fix(Upload): Card progress under controled value. fix alibaba-fusion#…

…2411
weinianyang · Nov 20, 2020 · edcea69 · edcea69
1 parent b865019
commit edcea69
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/scripts/upload-server.js b/scripts/upload-server.js
@@ -30,7 +30,7 @@ http.createServer(function(req, res) {
 
             form.parse(req, function(err, fields, files) {
                 if (err) {
-                    res.send({ success: false, message: err });
+                    res.end({ success: false, message: err });
                     return;
                 }
 

diff --git a/src/upload/card.jsx b/src/upload/card.jsx
@@ -75,7 +75,8 @@ class Card extends Base {
     }
 
     static getDerivedStateFromProps(nextProps, prevState) {
-        if ('value' in nextProps && nextProps.value !== prevState.value) {
+        const isUploading = prevState.uploaderRef && prevState.uploaderRef.isUploading();
+        if ('value' in nextProps && nextProps.value !== prevState.value && !isUploading) {
             return {
                 value: !Array.isArray(nextProps.value) ? [] : [].concat(nextProps.value),
             };
@@ -84,10 +85,12 @@ class Card extends Base {
         return null;
     }
 
-    onProgress = value => {
+    onProgress = (value, targetItem) => {
         this.setState({
             value,
         });
+
+        this.props.onProgress(value, targetItem);
     };
 
     onChange = (value, file) => {