iglooform 2.5.0 → 2.5.1

package/es/upload-photo/index.js

@@ -112,6 +112,7 @@ var UploadPhoto = function UploadPhoto(props) {
 
   var limitNumError = useRef();
   var DomRef = useRef();
+  var dataUrlRef = useRef([]);
 
   var _useContext = useContext(FormContext),
       uploadApi = _useContext.uploadApi;
@@ -244,12 +245,11 @@ var UploadPhoto = function UploadPhoto(props) {
   var uploadIndex = useRef((value === null || value === void 0 ? void 0 : value.length) ? value.length : 0);
   useEffect(function () {
     return function () {
-      files.forEach(function (_ref4) {
-        var dataUrl = _ref4.dataUrl;
+      dataUrlRef.current.forEach(function (dataUrl) {
         URL.revokeObjectURL(dataUrl);
       });
     };
-  }, [files]);
+  }, []);
   useEffect(function () {
     var removeLimitMsg = function removeLimitMsg(e) {
       if (DomRef.current && !DomRef.current.contains(e.target) && limitNumError.current) {
@@ -315,7 +315,7 @@ var UploadPhoto = function UploadPhoto(props) {
   };
 
   var uploadFile = /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4(file, currentIndex) {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4(file, currentIndex) {
       var uid, dataUrl, name, size, mimeType, type, errorMsg, _errorMsg;
 
       return regeneratorRuntime.wrap(function _callee4$(_context4) {
@@ -324,11 +324,12 @@ var UploadPhoto = function UploadPhoto(props) {
             case 0:
               uid = ++uploadIndex.current;
               dataUrl = URL.createObjectURL(file);
+              dataUrlRef.current.push(dataUrl);
               name = file.name, size = file.size, mimeType = file.type;
               type = classifyType(mimeType);
 
               if (!(type === 'unknown')) {
-                _context4.next = 9;
+                _context4.next = 10;
                 break;
               }
 
@@ -339,9 +340,9 @@ var UploadPhoto = function UploadPhoto(props) {
               setFieldError && setFieldError(errorMsg);
               return _context4.abrupt("return", Promise.reject(errorMsg));
 
-            case 9:
+            case 10:
               if (!(limit && currentIndex > limit)) {
-                _context4.next = 14;
+                _context4.next = 15;
                 break;
               }
 
@@ -355,7 +356,7 @@ var UploadPhoto = function UploadPhoto(props) {
               setFieldError && setFieldError(_errorMsg);
               return _context4.abrupt("return", Promise.reject(_errorMsg));
 
-            case 14:
+            case 15:
               limitNumError.current = undefined;
               setFiles(function (files) {
                 return [].concat(_toConsumableArray(files), [{
@@ -429,7 +430,7 @@ var UploadPhoto = function UploadPhoto(props) {
                 typeof onChange === 'function' && onChange(fileListWithError);
               }));
 
-            case 17:
+            case 18:
             case "end":
               return _context4.stop();
           }
@@ -438,12 +439,12 @@ var UploadPhoto = function UploadPhoto(props) {
     }));
 
     return function uploadFile(_x5, _x6) {
-      return _ref5.apply(this, arguments);
+      return _ref4.apply(this, arguments);
     };
   }();
 
   var handleUploadPromise = /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5(file, onSuccess, onFailed) {
+    var _ref5 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5(file, onSuccess, onFailed) {
       var rst, errorMsg;
       return regeneratorRuntime.wrap(function _callee5$(_context5) {
         while (1) {
@@ -474,12 +475,12 @@ var UploadPhoto = function UploadPhoto(props) {
     }));
 
     return function handleUploadPromise(_x7, _x8, _x9) {
-      return _ref6.apply(this, arguments);
+      return _ref5.apply(this, arguments);
     };
   }();
 
   var handleDelete = /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee6(index) {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee6(index) {
       var arr, hasError, rst;
       return regeneratorRuntime.wrap(function _callee6$(_context6) {
         while (1) {
@@ -527,8 +528,8 @@ var UploadPhoto = function UploadPhoto(props) {
               return _context6.abrupt("return", typeof onChange === 'function' && onChange(rst));
 
             case 10:
-              typeof onChange === 'function' && onChange(arr.map(function (_ref8) {
-                var url = _ref8.url;
+              typeof onChange === 'function' && onChange(arr.map(function (_ref7) {
+                var url = _ref7.url;
                 return url;
               }));
 
@@ -541,12 +542,12 @@ var UploadPhoto = function UploadPhoto(props) {
     }));
 
     return function handleDelete(_x10) {
-      return _ref7.apply(this, arguments);
+      return _ref6.apply(this, arguments);
     };
   }();
 
   var handleReUpload = /*#__PURE__*/function () {
-    var _ref9 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee7(index) {
+    var _ref8 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee7(index) {
       var _files$index, originFile, reUpUid, rst, latestFiles, fileListWithError, newList, _rst;
 
       return regeneratorRuntime.wrap(function _callee7$(_context7) {
@@ -657,7 +658,7 @@ var UploadPhoto = function UploadPhoto(props) {
     }));
 
     return function handleReUpload(_x11) {
-      return _ref9.apply(this, arguments);
+      return _ref8.apply(this, arguments);
     };
   }();
 
@@ -669,7 +670,7 @@ var UploadPhoto = function UploadPhoto(props) {
     Modal.noFooter({
       content: _jsx(Preview, {
         src: dataUrl,
-        type: type
+        type: classifyType(type)
       }),
       title: name,
       className: 'igloo-upload-photo-preview-modal',
@@ -750,12 +751,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 (_ref10, index) {
+        children: [Boolean(samples === null || samples === void 0 ? void 0 : samples.length) && samples.map(function (_ref9, index) {
           var _classnames, _classnames2;
 
-          var src = _ref10.src,
-              label = _ref10.label,
-              type = _ref10.type;
+          var src = _ref9.src,
+              label = _ref9.label,
+              type = _ref9.type;
           return _jsxs(_Col, {
             span: sampleSpan,
             children: [_jsx("img", {
@@ -815,13 +816,13 @@ var UploadPhoto = function UploadPhoto(props) {
             children: buttonText || 'Upload'
           })
         })]
-      }), files.map(function (_ref11, index) {
+      }), files.map(function (_ref10, index) {
         var _classnames5;
 
-        var dataUrl = _ref11.dataUrl,
-            status = _ref11.status,
-            type = _ref11.type,
-            uid = _ref11.uid;
+        var dataUrl = _ref10.dataUrl,
+            status = _ref10.status,
+            type = _ref10.type,
+            uid = _ref10.uid;
         return _jsx(_Badge, {
           count: getBadge(status, index, limit),
           children: _jsxs("div", {
@@ -889,10 +890,10 @@ function checkFileList(value) {
   return Promise.resolve();
 }
 
-UploadPhoto.formItemPropsHandler = function (_ref12) {
-  var limit = _ref12.limit,
-      previewFormater = _ref12.previewFormater,
-      label = _ref12.label;
+UploadPhoto.formItemPropsHandler = function (_ref11) {
+  var limit = _ref11.limit,
+      previewFormater = _ref11.previewFormater,
+      label = _ref11.label;
   return {
     previewFormater: previewFormater || function (value) {
       return _jsx(UploadPreview, {

package/lib/upload-photo/index.js

@@ -145,6 +145,7 @@ var UploadPhoto = function UploadPhoto(props) {
 
   var limitNumError = (0, _react.useRef)();
   var DomRef = (0, _react.useRef)();
+  var dataUrlRef = (0, _react.useRef)([]);
 
   var _useContext = (0, _react.useContext)(_formContext.default),
       uploadApi = _useContext.uploadApi;
@@ -277,12 +278,11 @@ var UploadPhoto = function UploadPhoto(props) {
   var uploadIndex = (0, _react.useRef)((value === null || value === void 0 ? void 0 : value.length) ? value.length : 0);
   (0, _react.useEffect)(function () {
     return function () {
-      files.forEach(function (_ref4) {
-        var dataUrl = _ref4.dataUrl;
+      dataUrlRef.current.forEach(function (dataUrl) {
         URL.revokeObjectURL(dataUrl);
       });
     };
-  }, [files]);
+  }, []);
   (0, _react.useEffect)(function () {
     var removeLimitMsg = function removeLimitMsg(e) {
       if (DomRef.current && !DomRef.current.contains(e.target) && limitNumError.current) {
@@ -348,7 +348,7 @@ var UploadPhoto = function UploadPhoto(props) {
   };
 
   var uploadFile = /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4(file, currentIndex) {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4(file, currentIndex) {
       var uid, dataUrl, name, size, mimeType, type, errorMsg, _errorMsg;
 
       return regeneratorRuntime.wrap(function _callee4$(_context4) {
@@ -357,11 +357,12 @@ var UploadPhoto = function UploadPhoto(props) {
             case 0:
               uid = ++uploadIndex.current;
               dataUrl = URL.createObjectURL(file);
+              dataUrlRef.current.push(dataUrl);
               name = file.name, size = file.size, mimeType = file.type;
               type = (0, _tools.classifyType)(mimeType);
 
               if (!(type === 'unknown')) {
-                _context4.next = 9;
+                _context4.next = 10;
                 break;
               }
 
@@ -372,9 +373,9 @@ var UploadPhoto = function UploadPhoto(props) {
               setFieldError && setFieldError(errorMsg);
               return _context4.abrupt("return", Promise.reject(errorMsg));
 
-            case 9:
+            case 10:
               if (!(limit && currentIndex > limit)) {
-                _context4.next = 14;
+                _context4.next = 15;
                 break;
               }
 
@@ -388,7 +389,7 @@ var UploadPhoto = function UploadPhoto(props) {
               setFieldError && setFieldError(_errorMsg);
               return _context4.abrupt("return", Promise.reject(_errorMsg));
 
-            case 14:
+            case 15:
               limitNumError.current = undefined;
               setFiles(function (files) {
                 return [].concat(_toConsumableArray(files), [{
@@ -462,7 +463,7 @@ var UploadPhoto = function UploadPhoto(props) {
                 typeof onChange === 'function' && onChange(fileListWithError);
               }));
 
-            case 17:
+            case 18:
             case "end":
               return _context4.stop();
           }
@@ -471,12 +472,12 @@ var UploadPhoto = function UploadPhoto(props) {
     }));
 
     return function uploadFile(_x5, _x6) {
-      return _ref5.apply(this, arguments);
+      return _ref4.apply(this, arguments);
     };
   }();
 
   var handleUploadPromise = /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5(file, onSuccess, onFailed) {
+    var _ref5 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5(file, onSuccess, onFailed) {
       var rst, errorMsg;
       return regeneratorRuntime.wrap(function _callee5$(_context5) {
         while (1) {
@@ -507,12 +508,12 @@ var UploadPhoto = function UploadPhoto(props) {
     }));
 
     return function handleUploadPromise(_x7, _x8, _x9) {
-      return _ref6.apply(this, arguments);
+      return _ref5.apply(this, arguments);
     };
   }();
 
   var handleDelete = /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee6(index) {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee6(index) {
       var arr, hasError, rst;
       return regeneratorRuntime.wrap(function _callee6$(_context6) {
         while (1) {
@@ -560,8 +561,8 @@ var UploadPhoto = function UploadPhoto(props) {
               return _context6.abrupt("return", typeof onChange === 'function' && onChange(rst));
 
             case 10:
-              typeof onChange === 'function' && onChange(arr.map(function (_ref8) {
-                var url = _ref8.url;
+              typeof onChange === 'function' && onChange(arr.map(function (_ref7) {
+                var url = _ref7.url;
                 return url;
               }));
 
@@ -574,12 +575,12 @@ var UploadPhoto = function UploadPhoto(props) {
     }));
 
     return function handleDelete(_x10) {
-      return _ref7.apply(this, arguments);
+      return _ref6.apply(this, arguments);
     };
   }();
 
   var handleReUpload = /*#__PURE__*/function () {
-    var _ref9 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee7(index) {
+    var _ref8 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee7(index) {
       var _files$index, originFile, reUpUid, rst, latestFiles, fileListWithError, newList, _rst;
 
       return regeneratorRuntime.wrap(function _callee7$(_context7) {
@@ -690,7 +691,7 @@ var UploadPhoto = function UploadPhoto(props) {
     }));
 
     return function handleReUpload(_x11) {
-      return _ref9.apply(this, arguments);
+      return _ref8.apply(this, arguments);
     };
   }();
 
@@ -703,7 +704,7 @@ var UploadPhoto = function UploadPhoto(props) {
     _modal.default.noFooter({
       content: (0, _jsxRuntime.jsx)(_media.default, {
         src: dataUrl,
-        type: type
+        type: (0, _tools.classifyType)(type)
       }),
       title: name,
       className: 'igloo-upload-photo-preview-modal',
@@ -784,12 +785,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 (_ref10, index) {
+        children: [Boolean(samples === null || samples === void 0 ? void 0 : samples.length) && samples.map(function (_ref9, index) {
           var _classnames, _classnames2;
 
-          var src = _ref10.src,
-              label = _ref10.label,
-              type = _ref10.type;
+          var src = _ref9.src,
+              label = _ref9.label,
+              type = _ref9.type;
           return (0, _jsxRuntime.jsxs)(_col.default, {
             span: sampleSpan,
             children: [(0, _jsxRuntime.jsx)("img", {
@@ -849,13 +850,13 @@ var UploadPhoto = function UploadPhoto(props) {
             children: buttonText || 'Upload'
           })
         })]
-      }), files.map(function (_ref11, index) {
+      }), files.map(function (_ref10, index) {
         var _classnames5;
 
-        var dataUrl = _ref11.dataUrl,
-            status = _ref11.status,
-            type = _ref11.type,
-            uid = _ref11.uid;
+        var dataUrl = _ref10.dataUrl,
+            status = _ref10.status,
+            type = _ref10.type,
+            uid = _ref10.uid;
         return (0, _jsxRuntime.jsx)(_badge.default, {
           count: getBadge(status, index, limit),
           children: (0, _jsxRuntime.jsxs)("div", {
@@ -923,10 +924,10 @@ function checkFileList(value) {
   return Promise.resolve();
 }
 
-UploadPhoto.formItemPropsHandler = function (_ref12) {
-  var limit = _ref12.limit,
-      previewFormater = _ref12.previewFormater,
-      label = _ref12.label;
+UploadPhoto.formItemPropsHandler = function (_ref11) {
+  var limit = _ref11.limit,
+      previewFormater = _ref11.previewFormater,
+      label = _ref11.label;
   return {
     previewFormater: previewFormater || function (value) {
       return (0, _jsxRuntime.jsx)(_uploadPreview.default, {

package/package.json

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