iglooform 2.5.50 → 2.5.52

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/es/utils/form-utils.d.ts

@@ -50,7 +50,7 @@ export declare const calcFormItemProps: (config: FormItemConfig, extraProps: For
     elementProps: {
         [key: string]: any;
     };
-    display: boolean;
+    display: any;
     previewFormater: ((value: any, form?: FormInstance<any> | undefined) => any) | undefined;
 };
 export declare const calcDisabled: (disabled?: boolean | FormItemAssert | FormItemAssert[] | undefined, form?: FormInstance<any> | undefined) => boolean;
@@ -72,5 +72,5 @@ export declare const calcSelectValue: (selectValue?: FormItemSelectValue[] | und
     value: any;
     disabled: boolean | undefined;
 };
-export declare const calcShouldRender: (dependencies?: NamePath[], asserts?: FormItemAssert[], shouldRender?: ((form?: FormInstance<any> | undefined) => boolean) | undefined, form?: FormInstance<any> | undefined) => boolean;
+export declare const calcShouldRender: (name: NamePath, dependencies?: NamePath[], asserts?: FormItemAssert[], shouldRender?: ((form?: FormInstance<any> | undefined) => boolean) | undefined, shouldRenderCode?: string | undefined, form?: FormInstance<any> | undefined) => any;
 export declare const getRuleValidation: (url: string, rule: string | string[], values?: any, lang?: string) => Promise<any>;

package/es/utils/form-utils.js

@@ -1,4 +1,4 @@
-var _excluded = ["type", "name", "required", "requiredAsserts", "showOptional", "rules", "initialValue", "normalize", "mergeRules", "getValueFromEvent", "getValueProps", "extra", "help", "label", "previewLabel", "extraLabel", "copyValue", "selectValue", "span", "halfRow", "fullRow", "valuePropName", "dependencies", "asserts", "messageVariables", "requiredMessage", "previewFormater", "disabled", "ignore", "shouldRender", "valueFormater", "antdDependencies", "dateLimitationType", "absoluteRangeEnd", "absoluteRangeStart", "relativeRangeStart", "relativeRangeEnd", "validationCode"],
+var _excluded = ["type", "name", "required", "requiredAsserts", "showOptional", "rules", "initialValue", "normalize", "mergeRules", "getValueFromEvent", "getValueProps", "extra", "help", "label", "previewLabel", "extraLabel", "copyValue", "selectValue", "span", "halfRow", "fullRow", "valuePropName", "dependencies", "asserts", "messageVariables", "requiredMessage", "previewFormater", "disabled", "ignore", "shouldRender", "valueFormater", "antdDependencies", "dateLimitationType", "absoluteRangeEnd", "absoluteRangeStart", "relativeRangeStart", "relativeRangeEnd", "validationCode", "shouldRenderCode"],
     _excluded2 = ["initialValue", "normalize", "rules", "extra", "help", "getValueFromEvent", "span", "valuePropName", "fullRow", "halfRow", "messageVariables", "requiredMessage", "previewFormater", "valueFormater", "required", "requiredMark", "className"];
 
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
@@ -207,6 +207,7 @@ export var calcFormItemProps = function calcFormItemProps(config, extraProps, fo
       relativeRangeEnd = config.relativeRangeEnd,
       _config$validationCod = config.validationCode,
       validationCode = _config$validationCod === void 0 ? [] : _config$validationCod,
+      shouldRenderCode = config.shouldRenderCode,
       rest = _objectWithoutProperties(config, _excluded);
 
   invariant(nameProp !== undefined || type === 'Divider' || type === 'Section' || type === 'Typography' || !type, "name property is required for form item config (type: ".concat(type, ")"));
@@ -428,7 +429,7 @@ export var calcFormItemProps = function calcFormItemProps(config, extraProps, fo
       dependencies: antdDependencies
     },
     elementProps: elementProps,
-    display: !ignore && calcShouldRender(dependencies, asserts, shouldRender, form),
+    display: !ignore && calcShouldRender(name, dependencies, asserts, shouldRender, shouldRenderCode, form),
     previewFormater: previewFormater || extraPreviewFormater
   };
 };
@@ -514,11 +515,12 @@ export var calcSelectValue = function calcSelectValue(selectValue, form) {
     selected: false
   };
 };
