iglooform 2.5.51 → 2.5.52

package/es/upload/index.js

@@ -168,6 +168,31 @@ var IglooUpload = function IglooUpload(props) {
       });
     };
   }, []);
+  useEffect(function () {
+    if (!(value === null || value === void 0 ? void 0 : value.length) && !files.length) return;
+
+    if (files.length) {
+      var urls = files.map(function (f) {
+        var status = f.status,
+            name = f.name,
+            errorMsg = f.errorMsg;
+
+        if (status === 'failed') {
+          return {
+            name: name,
+            errorMsg: errorMsg
+          };
+        }
+
+        if (f.url || f.dataUrl) {
+          return f.url || f.dataUrl;
+        }
+      });
+      onChange && onChange(urls);
+    } else {
+      onChange && onChange([]);
+    }
+  }, [files]);
   invariant(limit === undefined || limit > 0, "\"limit\" should be a pasitive number.");
 
   var onUpload = /*#__PURE__*/function () {
@@ -197,7 +222,8 @@ var IglooUpload = function IglooUpload(props) {
               return _context2.abrupt("return", Promise.reject(errorMsg));
 
             case 8:
-              limitNumError.current = undefined;
+              limitNumError.current = undefined; // 上传过程中 status为‘progress’，后续通过state更新
+
               setFiles(function (files) {
                 return [].concat(_toConsumableArray(files), [{
                   name: name,
@@ -211,39 +237,21 @@ var IglooUpload = function IglooUpload(props) {
               }); // 符合文件个数限制之后 上传时的错误处理
 
               return _context2.abrupt("return", handleUploadPromise(file, function (url) {
-                var urls = [];
-                setFiles(function (files) {
+                return setFiles(function (files) {
                   return files.map(function (f) {
-                    // 这里不能只处理成功的文件 因为这次上传的文件是成功了 但是这次之前可能会有上传失败的 需要将错误信息提取出来 否则错误提示会丢失
                     if (f.uid === uid) {
-                      urls.push(url);
                       return _objectSpread(_objectSpread({}, f), {}, {
                         url: url,
                         status: 'success'
                       });
                     }
 
-                    var status = f.status,
-                        name = f.name,
-                        errorMsg = f.errorMsg;
-
-                    if (status === 'failed') {
-                      urls.push({
-                        name: name,
-                        errorMsg: errorMsg
-                      });
-                    } else {
-                      f.url && urls.push(f.url);
-                    }
-
                     return f;
                   });
                 });
-                onChange && onChange(urls);
               }, function (errorMsg) {
-                var fileList = [];
-                setFiles(function (files) {
-                  var newList = files.map(function (f) {
+                return setFiles(function (files) {
+                  return files.map(function (f) {
                     if (f.uid === uid) {
                       return _objectSpread(_objectSpread({}, f), {}, {
                         status: 'failed',
@@ -253,23 +261,7 @@ var IglooUpload = function IglooUpload(props) {
 
                     return f;
                   });
-                  fileList = newList;
-                  return newList;
                 });
-                var fileListWithError = fileList.map(function (f) {
-                  if (f.uid === uid) {
-                    return {
-                      name: f.name,
-                      status: 'failed',
-                      errorMsg: errorMsg
-                    };
-                  }
-
-                  return f.url;
-                }); // 需要触发onchange 在form级别报错
-
-                // 需要触发onchange 在form级别报错
-                typeof onChange === 'function' && onChange(fileListWithError);
               }));
 
             case 11:
@@ -324,51 +316,19 @@ var IglooUpload = function IglooUpload(props) {
 
   var handleDelete = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4(index) {
-      var arr, hasError, rst;
       return regeneratorRuntime.wrap(function _callee4$(_context4) {
         while (1) {
           switch (_context4.prev = _context4.next) {
             case 0:
               limitNumError.current = null;
-              arr = files;
-              _context4.next = 4;
-              return setFiles(function (files) {
+              setFiles(function (files) {
                 var newArr = files.filter(function (_, i) {
                   return i !== index;
                 });
-                arr = newArr;
                 return newArr;
               });
 
-            case 4:
-              // 删除之后找一下是否存在上传过程中错误的文件
-              hasError = arr.some(function (f) {
-                return f.status === 'failed';
-              });
-
-              if (!hasError) {
-                _context4.next = 8;
-                break;
-              }
-
-              rst = arr.map(function (f) {
-                if (f.status === 'failed') {
-                  return {
-                    errorMsg: f.errorMsg
-                  };
-                }
-
-                return f.url;
-              });
-              return _context4.abrupt("return", typeof onChange === 'function' && onChange(rst));
-
-            case 8:
-              typeof onChange === 'function' && onChange(arr.map(function (_ref5) {
-                var url = _ref5.url;
-                return url;
-              }));
-
-            case 9:
+            case 2:
             case "end":
               return _context4.stop();
           }
@@ -382,8 +342,8 @@ var IglooUpload = function IglooUpload(props) {
   }();
 
   var handleReUpload = /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5(index) {
-      var _files$index, originFile, reUpUid, rst, latestFiles, fileListWithError, newList, _rst;
+    var _ref5 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5(index) {
+      var _files$index, originFile, reUpUid, rst;
 
       return regeneratorRuntime.wrap(function _callee5$(_context5) {
         while (1) {
@@ -414,81 +374,41 @@ var IglooUpload = function IglooUpload(props) {
 
             case 8:
               rst = _context5.sent;
-              latestFiles = [];
-              _context5.next = 12;
+              _context5.next = 11;
               return setFiles(function (files) {
                 var newFiles = _toConsumableArray(files);
 
                 newFiles[index].url = rst;
                 newFiles[index].status = 'success';
-                latestFiles = newFiles;
                 return newFiles;
               });
 
-            case 12:
-              // 查找出现在file 列表中地错误信息
-              fileListWithError = latestFiles.map(function (f) {
-                var status = f.status,
-                    errorMsg = f.errorMsg,
-                    url = f.url,
-                    name = f.name;
-
-                if (status === 'failed') {
-                  return {
-                    errorMsg: errorMsg,
-                    name: name
-                  };
-                }
-
-                return url;
-              });
-              onChange && onChange(fileListWithError);
-              _context5.next = 23;
+            case 11:
+              _context5.next = 17;
               break;
 
-            case 16:
-              _context5.prev = 16;
+            case 13:
+              _context5.prev = 13;
               _context5.t0 = _context5["catch"](5);
-              newList = [];
-              _context5.next = 21;
+              _context5.next = 17;
               return setFiles(function (files) {
                 var newFiles = _toConsumableArray(files);
 
                 newFiles[index].status = 'failed';
                 newFiles[index].errorMsg = _context5.t0;
-                newList = newFiles;
                 return newFiles;
               });
 
-            case 21:
-              // 报错之后要重置报错信息
-              _rst = newList.map(function (f) {
-                var name = f.name,
-                    errorMsg = f.errorMsg,
-                    url = f.url,
-                    uid = f.uid;
-
-                if (uid === reUpUid) {
-                  return {
-                    name: name,
-                    errorMsg: errorMsg
-                  };
-                }
-
-                return url;
-              });
-              typeof onChange === 'function' && onChange(_rst);
-
-            case 23:
+            case 17:
             case "end":
               return _context5.stop();
           }
         }
-      }, _callee5, null, [[5, 16]]);
+      }, _callee5, null, [[5, 13]]);
     }));
 
     return function handleReUpload(_x7) {
-      return _ref6.apply(this, arguments);
+      return _ref5.apply(this, arguments);
     };
   }();
 
@@ -572,14 +492,14 @@ var IglooUpload = function IglooUpload(props) {
   });
 };
 
-var FileList = function FileList(_ref7) {
-  var containerRef = _ref7.containerRef,
-      files = _ref7.files,
-      limit = _ref7.limit,
-      handleDelete = _ref7.handleDelete,
-      handlePreview = _ref7.handlePreview,
-      handleReUpload = _ref7.handleReUpload,
-      disabled = _ref7.disabled;
+var FileList = function FileList(_ref6) {
+  var containerRef = _ref6.containerRef,
+      files = _ref6.files,
+      limit = _ref6.limit,
+      handleDelete = _ref6.handleDelete,
+      handlePreview = _ref6.handlePreview,
+      handleReUpload = _ref6.handleReUpload,
+      disabled = _ref6.disabled;
 
   var _useState3 = useState(false),
       _useState4 = _slicedToArray(_useState3, 2),
@@ -593,11 +513,11 @@ var FileList = function FileList(_ref7) {
 
   var children = _jsx("div", {
     className: "igloo-upload-preview-list",
-    children: files.map(function (_ref8, index) {
-      var type = _ref8.type,
-          name = _ref8.name,
-          size = _ref8.size,
-          status = _ref8.status;
+    children: files.map(function (_ref7, index) {
+      var type = _ref7.type,
+          name = _ref7.name,
+          size = _ref7.size,
+          status = _ref7.status;
       return _jsxs("div", {
         className: classnames('igloo-upload-preview-item', {
           'igloo-upload-preview-item-failed': status === 'failed'
@@ -703,9 +623,9 @@ function checkFileList(value) {
   return Promise.resolve();
 }
 
-IglooUpload.formItemPropsHandler = function (_ref9) {
-  var previewFormater = _ref9.previewFormater,
-      label = _ref9.label;
+IglooUpload.formItemPropsHandler = function (_ref8) {
+  var previewFormater = _ref8.previewFormater,
+      label = _ref8.label;
   return {
     previewFormater: previewFormater || function (value) {
       return _jsx(UploadPreview, {

package/es/upload-photo/index.js

@@ -238,13 +238,39 @@ var UploadPhoto = function UploadPhoto(props) {
     }())).then(function () {
       return setFiles(_files);
     });
-  };
+  }; // 有初始值的处理 (不是初始化)
+
 
   useEffect(function () {
     if (Array.isArray(value) && value.length && files.length === 0) {
       mapFilesFromValue(value);
     }
   }, [value]);
+  useEffect(function () {
+    if (!value && !files.length) return;
+
+    if (files.length) {
+      var urls = files.map(function (f) {
+        var status = f.status,
+            name = f.name,
+            errorMsg = f.errorMsg;
+
+        if (status === 'failed') {
+          return {
+            name: name,
+            errorMsg: errorMsg
+          };
+        }
+
+        if (f.url || f.dataUrl) {
+          return f.url || f.dataUrl;
+        }
+      });
+      onChange && onChange(urls);
+    } else {
+      onChange && onChange([]);
+    }
+  }, [files]);
   var uploadId = useMemo(function () {
     return "igloo-upload-photo-input-".concat(Math.random());
   }, []);
@@ -376,38 +402,21 @@ var UploadPhoto = function UploadPhoto(props) {
                 }]);
               });
               return _context4.abrupt("return", handleUploadPromise(file, function (url) {
-                var urls = [];
-                setFiles(function (files) {
+                return setFiles(function (files) {
                   return files.map(function (f) {
                     if (f.uid === uid) {
-                      urls.push(url);
                       return _objectSpread(_objectSpread({}, f), {}, {
                         url: url,
                         status: 'success'
                       });
                     }
 
-                    var status = f.status,
-                        name = f.name,
-                        errorMsg = f.errorMsg;
-
-                    if (status === 'failed') {
-                      urls.push({
-                        name: name,
-                        errorMsg: errorMsg
-                      });
-                    } else {
-                      f.url && urls.push(f.url);
-                    }
-
                     return f;
                   });
                 });
-                onChange && onChange(urls);
               }, function (errorMsg) {
-                var fileList = [];
-                setFiles(function (files) {
-                  var newList = files.map(function (f) {
+                return setFiles(function (files) {
+                  return files.map(function (f) {
                     if (f.uid === uid) {
                       return _objectSpread(_objectSpread({}, f), {}, {
                         status: 'failed',
@@ -417,23 +426,7 @@ var UploadPhoto = function UploadPhoto(props) {
 
                     return f;
                   });
-                  fileList = newList;
-                  return newList;
                 });
-                var fileListWithError = fileList.map(function (f) {
-                  if (f.uid === uid) {
-                    return {
-                      name: f.name,
-                      status: 'failed',
-                      errorMsg: errorMsg
-                    };
-                  }
-
-                  return f.url;
-                }); // 需要触发onchange 在form级别报错
-
-                // 需要触发onchange 在form级别报错
-                typeof onChange === 'function' && onChange(fileListWithError);
               }));
 
             case 18:
@@ -487,59 +480,28 @@ var UploadPhoto = function UploadPhoto(props) {
 
   var handleDelete = /*#__PURE__*/function () {
     var _ref6 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee6(index) {
-      var arr, hasError, rst;
       return regeneratorRuntime.wrap(function _callee6$(_context6) {
         while (1) {
           switch (_context6.prev = _context6.next) {
             case 0:
               limitNumError.current = null;
-              arr = files;
-              _context6.next = 4;
+              _context6.next = 3;
               return setFiles(function (files) {
                 var newArr = files.filter(function (_, i) {
                   return i !== index;
                 });
-                arr = newArr;
                 return newArr;
               });
 
-            case 4:
-              _context6.next = 6;
+            case 3:
+              _context6.next = 5;
               return setMasks(function (masks) {
                 return masks.filter(function (_, i) {
                   return i !== index;
                 });
               });
 
-            case 6:
-              // 删除之后找一下是否存在上传过程中错误的文件
-              hasError = arr.some(function (f) {
-                return (f === null || f === void 0 ? void 0 : f.status) === 'failed';
-              });
-
-              if (!hasError) {
-                _context6.next = 10;
-                break;
-              }
-
-              rst = arr.map(function (f) {
-                if ((f === null || f === void 0 ? void 0 : f.status) === 'failed') {
-                  return {
-                    errorMsg: f.errorMsg
-                  };
-                }
-
-                return f.url;
-              });
-              return _context6.abrupt("return", typeof onChange === 'function' && onChange(rst));
-
-            case 10:
-              typeof onChange === 'function' && onChange(arr.map(function (_ref7) {
-                var url = _ref7.url;
-                return url;
-              }));
-
-            case 11:
+            case 5:
             case "end":
               return _context6.stop();
           }
@@ -553,8 +515,8 @@ var UploadPhoto = function UploadPhoto(props) {
   }();
 
   var handleReUpload = /*#__PURE__*/function () {
-    var _ref8 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee7(index) {
-      var _files$index, originFile, reUpUid, rst, latestFiles, fileListWithError, newList, _rst;
+    var _ref7 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee7(index) {
+      var _files$index, originFile, reUpUid, rst;
 
       return regeneratorRuntime.wrap(function _callee7$(_context7) {
         while (1) {
@@ -585,86 +547,46 @@ var UploadPhoto = function UploadPhoto(props) {
 
             case 8:
               rst = _context7.sent;
-              latestFiles = [];
-              _context7.next = 12;
+              _context7.next = 11;
               return setFiles(function (files) {
                 var newFiles = _toConsumableArray(files);
 
                 newFiles[index].url = rst;
                 newFiles[index].status = 'success';
-                latestFiles = newFiles;
                 return newFiles;
               });
 
-            case 12:
-              // 查找出现在file 列表中地错误信息
-              fileListWithError = latestFiles.map(function (f) {
-                var status = f.status,
-                    errorMsg = f.errorMsg,
-                    url = f.url,
-                    name = f.name;
-
-                if (status === 'failed') {
-                  return {
-                    errorMsg: errorMsg,
-                    name: name
-                  };
-                }
-
-                return url;
-              });
-              onChange && onChange(fileListWithError);
-              _context7.next = 23;
+            case 11:
+              _context7.next = 17;
               break;
 
-            case 16:
-              _context7.prev = 16;
+            case 13:
+              _context7.prev = 13;
               _context7.t0 = _context7["catch"](5);
-              newList = [];
-              _context7.next = 21;
+              _context7.next = 17;
               return setFiles(function (files) {
                 var newFiles = _toConsumableArray(files);
 
                 newFiles[index].status = 'failed';
                 newFiles[index].errorMsg = _context7.t0;
-                newList = newFiles;
                 return newFiles;
               });
 
-            case 21:
-              // 报错之后要重制报错信息
-              _rst = newList.map(function (f) {
-                var name = f.name,
-                    errorMsg = f.errorMsg,
-                    url = f.url,
-                    uid = f.uid;
-
-                if (uid === reUpUid) {
-                  return {
-                    name: name,
-                    errorMsg: errorMsg
-                  };
-                }
-
-                return url;
-              });
-              typeof onChange === 'function' && onChange(_rst);
-
-            case 23:
+            case 17:
               if (isMobile) {
                 closeMask(index);
               }
 
-            case 24:
+            case 18:
             case "end":
               return _context7.stop();
           }
         }
-      }, _callee7, null, [[5, 16]]);
+      }, _callee7, null, [[5, 13]]);
     }));
 
     return function handleReUpload(_x11) {
-      return _ref8.apply(this, arguments);
+      return _ref7.apply(this, arguments);
     };
   }();
 
@@ -761,12 +683,12 @@ var UploadPhoto = function UploadPhoto(props) {
       children: _jsxs(_Row, {
         gutter: [isMobile ? 16 : 32, 16],
         wrap: true,
-        children: [Boolean(samples === null || samples === void 0 ? void 0 : samples.length) && samples.map(function (_ref9, index) {
+        children: [Boolean(samples === null || samples === void 0 ? void 0 : samples.length) && samples.map(function (_ref8, index) {
           var _classnames, _classnames2;
 
-          var src = _ref9.src,
-              label = _ref9.label,
-              type = _ref9.type;
+          var src = _ref8.src,
+              label = _ref8.label,
+              type = _ref8.type;
           return _jsxs(_Col, {
             span: sampleSpan,
             children: [_jsx("img", {
@@ -826,13 +748,13 @@ var UploadPhoto = function UploadPhoto(props) {
             children: buttonText || 'Upload'
           })
         })]
-      }), files.map(function (_ref10, index) {
+      }), files.map(function (_ref9, index) {
         var _classnames5;
 
-        var dataUrl = _ref10.dataUrl,
-            status = _ref10.status,
-            type = _ref10.type,
-            uid = _ref10.uid;
+        var dataUrl = _ref9.dataUrl,
+            status = _ref9.status,
+            type = _ref9.type,
+            uid = _ref9.uid;
         return _jsx(_Badge, {
           count: getBadge(status, index, limit),
           children: _jsxs("div", {
@@ -900,10 +822,10 @@ function checkFileList(value) {
   return Promise.resolve();
 }
 
-UploadPhoto.formItemPropsHandler = function (_ref11) {
-  var limit = _ref11.limit,
-      previewFormater = _ref11.previewFormater,
-      label = _ref11.label;
+UploadPhoto.formItemPropsHandler = function (_ref10) {
+  var limit = _ref10.limit,
+      previewFormater = _ref10.previewFormater,
+      label = _ref10.label;
   return {
     previewFormater: previewFormater || function (value) {
       return _jsx(UploadPreview, {

package/lib/upload/index.js

@@ -193,6 +193,31 @@ var IglooUpload = function IglooUpload(props) {
       });
     };
   }, []);
+  (0, _react.useEffect)(function () {
+    if (!(value === null || value === void 0 ? void 0 : value.length) && !files.length) return;
+
+    if (files.length) {
+      var urls = files.map(function (f) {
+        var status = f.status,
+            name = f.name,
+            errorMsg = f.errorMsg;
+
+        if (status === 'failed') {
+          return {
+            name: name,
+            errorMsg: errorMsg
+          };
+        }
+
+        if (f.url || f.dataUrl) {
+          return f.url || f.dataUrl;
+        }
+      });
+      onChange && onChange(urls);
+    } else {
+      onChange && onChange([]);
+    }
+  }, [files]);
   (0, _invariant.default)(limit === undefined || limit > 0, "\"limit\" should be a pasitive number.");
 
   var onUpload = /*#__PURE__*/function () {
@@ -222,7 +247,8 @@ var IglooUpload = function IglooUpload(props) {
               return _context2.abrupt("return", Promise.reject(errorMsg));
 
             case 8:
-              limitNumError.current = undefined;
+              limitNumError.current = undefined; // 上传过程中 status为‘progress’，后续通过state更新
+
               setFiles(function (files) {
                 return [].concat(_toConsumableArray(files), [{
                   name: name,
@@ -236,39 +262,21 @@ var IglooUpload = function IglooUpload(props) {
               }); // 符合文件个数限制之后 上传时的错误处理
 
               return _context2.abrupt("return", handleUploadPromise(file, function (url) {
-                var urls = [];
-                setFiles(function (files) {
+                return setFiles(function (files) {
                   return files.map(function (f) {
-                    // 这里不能只处理成功的文件 因为这次上传的文件是成功了 但是这次之前可能会有上传失败的 需要将错误信息提取出来 否则错误提示会丢失
                     if (f.uid === uid) {
-                      urls.push(url);
                       return _objectSpread(_objectSpread({}, f), {}, {
                         url: url,
                         status: 'success'
                       });
                     }
 
-                    var status = f.status,
-                        name = f.name,
-                        errorMsg = f.errorMsg;
-
-                    if (status === 'failed') {
-                      urls.push({
-                        name: name,
-                        errorMsg: errorMsg
-                      });
-                    } else {
-                      f.url && urls.push(f.url);
-                    }
-
                     return f;
                   });
                 });
-                onChange && onChange(urls);
               }, function (errorMsg) {
-                var fileList = [];
-                setFiles(function (files) {
-                  var newList = files.map(function (f) {
+                return setFiles(function (files) {
+                  return files.map(function (f) {
                     if (f.uid === uid) {
                       return _objectSpread(_objectSpread({}, f), {}, {
                         status: 'failed',
@@ -278,23 +286,7 @@ var IglooUpload = function IglooUpload(props) {
 
                     return f;
                   });
-                  fileList = newList;
-                  return newList;
                 });
-                var fileListWithError = fileList.map(function (f) {
-                  if (f.uid === uid) {
-                    return {
-                      name: f.name,
-                      status: 'failed',
-                      errorMsg: errorMsg
-                    };
-                  }
-
-                  return f.url;
-                }); // 需要触发onchange 在form级别报错
-
-                // 需要触发onchange 在form级别报错
-                typeof onChange === 'function' && onChange(fileListWithError);
               }));
 
             case 11:
@@ -349,51 +341,19 @@ var IglooUpload = function IglooUpload(props) {
 
   var handleDelete = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4(index) {
-      var arr, hasError, rst;
       return regeneratorRuntime.wrap(function _callee4$(_context4) {
         while (1) {
           switch (_context4.prev = _context4.next) {
             case 0:
               limitNumError.current = null;
-              arr = files;
-              _context4.next = 4;
-              return setFiles(function (files) {
+              setFiles(function (files) {
                 var newArr = files.filter(function (_, i) {
                   return i !== index;
                 });
-                arr = newArr;
                 return newArr;
               });
 
-            case 4:
-              // 删除之后找一下是否存在上传过程中错误的文件
-              hasError = arr.some(function (f) {
-                return f.status === 'failed';
-              });
-
-              if (!hasError) {
-                _context4.next = 8;
-                break;
-              }
-
-              rst = arr.map(function (f) {
-                if (f.status === 'failed') {
-                  return {
-                    errorMsg: f.errorMsg
-                  };
-                }
-
-                return f.url;
-              });
-              return _context4.abrupt("return", typeof onChange === 'function' && onChange(rst));
-
-            case 8:
-              typeof onChange === 'function' && onChange(arr.map(function (_ref5) {
-                var url = _ref5.url;
-                return url;
-              }));
-
-            case 9:
+            case 2:
             case "end":
               return _context4.stop();
           }
@@ -407,8 +367,8 @@ var IglooUpload = function IglooUpload(props) {
   }();
 
   var handleReUpload = /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5(index) {
-      var _files$index, originFile, reUpUid, rst, latestFiles, fileListWithError, newList, _rst;
+    var _ref5 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5(index) {
+      var _files$index, originFile, reUpUid, rst;
 
       return regeneratorRuntime.wrap(function _callee5$(_context5) {
         while (1) {
@@ -439,81 +399,41 @@ var IglooUpload = function IglooUpload(props) {
 
             case 8:
               rst = _context5.sent;
-              latestFiles = [];
-              _context5.next = 12;
+              _context5.next = 11;
               return setFiles(function (files) {
                 var newFiles = _toConsumableArray(files);
 
                 newFiles[index].url = rst;
                 newFiles[index].status = 'success';
-                latestFiles = newFiles;
                 return newFiles;
               });
 
-            case 12:
-              // 查找出现在file 列表中地错误信息
-              fileListWithError = latestFiles.map(function (f) {
-                var status = f.status,
-                    errorMsg = f.errorMsg,
-                    url = f.url,
-                    name = f.name;
-
-                if (status === 'failed') {
-                  return {
-                    errorMsg: errorMsg,
-                    name: name
-                  };
-                }
-
-                return url;
-              });
-              onChange && onChange(fileListWithError);
-              _context5.next = 23;
+            case 11:
+              _context5.next = 17;
               break;
 
-            case 16:
-              _context5.prev = 16;
+            case 13:
+              _context5.prev = 13;
               _context5.t0 = _context5["catch"](5);
-              newList = [];
-              _context5.next = 21;
+              _context5.next = 17;
               return setFiles(function (files) {
                 var newFiles = _toConsumableArray(files);
 
                 newFiles[index].status = 'failed';
                 newFiles[index].errorMsg = _context5.t0;
-                newList = newFiles;
                 return newFiles;
               });
 
-            case 21:
-              // 报错之后要重置报错信息
-              _rst = newList.map(function (f) {
-                var name = f.name,
-                    errorMsg = f.errorMsg,
-                    url = f.url,
-                    uid = f.uid;
-
-                if (uid === reUpUid) {
-                  return {
-                    name: name,
-                    errorMsg: errorMsg
-                  };
-                }
-
-                return url;
-              });
-              typeof onChange === 'function' && onChange(_rst);
-
-            case 23:
+            case 17:
             case "end":
               return _context5.stop();
           }
         }
-      }, _callee5, null, [[5, 16]]);
+      }, _callee5, null, [[5, 13]]);
     }));
 
     return function handleReUpload(_x7) {
-      return _ref6.apply(this, arguments);
+      return _ref5.apply(this, arguments);
     };
   }();
 
@@ -598,14 +518,14 @@ var IglooUpload = function IglooUpload(props) {
   });
 };
 
-var FileList = function FileList(_ref7) {
-  var containerRef = _ref7.containerRef,
-      files = _ref7.files,
-      limit = _ref7.limit,
-      handleDelete = _ref7.handleDelete,
-      handlePreview = _ref7.handlePreview,
-      handleReUpload = _ref7.handleReUpload,
-      disabled = _ref7.disabled;
+var FileList = function FileList(_ref6) {
+  var containerRef = _ref6.containerRef,
+      files = _ref6.files,
+      limit = _ref6.limit,
+      handleDelete = _ref6.handleDelete,
+      handlePreview = _ref6.handlePreview,
+      handleReUpload = _ref6.handleReUpload,
+      disabled = _ref6.disabled;
 
   var _useState3 = (0, _react.useState)(false),
       _useState4 = _slicedToArray(_useState3, 2),
@@ -618,11 +538,11 @@ var FileList = function FileList(_ref7) {
   if (!initDone) return null;
   var children = (0, _jsxRuntime.jsx)("div", {
     className: "igloo-upload-preview-list",
-    children: files.map(function (_ref8, index) {
-      var type = _ref8.type,
-          name = _ref8.name,
-          size = _ref8.size,
-          status = _ref8.status;
+    children: files.map(function (_ref7, index) {
+      var type = _ref7.type,
+          name = _ref7.name,
+          size = _ref7.size,
+          status = _ref7.status;
       return (0, _jsxRuntime.jsxs)("div", {
         className: (0, _classnames.default)('igloo-upload-preview-item', {
           'igloo-upload-preview-item-failed': status === 'failed'
@@ -727,9 +647,9 @@ function checkFileList(value) {
   return Promise.resolve();
 }
 
-IglooUpload.formItemPropsHandler = function (_ref9) {
-  var previewFormater = _ref9.previewFormater,
-      label = _ref9.label;
+IglooUpload.formItemPropsHandler = function (_ref8) {
+  var previewFormater = _ref8.previewFormater,
+      label = _ref8.label;
   return {
     previewFormater: previewFormater || function (value) {
       return (0, _jsxRuntime.jsx)(_uploadPreview.default, {

package/lib/upload-photo/index.js

@@ -271,13 +271,39 @@ var UploadPhoto = function UploadPhoto(props) {
     }())).then(function () {
       return setFiles(_files);
     });
-  };
+  }; // 有初始值的处理 (不是初始化)
+
 
   (0, _react.useEffect)(function () {
     if (Array.isArray(value) && value.length && files.length === 0) {
       mapFilesFromValue(value);
     }
   }, [value]);
+  (0, _react.useEffect)(function () {
+    if (!value && !files.length) return;
+
+    if (files.length) {
+      var urls = files.map(function (f) {
+        var status = f.status,
+            name = f.name,
+            errorMsg = f.errorMsg;
+
+        if (status === 'failed') {
+          return {
+            name: name,
+            errorMsg: errorMsg
+          };
+        }
+
+        if (f.url || f.dataUrl) {
+          return f.url || f.dataUrl;
+        }
+      });
+      onChange && onChange(urls);
+    } else {
+      onChange && onChange([]);
+    }
+  }, [files]);
   var uploadId = (0, _react.useMemo)(function () {
     return "igloo-upload-photo-input-".concat(Math.random());
   }, []);
@@ -409,38 +435,21 @@ var UploadPhoto = function UploadPhoto(props) {
                 }]);
               });
               return _context4.abrupt("return", handleUploadPromise(file, function (url) {
-                var urls = [];
-                setFiles(function (files) {
+                return setFiles(function (files) {
                   return files.map(function (f) {
                     if (f.uid === uid) {
-                      urls.push(url);
                       return _objectSpread(_objectSpread({}, f), {}, {
                         url: url,
                         status: 'success'
                       });
                     }
 
-                    var status = f.status,
-                        name = f.name,
-                        errorMsg = f.errorMsg;
-
-                    if (status === 'failed') {
-                      urls.push({
-                        name: name,
-                        errorMsg: errorMsg
-                      });
-                    } else {
-                      f.url && urls.push(f.url);
-                    }
-
                     return f;
                   });
                 });
-                onChange && onChange(urls);
               }, function (errorMsg) {
-                var fileList = [];
-                setFiles(function (files) {
-                  var newList = files.map(function (f) {
+                return setFiles(function (files) {
+                  return files.map(function (f) {
                     if (f.uid === uid) {
                       return _objectSpread(_objectSpread({}, f), {}, {
                         status: 'failed',
@@ -450,23 +459,7 @@ var UploadPhoto = function UploadPhoto(props) {
 
                     return f;
                   });
-                  fileList = newList;
-                  return newList;
                 });
-                var fileListWithError = fileList.map(function (f) {
-                  if (f.uid === uid) {
-                    return {
-                      name: f.name,
-                      status: 'failed',
-                      errorMsg: errorMsg
-                    };
-                  }
-
-                  return f.url;
-                }); // 需要触发onchange 在form级别报错
-
-                // 需要触发onchange 在form级别报错
-                typeof onChange === 'function' && onChange(fileListWithError);
               }));
 
             case 18:
@@ -520,59 +513,28 @@ var UploadPhoto = function UploadPhoto(props) {
 
   var handleDelete = /*#__PURE__*/function () {
     var _ref6 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee6(index) {
-      var arr, hasError, rst;
       return regeneratorRuntime.wrap(function _callee6$(_context6) {
         while (1) {
           switch (_context6.prev = _context6.next) {
             case 0:
               limitNumError.current = null;
-              arr = files;
-              _context6.next = 4;
+              _context6.next = 3;
               return setFiles(function (files) {
                 var newArr = files.filter(function (_, i) {
                   return i !== index;
                 });
-                arr = newArr;
                 return newArr;
               });
 
-            case 4:
-              _context6.next = 6;
+            case 3:
+              _context6.next = 5;
               return setMasks(function (masks) {
                 return masks.filter(function (_, i) {
                   return i !== index;
                 });
               });
 
-            case 6:
-              // 删除之后找一下是否存在上传过程中错误的文件
-              hasError = arr.some(function (f) {
-                return (f === null || f === void 0 ? void 0 : f.status) === 'failed';
-              });
-
-              if (!hasError) {
-                _context6.next = 10;
-                break;
-              }
-
-              rst = arr.map(function (f) {
-                if ((f === null || f === void 0 ? void 0 : f.status) === 'failed') {
-                  return {
-                    errorMsg: f.errorMsg
-                  };
-                }
-
-                return f.url;
-              });
-              return _context6.abrupt("return", typeof onChange === 'function' && onChange(rst));
-
-            case 10:
-              typeof onChange === 'function' && onChange(arr.map(function (_ref7) {
-                var url = _ref7.url;
-                return url;
-              }));
-
-            case 11:
+            case 5:
             case "end":
               return _context6.stop();
           }
@@ -586,8 +548,8 @@ var UploadPhoto = function UploadPhoto(props) {
   }();
 
   var handleReUpload = /*#__PURE__*/function () {
-    var _ref8 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee7(index) {
-      var _files$index, originFile, reUpUid, rst, latestFiles, fileListWithError, newList, _rst;
+    var _ref7 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee7(index) {
+      var _files$index, originFile, reUpUid, rst;
 
       return regeneratorRuntime.wrap(function _callee7$(_context7) {
         while (1) {
@@ -618,86 +580,46 @@ var UploadPhoto = function UploadPhoto(props) {
 
             case 8:
               rst = _context7.sent;
-              latestFiles = [];
-              _context7.next = 12;
+              _context7.next = 11;
               return setFiles(function (files) {
                 var newFiles = _toConsumableArray(files);
 
                 newFiles[index].url = rst;
                 newFiles[index].status = 'success';
-                latestFiles = newFiles;
                 return newFiles;
               });
 
-            case 12:
-              // 查找出现在file 列表中地错误信息
-              fileListWithError = latestFiles.map(function (f) {
-                var status = f.status,
-                    errorMsg = f.errorMsg,
-                    url = f.url,
-                    name = f.name;
-
-                if (status === 'failed') {
-                  return {
-                    errorMsg: errorMsg,
-                    name: name
-                  };
-                }
-
-                return url;
-              });
-              onChange && onChange(fileListWithError);
-              _context7.next = 23;
+            case 11:
+              _context7.next = 17;
               break;
 
-            case 16:
-              _context7.prev = 16;
+            case 13:
+              _context7.prev = 13;
               _context7.t0 = _context7["catch"](5);
-              newList = [];
-              _context7.next = 21;
+              _context7.next = 17;
               return setFiles(function (files) {
                 var newFiles = _toConsumableArray(files);
 
                 newFiles[index].status = 'failed';
                 newFiles[index].errorMsg = _context7.t0;
-                newList = newFiles;
                 return newFiles;
               });
 
-            case 21:
-              // 报错之后要重制报错信息
-              _rst = newList.map(function (f) {
-                var name = f.name,
-                    errorMsg = f.errorMsg,
-                    url = f.url,
-                    uid = f.uid;
-
-                if (uid === reUpUid) {
-                  return {
-                    name: name,
-                    errorMsg: errorMsg
-                  };
-                }
-
-                return url;
-              });
-              typeof onChange === 'function' && onChange(_rst);
-
-            case 23:
+            case 17:
               if (isMobile) {
                 closeMask(index);
               }
 
-            case 24:
+            case 18:
             case "end":
               return _context7.stop();
           }
         }
-      }, _callee7, null, [[5, 16]]);
+      }, _callee7, null, [[5, 13]]);
     }));
 
     return function handleReUpload(_x11) {
-      return _ref8.apply(this, arguments);
+      return _ref7.apply(this, arguments);
     };
   }();
 
@@ -795,12 +717,12 @@ var UploadPhoto = function UploadPhoto(props) {
       children: (0, _jsxRuntime.jsxs)(_row.default, {
         gutter: [isMobile ? 16 : 32, 16],
         wrap: true,
-        children: [Boolean(samples === null || samples === void 0 ? void 0 : samples.length) && samples.map(function (_ref9, index) {
+        children: [Boolean(samples === null || samples === void 0 ? void 0 : samples.length) && samples.map(function (_ref8, index) {
           var _classnames, _classnames2;
 
-          var src = _ref9.src,
-              label = _ref9.label,
-              type = _ref9.type;
+          var src = _ref8.src,
+              label = _ref8.label,
+              type = _ref8.type;
           return (0, _jsxRuntime.jsxs)(_col.default, {
             span: sampleSpan,
             children: [(0, _jsxRuntime.jsx)("img", {
@@ -860,13 +782,13 @@ var UploadPhoto = function UploadPhoto(props) {
             children: buttonText || 'Upload'
           })
         })]
-      }), files.map(function (_ref10, index) {
+      }), files.map(function (_ref9, index) {
         var _classnames5;
 
-        var dataUrl = _ref10.dataUrl,
-            status = _ref10.status,
-            type = _ref10.type,
-            uid = _ref10.uid;
+        var dataUrl = _ref9.dataUrl,
+            status = _ref9.status,
+            type = _ref9.type,
+            uid = _ref9.uid;
         return (0, _jsxRuntime.jsx)(_badge.default, {
           count: getBadge(status, index, limit),
           children: (0, _jsxRuntime.jsxs)("div", {
@@ -934,10 +856,10 @@ function checkFileList(value) {
   return Promise.resolve();
 }
 
-UploadPhoto.formItemPropsHandler = function (_ref11) {
-  var limit = _ref11.limit,
-      previewFormater = _ref11.previewFormater,
-      label = _ref11.label;
+UploadPhoto.formItemPropsHandler = function (_ref10) {
+  var limit = _ref10.limit,
+      previewFormater = _ref10.previewFormater,
+      label = _ref10.label;
   return {
     previewFormater: previewFormater || function (value) {
       return (0, _jsxRuntime.jsx)(_uploadPreview.default, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iglooform",
-  "version": "2.5.51",
+  "version": "2.5.52",
   "scripts": {
     "start": "dumi dev",
     "build-dev": "dumi build",