@teamix/pro 1.2.5 → 1.2.9

package/dist/pro.js

@@ -3191,9 +3191,8 @@ function (_super) {
   });
   Object.defineProperty(Field.prototype, "required", {
     get: function get() {
-      var validators = (0,_formily_shared__WEBPACK_IMPORTED_MODULE_0__/* .isArr */ .H1)(this.validator) ? this.validator : (0,_formily_validator__WEBPACK_IMPORTED_MODULE_1__/* .parseValidatorDescriptions */ .oM)(this.validator);
-      return validators.some(function (desc) {
-        return !!(desc === null || desc === void 0 ? void 0 : desc['required']);
+      return (0,_formily_validator__WEBPACK_IMPORTED_MODULE_1__/* .parseValidatorDescriptions */ .oM)(this.validator).some(function (desc) {
+        return desc.required;
       });
     },
     set: function set(required) {
@@ -5267,7 +5266,6 @@ var queryFeedbacks = function queryFeedbacks(field, search) {
   });
 };
 var queryFeedbackMessages = function queryFeedbackMessages(field, search) {
-  if (!field.feedbacks.length) return [];
   return queryFeedbacks(field, search).reduce(function (buf, info) {
     return (0,_formily_shared__WEBPACK_IMPORTED_MODULE_0__/* .isEmpty */ .xb)(info.messages) ? buf : buf.concat(info.messages);
   }, []);
@@ -5309,10 +5307,6 @@ var updateFeedback = function updateFeedback(field, feedback) {
   });
 };
 var validateToFeedbacks = function validateToFeedbacks(field, triggerType) {
-  if (triggerType === void 0) {
-    triggerType = 'onInput';
-  }
-
   return __awaiter(void 0, void 0, void 0, function () {
     var results;
     return __generator(this, function (_a) {
@@ -5349,29 +5343,46 @@ var validateToFeedbacks = function validateToFeedbacks(field, triggerType) {
   });
 };
 var setValidatorRule = function setValidatorRule(field, name, value) {
-  var _a;
+  var _a, _b;
 
   if (!(0,_formily_shared__WEBPACK_IMPORTED_MODULE_0__/* .isValid */ .JY)(value)) return;
-  var validators = (0,_formily_validator__WEBPACK_IMPORTED_MODULE_1__/* .parseValidatorDescriptions */ .oM)(field.validator);
-  var hasRule = validators.some(function (desc) {
+  var hasRule = (0,_formily_validator__WEBPACK_IMPORTED_MODULE_1__/* .parseValidatorDescriptions */ .oM)(field.validator).some(function (desc) {
     return name in desc;
   });
   var rule = (_a = {}, _a[name] = value, _a);
 
   if (hasRule) {
-    field.validator = validators.map(function (desc) {
-      if ((0,_formily_shared__WEBPACK_IMPORTED_MODULE_0__/* .isPlainObj */ .Uk)(desc) && hasOwnProperty.call(desc, name)) {
-        desc[name] = value;
-        return desc;
-      }
+    if ((0,_formily_shared__WEBPACK_IMPORTED_MODULE_0__/* .isArr */ .H1)(field.validator)) {
+      field.validator = field.validator.map(function (desc) {
+        if ((0,_formily_shared__WEBPACK_IMPORTED_MODULE_0__/* .isPlainObj */ .Uk)(desc) && hasOwnProperty.call(desc, name)) {
+          desc[name] = value;
+          return desc;
+        }
 
-      return desc;
-    });
+        return desc;
+      });
+    } else if ((0,_formily_shared__WEBPACK_IMPORTED_MODULE_0__/* .isPlainObj */ .Uk)(field.validator)) {
+      field.validator[name] = value;
+    } else {
+      field.validator = (_b = {}, _b[name] = value, _b);
+    }
   } else {
-    if (name === 'required') {
-      field.validator = [rule].concat(validators);
+    if ((0,_formily_shared__WEBPACK_IMPORTED_MODULE_0__/* .isArr */ .H1)(field.validator)) {
+      if (name === 'required') {
+        field.validator.unshift(rule);
+      } else {
+        field.validator.push(rule);
+      }
     } else {
-      field.validator = validators.concat(rule);
+      if (name === 'required') {
+        field.validator = [rule, field.validator];
+      } else if ((0,_formily_shared__WEBPACK_IMPORTED_MODULE_0__/* .isPlainObj */ .Uk)(field.validator)) {
+        field.validator[name] = value;
+      } else if (field.validator) {
+        field.validator = [field.validator, rule];
+      } else {
+        field.validator = rule;
+      }
     }
   }
 };
@@ -8002,7 +8013,6 @@ var setSchemaFieldState = function setSchemaFieldState(options, demand) {
   var _a = options || {},
       request = _a.request,
       target = _a.target,
-      runner = _a.runner,
       field = _a.field,
       scope = _a.scope;
 
@@ -8024,14 +8034,6 @@ var setSchemaFieldState = function setSchemaFieldState(options, demand) {
         }), demand);
       });
     }
-
-    if ((0,_formily_shared__WEBPACK_IMPORTED_MODULE_1__/* .isStr */ .d8)(runner) && runner) {
-      field.form.setFieldState(target, function (state) {
-        (0,_compiler__WEBPACK_IMPORTED_MODULE_3__/* .shallowCompile */ .eC)("{{function(){".concat(runner, "}}}"), __assign(__assign({}, scope), {
-          $target: state
-        }))();
-      });
-    }
   } else {
     if (request.state) {
       field.setState(function (state) {
@@ -8044,10 +8046,6 @@ var setSchemaFieldState = function setSchemaFieldState(options, demand) {
         return (0,_compiler__WEBPACK_IMPORTED_MODULE_3__/* .patchSchemaCompile */ .Nc)(state, request.schema, scope, demand);
       });
     }
-
-    if ((0,_formily_shared__WEBPACK_IMPORTED_MODULE_1__/* .isStr */ .d8)(runner) && runner) {
-      (0,_compiler__WEBPACK_IMPORTED_MODULE_3__/* .shallowCompile */ .eC)("{{function(){".concat(runner, "}}}"), scope)();
-    }
   }
 };
 
@@ -8095,10 +8093,10 @@ var getBaseReactions = function getBaseReactions(schema, options) {
 };
 
 var getUserReactions = function getUserReactions(schema, options) {
-  var reactions = (0,_formily_shared__WEBPACK_IMPORTED_MODULE_1__/* .toArr */ ._K)(schema['x-reactions']);
-  return reactions.map(function (unCompiled) {
-    return function (field) {
-      var baseScope = getBaseScope(field, options);
+  return function (field) {
+    var reactions = (0,_formily_shared__WEBPACK_IMPORTED_MODULE_1__/* .toArr */ ._K)(schema['x-reactions']);
+    var baseScope = getBaseScope(field, options);
+    reactions.forEach(function (unCompiled) {
       var reaction = (0,_compiler__WEBPACK_IMPORTED_MODULE_3__/* .shallowCompile */ .eC)(unCompiled, baseScope);
       if (!reaction) return;
 
@@ -8130,9 +8128,12 @@ var getUserReactions = function getUserReactions(schema, options) {
           field: field,
           target: target,
           request: request,
-          runner: runner,
           scope: scope
         });
+
+        if ((0,_formily_shared__WEBPACK_IMPORTED_MODULE_1__/* .isStr */ .d8)(runner)) {
+          (0,_compiler__WEBPACK_IMPORTED_MODULE_3__/* .shallowCompile */ .eC)("{{function(){".concat(runner, "}}}"), scope)();
+        }
       };
 
       if (target) {
@@ -8152,14 +8153,14 @@ var getUserReactions = function getUserReactions(schema, options) {
       } else {
         run();
       }
-    };
-  });
+    });
+  };
 };
 
 var transformFieldProps = function transformFieldProps(schema, options) {
   return {
     name: schema.name,
-    reactions: [getBaseReactions(schema, options)].concat(getUserReactions(schema, options))
+    reactions: [getBaseReactions(schema, options), getUserReactions(schema, options)]
   };
 };
 
@@ -9854,17 +9855,17 @@ var isEqual = function isEqual(a, b) {
     var arrA = isArray(a);
     var arrB = isArray(b);
     var i = void 0;
-    var length = void 0;
+    var length_1;
     var key = void 0;
 
     if (arrA && arrB) {
-      length = a.length;
+      length_1 = a.length;
 
-      if (length !== b.length) {
+      if (length_1 !== b.length) {
         return false;
       }
 
-      for (i = length; i-- !== 0;) {
+      for (i = length_1; i-- !== 0;) {
         if (!isEqual(a[i], b[i])) {
           return false;
         }
@@ -9878,19 +9879,19 @@ var isEqual = function isEqual(a, b) {
     }
 
     var keys = keyList(a);
-    length = keys.length;
+    length_1 = keys.length;
 
-    if (length !== keyList(b).length) {
+    if (length_1 !== keyList(b).length) {
       return false;
     }
 
-    for (i = length; i-- !== 0;) {
+    for (i = length_1; i-- !== 0;) {
       if (!hasProp.call(b, keys[i])) {
         return false;
       }
     }
 
-    for (i = length; i-- !== 0;) {
+    for (i = length_1; i-- !== 0;) {
       key = keys[i];
 
       if (!isEqual(a[key], b[key])) {
@@ -10761,24 +10762,24 @@ var ReactiveInternal = function ReactiveInternal(props) {
   }
 
   var field = props.field;
-  var content = mergeChildren(renderChildren(props.children, field, field.form), (_a = field.content) !== null && _a !== void 0 ? _a : field.componentProps.children);
+  var content = mergeChildren(renderChildren(props.children, field, field.form), (_a = field.content) !== null && _a !== void 0 ? _a : field.component[1].children);
   if (field.display !== 'visible') return null;
 
   var renderDecorator = function renderDecorator(children) {
     var _a;
 
-    if (!field.decoratorType) {
+    if (!field.decorator[0]) {
       return react__WEBPACK_IMPORTED_MODULE_0___default().createElement(react__WEBPACK_IMPORTED_MODULE_0__.Fragment, null, children);
     }
 
-    var finalComponent = (_a = _formily_shared__WEBPACK_IMPORTED_MODULE_3__/* .FormPath.getIn */ .Dm.getIn(options === null || options === void 0 ? void 0 : options.components, field.decoratorType)) !== null && _a !== void 0 ? _a : field.decoratorType;
-    return react__WEBPACK_IMPORTED_MODULE_0___default().createElement(finalComponent, (0,_formily_reactive__WEBPACK_IMPORTED_MODULE_1__.toJS)(field.decoratorProps), children);
+    var finalComponent = (_a = _formily_shared__WEBPACK_IMPORTED_MODULE_3__/* .FormPath.getIn */ .Dm.getIn(options === null || options === void 0 ? void 0 : options.components, field.decorator[0])) !== null && _a !== void 0 ? _a : field.decorator[0];
+    return react__WEBPACK_IMPORTED_MODULE_0___default().createElement(finalComponent, (0,_formily_reactive__WEBPACK_IMPORTED_MODULE_1__.toJS)(field.decorator[1]), children);
   };
 
   var renderComponent = function renderComponent() {
     var _a, _b, _c, _d;
 
-    if (!field.componentType) return content;
+    if (!field.component[0]) return content;
     var value = !(0,_formily_core__WEBPACK_IMPORTED_MODULE_4__.isVoidField)(field) ? field.value : undefined;
     var onChange = !(0,_formily_core__WEBPACK_IMPORTED_MODULE_4__.isVoidField)(field) ? function () {
       var _a, _b;
@@ -10790,8 +10791,8 @@ var ReactiveInternal = function ReactiveInternal(props) {
       }
 
       field.onInput.apply(field, __spreadArray([], __read(args), false));
-      (_b = (_a = field.componentProps) === null || _a === void 0 ? void 0 : _a.onChange) === null || _b === void 0 ? void 0 : _b.call.apply(_b, __spreadArray([_a], __read(args), false));
-    } : (_a = field.componentProps) === null || _a === void 0 ? void 0 : _a.onChange;
+      (_b = (_a = field.component[1]) === null || _a === void 0 ? void 0 : _a.onChange) === null || _b === void 0 ? void 0 : _b.call.apply(_b, __spreadArray([_a], __read(args), false));
+    } : (_a = field.component[1]) === null || _a === void 0 ? void 0 : _a.onChange;
     var onFocus = !(0,_formily_core__WEBPACK_IMPORTED_MODULE_4__.isVoidField)(field) ? function () {
       var _a, _b;
 
@@ -10802,8 +10803,8 @@ var ReactiveInternal = function ReactiveInternal(props) {
       }
 
       field.onFocus.apply(field, __spreadArray([], __read(args), false));
-      (_b = (_a = field.componentProps) === null || _a === void 0 ? void 0 : _a.onFocus) === null || _b === void 0 ? void 0 : _b.call.apply(_b, __spreadArray([_a], __read(args), false));
-    } : (_b = field.componentProps) === null || _b === void 0 ? void 0 : _b.onFocus;
+      (_b = (_a = field.component[1]) === null || _a === void 0 ? void 0 : _a.onFocus) === null || _b === void 0 ? void 0 : _b.call.apply(_b, __spreadArray([_a], __read(args), false));
+    } : (_b = field.component[1]) === null || _b === void 0 ? void 0 : _b.onFocus;
     var onBlur = !(0,_formily_core__WEBPACK_IMPORTED_MODULE_4__.isVoidField)(field) ? function () {
       var _a, _b;
 
@@ -10814,15 +10815,15 @@ var ReactiveInternal = function ReactiveInternal(props) {
       }
 
       field.onBlur.apply(field, __spreadArray([], __read(args), false));
-      (_b = (_a = field.componentProps) === null || _a === void 0 ? void 0 : _a.onBlur) === null || _b === void 0 ? void 0 : _b.call.apply(_b, __spreadArray([_a], __read(args), false));
-    } : (_c = field.componentProps) === null || _c === void 0 ? void 0 : _c.onBlur;
+      (_b = (_a = field.component[1]) === null || _a === void 0 ? void 0 : _a.onBlur) === null || _b === void 0 ? void 0 : _b.call.apply(_b, __spreadArray([_a], __read(args), false));
+    } : (_c = field.component[1]) === null || _c === void 0 ? void 0 : _c.onBlur;
     var disabled = !(0,_formily_core__WEBPACK_IMPORTED_MODULE_4__.isVoidField)(field) ? field.pattern === 'disabled' || field.pattern === 'readPretty' : undefined;
     var readOnly = !(0,_formily_core__WEBPACK_IMPORTED_MODULE_4__.isVoidField)(field) ? field.pattern === 'readOnly' : undefined;
-    var finalComponent = (_d = _formily_shared__WEBPACK_IMPORTED_MODULE_3__/* .FormPath.getIn */ .Dm.getIn(options === null || options === void 0 ? void 0 : options.components, field.componentType)) !== null && _d !== void 0 ? _d : field.componentType;
+    var finalComponent = (_d = _formily_shared__WEBPACK_IMPORTED_MODULE_3__/* .FormPath.getIn */ .Dm.getIn(options === null || options === void 0 ? void 0 : options.components, field.component[0])) !== null && _d !== void 0 ? _d : field.component[0];
     return react__WEBPACK_IMPORTED_MODULE_0___default().createElement(finalComponent, __assign(__assign({
       disabled: disabled,
       readOnly: readOnly
-    }, (0,_formily_reactive__WEBPACK_IMPORTED_MODULE_1__.toJS)(field.componentProps)), {
+    }, (0,_formily_reactive__WEBPACK_IMPORTED_MODULE_1__.toJS)(field.component[1])), {
       value: value,
       onChange: onChange,
       onFocus: onFocus,
@@ -10915,11 +10916,7 @@ var RecursionField = function RecursionField(props) {
 
   var renderProperties = function renderProperties(field) {
     if (props.onlyRenderSelf) return;
-    var properties = _formily_json_schema__WEBPACK_IMPORTED_MODULE_2__/* .Schema.getOrderProperties */ .V.getOrderProperties(fieldSchema);
-    if (!properties.length) return;
-    return react__WEBPACK_IMPORTED_MODULE_0___default().createElement(react__WEBPACK_IMPORTED_MODULE_0__.Fragment, null, properties.map(function (_a, index) {
-      var item = _a.schema,
-          name = _a.key;
+    return react__WEBPACK_IMPORTED_MODULE_0___default().createElement(react__WEBPACK_IMPORTED_MODULE_0__.Fragment, null, fieldSchema.mapProperties(function (item, name, index) {
       var base = (field === null || field === void 0 ? void 0 : field.address) || basePath;
       var schema = item;
 
@@ -12223,60 +12220,10 @@ var box = (0,_internals__WEBPACK_IMPORTED_MODULE_1__/* .createAnnotation */ .Bh)
 /* harmony import */ var _environment__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(4756);
 /* harmony import */ var _internals__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(26755);
 /* harmony import */ var _tree__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(85755);
-/* harmony import */ var _checkers__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(56893);
-/* harmony import */ var _reaction__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(91476);
-var __read = undefined && undefined.__read || function (o, n) {
-  var m = typeof Symbol === "function" && o[Symbol.iterator];
-  if (!m) return o;
-  var i = m.call(o),
-      r,
-      ar = [],
-      e;
-
-  try {
-    while ((n === void 0 || n-- > 0) && !(r = i.next()).done) {
-      ar.push(r.value);
-    }
-  } catch (error) {
-    e = {
-      error: error
-    };
-  } finally {
-    try {
-      if (r && !r.done && (m = i["return"])) m.call(i);
-    } finally {
-      if (e) throw e.error;
-    }
-  }
-
-  return ar;
-};
-
-
-
+/* harmony import */ var _reaction__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(91476);
 
 
 
-var getDescriptor = Object.getOwnPropertyDescriptor;
-var getProto = Object.getPrototypeOf;
-
-function getGetterAndSetter(target, key, value) {
-  if (!target) {
-    if (value) {
-      if ((0,_checkers__WEBPACK_IMPORTED_MODULE_3__/* .isFn */ .LQ)(value)) {
-        return [value];
-      } else {
-        return [value.get, value.set];
-      }
-    }
-
-    return [];
-  }
-
-  var descriptor = getDescriptor(target, key);
-  if (descriptor) return [descriptor.get, descriptor.set];
-  return getGetterAndSetter(getProto(target), key, value);
-}
 
 var computed = (0,_internals__WEBPACK_IMPORTED_MODULE_1__/* .createAnnotation */ .Bh)(function (_a) {
   var target = _a.target,
@@ -12286,18 +12233,40 @@ var computed = (0,_internals__WEBPACK_IMPORTED_MODULE_1__/* .createAnnotation */
   var proxy = {};
   var context = target ? target : store;
   var property = target ? key : 'value';
+  var getter = getGetter(context);
+  var setter = getSetter(context);
+
+  function getGetter(target) {
+    if (!target) {
+      if (value === null || value === void 0 ? void 0 : value.get) return value === null || value === void 0 ? void 0 : value.get;
+      return value;
+    }
 
-  var _b = __read(getGetterAndSetter(context, property, value), 2),
-      getter = _b[0],
-      setter = _b[1];
+    var descriptor = Object.getOwnPropertyDescriptor(target, property);
+    if (descriptor === null || descriptor === void 0 ? void 0 : descriptor.get) return descriptor.get;
+    return getGetter(Object.getPrototypeOf(target));
+  }
+
+  function getSetter(target) {
+    if (!target) {
+      if (value === null || value === void 0 ? void 0 : value.set) return value === null || value === void 0 ? void 0 : value.set;
+      return;
+    }
+
+    var descriptor = Object.getOwnPropertyDescriptor(target, property);
+    if (descriptor === null || descriptor === void 0 ? void 0 : descriptor.set) return descriptor.set;
+    return getSetter(Object.getPrototypeOf(target));
+  }
 
   function compute() {
-    store.value = getter === null || getter === void 0 ? void 0 : getter.call(context);
+    var _a;
+
+    store.value = (_a = getter === null || getter === void 0 ? void 0 : getter.call) === null || _a === void 0 ? void 0 : _a.call(getter, context);
   }
 
   function reaction() {
     if (_environment__WEBPACK_IMPORTED_MODULE_0__/* .ReactionStack.indexOf */ .eA.indexOf(reaction) === -1) {
-      (0,_reaction__WEBPACK_IMPORTED_MODULE_4__/* .releaseBindingReactions */ .cD)(reaction);
+      (0,_reaction__WEBPACK_IMPORTED_MODULE_3__/* .releaseBindingReactions */ .cD)(reaction);
 
       try {
         _environment__WEBPACK_IMPORTED_MODULE_0__/* .ReactionStack.push */ .eA.push(reaction);
@@ -12312,25 +12281,30 @@ var computed = (0,_internals__WEBPACK_IMPORTED_MODULE_1__/* .createAnnotation */
 
   reaction._scheduler = function () {
     reaction._dirty = true;
-    (0,_reaction__WEBPACK_IMPORTED_MODULE_4__/* .runReactionsFromTargetKey */ .cL)({
+    (0,_reaction__WEBPACK_IMPORTED_MODULE_3__/* .batchStart */ .o$)();
+    (0,_reaction__WEBPACK_IMPORTED_MODULE_3__/* .runReactionsFromTargetKey */ .cL)({
       target: context,
       key: property,
       value: store.value,
       type: 'set'
     });
+    (0,_reaction__WEBPACK_IMPORTED_MODULE_3__/* .batchEnd */ .ks)();
   };
 
   reaction._isComputed = true;
   reaction._dirty = true;
   reaction._context = context;
   reaction._property = property;
+  _environment__WEBPACK_IMPORTED_MODULE_0__/* .ProxyRaw.set */ .wX.set(proxy, store);
+  _environment__WEBPACK_IMPORTED_MODULE_0__/* .RawProxy.set */ .dv.set(store, proxy);
+  (0,_tree__WEBPACK_IMPORTED_MODULE_2__/* .buildDataTree */ .Kv)(target, key, store);
 
   function get() {
-    if ((0,_reaction__WEBPACK_IMPORTED_MODULE_4__/* .hasRunningReaction */ .YX)()) {
-      (0,_reaction__WEBPACK_IMPORTED_MODULE_4__/* .bindComputedReactions */ .g3)(reaction);
+    if ((0,_reaction__WEBPACK_IMPORTED_MODULE_3__/* .hasRunningReaction */ .YX)()) {
+      (0,_reaction__WEBPACK_IMPORTED_MODULE_3__/* .bindComputedReactions */ .g3)(reaction);
     }
 
-    if (!(0,_reaction__WEBPACK_IMPORTED_MODULE_4__/* .isUntracking */ .Im)()) {
+    if (!(0,_reaction__WEBPACK_IMPORTED_MODULE_3__/* .isUntracking */ .Im)()) {
       //如果允许untracked过程中收集依赖，那么永远不会存在绑定，因为_dirty已经设置为false
       if (reaction._dirty) {
         reaction();
@@ -12340,7 +12314,7 @@ var computed = (0,_internals__WEBPACK_IMPORTED_MODULE_1__/* .createAnnotation */
       compute();
     }
 
-    (0,_reaction__WEBPACK_IMPORTED_MODULE_4__/* .bindTargetKeyWithCurrentReaction */ .q0)({
+    (0,_reaction__WEBPACK_IMPORTED_MODULE_3__/* .bindTargetKeyWithCurrentReaction */ .q0)({
       target: context,
       key: property,
       type: 'get'
@@ -12349,11 +12323,13 @@ var computed = (0,_internals__WEBPACK_IMPORTED_MODULE_1__/* .createAnnotation */
   }
 
   function set(value) {
+    var _a;
+
     try {
-      (0,_reaction__WEBPACK_IMPORTED_MODULE_4__/* .batchStart */ .o$)();
-      setter === null || setter === void 0 ? void 0 : setter.call(context, value);
+      (0,_reaction__WEBPACK_IMPORTED_MODULE_3__/* .batchStart */ .o$)();
+      (_a = setter === null || setter === void 0 ? void 0 : setter.call) === null || _a === void 0 ? void 0 : _a.call(setter, context, value);
     } finally {
-      (0,_reaction__WEBPACK_IMPORTED_MODULE_4__/* .batchEnd */ .ks)();
+      (0,_reaction__WEBPACK_IMPORTED_MODULE_3__/* .batchEnd */ .ks)();
     }
   }
 
@@ -12361,7 +12337,8 @@ var computed = (0,_internals__WEBPACK_IMPORTED_MODULE_1__/* .createAnnotation */
     Object.defineProperty(target, key, {
       get: get,
       set: set,
-      enumerable: true
+      enumerable: true,
+      configurable: false
     });
     return target;
   } else {
@@ -12369,9 +12346,6 @@ var computed = (0,_internals__WEBPACK_IMPORTED_MODULE_1__/* .createAnnotation */
       set: set,
       get: get
     });
-    (0,_tree__WEBPACK_IMPORTED_MODULE_2__/* .buildDataTree */ .Kv)(target, key, store);
-    _environment__WEBPACK_IMPORTED_MODULE_0__/* .ProxyRaw.set */ .wX.set(proxy, store);
-    _environment__WEBPACK_IMPORTED_MODULE_0__/* .RawProxy.set */ .dv.set(store, proxy);
   }
 
   return proxy;
@@ -12485,6 +12459,9 @@ var ref = (0,_internals__WEBPACK_IMPORTED_MODULE_1__/* .createAnnotation */ .Bh)
   var proxy = {};
   var context = target ? target : store;
   var property = target ? key : 'value';
+  (0,_tree__WEBPACK_IMPORTED_MODULE_2__/* .buildDataTree */ .Kv)(target, key, store);
+  _environment__WEBPACK_IMPORTED_MODULE_0__/* .ProxyRaw.set */ .wX.set(proxy, store);
+  _environment__WEBPACK_IMPORTED_MODULE_0__/* .RawProxy.set */ .dv.set(store, proxy);
 
   function get() {
     (0,_reaction__WEBPACK_IMPORTED_MODULE_3__/* .bindTargetKeyWithCurrentReaction */ .q0)({
@@ -12514,7 +12491,8 @@ var ref = (0,_internals__WEBPACK_IMPORTED_MODULE_1__/* .createAnnotation */ .Bh)
     Object.defineProperty(target, key, {
       get: get,
       set: set,
-      enumerable: true
+      enumerable: true,
+      configurable: false
     });
     return target;
   } else {
@@ -12522,9 +12500,6 @@ var ref = (0,_internals__WEBPACK_IMPORTED_MODULE_1__/* .createAnnotation */ .Bh)
       set: set,
       get: get
     });
-    (0,_tree__WEBPACK_IMPORTED_MODULE_2__/* .buildDataTree */ .Kv)(target, key, store);
-    _environment__WEBPACK_IMPORTED_MODULE_0__/* .ProxyRaw.set */ .wX.set(proxy, store);
-    _environment__WEBPACK_IMPORTED_MODULE_0__/* .RawProxy.set */ .dv.set(store, proxy);
   }
 
   return proxy;
@@ -12609,7 +12584,6 @@ function () {
       value = [];
     }
 
-    this.batchDeleting = false;
     this.value = value;
   }
 
@@ -12624,8 +12598,6 @@ function () {
   };
 
   ArraySet.prototype["delete"] = function (item) {
-    if (this.batchDeleting) return; //批量删除时禁止单独删除，会影响计数执行器
-
     var index = this.value.indexOf(item);
 
     if (index > -1) {
@@ -12643,7 +12615,6 @@ function () {
 
   ArraySet.prototype.forEachDelete = function (callback) {
     if (this.value.length === 0) return;
-    this.batchDeleting = true;
 
     for (var index = 0; index < this.value.length; index++) {
       var item = this.value[index];
@@ -12651,8 +12622,6 @@ function () {
       callback(item);
       index--;
     }
-
-    this.batchDeleting = false;
   };
 
   ArraySet.prototype.clear = function () {
@@ -12805,12 +12774,10 @@ var reaction = function reaction(tracker, subscriber, options) {
 
   var fireAction = function fireAction() {
     try {
-      (0,_reaction__WEBPACK_IMPORTED_MODULE_0__/* .untrackStart */ .aN)();
       (0,_reaction__WEBPACK_IMPORTED_MODULE_0__/* .batchStart */ .o$)();
       if ((0,_checkers__WEBPACK_IMPORTED_MODULE_1__/* .isFn */ .LQ)(subscriber)) subscriber(value.currentValue, value.oldValue);
     } finally {
       (0,_reaction__WEBPACK_IMPORTED_MODULE_0__/* .batchEnd */ .ks)();
-      (0,_reaction__WEBPACK_IMPORTED_MODULE_0__/* .untrackEnd */ .Pq)();
     }
   };
 
@@ -12894,7 +12861,6 @@ batch.endpoint = function (callback) {
 /* harmony export */   "gK": () => (/* binding */ isCollectionType),
 /* harmony export */   "Yq": () => (/* binding */ isNormalType)
 /* harmony export */ });
-var toString = Object.prototype.toString;
 var isMap = function isMap(val) {
   return val && val instanceof Map;
 };
@@ -12912,7 +12878,7 @@ var isFn = function isFn(val) {
 };
 var isArr = Array.isArray;
 var isPlainObj = function isPlainObj(val) {
-  return toString.call(val) === '[object Object]';
+  return Object.prototype.toString.call(val) === '[object Object]';
 };
 var isValid = function isValid(val) {
   return val !== null && val !== undefined;
@@ -12992,8 +12958,6 @@ var ObserverListeners = new _array__WEBPACK_IMPORTED_MODULE_0__/* .ArraySet */ .
 /* harmony export */ });
 /* harmony import */ var _checkers__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(56893);
 /* harmony import */ var _environment__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(4756);
-/* harmony import */ var _tree__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(85755);
-
 
 
 var RAW_TYPE = Symbol('RAW_TYPE');
@@ -13114,8 +13078,8 @@ var contains = function contains(target, property) {
   var targetRaw = _environment__WEBPACK_IMPORTED_MODULE_1__/* .ProxyRaw.get */ .wX.get(target) || target;
   var propertyRaw = _environment__WEBPACK_IMPORTED_MODULE_1__/* .ProxyRaw.get */ .wX.get(property) || property;
   if (targetRaw === propertyRaw) return true;
-  var targetNode = (0,_tree__WEBPACK_IMPORTED_MODULE_2__/* .getDataNode */ .bl)(targetRaw);
-  var propertyNode = (0,_tree__WEBPACK_IMPORTED_MODULE_2__/* .getDataNode */ .bl)(propertyRaw);
+  var targetNode = _environment__WEBPACK_IMPORTED_MODULE_1__/* .RawNode.get */ .xO.get(targetRaw);
+  var propertyNode = _environment__WEBPACK_IMPORTED_MODULE_1__/* .RawNode.get */ .xO.get(propertyRaw);
   if (!targetNode) return false;
   if (!propertyNode) return false;
   return targetNode.contains(propertyNode);
@@ -13538,9 +13502,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   "toJS": () => (/* reexport safe */ _externals__WEBPACK_IMPORTED_MODULE_8__.ZN),
 /* harmony export */   "DataChange": () => (/* reexport safe */ _types__WEBPACK_IMPORTED_MODULE_9__.UH),
 /* harmony export */   "DataNode": () => (/* reexport safe */ _types__WEBPACK_IMPORTED_MODULE_9__.RQ),
-/* harmony export */   "buildDataTree": () => (/* reexport safe */ _types__WEBPACK_IMPORTED_MODULE_9__.Kv),
-/* harmony export */   "getDataNode": () => (/* reexport safe */ _types__WEBPACK_IMPORTED_MODULE_9__.bl),
-/* harmony export */   "setDataNode": () => (/* reexport safe */ _types__WEBPACK_IMPORTED_MODULE_9__.Oe)
+/* harmony export */   "buildDataTree": () => (/* reexport safe */ _types__WEBPACK_IMPORTED_MODULE_9__.Kv)
 /* harmony export */ });
 /* harmony import */ var _batch__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1713);
 /* harmony import */ var _action__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(65483);
@@ -13627,7 +13589,7 @@ var createObservable = function createObservable(target, key, value, shallow) {
   var raw = _environment__WEBPACK_IMPORTED_MODULE_1__/* .ProxyRaw.get */ .wX.get(value);
 
   if (!!raw) {
-    var node = (0,_tree__WEBPACK_IMPORTED_MODULE_3__/* .getDataNode */ .bl)(raw);
+    var node = _environment__WEBPACK_IMPORTED_MODULE_1__/* .RawNode.get */ .xO.get(raw);
     node.key = key;
     return value;
   }
@@ -13828,11 +13790,11 @@ var observe = function observe(target, observer, deep) {
 
   var addListener = function addListener(target) {
     var raw = _environment__WEBPACK_IMPORTED_MODULE_0__/* .ProxyRaw.get */ .wX.get(target) || target;
-    var node = (0,_tree__WEBPACK_IMPORTED_MODULE_2__/* .getDataNode */ .bl)(raw);
+    var node = _environment__WEBPACK_IMPORTED_MODULE_0__/* .RawNode.get */ .xO.get(raw);
 
     var listener = function listener(operation) {
       var targetRaw = _environment__WEBPACK_IMPORTED_MODULE_0__/* .ProxyRaw.get */ .wX.get(operation.target) || operation.target;
-      var targetNode = (0,_tree__WEBPACK_IMPORTED_MODULE_2__/* .getDataNode */ .bl)(targetRaw);
+      var targetNode = _environment__WEBPACK_IMPORTED_MODULE_0__/* .RawNode.get */ .xO.get(targetRaw);
 
       if (deep) {
         if (node.contains(targetNode)) {
@@ -14218,8 +14180,6 @@ function () {
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "UH": () => (/* binding */ DataChange),
 /* harmony export */   "RQ": () => (/* binding */ DataNode),
-/* harmony export */   "bl": () => (/* binding */ getDataNode),
-/* harmony export */   "Oe": () => (/* binding */ setDataNode),
 /* harmony export */   "Kv": () => (/* binding */ buildDataTree)
 /* harmony export */ });
 /* harmony import */ var _environment__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(4756);
@@ -14269,7 +14229,7 @@ function () {
   Object.defineProperty(DataNode.prototype, "parent", {
     get: function get() {
       if (!this.target) return;
-      return getDataNode(this.targetRaw);
+      return _environment__WEBPACK_IMPORTED_MODULE_0__/* .RawNode.get */ .xO.get(this.targetRaw);
     },
     enumerable: false,
     configurable: true
@@ -14299,17 +14259,10 @@ function () {
 }();
 
 
-var getDataNode = function getDataNode(raw) {
-  return _environment__WEBPACK_IMPORTED_MODULE_0__/* .RawNode.get */ .xO.get(raw);
-};
-var setDataNode = function setDataNode(raw, node) {
-  _environment__WEBPACK_IMPORTED_MODULE_0__/* .RawNode.set */ .xO.set(raw, node);
-};
 var buildDataTree = function buildDataTree(target, key, value) {
-  var raw = _environment__WEBPACK_IMPORTED_MODULE_0__/* .ProxyRaw.get */ .wX.get(value) || value;
-  var currentNode = getDataNode(raw);
+  var currentNode = _environment__WEBPACK_IMPORTED_MODULE_0__/* .RawNode.get */ .xO.get(_environment__WEBPACK_IMPORTED_MODULE_0__/* .ProxyRaw.get */ .wX.get(value) || value);
   if (currentNode) return currentNode;
-  setDataNode(raw, new DataNode(target, key, value));
+  _environment__WEBPACK_IMPORTED_MODULE_0__/* .RawNode.set */ .xO.set(value, new DataNode(target, key, value));
 };
 
 /***/ }),
@@ -14321,9 +14274,7 @@ var buildDataTree = function buildDataTree(target, key, value) {
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "UH": () => (/* reexport safe */ _tree__WEBPACK_IMPORTED_MODULE_0__.UH),
 /* harmony export */   "RQ": () => (/* reexport safe */ _tree__WEBPACK_IMPORTED_MODULE_0__.RQ),
-/* harmony export */   "Kv": () => (/* reexport safe */ _tree__WEBPACK_IMPORTED_MODULE_0__.Kv),
-/* harmony export */   "bl": () => (/* reexport safe */ _tree__WEBPACK_IMPORTED_MODULE_0__.bl),
-/* harmony export */   "Oe": () => (/* reexport safe */ _tree__WEBPACK_IMPORTED_MODULE_0__.Oe)
+/* harmony export */   "Kv": () => (/* reexport safe */ _tree__WEBPACK_IMPORTED_MODULE_0__.Kv)
 /* harmony export */ });
 /* harmony import */ var _tree__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(85755);
 
@@ -14494,8 +14445,6 @@ function includes(val, searchElement, revert) {
 /* unused harmony exports getType, isMap, isSet, isWeakMap, isWeakSet, isRegExp, isReactElement, isHTMLElement */
 function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
-var toString = Object.prototype.toString;
-
 var isType = function isType(type) {
   return function (obj) {
     return getType(obj) === "[object ".concat(type, "]");
@@ -14503,7 +14452,7 @@ var isType = function isType(type) {
 };
 
 var getType = function getType(obj) {
-  return toString.call(obj);
+  return Object.prototype.toString.call(obj);
 };
 var isFn = function isFn(val) {
   return typeof val === 'function';
@@ -15908,7 +15857,6 @@ var getRuleMessage = function getRuleMessage(rule, type) {
 };
 
 var parseValidatorDescription = function parseValidatorDescription(description) {
-  if (!description) return {};
   var rules = {};
 
   if ((0,_formily_shared__WEBPACK_IMPORTED_MODULE_0__/* .isStr */ .d8)(description)) {
@@ -15919,10 +15867,10 @@ var parseValidatorDescription = function parseValidatorDescription(description)
     rules = Object.assign(rules, description);
   }
 
+  rules.triggerType = rules.triggerType || 'onInput';
   return rules;
 };
 var parseValidatorDescriptions = function parseValidatorDescriptions(validator) {
-  if (!validator) return [];
   var array = (0,_formily_shared__WEBPACK_IMPORTED_MODULE_0__/* .isArr */ .H1)(validator) ? validator : [validator];
   return array.map(function (description) {
     return parseValidatorDescription(description);
@@ -16060,14 +16008,10 @@ var parseValidator = function parseValidator(validator, options) {
     options = {};
   }
 
-  if (!validator) return [];
   var array = (0,_formily_shared__WEBPACK_IMPORTED_MODULE_0__/* .isArr */ .H1)(validator) ? validator : [validator];
   return array.reduce(function (buf, description) {
-    var _a;
-
     var rules = parseValidatorDescription(description);
-    var triggerType = (_a = rules.triggerType) !== null && _a !== void 0 ? _a : 'onInput';
-    if ((options === null || options === void 0 ? void 0 : options.triggerType) && options.triggerType !== triggerType) return buf;
+    if ((options === null || options === void 0 ? void 0 : options.triggerType) && options.triggerType !== rules.triggerType) return buf;
     return rules ? buf.concat(parseValidatorRules(rules)) : buf;
   }, []);
 };
@@ -17611,8 +17555,8 @@ var MenuOutlinedIcon = react__WEBPACK_IMPORTED_MODULE_0___default().forwardRef(f
   return react__WEBPACK_IMPORTED_MODULE_0___default().createElement(Icon, __assign({}, props, {
     ref: ref
   }), react__WEBPACK_IMPORTED_MODULE_0___default().createElement("path", {
-    d: "M262.4 192c0 35.3472 28.6528 64 64 64s64-28.6528 64-64-28.6528-64-64-64-64 28.6528-64 64zM262.4 512c0 35.3472 28.6528 64 64 64s64-28.6528 64-64-28.6528-64-64-64-64 28.6528-64 64zM633.6 192c0 35.3472 28.6528 64 64 64s64-28.6528 64-64-28.6528-64-64-64-64 28.6528-64 64zM633.6 512c0 35.3472 28.6528 64 64 64s64-28.6528 64-64-28.6528-64-64-64-64 28.6528-64 64zM262.4 832c0 35.3472 28.6528 64 64 64s64-28.6528 64-64-28.6528-64-64-64-64 28.6528-64 64zM633.6 832c0 35.3472 28.6528 64 64 64s64-28.6528 64-64-28.6528-64-64-64-64 28.6528-64 64z",
-    "p-id": "11148"
+    d: "M128.64 288h768c14.08 0 32-14.08 32-32s-17.92-32-32-32h-768c-14.08 0-32 14.08-32 32s17.92 32 32 32zM896.64 480h-768c-14.08 0-32 14.08-32 32s17.92 32 32 32h768c14.08 0 32-14.08 32-32s-17.28-32-32-32zM896.64 736h-768c-14.08 0-32 14.08-32 32s17.92 32 32 32h768c14.08 0 32-14.08 32-32s-17.28-32-32-32z",
+    "p-id": "12825"
   }));
 });
 var PlusOutlinedIcon = react__WEBPACK_IMPORTED_MODULE_0___default().forwardRef(function (props, ref) {
@@ -21694,17 +21638,16 @@ var BaseItem = function BaseItem(props) {
   }, extra)));
 }; // 适配
 
-var FormItem = (0,_formily_react__WEBPACK_IMPORTED_MODULE_3__.connect)(BaseItem, (0,_formily_react__WEBPACK_IMPORTED_MODULE_3__.mapProps)(function (props, field) {
+var FormItem = (0,_formily_react__WEBPACK_IMPORTED_MODULE_3__.connect)(BaseItem, (0,_formily_react__WEBPACK_IMPORTED_MODULE_3__.mapProps)({
+  validateStatus: true,
+  title: 'label',
+  required: true
+}, function (props, field) {
   if ((0,_formily_core__WEBPACK_IMPORTED_MODULE_2__.isVoidField)(field)) return {
     extra: props.extra || field.description
   };
   if (!field) return props;
 
-  var takeFeedbackStatus = function takeFeedbackStatus() {
-    if (field.validating) return 'pending';
-    return field.decoratorProps.feedbackStatus || field.validateStatus;
-  };
-
   var takeMessage = function takeMessage() {
     var split = function split(messages) {
       return messages.reduce(function (buf, text, index) {
@@ -21720,24 +21663,33 @@ var FormItem = (0,_formily_react__WEBPACK_IMPORTED_MODULE_3__.connect)(BaseItem,
     if (field.selfSuccesses.length) return split(field.selfSuccesses);
   };
 
-  var takeAsterisk = function takeAsterisk() {
-    if (field.required && field.pattern !== 'readPretty') {
-      return true;
-    }
-
-    if ('asterisk' in props) {
-      return props.asterisk;
-    }
+  return {
+    feedbackText: takeMessage(),
+    extra: props.extra || field.description
+  };
+}, function (props, field) {
+  var _a;
 
-    return false;
+  if ((0,_formily_core__WEBPACK_IMPORTED_MODULE_2__.isVoidField)(field)) return props;
+  if (!field) return props;
+  return {
+    feedbackStatus: field.validateStatus === 'validating' ? 'pending' : ((_a = field.decorator[1]) === null || _a === void 0 ? void 0 : _a.feedbackStatus) || field.validateStatus
   };
+}, function (props, field) {
+  if ((0,_formily_core__WEBPACK_IMPORTED_MODULE_2__.isVoidField)(field)) return props;
+  if (!field) return props;
+  var asterisk = false;
+
+  if (field.required && field.pattern !== 'readPretty') {
+    asterisk = true;
+  }
+
+  if ('asterisk' in props) {
+    asterisk = props.asterisk;
+  }
 
   return {
-    label: field.title,
-    feedbackStatus: takeFeedbackStatus(),
-    feedbackText: takeMessage(),
-    asterisk: takeAsterisk(),
-    extra: props.extra || field.description
+    asterisk: asterisk
   };
 }));
 FormItem.defaultProps = {
@@ -24399,8 +24351,7 @@ var TeamixIcon = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.forwardRef)(
   }
 
   return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("i", (0,_babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)({
-    className: classes // @ts-ignore
-    ,
+    className: classes,
     ref: ref
   }, others), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("svg", {
     viewBox: "0 0 1024 1024"
@@ -24413,7 +24364,7 @@ TeamixIcon.YUNXIAO = {
   symbolPrefix: 'yunxiao-'
 };
 TeamixIcon.HYBRIDCLOUD = {
-  scriptUrl: '//at.alicdn.com/t/font_2436140_xd91cirfxss.js',
+  scriptUrl: '//at.alicdn.com/t/font_2436140_psy0jd7csgm.js',
   symbolPrefix: 'hybridcloud-'
 };
 TeamixIcon.displayName = 'TeamixIcon';
@@ -53869,7 +53820,7 @@ var Icon = function Icon(props) {
       return (0,_utils_color__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .ZP)(render === null || render === void 0 ? void 0 : render.color);
     }
 
-    return 'var(--color-fill1-6, #848484)';
+    return '';
   };
 
   if (typeof render.icon === 'string') {
@@ -53882,7 +53833,9 @@ var Icon = function Icon(props) {
       },
       className: cls({
         '': true,
-        number: isNumber()
+        number: isNumber(),
+        // 如果前缀图标配有link属性并且没有指定color。则hover变蓝
+        link: (render === null || render === void 0 ? void 0 : render.link) && !render.color
       }),
       size: (_render$iconSize = render.iconSize) !== null && _render$iconSize !== void 0 ? _render$iconSize : 'small'
     }), result);
@@ -56054,7 +56007,8 @@ var progressMapper = {
   process: 'normal',
   pause: 'pause',
   help: 'Y50',
-  warning: 'O50'
+  warning: 'O50',
+  mention: 'P50'
 };
 var statusIconMapper = {
   'cloud-running': {
@@ -56897,6 +56851,9 @@ var ProPageContainerFixedFooter = function ProPageContainerFixedFooter(props) {
   var children = props.children;
   react__WEBPACK_IMPORTED_MODULE_0___default().useEffect(function () {
     registerFixedFooter && registerFixedFooter(children);
+    return function () {
+      registerFixedFooter && registerFixedFooter(null);
+    };
   }, [children]);
 
   if (!registerFixedFooter) {
@@ -57635,7 +57592,7 @@ function useDialogFormAction(action, context) {
       _onFinish = action.onFinish,
       others = _objectWithoutPropertiesLoose(action, _excluded2);
 
-  var formRef = (0,react__WEBPACK_IMPORTED_MODULE_0__.useRef)();
+  var formRef = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.createRef)();
   return (0,_dialog__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .Z)(Object.assign({
     size: size,
     closeable: true,
@@ -57753,14 +57710,7 @@ function useDialogTableAction(action, context) {
 /* harmony import */ var _request__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(67096);
 /* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(95983);
 var _excluded = ["url", "method", "params", "data", "extendParams", "successMsg", "errorMsg", "formatParams", "formatResult", "onSuccess", "onError"],
-    _excluded2 = ["title", "content", "component", "schema", "onFinish", "dialogType", "dialogQuickShowType", "messageType", "beforeRequest", "onTrigger", "link", "beforeContent", "afterContent", "message", "footerDescription", "footerAlign", "overlayProps"],
-    _excluded3 = ["className"];
-
-function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+    _excluded2 = ["title", "content", "component", "schema", "onFinish", "dialogType", "dialogQuickShowType", "messageType", "beforeRequest", "onTrigger", "link", "beforeContent", "afterContent", "message", "footerDescription", "footerAlign"];
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
@@ -57768,6 +57718,12 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
+function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
 
@@ -57851,28 +57807,20 @@ function useDialogAction(action, context) {
         message = _getTargetValue.message,
         footerDescription = _getTargetValue.footerDescription,
         footerAlign = _getTargetValue.footerAlign,
-        _getTargetValue$overl = _getTargetValue.overlayProps,
-        overlayProps = _getTargetValue$overl === void 0 ? {} : _getTargetValue$overl,
         containerProps = _objectWithoutPropertiesLoose(_getTargetValue, _excluded2);
 
     var isDrawer = dialogType === 'drawer';
     var container = isDrawer ? _alicloudfe_components__WEBPACK_IMPORTED_MODULE_3__.Drawer : _alicloudfe_components__WEBPACK_IMPORTED_MODULE_3__.Dialog;
-
-    var overlayClassName = overlayProps.className,
-        overlayOtherProps = _objectWithoutPropertiesLoose(overlayProps, _excluded3);
-
     var dialogOnlyProps = {
       type: dialogQuickShowType,
       messageProps: {
         type: messageType
-      },
-      overlayProps: _objectSpread({
-        className: classnames__WEBPACK_IMPORTED_MODULE_1___default()('teamix-pro-action-dialog', overlayClassName, {
-          'has-footer-description': !!footerDescription
-        })
-      }, overlayOtherProps)
+      }
     };
-    var containerOtherProps = isDrawer ? {} : dialogOnlyProps;
+    var containerOtherProps = isDrawer ? {
+      okText: (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_4__.getMessage)('ok'),
+      cancelText: (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_4__.getMessage)('cancel')
+    } : dialogOnlyProps;
 
     var renderDialogFooterDescription = function renderDialogFooterDescription(footer) {
       if (footer instanceof Array || footer.component) {
@@ -58285,13 +58233,15 @@ var ProActionButton = function ProActionButton(props) {
   }, buttonProps), buttonContent(children, icon, iconSize, context));
 };
 
-function renderMenuButtonItem(item, key, context) {
-  var config = item.config,
-      btnContext = item.context,
-      _onClick2 = item.onClick,
-      children = item.children,
-      icon = item.icon,
-      disabled = item.disabled;
+var ProActionMenuButtonItem = function ProActionMenuButtonItem(props) {
+  var action = props.action,
+      context = props.context;
+  var config = action.config,
+      btnContext = action.context,
+      _onClick2 = action.onClick,
+      children = action.children,
+      icon = action.icon,
+      disabled = action.disabled;
   var menuItemActionConfig = Object.assign({}, config, {
     trigger: 'onClick'
   });
@@ -58300,30 +58250,33 @@ function renderMenuButtonItem(item, key, context) {
       loading = _useAction.loading,
       menuItemProps = _objectWithoutPropertiesLoose(_useAction, _excluded3);
 
-  var buttonProps = _onClick2 ? _objectSpread(_objectSpread({}, menuItemProps), {}, {
+  var buttonProps = disabled ? {} : _onClick2 ? _objectSpread(_objectSpread({}, menuItemProps), {}, {
     onClick: function onClick(e) {
       return _onClick2(e, context);
     }
   }) : _objectSpread({}, menuItemProps);
-  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_2__.MenuButton.Item, _extends({
-    key: key,
-    disabled: disabled
+  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", _extends({
+    className: classnames__WEBPACK_IMPORTED_MODULE_1___default()('teamix-pro-action-menu-item', 'next-menu-item', {
+      'next-disabled': disabled
+    })
   }, buttonProps), buttonContent(children, icon, undefined, context));
-}
+};
 
-function renderCommonActionButtonMenuItem(action, key, context) {
+function renderCommonActionButtonMenuItem(action, context) {
   var menuBtn = action;
 
   if (menuBtn.actions && menuBtn.actions.length && menuBtn.disabled !== true) {
     return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_2__.Menu.SubMenu, {
-      key: key,
       label: menuBtn.label || menuBtn.children
     }, menuBtn.actions.map(function (a, j) {
-      return renderCommonActionButtonMenuItem(a, j, context);
+      return renderCommonActionButtonMenuItem(a, context);
     }));
   }
 
-  return renderMenuButtonItem(action, key, context);
+  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(ProActionMenuButtonItem, {
+    action: action,
+    context: context
+  });
 }
 
 var ProActionMenuButton = function ProActionMenuButton(props) {
@@ -58339,6 +58292,7 @@ var ProActionMenuButton = function ProActionMenuButton(props) {
 
   return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_2__.MenuButton, _extends({
     popupTriggerType: "hover",
+    autoWidth: false,
     menuProps: {
       mode: 'popup',
       triggerType: 'hover'
@@ -58348,8 +58302,8 @@ var ProActionMenuButton = function ProActionMenuButton(props) {
     },
     type: type,
     label: buttonContent(label || children, icon, iconSize, context)
-  }, others), actions.map(function (action, i) {
-    return renderCommonActionButtonMenuItem(action, i, context);
+  }, others), actions.map(function (action) {
+    return renderCommonActionButtonMenuItem(action, context);
   }));
 };
 
@@ -58456,9 +58410,7 @@ function ProActionGroup(props) {
     })
   }, containerProps), formatedActions.map(function (actionBtn, i) {
     var isLastOne = i === formatedActions.length - 1;
-    return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), {
-      key: i
-    }, renderCommonActionButton(actionBtn, context, isTypeText), isTypeText && divider && !isLastOne && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_2__.Divider, {
+    return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, renderCommonActionButton(actionBtn, context, isTypeText), isTypeText && divider && !isLastOne && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_2__.Divider, {
       direction: "ver"
     }));
   }));
@@ -58711,8 +58663,8 @@ ProCardDivider.isProCardDivider = true;
 
 "use strict";
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   "_L": () => (/* reexport safe */ _card_container__WEBPACK_IMPORTED_MODULE_9__._),
-/* harmony export */   "l0": () => (/* reexport safe */ _card_container__WEBPACK_IMPORTED_MODULE_9__.l),
+/* harmony export */   "_L": () => (/* reexport safe */ _card_container__WEBPACK_IMPORTED_MODULE_10__._),
+/* harmony export */   "l0": () => (/* reexport safe */ _card_container__WEBPACK_IMPORTED_MODULE_10__.l),
 /* harmony export */   "QW": () => (/* binding */ ProCard),
 /* harmony export */   "ZP": () => (__WEBPACK_DEFAULT_EXPORT__)
 /* harmony export */ });
@@ -58728,9 +58680,10 @@ ProCardDivider.isProCardDivider = true;
 /* harmony import */ var _actions__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(28758);
 /* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(20559);
 /* harmony import */ var _divider__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(66113);
-/* harmony import */ var _card_container__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(18110);
+/* harmony import */ var _selectable__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(80617);
+/* harmony import */ var _card_container__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(18110);
 var _excluded = ["context"],
-    _excluded2 = ["children", "title", "subTitle", "tooltip", "tooltipIcon", "description", "extra", "actions", "style", "className", "image", "divider", "bordered", "compacted", "centered", "loading", "backgroundColor", "contentClassName", "contentStyle", "direction", "wrap", "spacing", "split", "collapsible", "defaultCollapsed", "collapsed", "onCollapse", "context"];
+    _excluded2 = ["children", "title", "subTitle", "tooltip", "tooltipIcon", "description", "extra", "actions", "style", "className", "image", "hoveredShadow", "divider", "bordered", "compacted", "centered", "loading", "borderColor", "backgroundColor", "contentClassName", "contentStyle", "direction", "wrap", "spacing", "split", "collapsible", "defaultCollapsed", "collapsed", "onCollapse", "context"];
 
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
@@ -58753,6 +58706,7 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 
 
 
+
 var cls = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_4__.baseClass)('teamix-pro-card');
 
 var renderActionGroup = function renderActionGroup(extra, context) {
@@ -58786,7 +58740,7 @@ var getFlexDirectionClassName = function getFlexDirectionClassName(direction, sp
 };
 
 var ProCard = function ProCard(props) {
-  var _classnames;
+  var _classnames, _classnames2;
 
   var children = props.children,
       title = props.title,
@@ -58799,11 +58753,13 @@ var ProCard = function ProCard(props) {
       style = props.style,
       className = props.className,
       image = props.image,
+      hoveredShadow = props.hoveredShadow,
       divider = props.divider,
       bordered = props.bordered,
       compacted = props.compacted,
       centered = props.centered,
       loading = props.loading,
+      borderColor = props.borderColor,
       backgroundColor = props.backgroundColor,
       contentClassName = props.contentClassName,
       contentStyle = props.contentStyle,
@@ -58880,7 +58836,6 @@ var ProCard = function ProCard(props) {
     }
 
     if (element != null && (_element$type2 = element.type) != null && _element$type2.isProCardDivider) {
-      console.log('isProCardDivider');
       return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().cloneElement(element, {
         style: dividerStyle
       });
@@ -58888,13 +58843,12 @@ var ProCard = function ProCard(props) {
 
     return element;
   });
-  var cardClassName = classnames__WEBPACK_IMPORTED_MODULE_1___default()(cls(), className, backgroundColor, {
-    noBorder: !bordered,
-    compacted: compacted
-  });
-  var cardContentClassName = classnames__WEBPACK_IMPORTED_MODULE_1___default()(cls('content'), contentClassName, getFlexDirectionClassName(direction, split), (_classnames = {
+  var cardClassName = classnames__WEBPACK_IMPORTED_MODULE_1___default()(cls(), className, backgroundColor, (_classnames = {
+    'border-none': !bordered
+  }, _classnames["border-" + borderColor] = borderColor, _classnames.compacted = compacted, _classnames.hoverable = hoveredShadow, _classnames));
+  var cardContentClassName = classnames__WEBPACK_IMPORTED_MODULE_1___default()(cls('content'), contentClassName, getFlexDirectionClassName(direction, split), (_classnames2 = {
     'contain-pro-card': containProCard
-  }, _classnames["split-" + split] = split, _classnames['flex-wrap'] = wrap, _classnames.centered = centered, _classnames));
+  }, _classnames2["split-" + split] = split, _classnames2['flex-wrap'] = wrap, _classnames2.centered = centered, _classnames2));
   var cardContentMargin = containProCard && !split ? {
     marginRight: -horizonal,
     marginLeft: -horizonal,
@@ -58962,6 +58916,7 @@ ProCard.defaultProps = {
   direction: 'row'
 };
 ProCard.Divider = _divider__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z;
+ProCard.Selectable = _selectable__WEBPACK_IMPORTED_MODULE_9__/* ["default"] */ .Z;
 ProCard.isProCard = true;
 /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (ProCard);
 /**
@@ -58970,6 +58925,62 @@ ProCard.isProCard = true;
 
 /***/ }),
 
+/***/ 80617:
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+"use strict";
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   "Z": () => (__WEBPACK_DEFAULT_EXPORT__)
+/* 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 classnames__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(28266);
+/* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(classnames__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var _teamix_icon__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(89227);
+/* harmony import */ var _teamix_utils__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(80653);
+/* harmony import */ var _index__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(39465);
+var _excluded = ["selected", "onSelect", "className", "onClick"];
+
+function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+
+
+
+
+
+
+var cls = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_3__.baseClass)('teamix-pro-card-selectable');
+
+var ProCardSelectable = function ProCardSelectable(props) {
+  var selected = props.selected,
+      onSelect = props.onSelect,
+      className = props.className,
+      _onClick = props.onClick,
+      others = _objectWithoutPropertiesLoose(props, _excluded);
+
+  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_index__WEBPACK_IMPORTED_MODULE_4__/* .ProCard */ .QW, _extends({
+    className: classnames__WEBPACK_IMPORTED_MODULE_1___default()(cls(), className),
+    borderColor: selected ? 'blue' : 'grey',
+    extra: /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_teamix_icon__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z, {
+      className: cls('icon', selected ? 'icon-selected' : 'icon-unselected'),
+      type: selected ? 'success-fill' : 'circle-line'
+    }),
+    onClick: function onClick(e) {
+      _onClick && _onClick(e);
+      onSelect && onSelect(!selected);
+    }
+  }, others));
+};
+
+ProCardSelectable.defaultProps = {
+  hoveredShadow: true
+};
+ProCardSelectable.isProCard = true;
+/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (ProCardSelectable);
+
+/***/ }),
+
 /***/ 20559:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
@@ -59682,7 +59693,6 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 
 
-var searchText = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_2__.getMessage)('search');
 
 var getEventProps = function getEventProps(triggerType, onFilter) {
   var keydownEvent = {
@@ -59830,7 +59840,8 @@ var AdvancedFilter = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(fu
               onResetValidateSuccess: onReset,
               style: _objectSpread({}, triggerType === 'submit' ? {} : {
                 marginRight: -16
-              })
+              }),
+              children: (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_2__.getMessage)('reset')
             }
           }, {
             component: 'Submit',
@@ -59839,9 +59850,9 @@ var AdvancedFilter = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(fu
                 marginRight: -8
               } : {
                 display: 'none'
-              })
-            },
-            content: searchText
+              }),
+              children: (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_2__.getMessage)('search')
+            }
           }]
         }]
       }])
@@ -62096,6 +62107,7 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
+ // import ProSidebar from './sidebar'
 
 
 
@@ -62111,8 +62123,9 @@ _teamix_icon__WEBPACK_IMPORTED_MODULE_12__/* ["default"].setConfig */ .Z.setConf
 
 
 
+ // export * from './sidebar';
 
-var version = '1.2.4';
+var version = '1.2.8';
 
 
 /***/ }),
@@ -62859,8 +62872,9 @@ var ProTableInfo = function ProTableInfo(props) {
       _ref$labelGutter = _ref.labelGutter,
       labelGutter = _ref$labelGutter === void 0 ? '80px' : _ref$labelGutter;
 
-  var newColumns = function newColumns() {
-    return [].concat(new Array(colNum)).map(function (_, index) {
+  var getNewColumns = function getNewColumns() {
+    // 需要 fill 填充 否则有可能不执行
+    return [].concat(new Array(colNum)).fill(1).map(function (_, index) {
       return [{
         dataIndex: "label_" + index,
         align: 'left',
@@ -62905,9 +62919,7 @@ var ProTableInfo = function ProTableInfo(props) {
           var needCol = 1 + ((_columnsItem$colSpan = columnsItem == null ? void 0 : columnsItem.colSpan) != null ? _columnsItem$colSpan : 1); // 如果剩余的col能满足下一组数据那么就放在这一组
 
           if (needCol <= col) {
-            var _columnsItem$colSpan2;
-
-            col = col - 1 - ((_columnsItem$colSpan2 = columnsItem == null ? void 0 : columnsItem.colSpan) != null ? _columnsItem$colSpan2 : 1);
+            col = col - needCol;
             filterColumns.push(columnsItem);
           } else {
             var _filterColumns$0$colS;
@@ -62920,6 +62932,11 @@ var ProTableInfo = function ProTableInfo(props) {
             col = 0;
           }
         }
+
+        if (columnsCopy.length === 0) {
+          // 如果剩余仍有列数并且已经没有columns分配了
+          col = 0;
+        }
       }
 
       var itemData = filterColumns.map(function (item, index) {
@@ -62986,7 +63003,7 @@ var ProTableInfo = function ProTableInfo(props) {
   return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_1__.Table.StickyLock, {
     className: "teamix-pro-info-table",
     cellProps: setCellProps,
-    columns: newColumns(),
+    columns: getNewColumns(),
     hasHeader: false,
     hasBorder: true,
     dataSource: newDataSource
@@ -63357,9 +63374,7 @@ function getLayout(width) {
 var initialValues = {
   title: '卡片标题',
   children: '卡片内容卡片内容卡片内容',
-  extra: '操作',
-  bordered: true,
-  hoveredShadow: true
+  extra: '操作'
 };
 var schema = [{
   component: 'FormTab',
@@ -63410,10 +63425,6 @@ var schema = [{
       children: [{
         title: '整体样式',
         children: [{
-          name: 'bordered',
-          title: '边框',
-          component: 'Switch'
-        }, {
           name: 'divider',
           title: '头部分割线',
           component: 'Switch'
@@ -63428,7 +63439,36 @@ var schema = [{
             label: '蓝色',
             value: 'blue'
           }, {
-            label: '绿生',
+            label: '绿色',
+            value: 'green'
+          }, {
+            label: '红色',
+            value: 'red'
+          }, {
+            label: '橙色',
+            value: 'orange'
+          }, {
+            label: '黄色',
+            value: 'yellow'
+          }, {
+            label: '灰色',
+            value: 'grey'
+          }, {
+            label: '透明',
+            value: 'transparent'
+          }]
+        }, {
+          name: 'borderColor',
+          title: '边框色',
+          component: 'Select',
+          dataSource: [{
+            label: '无边框',
+            value: 'none'
+          }, {
+            label: '蓝色',
+            value: 'blue'
+          }, {
+            label: '绿色',
             value: 'green'
           }, {
             label: '红色',
@@ -66570,7 +66610,7 @@ var ToolBar = function ToolBar(props) {
 /* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(28266);
 /* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_14___default = /*#__PURE__*/__webpack_require__.n(classnames__WEBPACK_IMPORTED_MODULE_14__);
 /* harmony import */ var _page_container__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(2781);
-var _excluded = ["header", "className", "tableClassName", "mainAction", "extra", "dataFilter", "toolBar", "columns", "useRowSelection", "rowSelection", "onChangeRowSelection", "getRowSelection", "primaryKey", "footerAction", "url", "pageKey", "pageSizeKey", "method", "params", "formatSort", "formatParams", "formatResult", "requestWhenMount", "showPagination", "pageSizeList", "showSkeleton", "skeletonSize", "actionRef", "dataSource", "filterDebounce", "footerSuction", "autoRefresh", "customRequest"];
+var _excluded = ["header", "className", "tableClassName", "mainAction", "extra", "dataFilter", "toolBar", "columns", "useRowSelection", "rowSelection", "onChangeRowSelection", "getRowSelection", "primaryKey", "footerAction", "footer", "url", "pageKey", "pageSizeKey", "method", "params", "formatSort", "formatParams", "formatResult", "requestWhenMount", "showPagination", "pageSizeList", "showSkeleton", "skeletonSize", "actionRef", "dataSource", "filterDebounce", "footerSuction", "autoRefresh", "customRequest"];
 
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
@@ -66647,6 +66687,7 @@ var ProTable = function ProTable(props) {
       getRowSelection = props.getRowSelection,
       primaryKey = props.primaryKey,
       footerAction = props.footerAction,
+      footer = props.footer,
       url = props.url,
       pageKey = props.pageKey,
       pageSizeKey = props.pageSizeKey,
@@ -67273,7 +67314,7 @@ var ProTable = function ProTable(props) {
       }
     }
 
-    if (showPagination || footerAction) {
+    if (showPagination) {
       return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
         className: cls('footer', {
           'footer-has-rowSelection': rowSelection
@@ -67302,6 +67343,14 @@ var ProTable = function ProTable(props) {
           return onChangePaginationSize(number);
         }
       }, props.paginationProps))));
+    } else if (!showPagination) {
+      return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
+        className: cls('footer', {
+          'footer-has-rowSelection': rowSelection
+        })
+      }, renderRowSelection(), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
+        className: cls('footer-right-wrapper')
+      }, showSkeleton ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_skeleton__WEBPACK_IMPORTED_MODULE_4__/* .ProSkeletonRaw.Footer.Pagination */ .vR.Footer.Pagination, null) : footer));
     }
   };
 
@@ -68896,6 +68945,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   "getValueByValue": () => (/* reexport safe */ _paramMap__WEBPACK_IMPORTED_MODULE_13__.BN),
 /* harmony export */   "listToTree": () => (/* reexport safe */ _paramMap__WEBPACK_IMPORTED_MODULE_13__.OH),
 /* harmony export */   "paramMap": () => (/* reexport safe */ _paramMap__WEBPACK_IMPORTED_MODULE_13__.ur),
+/* harmony export */   "treeToList": () => (/* reexport safe */ _paramMap__WEBPACK_IMPORTED_MODULE_13__.iU),
 /* harmony export */   "getGlobalConfig": () => (/* reexport safe */ _globalConfig__WEBPACK_IMPORTED_MODULE_14__.Hi),
 /* harmony export */   "setGlobalConfig": () => (/* reexport safe */ _globalConfig__WEBPACK_IMPORTED_MODULE_14__.Qb),
 /* harmony export */   "updateGlobalConfig": () => (/* reexport safe */ _globalConfig__WEBPACK_IMPORTED_MODULE_14__.Hl),
@@ -69064,7 +69114,9 @@ function goToLink(link, history) {
   collapseAdvancedFilter: 'Collapse Advanced Filter',
   press: 'Press',
   toExitFullScreen: 'to exit fullscreen mode',
-  filter: 'Filter'
+  filter: 'Filter',
+  ok: 'OK',
+  cancel: 'Cancel'
 });
 
 /***/ }),
@@ -69168,7 +69220,9 @@ function getMessage(id, data) {
   collapseAdvancedFilter: '收起高级筛选',
   press: '按',
   toExitFullScreen: '即可退出全屏模式',
-  filter: '过滤器'
+  filter: '过滤器',
+  ok: '确定',
+  cancel: '取消'
 });
 
 /***/ }),
@@ -69220,7 +69274,9 @@ function getMessage(id, data) {
   collapseAdvancedFilter: '收起高級篩選',
   press: '按',
   toExitFullScreen: '即可退出全屏模式',
-  filter: '過濾器'
+  filter: '過濾器',
+  ok: '確定',
+  cancel: '取消'
 });
 
 /***/ }),
@@ -69232,7 +69288,8 @@ function getMessage(id, data) {
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "ur": () => (/* binding */ paramMap),
 /* harmony export */   "OH": () => (/* binding */ listToTree),
-/* harmony export */   "BN": () => (/* binding */ getValueByValue)
+/* harmony export */   "BN": () => (/* binding */ getValueByValue),
+/* harmony export */   "iU": () => (/* binding */ treeToList)
 /* harmony export */ });
 /* harmony import */ var _checkers__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(77981);
 /* harmony import */ var _getDeepValue__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(2273);
@@ -69324,6 +69381,31 @@ var listToTree = function listToTree(list, root, aliasMap) {
 
   return treeList;
 };
+/**
+ * tree 扁平化
+ * @param dataSource tree 数据源
+ * @param childrenKey children key
+ * @returns
+ */
+
+
+var treeToList = function treeToList(dataSource, childrenKey) {
+  if (childrenKey === void 0) {
+    childrenKey = 'children';
+  }
+
+  var res = [];
+
+  var fn = function fn(dataSource) {
+    dataSource.forEach(function (item) {
+      res.push(item);
+      item[childrenKey] && item[childrenKey].length > 0 ? fn(item[childrenKey]) : '';
+    });
+  };
+
+  fn(dataSource);
+  return res;
+};
 /**
  * 从对象数组中根据输入key的值获取输出key的值
  * @param array: 目标数组