@teamix/pro 1.2.20 → 1.2.21

package/dist/pro.js

@@ -60327,7 +60327,8 @@ FormGroup.GroupPanel = GroupPanel;
 /* harmony export */ });
 var componentMap = {
   Radio: 'Select',
-  Checkbox: 'Select'
+  Checkbox: 'Select',
+  CheckboxGroup: 'MultipleSelect'
 };
 var inputCategory = ['Input', 'Password', 'TextArea', 'NumberPicker', 'Percent', 'Money'];
 
@@ -60366,19 +60367,31 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 
 
- // 主激活区内容
+
+
+var formatComponent = function formatComponent(schema) {
+  var _schema$enum;
+
+  var component = schema['x-component'];
+
+  if (component === 'Checkbox' && (_schema$enum = schema['enum']) != null && _schema$enum.length) {
+    component = 'CheckboxGroup';
+  }
+
+  return _componentMap__WEBPACK_IMPORTED_MODULE_6__/* .componentMap */ .o[component] || component;
+}; // 主激活区内容
+
 
 var useMain = function useMain(active) {
   var schema = (0,_formily_react__WEBPACK_IMPORTED_MODULE_1__.useFieldSchema)();
   var main = [];
   schema.mapProperties(function (schema, name) {
-    // console.log(schema.required); // 添加 *
     if (schema.name === active) {
       main.push({
         name: name,
         schema: _objectSpread(_objectSpread({}, schema), {}, {
           title: '',
-          'x-component': _componentMap__WEBPACK_IMPORTED_MODULE_6__/* .componentMap */ .o[schema['x-component']] || schema['x-component']
+          'x-component': formatComponent(schema)
         })
       });
     }
@@ -61053,6 +61066,8 @@ AdvancedFilter.defaultProps = {
 /* harmony import */ var _SimpleFilter__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(53596);
 /* harmony import */ var _LightFilter__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(78677);
 /* harmony import */ var _AdvancedFilter__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(84051);
+/* harmony import */ var lodash_debounce__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(39339);
+/* harmony import */ var lodash_debounce__WEBPACK_IMPORTED_MODULE_13___default = /*#__PURE__*/__webpack_require__.n(lodash_debounce__WEBPACK_IMPORTED_MODULE_13__);
 var _excluded = ["addonAfter", "addonBefore", "onFilter", "onInit", "onReset", "mode", "expand", "formRef", "defaultFilterValue"];
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -61084,6 +61099,7 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 
 
 
+
 // 获取Schema是否包含默认值、异步默认值、必选校验等
 var getSpecialProps = function getSpecialProps(props) {
   var initialValues = props.initialValues,
@@ -61206,6 +61222,10 @@ var QueryFilter = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(funct
         (0,_formily_core__WEBPACK_IMPORTED_MODULE_4__.onFormReact)(function (form) {
           _onFormInit(form, props, configFilterItem);
         });
+        (0,_formily_core__WEBPACK_IMPORTED_MODULE_4__.onFormInputChange)(function (form) {
+          // 主动修改高级筛选值
+          setCurrentForm('advanced');
+        });
       }
     });
   }, []);
@@ -61344,11 +61364,7 @@ var QueryFilter = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(funct
     return function (_x2) {
       return _ref4.apply(this, arguments);
     };
-  }(), [onFilter, currentForm.current]); // 高级筛选Change
-
-  var onAdvancedChange = (0,react__WEBPACK_IMPORTED_MODULE_0__.useCallback)(function () {
-    setCurrentForm('advanced');
-  }, []); // 高级搜索Filter
+  }(), [onFilter, currentForm.current]); // 高级搜索Filter
 
   var onAdvancedFilter = (0,react__WEBPACK_IMPORTED_MODULE_0__.useCallback)(function (values) {
     setCurrentForm('advanced');
@@ -61393,8 +61409,7 @@ var QueryFilter = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(funct
   }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_LightFilter__WEBPACK_IMPORTED_MODULE_11__/* ["default"] */ .Z, _extends({}, otherProps, {
     defaultFilterValue: defaultFilterValue,
     form: lightForm,
-    onChange: onLightFilter // onSubmit={onLightFilter}
-
+    onChange: lodash_debounce__WEBPACK_IMPORTED_MODULE_13___default()(onLightFilter, 300)
   }))), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
     className: prefixCls + "-toggle"
   }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_2__.Badge, {
@@ -61415,7 +61430,7 @@ var QueryFilter = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(funct
     className: prefixCls + "-inline-form"
   }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_SimpleFilter__WEBPACK_IMPORTED_MODULE_10__/* ["default"] */ .Z, _extends({}, otherProps, {
     form: simpleForm,
-    onChange: onSimpleFilter,
+    onChange: lodash_debounce__WEBPACK_IMPORTED_MODULE_13___default()(onSimpleFilter, 300),
     onSubmit: onSimpleFilter
   })))), addonAfter ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
     className: prefixCls + "-addonAfter"
