@teamix/pro 1.3.14 → 1.3.15

package/dist/pro.js

@@ -55339,7 +55339,7 @@ var FieldSwitch = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().forw
 /* harmony import */ var _output__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(90405);
 /* harmony import */ var _tagPicker__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(81979);
 /* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(72326);
-var _excluded = ["value", "mode", "onChange", "inputProps", "layout", "size", "render", "disabled", "dataSource", "state", "type"];
+var _excluded = ["value", "mode", "onChange", "inputProps", "layout", "size", "render", "dataSource", "state", "type"];
 
 function ownKeys(object, enumerableOnly) {
   var keys = Object.keys(object);
@@ -55492,7 +55492,6 @@ var FieldTagPicker = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().f
       layout = props.layout,
       size = props.size,
       render = props.render,
-      disabled = props.disabled,
       dataSource = props.dataSource,
       state = props.state,
       type = props.type,
@@ -66070,24 +66069,21 @@ var QueryFilter = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(funct
               }); // 等待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 ? void 0 : onInit((0,_formily_reactive__WEBPACK_IMPORTED_MODULE_5__.toJS)(form.values)); // 设置Tag
 
               if (mode === 'panel') {
@@ -66095,7 +66091,7 @@ var QueryFilter = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(funct
                 !panelVisible && configTag();
               }
 
-            case 10:
+            case 9:
             case "end":
               return _context.stop();
           }
@@ -66114,13 +66110,105 @@ var QueryFilter = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(funct
 
     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 ? void 0 : onFilter((0,_formily_reactive__WEBPACK_IMPORTED_MODULE_5__.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 ? void 0 : onFilter((0,_formily_reactive__WEBPACK_IMPORTED_MODULE_5__.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 ? void 0 : onReset((0,_formily_reactive__WEBPACK_IMPORTED_MODULE_5__.toJS)(advancedForm.values));
+                      updateTags(form);
+                    }
+
+                  case 4:
+                  case "end":
+                    return _context4.stop();
+                }
+              }
+            }, _callee4);
+          }));
+
+          return function (_x3) {
+            return _ref4.apply(this, arguments);
+          };
+        }();
       }
     }
   }; // 创建简单筛选表单实例
@@ -66132,7 +66220,9 @@ var QueryFilter = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(funct
       effects: function effects() {
         (0,_formily_core__WEBPACK_IMPORTED_MODULE_4__.onFormReact)(function (form) {
           if (mode === 'inline') {
-            onFormInit(form);
+            onFormInit == null ? void 0 : onFormInit(form)["finally"](function () {
+              return filterEnable.current = 'filter';
+            });
           }
         });
       }
@@ -66156,7 +66246,9 @@ var QueryFilter = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(funct
       effects: function effects() {
         (0,_formily_core__WEBPACK_IMPORTED_MODULE_4__.onFormReact)(function (form) {
           if (mode === 'panel') {
-            onFormInit(form);
+            onFormInit == null ? void 0 : onFormInit(form)["finally"](function () {
+              return filterEnable.current = 'filter';
+            });
           }
         });
         (0,_formily_core__WEBPACK_IMPORTED_MODULE_4__.onFormInputChange)(function (form) {
@@ -66175,11 +66267,11 @@ var QueryFilter = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(funct
     var displayValues = (0,_ProForm_useFormDisplayValues__WEBPACK_IMPORTED_MODULE_9__/* .getFormDisplayValues */ .z)(form);
     var originalData = Object.entries(displayValues);
     var filterData = [];
