@teamix/pro 1.3.14 → 1.3.15

package/es/form/utils.d.ts

@@ -37,4 +37,11 @@ declare const mapSchemaName: (obj: any) => any;
  * @returns 合并数组或合并其他值
  */
 declare const mergeArrayValue: (arr: any[], v?: any) => any[];
-export { mapSize, mapStatus, mapDataSource, mapMode, mergeArrayValue, getFieldName, mapSchemaName, };
+/**
+ * 初始化请求配置为表达式
+ * @param config 请求配置
+ * @param suffix scope名称后缀
+ * @returns 表达式和scope上下文
+ */
+declare const initializeRequestExpression: (config?: any, mode?: string | undefined, suffix?: string | undefined) => any;
+export { mapSize, mapStatus, mapDataSource, mapMode, mergeArrayValue, getFieldName, mapSchemaName, initializeRequestExpression, };

package/es/form/utils.js

@@ -1,3 +1,9 @@
+var _excluded = ["customRequest"];
+
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+
+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; }
+
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -26,7 +32,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 import { isVoidField } from '@formily/core';
 import { useFormLayout, useFormShallowLayout } from '@teamix/formily';
-import { isArr, isObj, getValueByValue } from '@teamix/utils';
+import { isArr, isObj, getValueByValue, isPlainObj, isFn } from '@teamix/utils';
 import schemaNameMap from './schemaNameMap';
 /**
  * 映射字段size，主要是default转medium
@@ -177,5 +183,42 @@ var mergeArrayValue = function mergeArrayValue(arr, v) {
 
   return [].concat(_toConsumableArray(arr), [v]);
 };
+/**
+ * 初始化请求配置为表达式
+ * @param config 请求配置
+ * @param suffix scope名称后缀
+ * @returns 表达式和scope上下文
+ */
+
+
+var initializeRequestExpression = function initializeRequestExpression(config, mode, suffix) {
+  var schema = {};
+
+  if (isPlainObj(config)) {
+    var customRequest = config.customRequest,
+        requestConfig = _objectWithoutProperties(config, _excluded);
+
+    var requestConfigName = "$requestConfig_".concat(suffix);
+
+    if (isFn(customRequest)) {
+      var _scope;
+
+      // 自定义请求方法 customRequest
+      var customRequestName = "$customRequest_".concat(suffix);
+      schema = {
+        expression: "{{".concat(mode, "(").concat(customRequestName, ",context,").concat(requestConfigName, ")}}"),
+        scope: (_scope = {}, _defineProperty(_scope, customRequestName, customRequest), _defineProperty(_scope, requestConfigName, requestConfig), _scope)
+      };
+    } else {
+      // pro 通用数据请求 $request
+      schema = {
+        expression: "{{".concat(mode, "($request,context,").concat(requestConfigName, ")}}"),
+        scope: _defineProperty({}, requestConfigName, requestConfig)
+      };
+    }
+  }
+
+  return schema;
+};
 
-export { mapSize, mapStatus, mapDataSource, mapMode, mergeArrayValue, getFieldName, mapSchemaName };
+export { mapSize, mapStatus, mapDataSource, mapMode, mergeArrayValue, getFieldName, mapSchemaName, initializeRequestExpression };

package/es/index.d.ts

@@ -26,5 +26,5 @@ export * from './table';
 export * from './sidebar';
 export * from './utils';
 export * from './timeline';
-declare const version = "1.3.14";
+declare const version = "1.3.15";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, hooks, nocode, templates, utils, };

package/es/index.js

@@ -31,6 +31,6 @@ export * from './sidebar';
 export * from './utils'; // export * from './sidebar';
 
 export * from './timeline';
-var version = '1.3.14';
+var version = '1.3.15';
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, // ProLayout,
 ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, hooks, nocode, templates, utils };

package/lib/actions/index.scss

@@ -121,3 +121,16 @@
     }
   }
 }
+
+// 针对弹层内的 table 在暗色模式下适配
+.next-dialog-body {
+  .teamix-pro-table, .next-table-empty {
+    background: var(--dialog-bg);
+  }
+}
+
+.next-drawer-body {
+  .teamix-pro-table, .next-table-empty {
+    background: var(--drawer-bg);
+  }
+}

package/lib/form/Filter/index.js

@@ -150,24 +150,21 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
               }); // 等待mounted + 字段loading结束 + initialRequest结束 => 表单默认值初始化完成
 
               if (!(form.mounted && !loadingField.length && !form.loading)) {
-                _context.next = 10;
+                _context.next = 9;
                 break;
               }
 
