iglooform 3.0.2 → 3.0.3

package/lib/upload/index.js

@@ -50,10 +50,14 @@ var IglooUpload = function IglooUpload(props) {
   var dataUrlRef = (0, _react.useRef)([]);
   var _useContext = (0, _react.useContext)(_formContext.default),
     uploadApi = _useContext.uploadApi;
+  var _useContext2 = (0, _react.useContext)(_locale.LocaleContext),
+    formatMessage = _useContext2.formatMessage;
+  var staticMessage = formatMessage({
+    id: 'File Uploading'
+  });
   (0, _invariant.default)(typeof props.handleUpload === 'function' || uploadApi, '"handleUpload" should be a function. Or uploadApi should be set at Form/FreeForm');
   (0, _invariant.default)(!uploadApi || props.bizKey, '"bizKey" should be set if Upload is used with uploadApi');
-  var _props$value = props.value,
-    value = _props$value === void 0 ? [] : _props$value,
+  var value = props.value,
     limit = props.limit,
     limitErrorMessage = props.limitErrorMessage,
     descriptions = props.descriptions,
@@ -97,17 +101,7 @@ var IglooUpload = function IglooUpload(props) {
     containerRef = props.containerRef,
     placeholder = props.placeholder,
     rest = _objectWithoutProperties(props, _excluded);
-  var _useState = (0, _react.useState)(value.map(function (url, index) {
-      return {
-        url: url,
-        dataUrl: url,
-        status: 'success',
-        type: '',
-        name: "File".concat(index + 1),
-        size: 0,
-        uid: index
-      };
-    })),
+  var _useState = (0, _react.useState)([]),
     _useState2 = _slicedToArray(_useState, 2),
     files = _useState2[0],
     setFiles = _useState2[1];
@@ -132,8 +126,24 @@ var IglooUpload = function IglooUpload(props) {
       return;
     }
   });
-  var _useContext2 = (0, _react.useContext)(_locale.LocaleContext),
-    formatMessage = _useContext2.formatMessage;
+
+  // 有初始值的处理 (不是初始化)
+  (0, _react.useEffect)(function () {
+    if (Array.isArray(value) && value.length && files.length === 0) {
+      var _files = (value || []).map(function (url, index) {
+        return {
+          url: url,
+          dataUrl: url,
+          status: 'success',
+          type: '',
+          name: "File".concat(index + 1),
+          size: 0,
+          uid: index
+        };
+      });
+      setFiles(_files);
+    }
+  }, [value]);
   (0, _react.useEffect)(function () {
     return function () {
       dataUrlRef.current.forEach(function (dataUrl) {
@@ -142,8 +152,17 @@ var IglooUpload = function IglooUpload(props) {
     };
   }, []);
   (0, _react.useEffect)(function () {
-    if (!(value !== null && value !== void 0 && value.length) && !files.length) return;
+    if (!value && !files.length) return;
     if (files.length) {
+      var hasProcessing = files.find(function (f) {
+        return f.status === 'progress';
+      });
+      if (hasProcessing) {
+        onChange && onChange({
+          status: 'processing'
+        });
+        return;
+      }
       var urls = files.map(function (f) {
         var status = f.status,
           name = f.name,
@@ -154,13 +173,11 @@ var IglooUpload = function IglooUpload(props) {
             errorMsg: errorMsg
           };
         }
-        if (f.url || f.dataUrl) {
-          return f.url || f.dataUrl;
-        }
+        return f.url;
       });
       onChange && onChange(urls);
     } else {
-      onChange && onChange([]);
+      onChange && onChange(undefined);
     }
   }, [files]);
   (0, _invariant.default)(limit === undefined || limit > 0, "\"limit\" should be a pasitive number.");
@@ -534,6 +551,11 @@ var FileList = function FileList(_ref6) {
   return /*#__PURE__*/_reactDom.default.createPortal(children, containerRef.current);
 };
 function checkFileList(value) {
+  if ((value === null || value === void 0 ? void 0 : value.status) === 'processing') {
+    return Promise.reject((0, _locale.staticFormatMessage)({
+      id: 'File Uploading'
+    }));
+  }
   if (!value) {
     return Promise.resolve();
   }

package/lib/upload-photo/index.js

@@ -155,6 +155,9 @@ var UploadPhoto = function UploadPhoto(props) {
     setMasks = _useState6[1];
   var _useBreakpoint = useBreakpoint(),
     md = _useBreakpoint.md;
+  var staticMessage = formatMessage({
+    id: 'Photo Uploading'
+  });
   var mapFilesFromValue = function mapFilesFromValue(urls) {
     var _files = [];
     Promise.all(urls.map( /*#__PURE__*/function () {
@@ -199,6 +202,15 @@ var UploadPhoto = function UploadPhoto(props) {
   (0, _react.useEffect)(function () {
     if (!value && !files.length) return;
     if (files.length) {
+      var hasProcessing = files.find(function (f) {
+        return f.status === 'progress';
+      });
+      if (hasProcessing) {
+        onChange && onChange({
+          status: 'processing'
+        });
+        return;
+      }
       var urls = files.map(function (f) {
         var status = f.status,
           name = f.name,
@@ -209,13 +221,11 @@ var UploadPhoto = function UploadPhoto(props) {
             errorMsg: errorMsg
           };
         }
-        if (f.url || f.dataUrl) {
-          return f.url || f.dataUrl;
-        }
+        return f.url;
       });
       onChange && onChange(urls);
     } else {
-      onChange && onChange([]);
+      onChange && onChange(undefined);
     }
   }, [files]);
   var uploadId = (0, _react.useMemo)(function () {
@@ -687,6 +697,11 @@ var UploadPhoto = function UploadPhoto(props) {
   });
 };
 function checkFileList(value) {
+  if ((value === null || value === void 0 ? void 0 : value.status) === 'processing') {
+    return Promise.reject((0, _locale.staticFormatMessage)({
+      id: 'Photo Uploading'
+    }));
+  }
   if (!value) {
     return Promise.resolve();
   }

package/lib/utils/useAsyncEffect.d.ts

@@ -0,0 +1,3 @@
+import type { DependencyList } from 'react';
+declare function useAsyncEffect(effect: () => AsyncGenerator<void, void, void> | Promise<void>, deps?: DependencyList): void;
+export default useAsyncEffect;

package/package.json

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