-    originalData.forEach(function (_ref2) {
+    originalData.forEach(function (_ref5) {
       var _data$displayValue;
 
-      var key = _ref2[0],
-          data = _ref2[1];
+      var key = _ref5[0],
+          data = _ref5[1];
       var value = (_data$displayValue = data.displayValue) != null ? _data$displayValue : data.value;
       var component = data.component;
 
@@ -66213,6 +66305,11 @@ var QueryFilter = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(funct
 
   var configTag = (0,react__WEBPACK_IMPORTED_MODULE_0__.useCallback)(function () {
     setTagDataSource(filterItem.current);
+  }, []); // 更新标签数据
+
+  var updateTags = (0,react__WEBPACK_IMPORTED_MODULE_0__.useCallback)(function (form) {
+    configFilterItem(form);
+    configTag();
   }, []); // 展开收起高级筛选
 
   var toggleAdvancedFilter = (0,react__WEBPACK_IMPORTED_MODULE_0__.useCallback)(function () {
@@ -66235,12 +66332,12 @@ var QueryFilter = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(funct
   }, [panelVisible, configTag]); // 简单搜索Filter
 
   var onSimpleFilter = (0,react__WEBPACK_IMPORTED_MODULE_0__.useCallback)( /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(values) {
-      return regeneratorRuntime.wrap(function _callee2$(_context2) {
+    var _ref6 = _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:
@@ -66248,14 +66345,14 @@ var QueryFilter = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(funct
 
             case 3:
             case "end":
-              return _context2.stop();
+              return _context5.stop();
           }
         }
-      }, _callee2);
+      }, _callee5);
     }));
 
-    return function (_x2) {
-      return _ref3.apply(this, arguments);
+    return function (_x4) {
+      return _ref6.apply(this, arguments);
     };
   }(), [onFilter]); // 简单搜索Change
 
@@ -66278,10 +66375,8 @@ var QueryFilter = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(funct
     (_Object$keys = Object.keys(advancedForm.values)) == null ? 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__WEBPACK_IMPORTED_MODULE_0__.useCallback)(function (values, fieldValue, fieldName) {
@@ -66329,8 +66424,7 @@ var QueryFilter = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(funct
     }
 
     advancedForm.setValuesIn(key, newValue);
-    configFilterItem(advancedForm);
-    configTag();
+    updateTags(advancedForm);
     onFilter == null ? void 0 : onFilter((0,_formily_reactive__WEBPACK_IMPORTED_MODULE_5__.toJS)(advancedForm.values));
   }, [onFilter]); // initialRequest 的回调
 
@@ -66375,12 +66469,12 @@ var QueryFilter = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(funct
       onReset: onAdvancedReset,
       onInitialComplete: onInitialComplete
     })) : null
