iglooform 2.5.51 → 2.5.53

package/.idea/iglooform.iml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

package/.idea/misc.xml

@@ -0,0 +1,5 @@
+<project version="4">
+  <component name="ProjectRootManager">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>

package/.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/iglooform.iml" filepath="$PROJECT_DIR$/.idea/iglooform.iml" />
+    </modules>
+  </component>
+</project>

package/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

package/es/free-form/step/index.js

@@ -98,7 +98,7 @@ var Step = function Step(_ref) {
 
   invariant(!validationRule || getRuleValidationApi, 'Please provide getRuleValidationApi in Form props');
   useEffect(function () {
-    if (shouldRender || getButtonDisabledState) {
+    if (shouldRender || getButtonDisabledState || shouldRenderCode) {
       registerDependencies(Array.isArray(subscribedFields) ? subscribedFields : 'SUBSCRIBE_ALL', dispatch);
     }
 

package/es/input/email.js

@@ -10,6 +10,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 import { jsx as _jsx } from "react/jsx-runtime";
 import omit from 'omit.js';
 import formMethods from '../utils/form-methods';
+import { staticFormatMessage as formatMessage } from '../locale';
 import './style/index.less';
 
 var Email = function Email(props) {
@@ -18,11 +19,30 @@ var Email = function Email(props) {
   }, omit(props, formMethods)));
 };
 
-Email.formItemPropsHandler = function () {
+Email.formItemPropsHandler = function (config) {
+  var maxLength = config.maxLength,
+      label = config.label;
+  var rules = [{
+    type: 'email'
+  }];
+
+  if (maxLength !== undefined) {
+    rules.push({
+      validator: function validator(_, value) {
+        if (value === undefined || value === null || value === '' || String(value).length <= maxLength) return Promise.resolve();
+        return Promise.reject(formatMessage({
+          id: '{label} must be less than {maxLength} characters.',
+          values: {
+            maxLength: maxLength,
+            label: label
+          }
+        }));
+      }
+    });
+  }
+
   return {
-    rules: [{
-      type: 'email'
-    }]
+    rules: rules
   };
 };
 

package/es/input/text-area.js

@@ -1,14 +1,6 @@
 import "antd/es/input/style";
 import _Input from "antd/es/input";
 
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -82,7 +74,7 @@ var IglooTextArea = function IglooTextArea(props) {
     children: [_jsx(_Input.TextArea, _objectSpread(_objectSpread({
       className: classnames('igloo-input'),
       rows: 3
-    }, omit(props, [].concat(_toConsumableArray(formMethods), ['maxLength']))), {}, {
+    }, omit(props, formMethods)), {}, {
       onChange: function onChange(e) {
         return handleOnChange(e, onChangeProps, maxLength);
       }

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, {