@teamix/pro 1.4.5 → 1.4.6

package/dist/pro.js

@@ -2938,8 +2938,12 @@ function () {
       _this.form.removeEffects(_this);
     };
 
-    this.destroy = function () {
-      (0,_shared_internals__WEBPACK_IMPORTED_MODULE_2__/* .destroy */ .ob)(_this.form.fields, _this.address.toString());
+    this.destroy = function (forceClear) {
+      if (forceClear === void 0) {
+        forceClear = true;
+      }
+
+      (0,_shared_internals__WEBPACK_IMPORTED_MODULE_2__/* .destroy */ .ob)(_this.form.fields, _this.address.toString(), forceClear);
     };
 
     this.match = function (pattern) {
@@ -3040,9 +3044,18 @@ function () {
     get: function get() {
       var _a;
 
-      var parentPattern = (_a = this.parent) === null || _a === void 0 ? void 0 : _a.pattern;
-      if ((0,_formily_shared__WEBPACK_IMPORTED_MODULE_0__/* .isValid */ .JY)(this.selfPattern)) return this.selfPattern;
-      return parentPattern || this.form.pattern || 'editable';
+      var parentPattern = ((_a = this.parent) === null || _a === void 0 ? void 0 : _a.pattern) || this.form.pattern || 'editable';
+      var selfPattern = this.selfPattern;
+
+      if ((0,_formily_shared__WEBPACK_IMPORTED_MODULE_0__/* .isValid */ .JY)(selfPattern)) {
+        if (parentPattern === 'readPretty' && selfPattern !== 'editable') {
+          return parentPattern;
+        }
+
+        return selfPattern;
+      }
+
+      return parentPattern;
     },
     set: function set(pattern) {
       this.selfPattern = pattern;
@@ -3146,6 +3159,13 @@ function () {
     enumerable: false,
     configurable: true
   });
+  Object.defineProperty(BaseField.prototype, "destroyed", {
+    get: function get() {
+      return !this.form.fields[this.address.toString()];
+    },
+    enumerable: false,
+    configurable: true
+  });
   return BaseField;
 }();
 
@@ -3419,20 +3439,21 @@ function (_super) {
       }
 
       return __awaiter(_this, void 0, void 0, function () {
-        var values, value;
+        var getValues, values, value;
+        return __generator(this, function (_a) {
+          switch (_a.label) {
+            case 0:
+              getValues = function getValues(args) {
+                var _a;
 
-        var _a;
+                if ((_a = args[0]) === null || _a === void 0 ? void 0 : _a.target) {
+                  if (!(0,_shared_internals__WEBPACK_IMPORTED_MODULE_4__/* .isHTMLInputEvent */ .YC)(args[0])) return args;
+                }
 
-        return __generator(this, function (_b) {
-          switch (_b.label) {
-            case 0:
-              if ((_a = args[0]) === null || _a === void 0 ? void 0 : _a.target) {
-                if (!(0,_shared_internals__WEBPACK_IMPORTED_MODULE_4__/* .isHTMLInputEvent */ .YC)(args[0])) return [2
-                /*return*/
-                ];
-              }
+                return (0,_shared_internals__WEBPACK_IMPORTED_MODULE_4__/* .getValuesFromEvent */ .C7)(args);
+              };
 
-              values = (0,_shared_internals__WEBPACK_IMPORTED_MODULE_4__/* .getValuesFromEvent */ .C7)(args);
+              values = getValues(args);
               value = values[0];
               this.caches.inputting = true;
               this.inputValue = value;
@@ -3446,7 +3467,7 @@ function (_super) {
               , (0,_shared_internals__WEBPACK_IMPORTED_MODULE_4__/* .validateSelf */ .Ct)(this, 'onInput')];
 
             case 1:
-              _b.sent();
+              _a.sent();
 
               this.caches.inputting = false;
               return [2
@@ -3625,10 +3646,10 @@ function (_super) {
       decoratorType: _formily_reactive__WEBPACK_IMPORTED_MODULE_2__.observable.ref,
       componentType: _formily_reactive__WEBPACK_IMPORTED_MODULE_2__.observable.ref,
       content: _formily_reactive__WEBPACK_IMPORTED_MODULE_2__.observable.ref,
+      feedbacks: _formily_reactive__WEBPACK_IMPORTED_MODULE_2__.observable.ref,
       decoratorProps: _formily_reactive__WEBPACK_IMPORTED_MODULE_2__.observable,
       componentProps: _formily_reactive__WEBPACK_IMPORTED_MODULE_2__.observable,
       validator: _formily_reactive__WEBPACK_IMPORTED_MODULE_2__.observable.shallow,
-      feedbacks: _formily_reactive__WEBPACK_IMPORTED_MODULE_2__.observable.shallow,
       data: _formily_reactive__WEBPACK_IMPORTED_MODULE_2__.observable.shallow,
       component: _formily_reactive__WEBPACK_IMPORTED_MODULE_2__.observable.computed,
       decorator: _formily_reactive__WEBPACK_IMPORTED_MODULE_2__.observable.computed,
@@ -3845,6 +3866,8 @@ function (_super) {
       return this.form.getValuesIn(this.path);
     },
     set: function set(value) {
+      if (this.destroyed) return;
+
       if (!this.initialized) {
         if (this.display === 'none') {
           this.caches.value = value;
@@ -3866,6 +3889,8 @@ function (_super) {
       return this.form.getInitialValuesIn(this.path);
     },
     set: function set(initialValue) {
+      if (this.destroyed) return;
+
       if (!this.initialized) {
         if (!(0,_shared_internals__WEBPACK_IMPORTED_MODULE_4__/* .allowAssignDefaultValue */ .ab)(this.initialValue, initialValue) && !this.designable) {
           return;
@@ -4249,7 +4274,7 @@ function () {
       _this.notify(_types__WEBPACK_IMPORTED_MODULE_4__/* .LifeCycleTypes.ON_FORM_UNMOUNT */ .N.ON_FORM_UNMOUNT);
 
       _this.query('*').forEach(function (field) {
-        return field.destroy();
+        return field.destroy(false);
       });
 
       _this.disposers.forEach(function (dispose) {
@@ -4281,13 +4306,17 @@ function () {
       _this.graph.setGraph(graph);
     };
 
-    this.clearFormGraph = function (pattern) {
+    this.clearFormGraph = function (pattern, forceClear) {
       if (pattern === void 0) {
         pattern = '*';
       }
 
+      if (forceClear === void 0) {
+        forceClear = true;
+      }
+
       _this.query(pattern).forEach(function (field) {
-        field.destroy();
+        field.destroy(forceClear);
       });
     };
 
@@ -4798,14 +4827,14 @@ var LifeCycle =
 /** @class */
 function () {
   function LifeCycle() {
-    var _this = this;
-
     var params = [];
 
     for (var _i = 0; _i < arguments.length; _i++) {
       params[_i] = arguments[_i];
     }
 
+    var _this = this;
+
     this.buildListener = function (params) {
       return function (payload, ctx) {
         var _this = this;
@@ -5810,14 +5839,8 @@ var isHTMLInputEvent = function isHTMLInputEvent(event, stopPropagation) {
   }
 
   if (event === null || event === void 0 ? void 0 : event.target) {
-    if ((0,_formily_shared__WEBPACK_IMPORTED_MODULE_0__/* .isValid */ .JY)(event.target.value) || (0,_formily_shared__WEBPACK_IMPORTED_MODULE_0__/* .isValid */ .JY)(event.target.checked)) return true;
-
-    if (event.target.tagName && event.target.tagName !== 'INPUT' && event.target.tagName !== 'TEXTAREA' && event.target.tagName !== 'SELECT') {
-      return false;
-    }
-
+    if (_typeof(event.target) === 'object' && ('value' in event.target || 'checked' in event.target)) return true;
     if (stopPropagation) (_a = event.stopPropagation) === null || _a === void 0 ? void 0 : _a.call(event);
-    return true;
   }
 
   return false;
@@ -5892,11 +5915,14 @@ var patchFieldStates = function patchFieldStates(target, patches) {
         payload = _a.payload;
 
     if (type === 'remove') {
-      destroy(target, address);
+      destroy(target, address, false);
     } else if (type === 'update') {
       if (payload) {
         target[address] = payload;
-        if (target[oldAddress] === payload) delete target[oldAddress];
+
+        if (target[oldAddress] === payload) {
+          delete target[oldAddress];
+        }
       }
 
       if (address && payload) {
@@ -5905,10 +5931,21 @@ var patchFieldStates = function patchFieldStates(target, patches) {
     }
   });
 };
-var destroy = function destroy(target, address) {
-  var _a;
+var destroy = function destroy(target, address, removeValue) {
+  if (removeValue === void 0) {
+    removeValue = true;
+  }
+
+  var field = target[address];
+  field === null || field === void 0 ? void 0 : field.dispose();
+
+  if ((0,_externals__WEBPACK_IMPORTED_MODULE_4__/* .isDataField */ .Ip)(field) && removeValue) {
+    var form = field.form;
+    var path = field.path;
+    form.deleteValuesIn(path);
+    form.deleteInitialValuesIn(path);
+  }
 
-  (_a = target[address]) === null || _a === void 0 ? void 0 : _a.dispose();
   delete target[address];
 };
 var patchFormValues = function patchFormValues(form, path, source) {
@@ -5927,6 +5964,8 @@ var patchFormValues = function patchFormValues(form, path, source) {
 
     var targetValue = form.getValuesIn(path);
     var targetField = form.query(path).take();
+    var isUnVoidField = targetField && !(0,_externals__WEBPACK_IMPORTED_MODULE_4__/* .isVoidField */ .JF)(targetField);
+    if (isUnVoidField && targetField.display === 'none') return;
 
     if (allowAssignDefaultValue(targetValue, source)) {
       update(path, source);
@@ -5940,7 +5979,7 @@ var patchFormValues = function patchFormValues(form, path, source) {
         });
       } else {
         if (targetField) {
-          if (!(0,_externals__WEBPACK_IMPORTED_MODULE_4__/* .isVoidField */ .JF)(targetField) && !targetField.selfModified) {
+          if (isUnVoidField && !targetField.selfModified) {
             update(path, source);
           }
         } else if (form.initialized) {
@@ -6028,14 +6067,17 @@ var validateToFeedbacks = function validateToFeedbacks(field, triggerType) {
 
   return __awaiter(void 0, void 0, void 0, function () {
     var results;
-    return __generator(this, function (_a) {
-      switch (_a.label) {
+
+    var _a;
+
+    return __generator(this, function (_b) {
+      switch (_b.label) {
         case 0:
           return [4
           /*yield*/
           , (0,_formily_validator__WEBPACK_IMPORTED_MODULE_1__/* .validate */ .Gu)(field.value, field.validator, {
             triggerType: triggerType,
-            validateFirst: field.props.validateFirst || field.form.props.validateFirst,
+            validateFirst: (_a = field.props.validateFirst) !== null && _a !== void 0 ? _a : field.form.props.validateFirst,
             context: {
               field: field,
               form: field.form
@@ -6043,7 +6085,7 @@ var validateToFeedbacks = function validateToFeedbacks(field, triggerType) {
           })];
 
         case 1:
-          results = _a.sent();
+          results = _b.sent();
           (0,_formily_reactive__WEBPACK_IMPORTED_MODULE_2__.batch)(function () {
             (0,_formily_shared__WEBPACK_IMPORTED_MODULE_0__/* .each */ .S6)(results, function (messages, type) {
               field.setFeedback({
@@ -6137,7 +6179,7 @@ var spliceArrayState = function spliceArrayState(field, props) {
     var number = (_a = afterStr.match(_constants__WEBPACK_IMPORTED_MODULE_5__/* .NumberIndexReg */ .rQ)) === null || _a === void 0 ? void 0 : _a[1];
     if (number === undefined) return false;
     var index = Number(number);
-    return index >= startIndex && !fields["".concat(preStr).concat(afterStr.replace(/^\.\d+/, ".".concat(index + deleteCount)))];
+    return index > startIndex && !fields["".concat(preStr).concat(afterStr.replace(/^\.\d+/, ".".concat(index + deleteCount)))] || index === startIndex;
   };
 
   var moveIndex = function moveIndex(identifier) {
@@ -6273,9 +6315,9 @@ var cleanupArrayChildren = function cleanupArrayChildren(field, start) {
     var _a;
 
     var afterStr = identifier.slice(address.length);
-    var number = (_a = afterStr.match(_constants__WEBPACK_IMPORTED_MODULE_5__/* .NumberIndexReg */ .rQ)) === null || _a === void 0 ? void 0 : _a[1];
-    if (number === undefined) return false;
-    var index = Number(number);
+    var numStr = (_a = afterStr.match(_constants__WEBPACK_IMPORTED_MODULE_5__/* .NumberIndexReg */ .rQ)) === null || _a === void 0 ? void 0 : _a[1];
+    if (numStr === undefined) return false;
+    var index = Number(numStr);
     return index >= start;
   };
 
@@ -6410,7 +6452,7 @@ var createChildrenFeedbackFilter = function createChildrenFeedbackFilter(field)
   var identifier = (_a = field.address) === null || _a === void 0 ? void 0 : _a.toString();
   return function (_a) {
     var address = _a.address;
-    return address.indexOf(identifier) === 0;
+    return address === identifier || address.indexOf(identifier + '.') === 0;
   };
 };
 var createStateSetter = function createStateSetter(model) {
@@ -6462,7 +6504,7 @@ var triggerFormInitialValuesChange = function triggerFormInitialValuesChange(for
   var path = change.path;
   if (Array.isArray(change.object) && change.key === 'length') return;
 
-  if ((0,_formily_reactive__WEBPACK_IMPORTED_MODULE_2__.contains)(form.initialValues, change.object) || (0,_formily_reactive__WEBPACK_IMPORTED_MODULE_2__.contains)(form.initialValues, change.value)) {
+  if ((0,_formily_reactive__WEBPACK_IMPORTED_MODULE_2__.contains)(form.initialValues, change.object) || form.initialValues === change.value) {
     if (change.type === 'add' || change.type === 'set') {
       patchFormValues(form, path.slice(1), change.value);
     }
@@ -6475,7 +6517,7 @@ var triggerFormInitialValuesChange = function triggerFormInitialValuesChange(for
 var triggerFormValuesChange = function triggerFormValuesChange(form, change) {
   if (Array.isArray(change.object) && change.key === 'length') return;
 
-  if (((0,_formily_reactive__WEBPACK_IMPORTED_MODULE_2__.contains)(form.values, change.object) || (0,_formily_reactive__WEBPACK_IMPORTED_MODULE_2__.contains)(form.values, change.value)) && form.initialized) {
+  if (((0,_formily_reactive__WEBPACK_IMPORTED_MODULE_2__.contains)(form.values, change.object) || form.values === change.value) && form.initialized) {
     form.notify(_types__WEBPACK_IMPORTED_MODULE_3__/* .LifeCycleTypes.ON_FORM_VALUES_CHANGE */ .N.ON_FORM_VALUES_CHANGE);
   }
 };
@@ -6782,11 +6824,8 @@ var resetSelf = _formily_reactive__WEBPACK_IMPORTED_MODULE_2__.batch.bound(funct
 
   return __awaiter(void 0, void 0, void 0, function () {
     var typedDefaultValue;
-
-    var _a;
-
-    return __generator(this, function (_b) {
-      switch (_b.label) {
+    return __generator(this, function (_a) {
+      switch (_a.label) {
         case 0:
           typedDefaultValue = getTypedDefaultValue(target);
           target.modified = false;
@@ -6797,11 +6836,11 @@ var resetSelf = _formily_reactive__WEBPACK_IMPORTED_MODULE_2__.batch.bound(funct
           target.inputValues = [];
           target.caches = {};
 
-          if ((0,_formily_shared__WEBPACK_IMPORTED_MODULE_0__/* .isValid */ .JY)(target.value)) {
+          if (!(0,_formily_shared__WEBPACK_IMPORTED_MODULE_0__/* .isUndef */ .G7)(target.value)) {
             if (options === null || options === void 0 ? void 0 : options.forceClear) {
               target.value = typedDefaultValue;
             } else {
-              target.value = (0,_formily_reactive__WEBPACK_IMPORTED_MODULE_2__.toJS)((_a = target.initialValue) !== null && _a !== void 0 ? _a : typedDefaultValue);
+              target.value = (0,_formily_reactive__WEBPACK_IMPORTED_MODULE_2__.toJS)(!(0,_formily_shared__WEBPACK_IMPORTED_MODULE_0__/* .isUndef */ .G7)(target.initialValue) ? target.initialValue : typedDefaultValue);
             }
           }
 
@@ -6819,7 +6858,7 @@ var resetSelf = _formily_reactive__WEBPACK_IMPORTED_MODULE_2__.batch.bound(funct
         case 1:
           return [2
           /*return*/
-          , _b.sent()];
+          , _a.sent()];
 
         case 2:
           return [2
@@ -6855,10 +6894,10 @@ var getValidFieldDefaultValue = function getValidFieldDefaultValue(value, initia
   return value;
 };
 var allowAssignDefaultValue = function allowAssignDefaultValue(target, source) {
-  var isEmptyTarget = (0,_formily_shared__WEBPACK_IMPORTED_MODULE_0__/* .isEmpty */ .xb)(target);
-  var isEmptySource = (0,_formily_shared__WEBPACK_IMPORTED_MODULE_0__/* .isEmpty */ .xb)(source);
-  var isValidTarget = (0,_formily_shared__WEBPACK_IMPORTED_MODULE_0__/* .isValid */ .JY)(target);
-  var isValidSource = (0,_formily_shared__WEBPACK_IMPORTED_MODULE_0__/* .isValid */ .JY)(source);
+  var isEmptyTarget = target !== null && (0,_formily_shared__WEBPACK_IMPORTED_MODULE_0__/* .isEmpty */ .xb)(target);
+  var isEmptySource = source !== null && (0,_formily_shared__WEBPACK_IMPORTED_MODULE_0__/* .isEmpty */ .xb)(source);
+  var isValidTarget = !(0,_formily_shared__WEBPACK_IMPORTED_MODULE_0__/* .isUndef */ .G7)(target);
+  var isValidSource = !(0,_formily_shared__WEBPACK_IMPORTED_MODULE_0__/* .isUndef */ .G7)(source);
 
   if (!isValidTarget) {
     if (isValidSource) {
@@ -6889,7 +6928,8 @@ var createReactions = function createReactions(field) {
     reactions.forEach(function (reaction) {
       if ((0,_formily_shared__WEBPACK_IMPORTED_MODULE_0__/* .isFn */ .LQ)(reaction)) {
         field.disposers.push((0,_formily_reactive__WEBPACK_IMPORTED_MODULE_2__.autorun)(_formily_reactive__WEBPACK_IMPORTED_MODULE_2__.batch.scope.bound(function () {
-          return reaction(field);
+          if (field.destroyed) return;
+          reaction(field);
         })));
       }
     });
@@ -7799,10 +7839,12 @@ var patchSchemaCompile = function patchSchemaCompile(targetState, sourceSchema,
     demand = false;
   }
 
-  (0,_shared__WEBPACK_IMPORTED_MODULE_2__/* .traverseSchema */ .dF)(sourceSchema, function (value, path) {
+  (0,_shared__WEBPACK_IMPORTED_MODULE_2__/* .traverseSchema */ .dF)(sourceSchema, function (value, path, omitCompile) {
     var compiled = value;
     var collected = (0,_formily_reactive__WEBPACK_IMPORTED_MODULE_1__.hasCollected)(function () {
-      compiled = compile(value, scope);
+      if (!omitCompile) {
+        compiled = compile(value, scope);
+      }
     });
     if (compiled === undefined) return;
 
@@ -8516,14 +8558,21 @@ var traverseSchema = function traverseSchema(schema, visitor) {
   var root = schema;
 
   var traverse = function traverse(target, path) {
+    var _a;
+
     if (path === void 0) {
       path = [];
     }
 
-    if (path[0] === 'x-validator' || path[0] === 'version' || path[0] === '_isJSONSchemaObject') return;
+    if (path[0] === 'x-compile-omitted' || path[0] === 'x-validator' || path[0] === 'version' || path[0] === '_isJSONSchemaObject') return;
     if (String(path[0]).indexOf('x-') == -1 && (0,_formily_shared__WEBPACK_IMPORTED_MODULE_0__/* .isFn */ .LQ)(target)) return;
     if (SchemaNestedMap[path[0]]) return;
 
+    if (((_a = schema['x-compile-omitted']) === null || _a === void 0 ? void 0 : _a.indexOf(path[0])) > -1) {
+      visitor(target, path, true);
+      return;
+    }
+
     if ((0,_formily_shared__WEBPACK_IMPORTED_MODULE_0__/* .isPlainObj */ .Uk)(target)) {
       if (path[0] === 'default' || path[0] === 'x-value') {
         visitor(target, path);
@@ -8633,22 +8682,6 @@ var patchStateFormSchema = function patchStateFormSchema(targetState, pattern, c
 /* harmony import */ var _formily_shared__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(71131);
 /* harmony import */ var _formily_core__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(7186);
 /* harmony import */ var _compiler__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(11690);
-var __assign = undefined && undefined.__assign || function () {
-  __assign = Object.assign || function (t) {
-    for (var s, i = 1, n = arguments.length; i < n; i++) {
-      s = arguments[i];
-
-      for (var p in s) {
-        if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
-      }
-    }
-
-    return t;
-  };
-
-  return __assign.apply(this, arguments);
-};
-
 var __read = undefined && undefined.__read || function (o, n) {
   var m = typeof Symbol === "function" && o[Symbol.iterator];
   if (!m) return o;
@@ -8675,8 +8708,6 @@ var __read = undefined && undefined.__read || function (o, n) {
 
   return ar;
 };
-/* istanbul ignore file */
-
 
 
 
@@ -8744,7 +8775,7 @@ var setSchemaFieldState = function setSchemaFieldState(options, demand) {
   if (target) {
     if (request.state) {
       field.form.setFieldState(target, function (state) {
-        return (0,_compiler__WEBPACK_IMPORTED_MODULE_3__/* .patchCompile */ .EO)(state, request.state, __assign(__assign({}, scope), {
+        return (0,_compiler__WEBPACK_IMPORTED_MODULE_3__/* .patchCompile */ .EO)(state, request.state, (0,_formily_shared__WEBPACK_IMPORTED_MODULE_1__/* .lazyMerge */ .e_)(scope, {
           $target: state
         }));
       });
@@ -8752,7 +8783,7 @@ var setSchemaFieldState = function setSchemaFieldState(options, demand) {
 
     if (request.schema) {
       field.form.setFieldState(target, function (state) {
-        return (0,_compiler__WEBPACK_IMPORTED_MODULE_3__/* .patchSchemaCompile */ .Nc)(state, request.schema, __assign(__assign({}, scope), {
+        return (0,_compiler__WEBPACK_IMPORTED_MODULE_3__/* .patchSchemaCompile */ .Nc)(state, request.schema, (0,_formily_shared__WEBPACK_IMPORTED_MODULE_1__/* .lazyMerge */ .e_)(scope, {
           $target: state
         }), demand);
       });
@@ -8760,7 +8791,7 @@ var setSchemaFieldState = function setSchemaFieldState(options, 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), {
+        (0,_compiler__WEBPACK_IMPORTED_MODULE_3__/* .shallowCompile */ .eC)("{{function(){".concat(runner, "}}}"), (0,_formily_shared__WEBPACK_IMPORTED_MODULE_1__/* .lazyMerge */ .e_)(scope, {
           $target: state
         }))();
       });
@@ -8804,7 +8835,7 @@ var getBaseScope = function getBaseScope(field, options) {
   var $self = field;
   var $form = field.form;
   var $values = field.form.values;
-  return __assign(__assign({}, options.scope), {
+  return (0,_formily_shared__WEBPACK_IMPORTED_MODULE_1__/* .lazyMerge */ .e_)(options.scope, {
     $form: $form,
     $self: $self,
     $observable: $observable,
@@ -8848,13 +8879,11 @@ var getUserReactions = function getUserReactions(schema, options) {
       var run = function run() {
         var $deps = getDependencies(field, reaction.dependencies);
         var $dependencies = $deps;
-
-        var scope = __assign(__assign({}, baseScope), {
+        var scope = (0,_formily_shared__WEBPACK_IMPORTED_MODULE_1__/* .lazyMerge */ .e_)(baseScope, {
           $target: null,
           $deps: $deps,
           $dependencies: $dependencies
         });
-
         var compiledWhen = (0,_compiler__WEBPACK_IMPORTED_MODULE_3__/* .shallowCompile */ .eC)(when, scope);
         var condition = when ? compiledWhen : true;
         var request = condition ? fulfill : otherwise;
@@ -9208,6 +9237,7 @@ var setIn = function setIn(segments, source, value) {
 
       if (!isValid(source[index])) {
         if (value === undefined) {
+          if (source[index] === null) source[index] = value;
           return;
         }
 
@@ -9988,7 +10018,8 @@ function () {
       if (node.end) {
         return current <= Number(node.end.value);
       } else {
-        return true;
+        this.wildcards = this.stack.slice();
+        return this.next(node, pos);
       }
     }
   };
@@ -11277,29 +11308,15 @@ ArrayField.displayName = 'ArrayField';
 /* harmony export */ });
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(59787);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var _shared__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(36869);
-var __assign = undefined && undefined.__assign || function () {
-  __assign = Object.assign || function (t) {
-    for (var s, i = 1, n = arguments.length; i < n; i++) {
-      s = arguments[i];
-
-      for (var p in s) {
-        if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
-      }
-    }
-
-    return t;
-  };
-
-  return __assign.apply(this, arguments);
-};
+/* harmony import */ var _formily_shared__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(71131);
+/* harmony import */ var _shared__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(36869);
 
 
 
 var ExpressionScope = function ExpressionScope(props) {
-  var scope = (0,react__WEBPACK_IMPORTED_MODULE_0__.useContext)(_shared__WEBPACK_IMPORTED_MODULE_1__/* .SchemaExpressionScopeContext */ .pv);
-  return react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_shared__WEBPACK_IMPORTED_MODULE_1__/* .SchemaExpressionScopeContext.Provider */ .pv.Provider, {
-    value: __assign(__assign({}, scope), props.value)
+  var scope = (0,react__WEBPACK_IMPORTED_MODULE_0__.useContext)(_shared__WEBPACK_IMPORTED_MODULE_2__/* .SchemaExpressionScopeContext */ .pv);
+  return react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_shared__WEBPACK_IMPORTED_MODULE_2__/* .SchemaExpressionScopeContext.Provider */ .pv.Provider, {
+    value: (0,_formily_shared__WEBPACK_IMPORTED_MODULE_1__/* .lazyMerge */ .e_)(scope, props.value)
   }, props.children);
 };
 
@@ -11529,23 +11546,18 @@ var __spreadArray = undefined && undefined.__spreadArray || function (to, from,
 
 var mergeChildren = function mergeChildren(children, content) {
   if (!children && !content) return;
+  if ((0,_formily_shared__WEBPACK_IMPORTED_MODULE_3__/* .isFn */ .LQ)(children)) return;
   return react__WEBPACK_IMPORTED_MODULE_0___default().createElement(react__WEBPACK_IMPORTED_MODULE_0__.Fragment, null, children, content);
 };
 
-var renderChildren = function renderChildren(children) {
-  var args = [];
-
-  for (var _i = 1; _i < arguments.length; _i++) {
-    args[_i - 1] = arguments[_i];
-  }
-
-  return (0,_formily_shared__WEBPACK_IMPORTED_MODULE_3__/* .isFn */ .LQ)(children) ? children.apply(void 0, __spreadArray([], __read(args), false)) : children;
+var renderChildren = function renderChildren(children, field, form) {
+  return (0,_formily_shared__WEBPACK_IMPORTED_MODULE_3__/* .isFn */ .LQ)(children) ? children(field, form) : children;
 };
 
 var ReactiveInternal = function ReactiveInternal(props) {
   var _a;
 
-  var options = (0,react__WEBPACK_IMPORTED_MODULE_0__.useContext)(_shared__WEBPACK_IMPORTED_MODULE_5__/* .SchemaOptionsContext */ .BB);
+  var components = (0,react__WEBPACK_IMPORTED_MODULE_0__.useContext)(_shared__WEBPACK_IMPORTED_MODULE_5__/* .SchemaComponentsContext */ .$B);
 
   if (!props.field) {
     return react__WEBPACK_IMPORTED_MODULE_0___default().createElement(react__WEBPACK_IMPORTED_MODULE_0__.Fragment, null, renderChildren(props.children));
@@ -11562,7 +11574,7 @@ var ReactiveInternal = function ReactiveInternal(props) {
       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;
+    var finalComponent = (_a = _formily_shared__WEBPACK_IMPORTED_MODULE_3__/* .FormPath.getIn */ .Dm.getIn(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);
   };
 
@@ -11609,7 +11621,7 @@ var ReactiveInternal = function ReactiveInternal(props) {
     } : (_c = field.componentProps) === 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(components, field.componentType)) !== null && _d !== void 0 ? _d : field.componentType;
     return react__WEBPACK_IMPORTED_MODULE_0___default().createElement(finalComponent, __assign(__assign({
       disabled: disabled,
       readOnly: readOnly
@@ -11675,16 +11687,10 @@ var __assign = undefined && undefined.__assign || function () {
 
 
 var useFieldProps = function useFieldProps(schema) {
-  var options = (0,react__WEBPACK_IMPORTED_MODULE_0__.useContext)(_shared__WEBPACK_IMPORTED_MODULE_3__/* .SchemaOptionsContext */ .BB);
   var scope = (0,react__WEBPACK_IMPORTED_MODULE_0__.useContext)(_shared__WEBPACK_IMPORTED_MODULE_3__/* .SchemaExpressionScopeContext */ .pv);
-  var scopeRef = (0,react__WEBPACK_IMPORTED_MODULE_0__.useRef)();
-  scopeRef.current = scope;
-  return schema.toFieldProps(__assign(__assign({}, options), {
-    get scope() {
-      return __assign(__assign({}, options.scope), scopeRef.current);
-    }
-
-  }));
+  return schema.toFieldProps({
+    scope: scope
+  });
 };
 
 var useBasePath = function useBasePath(props) {
@@ -11783,9 +11789,10 @@ var RecursionField = function RecursionField(props) {
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(59787);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var _formily_json_schema__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(89924);
-/* harmony import */ var ___WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(39956);
+/* harmony import */ var _RecursionField__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(97953);
 /* harmony import */ var _shared_render__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(17287);
 /* harmony import */ var _shared__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(36869);
+/* harmony import */ var _formily_shared__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(71131);
 var __assign = undefined && undefined.__assign || function () {
   __assign = Object.assign || function (t) {
     for (var s, i = 1, n = arguments.length; i < n; i++) {
@@ -11807,6 +11814,7 @@ var __assign = undefined && undefined.__assign || function () {
 
 
 
+
 var env = {
   nonameId: 0
 };
@@ -11834,23 +11842,23 @@ function createSchemaField(options) {
     };
 
     var renderChildren = function renderChildren() {
-      return react__WEBPACK_IMPORTED_MODULE_0___default().createElement(___WEBPACK_IMPORTED_MODULE_2__/* .RecursionField */ .Uk, __assign({}, props, {
+      return react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_RecursionField__WEBPACK_IMPORTED_MODULE_2__/* .RecursionField */ .U, __assign({}, props, {
         schema: schema
       }));
     };
 
     return react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_shared__WEBPACK_IMPORTED_MODULE_4__/* .SchemaOptionsContext.Provider */ .BB.Provider, {
-      value: __assign(__assign({}, options), {
-        components: __assign(__assign({}, options.components), props.components)
-      })
+      value: options
+    }, react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_shared__WEBPACK_IMPORTED_MODULE_4__/* .SchemaComponentsContext.Provider */ .$B.Provider, {
+      value: (0,_formily_shared__WEBPACK_IMPORTED_MODULE_5__/* .lazyMerge */ .e_)(options.components, props.components)
     }, react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_shared__WEBPACK_IMPORTED_MODULE_4__/* .SchemaExpressionScopeContext.Provider */ .pv.Provider, {
-      value: __assign(__assign({}, options.scope), props.scope)
-    }, renderMarkup(), renderChildren()));
+      value: (0,_formily_shared__WEBPACK_IMPORTED_MODULE_5__/* .lazyMerge */ .e_)(options.scope, props.scope)
+    }, renderMarkup(), renderChildren())));
   }
 
   SchemaField.displayName = 'SchemaField';
 
-  function MarkupField(props) {
+  function MarkupRender(props) {
     var parent = (0,react__WEBPACK_IMPORTED_MODULE_0__.useContext)(_shared__WEBPACK_IMPORTED_MODULE_4__/* .SchemaMarkupContext */ .Dc);
     if (!parent) return react__WEBPACK_IMPORTED_MODULE_0___default().createElement(react__WEBPACK_IMPORTED_MODULE_0__.Fragment, null);
 
@@ -11859,17 +11867,17 @@ function createSchemaField(options) {
     };
 
     var appendArraySchema = function appendArraySchema(schema) {
-      if (parent.items) {
-        return parent.addProperty(name, schema);
+      var items = parent.items;
+
+      if (items && items.name !== props.name) {
+        return parent.addProperty(props.name, schema);
       } else {
-        return parent.setItems(props);
+        return parent.setItems(schema);
       }
     };
 
-    var name = props.name || getRandomName();
-
     if (parent.type === 'object' || parent.type === 'void') {
-      var schema = parent.addProperty(name, props);
+      var schema = parent.addProperty(props.name, props);
       return react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_shared__WEBPACK_IMPORTED_MODULE_4__/* .SchemaMarkupContext.Provider */ .Dc.Provider, {
         value: schema
       }, renderChildren());
@@ -11883,6 +11891,12 @@ function createSchemaField(options) {
     }
   }
 
+  function MarkupField(props) {
+    return react__WEBPACK_IMPORTED_MODULE_0___default().createElement(MarkupRender, __assign({}, props, {
+      name: props.name || getRandomName()
+    }));
+  }
+
   MarkupField.displayName = 'MarkupField';
 
   function StringField(props) {
@@ -12237,6 +12251,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   "Observer": () => (/* reexport safe */ _shared__WEBPACK_IMPORTED_MODULE_2__.Qj),
 /* harmony export */   "RecursionField": () => (/* reexport safe */ _components__WEBPACK_IMPORTED_MODULE_1__.Uk),
 /* harmony export */   "Schema": () => (/* reexport safe */ _formily_json_schema__WEBPACK_IMPORTED_MODULE_0__.V),
+/* harmony export */   "SchemaComponentsContext": () => (/* reexport safe */ _shared__WEBPACK_IMPORTED_MODULE_2__.$B),
 /* harmony export */   "SchemaContext": () => (/* reexport safe */ _shared__WEBPACK_IMPORTED_MODULE_2__.Gi),
 /* harmony export */   "SchemaExpressionScopeContext": () => (/* reexport safe */ _shared__WEBPACK_IMPORTED_MODULE_2__.pv),
 /* harmony export */   "SchemaMarkupContext": () => (/* reexport safe */ _shared__WEBPACK_IMPORTED_MODULE_2__.Dc),
@@ -12386,6 +12401,7 @@ function connect(target) {
 
 "use strict";
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   "$B": () => (/* binding */ SchemaComponentsContext),
 /* harmony export */   "BB": () => (/* binding */ SchemaOptionsContext),
 /* harmony export */   "Dc": () => (/* binding */ SchemaMarkupContext),
 /* harmony export */   "Gi": () => (/* binding */ SchemaContext),
@@ -12420,8 +12436,9 @@ var FieldContext = (0,react__WEBPACK_IMPORTED_MODULE_0__.createContext)(null);
 var SchemaMarkupContext = (0,react__WEBPACK_IMPORTED_MODULE_0__.createContext)(null);
 var SchemaContext = (0,react__WEBPACK_IMPORTED_MODULE_0__.createContext)(null);
 var SchemaExpressionScopeContext = (0,react__WEBPACK_IMPORTED_MODULE_0__.createContext)(null);
+var SchemaComponentsContext = (0,react__WEBPACK_IMPORTED_MODULE_0__.createContext)(null);
 var SchemaOptionsContext = (0,react__WEBPACK_IMPORTED_MODULE_0__.createContext)(null);
-var ContextCleaner = createContextCleaner(FieldContext, SchemaMarkupContext, SchemaContext, SchemaExpressionScopeContext, SchemaOptionsContext);
+var ContextCleaner = createContextCleaner(FieldContext, SchemaMarkupContext, SchemaContext, SchemaExpressionScopeContext, SchemaComponentsContext, SchemaOptionsContext);
 
 /***/ }),
 
@@ -12430,6 +12447,7 @@ var ContextCleaner = createContextCleaner(FieldContext, SchemaMarkupContext, Sch
 
 "use strict";
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   "$B": () => (/* reexport safe */ _context__WEBPACK_IMPORTED_MODULE_0__.$B),
 /* harmony export */   "$j": () => (/* reexport safe */ _connect__WEBPACK_IMPORTED_MODULE_1__.$j),
 /* harmony export */   "BB": () => (/* reexport safe */ _context__WEBPACK_IMPORTED_MODULE_0__.BB),
 /* harmony export */   "Dc": () => (/* reexport safe */ _context__WEBPACK_IMPORTED_MODULE_0__.Dc),
@@ -13020,33 +13038,6 @@ var box = (0,_internals__WEBPACK_IMPORTED_MODULE_1__/* .createAnnotation */ .Bh)
 /* 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;
-};
-
 
 
 
@@ -13054,23 +13045,47 @@ var __read = undefined && undefined.__read || function (o, n) {
 
 var getDescriptor = Object.getOwnPropertyDescriptor;
 var getProto = Object.getPrototypeOf;
+var ClassDescriptorMap = new WeakMap();
+
+function getPropertyDescriptor(obj, key) {
+  if (!obj) return;
+  return getDescriptor(obj, key) || getPropertyDescriptor(getProto(obj), key);
+}
+
+function getPropertyDescriptorCache(obj, key) {
+  var constructor = obj.constructor;
+  if (constructor === Object || constructor === Array) return getPropertyDescriptor(obj, key);
+  var cache = ClassDescriptorMap.get(constructor) || {};
+  var descriptor = cache[key];
+  if (descriptor) return descriptor;
+  var newDesc = getPropertyDescriptor(obj, key);
+  ClassDescriptorMap.set(constructor, cache);
+  cache[key] = newDesc;
+  return newDesc;
+}
 
-function getGetterAndSetter(target, key, value) {
+function getPrototypeDescriptor(target, key, value) {
   if (!target) {
     if (value) {
       if ((0,_checkers__WEBPACK_IMPORTED_MODULE_3__/* .isFn */ .LQ)(value)) {
-        return [value];
+        return {
+          get: value
+        };
       } else {
-        return [value.get, value.set];
+        return value;
       }
     }
 
-    return [];
+    return {};
+  }
+
+  var descriptor = getPropertyDescriptorCache(target, key);
+
+  if (descriptor) {
+    return descriptor;
   }
 
-  var descriptor = getDescriptor(target, key);
-  if (descriptor) return [descriptor.get, descriptor.set];
-  return getGetterAndSetter(getProto(target), key, value);
+  return {};
 }
 
 var computed = (0,_internals__WEBPACK_IMPORTED_MODULE_1__/* .createAnnotation */ .Bh)(function (_a) {
@@ -13081,13 +13096,12 @@ var computed = (0,_internals__WEBPACK_IMPORTED_MODULE_1__/* .createAnnotation */
   var proxy = {};
   var context = target ? target : store;
   var property = target ? key : 'value';
-
-  var _b = __read(getGetterAndSetter(context, property, value), 2),
-      getter = _b[0],
-      setter = _b[1];
+  var descriptor = getPrototypeDescriptor(target, property, value);
 
   function compute() {
-    store.value = getter === null || getter === void 0 ? void 0 : getter.call(context);
+    var _a;
+
+    store.value = (_a = descriptor.get) === null || _a === void 0 ? void 0 : _a.call(context);
   }
 
   function reaction() {
@@ -13144,9 +13158,11 @@ 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);
+      (_a = descriptor.set) === null || _a === void 0 ? void 0 : _a.call(context, value);
     } finally {
       (0,_reaction__WEBPACK_IMPORTED_MODULE_4__/* .batchEnd */ .ks)();
     }
@@ -14423,6 +14439,7 @@ var createObservable = function createObservable(target, key, value, shallow) {
 
   if (!!raw) {
     var node = (0,_tree__WEBPACK_IMPORTED_MODULE_3__/* .getDataNode */ .bl)(raw);
+    if (!node.target) node.target = target;
     node.key = key;
     return value;
   }
@@ -14958,12 +14975,12 @@ var Tracker =
 /** @class */
 function () {
   function Tracker(scheduler, name) {
-    var _this = this;
-
     if (name === void 0) {
       name = 'TrackerReaction';
     }
 
+    var _this = this;
+
     this.track = function (tracker) {
       if (!(0,_checkers__WEBPACK_IMPORTED_MODULE_1__/* .isFn */ .LQ)(tracker)) return _this.results;
       if (_this.track._boundary > 0) return;
@@ -15727,9 +15744,10 @@ var globalThisPolyfill = globalSelf();
 /* harmony export */   "BP": () => (/* reexport safe */ _checkers__WEBPACK_IMPORTED_MODULE_2__.BP),
 /* harmony export */   "Bl": () => (/* reexport safe */ _checkers__WEBPACK_IMPORTED_MODULE_2__.Bl),
 /* harmony export */   "Dm": () => (/* reexport safe */ _path__WEBPACK_IMPORTED_MODULE_8__.D),
+/* harmony export */   "G7": () => (/* reexport safe */ _isEmpty__WEBPACK_IMPORTED_MODULE_4__.G7),
 /* harmony export */   "H1": () => (/* reexport safe */ _checkers__WEBPACK_IMPORTED_MODULE_2__.H1),
 /* harmony export */   "Ho": () => (/* reexport safe */ _case__WEBPACK_IMPORTED_MODULE_5__.Ho),
-/* harmony export */   "JY": () => (/* reexport safe */ _isEmpty__WEBPACK_IMPORTED_MODULE_4__.J),
+/* harmony export */   "JY": () => (/* reexport safe */ _isEmpty__WEBPACK_IMPORTED_MODULE_4__.JY),
 /* harmony export */   "LQ": () => (/* reexport safe */ _checkers__WEBPACK_IMPORTED_MODULE_2__.LQ),
 /* harmony export */   "S6": () => (/* reexport safe */ _array__WEBPACK_IMPORTED_MODULE_0__.S6),
 /* harmony export */   "TS": () => (/* reexport safe */ _merge__WEBPACK_IMPORTED_MODULE_12__.T),
@@ -15740,6 +15758,7 @@ var globalThisPolyfill = globalSelf();
 /* harmony export */   "d8": () => (/* reexport safe */ _checkers__WEBPACK_IMPORTED_MODULE_2__.d8),
 /* harmony export */   "d9": () => (/* reexport safe */ _clone__WEBPACK_IMPORTED_MODULE_3__.d),
 /* harmony export */   "e9": () => (/* reexport safe */ _checkers__WEBPACK_IMPORTED_MODULE_2__.e9),
+/* harmony export */   "e_": () => (/* reexport safe */ _merge__WEBPACK_IMPORTED_MODULE_12__.e),
 /* harmony export */   "hQ": () => (/* reexport safe */ _uid__WEBPACK_IMPORTED_MODULE_15__.h),
 /* harmony export */   "iw": () => (/* reexport safe */ _instanceof__WEBPACK_IMPORTED_MODULE_13__.i),
 /* harmony export */   "kk": () => (/* reexport safe */ _global__WEBPACK_IMPORTED_MODULE_7__.k),
@@ -15749,7 +15768,7 @@ var globalThisPolyfill = globalSelf();
 /* harmony export */   "u4": () => (/* reexport safe */ _array__WEBPACK_IMPORTED_MODULE_0__.u4),
 /* harmony export */   "ug": () => (/* reexport safe */ _string__WEBPACK_IMPORTED_MODULE_6__.u),
 /* harmony export */   "vl": () => (/* reexport safe */ _case__WEBPACK_IMPORTED_MODULE_5__.vl),
-/* harmony export */   "xb": () => (/* reexport safe */ _isEmpty__WEBPACK_IMPORTED_MODULE_4__.x)
+/* harmony export */   "xb": () => (/* reexport safe */ _isEmpty__WEBPACK_IMPORTED_MODULE_4__.xb)
 /* harmony export */ });
 /* harmony import */ var _array__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(76162);
 /* harmony import */ var _compare__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(59975);
@@ -15810,13 +15829,17 @@ var instOf = function instOf(value, cls) {
 
 "use strict";
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   "J": () => (/* binding */ isValid),
-/* harmony export */   "x": () => (/* binding */ isEmpty)
+/* harmony export */   "G7": () => (/* binding */ isUndef),
+/* harmony export */   "JY": () => (/* binding */ isValid),
+/* harmony export */   "xb": () => (/* binding */ isEmpty)
 /* harmony export */ });
 /* harmony import */ var _instanceof__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(97430);
 
 var has = Object.prototype.hasOwnProperty;
 var toString = Object.prototype.toString;
+var isUndef = function isUndef(val) {
+  return val === undefined;
+};
 var isValid = function isValid(val) {
   return val !== undefined && val !== null;
 };
@@ -15912,7 +15935,8 @@ function isEmpty(val, strict) {
 
 "use strict";
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   "T": () => (/* binding */ merge)
+/* harmony export */   "T": () => (/* binding */ merge),
+/* harmony export */   "e": () => (/* binding */ lazyMerge)
 /* harmony export */ });
 /* harmony import */ var _isEmpty__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(81433);
 /* harmony import */ var _checkers__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(6808);
@@ -15987,7 +16011,7 @@ function getEnumerableOwnPropertySymbols(target) {
 }
 
 function getKeys(target) {
-  if (!(0,_isEmpty__WEBPACK_IMPORTED_MODULE_0__/* .isValid */ .J)(target)) return [];
+  if (!(0,_isEmpty__WEBPACK_IMPORTED_MODULE_0__/* .isValid */ .JY)(target)) return [];
   return Object.keys(target).concat(getEnumerableOwnPropertySymbols(target));
 }
 
@@ -16023,7 +16047,7 @@ function mergeObject(target, source, options) {
       return;
     }
 
-    if ((0,_isEmpty__WEBPACK_IMPORTED_MODULE_0__/* .isEmpty */ .x)(target[key])) {
+    if ((0,_isEmpty__WEBPACK_IMPORTED_MODULE_0__/* .isEmpty */ .xb)(target[key])) {
       destination[key] = source[key];
     } else if (propertyIsOnObject(target, key) && options.isMergeableObject(source[key])) {
       destination[key] = getMergeFunction(key, options)(target[key], source[key], options);
@@ -16054,6 +16078,40 @@ function deepmerge(target, source, options) {
   }
 }
 
+var lazyMerge = function lazyMerge(target, source) {
+  if (!(0,_isEmpty__WEBPACK_IMPORTED_MODULE_0__/* .isValid */ .JY)(source)) return target;
+  if (!(0,_isEmpty__WEBPACK_IMPORTED_MODULE_0__/* .isValid */ .JY)(target)) return source;
+  if (_typeof(target) !== 'object') return source;
+  if (_typeof(source) !== 'object') return target;
+  return new Proxy({}, {
+    get: function get(_, key) {
+      if (key in source) return source[key];
+      return target[key];
+    },
+    ownKeys: function ownKeys() {
+      var keys = Object.keys(target);
+
+      for (var key in source) {
+        if (!(key in target)) {
+          keys.push(key);
+        }
+      }
+
+      return keys;
+    },
+    getOwnPropertyDescriptor: function getOwnPropertyDescriptor() {
+      return {
+        enumerable: true,
+        configurable: true,
+        writable: false
+      };
+    },
+    has: function has(_, key) {
+      if (key in source || key in target) return true;
+      return false;
+    }
+  });
+};
 var merge = deepmerge;
 
 /***/ }),
@@ -18780,10 +18838,11 @@ var useClickAway = function useClickAway(onClickAway, target, eventName) {
 /* harmony import */ var _alicloudfe_components__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_0__);
 
 var usePrefixCls = function usePrefixCls(tag, props) {
-  var _a, _b, _c;
+  var _a, _b, _c, _d;
 
   var getContext = _alicloudfe_components__WEBPACK_IMPORTED_MODULE_0__.ConfigProvider.getContext;
-  var prefix = (_c = (_a = props === null || props === void 0 ? void 0 : props.prefix) !== null && _a !== void 0 ? _a : (_b = getContext()) === null || _b === void 0 ? void 0 : _b.prefix) !== null && _c !== void 0 ? _c : 'next-';
+  var prefix = (_d = (_b = (_a = props === null || props === void 0 ? void 0 : props.prefix) !== null && _a !== void 0 ? _a : // @ts-ignore
+  window.TEAMIX_FORMILY_PREFIX) !== null && _b !== void 0 ? _b : (_c = getContext()) === null || _c === void 0 ? void 0 : _c.prefix) !== null && _d !== void 0 ? _d : 'next-';
   return "".concat(prefix).concat(tag !== null && tag !== void 0 ? tag : '');
 };
 
@@ -19537,19 +19596,22 @@ var useRecord = function useRecord(record) {
   return ctx ? ctx.record : record;
 };
 
-var getDefaultValue = function getDefaultValue(defaultValue, schema) {
-  var _a, _b, _c, _d, _e, _f, _g;
+var getSchemaDefaultValue = function getSchemaDefaultValue(schema) {
+  if ((schema === null || schema === void 0 ? void 0 : schema.type) === 'array') return [];
+  if ((schema === null || schema === void 0 ? void 0 : schema.type) === 'object') return {};
+
+  if ((schema === null || schema === void 0 ? void 0 : schema.type) === 'void') {
+    for (var key in schema.properties) {
+      var value = getSchemaDefaultValue(schema.properties[key]);
+      if ((0,_formily_shared__WEBPACK_IMPORTED_MODULE_2__/* .isValid */ .JY)(value)) return value;
+    }
+  }
+};
 
+var getDefaultValue = function getDefaultValue(defaultValue, schema) {
   if ((0,_formily_shared__WEBPACK_IMPORTED_MODULE_2__/* .isValid */ .JY)(defaultValue)) return (0,_formily_shared__WEBPACK_IMPORTED_MODULE_2__/* .clone */ .d9)(defaultValue);
-  if (Array.isArray(schema === null || schema === void 0 ? void 0 : schema.items)) return getDefaultValue(defaultValue, schema.items[0]);
-  if (((_a = schema === null || schema === void 0 ? void 0 : schema.items) === null || _a === void 0 ? void 0 : _a.type) === 'array') return [];
-  if (((_b = schema === null || schema === void 0 ? void 0 : schema.items) === null || _b === void 0 ? void 0 : _b.type) === 'boolean') return true;
-  if (((_c = schema === null || schema === void 0 ? void 0 : schema.items) === null || _c === void 0 ? void 0 : _c.type) === 'date') return '';
-  if (((_d = schema === null || schema === void 0 ? void 0 : schema.items) === null || _d === void 0 ? void 0 : _d.type) === 'datetime') return '';
-  if (((_e = schema === null || schema === void 0 ? void 0 : schema.items) === null || _e === void 0 ? void 0 : _e.type) === 'number') return 0;
-  if (((_f = schema === null || schema === void 0 ? void 0 : schema.items) === null || _f === void 0 ? void 0 : _f.type) === 'object') return {};
-  if (((_g = schema === null || schema === void 0 ? void 0 : schema.items) === null || _g === void 0 ? void 0 : _g.type) === 'string') return '';
-  return null;
+  if (Array.isArray(schema === null || schema === void 0 ? void 0 : schema.items)) return getSchemaDefaultValue(schema.items[0]);
+  return getSchemaDefaultValue(schema.items);
 };
 
 var ArrayBase = function ArrayBase(props) {
@@ -19604,7 +19666,7 @@ ArrayBase.Index = function (props) {
 };
 
 ArrayBase.Addition = function (props) {
-  var _a, _b, _c;
+  var _a, _b;
 
   var self = (0,_formily_react__WEBPACK_IMPORTED_MODULE_3__.useField)();
   var array = useArray();
@@ -19612,7 +19674,7 @@ ArrayBase.Addition = function (props) {
   if (!array) return null;
   if (((_a = array.field) === null || _a === void 0 ? void 0 : _a.pattern) !== 'editable' && ((_b = array.field) === null || _b === void 0 ? void 0 : _b.pattern) !== 'disabled') return null;
   return react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_1__.Button, __assign({}, props, {
-    disabled: (0,_formily_shared__WEBPACK_IMPORTED_MODULE_2__/* .isBool */ .Bl)(self === null || self === void 0 ? void 0 : self.disabled) ? self === null || self === void 0 ? void 0 : self.disabled : (_c = array.field) === null || _c === void 0 ? void 0 : _c.disabled,
+    disabled: self === null || self === void 0 ? void 0 : self.disabled,
     className: classnames__WEBPACK_IMPORTED_MODULE_5___default()("".concat(prefixCls, "-addition"), props.className),
     style: __assign({
       display: 'block',
@@ -19644,20 +19706,21 @@ ArrayBase.Remove = react__WEBPACK_IMPORTED_MODULE_0___default().forwardRef(funct
   var _a;
 
   var index = useIndex(props.index);
+  var self = (0,_formily_react__WEBPACK_IMPORTED_MODULE_3__.useField)();
   var array = useArray();
   var prefixCls = (0,_builtins___WEBPACK_IMPORTED_MODULE_6__/* .usePrefixCls */ .F)('formily-array-base');
   if (!array) return null;
   if (((_a = array.field) === null || _a === void 0 ? void 0 : _a.pattern) !== 'editable') return null;
   return react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_builtins___WEBPACK_IMPORTED_MODULE_7__/* .DeleteOutlinedIcon */ .TG, __assign({}, props, {
-    className: classnames__WEBPACK_IMPORTED_MODULE_5___default()("".concat(prefixCls, "-remove"), props.className),
+    className: classnames__WEBPACK_IMPORTED_MODULE_5___default()("".concat(prefixCls, "-remove"), (self === null || self === void 0 ? void 0 : self.disabled) ? "".concat(prefixCls, "-remove-disabled") : '', props.className),
     ref: ref,
     onClick: function onClick(e) {
-      var _a, _b, _c, _d, _e;
+      var _a, _b, _c, _d;
 
-      if ((_a = array.props) === null || _a === void 0 ? void 0 : _a.disabled) return;
+      if (self === null || self === void 0 ? void 0 : self.disabled) return;
       e.stopPropagation();
-      (_c = (_b = array.field) === null || _b === void 0 ? void 0 : _b.remove) === null || _c === void 0 ? void 0 : _c.call(_b, index);
-      (_e = (_d = array.props) === null || _d === void 0 ? void 0 : _d.onRemove) === null || _e === void 0 ? void 0 : _e.call(_d, index);
+      (_b = (_a = array.field) === null || _a === void 0 ? void 0 : _a.remove) === null || _b === void 0 ? void 0 : _b.call(_a, index);
+      (_d = (_c = array.props) === null || _c === void 0 ? void 0 : _c.onRemove) === null || _d === void 0 ? void 0 : _d.call(_c, index);
 
       if (props.onClick) {
         props.onClick(e);
@@ -19669,20 +19732,21 @@ ArrayBase.MoveDown = react__WEBPACK_IMPORTED_MODULE_0___default().forwardRef(fun
   var _a;
 
   var index = useIndex(props.index);
+  var self = (0,_formily_react__WEBPACK_IMPORTED_MODULE_3__.useField)();
   var array = useArray();
   var prefixCls = (0,_builtins___WEBPACK_IMPORTED_MODULE_6__/* .usePrefixCls */ .F)('formily-array-base');
   if (!array) return null;
   if (((_a = array.field) === null || _a === void 0 ? void 0 : _a.pattern) !== 'editable') return null;
   return react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_builtins___WEBPACK_IMPORTED_MODULE_7__/* .DownOutlinedIcon */ .zI, __assign({}, props, {
-    className: classnames__WEBPACK_IMPORTED_MODULE_5___default()("".concat(prefixCls, "-move-down"), props.className),
+    className: classnames__WEBPACK_IMPORTED_MODULE_5___default()("".concat(prefixCls, "-move-down"), (self === null || self === void 0 ? void 0 : self.disabled) ? "".concat(prefixCls, "-move-down-disabled") : '', props.className),
     ref: ref,
     onClick: function onClick(e) {
-      var _a, _b, _c, _d, _e;
+      var _a, _b, _c, _d;
 
-      if ((_a = array.props) === null || _a === void 0 ? void 0 : _a.disabled) return;
+      if (self === null || self === void 0 ? void 0 : self.disabled) return;
       e.stopPropagation();
-      (_c = (_b = array.field) === null || _b === void 0 ? void 0 : _b.moveDown) === null || _c === void 0 ? void 0 : _c.call(_b, index);
-      (_e = (_d = array.props) === null || _d === void 0 ? void 0 : _d.onMoveDown) === null || _e === void 0 ? void 0 : _e.call(_d, index);
+      (_b = (_a = array.field) === null || _a === void 0 ? void 0 : _a.moveDown) === null || _b === void 0 ? void 0 : _b.call(_a, index);
+      (_d = (_c = array.props) === null || _c === void 0 ? void 0 : _c.onMoveDown) === null || _d === void 0 ? void 0 : _d.call(_c, index);
 
       if (props.onClick) {
         props.onClick(e);
@@ -19694,20 +19758,21 @@ ArrayBase.MoveUp = react__WEBPACK_IMPORTED_MODULE_0___default().forwardRef(funct
   var _a;
 
   var index = useIndex(props.index);
+  var self = (0,_formily_react__WEBPACK_IMPORTED_MODULE_3__.useField)();
   var array = useArray();
   var prefixCls = (0,_builtins___WEBPACK_IMPORTED_MODULE_6__/* .usePrefixCls */ .F)('formily-array-base');
   if (!array) return null;
   if (((_a = array.field) === null || _a === void 0 ? void 0 : _a.pattern) !== 'editable') return null;
   return react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_builtins___WEBPACK_IMPORTED_MODULE_7__/* .UpOutlinedIcon */ .XX, __assign({}, props, {
-    className: classnames__WEBPACK_IMPORTED_MODULE_5___default()("".concat(prefixCls, "-move-up"), props.className),
+    className: classnames__WEBPACK_IMPORTED_MODULE_5___default()("".concat(prefixCls, "-move-up"), (self === null || self === void 0 ? void 0 : self.disabled) ? "".concat(prefixCls, "-move-up-disabled") : '', props.className),
     ref: ref,
     onClick: function onClick(e) {
-      var _a, _b, _c, _d;
+      var _a, _b, _c;
 
-      if ((_a = array.props) === null || _a === void 0 ? void 0 : _a.disabled) return;
+      if (self === null || self === void 0 ? void 0 : self.disabled) return;
       e.stopPropagation();
-      (_b = array === null || array === void 0 ? void 0 : array.field) === null || _b === void 0 ? void 0 : _b.moveUp(index);
-      (_d = (_c = array === null || array === void 0 ? void 0 : array.props) === null || _c === void 0 ? void 0 : _c.onMoveUp) === null || _d === void 0 ? void 0 : _d.call(_c, index);
+      (_a = array === null || array === void 0 ? void 0 : array.field) === null || _a === void 0 ? void 0 : _a.moveUp(index);
+      (_c = (_b = array === null || array === void 0 ? void 0 : array.props) === null || _b === void 0 ? void 0 : _b.onMoveUp) === null || _c === void 0 ? void 0 : _c.call(_b, index);
 
       if (props.onClick) {
         props.onClick(e);
@@ -20571,16 +20636,20 @@ var StatusSelect = (0,_formily_react__WEBPACK_IMPORTED_MODULE_3__.observer)(func
     }, 100);
   }
 });
+var PaginationContext = (0,react__WEBPACK_IMPORTED_MODULE_0__.createContext)({});
 
-var ArrayTablePagination = function ArrayTablePagination(_a) {
-  var _b;
+var usePagination = function usePagination() {
+  return (0,react__WEBPACK_IMPORTED_MODULE_0__.useContext)(PaginationContext);
+};
 
-  var dataSource = _a.dataSource,
-      props = __rest(_a, ["dataSource"]);
+var ArrayTablePagination = function ArrayTablePagination(_a) {
+  var children = _a.children,
+      dataSource = _a.dataSource,
+      props = __rest(_a, ["children", "dataSource"]);
 
-  var _c = __read((0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(1), 2),
-      current = _c[0],
-      setCurrent = _c[1];
+  var _b = __read((0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(1), 2),
+      current = _b[0],
+      setCurrent = _b[1];
 
   var prefixCls = (0,_builtins___WEBPACK_IMPORTED_MODULE_6__/* .usePrefixCls */ .F)('formily-array-table');
   var pageSize = props.pageSize || 10;
@@ -20628,7 +20697,13 @@ var ArrayTablePagination = function ArrayTablePagination(_a) {
     })));
   };
 
-  return react__WEBPACK_IMPORTED_MODULE_0___default().createElement(react__WEBPACK_IMPORTED_MODULE_0__.Fragment, null, (_b = props.children) === null || _b === void 0 ? void 0 : _b.call(props, dataSource === null || dataSource === void 0 ? void 0 : dataSource.slice(startIndex, endIndex + 1), renderPagination()));
+  return react__WEBPACK_IMPORTED_MODULE_0___default().createElement(react__WEBPACK_IMPORTED_MODULE_0__.Fragment, null, react__WEBPACK_IMPORTED_MODULE_0___default().createElement(PaginationContext.Provider, {
+    value: {
+      totalPage: totalPage,
+      pageSize: pageSize,
+      changePage: handleChange
+    }
+  }, children === null || children === void 0 ? void 0 : children(dataSource === null || dataSource === void 0 ? void 0 : dataSource.slice(startIndex, endIndex + 1), renderPagination())));
 };
 
 var omit = function omit(props, keys) {
@@ -20684,6 +20759,34 @@ ArrayTable.Column = function () {
 };
 
 _array_base__WEBPACK_IMPORTED_MODULE_5__/* .ArrayBase.mixin */ .w.mixin(ArrayTable);
+
+var Addition = function Addition(props) {
+  var array = _array_base__WEBPACK_IMPORTED_MODULE_5__/* .ArrayBase.useArray */ .w.useArray();
+
+  var _a = usePagination(),
+      _b = _a.totalPage,
+      totalPage = _b === void 0 ? 0 : _b,
+      _c = _a.pageSize,
+      pageSize = _c === void 0 ? 10 : _c,
+      changePage = _a.changePage;
+
+  return react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_array_base__WEBPACK_IMPORTED_MODULE_5__/* .ArrayBase.Addition */ .w.Addition, __assign({}, props, {
+    onClick: function onClick(e) {
+      var _a, _b; // 如果添加数据后将超过当前页，则自动切换到下一页
+
+
+      var total = ((_a = array === null || array === void 0 ? void 0 : array.field) === null || _a === void 0 ? void 0 : _a.value.length) || 0;
+
+      if (total === totalPage * pageSize + 1 && (0,_formily_shared__WEBPACK_IMPORTED_MODULE_4__/* .isFn */ .LQ)(changePage)) {
+        changePage(totalPage + 1);
+      }
+
+      (_b = props.onClick) === null || _b === void 0 ? void 0 : _b.call(props, e);
+    }
+  }));
+};
+
+ArrayTable.Addition = Addition;
 /* unused harmony default export */ var __WEBPACK_DEFAULT_EXPORT__ = ((/* unused pure expression or super */ null && (ArrayTable)));
 
 /***/ }),
@@ -20788,18 +20891,25 @@ var mapDateFormat = function mapDateFormat(type) {
       return 'YYYY-wo';
     }
 
-    return props['showTime'] ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD';
+    return 'YYYY-MM-DD';
   };
 
   return function (props) {
-    var format = props['format'] || getDefaultFormat(props);
+    var dateFormat = props['format'] || getDefaultFormat(props);
+    var valueFormat = dateFormat;
+
+    if (props.showTime) {
+      var timeFormat = props.showTime.format || 'HH:mm:ss';
+      valueFormat = "".concat(valueFormat, " ").concat(timeFormat);
+    }
+
     var _onChange = props.onChange;
     return __assign(__assign({}, props), {
-      format: format,
-      value: (0,_builtins___WEBPACK_IMPORTED_MODULE_2__/* .momentable */ .y)(props.value, format === 'YYYY-wo' ? 'YYYY-w' : format),
+      format: dateFormat,
+      value: (0,_builtins___WEBPACK_IMPORTED_MODULE_2__/* .momentable */ .y)(props.value, valueFormat === 'YYYY-wo' ? 'YYYY-w' : valueFormat),
       onChange: function onChange(value) {
         if (_onChange) {
-          _onChange((0,_builtins___WEBPACK_IMPORTED_MODULE_2__/* .formatMomentValue */ .$)(value, format));
+          _onChange((0,_builtins___WEBPACK_IMPORTED_MODULE_2__/* .formatMomentValue */ .$)(value, valueFormat));
         }
       }
     });
@@ -21310,7 +21420,7 @@ Editable.Popover = (0,_formily_react__WEBPACK_IMPORTED_MODULE_2__.observer)(func
 /* harmony export */ });
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(59787);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var react_sticky_box__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(23060);
+/* harmony import */ var react_sticky_box__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(17129);
 /* harmony import */ var _space__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(7288);
 /* harmony import */ var _form_item__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(97848);
 /* harmony import */ var _builtins___WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(35166);
@@ -21618,7 +21728,7 @@ var FormCollapse = (0,_formily_react__WEBPACK_IMPORTED_MODULE_3__.observer)(func
   var prefixCls = (0,_builtins___WEBPACK_IMPORTED_MODULE_6__/* .usePrefixCls */ .F)('formily-collapse', props);
 
   var _formCollapse = (0,react__WEBPACK_IMPORTED_MODULE_0__.useMemo)(function () {
-    return formCollapse ? formCollapse : createFormCollapse();
+    return formCollapse ? formCollapse : createFormCollapse(props.defaultExpandedKeys);
   }, []);
 
   var takeExpandedKeys = function takeExpandedKeys() {
@@ -23614,11 +23724,15 @@ var createFormStep = function createFormStep(defaultCurrent) {
     defaultCurrent = 0;
   }
 
-  var env = {
+  var env = (0,_formily_reactive__WEBPACK_IMPORTED_MODULE_1__.define)({
     form: null,
     field: null,
     steps: []
-  };
+  }, {
+    form: _formily_reactive__WEBPACK_IMPORTED_MODULE_1__.observable.ref,
+    field: _formily_reactive__WEBPACK_IMPORTED_MODULE_1__.observable.ref,
+    steps: _formily_reactive__WEBPACK_IMPORTED_MODULE_1__.observable.shallow
+  });
   var setDisplay = _formily_reactive__WEBPACK_IMPORTED_MODULE_1__.action.bound(function (target) {
     var currentStep = env.steps[target];
     env.steps.forEach(function (_a) {
@@ -23635,14 +23749,12 @@ var createFormStep = function createFormStep(defaultCurrent) {
 
   var _next = function next() {
     if (formStep.allowNext) {
-      setDisplay(formStep.current + 1);
       formStep.setCurrent(formStep.current + 1);
     }
   };
 
   var _back = function back() {
     if (formStep.allowBack) {
-      setDisplay(formStep.current - 1);
       formStep.setCurrent(formStep.current - 1);
     }
   };
@@ -23655,6 +23767,7 @@ var createFormStep = function createFormStep(defaultCurrent) {
     },
     current: defaultCurrent,
     setCurrent: function setCurrent(key) {
+      setDisplay(key);
       formStep.current = key;
     },
 
@@ -23682,7 +23795,9 @@ var createFormStep = function createFormStep(defaultCurrent) {
             case 1:
               _b.sent();
 
-              _next();
+              if (env.form.valid) {
+                _next();
+              }
 
               return [3
               /*break*/
@@ -23863,11 +23978,26 @@ var createFormTab = function createFormTab(defaultActiveKey) {
   return (0,_formily_reactive__WEBPACK_IMPORTED_MODULE_2__.markRaw)(formTab);
 };
 
+var FeedbackBadge = (0,_formily_react__WEBPACK_IMPORTED_MODULE_4__.observer)(function (props) {
+  var field = (0,_formily_react__WEBPACK_IMPORTED_MODULE_4__.useField)();
+  var errors = field.form.queryFeedbacks({
+    type: 'error',
+    address: "".concat(field.address.concat(props.key), ".*")
+  });
+
+  if (errors.length) {
+    return react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_1__.Badge, {
+      className: "errors-badge",
+      count: errors.length
+    }, props.tab);
+  }
+
+  return react__WEBPACK_IMPORTED_MODULE_0___default().createElement(react__WEBPACK_IMPORTED_MODULE_0__.Fragment, null, props.tab);
+});
 var FormTab = (0,_formily_react__WEBPACK_IMPORTED_MODULE_4__.observer)(function (_a) {
   var formTab = _a.formTab,
       props = __rest(_a, ["formTab"]);
 
-  var field = (0,_formily_react__WEBPACK_IMPORTED_MODULE_4__.useField)();
   var tabs = useTabs();
 
   var _formTab = (0,react__WEBPACK_IMPORTED_MODULE_0__.useMemo)(function () {
@@ -23876,23 +24006,6 @@ var FormTab = (0,_formily_react__WEBPACK_IMPORTED_MODULE_4__.observer)(function
 
   var prefixCls = (0,_builtins___WEBPACK_IMPORTED_MODULE_6__/* .usePrefixCls */ .F)('formily-tab', props);
   var activeKey = props.activeKey || (_formTab === null || _formTab === void 0 ? void 0 : _formTab.activeKey);
-
-  var badgedTab = function badgedTab(key, props) {
-    var errors = field.form.queryFeedbacks({
-      type: 'error',
-      address: "".concat(field.address.concat(key), ".*")
-    });
-
-    if (errors.length) {
-      return react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_1__.Badge, {
-        className: "errors-badge",
-        count: errors.length
-      }, props.tab);
-    }
-
-    return props.tab;
-  };
-
   return react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_1__.Tab, __assign({}, props, (0,_formily_shared__WEBPACK_IMPORTED_MODULE_3__/* .isValid */ .JY)(activeKey) && {
     activeKey: activeKey
   }, {
@@ -23911,7 +24024,10 @@ var FormTab = (0,_formily_react__WEBPACK_IMPORTED_MODULE_4__.observer)(function
     return react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_1__.Tab.Item, __assign({
       key: key
     }, props, {
-      tab: badgedTab(name, props)
+      tab: react__WEBPACK_IMPORTED_MODULE_0___default().createElement(FeedbackBadge, {
+        key: name,
+        tab: props.tab
+      })
     }), react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_formily_react__WEBPACK_IMPORTED_MODULE_4__.RecursionField, {
       schema: schema,
       name: name
@@ -24044,7 +24160,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   "Checkbox": () => (/* reexport safe */ _checkbox__WEBPACK_IMPORTED_MODULE_20__.X),
 /* harmony export */   "DatePicker": () => (/* reexport safe */ _date_picker__WEBPACK_IMPORTED_MODULE_26__.M),
 /* harmony export */   "DatePicker2": () => (/* reexport safe */ _date_picker2__WEBPACK_IMPORTED_MODULE_27__.B),
-/* harmony export */   "Editable": () => (/* reexport safe */ _editable__WEBPACK_IMPORTED_MODULE_34__.C),
+/* harmony export */   "Editable": () => (/* reexport safe */ _editable__WEBPACK_IMPORTED_MODULE_35__.C),
 /* harmony export */   "Form": () => (/* reexport safe */ _form__WEBPACK_IMPORTED_MODULE_10__.l),
 /* harmony export */   "FormButtonGroup": () => (/* reexport safe */ _form_button_group__WEBPACK_IMPORTED_MODULE_15__.d),
 /* harmony export */   "FormCollapse": () => (/* reexport safe */ _form_collapse__WEBPACK_IMPORTED_MODULE_14__.o),
@@ -24059,20 +24175,21 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   "FormTab": () => (/* reexport safe */ _form_tab__WEBPACK_IMPORTED_MODULE_13__.K),
 /* harmony export */   "GridColumn": () => (/* reexport safe */ _form_grid__WEBPACK_IMPORTED_MODULE_8__.C4),
 /* harmony export */   "Input": () => (/* reexport safe */ _input__WEBPACK_IMPORTED_MODULE_16__.I),
-/* harmony export */   "NumberPicker": () => (/* reexport safe */ _number_picker__WEBPACK_IMPORTED_MODULE_29__.Y),
+/* harmony export */   "NumberPicker": () => (/* reexport safe */ _number_picker__WEBPACK_IMPORTED_MODULE_30__.Y),
 /* harmony export */   "Password": () => (/* reexport safe */ _password__WEBPACK_IMPORTED_MODULE_17__.r),
 /* harmony export */   "PreviewText": () => (/* reexport safe */ _preview_text__WEBPACK_IMPORTED_MODULE_18__.c),
 /* harmony export */   "Radio": () => (/* reexport safe */ _radio__WEBPACK_IMPORTED_MODULE_19__.Y),
-/* harmony export */   "Reset": () => (/* reexport safe */ _reset__WEBPACK_IMPORTED_MODULE_33__.A),
+/* harmony export */   "Reset": () => (/* reexport safe */ _reset__WEBPACK_IMPORTED_MODULE_34__.A),
 /* harmony export */   "Select": () => (/* reexport safe */ _select__WEBPACK_IMPORTED_MODULE_21__.P),
-/* harmony export */   "SelectTable": () => (/* reexport safe */ _select_table__WEBPACK_IMPORTED_MODULE_35__.c),
+/* harmony export */   "SelectTable": () => (/* reexport safe */ _select_table__WEBPACK_IMPORTED_MODULE_36__.c),
 /* harmony export */   "Space": () => (/* reexport safe */ _space__WEBPACK_IMPORTED_MODULE_23__.T),
-/* harmony export */   "Submit": () => (/* reexport safe */ _submit__WEBPACK_IMPORTED_MODULE_32__.k),
-/* harmony export */   "Switch": () => (/* reexport safe */ _switch__WEBPACK_IMPORTED_MODULE_30__.r),
+/* harmony export */   "Submit": () => (/* reexport safe */ _submit__WEBPACK_IMPORTED_MODULE_33__.k),
+/* harmony export */   "Switch": () => (/* reexport safe */ _switch__WEBPACK_IMPORTED_MODULE_31__.r),
 /* harmony export */   "TimePicker": () => (/* reexport safe */ _time_picker__WEBPACK_IMPORTED_MODULE_28__.j),
+/* harmony export */   "TimePicker2": () => (/* reexport safe */ _time_picker2__WEBPACK_IMPORTED_MODULE_29__.g),
 /* harmony export */   "Transfer": () => (/* reexport safe */ _transfer__WEBPACK_IMPORTED_MODULE_25__.F),
 /* harmony export */   "TreeSelect": () => (/* reexport safe */ _tree_select__WEBPACK_IMPORTED_MODULE_24__.m),
-/* harmony export */   "Upload": () => (/* reexport safe */ _upload__WEBPACK_IMPORTED_MODULE_31__.g),
+/* harmony export */   "Upload": () => (/* reexport safe */ _upload__WEBPACK_IMPORTED_MODULE_32__.g),
 /* harmony export */   "createFormGrid": () => (/* reexport safe */ _form_grid__WEBPACK_IMPORTED_MODULE_8__.CY),
 /* harmony export */   "useFormDeepLayout": () => (/* reexport safe */ _form_layout__WEBPACK_IMPORTED_MODULE_11__.Cj),
 /* harmony export */   "useFormGrid": () => (/* reexport safe */ _form_grid__WEBPACK_IMPORTED_MODULE_8__.he),
@@ -24110,13 +24227,15 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _date_picker__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(45930);
 /* harmony import */ var _date_picker2__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(3796);
 /* harmony import */ var _time_picker__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(30790);
-/* harmony import */ var _number_picker__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(57295);
-/* harmony import */ var _switch__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(43111);
-/* harmony import */ var _upload__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(28587);
-/* harmony import */ var _submit__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(52710);
-/* harmony import */ var _reset__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(96355);
-/* harmony import */ var _editable__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(91810);
-/* harmony import */ var _select_table__WEBPACK_IMPORTED_MODULE_35__ = __webpack_require__(97173);
+/* harmony import */ var _time_picker2__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(52216);
+/* harmony import */ var _number_picker__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(57295);
+/* harmony import */ var _switch__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(43111);
+/* harmony import */ var _upload__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(28587);
+/* harmony import */ var _submit__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(52710);
+/* harmony import */ var _reset__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(96355);
+/* harmony import */ var _editable__WEBPACK_IMPORTED_MODULE_35__ = __webpack_require__(91810);
+/* harmony import */ var _select_table__WEBPACK_IMPORTED_MODULE_36__ = __webpack_require__(97173);
+
 
 
 
@@ -24770,7 +24889,7 @@ var Cascader = (0,_formily_react__WEBPACK_IMPORTED_MODULE_2__.observer)(function
   var dataSource = ((_a = field === null || field === void 0 ? void 0 : field.dataSource) === null || _a === void 0 ? void 0 : _a.length) ? field.dataSource : ((_b = props === null || props === void 0 ? void 0 : props.dataSource) === null || _b === void 0 ? void 0 : _b.length) ? props.dataSource : [];
 
   var getSelected = function getSelected() {
-    return (0,_formily_shared__WEBPACK_IMPORTED_MODULE_1__/* .isArr */ .H1)(props.value) ? props.value : [];
+    return props.multiple ? (0,_formily_shared__WEBPACK_IMPORTED_MODULE_1__/* .toArr */ ._K)(props.value) : [props.value];
   };
 
   var getLabels = function getLabels() {
@@ -24780,7 +24899,9 @@ var Cascader = (0,_formily_react__WEBPACK_IMPORTED_MODULE_2__.observer)(function
     var labels = (_b = (_a = getValueByValue(dataSource, selected)) === null || _a === void 0 ? void 0 : _a.filter(function (item) {
       return (0,_formily_shared__WEBPACK_IMPORTED_MODULE_1__/* .isValid */ .JY)(item);
     })) === null || _b === void 0 ? void 0 : _b.map(function (item) {
-      return item === null || item === void 0 ? void 0 : item.whole.join('/');
+      var _a;
+
+      return (_a = item === null || item === void 0 ? void 0 : item.whole) === null || _a === void 0 ? void 0 : _a.join('/');
     }).join(', ');
     return labels || placeholder;
   };
@@ -24832,6 +24953,34 @@ var TimePicker = function TimePicker(props) {
   }, getLabels());
 };
 
+var TimePicker2 = function TimePicker2(props) {
+  var placeholder = usePlaceholder();
+  var prefixCls = (0,_builtins___WEBPACK_IMPORTED_MODULE_5__/* .usePrefixCls */ .F)('form-text', props);
+
+  var getLabels = function getLabels() {
+    var labels = (0,_builtins___WEBPACK_IMPORTED_MODULE_6__/* .formatMomentValue */ .$)(props.value, props.format, placeholder);
+    return (0,_formily_shared__WEBPACK_IMPORTED_MODULE_1__/* .isArr */ .H1)(labels) ? labels.join('~') : labels;
+  };
+
+  return react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
+    className: classnames__WEBPACK_IMPORTED_MODULE_4___default()(prefixCls, props.className)
+  }, getLabels());
+};
+
+var TimeRangePicker2 = function TimeRangePicker2(props) {
+  var placeholder = usePlaceholder();
+  var prefixCls = (0,_builtins___WEBPACK_IMPORTED_MODULE_5__/* .usePrefixCls */ .F)('form-text', props);
+
+  var getLabels = function getLabels() {
+    var labels = (0,_builtins___WEBPACK_IMPORTED_MODULE_6__/* .formatMomentValue */ .$)(props.value, props.format, placeholder);
+    return (0,_formily_shared__WEBPACK_IMPORTED_MODULE_1__/* .isArr */ .H1)(labels) ? labels.join('~') : labels;
+  };
+
+  return react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
+    className: classnames__WEBPACK_IMPORTED_MODULE_4___default()(prefixCls, props.className)
+  }, getLabels());
+};
+
 var Text = function Text(props) {
   var prefixCls = (0,_builtins___WEBPACK_IMPORTED_MODULE_5__/* .usePrefixCls */ .F)('form-text', props);
   return react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
@@ -24847,6 +24996,8 @@ Text.Cascader = Cascader;
 Text.DatePicker = DatePicker;
 Text.DateRangePicker = DateRangePicker;
 Text.TimePicker = TimePicker;
+Text.TimePicker2 = TimePicker2;
+Text.TimeRangePicker2 = TimeRangePicker2;
 Text.Placeholder = Placeholder;
 Text.usePlaceholder = usePlaceholder;
 var PreviewText = Text;
@@ -25134,7 +25285,25 @@ var SelectTable = (0,_formily_react__WEBPACK_IMPORTED_MODULE_1__.observer)(funct
     });
   }, [filteredDataSource, filterSort]);
   var flatDataSource = (0,_useFlatOptions__WEBPACK_IMPORTED_MODULE_8__/* .useFlatOptions */ .Q)(dataSource);
-  var flatFilteredDataSource = (0,_useFlatOptions__WEBPACK_IMPORTED_MODULE_8__/* .useFlatOptions */ .Q)(filteredDataSource); // selected keys for Table UI
+  var flatFilteredDataSource = (0,_useFlatOptions__WEBPACK_IMPORTED_MODULE_8__/* .useFlatOptions */ .Q)(filteredDataSource); // 分页或异步查询时，dataSource会丢失已选数据，配置optionAsValue则无法获取已选数据，需要进行合并
+
+  var getWholeDataSource = function getWholeDataSource() {
+    if (optionAsValue && mode === 'multiple' && (value === null || value === void 0 ? void 0 : value.length)) {
+      var map_1 = new Map();
+
+      var arr = __spreadArray(__spreadArray([], __read(flatDataSource), false), __read(value), false);
+
+      arr.forEach(function (item) {
+        if (!map_1.has(item[primaryKey])) {
+          map_1.set(item[primaryKey], item);
+        }
+      });
+      return __spreadArray([], __read(map_1.values()), false);
+    }
+
+    return flatDataSource;
+  }; // selected keys for Table UI
+
 
   var selected = (0,_utils__WEBPACK_IMPORTED_MODULE_9__/* .getUISelected */ .S_)(value, flatDataSource, primaryKey, valueType, optionAsValue, mode, rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.checkStrictly, rowKey); // readPretty Value
 
@@ -25154,7 +25323,7 @@ var SelectTable = (0,_formily_react__WEBPACK_IMPORTED_MODULE_1__.observer)(funct
     } // 筛选后onChange默认的records数据不完整，此处需使用完整数据过滤
 
 
-    var wholeRecords = flatDataSource.filter(function (item) {
+    var wholeRecords = getWholeDataSource().filter(function (item) {
       return selectedRowKeys.includes(item === null || item === void 0 ? void 0 : item[primaryKey]);
     });
 
@@ -26292,8 +26461,10 @@ Space.defaultProps = {
 /* harmony import */ var _preview_text_main_scss__WEBPACK_IMPORTED_MODULE_12___default = /*#__PURE__*/__webpack_require__.n(_preview_text_main_scss__WEBPACK_IMPORTED_MODULE_12__);
 /* harmony import */ var _select_table_main_scss__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(98078);
 /* harmony import */ var _select_table_main_scss__WEBPACK_IMPORTED_MODULE_13___default = /*#__PURE__*/__webpack_require__.n(_select_table_main_scss__WEBPACK_IMPORTED_MODULE_13__);
-/* harmony import */ var _upload_main_scss__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(39205);
-/* harmony import */ var _upload_main_scss__WEBPACK_IMPORTED_MODULE_14___default = /*#__PURE__*/__webpack_require__.n(_upload_main_scss__WEBPACK_IMPORTED_MODULE_14__);
+/* harmony import */ var _space_main_scss__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(28226);
+/* harmony import */ var _space_main_scss__WEBPACK_IMPORTED_MODULE_14___default = /*#__PURE__*/__webpack_require__.n(_space_main_scss__WEBPACK_IMPORTED_MODULE_14__);
+/* harmony import */ var _upload_main_scss__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(39205);
+/* harmony import */ var _upload_main_scss__WEBPACK_IMPORTED_MODULE_15___default = /*#__PURE__*/__webpack_require__.n(_upload_main_scss__WEBPACK_IMPORTED_MODULE_15__);
 // auto generated code
 
 
@@ -26311,6 +26482,7 @@ Space.defaultProps = {
 
 
 
+
 /***/ }),
 
 /***/ 52710:
@@ -26464,6 +26636,63 @@ var TimePicker = (0,_formily_react__WEBPACK_IMPORTED_MODULE_0__.connect)(_aliclo
 
 /***/ }),
 
+/***/ 52216:
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+"use strict";
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   "g": () => (/* binding */ TimePicker2)
+/* harmony export */ });
+/* harmony import */ var _formily_react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(61006);
+/* harmony import */ var _alicloudfe_components__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(33049);
+/* harmony import */ var _alicloudfe_components__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var _preview_text__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(84929);
+/* harmony import */ var _builtins___WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(46284);
+/* harmony import */ var _builtins___WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(258);
+/* harmony import */ var _builtins___WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(89350);
+var __assign = undefined && undefined.__assign || function () {
+  __assign = Object.assign || function (t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+      s = arguments[i];
+
+      for (var p in s) {
+        if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+      }
+    }
+
+    return t;
+  };
+
+  return __assign.apply(this, arguments);
+};
+
+
+
+
+
+
+var mapTimeFormat = function mapTimeFormat() {
+  return function (props) {
+    var format = props['format'] || 'HH:mm:ss';
+    var _onChange = props.onChange;
+    return __assign(__assign({}, props), {
+      format: format,
+      value: (0,_builtins___WEBPACK_IMPORTED_MODULE_2__/* .momentable */ .y)(props.value, format),
+      onChange: function onChange(value) {
+        if (_onChange) {
+          _onChange((0,_builtins___WEBPACK_IMPORTED_MODULE_2__/* .formatMomentValue */ .$)(value, format));
+        }
+      }
+    });
+  };
+};
+
+var TimePicker2 = (0,_formily_react__WEBPACK_IMPORTED_MODULE_0__.connect)(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_1__.TimePicker2, (0,_formily_react__WEBPACK_IMPORTED_MODULE_0__.mapProps)(mapTimeFormat(), _builtins___WEBPACK_IMPORTED_MODULE_3__/* .mapSize */ .z, _builtins___WEBPACK_IMPORTED_MODULE_4__/* .mapStatus */ .O), (0,_formily_react__WEBPACK_IMPORTED_MODULE_0__.mapReadPretty)(_preview_text__WEBPACK_IMPORTED_MODULE_5__/* .PreviewText.TimePicker2 */ .c.TimePicker2));
+TimePicker2.RangePicker = (0,_formily_react__WEBPACK_IMPORTED_MODULE_0__.connect)(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_1__.TimePicker2.RangePicker, (0,_formily_react__WEBPACK_IMPORTED_MODULE_0__.mapProps)(mapTimeFormat(), _builtins___WEBPACK_IMPORTED_MODULE_3__/* .mapSize */ .z, _builtins___WEBPACK_IMPORTED_MODULE_4__/* .mapStatus */ .O), (0,_formily_react__WEBPACK_IMPORTED_MODULE_0__.mapReadPretty)(_preview_text__WEBPACK_IMPORTED_MODULE_5__/* .PreviewText.TimeRangePicker2 */ .c.TimeRangePicker2));
+/* unused harmony default export */ var __WEBPACK_DEFAULT_EXPORT__ = ((/* unused pure expression or super */ null && (TimePicker2)));
+
+/***/ }),
+
 /***/ 33218:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
@@ -58645,374 +58874,6 @@ module.exports = withSideEffect;
 
 /***/ }),
 
-/***/ 23060:
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
-
-"use strict";
-/* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   "Z": () => (/* binding */ StickyBox)
-/* harmony export */ });
-/* harmony import */ var _babel_runtime_helpers_inheritsLoose__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(38173);
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(59787);
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var resize_observer_polyfill__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(94738);
-
-
-
-
-
-var getScrollParent = function getScrollParent(node) {
-  var parent = node;
-
-  while (parent = parent.parentElement) {
-    var overflowYVal = getComputedStyle(parent, null).getPropertyValue("overflow-y");
-    if (parent === document.body) return window;
-    if (overflowYVal === "auto" || overflowYVal === "scroll") return parent;
-  }
-
-  return window;
-};
-
-var offsetTill = function offsetTill(node, target) {
-  var current = node;
-  var offset = 0; // If target is not an offsetParent itself, subtract its offsetTop and set correct target
-
-  if (target.firstChild && target.firstChild.offsetParent !== target) {
-    offset += node.offsetTop - target.offsetTop;
-    target = node.offsetParent;
-    offset += -node.offsetTop;
-  }
-
-  do {
-    offset += current.offsetTop;
-    current = current.offsetParent;
-  } while (current && current !== target);
-
-  return offset;
-};
-
-var stickyProp = null;
-
-if (typeof CSS !== "undefined" && CSS.supports) {
-  if (CSS.supports("position", "sticky")) stickyProp = "sticky";else if (CSS.supports("position", "-webkit-sticky")) stickyProp = "-webkit-sticky";
-} // Inspired by https://github.com/WICG/EventListenerOptions/blob/gh-pages/explainer.md#feature-detection
-
-
-var passiveArg = false;
-
-try {
-  var opts = Object.defineProperty({}, "passive", {
-    // eslint-disable-next-line getter-return
-    get: function get() {
-      passiveArg = {
-        passive: true
-      };
-    }
-  });
-  window.addEventListener("testPassive", null, opts);
-  window.removeEventListener("testPassive", null, opts);
-} catch (e) {}
-
-var StickyBox = /*#__PURE__*/function (_React$Component) {
-  (0,_babel_runtime_helpers_inheritsLoose__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(StickyBox, _React$Component);
-
-  function StickyBox(props) {
-    var _this = _React$Component.call(this, props) || this;
-
-    _this.addListener = function (element, event, handler, passive) {
-      element.addEventListener(event, handler, passive);
-
-      _this.unsubscribes.push(function () {
-        return element.removeEventListener(event, handler);
-      });
-    };
-
-    _this.addResizeObserver = function (node, handler) {
-      var ro = new resize_observer_polyfill__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z(handler);
-      ro.observe(node);
-
-      _this.unsubscribes.push(function () {
-        return ro.disconnect();
-      });
-    };
-
-    _this.registerContainerRef = function (n) {
-      if (!stickyProp) return;
-      _this.node = n;
-
-      if (n) {
-        _this.scrollPane = getScrollParent(_this.node);
-        _this.latestScrollY = _this.scrollPane === window ? window.scrollY : _this.scrollPane.scrollTop;
-
-        _this.addListener(_this.scrollPane, "scroll", _this.handleScroll, passiveArg);
-
-        _this.addListener(_this.scrollPane, "mousewheel", _this.handleScroll, passiveArg);
-
-        if (_this.scrollPane === window) {
-          _this.addListener(window, "resize", _this.handleWindowResize);
-
-          _this.handleWindowResize();
-        } else {
-          _this.addResizeObserver(_this.scrollPane, _this.handleScrollPaneResize);
-
-          _this.handleScrollPaneResize();
-        }
-
-        _this.addResizeObserver(_this.node.parentNode, _this.handleParentNodeResize);
-
-        _this.handleParentNodeResize();
-
-        _this.addResizeObserver(_this.node, _this.handleNodeResize);
-
-        _this.handleNodeResize({
-          initial: true
-        });
-
-        _this.initial();
-      } else {
-        _this.unsubscribes.forEach(function (fn) {
-          return fn();
-        });
-
-        _this.unsubscribes = [];
-        _this.scrollPane = null;
-      }
-    };
-
-    _this.getCurrentOffset = function () {
-      if (_this.mode === "relative") return _this.offset;
-      var _this$props = _this.props,
-          offsetTop = _this$props.offsetTop,
-          offsetBottom = _this$props.offsetBottom;
-
-      if (_this.mode === "stickyTop") {
-        return Math.max(0, _this.scrollPaneOffset + _this.latestScrollY - _this.naturalTop + offsetTop);
-      }
-
-      if (_this.mode === "stickyBottom") {
-        return Math.max(0, _this.scrollPaneOffset + _this.latestScrollY + _this.viewPortHeight - (_this.naturalTop + _this.nodeHeight + offsetBottom));
-      }
-    };
-
-    _this.handleWindowResize = function () {
-      _this.viewPortHeight = window.innerHeight;
-      _this.scrollPaneOffset = 0;
-
-      _this.handleScroll();
-    };
-
-    _this.handleScrollPaneResize = function () {
-      _this.viewPortHeight = _this.scrollPane.offsetHeight;
-
-      if (false) {} // Only applicable if scrollPane is an offsetParent
-
-
-      if (_this.scrollPane.firstChild.offsetParent === _this.scrollPane) {
-        _this.scrollPaneOffset = _this.scrollPane.getBoundingClientRect().top;
-      } else {
-        _this.scrollPaneOffset = 0;
-      }
-
-      _this.handleScroll();
-    };
-
-    _this.handleParentNodeResize = function () {
-      var parentNode = _this.node.parentNode;
-      var computedParentStyle = getComputedStyle(parentNode, null);
-      var parentPaddingTop = parseInt(computedParentStyle.getPropertyValue("padding-top"), 10);
-      var parentPaddingBottom = parseInt(computedParentStyle.getPropertyValue("padding-bottom"), 10);
-      _this.naturalTop = offsetTill(parentNode, _this.scrollPane) + parentPaddingTop + _this.scrollPaneOffset;
-      var oldParentHeight = _this.parentHeight;
-      _this.parentHeight = parentNode.getBoundingClientRect().height - (parentPaddingTop + parentPaddingBottom);
-
-      if (_this.mode === "relative") {
-        if (_this.props.bottom) {
-          _this.changeMode("relative");
-        } else {
-          // If parent height decreased...
-          if (oldParentHeight > _this.parentHeight) {
-            _this.changeToStickyBottomIfBoxTooLow(_this.latestScrollY);
-          }
-        }
-      }
-
-      if (oldParentHeight !== _this.parentHeight && _this.mode === "relative") {
-        _this.latestScrollY = Number.POSITIVE_INFINITY;
-
-        _this.handleScroll();
-      }
-    };
-
-    _this.handleNodeResize = function (_temp) {
-      var _ref = _temp === void 0 ? {} : _temp,
-          initial = _ref.initial;
-
-      var prevHeight = _this.nodeHeight;
-      _this.nodeHeight = _this.node.getBoundingClientRect().height;
-
-      if (!initial && prevHeight !== _this.nodeHeight) {
-        var _this$props2 = _this.props,
-            offsetTop = _this$props2.offsetTop,
-            offsetBottom = _this$props2.offsetBottom,
-            bottom = _this$props2.bottom;
-
-        if (_this.nodeHeight + offsetTop + offsetBottom <= _this.viewPortHeight) {
-          // Just make it sticky if node smaller than viewport
-          _this.mode = undefined;
-
-          _this.initial();
-        } else {
-          var diff = prevHeight - _this.nodeHeight;
-          var lowestPossible = _this.parentHeight - _this.nodeHeight;
-          var nextOffset = Math.min(lowestPossible, _this.getCurrentOffset() + (bottom ? diff : 0));
-          _this.offset = Math.max(0, nextOffset);
-          if (!bottom || _this.mode !== "stickyBottom") _this.changeMode("relative");
-        }
-      }
-    };
-
-    _this.handleScroll = function () {
-      var _this$props3 = _this.props,
-          offsetTop = _this$props3.offsetTop,
-          offsetBottom = _this$props3.offsetBottom;
-      var scrollY = _this.scrollPane === window ? window.scrollY : _this.scrollPane.scrollTop;
-      if (scrollY === _this.latestScrollY) return;
-
-      if (_this.nodeHeight + offsetTop + offsetBottom <= _this.viewPortHeight) {
-        // Just make it sticky if node smaller than viewport
-        _this.initial();
-
-        _this.latestScrollY = scrollY;
-        return;
-      }
-
-      var scrollDelta = scrollY - _this.latestScrollY;
-      _this.offset = _this.getCurrentOffset();
-
-      if (scrollDelta > 0) {
-        // scroll down
-        if (_this.mode === "stickyTop") {
-          if (scrollY + _this.scrollPaneOffset + offsetTop > _this.naturalTop) {
-            if (scrollY + _this.scrollPaneOffset + _this.viewPortHeight <= _this.naturalTop + _this.nodeHeight + _this.offset + offsetBottom) {
-              _this.changeMode("relative");
-            } else {
-              _this.changeMode("stickyBottom");
-            }
-          }
-        } else if (_this.mode === "relative") {
-          _this.changeToStickyBottomIfBoxTooLow(scrollY);
-        }
-      } else {
-        // scroll up
-        if (_this.mode === "stickyBottom") {
-          if (_this.scrollPaneOffset + scrollY + _this.viewPortHeight < _this.naturalTop + _this.parentHeight + offsetBottom) {
-            if (_this.scrollPaneOffset + scrollY + offsetTop >= _this.naturalTop + _this.offset) {
-              _this.changeMode("relative");
-            } else {
-              _this.changeMode("stickyTop");
-            }
-          }
-        } else if (_this.mode === "relative") {
-          if (_this.scrollPaneOffset + scrollY + offsetTop < _this.naturalTop + _this.offset) {
-            _this.changeMode("stickyTop");
-          }
-        }
-      }
-
-      _this.latestScrollY = scrollY;
-    };
-
-    if (props.offset && "production" !== "production") {}
-
-    _this.unsubscribes = [];
-    return _this;
-  }
-
-  var _proto = StickyBox.prototype;
-
-  _proto.changeMode = function changeMode(newMode) {
-    var _this$props4 = this.props,
-        onChangeMode = _this$props4.onChangeMode,
-        offsetTop = _this$props4.offsetTop,
-        offsetBottom = _this$props4.offsetBottom,
-        bottom = _this$props4.bottom;
-    if (this.mode !== newMode) onChangeMode(this.mode, newMode);
-    this.mode = newMode;
-
-    if (newMode === "relative") {
-      this.node.style.position = "relative";
-
-      if (bottom) {
-        var nextBottom = Math.max(0, this.parentHeight - this.nodeHeight - this.offset);
-        this.node.style.bottom = nextBottom + "px";
-      } else {
-        this.node.style.top = this.offset + "px";
-      }
-    } else {
-      this.node.style.position = stickyProp;
-
-      if (newMode === "stickyBottom") {
-        if (bottom) {
-          this.node.style.bottom = offsetBottom + "px";
-        } else {
-          this.node.style.top = this.viewPortHeight - this.nodeHeight - offsetBottom + "px";
-        }
-      } else {
-        // stickyTop
-        if (bottom) {
-          this.node.style.bottom = this.viewPortHeight - this.nodeHeight - offsetBottom + "px";
-        } else {
-          this.node.style.top = offsetTop + "px";
-        }
-      }
-    }
-
-    this.offset = this.getCurrentOffset();
-  };
-
-  _proto.initial = function initial() {
-    var bottom = this.props.bottom;
-
-    if (bottom) {
-      if (this.mode !== "stickyBottom") this.changeMode("stickyBottom");
-    } else {
-      if (this.mode !== "stickyTop") this.changeMode("stickyTop");
-    }
-  };
-
-  _proto.changeToStickyBottomIfBoxTooLow = function changeToStickyBottomIfBoxTooLow(scrollY) {
-    var offsetBottom = this.props.offsetBottom;
-
-    if (scrollY + this.scrollPaneOffset + this.viewPortHeight >= this.naturalTop + this.nodeHeight + this.offset + offsetBottom) {
-      this.changeMode("stickyBottom");
-    }
-  };
-
-  _proto.render = function render() {
-    var _this$props5 = this.props,
-        children = _this$props5.children,
-        className = _this$props5.className,
-        style = _this$props5.style;
-    return react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
-      className: className,
-      style: style,
-      ref: this.registerContainerRef
-    }, children);
-  };
-
-  return StickyBox;
-}((react__WEBPACK_IMPORTED_MODULE_0___default().Component));
-
-
-StickyBox.defaultProps = {
-  onChangeMode: function onChangeMode() {},
-  offsetTop: 0,
-  offsetBottom: 0
-};
- false ? 0 : void 0;
-
-/***/ }),
-
 /***/ 94738:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
@@ -61747,7 +61608,9 @@ var Ellipsis = function Ellipsis(props) {
       WebkitLineClamp: rows
     }, style),
     className: classnames__WEBPACK_IMPORTED_MODULE_0___default()(_defineProperty({
-      'teamix-pro-ellipsis': true
+      'teamix-pro-ellipsis': true,
+      'teamix-pro-ellipsis-single-line': rows === 1,
+      'teamix-pro-ellipsis-multi-line': rows > 1
     }, className !== null && className !== void 0 ? className : '', true))
   }, children);
   return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement("span", {
@@ -64433,7 +64296,7 @@ var FieldIcon = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().forwar
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(72326);
 /* harmony import */ var _menuSelect__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(20472);
-var _excluded = ["value", "mode", "onChange", "inputProps", "layout", "render", "disabled", "dataSource", "state"];
+var _excluded = ["value", "mode", "onChange", "inputProps", "layout", "render", "dataSource", "state"];
 
 function ownKeys(object, enumerableOnly) {
   var keys = Object.keys(object);
@@ -64584,7 +64447,6 @@ var FieldMenuSelect = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().
       inputProps = props.inputProps,
       layout = props.layout,
       render = props.render,
-      disabled = props.disabled,
       dataSource = props.dataSource,
       state = props.state,
       others = _objectWithoutProperties(props, _excluded);
@@ -64626,10 +64488,11 @@ var FieldMenuSelect = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().
 /* harmony import */ var _alicloudfe_components__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(33049);
 /* harmony import */ var _alicloudfe_components__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_1__);
 /* harmony import */ var _teamix_money_input__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(20106);
-/* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(28266);
-/* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(classnames__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var _output__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(90405);
-/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(72326);
+/* harmony import */ var _teamix_utils__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(80653);
+/* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(28266);
+/* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(classnames__WEBPACK_IMPORTED_MODULE_4__);
+/* harmony import */ var _output__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(90405);
+/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(72326);
 var _excluded = ["value", "mode", "onChange", "inputProps", "layout", "size", "render", "disabled", "currency", "state", "dataSource"];
 
 function ownKeys(object, enumerableOnly) {
@@ -64777,6 +64640,7 @@ function _objectWithoutPropertiesLoose(source, excluded) {
 
 
 
+
 var currencyMap = new Map([['CNY', {
   countryName: '中国',
   name: '人民币元',
@@ -64814,7 +64678,7 @@ var FieldMoney = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().forwa
 
   (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
     setFieldVal(value);
-    (0,_utils__WEBPACK_IMPORTED_MODULE_5__/* .bindRefValue */ .Dd)(value, ref);
+    (0,_utils__WEBPACK_IMPORTED_MODULE_6__/* .bindRefValue */ .Dd)(value, ref);
   }, [value]);
 
   var numberFormatter = function numberFormatter() {
@@ -64826,7 +64690,14 @@ var FieldMoney = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().forwa
       currency: currency
     }); // 符号后加空格
 
-    var symbol = money.substr(0, 1);
+    var symbol = money.substr(0, 1); // 针对英文下人民币做格式化处理
+
+    if ((0,_teamix_utils__WEBPACK_IMPORTED_MODULE_3__.getLanguage)() === 'en-us') {
+      if (symbol === '¥') {
+        return money.replace(symbol, "CN".concat(symbol, " "));
+      }
+    }
+
     return money.replace(symbol, "".concat(symbol, " "));
   };
 
@@ -64841,7 +64712,7 @@ var FieldMoney = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().forwa
       }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_1__.Icon, {
         type: (_currencyMap$get2 = currencyMap.get(currency)) === null || _currencyMap$get2 === void 0 ? void 0 : _currencyMap$get2.icon
       })),
-      className: classnames__WEBPACK_IMPORTED_MODULE_3___default()({
+      className: classnames__WEBPACK_IMPORTED_MODULE_4___default()({
         'teamix-pro-field-money': true,
         'teamix-pro-field-layout-compact': true
       }),
@@ -64855,13 +64726,13 @@ var FieldMoney = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().forwa
       disabled: disabled,
       onChange: function onChange(val) {
         setFieldVal(val);
-        (0,_utils__WEBPACK_IMPORTED_MODULE_5__/* .bindRefValue */ .Dd)(val, ref);
-        _onChange === null || _onChange === void 0 ? void 0 : _onChange((0,_utils__WEBPACK_IMPORTED_MODULE_5__/* .formatterOnchangeValue */ .WO)(val), null);
+        (0,_utils__WEBPACK_IMPORTED_MODULE_6__/* .bindRefValue */ .Dd)(val, ref);
+        _onChange === null || _onChange === void 0 ? void 0 : _onChange((0,_utils__WEBPACK_IMPORTED_MODULE_6__/* .formatterOnchangeValue */ .WO)(val), null);
       }
     }));
   }
 
-  return (0,_output__WEBPACK_IMPORTED_MODULE_4__/* .formatterOutput */ .h)(fieldVal, render, [], numberFormatter);
+  return (0,_output__WEBPACK_IMPORTED_MODULE_5__/* .formatterOutput */ .h)(fieldVal, render, [], numberFormatter);
 });
 /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (FieldMoney);
 
@@ -68835,7 +68706,7 @@ var Trigger = function Trigger(props) {
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_1__);
 /* harmony import */ var _teamix_utils__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(80653);
 /* harmony import */ var _teamix_icon__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(89227);
-var _excluded = ["dataSource", "col", "width", "value", "onChange", "showAll", "size", "hideTitle"];
+var _excluded = ["dataSource", "col", "width", "value", "onChange", "showAll", "size", "hideTitle", "placeholder"];
 
 function ownKeys(object, enumerableOnly) {
   var keys = Object.keys(object);
@@ -69030,8 +68901,10 @@ var MenuSelect = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().forwa
       size = props.size,
       _props$hideTitle = props.hideTitle,
       hideTitle = _props$hideTitle === void 0 ? false : _props$hideTitle,
+      placeholder = props.placeholder,
       others = _objectWithoutProperties(props, _excluded);
 
+  console.log('others', others);
   var ref = (0,react__WEBPACK_IMPORTED_MODULE_1__.useRef)();
 
   var _useState = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(valueProp),
@@ -69198,7 +69071,7 @@ var MenuSelect = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().forwa
   return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement(Popup, {
     trigger: /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_0__.Input, _objectSpread({
       ref: forwardRef,
-      placeholder: "\u8BF7\u9009\u62E9",
+      placeholder: placeholder !== null && placeholder !== void 0 ? placeholder : (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_2__.getMessage)('pleaseSelect'),
       value: inputValue,
       hint: popupVisible ? 'arrow-up' : 'arrow-down',
       onChange: inputOnChange,
@@ -72158,7 +72031,7 @@ var SelectGroup = function SelectGroup(props) {
         select: true,
         'select-has-placeholder': !value || (value === null || value === void 0 ? void 0 : value.length) === 0
       }), " ").concat(className),
-      placeholder: value && (value === null || value === void 0 ? void 0 : value.length) > 0 ? ' ' : placeholder !== null && placeholder !== void 0 ? placeholder : (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_3__.getMessage)('pleaseChoose'),
+      placeholder: value && (value === null || value === void 0 ? void 0 : value.length) > 0 ? ' ' : placeholder !== null && placeholder !== void 0 ? placeholder : (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_3__.getMessage)('pleaseSelect'),
       label: maxTagCount === 'total' ? (0,_commonComponents__WEBPACK_IMPORTED_MODULE_4__/* .renderTags */ .as)(labelTag) : /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement(_commonComponents__WEBPACK_IMPORTED_MODULE_4__/* .ProTagGroup */ .VM, {
         tag: labelTag,
         moreTagProps: {
@@ -76216,15 +76089,22 @@ var DialogForm = function DialogForm(props) {
       innerFormRef = props.innerFormRef,
       _props$validateFirst = props.validateFirst,
       validateFirst = _props$validateFirst === void 0 ? true : _props$validateFirst;
+  var form = (0,react__WEBPACK_IMPORTED_MODULE_0__.useMemo)(function () {
+    return (0,_form__WEBPACK_IMPORTED_MODULE_3__/* .createForm */ .Np)({
+      initialValues: (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_4__.getTargetValue)(initialValues, context),
+      validateFirst: validateFirst
+    });
+  }, [validateFirst, initialValues, context]);
 
-  var _getSchemaAndFormProp = getSchemaAndFormProps(schema, formProps),
-      formSchema = _getSchemaAndFormProp.schema,
-      others = _objectWithoutPropertiesLoose(_getSchemaAndFormProp, _excluded);
+  var _useMemo = (0,react__WEBPACK_IMPORTED_MODULE_0__.useMemo)(function () {
+    return getSchemaAndFormProps(schema, formProps);
+  }, [schema, formProps]),
+      formSchema = _useMemo.schema,
+      others = _objectWithoutPropertiesLoose(_useMemo, _excluded);
 
-  var form = (0,_form__WEBPACK_IMPORTED_MODULE_3__/* .createForm */ .Np)({
-    initialValues: (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_4__.getTargetValue)(initialValues, context),
-    validateFirst: validateFirst
-  });
+  var otherFormProps = (0,react__WEBPACK_IMPORTED_MODULE_0__.useMemo)(function () {
+    return (0,_utils__WEBPACK_IMPORTED_MODULE_7__/* .addContext */ .F)((0,_teamix_utils__WEBPACK_IMPORTED_MODULE_4__.getTargetValue)(others, context), context);
+  }, [context, JSON.stringify(others)]);
 
   var _useState = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false),
       loading = _useState[0],
@@ -76256,7 +76136,7 @@ var DialogForm = function DialogForm(props) {
   }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_form__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .ZP, _extends({
     form: form,
     schema: formSchema
-  }, getDefaultFormPropsByDialogSize(size), (0,_utils__WEBPACK_IMPORTED_MODULE_7__/* .addContext */ .F)((0,_teamix_utils__WEBPACK_IMPORTED_MODULE_4__.getTargetValue)(others, context), context))));
+  }, getDefaultFormPropsByDialogSize(size), otherFormProps)));
 };
 
 function useDialogFormAction(action, context) {
@@ -82474,7 +82354,7 @@ _teamix_icon__WEBPACK_IMPORTED_MODULE_15__/* ["default"].setConfig */ .Z.setConf
 
 
 
-var version = '1.4.5';
+var version = '1.4.6';
 
 
 /***/ }),
@@ -87648,7 +87528,7 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
           lineHeight: '18px'
         }
       }, (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_2__.getMessage)('total', {
-        total: total
+        total: new Intl.NumberFormat().format(total)
       }))
     }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
       className: prefixCls('custom-total-content')
@@ -87766,7 +87646,7 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
         return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_1__.Pagination, _extends({}, commonPaginationProps, {
           totalRender: function totalRender(total) {
             return (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_2__.getMessage)('total', {
-              total: total
+              total: new Intl.NumberFormat().format(total)
             });
           }
         }, otherProps));
@@ -87776,7 +87656,7 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
           pageShowCount: 3,
           totalRender: function totalRender(total) {
             return (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_2__.getMessage)('total', {
-              total: total
+              total: new Intl.NumberFormat().format(total)
             });
           }
         }, otherProps));
@@ -89690,7 +89570,7 @@ var ProTable = function ProTable(props) {
         ,
         totalRender: function totalRender(total) {
           return (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_4__.getMessage)('total', {
-            total: total
+            total: new Intl.NumberFormat().format(total)
           });
         },
         pageSize: pageSize,
@@ -93374,7 +93254,7 @@ function sandbox(target) {
 
 var usePrefixCls = function usePrefixCls(tag, props) {
   return function () {
-    var _getContext$prefix, _getContext;
+    var _ref2, _window$TEAMIX_PRO_PR, _getContext;
 
     var _ref = props || {},
         base = _ref.base,
@@ -93383,7 +93263,8 @@ var usePrefixCls = function usePrefixCls(tag, props) {
 
     var getContext = _alicloudfe_components__WEBPACK_IMPORTED_MODULE_1__.ConfigProvider.getContext; // 基于 context 获取基础组件前缀
 
-    var basePrefix = (_getContext$prefix = (_getContext = getContext()) == null ? void 0 : _getContext.prefix) != null ? _getContext$prefix : 'next-'; // 获取模块前缀（是否添加基础前缀）
+    var basePrefix = // @ts-ignore
+    (_ref2 = (_window$TEAMIX_PRO_PR = window.TEAMIX_PRO_PREFIX) != null ? _window$TEAMIX_PRO_PR : (_getContext = getContext()) == null ? void 0 : _getContext.prefix) != null ? _ref2 : 'next-'; // 获取模块前缀（是否添加基础前缀）
 
     var modulePrefix = base ? "" + basePrefix + (tag != null ? tag : '') : "" + (prefix != null ? prefix : '') + (tag != null ? tag : ''); // 获取拼接样式
 
@@ -93463,7 +93344,7 @@ var usePrefixCls = function usePrefixCls(tag, props) {
   cancel: 'Cancel',
   edit: 'Edit',
   pageSize: 'Items per page:',
-  pleaseChoose: 'Please choose',
+  pleaseSelect: 'Please Select',
   labelKey: 'Tag key',
   labelValue: 'Tag value',
   searchTagKeyOrTagValue: 'Search tag key or tag value',
@@ -93599,7 +93480,7 @@ var getMessage = function getMessage(id, data) {
   cancel: '取消',
   edit: '编辑',
   pageSize: '每页显示：',
-  pleaseChoose: '请选择',
+  pleaseSelect: '请选择',
   labelKey: '标签键',
   labelValue: '标签值',
   searchTagKeyOrTagValue: '搜索标签键或标签值',
@@ -94261,6 +94142,13 @@ var listToTree = generateTree;
 
 /***/ }),
 
+/***/ 28226:
+/***/ (() => {
+
+// extracted by mini-css-extract-plugin
+
+/***/ }),
+
 /***/ 39205:
 /***/ (() => {
 
@@ -94519,23 +94407,6 @@ function _inherits(subClass, superClass) {
 
 /***/ }),
 
-/***/ 38173:
-/***/ ((__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) => {
-
-"use strict";
-/* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   "Z": () => (/* binding */ _inheritsLoose)
-/* harmony export */ });
-/* harmony import */ var _setPrototypeOf_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1856);
-
-function _inheritsLoose(subClass, superClass) {
-  subClass.prototype = Object.create(superClass.prototype);
-  subClass.prototype.constructor = subClass;
-  (0,_setPrototypeOf_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(subClass, superClass);
-}
-
-/***/ }),
-
 /***/ 42801:
 /***/ ((__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) => {
 
@@ -95163,6 +95034,375 @@ function _setPrototypeOf(o, p) {
   return _setPrototypeOf(o, p);
 }
 
+/***/ }),
+
+/***/ 17129:
+/***/ ((__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) => {
+
+"use strict";
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   "Z": () => (/* binding */ src_default)
+/* harmony export */ });
+/* unused harmony export useStickyBox */
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(59787);
+/* harmony import */ var resize_observer_polyfill__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(94738);
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+// src/index.jsx
+
+
+
+var getScrollParent = function getScrollParent(node) {
+  var parent = node;
+
+  while (parent = parent.parentElement) {
+    var overflowYVal = getComputedStyle(parent, null).getPropertyValue("overflow-y");
+    if (parent === document.body) return window;
+    if (overflowYVal === "auto" || overflowYVal === "scroll") return parent;
+  }
+
+  return window;
+};
+
+var offsetTill = function offsetTill(node, target) {
+  var current = node;
+  var offset = 0;
+
+  if (target.firstChild && target.firstChild.offsetParent !== target) {
+    offset += node.offsetTop - target.offsetTop;
+    target = node.offsetParent;
+    offset += -node.offsetTop;
+  }
+
+  do {
+    offset += current.offsetTop;
+    current = current.offsetParent;
+  } while (current && current !== target);
+
+  return offset;
+};
+
+var getParentNode = function getParentNode(node) {
+  var currentParent = node.parentNode;
+
+  while (currentParent) {
+    var style = getComputedStyle(currentParent, null);
+    if (style.getPropertyValue("display") !== "contents") break;
+    currentParent = currentParent.parentNode;
+  }
+
+  return currentParent || window;
+};
+
+var stickyProp = null;
+
+if (typeof CSS !== "undefined" && CSS.supports) {
+  if (CSS.supports("position", "sticky")) stickyProp = "sticky";else if (CSS.supports("position", "-webkit-sticky")) stickyProp = "-webkit-sticky";
+}
+
+var passiveArg = false;
+
+try {
+  opts = Object.defineProperty({}, "passive", {
+    get: function get() {
+      passiveArg = {
+        passive: true
+      };
+    }
+  });
+  window.addEventListener("testPassive", null, opts);
+  window.removeEventListener("testPassive", null, opts);
+} catch (e) {}
+
+var opts;
+
+var registerNode = function registerNode(node, _ref) {
+  var offsetTop = _ref.offsetTop,
+      offsetBottom = _ref.offsetBottom,
+      bottom = _ref.bottom;
+  var scrollPane = getScrollParent(node);
+  var latestScrollY = scrollPane === window ? window.scrollY : scrollPane.scrollTop;
+  var unsubs = [];
+  var mode, offset, nodeHeight, naturalTop, parentHeight, scrollPaneOffset, viewPortHeight;
+
+  var getCurrentOffset = function getCurrentOffset() {
+    if (mode === "relative") return offset;
+
+    if (mode === "stickyTop") {
+      return Math.max(0, scrollPaneOffset + latestScrollY - naturalTop + offsetTop);
+    }
+
+    if (mode === "stickyBottom") {
+      return Math.max(0, scrollPaneOffset + latestScrollY + viewPortHeight - (naturalTop + nodeHeight + offsetBottom));
+    }
+  };
+
+  var changeToStickyBottomIfBoxTooLow = function changeToStickyBottomIfBoxTooLow(scrollY) {
+    if (scrollY + scrollPaneOffset + viewPortHeight >= naturalTop + nodeHeight + offset + offsetBottom) {
+      changeMode("stickyBottom");
+    }
+  };
+
+  var changeMode = function changeMode(newMode) {
+    mode = newMode;
+
+    if (newMode === "relative") {
+      node.style.position = "relative";
+
+      if (bottom) {
+        var nextBottom = Math.max(0, parentHeight - nodeHeight - offset);
+        node.style.bottom = "".concat(nextBottom, "px");
+      } else {
+        node.style.top = "".concat(offset, "px");
+      }
+    } else {
+      node.style.position = stickyProp;
+
+      if (newMode === "stickyBottom") {
+        if (bottom) {
+          node.style.bottom = "".concat(offsetBottom, "px");
+        } else {
+          node.style.top = "".concat(viewPortHeight - nodeHeight - offsetBottom, "px");
+        }
+      } else {
+        if (bottom) {
+          node.style.bottom = "".concat(viewPortHeight - nodeHeight - offsetBottom, "px");
+        } else {
+          node.style.top = "".concat(offsetTop, "px");
+        }
+      }
+    }
+
+    offset = getCurrentOffset();
+  };
+
+  var initial = function initial() {
+    if (bottom) {
+      if (mode !== "stickyBottom") changeMode("stickyBottom");
+    } else {
+      if (mode !== "stickyTop") changeMode("stickyTop");
+    }
+  };
+
+  var addListener = function addListener(element, event, handler, passive) {
+    element.addEventListener(event, handler, passive);
+    unsubs.push(function () {
+      return element.removeEventListener(event, handler);
+    });
+  };
+
+  var handleScroll = function handleScroll() {
+    var scrollY = scrollPane === window ? window.scrollY : scrollPane.scrollTop;
+    if (scrollY === latestScrollY) return;
+
+    if (nodeHeight + offsetTop + offsetBottom <= viewPortHeight) {
+      initial();
+      latestScrollY = scrollY;
+      return;
+    }
+
+    var scrollDelta = scrollY - latestScrollY;
+    offset = getCurrentOffset();
+
+    if (scrollDelta > 0) {
+      if (mode === "stickyTop") {
+        if (scrollY + scrollPaneOffset + offsetTop > naturalTop) {
+          if (scrollY + scrollPaneOffset + viewPortHeight <= naturalTop + nodeHeight + offset + offsetBottom) {
+            changeMode("relative");
+          } else {
+            changeMode("stickyBottom");
+          }
+        }
+      } else if (mode === "relative") {
+        changeToStickyBottomIfBoxTooLow(scrollY);
+      }
+    } else {
+      if (mode === "stickyBottom") {
+        if (scrollPaneOffset + scrollY + viewPortHeight < naturalTop + parentHeight + offsetBottom) {
+          if (scrollPaneOffset + scrollY + offsetTop >= naturalTop + offset) {
+            changeMode("relative");
+          } else {
+            changeMode("stickyTop");
+          }
+        }
+      } else if (mode === "relative") {
+        if (scrollPaneOffset + scrollY + offsetTop < naturalTop + offset) {
+          changeMode("stickyTop");
+        }
+      }
+    }
+
+    latestScrollY = scrollY;
+  };
+
+  var handleWindowResize = function handleWindowResize() {
+    viewPortHeight = window.innerHeight;
+    scrollPaneOffset = 0;
+    handleScroll();
+  };
+
+  var handleScrollPaneResize = function handleScrollPaneResize() {
+    viewPortHeight = scrollPane.offsetHeight;
+
+    if (viewPortHeight === 0) {
+      console.warn("react-sticky-box's scroll pane has a height of 0. This seems odd. Please check this node:", scrollPane);
+    }
+
+    if (scrollPane.firstChild.offsetParent === scrollPane) {
+      scrollPaneOffset = scrollPane.getBoundingClientRect().top;
+    } else {
+      scrollPaneOffset = 0;
+    }
+
+    handleScroll();
+  };
+
+  var handleParentNodeResize = function handleParentNodeResize() {
+    var parentNode = getParentNode(node);
+    var computedParentStyle = getComputedStyle(parentNode, null);
+    var parentPaddingTop = parseInt(computedParentStyle.getPropertyValue("padding-top"), 10);
+    var parentPaddingBottom = parseInt(computedParentStyle.getPropertyValue("padding-bottom"), 10);
+    var verticalParentPadding = parentPaddingTop + parentPaddingBottom;
+    naturalTop = offsetTill(parentNode, scrollPane) + parentPaddingTop + scrollPaneOffset;
+    var oldParentHeight = parentHeight;
+    parentHeight = parentNode.getBoundingClientRect().height - verticalParentPadding;
+
+    if (mode === "relative") {
+      if (bottom) {
+        changeMode("relative");
+      } else {
+        if (oldParentHeight > parentHeight) {
+          changeToStickyBottomIfBoxTooLow(latestScrollY);
+        }
+      }
+    }
+
+    if (oldParentHeight !== parentHeight && mode === "relative") {
+      latestScrollY = Number.POSITIVE_INFINITY;
+      handleScroll();
+    }
+  };
+
+  var handleNodeResize = function handleNodeResize() {
+    var _ref2 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+        initialArg = _ref2.initial;
+
+    var prevHeight = nodeHeight;
+    nodeHeight = node.getBoundingClientRect().height;
+
+    if (!initialArg && prevHeight !== nodeHeight) {
+      if (nodeHeight + offsetTop + offsetBottom <= viewPortHeight) {
+        mode = void 0;
+        initial();
+        return;
+      } else {
+        var diff = prevHeight - nodeHeight;
+        var lowestPossible = parentHeight - nodeHeight;
+        var nextOffset = Math.min(lowestPossible, getCurrentOffset() + (bottom ? diff : 0));
+        offset = Math.max(0, nextOffset);
+        if (!bottom || mode !== "stickyBottom") changeMode("relative");
+      }
+    }
+  };
+
+  var addResizeObserver = function addResizeObserver(n, handler) {
+    var ro = new resize_observer_polyfill__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z(handler);
+    ro.observe(n);
+    unsubs.push(function () {
+      return ro.disconnect();
+    });
+  };
+
+  addListener(scrollPane, "scroll", handleScroll, passiveArg);
+  addListener(scrollPane, "mousewheel", handleScroll, passiveArg);
+
+  if (scrollPane === window) {
+    addListener(window, "resize", handleWindowResize);
+    handleWindowResize();
+  } else {
+    addResizeObserver(scrollPane, handleScrollPaneResize);
+    handleScrollPaneResize();
+  }
+
+  addResizeObserver(getParentNode(node), handleParentNodeResize);
+  handleParentNodeResize();
+  addResizeObserver(node, handleNodeResize);
+  handleNodeResize({
+    initial: true
+  });
+  initial();
+  return function () {
+    return unsubs.forEach(function (fn) {
+      return fn();
+    });
+  };
+};
+
+var useStickyBox = function useStickyBox() {
+  var _ref3 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+      _ref3$offsetTop = _ref3.offsetTop,
+      offsetTop = _ref3$offsetTop === void 0 ? 0 : _ref3$offsetTop,
+      _ref3$offsetBottom = _ref3.offsetBottom,
+      offsetBottom = _ref3$offsetBottom === void 0 ? 0 : _ref3$offsetBottom,
+      _ref3$bottom = _ref3.bottom,
+      bottom = _ref3$bottom === void 0 ? false : _ref3$bottom;
+
+  var _useState = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(null),
+      _useState2 = _slicedToArray(_useState, 2),
+      node = _useState2[0],
+      setNode = _useState2[1];
+
+  var argRef = (0,react__WEBPACK_IMPORTED_MODULE_0__.useRef)({
+    offsetTop: offsetTop,
+    offsetBottom: offsetBottom,
+    bottom: bottom
+  });
+  (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
+    argRef.current = {
+      offsetTop: offsetTop,
+      offsetBottom: offsetBottom,
+      bottom: bottom
+    };
+  });
+  (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
+    if (!node) return;
+    return registerNode(node, argRef.current);
+  }, [node]);
+  return setNode;
+};
+
+var StickyBox = function StickyBox(_ref4) {
+  var offsetTop = _ref4.offsetTop,
+      offsetBottom = _ref4.offsetBottom,
+      bottom = _ref4.bottom,
+      children = _ref4.children,
+      className = _ref4.className,
+      style = _ref4.style;
+  var ref = useStickyBox({
+    offsetTop: offsetTop,
+    offsetBottom: offsetBottom,
+    bottom: bottom
+  });
+  return /* @__PURE__ */react__WEBPACK_IMPORTED_MODULE_0__.createElement("div", {
+    className: className,
+    style: style,
+    ref: ref
+  }, children);
+};
+
+var src_default = StickyBox;
+
+
 /***/ }),
 
 /***/ 38471: