@teamix/pro 1.2.5 → 1.2.6

package/dist/pro.js

@@ -3191,9 +3191,8 @@ function (_super) {
   });
   Object.defineProperty(Field.prototype, "required", {
     get: function get() {
-      var validators = (0,_formily_shared__WEBPACK_IMPORTED_MODULE_0__/* .isArr */ .H1)(this.validator) ? this.validator : (0,_formily_validator__WEBPACK_IMPORTED_MODULE_1__/* .parseValidatorDescriptions */ .oM)(this.validator);
-      return validators.some(function (desc) {
-        return !!(desc === null || desc === void 0 ? void 0 : desc['required']);
+      return (0,_formily_validator__WEBPACK_IMPORTED_MODULE_1__/* .parseValidatorDescriptions */ .oM)(this.validator).some(function (desc) {
+        return desc.required;
       });
     },
     set: function set(required) {
@@ -5267,7 +5266,6 @@ var queryFeedbacks = function queryFeedbacks(field, search) {
   });
 };
 var queryFeedbackMessages = function queryFeedbackMessages(field, search) {
-  if (!field.feedbacks.length) return [];
   return queryFeedbacks(field, search).reduce(function (buf, info) {
     return (0,_formily_shared__WEBPACK_IMPORTED_MODULE_0__/* .isEmpty */ .xb)(info.messages) ? buf : buf.concat(info.messages);
   }, []);
@@ -5309,10 +5307,6 @@ var updateFeedback = function updateFeedback(field, feedback) {
   });
 };
 var validateToFeedbacks = function validateToFeedbacks(field, triggerType) {
-  if (triggerType === void 0) {
-    triggerType = 'onInput';
-  }
-
   return __awaiter(void 0, void 0, void 0, function () {
     var results;
     return __generator(this, function (_a) {
@@ -5349,29 +5343,46 @@ var validateToFeedbacks = function validateToFeedbacks(field, triggerType) {
   });
 };
 var setValidatorRule = function setValidatorRule(field, name, value) {
-  var _a;
+  var _a, _b;
 
   if (!(0,_formily_shared__WEBPACK_IMPORTED_MODULE_0__/* .isValid */ .JY)(value)) return;
-  var validators = (0,_formily_validator__WEBPACK_IMPORTED_MODULE_1__/* .parseValidatorDescriptions */ .oM)(field.validator);
-  var hasRule = validators.some(function (desc) {
+  var hasRule = (0,_formily_validator__WEBPACK_IMPORTED_MODULE_1__/* .parseValidatorDescriptions */ .oM)(field.validator).some(function (desc) {
     return name in desc;
   });
   var rule = (_a = {}, _a[name] = value, _a);
 
   if (hasRule) {
-    field.validator = validators.map(function (desc) {
-      if ((0,_formily_shared__WEBPACK_IMPORTED_MODULE_0__/* .isPlainObj */ .Uk)(desc) && hasOwnProperty.call(desc, name)) {
-        desc[name] = value;
-        return desc;
-      }
+    if ((0,_formily_shared__WEBPACK_IMPORTED_MODULE_0__/* .isArr */ .H1)(field.validator)) {
+      field.validator = field.validator.map(function (desc) {
+        if ((0,_formily_shared__WEBPACK_IMPORTED_MODULE_0__/* .isPlainObj */ .Uk)(desc) && hasOwnProperty.call(desc, name)) {
+          desc[name] = value;
+          return desc;
+        }
 
-      return desc;
-    });
+        return desc;
+      });
+    } else if ((0,_formily_shared__WEBPACK_IMPORTED_MODULE_0__/* .isPlainObj */ .Uk)(field.validator)) {
+      field.validator[name] = value;
+    } else {
+      field.validator = (_b = {}, _b[name] = value, _b);
+    }
   } else {
-    if (name === 'required') {
-      field.validator = [rule].concat(validators);
+    if ((0,_formily_shared__WEBPACK_IMPORTED_MODULE_0__/* .isArr */ .H1)(field.validator)) {
+      if (name === 'required') {
+        field.validator.unshift(rule);
+      } else {
+        field.validator.push(rule);
+      }
     } else {
-      field.validator = validators.concat(rule);
+      if (name === 'required') {
+        field.validator = [rule, field.validator];
+      } else if ((0,_formily_shared__WEBPACK_IMPORTED_MODULE_0__/* .isPlainObj */ .Uk)(field.validator)) {
+        field.validator[name] = value;
+      } else if (field.validator) {
+        field.validator = [field.validator, rule];
+      } else {
+        field.validator = rule;
+      }
     }
   }
 };
@@ -8002,7 +8013,6 @@ var setSchemaFieldState = function setSchemaFieldState(options, demand) {
   var _a = options || {},
       request = _a.request,
       target = _a.target,
-      runner = _a.runner,
       field = _a.field,
       scope = _a.scope;
 
@@ -8024,14 +8034,6 @@ var setSchemaFieldState = function setSchemaFieldState(options, demand) {
         }), demand);
       });
     }
-
-    if ((0,_formily_shared__WEBPACK_IMPORTED_MODULE_1__/* .isStr */ .d8)(runner) && runner) {
-      field.form.setFieldState(target, function (state) {
-        (0,_compiler__WEBPACK_IMPORTED_MODULE_3__/* .shallowCompile */ .eC)("{{function(){".concat(runner, "}}}"), __assign(__assign({}, scope), {
-          $target: state
-        }))();
-      });
-    }
   } else {
     if (request.state) {
       field.setState(function (state) {
@@ -8044,10 +8046,6 @@ var setSchemaFieldState = function setSchemaFieldState(options, demand) {
         return (0,_compiler__WEBPACK_IMPORTED_MODULE_3__/* .patchSchemaCompile */ .Nc)(state, request.schema, scope, demand);
       });
     }
-
-    if ((0,_formily_shared__WEBPACK_IMPORTED_MODULE_1__/* .isStr */ .d8)(runner) && runner) {
-      (0,_compiler__WEBPACK_IMPORTED_MODULE_3__/* .shallowCompile */ .eC)("{{function(){".concat(runner, "}}}"), scope)();
-    }
   }
 };
 
@@ -8095,10 +8093,10 @@ var getBaseReactions = function getBaseReactions(schema, options) {
 };
 
 var getUserReactions = function getUserReactions(schema, options) {
-  var reactions = (0,_formily_shared__WEBPACK_IMPORTED_MODULE_1__/* .toArr */ ._K)(schema['x-reactions']);
-  return reactions.map(function (unCompiled) {
-    return function (field) {
-      var baseScope = getBaseScope(field, options);
+  return function (field) {
+    var reactions = (0,_formily_shared__WEBPACK_IMPORTED_MODULE_1__/* .toArr */ ._K)(schema['x-reactions']);
+    var baseScope = getBaseScope(field, options);
+    reactions.forEach(function (unCompiled) {
       var reaction = (0,_compiler__WEBPACK_IMPORTED_MODULE_3__/* .shallowCompile */ .eC)(unCompiled, baseScope);
       if (!reaction) return;
 
@@ -8130,9 +8128,12 @@ var getUserReactions = function getUserReactions(schema, options) {
           field: field,
           target: target,
           request: request,
-          runner: runner,
           scope: scope
         });
+
+        if ((0,_formily_shared__WEBPACK_IMPORTED_MODULE_1__/* .isStr */ .d8)(runner)) {
+          (0,_compiler__WEBPACK_IMPORTED_MODULE_3__/* .shallowCompile */ .eC)("{{function(){".concat(runner, "}}}"), scope)();
+        }
       };
 
       if (target) {
@@ -8152,14 +8153,14 @@ var getUserReactions = function getUserReactions(schema, options) {
       } else {
         run();
       }
-    };
-  });
+    });
+  };
 };
 
 var transformFieldProps = function transformFieldProps(schema, options) {
   return {
     name: schema.name,
-    reactions: [getBaseReactions(schema, options)].concat(getUserReactions(schema, options))
+    reactions: [getBaseReactions(schema, options), getUserReactions(schema, options)]
   };
 };
 
@@ -9854,17 +9855,17 @@ var isEqual = function isEqual(a, b) {
     var arrA = isArray(a);
     var arrB = isArray(b);
     var i = void 0;
-    var length = void 0;
+    var length_1;
     var key = void 0;
 
     if (arrA && arrB) {
-      length = a.length;
+      length_1 = a.length;
 
-      if (length !== b.length) {
+      if (length_1 !== b.length) {
         return false;
       }
 
-      for (i = length; i-- !== 0;) {
+      for (i = length_1; i-- !== 0;) {
         if (!isEqual(a[i], b[i])) {
           return false;
         }
@@ -9878,19 +9879,19 @@ var isEqual = function isEqual(a, b) {
     }
 
     var keys = keyList(a);
-    length = keys.length;
+    length_1 = keys.length;
 
-    if (length !== keyList(b).length) {
+    if (length_1 !== keyList(b).length) {
       return false;
     }
 
-    for (i = length; i-- !== 0;) {
+    for (i = length_1; i-- !== 0;) {
       if (!hasProp.call(b, keys[i])) {
         return false;
       }
     }
 
-    for (i = length; i-- !== 0;) {
+    for (i = length_1; i-- !== 0;) {
       key = keys[i];
 
       if (!isEqual(a[key], b[key])) {
@@ -10761,24 +10762,24 @@ var ReactiveInternal = function ReactiveInternal(props) {
   }
 
   var field = props.field;
-  var content = mergeChildren(renderChildren(props.children, field, field.form), (_a = field.content) !== null && _a !== void 0 ? _a : field.componentProps.children);
+  var content = mergeChildren(renderChildren(props.children, field, field.form), (_a = field.content) !== null && _a !== void 0 ? _a : field.component[1].children);
   if (field.display !== 'visible') return null;
 
   var renderDecorator = function renderDecorator(children) {
     var _a;
 
-    if (!field.decoratorType) {
+    if (!field.decorator[0]) {
       return react__WEBPACK_IMPORTED_MODULE_0___default().createElement(react__WEBPACK_IMPORTED_MODULE_0__.Fragment, null, children);
     }
 
-    var finalComponent = (_a = _formily_shared__WEBPACK_IMPORTED_MODULE_3__/* .FormPath.getIn */ .Dm.getIn(options === null || options === void 0 ? void 0 : options.components, field.decoratorType)) !== null && _a !== void 0 ? _a : field.decoratorType;
-    return react__WEBPACK_IMPORTED_MODULE_0___default().createElement(finalComponent, (0,_formily_reactive__WEBPACK_IMPORTED_MODULE_1__.toJS)(field.decoratorProps), children);
+    var finalComponent = (_a = _formily_shared__WEBPACK_IMPORTED_MODULE_3__/* .FormPath.getIn */ .Dm.getIn(options === null || options === void 0 ? void 0 : options.components, field.decorator[0])) !== null && _a !== void 0 ? _a : field.decorator[0];
+    return react__WEBPACK_IMPORTED_MODULE_0___default().createElement(finalComponent, (0,_formily_reactive__WEBPACK_IMPORTED_MODULE_1__.toJS)(field.decorator[1]), children);
   };
 
   var renderComponent = function renderComponent() {
     var _a, _b, _c, _d;
 
-    if (!field.componentType) return content;
+    if (!field.component[0]) return content;
     var value = !(0,_formily_core__WEBPACK_IMPORTED_MODULE_4__.isVoidField)(field) ? field.value : undefined;
     var onChange = !(0,_formily_core__WEBPACK_IMPORTED_MODULE_4__.isVoidField)(field) ? function () {
       var _a, _b;
@@ -10790,8 +10791,8 @@ var ReactiveInternal = function ReactiveInternal(props) {
       }
 
       field.onInput.apply(field, __spreadArray([], __read(args), false));
-      (_b = (_a = field.componentProps) === null || _a === void 0 ? void 0 : _a.onChange) === null || _b === void 0 ? void 0 : _b.call.apply(_b, __spreadArray([_a], __read(args), false));
-    } : (_a = field.componentProps) === null || _a === void 0 ? void 0 : _a.onChange;
+      (_b = (_a = field.component[1]) === null || _a === void 0 ? void 0 : _a.onChange) === null || _b === void 0 ? void 0 : _b.call.apply(_b, __spreadArray([_a], __read(args), false));
+    } : (_a = field.component[1]) === null || _a === void 0 ? void 0 : _a.onChange;
     var onFocus = !(0,_formily_core__WEBPACK_IMPORTED_MODULE_4__.isVoidField)(field) ? function () {
       var _a, _b;
 
@@ -10802,8 +10803,8 @@ var ReactiveInternal = function ReactiveInternal(props) {
       }
 
       field.onFocus.apply(field, __spreadArray([], __read(args), false));
-      (_b = (_a = field.componentProps) === null || _a === void 0 ? void 0 : _a.onFocus) === null || _b === void 0 ? void 0 : _b.call.apply(_b, __spreadArray([_a], __read(args), false));
-    } : (_b = field.componentProps) === null || _b === void 0 ? void 0 : _b.onFocus;
+      (_b = (_a = field.component[1]) === null || _a === void 0 ? void 0 : _a.onFocus) === null || _b === void 0 ? void 0 : _b.call.apply(_b, __spreadArray([_a], __read(args), false));
+    } : (_b = field.component[1]) === null || _b === void 0 ? void 0 : _b.onFocus;
     var onBlur = !(0,_formily_core__WEBPACK_IMPORTED_MODULE_4__.isVoidField)(field) ? function () {
       var _a, _b;
 
@@ -10814,15 +10815,15 @@ var ReactiveInternal = function ReactiveInternal(props) {
       }
 
       field.onBlur.apply(field, __spreadArray([], __read(args), false));
-      (_b = (_a = field.componentProps) === null || _a === void 0 ? void 0 : _a.onBlur) === null || _b === void 0 ? void 0 : _b.call.apply(_b, __spreadArray([_a], __read(args), false));
-    } : (_c = field.componentProps) === null || _c === void 0 ? void 0 : _c.onBlur;
+      (_b = (_a = field.component[1]) === null || _a === void 0 ? void 0 : _a.onBlur) === null || _b === void 0 ? void 0 : _b.call.apply(_b, __spreadArray([_a], __read(args), false));
+    } : (_c = field.component[1]) === null || _c === void 0 ? void 0 : _c.onBlur;
     var disabled = !(0,_formily_core__WEBPACK_IMPORTED_MODULE_4__.isVoidField)(field) ? field.pattern === 'disabled' || field.pattern === 'readPretty' : undefined;
     var readOnly = !(0,_formily_core__WEBPACK_IMPORTED_MODULE_4__.isVoidField)(field) ? field.pattern === 'readOnly' : undefined;
-    var finalComponent = (_d = _formily_shared__WEBPACK_IMPORTED_MODULE_3__/* .FormPath.getIn */ .Dm.getIn(options === null || options === void 0 ? void 0 : options.components, field.componentType)) !== null && _d !== void 0 ? _d : field.componentType;
+    var finalComponent = (_d = _formily_shared__WEBPACK_IMPORTED_MODULE_3__/* .FormPath.getIn */ .Dm.getIn(options === null || options === void 0 ? void 0 : options.components, field.component[0])) !== null && _d !== void 0 ? _d : field.component[0];
     return react__WEBPACK_IMPORTED_MODULE_0___default().createElement(finalComponent, __assign(__assign({
       disabled: disabled,
       readOnly: readOnly
-    }, (0,_formily_reactive__WEBPACK_IMPORTED_MODULE_1__.toJS)(field.componentProps)), {
+    }, (0,_formily_reactive__WEBPACK_IMPORTED_MODULE_1__.toJS)(field.component[1])), {
       value: value,
       onChange: onChange,
       onFocus: onFocus,
@@ -10915,11 +10916,7 @@ var RecursionField = function RecursionField(props) {
 
   var renderProperties = function renderProperties(field) {
     if (props.onlyRenderSelf) return;
-    var properties = _formily_json_schema__WEBPACK_IMPORTED_MODULE_2__/* .Schema.getOrderProperties */ .V.getOrderProperties(fieldSchema);
-    if (!properties.length) return;
-    return react__WEBPACK_IMPORTED_MODULE_0___default().createElement(react__WEBPACK_IMPORTED_MODULE_0__.Fragment, null, properties.map(function (_a, index) {
-      var item = _a.schema,
-          name = _a.key;
+    return react__WEBPACK_IMPORTED_MODULE_0___default().createElement(react__WEBPACK_IMPORTED_MODULE_0__.Fragment, null, fieldSchema.mapProperties(function (item, name, index) {
       var base = (field === null || field === void 0 ? void 0 : field.address) || basePath;
       var schema = item;
 
@@ -12223,60 +12220,10 @@ var box = (0,_internals__WEBPACK_IMPORTED_MODULE_1__/* .createAnnotation */ .Bh)
 /* harmony import */ var _environment__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(4756);
 /* harmony import */ var _internals__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(26755);
 /* harmony import */ var _tree__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(85755);
-/* harmony import */ var _checkers__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(56893);
-/* harmony import */ var _reaction__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(91476);
-var __read = undefined && undefined.__read || function (o, n) {
-  var m = typeof Symbol === "function" && o[Symbol.iterator];
-  if (!m) return o;
-  var i = m.call(o),
-      r,
-      ar = [],
-      e;
-
-  try {
-    while ((n === void 0 || n-- > 0) && !(r = i.next()).done) {
-      ar.push(r.value);
-    }
-  } catch (error) {
-    e = {
-      error: error
-    };
-  } finally {
-    try {
-      if (r && !r.done && (m = i["return"])) m.call(i);
-    } finally {
-      if (e) throw e.error;
-    }
-  }
-
-  return ar;
-};
-
-
-
-
-
-
-var getDescriptor = Object.getOwnPropertyDescriptor;
-var getProto = Object.getPrototypeOf;
+/* harmony import */ var _reaction__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(91476);
 
-function getGetterAndSetter(target, key, value) {
-  if (!target) {
-    if (value) {
-      if ((0,_checkers__WEBPACK_IMPORTED_MODULE_3__/* .isFn */ .LQ)(value)) {
-        return [value];
-      } else {
-        return [value.get, value.set];
-      }
-    }
 
-    return [];
-  }
 
-  var descriptor = getDescriptor(target, key);
-  if (descriptor) return [descriptor.get, descriptor.set];
-  return getGetterAndSetter(getProto(target), key, value);
-}
 
 var computed = (0,_internals__WEBPACK_IMPORTED_MODULE_1__/* .createAnnotation */ .Bh)(function (_a) {
   var target = _a.target,
@@ -12286,18 +12233,40 @@ var computed = (0,_internals__WEBPACK_IMPORTED_MODULE_1__/* .createAnnotation */
   var proxy = {};
   var context = target ? target : store;
   var property = target ? key : 'value';
+  var getter = getGetter(context);
+  var setter = getSetter(context);
+
+  function getGetter(target) {
+    if (!target) {
+      if (value === null || value === void 0 ? void 0 : value.get) return value === null || value === void 0 ? void 0 : value.get;
+      return value;
+    }
+
+    var descriptor = Object.getOwnPropertyDescriptor(target, property);
+    if (descriptor === null || descriptor === void 0 ? void 0 : descriptor.get) return descriptor.get;
+    return getGetter(Object.getPrototypeOf(target));
+  }
 
-  var _b = __read(getGetterAndSetter(context, property, value), 2),
-      getter = _b[0],
-      setter = _b[1];
+  function getSetter(target) {
+    if (!target) {
+      if (value === null || value === void 0 ? void 0 : value.set) return value === null || value === void 0 ? void 0 : value.set;
+      return;
+    }
+
+    var descriptor = Object.getOwnPropertyDescriptor(target, property);
+    if (descriptor === null || descriptor === void 0 ? void 0 : descriptor.set) return descriptor.set;
+    return getSetter(Object.getPrototypeOf(target));
+  }
 
   function compute() {
-    store.value = getter === null || getter === void 0 ? void 0 : getter.call(context);
+    var _a;
+
+    store.value = (_a = getter === null || getter === void 0 ? void 0 : getter.call) === null || _a === void 0 ? void 0 : _a.call(getter, context);
   }
 
   function reaction() {
     if (_environment__WEBPACK_IMPORTED_MODULE_0__/* .ReactionStack.indexOf */ .eA.indexOf(reaction) === -1) {
-      (0,_reaction__WEBPACK_IMPORTED_MODULE_4__/* .releaseBindingReactions */ .cD)(reaction);
+      (0,_reaction__WEBPACK_IMPORTED_MODULE_3__/* .releaseBindingReactions */ .cD)(reaction);
 
       try {
         _environment__WEBPACK_IMPORTED_MODULE_0__/* .ReactionStack.push */ .eA.push(reaction);
@@ -12312,25 +12281,30 @@ var computed = (0,_internals__WEBPACK_IMPORTED_MODULE_1__/* .createAnnotation */
 
   reaction._scheduler = function () {
     reaction._dirty = true;
-    (0,_reaction__WEBPACK_IMPORTED_MODULE_4__/* .runReactionsFromTargetKey */ .cL)({
+    (0,_reaction__WEBPACK_IMPORTED_MODULE_3__/* .batchStart */ .o$)();
+    (0,_reaction__WEBPACK_IMPORTED_MODULE_3__/* .runReactionsFromTargetKey */ .cL)({
       target: context,
       key: property,
       value: store.value,
       type: 'set'
     });
+    (0,_reaction__WEBPACK_IMPORTED_MODULE_3__/* .batchEnd */ .ks)();
   };
 
   reaction._isComputed = true;
   reaction._dirty = true;
   reaction._context = context;
   reaction._property = property;
+  _environment__WEBPACK_IMPORTED_MODULE_0__/* .ProxyRaw.set */ .wX.set(proxy, store);
+  _environment__WEBPACK_IMPORTED_MODULE_0__/* .RawProxy.set */ .dv.set(store, proxy);
+  (0,_tree__WEBPACK_IMPORTED_MODULE_2__/* .buildDataTree */ .Kv)(target, key, store);
 
   function get() {
-    if ((0,_reaction__WEBPACK_IMPORTED_MODULE_4__/* .hasRunningReaction */ .YX)()) {
-      (0,_reaction__WEBPACK_IMPORTED_MODULE_4__/* .bindComputedReactions */ .g3)(reaction);
+    if ((0,_reaction__WEBPACK_IMPORTED_MODULE_3__/* .hasRunningReaction */ .YX)()) {
+      (0,_reaction__WEBPACK_IMPORTED_MODULE_3__/* .bindComputedReactions */ .g3)(reaction);
     }
 
-    if (!(0,_reaction__WEBPACK_IMPORTED_MODULE_4__/* .isUntracking */ .Im)()) {
+    if (!(0,_reaction__WEBPACK_IMPORTED_MODULE_3__/* .isUntracking */ .Im)()) {
       //如果允许untracked过程中收集依赖，那么永远不会存在绑定，因为_dirty已经设置为false
       if (reaction._dirty) {
         reaction();
@@ -12340,7 +12314,7 @@ var computed = (0,_internals__WEBPACK_IMPORTED_MODULE_1__/* .createAnnotation */
       compute();
     }
 
-    (0,_reaction__WEBPACK_IMPORTED_MODULE_4__/* .bindTargetKeyWithCurrentReaction */ .q0)({
+    (0,_reaction__WEBPACK_IMPORTED_MODULE_3__/* .bindTargetKeyWithCurrentReaction */ .q0)({
       target: context,
       key: property,
       type: 'get'
@@ -12349,11 +12323,13 @@ var computed = (0,_internals__WEBPACK_IMPORTED_MODULE_1__/* .createAnnotation */
   }
 
   function set(value) {
+    var _a;
+
     try {
-      (0,_reaction__WEBPACK_IMPORTED_MODULE_4__/* .batchStart */ .o$)();
-      setter === null || setter === void 0 ? void 0 : setter.call(context, value);
+      (0,_reaction__WEBPACK_IMPORTED_MODULE_3__/* .batchStart */ .o$)();
+      (_a = setter === null || setter === void 0 ? void 0 : setter.call) === null || _a === void 0 ? void 0 : _a.call(setter, context, value);
     } finally {
-      (0,_reaction__WEBPACK_IMPORTED_MODULE_4__/* .batchEnd */ .ks)();
+      (0,_reaction__WEBPACK_IMPORTED_MODULE_3__/* .batchEnd */ .ks)();
     }
   }
 
@@ -12361,7 +12337,8 @@ var computed = (0,_internals__WEBPACK_IMPORTED_MODULE_1__/* .createAnnotation */
     Object.defineProperty(target, key, {
       get: get,
       set: set,
-      enumerable: true
+      enumerable: true,
+      configurable: false
     });
     return target;
   } else {
@@ -12369,9 +12346,6 @@ var computed = (0,_internals__WEBPACK_IMPORTED_MODULE_1__/* .createAnnotation */
       set: set,
       get: get
     });
-    (0,_tree__WEBPACK_IMPORTED_MODULE_2__/* .buildDataTree */ .Kv)(target, key, store);
-    _environment__WEBPACK_IMPORTED_MODULE_0__/* .ProxyRaw.set */ .wX.set(proxy, store);
-    _environment__WEBPACK_IMPORTED_MODULE_0__/* .RawProxy.set */ .dv.set(store, proxy);
   }
 
   return proxy;
@@ -12485,6 +12459,9 @@ var ref = (0,_internals__WEBPACK_IMPORTED_MODULE_1__/* .createAnnotation */ .Bh)
   var proxy = {};
   var context = target ? target : store;
   var property = target ? key : 'value';
+  (0,_tree__WEBPACK_IMPORTED_MODULE_2__/* .buildDataTree */ .Kv)(target, key, store);
+  _environment__WEBPACK_IMPORTED_MODULE_0__/* .ProxyRaw.set */ .wX.set(proxy, store);
+  _environment__WEBPACK_IMPORTED_MODULE_0__/* .RawProxy.set */ .dv.set(store, proxy);
 
   function get() {
     (0,_reaction__WEBPACK_IMPORTED_MODULE_3__/* .bindTargetKeyWithCurrentReaction */ .q0)({
@@ -12514,7 +12491,8 @@ var ref = (0,_internals__WEBPACK_IMPORTED_MODULE_1__/* .createAnnotation */ .Bh)
     Object.defineProperty(target, key, {
       get: get,
       set: set,
-      enumerable: true
+      enumerable: true,
+      configurable: false
     });
     return target;
   } else {
@@ -12522,9 +12500,6 @@ var ref = (0,_internals__WEBPACK_IMPORTED_MODULE_1__/* .createAnnotation */ .Bh)
       set: set,
       get: get
     });
-    (0,_tree__WEBPACK_IMPORTED_MODULE_2__/* .buildDataTree */ .Kv)(target, key, store);
-    _environment__WEBPACK_IMPORTED_MODULE_0__/* .ProxyRaw.set */ .wX.set(proxy, store);
-    _environment__WEBPACK_IMPORTED_MODULE_0__/* .RawProxy.set */ .dv.set(store, proxy);
   }
 
   return proxy;
@@ -12609,7 +12584,6 @@ function () {
       value = [];
     }
 
-    this.batchDeleting = false;
     this.value = value;
   }
 
@@ -12624,8 +12598,6 @@ function () {
   };
 
   ArraySet.prototype["delete"] = function (item) {
-    if (this.batchDeleting) return; //批量删除时禁止单独删除，会影响计数执行器
-
     var index = this.value.indexOf(item);
 
     if (index > -1) {
@@ -12643,7 +12615,6 @@ function () {
 
   ArraySet.prototype.forEachDelete = function (callback) {
     if (this.value.length === 0) return;
-    this.batchDeleting = true;
 
     for (var index = 0; index < this.value.length; index++) {
       var item = this.value[index];
@@ -12651,8 +12622,6 @@ function () {
       callback(item);
       index--;
     }
-
-    this.batchDeleting = false;
   };
 
   ArraySet.prototype.clear = function () {
@@ -12805,12 +12774,10 @@ var reaction = function reaction(tracker, subscriber, options) {
 
   var fireAction = function fireAction() {
     try {
-      (0,_reaction__WEBPACK_IMPORTED_MODULE_0__/* .untrackStart */ .aN)();
       (0,_reaction__WEBPACK_IMPORTED_MODULE_0__/* .batchStart */ .o$)();
       if ((0,_checkers__WEBPACK_IMPORTED_MODULE_1__/* .isFn */ .LQ)(subscriber)) subscriber(value.currentValue, value.oldValue);
     } finally {
       (0,_reaction__WEBPACK_IMPORTED_MODULE_0__/* .batchEnd */ .ks)();
-      (0,_reaction__WEBPACK_IMPORTED_MODULE_0__/* .untrackEnd */ .Pq)();
     }
   };
 
@@ -12894,7 +12861,6 @@ batch.endpoint = function (callback) {
 /* harmony export */   "gK": () => (/* binding */ isCollectionType),
 /* harmony export */   "Yq": () => (/* binding */ isNormalType)
 /* harmony export */ });
-var toString = Object.prototype.toString;
 var isMap = function isMap(val) {
   return val && val instanceof Map;
 };
@@ -12912,7 +12878,7 @@ var isFn = function isFn(val) {
 };
 var isArr = Array.isArray;
 var isPlainObj = function isPlainObj(val) {
-  return toString.call(val) === '[object Object]';
+  return Object.prototype.toString.call(val) === '[object Object]';
 };
 var isValid = function isValid(val) {
   return val !== null && val !== undefined;
@@ -12992,8 +12958,6 @@ var ObserverListeners = new _array__WEBPACK_IMPORTED_MODULE_0__/* .ArraySet */ .
 /* harmony export */ });
 /* harmony import */ var _checkers__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(56893);
 /* harmony import */ var _environment__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(4756);
-/* harmony import */ var _tree__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(85755);
-
 
 
 var RAW_TYPE = Symbol('RAW_TYPE');
@@ -13114,8 +13078,8 @@ var contains = function contains(target, property) {
   var targetRaw = _environment__WEBPACK_IMPORTED_MODULE_1__/* .ProxyRaw.get */ .wX.get(target) || target;
   var propertyRaw = _environment__WEBPACK_IMPORTED_MODULE_1__/* .ProxyRaw.get */ .wX.get(property) || property;
   if (targetRaw === propertyRaw) return true;
-  var targetNode = (0,_tree__WEBPACK_IMPORTED_MODULE_2__/* .getDataNode */ .bl)(targetRaw);
-  var propertyNode = (0,_tree__WEBPACK_IMPORTED_MODULE_2__/* .getDataNode */ .bl)(propertyRaw);
+  var targetNode = _environment__WEBPACK_IMPORTED_MODULE_1__/* .RawNode.get */ .xO.get(targetRaw);
+  var propertyNode = _environment__WEBPACK_IMPORTED_MODULE_1__/* .RawNode.get */ .xO.get(propertyRaw);
   if (!targetNode) return false;
   if (!propertyNode) return false;
   return targetNode.contains(propertyNode);
@@ -13538,9 +13502,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   "toJS": () => (/* reexport safe */ _externals__WEBPACK_IMPORTED_MODULE_8__.ZN),
 /* harmony export */   "DataChange": () => (/* reexport safe */ _types__WEBPACK_IMPORTED_MODULE_9__.UH),
 /* harmony export */   "DataNode": () => (/* reexport safe */ _types__WEBPACK_IMPORTED_MODULE_9__.RQ),
-/* harmony export */   "buildDataTree": () => (/* reexport safe */ _types__WEBPACK_IMPORTED_MODULE_9__.Kv),
-/* harmony export */   "getDataNode": () => (/* reexport safe */ _types__WEBPACK_IMPORTED_MODULE_9__.bl),
-/* harmony export */   "setDataNode": () => (/* reexport safe */ _types__WEBPACK_IMPORTED_MODULE_9__.Oe)
+/* harmony export */   "buildDataTree": () => (/* reexport safe */ _types__WEBPACK_IMPORTED_MODULE_9__.Kv)
 /* harmony export */ });
 /* harmony import */ var _batch__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1713);
 /* harmony import */ var _action__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(65483);
@@ -13627,7 +13589,7 @@ var createObservable = function createObservable(target, key, value, shallow) {
   var raw = _environment__WEBPACK_IMPORTED_MODULE_1__/* .ProxyRaw.get */ .wX.get(value);
 
   if (!!raw) {
-    var node = (0,_tree__WEBPACK_IMPORTED_MODULE_3__/* .getDataNode */ .bl)(raw);
+    var node = _environment__WEBPACK_IMPORTED_MODULE_1__/* .RawNode.get */ .xO.get(raw);
     node.key = key;
     return value;
   }
@@ -13828,11 +13790,11 @@ var observe = function observe(target, observer, deep) {
 
   var addListener = function addListener(target) {
     var raw = _environment__WEBPACK_IMPORTED_MODULE_0__/* .ProxyRaw.get */ .wX.get(target) || target;
-    var node = (0,_tree__WEBPACK_IMPORTED_MODULE_2__/* .getDataNode */ .bl)(raw);
+    var node = _environment__WEBPACK_IMPORTED_MODULE_0__/* .RawNode.get */ .xO.get(raw);
 
     var listener = function listener(operation) {
       var targetRaw = _environment__WEBPACK_IMPORTED_MODULE_0__/* .ProxyRaw.get */ .wX.get(operation.target) || operation.target;
-      var targetNode = (0,_tree__WEBPACK_IMPORTED_MODULE_2__/* .getDataNode */ .bl)(targetRaw);
+      var targetNode = _environment__WEBPACK_IMPORTED_MODULE_0__/* .RawNode.get */ .xO.get(targetRaw);
 
       if (deep) {
         if (node.contains(targetNode)) {
@@ -14218,8 +14180,6 @@ function () {
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "UH": () => (/* binding */ DataChange),
 /* harmony export */   "RQ": () => (/* binding */ DataNode),
-/* harmony export */   "bl": () => (/* binding */ getDataNode),
-/* harmony export */   "Oe": () => (/* binding */ setDataNode),
 /* harmony export */   "Kv": () => (/* binding */ buildDataTree)
 /* harmony export */ });
 /* harmony import */ var _environment__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(4756);
@@ -14269,7 +14229,7 @@ function () {
   Object.defineProperty(DataNode.prototype, "parent", {
     get: function get() {
       if (!this.target) return;
-      return getDataNode(this.targetRaw);
+      return _environment__WEBPACK_IMPORTED_MODULE_0__/* .RawNode.get */ .xO.get(this.targetRaw);
     },
     enumerable: false,
     configurable: true
@@ -14299,17 +14259,10 @@ function () {
 }();
 
 
-var getDataNode = function getDataNode(raw) {
-  return _environment__WEBPACK_IMPORTED_MODULE_0__/* .RawNode.get */ .xO.get(raw);
-};
-var setDataNode = function setDataNode(raw, node) {
-  _environment__WEBPACK_IMPORTED_MODULE_0__/* .RawNode.set */ .xO.set(raw, node);
-};
 var buildDataTree = function buildDataTree(target, key, value) {
-  var raw = _environment__WEBPACK_IMPORTED_MODULE_0__/* .ProxyRaw.get */ .wX.get(value) || value;
-  var currentNode = getDataNode(raw);
+  var currentNode = _environment__WEBPACK_IMPORTED_MODULE_0__/* .RawNode.get */ .xO.get(_environment__WEBPACK_IMPORTED_MODULE_0__/* .ProxyRaw.get */ .wX.get(value) || value);
   if (currentNode) return currentNode;
-  setDataNode(raw, new DataNode(target, key, value));
+  _environment__WEBPACK_IMPORTED_MODULE_0__/* .RawNode.set */ .xO.set(value, new DataNode(target, key, value));
 };
 
 /***/ }),
@@ -14321,9 +14274,7 @@ var buildDataTree = function buildDataTree(target, key, value) {
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "UH": () => (/* reexport safe */ _tree__WEBPACK_IMPORTED_MODULE_0__.UH),
 /* harmony export */   "RQ": () => (/* reexport safe */ _tree__WEBPACK_IMPORTED_MODULE_0__.RQ),
-/* harmony export */   "Kv": () => (/* reexport safe */ _tree__WEBPACK_IMPORTED_MODULE_0__.Kv),
-/* harmony export */   "bl": () => (/* reexport safe */ _tree__WEBPACK_IMPORTED_MODULE_0__.bl),
-/* harmony export */   "Oe": () => (/* reexport safe */ _tree__WEBPACK_IMPORTED_MODULE_0__.Oe)
+/* harmony export */   "Kv": () => (/* reexport safe */ _tree__WEBPACK_IMPORTED_MODULE_0__.Kv)
 /* harmony export */ });
 /* harmony import */ var _tree__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(85755);
 
@@ -14494,8 +14445,6 @@ function includes(val, searchElement, revert) {
 /* unused harmony exports getType, isMap, isSet, isWeakMap, isWeakSet, isRegExp, isReactElement, isHTMLElement */
 function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
-var toString = Object.prototype.toString;
-
 var isType = function isType(type) {
   return function (obj) {
     return getType(obj) === "[object ".concat(type, "]");
@@ -14503,7 +14452,7 @@ var isType = function isType(type) {
 };
 
 var getType = function getType(obj) {
-  return toString.call(obj);
+  return Object.prototype.toString.call(obj);
 };
 var isFn = function isFn(val) {
   return typeof val === 'function';
@@ -15908,7 +15857,6 @@ var getRuleMessage = function getRuleMessage(rule, type) {
 };
 
 var parseValidatorDescription = function parseValidatorDescription(description) {
-  if (!description) return {};
   var rules = {};
 
   if ((0,_formily_shared__WEBPACK_IMPORTED_MODULE_0__/* .isStr */ .d8)(description)) {
@@ -15919,10 +15867,10 @@ var parseValidatorDescription = function parseValidatorDescription(description)
     rules = Object.assign(rules, description);
   }
 
+  rules.triggerType = rules.triggerType || 'onInput';
   return rules;
 };
 var parseValidatorDescriptions = function parseValidatorDescriptions(validator) {
-  if (!validator) return [];
   var array = (0,_formily_shared__WEBPACK_IMPORTED_MODULE_0__/* .isArr */ .H1)(validator) ? validator : [validator];
   return array.map(function (description) {
     return parseValidatorDescription(description);
@@ -16060,14 +16008,10 @@ var parseValidator = function parseValidator(validator, options) {
     options = {};
   }
 
-  if (!validator) return [];
   var array = (0,_formily_shared__WEBPACK_IMPORTED_MODULE_0__/* .isArr */ .H1)(validator) ? validator : [validator];
   return array.reduce(function (buf, description) {
-    var _a;
-
     var rules = parseValidatorDescription(description);
-    var triggerType = (_a = rules.triggerType) !== null && _a !== void 0 ? _a : 'onInput';
-    if ((options === null || options === void 0 ? void 0 : options.triggerType) && options.triggerType !== triggerType) return buf;
+    if ((options === null || options === void 0 ? void 0 : options.triggerType) && options.triggerType !== rules.triggerType) return buf;
     return rules ? buf.concat(parseValidatorRules(rules)) : buf;
   }, []);
 };
@@ -17611,8 +17555,8 @@ var MenuOutlinedIcon = react__WEBPACK_IMPORTED_MODULE_0___default().forwardRef(f
   return react__WEBPACK_IMPORTED_MODULE_0___default().createElement(Icon, __assign({}, props, {
     ref: ref
   }), react__WEBPACK_IMPORTED_MODULE_0___default().createElement("path", {
-    d: "M262.4 192c0 35.3472 28.6528 64 64 64s64-28.6528 64-64-28.6528-64-64-64-64 28.6528-64 64zM262.4 512c0 35.3472 28.6528 64 64 64s64-28.6528 64-64-28.6528-64-64-64-64 28.6528-64 64zM633.6 192c0 35.3472 28.6528 64 64 64s64-28.6528 64-64-28.6528-64-64-64-64 28.6528-64 64zM633.6 512c0 35.3472 28.6528 64 64 64s64-28.6528 64-64-28.6528-64-64-64-64 28.6528-64 64zM262.4 832c0 35.3472 28.6528 64 64 64s64-28.6528 64-64-28.6528-64-64-64-64 28.6528-64 64zM633.6 832c0 35.3472 28.6528 64 64 64s64-28.6528 64-64-28.6528-64-64-64-64 28.6528-64 64z",
-    "p-id": "11148"
+    d: "M128.64 288h768c14.08 0 32-14.08 32-32s-17.92-32-32-32h-768c-14.08 0-32 14.08-32 32s17.92 32 32 32zM896.64 480h-768c-14.08 0-32 14.08-32 32s17.92 32 32 32h768c14.08 0 32-14.08 32-32s-17.28-32-32-32zM896.64 736h-768c-14.08 0-32 14.08-32 32s17.92 32 32 32h768c14.08 0 32-14.08 32-32s-17.28-32-32-32z",
+    "p-id": "12825"
   }));
 });
 var PlusOutlinedIcon = react__WEBPACK_IMPORTED_MODULE_0___default().forwardRef(function (props, ref) {
@@ -21694,17 +21638,16 @@ var BaseItem = function BaseItem(props) {
   }, extra)));
 }; // 适配
 
-var FormItem = (0,_formily_react__WEBPACK_IMPORTED_MODULE_3__.connect)(BaseItem, (0,_formily_react__WEBPACK_IMPORTED_MODULE_3__.mapProps)(function (props, field) {
+var FormItem = (0,_formily_react__WEBPACK_IMPORTED_MODULE_3__.connect)(BaseItem, (0,_formily_react__WEBPACK_IMPORTED_MODULE_3__.mapProps)({
+  validateStatus: true,
+  title: 'label',
+  required: true
+}, function (props, field) {
   if ((0,_formily_core__WEBPACK_IMPORTED_MODULE_2__.isVoidField)(field)) return {
     extra: props.extra || field.description
   };
   if (!field) return props;
 
-  var takeFeedbackStatus = function takeFeedbackStatus() {
-    if (field.validating) return 'pending';
-    return field.decoratorProps.feedbackStatus || field.validateStatus;
-  };
-
   var takeMessage = function takeMessage() {
     var split = function split(messages) {
       return messages.reduce(function (buf, text, index) {
@@ -21720,24 +21663,33 @@ var FormItem = (0,_formily_react__WEBPACK_IMPORTED_MODULE_3__.connect)(BaseItem,
     if (field.selfSuccesses.length) return split(field.selfSuccesses);
   };
 
-  var takeAsterisk = function takeAsterisk() {
-    if (field.required && field.pattern !== 'readPretty') {
-      return true;
-    }
-
-    if ('asterisk' in props) {
-      return props.asterisk;
-    }
+  return {
+    feedbackText: takeMessage(),
+    extra: props.extra || field.description
+  };
+}, function (props, field) {
+  var _a;
 
-    return false;
+  if ((0,_formily_core__WEBPACK_IMPORTED_MODULE_2__.isVoidField)(field)) return props;
+  if (!field) return props;
+  return {
+    feedbackStatus: field.validateStatus === 'validating' ? 'pending' : ((_a = field.decorator[1]) === null || _a === void 0 ? void 0 : _a.feedbackStatus) || field.validateStatus
   };
+}, function (props, field) {
+  if ((0,_formily_core__WEBPACK_IMPORTED_MODULE_2__.isVoidField)(field)) return props;
+  if (!field) return props;
+  var asterisk = false;
+
+  if (field.required && field.pattern !== 'readPretty') {
+    asterisk = true;
+  }
+
+  if ('asterisk' in props) {
+    asterisk = props.asterisk;
+  }
 
   return {
-    label: field.title,
-    feedbackStatus: takeFeedbackStatus(),
-    feedbackText: takeMessage(),
-    asterisk: takeAsterisk(),
-    extra: props.extra || field.description
+    asterisk: asterisk
   };
 }));
 FormItem.defaultProps = {
@@ -24399,8 +24351,7 @@ var TeamixIcon = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.forwardRef)(
   }
 
   return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("i", (0,_babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)({
-    className: classes // @ts-ignore
-    ,
+    className: classes,
     ref: ref
   }, others), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("svg", {
     viewBox: "0 0 1024 1024"
@@ -24413,7 +24364,7 @@ TeamixIcon.YUNXIAO = {
   symbolPrefix: 'yunxiao-'
 };
 TeamixIcon.HYBRIDCLOUD = {
-  scriptUrl: '//at.alicdn.com/t/font_2436140_xd91cirfxss.js',
+  scriptUrl: '//at.alicdn.com/t/font_2436140_psy0jd7csgm.js',
   symbolPrefix: 'hybridcloud-'
 };
 TeamixIcon.displayName = 'TeamixIcon';
@@ -62112,7 +62063,7 @@ _teamix_icon__WEBPACK_IMPORTED_MODULE_12__/* ["default"].setConfig */ .Z.setConf
 
 
 
-var version = '1.2.4';
+var version = '1.2.5';
 
 
 /***/ }),