-  }, mode === 'panel' && !panelVisible ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_3__.Tag.Group, null, tagDataSource.map(function (_ref4) {
-    var key = _ref4.key,
-        label = _ref4.label,
-        value = _ref4.value,
-        type = _ref4.type,
-        index = _ref4.index;
+  }, mode === 'panel' && !panelVisible ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_3__.Tag.Group, null, tagDataSource.map(function (_ref7) {
+    var key = _ref7.key,
+        label = _ref7.label,
+        value = _ref7.value,
+        type = _ref7.type,
+        index = _ref7.index;
     return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_3__.Tag.Closeable, {
       key: (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_6__.isNum)(index) ? key + label : key,
       afterClose: function afterClose() {
@@ -67720,29 +67814,26 @@ var initialize = function initialize(item) {
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "Z": () => (__WEBPACK_DEFAULT_EXPORT__)
 /* harmony export */ });
-/* harmony import */ var _teamix_utils__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(80653);
+/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(51344);
 
 
 var initializeDataSource = function initializeDataSource(dataSource, suffix) {
-  if ((0,_teamix_utils__WEBPACK_IMPORTED_MODULE_0__.isPlainObj)(dataSource)) {
-    var _scope, _requestConfig$extraC;
+  var _dataSource$extraConf;
 
-    var _requestConfig = dataSource;
-    var requestConfigName = "$requestConfig_" + suffix;
-    return {
-      reactions: ["{{$dataSource($request," + requestConfigName + ",context)}}"],
-      scope: (_scope = {}, _scope[requestConfigName] = _requestConfig, _scope),
-      // dataSource请求时，默认配置字段为只读
-      data: {
-        readOnlyOnLoading: (_requestConfig == null ? void 0 : (_requestConfig$extraC = _requestConfig.extraConfig) == null ? void 0 : _requestConfig$extraC.readOnly) !== false
-      }
-    };
-  }
+  var _initializeRequestExp = (0,_utils__WEBPACK_IMPORTED_MODULE_0__/* .initializeRequestExpression */ .Q3)(dataSource, '$dataSource', suffix),
+      expression = _initializeRequestExp.expression,
+      scope = _initializeRequestExp.scope;
 
-  return {
-    dataSource: dataSource,
+  return expression ? {
+    reactions: [expression],
+    scope: scope,
+    data: {
+      readOnlyOnLoading: (dataSource == null ? void 0 : (_dataSource$extraConf = dataSource.extraConfig) == null ? void 0 : _dataSource$extraConf.readOnly) !== false
+    }
+  } : {
     reactions: [],
-    scope: {}
+    scope: {},
+    dataSource: dataSource
   };
 };
 
@@ -68161,6 +68252,7 @@ var initializeReactions = function initializeReactions(reactions, innerReactions
 /* harmony export */   "Z": () => (__WEBPACK_DEFAULT_EXPORT__)
 /* harmony export */ });
 /* harmony import */ var _teamix_utils__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(80653);
+/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(51344);
 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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
@@ -68177,40 +68269,37 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 
 
 
-var initializeRequest = function initializeRequest(requestConfig, suffix) {
-  if (requestConfig) {
-    if ((0,_teamix_utils__WEBPACK_IMPORTED_MODULE_0__.isArr)(requestConfig)) {
-      var reactionsMap = [];
-      var scopeMap = {};
-      requestConfig.forEach(function (item, index) {
-        var _initializeRequest = initializeRequest(item, "" + suffix + index),
-            reactions = _initializeRequest.reactions,
-            scope = _initializeRequest.scope;
 
-        reactionsMap = [].concat(_toConsumableArray(reactionsMap), _toConsumableArray(reactions));
-        scopeMap = _extends({}, scopeMap, scope);
-      });
-      return {
-        reactions: reactionsMap,
-        scope: scopeMap
-      };
-    } else {
-      var _scope;
-
-      var requestConfigName = "$requestConfig_" + suffix;
-      return {
-        reactions: ["{{$common($request," + requestConfigName + ",context)}}"],
-        scope: (_scope = {}, _scope[requestConfigName] = requestConfig, _scope)
-      };
-    }
-  }
+var initializeItem = function initializeItem(request, suffix) {
+  var _initializeRequestExp = (0,_utils__WEBPACK_IMPORTED_MODULE_1__/* .initializeRequestExpression */ .Q3)(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,_teamix_utils__WEBPACK_IMPORTED_MODULE_0__.isArr)(request)) {
+    return request.reduce(function (prev, current, index) {
+      var result = initializeItem(current, suffix + "_" + index);
+      prev.reactions = [].concat(_toConsumableArray(prev.reactions), _toConsumableArray(result.reactions));
+      prev.scope = _extends({}, prev.scope, result.scope);
+      return prev;
+    }, {
+      reactions: [],
+      scope: {}
+    });
+  }
+
+  return initializeItem(request, suffix);
+};
+
 /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (initializeRequest);
 
 /***/ }),
@@ -68223,6 +68312,9 @@ var initializeRequest = function initializeRequest(requestConfig, suffix) {
 /* harmony export */   "Z": () => (__WEBPACK_DEFAULT_EXPORT__)
 /* harmony export */ });
 /* harmony import */ var _teamix_utils__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(80653);
+/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(51344);
+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."); }
@@ -68237,36 +68329,35 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 
 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 initializeRules = function initializeRules(rules, suffix) {
-  var initializeValidator = function initializeValidator(rule, index) {
-    if (index === void 0) {
-      index = 0;
-    }
 
-    if ((0,_teamix_utils__WEBPACK_IMPORTED_MODULE_0__.isPlainObj)(rule == null ? void 0 : rule.validator)) {
-      var _scope;
 
-      var requestConfig = rule.validator;
-      var requestConfigName = "$requestConfig_" + suffix + index;
-      return {
-        rules: _extends({}, rule, {
-          validator: "{{$validator($request," + requestConfigName + ",context)}}"
-        }),
-        scope: (_scope = {}, _scope[requestConfigName] = requestConfig, _scope)
-      };
-    }
+var initializeRule = function initializeRule(rule, suffix) {
+  var _ref = rule || {},
+      validator = _ref.validator,
+      rest = _objectWithoutPropertiesLoose(_ref, _excluded);
 
-    return {
-      rules: rule,
-      scope: {}
-    };
+  var _initializeRequestExp = (0,_utils__WEBPACK_IMPORTED_MODULE_1__/* .initializeRequestExpression */ .Q3)(validator, '$validator', suffix),
+      expression = _initializeRequestExp.expression,
+      scope = _initializeRequestExp.scope;
+
+  return expression ? {
+    scope: scope,
+    rules: _extends({
+      validator: expression
+    }, rest)
+  } : {
+    scope: {},
+    rules: rule
   };
+};
 
+var initializeRules = function initializeRules(rules, suffix) {
   if ((0,_teamix_utils__WEBPACK_IMPORTED_MODULE_0__.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, suffix + "_" + index);
       prev.rules = [].concat(_toConsumableArray(prev.rules), [result.rules]);
       prev.scope = _extends({}, prev.scope, result.scope);
       return prev;
@@ -68276,7 +68367,7 @@ var initializeRules = function initializeRules(rules, suffix) {
     });
   }
 
-  return initializeValidator(rules);
+  return initializeRule(rules, suffix);
 };
 
 /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (initializeRules);
@@ -68400,7 +68491,7 @@ var initialize = function initialize(item) {
 /* harmony export */   "fn": () => (/* binding */ $validator)
 /* harmony export */ });
 /* harmony import */ var _teamix_utils__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(80653);
-var _excluded = ["extraConfig"];
+var _excluded = ["extraConfig", "onComplete"];
 
 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); }
 
