iglooform 2.5.50 → 2.5.52

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

@@ -87,7 +87,10 @@ var Step = function Step(_ref) {
       shouldRender = _ref.shouldRender,
       subscribedFields = _ref.subscribedFields,
       buttonText = _ref.buttonText,
-      validationRule = _ref.validationRule;
+      validationRule = _ref.validationRule,
+      asserts = _ref.asserts,
+      dependencies = _ref.dependencies,
+      shouldRenderCode = _ref.shouldRenderCode;
 
   var _useContext = (0, _react.useContext)(_locale.LocaleContext),
       formatMessage = _useContext.formatMessage,
@@ -122,6 +125,14 @@ var Step = function Step(_ref) {
     if (shouldRender || getButtonDisabledState) {
       registerDependencies(Array.isArray(subscribedFields) ? subscribedFields : 'SUBSCRIBE_ALL', dispatch);
     }
+
+    if (asserts === null || asserts === void 0 ? void 0 : asserts.length) {
+      var dependentField = asserts.map(function (_ref2) {
+        var field = _ref2.field;
+        return field;
+      });
+      registerDependencies(dependentField, dispatch);
+    }
   }, []);
   var pName = (0, _react.useMemo)(function () {
     return (0, _formUtils.calcNamePath)(parentName, name);
@@ -174,7 +185,7 @@ var Step = function Step(_ref) {
   };
 
   var handleNext = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
       var _allFields$filter;
 
       var allFields, allValues, fields, res, errors;
@@ -184,11 +195,11 @@ var Step = function Step(_ref) {
             case 0:
               allFields = (form === null || form === void 0 ? void 0 : form.getFieldsError()) || [];
               allValues = form === null || form === void 0 ? void 0 : form.getFieldsValue(true);
-              fields = allFields === null || allFields === void 0 ? void 0 : (_allFields$filter = allFields.filter(function (_ref3) {
-                var name = _ref3.name;
-                return name.join().startsWith(pName === null || pName === void 0 ? void 0 : pName.join());
-              })) === null || _allFields$filter === void 0 ? void 0 : _allFields$filter.map(function (_ref4) {
+              fields = allFields === null || allFields === void 0 ? void 0 : (_allFields$filter = allFields.filter(function (_ref4) {
                 var name = _ref4.name;
+                return name.join().startsWith(pName === null || pName === void 0 ? void 0 : pName.join());
+              })) === null || _allFields$filter === void 0 ? void 0 : _allFields$filter.map(function (_ref5) {
+                var name = _ref5.name;
                 return name;
               });
               _context.prev = 3;
@@ -273,11 +284,11 @@ var Step = function Step(_ref) {
     }));
 
     return function handleNext() {
-      return _ref2.apply(this, arguments);
+      return _ref3.apply(this, arguments);
     };
   }();
 
-  if (typeof shouldRender === 'function' && !shouldRender(form)) {
+  if (!(0, _formUtils.calcShouldRender)(pName, dependencies, asserts, shouldRender, shouldRenderCode, form)) {
     return null;
   }
 

package/lib/types.d.ts

@@ -123,6 +123,7 @@ export interface FormItemExtraConfig extends FormItemProps {
     maxLength?: number;
     idType?: 'KTP' | 'NIK';
     validationRule?: string;
+    shouldRenderCode?: string;
     [key: string]: any;
 }
 export interface FormItemConfig extends FormItemExtraConfig {

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