-export var calcShouldRender = function calcShouldRender() {
-  var dependencies = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-  var asserts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
-  var shouldRender = arguments.length > 2 ? arguments[2] : undefined;
-  var form = arguments.length > 3 ? arguments[3] : undefined;
+export var calcShouldRender = function calcShouldRender(name) {
+  var dependencies = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+  var asserts = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
+  var shouldRender = arguments.length > 3 ? arguments[3] : undefined;
+  var shouldRenderCode = arguments.length > 4 ? arguments[4] : undefined;
+  var form = arguments.length > 5 ? arguments[5] : undefined;
   if (!form) return true;
 
   var _iterator3 = _createForOfIteratorHelper(dependencies),
@@ -538,6 +540,26 @@ export var calcShouldRender = function calcShouldRender() {
     _iterator3.f();
   }
 
+  if (typeof shouldRender === 'function') {
+    return shouldRender(form);
+  }
+
+  if (shouldRenderCode) {
+    var fn = eval(shouldRenderCode);
+
+    if (typeof fn === 'function') {
+      try {
+        var value = form.getFieldValue(name);
+        var values = form.getFieldsValue(true);
+        return fn(value, values, {
+          moment: moment
+        });
+      } catch (_unused2) {
+        return false;
+      }
+    }
+  }
+
   var _iterator4 = _createForOfIteratorHelper(asserts),
       _step4;
 
@@ -553,10 +575,6 @@ export var calcShouldRender = function calcShouldRender() {
     _iterator4.f();
   }
 
-  if (typeof shouldRender === 'function' && !shouldRender(form)) {
-    return false;
-  }
-
   return true;
 };
 export var getRuleValidation = /*#__PURE__*/function () {

package/lib/date-picker/index.d.ts

@@ -1,8 +1,11 @@
 import { DatePickerProps, RangePickerProps, MonthPickerProps, WeekPickerProps } from 'antd/es/date-picker';
 import { FC, IglooComponentProps } from '../types';
+import { Moment } from 'moment';
 import './style/index.less';
 export { default as IglooBuddhistDatePicker } from './buddhist';
-declare type Props = DatePickerProps & IglooComponentProps;
+declare type Props = Omit<DatePickerProps, 'value'> & IglooComponentProps & {
+    value?: Moment | null | 0;
+};
 declare const IglooDatePicker: FC<Props>;
 export default IglooDatePicker;
 export declare const IglooRangePicker: FC<RangePickerProps & IglooComponentProps>;

package/lib/date-picker/index.js

@@ -89,7 +89,7 @@ var IglooDatePicker = function IglooDatePicker(_ref) {
       setFocus = _useState2[1];
 
   return (0, _jsxRuntime.jsx)(_datePicker.default, _objectSpread(_objectSpread({}, (0, _omit.default)(props, _formMethods.default)), {}, {
-    value: (0, _moment.default)(value),
+    value: value || value === 0 ? (0, _moment.default)(value) : undefined,
     placeholder: placeholder || dateFormater,
     format: format || dateFormater,
     inputReadOnly: true,
@@ -116,7 +116,7 @@ IglooDatePicker.formItemPropsHandler = function (_ref2) {
       return (0, _moment.default)(value).format(format || dateFormater);
     },
     valueFormater: function valueFormater(value) {
-      return +(0, _moment.default)(value);
+      return value ? +(0, _moment.default)(value) : value;
     },
     'element-allowClear': false
   };

package/lib/form/element/index.js

@@ -121,7 +121,8 @@ var Element = function Element(_ref) {
         subscribedFields = config.subscribedFields,
         disabled = config.disabled,
         extraLabel = config.extraLabel,
-        requiredAsserts = config.requiredAsserts;
+        requiredAsserts = config.requiredAsserts,
+        shouldRenderCode = config.shouldRenderCode;
     var dependentField = dependencies || [];
 
     if (Array.isArray(subscribedFields)) {
@@ -153,7 +154,7 @@ var Element = function Element(_ref) {
       });
     }
 
-    if ((shouldRender || getOptions || typeof extraLabel === 'function') && !Array.isArray(subscribedFields)) {
+    if ((shouldRender || shouldRenderCode || getOptions || typeof extraLabel === 'function') && !Array.isArray(subscribedFields)) {
       dependentField.push('SUBSCRIBE_ALL');
     }
 

package/lib/form/hsteps/index.js

@@ -134,26 +134,45 @@ var HSteps = function HSteps(_ref) {
   (0, _react.useEffect)(function () {
     var subscribe = elements.some(function (_ref2) {
       var shouldRender = _ref2.shouldRender,
-          getButtonDisabledState = _ref2.getButtonDisabledState;
-      return Boolean(shouldRender) || Boolean(getButtonDisabledState);
+          getButtonDisabledState = _ref2.getButtonDisabledState,
+          shouldRenderCode = _ref2.shouldRenderCode;
+      return Boolean(shouldRender) || Boolean(getButtonDisabledState) || Boolean(shouldRenderCode);
     });
 
     if (subscribe) {
       Array.isArray(subscribedFields) ? registerDependencies(subscribedFields, dispatch) : registerDependencies('SUBSCRIBE_ALL', dispatch);
     }
+
+    var dependentField = [];
+    elements.forEach(function (_ref3) {
+      var asserts = _ref3.asserts;
+      if (!(asserts === null || asserts === void 0 ? void 0 : asserts.length)) return;
+      asserts.forEach(function (_ref4) {
+        var field = _ref4.field;
+        return dependentField.push(field);
+      });
+    });
+    dependentField.length && registerDependencies(dependentField, dispatch);
   }, []);
   (0, _react.useEffect)(function () {
     if (currentStep === undefined || currentStep === current) return;
     setCurrent(currentStep);
   }, [currentStep]);
-  var renderElements = elements.filter(function (step) {
-    (0, _invariant.default)(step.type === 'Step', 'Child of steps should be Step');
-    (0, _invariant.default)(!step.validationRule || getRuleValidationApi, 'Please provide getRuleValidationApi in Form props');
-    return typeof step.shouldRender !== 'function' || step.shouldRender(form);
+  var renderElements = elements.filter(function (_ref5) {
+    var type = _ref5.type,
+        curName = _ref5.name,
+        validationRule = _ref5.validationRule,
+        dependencies = _ref5.dependencies,
+        asserts = _ref5.asserts,
+        shouldRender = _ref5.shouldRender,
+        shouldRenderCode = _ref5.shouldRenderCode;
+    (0, _invariant.default)(type === 'Step', 'Child of steps should be Step');
+    (0, _invariant.default)(!validationRule || getRuleValidationApi, 'Please provide getRuleValidationApi in Form props');
+    return (0, _formUtils.calcShouldRender)((0, _formUtils.calcNamePath)((0, _formUtils.calcNamePath)(parentName, name), curName), dependencies, asserts, shouldRender, shouldRenderCode, form);
   });
 
   var handleNext = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
       var _allFields$filter;
 
       var allFields, allValues, _renderElements$curre, currentName, handleNext, validationRule, namePath, fields, _iterator, _step, collapseSection, res, errors;
@@ -166,11 +185,11 @@ var HSteps = function HSteps(_ref) {
               allValues = form === null || form === void 0 ? void 0 : form.getFieldsValue(true);
               _renderElements$curre = renderElements[current], currentName = _renderElements$curre.name, handleNext = _renderElements$curre.handleNext, validationRule = _renderElements$curre.validationRule;
               namePath = (0, _formUtils.calcNamePath)(name, currentName);
-              fields = allFields === null || allFields === void 0 ? void 0 : (_allFields$filter = allFields.filter(function (_ref4) {
-                var name = _ref4.name;
+              fields = allFields === null || allFields === void 0 ? void 0 : (_allFields$filter = allFields.filter(function (_ref7) {
+                var name = _ref7.name;
                 return name.join().startsWith(namePath === null || namePath === void 0 ? void 0 : namePath.join());
-              })) === null || _allFields$filter === void 0 ? void 0 : _allFields$filter.map(function (_ref5) {
-                var name = _ref5.name;
+              })) === null || _allFields$filter === void 0 ? void 0 : _allFields$filter.map(function (_ref8) {
+                var name = _ref8.name;
                 return name;
               });
               _context.prev = 5;
@@ -274,7 +293,7 @@ var HSteps = function HSteps(_ref) {
     }));
 
     return function handleNext() {
-      return _ref3.apply(this, arguments);
+      return _ref6.apply(this, arguments);
     };
   }();
 
@@ -421,14 +440,14 @@ var HSteps = function HSteps(_ref) {
               margin: 0
             },
             children: (0, _jsxRuntime.jsx)(_confirmation.default, {})
-          }), confirmations && Object.entries(confirmations).map(function (_ref6) {
-            var _ref7 = _slicedToArray(_ref6, 2),
-                key = _ref7[0],
-                _ref7$ = _ref7[1],
-                required = _ref7$.required,
-                _ref7$$confirmation = _ref7$.confirmation,
-                confirmation = _ref7$$confirmation === void 0 ? {} : _ref7$$confirmation,
-                requiredMessage = _ref7$.requiredMessage;
+          }), confirmations && Object.entries(confirmations).map(function (_ref9) {
+            var _ref10 = _slicedToArray(_ref9, 2),
+                key = _ref10[0],
+                _ref10$ = _ref10[1],
+                required = _ref10$.required,
+                _ref10$$confirmation = _ref10$.confirmation,
+                confirmation = _ref10$$confirmation === void 0 ? {} : _ref10$$confirmation,
+                requiredMessage = _ref10$.requiredMessage;
 
             return (0, _jsxRuntime.jsx)(_form.default.Item, {
               name: (0, _formUtils.calcNamePath)(parentName, key),

package/lib/form/steps/index.js

@@ -92,24 +92,41 @@ var Steps = function Steps(_ref) {
   (0, _react.useEffect)(function () {
     var subscribe = elements.some(function (_ref2) {
       var shouldRender = _ref2.shouldRender,
-          getButtonDisabledState = _ref2.getButtonDisabledState;
-      return Boolean(shouldRender) || Boolean(getButtonDisabledState);
+          getButtonDisabledState = _ref2.getButtonDisabledState,
+          shouldRenderCode = _ref2.shouldRenderCode;
+      return Boolean(shouldRender) || Boolean(getButtonDisabledState) || Boolean(shouldRenderCode);
     });
 
     if (subscribe) {
       Array.isArray(subscribedFields) ? registerDependencies(subscribedFields, dispatch) : registerDependencies('SUBSCRIBE_ALL', dispatch);
     }
+
+    var dependentField = [];
+    elements.forEach(function (_ref3) {
+      var asserts = _ref3.asserts;
+      if (!(asserts === null || asserts === void 0 ? void 0 : asserts.length)) return;
+      asserts.forEach(function (_ref4) {
+        var field = _ref4.field;
+        return dependentField.push(field);
+      });
+    });
+    dependentField.length && registerDependencies(dependentField, dispatch);
   }, []);
   (0, _react.useEffect)(function () {
     if (currentStep === undefined || currentStep === current) return;
     setCurrent(currentStep);
   }, [currentStep]);
-  var renderElements = elements.filter(function (step) {
-    return typeof step.shouldRender !== 'function' || step.shouldRender(form);
+  var renderElements = elements.filter(function (_ref5) {
+    var curName = _ref5.name,
+        dependencies = _ref5.dependencies,
+        asserts = _ref5.asserts,
+        shouldRender = _ref5.shouldRender,
+        shouldRenderCode = _ref5.shouldRenderCode;
+    return (0, _formUtils.calcShouldRender)((0, _formUtils.calcNamePath)((0, _formUtils.calcNamePath)(parentName, name), curName), dependencies, asserts, shouldRender, shouldRenderCode, form);
   });
 
   var handleNext = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
       var _allFields$filter;
 
       var allFields, allValues, _renderElements$curre, currentName, handleNext, validationRule, namePath, fields, res, errors;
@@ -122,11 +139,11 @@ var Steps = function Steps(_ref) {
               allValues = form === null || form === void 0 ? void 0 : form.getFieldsValue(true);
               _renderElements$curre = renderElements[current], currentName = _renderElements$curre.name, handleNext = _renderElements$curre.handleNext, validationRule = _renderElements$curre.validationRule;
               namePath = (0, _formUtils.calcNamePath)(name, currentName);
-              fields = allFields === null || allFields === void 0 ? void 0 : (_allFields$filter = allFields.filter(function (_ref4) {
-                var name = _ref4.name;
+              fields = allFields === null || allFields === void 0 ? void 0 : (_allFields$filter = allFields.filter(function (_ref7) {
+                var name = _ref7.name;
                 return name.join().startsWith(namePath === null || namePath === void 0 ? void 0 : namePath.join());
-              })) === null || _allFields$filter === void 0 ? void 0 : _allFields$filter.map(function (_ref5) {
-                var name = _ref5.name;
+              })) === null || _allFields$filter === void 0 ? void 0 : _allFields$filter.map(function (_ref8) {
+                var name = _ref8.name;
                 return name;
               });
               _context.prev = 5;
@@ -217,7 +234,7 @@ var Steps = function Steps(_ref) {
     }));
 
     return function handleNext() {
-      return _ref3.apply(this, arguments);
+      return _ref6.apply(this, arguments);
     };
   }();
 

package/lib/free-form/step/index.d.ts

@@ -16,7 +16,6 @@ export interface StepProps extends FormItemConfig {
     editButtonLabel?: string;
     disableEditButton?: boolean;
     buttonText?: string;
-    validationRule?: string;
 }
 declare const Step: FC<StepProps>;
 export default Step;