@@ -68409,24 +68500,23 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 
 
 // 配置请求
-var $request = function $request(field, _ref, context, type) {
+var $request = function $request(field, context, _ref, type) {
   var _field$data;
 
   var extraConfig = _ref.extraConfig,
-      requestConfig = _objectWithoutPropertiesLoose(_ref, _excluded);
+      onComplete = _ref.onComplete,
+      rest = _objectWithoutPropertiesLoose(_ref, _excluded);
 
+  var requestConfig = rest;
   var params = requestConfig.params,
       beforeRequest = requestConfig.beforeRequest,
       formatResult = requestConfig.formatResult,
       onSuccess = requestConfig.onSuccess;
-  var beforeRequestResult = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_0__.isFn)(beforeRequest) ? beforeRequest(field, context) : {};
-  /**
-   * 主动触发的请求刷新
-   */
-  // 触发所有配置的请求
+  var beforeRequestResult = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_0__.isFn)(beforeRequest) ? beforeRequest(field, context) : {}; // 通过字段 data 的 refresh 主动触发的请求刷新
 
   var refresh = (_field$data = field.data) == null ? void 0 : _field$data.refresh;
-  var refreshResult = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_0__.isPlainObj)(refresh) ? refresh : {};
+  var refreshResult = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_0__.isPlainObj)(refresh) ? refresh : {}; // 执行通用数据请求
+
   return (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_0__.doCommonRequest)(_extends({}, requestConfig, {
     params: _extends({}, params, beforeRequestResult, refreshResult),
     beforeRequest: function beforeRequest() {
@@ -68442,31 +68532,35 @@ 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 requestConfig.onComplete == null ? void 0 : requestConfig.onComplete(res, field, context);
+    return services(field, context, requestConfig, 'request').then(function (res) {
+      return requestConfig == null ? void 0 : requestConfig.onComplete == null ? void 0 : requestConfig.onComplete(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) {
-      return requestConfig.onComplete == null ? void 0 : requestConfig.onComplete(res, field, context);
+    return services(field, context, requestConfig, 'validator').then(function (res) {
+      if (requestConfig != null && 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) {
+    return services(field, context, requestConfig, 'dataSource').then(function (res) {
       var _requestConfig$extraC;
 
       var isValueInDataSource = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_0__.getValueByValue)(res, field.value);
@@ -68477,7 +68571,7 @@ var $dataSource = function $dataSource(services, requestConfig, context) {
         dataSource: res,
         loading: false
       }, clearResult));
-      return requestConfig.onComplete == null ? void 0 : requestConfig.onComplete(res, field, context);
+      return requestConfig == null ? void 0 : requestConfig.onComplete == null ? void 0 : requestConfig.onComplete(res, field, context);
     })["catch"](function () {
       field.setState({
         loading: false
@@ -68873,6 +68967,7 @@ var schemaNameMap = [{
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "Lx": () => (/* binding */ mapDataSource),
 /* harmony export */   "OA": () => (/* binding */ mapStatus),
+/* harmony export */   "Q3": () => (/* binding */ initializeRequestExpression),
 /* harmony export */   "Ts": () => (/* binding */ getFieldName),
 /* harmony export */   "UT": () => (/* binding */ mergeArrayValue),
 /* harmony export */   "Uk": () => (/* binding */ mapSchemaName),
@@ -68883,6 +68978,10 @@ var schemaNameMap = [{
 /* harmony import */ var _teamix_formily__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(59953);
 /* harmony import */ var _teamix_utils__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(80653);
 /* harmony import */ var _schemaNameMap__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(7716);
+var _excluded = ["customRequest"];
+
+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."); }
@@ -68901,13 +69000,13 @@ function _extends() { _extends = Object.assign || function (target) { for (var i
 
 
 
+
 /**
  * 映射字段size，主要是default转medium
  * @param props component的props
  * @param field 当前字段实例
  * @returns 映射后的字段属性
  */
-
 var mapSize = function mapSize(props, field) {
   var layout = _extends({}, (0,_teamix_formily__WEBPACK_IMPORTED_MODULE_1__.useFormShallowLayout)(), (0,_teamix_formily__WEBPACK_IMPORTED_MODULE_1__.useFormLayout)());
 
@@ -69059,6 +69158,46 @@ 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 ((0,_teamix_utils__WEBPACK_IMPORTED_MODULE_2__.isPlainObj)(config)) {
+    var _ref2 = config,
+        customRequest = _ref2.customRequest,
+        requestConfig = _objectWithoutPropertiesLoose(_ref2, _excluded);
+
+    var requestConfigName = "$requestConfig_" + suffix;
+
+    if ((0,_teamix_utils__WEBPACK_IMPORTED_MODULE_2__.isFn)(customRequest)) {
+      var _scope;
+
+      // 自定义请求方法 customRequest
+      var customRequestName = "$customRequest_" + suffix;
+      schema = {
+        expression: "{{" + mode + "(" + customRequestName + ",context," + requestConfigName + ")}}",
+        scope: (_scope = {}, _scope[customRequestName] = customRequest, _scope[requestConfigName] = requestConfig, _scope)
+      };
+    } else {
+      var _scope2;
+
+      // pro 通用数据请求 $request
+      schema = {
+        expression: "{{" + mode + "($request,context," + requestConfigName + ")}}",
+        scope: (_scope2 = {}, _scope2[requestConfigName] = requestConfig, _scope2)
+      };
+    }
+  }
+
+  return schema;
+};
 
 
 
@@ -69300,7 +69439,7 @@ _teamix_icon__WEBPACK_IMPORTED_MODULE_15__/* ["default"].setConfig */ .Z.setConf
  // export * from './sidebar';
 
 
-var version = '1.3.14';
+var version = '1.3.15';
 
 
 /***/ }),
@@ -79654,6 +79793,8 @@ __webpack_require__.r(__webpack_exports__);
 
  // 常用数据处理
 
+ // DOM 操作
+
 
 function baseClass(perfix) {
   return function () {