@teamix/pro 1.3.14 → 1.3.15

package/es/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/es/form/Filter/index.js

@@ -114,24 +114,21 @@ var QueryFilter = /*#__PURE__*/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(toJS(form.values)); // 设置Tag
 
               if (mode === 'panel') {
@@ -139,7 +136,7 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
                 !panelVisible && configTag();
               }
 
-            case 10:
+            case 9:
             case "end":
               return _context.stop();
           }
@@ -158,13 +155,105 @@ var QueryFilter = /*#__PURE__*/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(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(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(toJS(advancedForm.values));
+                      updateTags(form);
+                    }
+
+                  case 4:
+                  case "end":
+                    return _context4.stop();
+                }
+              }
+            }, _callee4);
+          }));
+
+          return function (_x3) {
+            return _ref4.apply(this, arguments);
+          };
+        }();
       }
     }
   }; // 创建简单筛选表单实例
@@ -176,7 +265,11 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
       effects: function effects() {
         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';
+            });
           }
         });
       }
@@ -200,7 +293,11 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
       effects: function effects() {
         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';
+            });
           }
         });
         onFormInputChange(function (form) {
@@ -219,12 +316,12 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
     var displayValues = 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;
@@ -259,6 +356,11 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
 
   var configTag = useCallback(function () {
     setTagDataSource(filterItem.current);
+  }, []); // 更新标签数据
+
+  var updateTags = useCallback(function (form) {
+    configFilterItem(form);
+    configTag();
   }, []); // 展开收起高级筛选
 
   var toggleAdvancedFilter = useCallback(function () {
@@ -281,12 +383,12 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
   }, [panelVisible, configTag]); // 简单搜索Filter
 
   var onSimpleFilter = 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:
@@ -294,14 +396,14 @@ var QueryFilter = /*#__PURE__*/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
 
@@ -324,10 +426,8 @@ var QueryFilter = /*#__PURE__*/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 = useCallback(function (values, fieldValue, fieldName) {
@@ -375,8 +475,7 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
     }
 
     advancedForm.setValuesIn(key, newValue);
-    configFilterItem(advancedForm);
-    configTag();
+    updateTags(advancedForm);
     onFilter === null || onFilter === void 0 ? void 0 : onFilter(toJS(advancedForm.values));
   }, [onFilter]); // initialRequest 的回调
 
@@ -420,12 +519,12 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
       onReset: onAdvancedReset,
       onInitialComplete: onInitialComplete
     })) : null