@@ -61448,7 +61463,6 @@ var QueryFilter = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(funct
       onComplete: onInitialRequestComplete
     }) : undefined,
     form: advancedForm,
-    onChange: onAdvancedChange,
     onSubmit: onAdvancedFilter,
     onReset: onAdvancedReset
   })))) : null);
@@ -61481,8 +61495,6 @@ QueryFilter.defaultProps = {
 /* harmony import */ var _useAutoSubmit__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(86924);
 /* harmony import */ var _useInitialRequest__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(8550);
 /* harmony import */ var _locales_validate__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(67315);
-/* harmony import */ var lodash_debounce__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(39339);
-/* harmony import */ var lodash_debounce__WEBPACK_IMPORTED_MODULE_11___default = /*#__PURE__*/__webpack_require__.n(lodash_debounce__WEBPACK_IMPORTED_MODULE_11__);
 var _excluded = ["form", "initialValues", "initialRequest", "schema", "scope", "context", "components", "children", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol", "breakpoints", "onChange", "onSubmit", "onSubmitFailed", "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); }
@@ -61507,7 +61519,6 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 
 
 
-
 (0,_formily_core__WEBPACK_IMPORTED_MODULE_2__.registerValidateLocale)(_locales_validate__WEBPACK_IMPORTED_MODULE_10__/* ["default"] */ .Z);
 var ProForm = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(function (_ref) {
   var outerForm = _ref.form,
@@ -61566,9 +61577,11 @@ var ProForm = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(function
   (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
     form.removeEffects('onFieldValueChange');
     form.addEffects('onFieldValueChange', function () {
-      (0,_formily_core__WEBPACK_IMPORTED_MODULE_2__.onFieldValueChange)('*', lodash_debounce__WEBPACK_IMPORTED_MODULE_11___default()(function (field, form) {
-        onChange && onChange((0,_formily_reactive__WEBPACK_IMPORTED_MODULE_3__.toJS)(form.values), (0,_formily_reactive__WEBPACK_IMPORTED_MODULE_3__.toJS)(field.value), field.props.name);
-      }, 300));
+      (0,_formily_core__WEBPACK_IMPORTED_MODULE_2__.onFieldValueChange)('*', function (field, form) {
+        var _field$props;
+
+        onChange && onChange((0,_formily_reactive__WEBPACK_IMPORTED_MODULE_3__.toJS)(form.values), (0,_formily_reactive__WEBPACK_IMPORTED_MODULE_3__.toJS)(field.value), (_field$props = field.props) == null ? void 0 : _field$props.name);
+      });
     });
   }, [form, onChange]); // 配置表单默认值
 
@@ -61739,7 +61752,9 @@ var getDisplayValues = function getDisplayValues(form, values, prefix) {
   }; // 判断值的类型，递归获取每个值在该结构中的完整路径
 
 
-  if ((0,_teamix_utils__WEBPACK_IMPORTED_MODULE_2__.isPlainObj)(values) && isLayoutValue(values)) {
+  if (!(0,_teamix_utils__WEBPACK_IMPORTED_MODULE_2__.isSignificative)(values)) {
+    displayValues = {};
+  } else if ((0,_teamix_utils__WEBPACK_IMPORTED_MODULE_2__.isPlainObj)(values) && isLayoutValue(values)) {
     // 如果值是对象且是布局对象的值
     displayValues = {};
     Object.entries(values).forEach(function (_ref) {
@@ -61947,19 +61962,20 @@ var typeMap = (_typeMap = {
 /* harmony import */ var _adapterType__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(40585);
 /* harmony import */ var _adapterComponent__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(30147);
 /* harmony import */ var _adapterDecorator__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(61614);
-/* harmony import */ var _initializeRequest__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(27913);
-/* harmony import */ var _initializeReactions__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(88111);
-/* harmony import */ var _initializeDataSource__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(8565);
-/* harmony import */ var _initializeRules__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(30206);
+/* harmony import */ var _initializeRequest__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(27913);
+/* harmony import */ var _initializeReactions__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(88111);
+/* harmony import */ var _initializeDataSource__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(8565);
+/* harmony import */ var _initializeRules__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(30206);
 /* harmony import */ var _initializeArrayCards__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(24112);
 /* harmony import */ var _initializeArrayCollapse__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(68018);
 /* harmony import */ var _initializeArrayTable__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(49174);
 /* harmony import */ var _initializeArrayItems__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(16795);
-/* harmony import */ var _initializeFormButton__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(58741);
+/* harmony import */ var _initializeFormButton__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(58741);
 /* harmony import */ var _initializeFormGroup__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(80734);
 /* harmony import */ var _initializeFormStep__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(31763);
 /* harmony import */ var _initializeFormTab__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(9201);
 /* harmony import */ var _initializeFormCollapse__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(61739);
+/* harmony import */ var _reactions__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(33650);
 /* harmony import */ var _fieldTypeMap__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(59687);
 /* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(51344);
 /* harmony import */ var _warning__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(27324);
@@ -61999,6 +62015,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 
 
+
 
 
 /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (/*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(function (_ref) {
@@ -62039,12 +62056,17 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
   }, []); // 合并 schema 中 request 的 scope
 
   var mergedScope = (0,react__WEBPACK_IMPORTED_MODULE_0__.useMemo)(function () {
-    return _objectSpread({}, scope);
+    return _objectSpread(_objectSpread({}, scope), {}, {
+      $request: _reactions__WEBPACK_IMPORTED_MODULE_16__/* .$request */ .bE,
+      $common: _reactions__WEBPACK_IMPORTED_MODULE_16__/* .$common */ .Wn,
+      $dataSource: _reactions__WEBPACK_IMPORTED_MODULE_16__/* .$dataSource */ .Sv,
+      $validator: _reactions__WEBPACK_IMPORTED_MODULE_16__/* .$validator */ .fn
+    });
   }, [scope]); // 格式化 schema
 
   var formatSchema = (0,react__WEBPACK_IMPORTED_MODULE_0__.useCallback)(function (schema) {
     var schemaProperties = {};
-    schema == null ? void 0 : schema.forEach(function (item) {
+    schema == null ? void 0 : schema.forEach(function (item, index) {
       var newItem = (0,_warning__WEBPACK_IMPORTED_MODULE_19__/* ["default"] */ .Z)(item);
       var _newItem = newItem,
           originalComponent = _newItem.component; // 根据component的不同，初始化为内置的item
@@ -62060,7 +62082,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 
         if (['FormButtonGroup', 'Submit', 'Reset'].includes(originalComponent)) {
-          newItem = (0,_initializeFormButton__WEBPACK_IMPORTED_MODULE_16__/* ["default"] */ .Z)(newItem);
+          newItem = (0,_initializeFormButton__WEBPACK_IMPORTED_MODULE_15__/* ["default"] */ .Z)(newItem);
         } // 初始化高级组件 - ArrayCards
 
 
@@ -62108,7 +62130,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
           component = _newItem2.component,
           type = _newItem2.type,
           _newItem2$name = _newItem2.name,
-          name = _newItem2$name === void 0 ? (0,_utils__WEBPACK_IMPORTED_MODULE_18__/* .getRandomName */ .VO)(component == null ? void 0 : component.replace(/\./g, '')) : _newItem2$name,
+          name = _newItem2$name === void 0 ? (0,_utils__WEBPACK_IMPORTED_MODULE_18__/* .getFieldName */ .Ts)(component == null ? void 0 : component.replace(/\./g, ''), index) : _newItem2$name,
           decorator = _newItem2.decorator,
           decoratorProps = _newItem2.decoratorProps,
           dataSource = _newItem2.dataSource,
@@ -62133,23 +62155,23 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
       var defaultDecoratorProps = _objectSpread(_objectSpread({}, tooltipProps), decoratorProps); // 初始化request
 
 
-      var _initializeRequest = (0,_initializeRequest__WEBPACK_IMPORTED_MODULE_12__/* ["default"] */ .Z)(request),
+      var _initializeRequest = (0,_initializeRequest__WEBPACK_IMPORTED_MODULE_28__/* ["default"] */ .Z)(request, index),
           requestReactions = _initializeRequest.reactions,
           requestScope = _initializeRequest.scope; // 初始化dataSource
 
 
-      var _initializeDataSource = (0,_initializeDataSource__WEBPACK_IMPORTED_MODULE_14__/* ["default"] */ .Z)(dataSource),
+      var _initializeDataSource = (0,_initializeDataSource__WEBPACK_IMPORTED_MODULE_13__/* ["default"] */ .Z)(dataSource, index),
           defaultDataSource = _initializeDataSource.dataSource,
           dataSourceReactions = _initializeDataSource.reactions,
           dataSourceScope = _initializeDataSource.scope; // 初始化rules
 
 
-      var _initializeRules = (0,_initializeRules__WEBPACK_IMPORTED_MODULE_15__/* ["default"] */ .Z)(rules),
+      var _initializeRules = (0,_initializeRules__WEBPACK_IMPORTED_MODULE_14__/* ["default"] */ .Z)(rules, index),
           defaultRules = _initializeRules.rules,
           rulesScope = _initializeRules.scope; // 合并reactions，初始化reactions
 
 
-      var defaultReactions = (0,_initializeReactions__WEBPACK_IMPORTED_MODULE_13__/* ["default"] */ .Z)(reactions, [].concat(requestReactions, dataSourceReactions)); // 合并scope
+      var defaultReactions = (0,_initializeReactions__WEBPACK_IMPORTED_MODULE_12__/* ["default"] */ .Z)(reactions, [].concat(requestReactions, dataSourceReactions)); // 合并scope
 
       Object.entries(_objectSpread(_objectSpread(_objectSpread({}, requestScope), dataSourceScope), rulesScope)).map(function (_ref2) {
         var k = _ref2[0],
@@ -62180,15 +62202,15 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
     });
     return schemaProperties;
   }, [mergedScope]);
-  var proFormSchema = (0,react__WEBPACK_IMPORTED_MODULE_0__.useMemo)(function () {
+  var formilySchema = (0,react__WEBPACK_IMPORTED_MODULE_0__.useMemo)(function () {
     return {
       type: 'object',
       properties: formatSchema(schema)
     };
-  }, [schema]); // console.log(proFormSchema);
+  }, [schema]); // console.log(formilySchema);
 
   return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(SchemaField, {
-    schema: proFormSchema,
+    schema: formilySchema,
     components: components,
     scope: mergedScope
   });
@@ -62385,22 +62407,17 @@ var initialize = function initialize(item) {
 /* harmony export */   "Z": () => (__WEBPACK_DEFAULT_EXPORT__)
 /* harmony export */ });
 /* harmony import */ var _teamix_utils__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(80653);
-/* harmony import */ var _reactions__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(33650);
-/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(51344);
-
 
 
-
-var initializeDataSource = function initializeDataSource(dataSource) {
+var initializeDataSource = function initializeDataSource(dataSource, index) {
   if ((0,_teamix_utils__WEBPACK_IMPORTED_MODULE_0__.isPlainObj)(dataSource)) {
     var _scope;
 
     var _requestConfig = dataSource;
-    var requestScopeName = (0,_utils__WEBPACK_IMPORTED_MODULE_2__/* .getRandomName */ .VO)('$request');
-    var dataSourceScopeName = (0,_utils__WEBPACK_IMPORTED_MODULE_2__/* .getRandomName */ .VO)('$dataSource');
+    var requestConfigName = "$requestConfig_" + index;
     return {
-      reactions: ["{{" + dataSourceScopeName + "(" + requestScopeName + "," + _requestConfig.onComplete + ",context)}}"],
-      scope: (_scope = {}, _scope[requestScopeName] = (0,_reactions__WEBPACK_IMPORTED_MODULE_1__/* .$request */ .bE)(_requestConfig), _scope[dataSourceScopeName] = _reactions__WEBPACK_IMPORTED_MODULE_1__/* .$dataSource */ .Sv, _scope)
+      reactions: ["{{$dataSource($request," + requestConfigName + ",context)}}"],
+      scope: (_scope = {}, _scope[requestConfigName] = _requestConfig, _scope)
     };
   }
 
@@ -62837,20 +62854,14 @@ var initializeReactions = function initializeReactions(reactions, innerReactions
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "Z": () => (__WEBPACK_DEFAULT_EXPORT__)
 /* harmony export */ });
-/* harmony import */ var _SchemaForm_reactions__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(33650);
-/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(51344);
-
-
-
-var initializeRequest = function initializeRequest(requestConfig) {
+var initializeRequest = function initializeRequest(requestConfig, index) {
   if (requestConfig) {
     var _scope;
 
-    var requestScopeName = (0,_utils__WEBPACK_IMPORTED_MODULE_1__/* .getRandomName */ .VO)('$request');
-    var contextScopeName = (0,_utils__WEBPACK_IMPORTED_MODULE_1__/* .getRandomName */ .VO)('$context');
+    var requestConfigName = "$requestConfig_" + index;
     return {
-      reactions: ["{{" + contextScopeName + "(" + requestScopeName + "," + requestConfig.onComplete + ",context)}}"],
-      scope: (_scope = {}, _scope[requestScopeName] = (0,_SchemaForm_reactions__WEBPACK_IMPORTED_MODULE_0__/* .$request */ .bE)(requestConfig), _scope[contextScopeName] = _SchemaForm_reactions__WEBPACK_IMPORTED_MODULE_0__/* .$context */ .Am, _scope)
+      reactions: ["{{$common($request," + requestConfigName + ",context)}}"],
+      scope: (_scope = {}, _scope[requestConfigName] = requestConfig, _scope)
     };
   }
 
@@ -62872,8 +62883,6 @@ var initializeRequest = function initializeRequest(requestConfig) {
 /* harmony export */   "Z": () => (__WEBPACK_DEFAULT_EXPORT__)
 /* harmony export */ });
 /* harmony import */ var _teamix_utils__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(80653);
-/* harmony import */ var _SchemaForm_reactions__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(33650);
-/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(51344);
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -62882,22 +62891,22 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 
 
+var initializeRules = function initializeRules(rules, index) {
+  var initializeValidator = function initializeValidator(rule, subIndex) {
+    if (subIndex === void 0) {
+      subIndex = 0;
+    }
 
-
-
-var initializeRules = function initializeRules(rules) {
-  var initializeValidator = function initializeValidator(rule) {
     if ((0,_teamix_utils__WEBPACK_IMPORTED_MODULE_0__.isPlainObj)(rule == null ? void 0 : rule.validator)) {
       var _scope;
 
-      var validator = rule.validator;
-      var requestScopeName = (0,_utils__WEBPACK_IMPORTED_MODULE_2__/* .getRandomName */ .VO)('$request');
-      var validatorScopeName = (0,_utils__WEBPACK_IMPORTED_MODULE_2__/* .getRandomName */ .VO)('$validator');
+      var requestConfig = rule.validator;
+      var requestConfigName = "$requestConfig_" + index + "_" + subIndex;
       return {
         rules: _objectSpread(_objectSpread({}, rule), {}, {
-          validator: "{{" + validatorScopeName + "(" + requestScopeName + "," + validator.onComplete + ",context)}}"
+          validator: "{{$validator($request," + requestConfigName + ",context)}}"
         }),
-        scope: (_scope = {}, _scope[requestScopeName] = (0,_SchemaForm_reactions__WEBPACK_IMPORTED_MODULE_1__/* .$request */ .bE)(validator), _scope[validatorScopeName] = _SchemaForm_reactions__WEBPACK_IMPORTED_MODULE_1__/* .$validator */ .fn, _scope)
+        scope: (_scope = {}, _scope[requestConfigName] = requestConfig, _scope)
       };
     }
 
@@ -62908,8 +62917,8 @@ var initializeRules = function initializeRules(rules) {
   };
 
   if ((0,_teamix_utils__WEBPACK_IMPORTED_MODULE_0__.isArr)(rules)) {
-    return rules.reduce(function (prev, current) {
-      var result = initializeValidator(current);
+    return rules.reduce(function (prev, current, subIndex) {
+      var result = initializeValidator(current, subIndex);
       prev.rules = [].concat(prev.rules, [result.rules]);
       prev.scope = _objectSpread(_objectSpread({}, prev.scope), result.scope);
       return prev;
@@ -62932,7 +62941,7 @@ var initializeRules = function initializeRules(rules) {
 "use strict";
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "bE": () => (/* binding */ $request),
-/* harmony export */   "Am": () => (/* binding */ $context),
+/* harmony export */   "Wn": () => (/* binding */ $common),
 /* harmony export */   "Sv": () => (/* binding */ $dataSource),
 /* harmony export */   "fn": () => (/* binding */ $validator)
 /* harmony export */ });
@@ -62946,54 +62955,52 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 
 // 配置请求
-var $request = function $request(requestConfig) {
-  return function (field, context) {
-    var _field$data;
-
-    var refresh = field == null ? void 0 : (_field$data = field.data) == null ? void 0 : _field$data.refresh;
-    var beforeRequest = requestConfig.beforeRequest,
-        onSuccess = requestConfig.onSuccess;
-    var refreshResult = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_0__.isPlainObj)(refresh) ? refresh : {};
-    var beforeRequestResult = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_0__.isFn)(beforeRequest) ? beforeRequest(field, context) : {};
-    return (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_0__.doCommonRequest)(_objectSpread(_objectSpread({}, requestConfig), {}, {
-      params: _objectSpread(_objectSpread(_objectSpread({}, requestConfig.params), beforeRequestResult), refreshResult),
-      beforeRequest: function beforeRequest() {
-        return beforeRequestResult;
-      },
-      onSuccess: (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_0__.isFn)(onSuccess) ? function (res) {
-        return onSuccess(res, field, context);
-      } : onSuccess
-    }), context);
-  };
-}; // 配置上下文
+var $request = function $request(field, requestConfig, context) {
+  var _field$data;
+
+  var refresh = field == null ? void 0 : (_field$data = field.data) == null ? void 0 : _field$data.refresh;
+  var beforeRequest = requestConfig.beforeRequest,
+      onSuccess = requestConfig.onSuccess;
+  var refreshResult = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_0__.isPlainObj)(refresh) ? refresh : {};
+  var beforeRequestResult = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_0__.isFn)(beforeRequest) ? beforeRequest(field, context) : {};
+  return (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_0__.doCommonRequest)(_objectSpread(_objectSpread({}, requestConfig), {}, {
+    params: _objectSpread(_objectSpread(_objectSpread({}, requestConfig.params), beforeRequestResult), refreshResult),
+    beforeRequest: function beforeRequest() {
+      return beforeRequestResult;
+    },
+    onSuccess: (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_0__.isFn)(onSuccess) ? function (res) {
+      return onSuccess(res, field, context);
+    } : onSuccess
+  }), context);
+}; // 通用请求配置上下文
 
 
-var $context = function $context(services, onComplete, context) {
+var $common = function $common(services, requestConfig, context) {
   return function (field) {
-    return services(field, context).then(function (res) {
-      return onComplete && onComplete(res, field, context);
+    return services(field, requestConfig, context).then(function (res) {
+      return requestConfig.onComplete && requestConfig.onComplete(res, field, context);
     });
   };
 }; // 配置校验
 
 
-var $validator = function $validator(services, onComplete, context) {
+var $validator = function $validator(services, requestConfig, context) {
   return function (value, rules, _ref) {
     var field = _ref.field;
-    return services(field, context).then(function (res) {
-      return onComplete && onComplete(res, field, context);
+    return services(field, requestConfig, context).then(function (res) {
+      return requestConfig.onComplete && requestConfig.onComplete(res, field, context);
     });
   };
 }; // 配置DataSource
 
 
-var $dataSource = function $dataSource(services, onComplete, context) {
+var $dataSource = function $dataSource(services, requestConfig, context) {
   return function (field) {
     field.setState({
       loading: true,
       readOnly: true
     });
-    return services(field, context).then(function (res) {
+    return services(field, requestConfig, context).then(function (res) {
       var isValueInDataSource = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_0__.getValueByValue)(res, field.value);
       var clearValue = isValueInDataSource ? {} : {
         value: undefined
@@ -63003,7 +63010,7 @@ var $dataSource = function $dataSource(services, onComplete, context) {
         loading: false,
         readOnly: false
       }, clearValue));
-      return onComplete && onComplete(res, field, context);
+      return requestConfig.onComplete && requestConfig.onComplete(res, field, context);
     })["catch"](function () {
       field.setState({
         loading: false,
@@ -63396,7 +63403,7 @@ var schemaNameMap = [{
 /* harmony export */   "Lx": () => (/* binding */ mapDataSource),
 /* harmony export */   "kw": () => (/* binding */ mapMode),
 /* harmony export */   "UT": () => (/* binding */ mergeArrayValue),
-/* harmony export */   "VO": () => (/* binding */ getRandomName),
+/* harmony export */   "Ts": () => (/* binding */ getFieldName),
 /* harmony export */   "Uk": () => (/* binding */ mapSchemaName)
 /* harmony export */ });
 /* harmony import */ var _formily_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(7186);
@@ -63500,18 +63507,19 @@ var mapMode = function mapMode(props, field) {
   });
 };
 /**
- * 为未配置name的字段添加随机字段名称
- * @param prefix 随机字段名称前缀，默认为name
- * @returns 随机字段名称
+ * 创建字段名称
+ * @param prefix 字段名称前缀，接收字段component名称，默认为FieldName
+ * @param index 字段索引
+ * @returns 字段唯一名称
  */
 
 
-var getRandomName = function getRandomName(prefix) {
+var getFieldName = function getFieldName(prefix, index) {
   if (prefix === void 0) {
-    prefix = 'name';
+    prefix = 'FieldName';
   }
 
-  return prefix + "_" + Math.floor(Math.random() * Math.pow(10, 18));
+  return prefix + "-" + index;
 };
 /**
  * 将ProForm的key映射为formily的key，然后筛除掉无效的key/value
@@ -63714,7 +63722,7 @@ _teamix_icon__WEBPACK_IMPORTED_MODULE_13__/* ["default"].setConfig */ .Z.setConf
 
  // export * from './sidebar';
 
-var version = '1.2.19';
+var version = '1.2.20';
 
 
 /***/ }),
@@ -66843,6 +66851,7 @@ 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; }
 
+// 表格项列筛选