-              onFormInit = function onFormInit() {}; // init后销毁 isFormInit 方法
-
-
-              filterEnable.current = 'filter';
+              onFormInit = undefined; // init后销毁 isFormInit 方法
 
               if (!onInit) {
-                _context.next = 10;
+                _context.next = 9;
                 break;
               }
 
-              _context.next = 8;
+              _context.next = 7;
               return form.validate();
 
-            case 8:
+            case 7:
               onInit === null || onInit === void 0 ? void 0 : onInit((0, _reactive.toJS)(form.values)); // 设置Tag
 
               if (mode === 'panel') {
@@ -175,7 +172,7 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
                 !panelVisible && configTag();
               }
 
-            case 10:
+            case 9:
             case "end":
               return _context.stop();
           }
@@ -194,13 +191,105 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
 
     if (formRef) {
       var form = formMap[formName];
-      formRef.current = form;
+      formRef.current = form; // 自定义updateTags方法
 
       if (!formRef.current.updateTags) {
         formRef.current.updateTags = function () {
-          configFilterItem(form);
-          configTag();
+          updateTags(form);
         };
+      } // 自定义setAsyncValues方法
+
+
+      if (!formRef.current.setAsyncValues) {
+        formRef.current.setAsyncValues = /*#__PURE__*/function () {
+          var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(values) {
+            return regeneratorRuntime.wrap(function _callee2$(_context2) {
+              while (1) {
+                switch (_context2.prev = _context2.next) {
+                  case 0:
+                    form.setValues(values);
+
+                    if (!(filterEnable.current === 'filter' && formName === 'advanced')) {
+                      _context2.next = 6;
+                      break;
+                    }
+
+                    _context2.next = 4;
+                    return form.validate();
+
+                  case 4:
+                    onFilter === null || onFilter === void 0 ? void 0 : onFilter((0, _reactive.toJS)(form.values));
+                    updateTags(form);
+
+                  case 6:
+                  case "end":
+                    return _context2.stop();
+                }
+              }
+            }, _callee2);
+          }));
+
+          return function (_x2) {
+            return _ref2.apply(this, arguments);
+          };
+        }();
+      } // 自定义triggerFilter方法
+
+
+      if (!formRef.current.triggerFilter) {
+        formRef.current.triggerFilter = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3() {
+          return regeneratorRuntime.wrap(function _callee3$(_context3) {
+            while (1) {
+              switch (_context3.prev = _context3.next) {
+                case 0:
+                  _context3.next = 2;
+                  return form.validate();
+
+                case 2:
+                  onFilter === null || onFilter === void 0 ? void 0 : onFilter((0, _reactive.toJS)(form.values));
+
+                  if (formName === 'advanced') {
+                    updateTags(form);
+                  }
+
+                case 4:
+                case "end":
+                  return _context3.stop();
+              }
+            }
+          }, _callee3);
+        }));
+      } // 自定义triggerReset方法
+
+
+      if (!formRef.current.triggerReset) {
+        formRef.current.triggerReset = /*#__PURE__*/function () {
+          var _ref4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4(config) {
+            return regeneratorRuntime.wrap(function _callee4$(_context4) {
+              while (1) {
+                switch (_context4.prev = _context4.next) {
+                  case 0:
+                    simpleForm.reset('*', config);
+                    lightForm.reset('*', config);
+                    advancedForm.reset('*', config);
+
+                    if (formName === 'advanced') {
+                      onReset === null || onReset === void 0 ? void 0 : onReset((0, _reactive.toJS)(advancedForm.values));
+                      updateTags(form);
+                    }
+
+                  case 4:
+                  case "end":
+                    return _context4.stop();
+                }
+              }
+            }, _callee4);
+          }));
+
+          return function (_x3) {
+            return _ref4.apply(this, arguments);
+          };
+        }();
       }
     }
   }; // 创建简单筛选表单实例
@@ -212,7 +301,11 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       effects: function effects() {
         (0, _core.onFormReact)(function (form) {
           if (mode === 'inline') {
-            onFormInit(form);
+            var _onFormInit;
+
+            (_onFormInit = onFormInit) === null || _onFormInit === void 0 ? void 0 : _onFormInit(form).finally(function () {
+              return filterEnable.current = 'filter';
+            });
           }
         });
       }