-  }, mode === 'panel' && !panelVisible ? /*#__PURE__*/React.createElement(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.createElement(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.createElement(Tag.Closeable, {
       key: isNum(index) ? key + label : key,
       afterClose: function afterClose() {

package/es/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/es/form/SchemaForm/initializeDataSource.js

@@ -1,27 +1,22 @@
-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; }
-
-import { isPlainObj } from '@teamix/utils';
+import { initializeRequestExpression } from '../utils';
 
 var initializeDataSource = function initializeDataSource(dataSource, suffix) {
-  if (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 = 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/es/form/SchemaForm/initializeRequest.js

@@ -17,37 +17,36 @@ 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; }
 
 import { isArr } from '@teamix/utils';
+import { initializeRequestExpression } from '../utils';
 
-var initializeRequest = function initializeRequest(requestConfig, suffix) {
-  if (requestConfig) {
-    if (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 = 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 (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);
+};
+
 export default initializeRequest;

package/es/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/es/form/SchemaForm/initializeRules.js

@@ -1,3 +1,5 @@
+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."); }
@@ -16,32 +18,37 @@ 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; }
 
-import { isArr, isPlainObj } from '@teamix/utils';
+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; }
 
-var initializeRules = function initializeRules(rules, suffix) {
-  var initializeValidator = function initializeValidator(rule) {
-    var index = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
-
-    if (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 _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; }
+
+import { isArr } from '@teamix/utils';
+import { initializeRequestExpression } from '../utils';
+
+var initializeRule = function initializeRule(rule, suffix) {
+  var _ref = rule || {},
+      validator = _ref.validator,
+      rest = _objectWithoutProperties(_ref, _excluded);
+
+  var _initializeRequestExp = 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 (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;
@@ -51,7 +58,7 @@ var initializeRules = function initializeRules(rules, suffix) {
     });
   }
 
-  return initializeValidator(rules);
+  return initializeRule(rules, suffix);
 };
 
 export default initializeRules;

package/es/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 };

package/es/form/SchemaForm/reactions.js

@@ -1,4 +1,4 @@
-var _excluded = ["extraConfig"];
+var _excluded = ["extraConfig", "onComplete"];
 
 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; }
 
@@ -12,24 +12,23 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 
 import { isFn, isPlainObj, doCommonRequest, getValueByValue } from '@teamix/utils'; // 配置请求
 
-var $request = function $request(field, _ref, context, type) {
+var $request = function $request(field, context, _ref, type) {
   var _field$data;
 
   var extraConfig = _ref.extraConfig,
-      requestConfig = _objectWithoutProperties(_ref, _excluded);
+      onComplete = _ref.onComplete,
+      rest = _objectWithoutProperties(_ref, _excluded);
 
+  var requestConfig = rest;
   var params = requestConfig.params,
       beforeRequest = requestConfig.beforeRequest,
       formatResult = requestConfig.formatResult,
       onSuccess = requestConfig.onSuccess;
-  var beforeRequestResult = isFn(beforeRequest) ? beforeRequest(field, context) : {};
-  /**
-   * 主动触发的请求刷新
-   */
-  // 触发所有配置的请求
+  var beforeRequestResult = isFn(beforeRequest) ? beforeRequest(field, context) : {}; // 通过字段 data 的 refresh 主动触发的请求刷新
 
   var refresh = (_field$data = field.data) === null || _field$data === void 0 ? void 0 : _field$data.refresh;
-  var refreshResult = isPlainObj(refresh) ? refresh : {};
+  var refreshResult = isPlainObj(refresh) ? refresh : {}; // 执行通用数据请求
+
   return doCommonRequest(_objectSpread(_objectSpread({}, requestConfig), {}, {
     params: _objectSpread(_objectSpread(_objectSpread({}, params), beforeRequestResult), refreshResult),
     beforeRequest: function beforeRequest() {
@@ -45,36 +44,38 @@ var $request = function $request(field, _ref, context, type) {
 }; // 通用请求配置上下文
 
 
-var $common = function $common(services, requestConfig, context) {
+var $common = function $common(services, context, requestConfig) {
   return function (field) {
-    return services(field, requestConfig, context, 'request').then(function (res) {
+    return services(field, context, requestConfig, 'request').then(function (res) {
       var _requestConfig$onComp;
 
-      return (_requestConfig$onComp = requestConfig.onComplete) === null || _requestConfig$onComp === void 0 ? void 0 : _requestConfig$onComp.call(requestConfig, res, field, context);
+      return requestConfig === null || requestConfig === void 0 ? void 0 : (_requestConfig$onComp = requestConfig.onComplete) === null || _requestConfig$onComp === void 0 ? void 0 : _requestConfig$onComp.call(requestConfig, res, field, context);
     });
   };
 }; // 配置校验
 
 
-var $validator = function $validator(services, requestConfig, context) {
+var $validator = function $validator(services, context, requestConfig) {
   return function (value, rules, _ref2) {
     var field = _ref2.field;
-    return services(field, requestConfig, context, 'validator').then(function (res) {
-      var _requestConfig$onComp2;
-
-      return (_requestConfig$onComp2 = requestConfig.onComplete) === null || _requestConfig$onComp2 === void 0 ? void 0 : _requestConfig$onComp2.call(requestConfig, res, field, context);
+    return services(field, context, requestConfig, 'validator').then(function (res) {
+      if (requestConfig === null || requestConfig === void 0 ? void 0 : requestConfig.onComplete) {
+        return requestConfig.onComplete(res, field, context);
+      } else {
+        return res;
+      }
     });
   };
 }; // 配置DataSource
 
 
-var $dataSource = function $dataSource(services, requestConfig, context) {
+var $dataSource = function $dataSource(services, context, requestConfig) {
   return function (field) {
     field.setState({
       loading: true
     });
-    return services(field, requestConfig, context, 'dataSource').then(function (res) {
-      var _requestConfig$extraC, _requestConfig$onComp3;
+    return services(field, context, requestConfig, 'dataSource').then(function (res) {
+      var _requestConfig$extraC, _requestConfig$onComp2;
 
       var isValueInDataSource = getValueByValue(res, field.value);
       var clearResult = !isValueInDataSource && (requestConfig === null || requestConfig === void 0 ? void 0 : (_requestConfig$extraC = requestConfig.extraConfig) === null || _requestConfig$extraC === void 0 ? void 0 : _requestConfig$extraC.clearInvalidValue) !== false ? {
@@ -84,7 +85,7 @@ var $dataSource = function $dataSource(services, requestConfig, context) {
         dataSource: res,
         loading: false
       }, clearResult));
-      return (_requestConfig$onComp3 = requestConfig.onComplete) === null || _requestConfig$onComp3 === void 0 ? void 0 : _requestConfig$onComp3.call(requestConfig, res, field, context);
+      return requestConfig === null || requestConfig === void 0 ? void 0 : (_requestConfig$onComp2 = requestConfig.onComplete) === null || _requestConfig$onComp2 === void 0 ? void 0 : _requestConfig$onComp2.call(requestConfig, res, field, context);
     }).catch(function () {
       field.setState({
         loading: false

package/es/form/typing.d.ts

@@ -1,7 +1,7 @@
 import type { ReactNode } from 'react';
 import type { IFormFeedback, Form as FormType, FieldPatternTypes } from '@formily/core';
 import type { IFormLayoutProps } from '@teamix/formily';
-import { CommonRequestConfig } from '@teamix/utils';
+import type { CommonRequestConfig } from '@teamix/utils';
 import React from 'react';
 interface AnyObject {
     [propName: string]: any;
@@ -18,12 +18,16 @@ declare type IBaseComponent = 'Input' | 'Password' | 'TextArea' | 'NumberPicker'
 declare type IButtonComponent = 'Submit' | 'Reset';
 declare type IComboComponent = 'ArrayCards' | 'ArrayCards.Addition' | 'ArrayCards.Remove' | 'ArrayCards.MoveUp' | 'ArrayCards.MoveDown' | 'ArrayCards.Index' | 'ArrayCollapse' | 'ArrayCollapse.CollapsePanel' | 'ArrayCollapse.Addition' | 'ArrayCollapse.Remove' | 'ArrayCollapse.MoveUp' | 'ArrayCollapse.MoveDown' | 'ArrayCollapse.Index' | 'ArrayTable' | 'ArrayTable.Column' | 'ArrayTable.SortHandle' | 'ArrayTable.Addition' | 'ArrayTable.Remove' | 'ArrayTable.MoveDown' | 'ArrayTable.MoveUp' | 'ArrayTable.Index' | 'ArrayItems' | 'ArrayItems.Item' | 'ArrayItems.SortHandle' | 'ArrayItems.Addition' | 'ArrayItems.Remove' | 'ArrayItems.MoveDown' | 'ArrayItems.MoveUp' | 'ArrayItems.Index' | 'Editable' | 'Editable.Popover' | 'Editable.Dialog' | 'Editable.Drawer';
 declare type ILayoutComponent = 'FormFlex' | 'FormGrid' | 'FormGroup' | 'FormGroup.GroupPanel' | 'Search' | 'Search.SearchPanel' | 'FormTab' | 'FormTab.TabPane' | 'FormStep' | 'FormStep.StepPane' | 'FormCollapse' | 'FormCollapse.CollapsePanel' | 'FormButtonGroup' | 'FormDialog' | 'FormDrawer' | 'FormDialog.Footer' | 'FormDrawer.Footer';
-export interface ProFormRequestConfig extends CommonRequestConfig {
+export interface ProFormCommonRequestConfig extends CommonRequestConfig {
     beforeRequest?: (field?: any, context?: any) => any;
     formatResult?: (res?: any, field?: any, context?: any) => any;
     onSuccess?: (res?: any, field?: any, context?: any) => any;
-    onComplete?: (res?: any, field?: any, context?: any) => any;
+}
+export interface ProFormRequestConfig extends Omit<ProFormCommonRequestConfig, 'url'> {
+    url?: string;
+    customRequest?: (field?: any, context?: any) => Promise<any>;
     extraConfig?: AnyObject;
+    onComplete?: (res?: any, field?: any, context?: any) => any;
 }
 export interface ProFormSchemaItem {
     type?: string;
@@ -64,7 +68,7 @@ export interface ProFormProps extends IFormLayoutProps {
     };
     children?: React.ReactNode;
     initialValues?: AnyObject;
-    initialRequest?: ProFormRequestConfig;
+    initialRequest?: ProFormCommonRequestConfig;
     previewTextPlaceholder?: ReactNode;
     validateFirst?: boolean;
     onChangeType?: 'form';
@@ -121,7 +125,7 @@ export interface QueryFilterProps extends ProFormProps {
     /** onChange事件的防抖时间 */
     filterDebounce?: number;
     /** 表单初始化（含异步默认值）后回调函数 */
-    onInit?: (values: any) => boolean;
+    onInit?: (values: any) => void;
     /** 表单筛选回调函数 */
     onFilter?: (values: any) => void;
     /** 表单重置回调函数 */