@@ -236,7 +329,11 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       effects: function effects() {
         (0, _core.onFormReact)(function (form) {
           if (mode === 'panel') {
-            onFormInit(form);
+            var _onFormInit2;
+
+            (_onFormInit2 = onFormInit) === null || _onFormInit2 === void 0 ? void 0 : _onFormInit2(form).finally(function () {
+              return filterEnable.current = 'filter';
+            });
           }
         });
         (0, _core.onFormInputChange)(function (form) {
@@ -255,12 +352,12 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     var displayValues = (0, _useFormDisplayValues.getFormDisplayValues)(form);
     var originalData = Object.entries(displayValues);
     var filterData = [];
-    originalData.forEach(function (_ref2) {
+    originalData.forEach(function (_ref5) {
       var _data$displayValue;
 
-      var _ref3 = _slicedToArray(_ref2, 2),
-          key = _ref3[0],
-          data = _ref3[1];
+      var _ref6 = _slicedToArray(_ref5, 2),
+          key = _ref6[0],
+          data = _ref6[1];
 
       var value = (_data$displayValue = data.displayValue) !== null && _data$displayValue !== void 0 ? _data$displayValue : data.value;
       var component = data.component;
@@ -295,6 +392,11 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
 
   var configTag = (0, _react.useCallback)(function () {
     setTagDataSource(filterItem.current);
+  }, []); // 更新标签数据
+
+  var updateTags = (0, _react.useCallback)(function (form) {
+    configFilterItem(form);
+    configTag();
   }, []); // 展开收起高级筛选
 
   var toggleAdvancedFilter = (0, _react.useCallback)(function () {
@@ -317,12 +419,12 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
   }, [panelVisible, configTag]); // 简单搜索Filter
 
   var onSimpleFilter = (0, _react.useCallback)( /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(values) {
-      return regeneratorRuntime.wrap(function _callee2$(_context2) {
+    var _ref7 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5(values) {
+      return regeneratorRuntime.wrap(function _callee5$(_context5) {
         while (1) {
-          switch (_context2.prev = _context2.next) {
+          switch (_context5.prev = _context5.next) {
             case 0:
-              _context2.next = 2;
+              _context5.next = 2;
               return simpleForm.validate();
 
             case 2:
@@ -330,14 +432,14 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
 
             case 3:
             case "end":
-              return _context2.stop();
+              return _context5.stop();
           }
         }
-      }, _callee2);
+      }, _callee5);
     }));
 
-    return function (_x2) {
-      return _ref4.apply(this, arguments);
+    return function (_x4) {
+      return _ref7.apply(this, arguments);
     };
   }(), [onFilter]); // 简单搜索Change
 
@@ -360,10 +462,8 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     (_Object$keys = Object.keys(advancedForm.values)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.forEach(function (key) {
       clearKeys[key] = undefined;
     });
-    advancedForm.setValues(clearKeys); // 配置Tag
-
-    configFilterItem(advancedForm);
-    configTag();
+    advancedForm.setValues(clearKeys);
+    updateTags(advancedForm);
   }, [onFilter]); // 轻量搜索Change
 
   var onLightChange = (0, _react.useCallback)(function (values, fieldValue, fieldName) {
@@ -411,8 +511,7 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     }
 
     advancedForm.setValuesIn(key, newValue);
-    configFilterItem(advancedForm);
-    configTag();
+    updateTags(advancedForm);
     onFilter === null || onFilter === void 0 ? void 0 : onFilter((0, _reactive.toJS)(advancedForm.values));
   }, [onFilter]); // initialRequest 的回调
 
@@ -456,12 +555,12 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       onReset: onAdvancedReset,
       onInitialComplete: onInitialComplete
     })) : null
-  }, mode === 'panel' && !panelVisible ? /*#__PURE__*/_react.default.createElement(_components.Tag.Group, null, tagDataSource.map(function (_ref5) {
-    var key = _ref5.key,
-        label = _ref5.label,
-        value = _ref5.value,
-        type = _ref5.type,
-        index = _ref5.index;
+  }, mode === 'panel' && !panelVisible ? /*#__PURE__*/_react.default.createElement(_components.Tag.Group, null, tagDataSource.map(function (_ref8) {
+    var key = _ref8.key,
+        label = _ref8.label,
+        value = _ref8.value,
+        type = _ref8.type,
+        index = _ref8.index;
     return /*#__PURE__*/_react.default.createElement(_components.Tag.Closeable, {
       key: (0, _utils.isNum)(index) ? key + label : key,
       afterClose: function afterClose() {

package/lib/form/SchemaForm/initializeDataSource.d.ts

@@ -1,6 +1,5 @@
-import type { ProFormRequestConfig } from '../typing';
 interface IInitializeDataSource {
-    (requestConfig?: ProFormRequestConfig | any, suffix?: string): {
+    (requestConfig: any, suffix: string): {
         dataSource?: any[];
         reactions: any[];
         scope: {

package/lib/form/SchemaForm/initializeDataSource.js

@@ -5,30 +5,25 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _utils = require("@teamix/utils");
-
-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; }
+var _utils = require("../utils");
 
 var initializeDataSource = function initializeDataSource(dataSource, suffix) {
-  if ((0, _utils.isPlainObj)(dataSource)) {
-    var _requestConfig$extraC;
+  var _dataSource$extraConf;
 
-    var requestConfig = dataSource;
-    var requestConfigName = "$requestConfig_".concat(suffix);
-    return {
-      reactions: ["{{$dataSource($request,".concat(requestConfigName, ",context)}}")],
-      scope: _defineProperty({}, requestConfigName, requestConfig),
-      // dataSource请求时，默认配置字段为只读
-      data: {
-        readOnlyOnLoading: (requestConfig === null || requestConfig === void 0 ? void 0 : (_requestConfig$extraC = requestConfig.extraConfig) === null || _requestConfig$extraC === void 0 ? void 0 : _requestConfig$extraC.readOnly) !== false
-      }
-    };
-  }
+  var _initializeRequestExp = (0, _utils.initializeRequestExpression)(dataSource, '$dataSource', suffix),
+      expression = _initializeRequestExp.expression,
+      scope = _initializeRequestExp.scope;
 
-  return {
-    dataSource: dataSource,
+  return expression ? {
+    reactions: [expression],
+    scope: scope,
+    data: {
+      readOnlyOnLoading: (dataSource === null || dataSource === void 0 ? void 0 : (_dataSource$extraConf = dataSource.extraConfig) === null || _dataSource$extraConf === void 0 ? void 0 : _dataSource$extraConf.readOnly) !== false
+    }
+  } : {
     reactions: [],
-    scope: {}
+    scope: {},
+    dataSource: dataSource
   };
 };
 

package/lib/form/SchemaForm/initializeRequest.js

@@ -7,6 +7,8 @@ exports.default = void 0;
 
 var _utils = require("@teamix/utils");
 
+var _utils2 = require("../utils");
+
 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; }
@@ -25,37 +27,35 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
 
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
-var initializeRequest = function initializeRequest(requestConfig, suffix) {
-  if (requestConfig) {
-    if ((0, _utils.isArr)(requestConfig)) {
-      var reactionsMap = [];
-      var scopeMap = {};
-      requestConfig.forEach(function (item, index) {
-        var _initializeRequest = initializeRequest(item, "".concat(suffix).concat(index)),
-            reactions = _initializeRequest.reactions,
-            scope = _initializeRequest.scope;
-
-        reactionsMap = [].concat(_toConsumableArray(reactionsMap), _toConsumableArray(reactions));
-        scopeMap = _objectSpread(_objectSpread({}, scopeMap), scope);
-      });
-      return {
-        reactions: reactionsMap,
-        scope: scopeMap
-      };
-    } else {
-      var requestConfigName = "$requestConfig_".concat(suffix);
-      return {
-        reactions: ["{{$common($request,".concat(requestConfigName, ",context)}}")],
-        scope: _defineProperty({}, requestConfigName, requestConfig)
-      };
-    }
-  }
+var initializeItem = function initializeItem(request, suffix) {
+  var _initializeRequestExp = (0, _utils2.initializeRequestExpression)(request, '$common', suffix),
+      expression = _initializeRequestExp.expression,
+      scope = _initializeRequestExp.scope;
 
-  return {
+  return expression ? {
+    reactions: [expression],
+    scope: scope
+  } : {
     reactions: [],
     scope: {}
   };
 };
 
+var initializeRequest = function initializeRequest(request, suffix) {
+  if ((0, _utils.isArr)(request)) {
+    return request.reduce(function (prev, current, index) {
+      var result = initializeItem(current, "".concat(suffix, "_").concat(index));
+      prev.reactions = [].concat(_toConsumableArray(prev.reactions), _toConsumableArray(result.reactions));
+      prev.scope = _objectSpread(_objectSpread({}, prev.scope), result.scope);
+      return prev;
+    }, {
+      reactions: [],
+      scope: {}
+    });
+  }
+
+  return initializeItem(request, suffix);
+};
+
 var _default = initializeRequest;
 exports.default = _default;

package/lib/form/SchemaForm/initializeRules.d.ts

@@ -1,7 +1,7 @@
 interface IInitializeRules {
-    (rules?: any, suffix?: string): {
+    (rules: any, suffix: string): {
         rules?: any;
-        reactions: any[];
+        reactions?: any[];
         scope: {
             [x: string]: any;
         };

package/lib/form/SchemaForm/initializeRules.js

@@ -7,6 +7,10 @@ exports.default = void 0;
 
 var _utils = require("@teamix/utils");
 
+var _utils2 = require("../utils");
+
+var _excluded = ["validator"];
+
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -25,30 +29,34 @@ 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; }
 
-var initializeRules = function initializeRules(rules, suffix) {
-  var initializeValidator = function initializeValidator(rule) {
-    var index = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
-
-    if ((0, _utils.isPlainObj)(rule === null || rule === void 0 ? void 0 : rule.validator)) {
-      var requestConfig = rule.validator;
-      var requestConfigName = "$requestConfig_".concat(suffix).concat(index);
-      return {
-        rules: _objectSpread(_objectSpread({}, rule), {}, {
-          validator: "{{$validator($request,".concat(requestConfigName, ",context)}}")
-        }),
-        scope: _defineProperty({}, requestConfigName, requestConfig)
-      };
-    }
-
-    return {
-      rules: rule,
-      scope: {}
-    };
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+
+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 initializeRule = function initializeRule(rule, suffix) {
+  var _ref = rule || {},
+      validator = _ref.validator,
+      rest = _objectWithoutProperties(_ref, _excluded);
+
+  var _initializeRequestExp = (0, _utils2.initializeRequestExpression)(validator, '$validator', suffix),
+      expression = _initializeRequestExp.expression,
+      scope = _initializeRequestExp.scope;
+
+  return expression ? {
+    scope: scope,
+    rules: _objectSpread({
+      validator: expression
+    }, rest)
+  } : {
+    scope: {},
+    rules: rule
   };
+};
 
+var initializeRules = function initializeRules(rules, suffix) {
   if ((0, _utils.isArr)(rules)) {
-    return rules.reduce(function (prev, current, subIndex) {
-      var result = initializeValidator(current, subIndex);
+    return rules.reduce(function (prev, current, index) {
+      var result = initializeRule(current, "".concat(suffix, "_").concat(index));
       prev.rules = [].concat(_toConsumableArray(prev.rules), [result.rules]);
       prev.scope = _objectSpread(_objectSpread({}, prev.scope), result.scope);
       return prev;
@@ -58,7 +66,7 @@ var initializeRules = function initializeRules(rules, suffix) {
     });
   }
 
-  return initializeValidator(rules);
+  return initializeRule(rules, suffix);
 };
 
 var _default = initializeRules;

package/lib/form/SchemaForm/reactions.d.ts

@@ -1,6 +1,6 @@
 import type { ProFormRequestConfig } from '../typing';
-declare const $request: (field: any, { extraConfig, ...requestConfig }: ProFormRequestConfig, context: any, type: 'request' | 'validator' | 'dataSource') => Promise<unknown>;
-declare const $common: (services: any, requestConfig: ProFormRequestConfig, context: any) => (field: any) => any;
-declare const $validator: (services: any, requestConfig: ProFormRequestConfig, context: any) => (value: any, rules: any, { field }: any) => any;
-declare const $dataSource: (services: any, requestConfig: ProFormRequestConfig, context: any) => (field: any) => any;
+declare const $request: (field: any, context: any, { extraConfig, onComplete, ...rest }: ProFormRequestConfig, type: 'request' | 'validator' | 'dataSource') => Promise<unknown>;
+declare const $common: (services: any, context: any, requestConfig: ProFormRequestConfig) => (field: any) => any;
+declare const $validator: (services: any, context: any, requestConfig: ProFormRequestConfig) => (value: any, rules: any, { field }: any) => any;
+declare const $dataSource: (services: any, context: any, requestConfig: ProFormRequestConfig) => (field: any) => any;
 export { $request, $common, $dataSource, $validator };