@teamix/pro 1.3.14 → 1.3.17

package/lib/form/ProForm/index.js

@@ -135,7 +135,7 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
 
   var mergedComponents = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, globalComponents), components), formilyComponents), _ProField.default);
 
-  var onAutoSubmit = (0, _useAutoSubmit.default)(onSubmit); // todo 需要formily支持断点下的属性更新
+  var onAutoSubmit = (0, _useAutoSubmit.default)(onSubmit, context); // todo 需要formily支持断点下的属性更新
 
   var getTeamixLayout = (0, _react.useMemo)(function () {
     return breakpoints ? {
@@ -160,7 +160,7 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
     if (initialValues) {
       form.setInitialValues(initialValues);
     } else if (initialRequest) {
-      (0, _useInitialRequest.default)(initialRequest).then(function (values) {
+      (0, _useInitialRequest.default)(initialRequest, context).then(function (values) {
         form.setInitialValues(values);
       }).finally(function () {
         onInitialComplete === null || onInitialComplete === void 0 ? void 0 : onInitialComplete(form);
@@ -205,10 +205,12 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
   }) : null, otherProps === null || otherProps === void 0 ? void 0 : otherProps.children);
 });
 
-ProForm.Field = function () {
+var Field = function Field() {
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
 };
 
+Field.displayName = 'ProFormField';
+ProForm.Field = Field;
 ProForm.defaultProps = {
   colon: false,
   labelAlign: 'left',

package/lib/form/ProForm/useFieldSchema.js

@@ -28,45 +28,70 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
  * @returns schema 配置
  */
 var getMergedSchema = function getMergedSchema(field, extra, wholeExtra) {
-  return field.reduce(function (prev, curr, index) {
+  return [].concat(field).reduce(function (prev, curr, index) {
+    var _curr$type;
+
     var _ref = curr.props || {},
         id = _ref.id,
         _ref$children = _ref.children,
         children = _ref$children === void 0 ? [] : _ref$children,
         _ref$reactions = _ref.reactions,
         reactions = _ref$reactions === void 0 ? [] : _ref$reactions,
-        rest = _objectWithoutProperties(_ref, _excluded); // 获取字段额外的 schema 配置（From ProForm）
+        rest = _objectWithoutProperties(_ref, _excluded);
 
+    var displayName = curr === null || curr === void 0 ? void 0 : (_curr$type = curr.type) === null || _curr$type === void 0 ? void 0 : _curr$type.displayName; // 自定义组件
 
-    var extraFieldProps = extra[index] || {};
+    var type = curr === null || curr === void 0 ? void 0 : curr.type; // 基本Dom元素
 
-    if (id !== extraFieldProps.id) {
-      // 索引不匹配，通过 id 查找获取
-      extraFieldProps = (0, _utils.getValueByValue)(extra, id, {
-        inputKey: 'id',
-        outputKey: '__whole__'
-      }) || (0, _utils.getValueByValue)(wholeExtra, id, {
-        inputKey: 'id',
-        outputKey: '__whole__'
-      });
+    if (displayName === 'ProFormField') {
+      // 获取字段额外的 schema 配置（From ProForm）
+      var extraFieldProps = extra[index] || {};
 
-      if (extraFieldProps) {
-        console.warn("Field id \"".concat(id, "\" is not found by index in ProForm schema props, Please pay attention to the order."));
+      if (id !== extraFieldProps.id) {
+        // 索引不匹配，通过 id 查找获取
+        extraFieldProps = (0, _utils.getValueByValue)(extra, id, {
+          inputKey: 'id',
+          outputKey: '__whole__'
+        }) || (0, _utils.getValueByValue)(wholeExtra, id, {
+          inputKey: 'id',
+          outputKey: '__whole__'
+        });
+
+        if (extraFieldProps) {
+          console.warn("Field id \"".concat(id, "\" is not found by index in ProForm schema props, Please pay attention to the order."));
+        }
       }
+
+      var _ref2 = extraFieldProps || {},
+          extraId = _ref2.id,
+          _ref2$children = _ref2.children,
+          extraChildren = _ref2$children === void 0 ? [] : _ref2$children,
+          _ref2$reactions = _ref2.reactions,
+          extraReactions = _ref2$reactions === void 0 ? [] : _ref2$reactions,
+          extraRest = _objectWithoutProperties(_ref2, _excluded2);
+
+      var mergedReactions = [].concat(reactions, extraReactions);
+      var mergedChildren = children ? getMergedSchema(children, extraChildren, wholeExtra) : [];
+      prev.push(_objectSpread(_objectSpread(_objectSpread({}, (0, _utils.deepMerge)(rest, extraRest)), mergedReactions.length && {
+        reactions: mergedReactions
+      }), mergedChildren.length && {
+        children: mergedChildren
+      }));
+    } else if ((0, _utils.isStr)(type)) {
+      prev.push({
+        component: type,
+        props: curr.props
+      });
+    } else if ((0, _utils.isStr)(displayName)) {
+      prev.push({
+        decorator: displayName,
+        decoratorProps: _objectSpread({
+          id: id
+        }, rest),
+        children: children ? getMergedSchema(children, [], wholeExtra) : []
+      });
     }
 
-    var _ref2 = extraFieldProps || {},
-        extraId = _ref2.id,
-        _ref2$children = _ref2.children,
-        extraChildren = _ref2$children === void 0 ? [] : _ref2$children,
-        _ref2$reactions = _ref2.reactions,
-        extraReactions = _ref2$reactions === void 0 ? [] : _ref2$reactions,
-        extraRest = _objectWithoutProperties(_ref2, _excluded2);
-
-    prev.push(_objectSpread(_objectSpread({}, (0, _utils.deepMerge)(rest, extraRest)), {}, {
-      reactions: [].concat(reactions, extraReactions),
-      children: (children === null || children === void 0 ? void 0 : children.length) ? getMergedSchema(children, extraChildren, wholeExtra) : []
-    }));
     return prev;
   }, []);
 };
@@ -80,11 +105,7 @@ var getMergedSchema = function getMergedSchema(field, extra, wholeExtra) {
 var _default = function _default(_ref3) {
   var children = _ref3.children,
       schema = _ref3.schema;
-  var field = [].concat(children !== null && children !== void 0 ? children : []).filter(function (item) {
-    var _item$type, _item$props;
-
-    return (item === null || item === void 0 ? void 0 : (_item$type = item.type) === null || _item$type === void 0 ? void 0 : _item$type.name) === '' && (item === null || item === void 0 ? void 0 : (_item$props = item.props) === null || _item$props === void 0 ? void 0 : _item$props.component);
-  }); // 如果 ProForm 的 children 含有 Field 字段，则优先使用 Field 渲染表单（仅合并 ProForm 的 schema 属性 ）
+  var field = [].concat(children !== null && children !== void 0 ? children : []); // 如果 ProForm 的 children 含有 Field 字段，则优先使用 Field 渲染表单（仅合并 ProForm 的 schema 属性 ）
 
   if (field.length) {
     return getMergedSchema(field, schema !== null && schema !== void 0 ? schema : [], schema !== null && schema !== void 0 ? schema : []);

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 };

package/lib/form/SchemaForm/reactions.js

@@ -7,7 +7,7 @@ exports.$validator = exports.$request = exports.$dataSource = exports.$common =
 
 var _utils = require("@teamix/utils");
 
-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; }
 
@@ -20,26 +20,28 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 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 $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 = (0, _utils.isFn)(beforeRequest) ? beforeRequest(field, context) : {};
-  /**
-   * 主动触发的请求刷新
-   */
-  // 触发所有配置的请求
+  var beforeRequestResult = (0, _utils.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 = (0, _utils.isPlainObj)(refresh) ? refresh : {};
+  var refreshResult = (0, _utils.isPlainObj)(refresh) ? refresh : {}; // 合并请求参数
+
+  var mergedParams = _objectSpread(_objectSpread(_objectSpread({}, params), beforeRequestResult), refreshResult); // 执行通用数据请求
+
+
   return (0, _utils.doCommonRequest)(_objectSpread(_objectSpread({}, requestConfig), {}, {
-    params: _objectSpread(_objectSpread(_objectSpread({}, params), beforeRequestResult), refreshResult),
+    params: mergedParams,
     beforeRequest: function beforeRequest() {
       return beforeRequestResult;
     },
@@ -49,18 +51,21 @@ var $request = function $request(field, _ref, context, type) {
     onSuccess: (0, _utils.isFn)(onSuccess) ? function (res) {
       return onSuccess(res, field, context);
     } : onSuccess
-  }), context);
+  }), _objectSpread(_objectSpread({}, context), {}, {
+    field: field,
+    params: mergedParams
+  }));
 }; // 通用请求配置上下文
 
 
 exports.$request = $request;
 
-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);
     });
   };
 }; // 配置校验
@@ -68,13 +73,15 @@ var $common = function $common(services, requestConfig, context) {
 
 exports.$common = $common;
 
-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
@@ -82,13 +89,13 @@ var $validator = function $validator(services, requestConfig, context) {
 
 exports.$validator = $validator;
 
-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 = (0, _utils.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 ? {
@@ -98,7 +105,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/lib/form/typing.d.ts

@@ -1,7 +1,8 @@
 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 type { UrlStateOptions } from '@teamix/hooks';
 import React from 'react';
 interface AnyObject {
     [propName: string]: any;
@@ -18,12 +19,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 +69,7 @@ export interface ProFormProps extends IFormLayoutProps {
     };
     children?: React.ReactNode;
     initialValues?: AnyObject;
-    initialRequest?: ProFormRequestConfig;
+    initialRequest?: ProFormCommonRequestConfig;
     previewTextPlaceholder?: ReactNode;
     validateFirst?: boolean;
     onChangeType?: 'form';
@@ -120,8 +125,10 @@ export interface QueryFilterProps extends ProFormProps {
     formRef?: React.MutableRefObject<any>;
     /** onChange事件的防抖时间 */
     filterDebounce?: number;
+    /** 绑定URL参数 */
+    bindUrl?: boolean | UrlStateOptions;
     /** 表单初始化（含异步默认值）后回调函数 */
-    onInit?: (values: any) => boolean;
+    onInit?: (values: any) => void;
     /** 表单筛选回调函数 */
     onFilter?: (values: any) => void;
     /** 表单重置回调函数 */

package/lib/form/utils.d.ts

@@ -37,4 +37,19 @@ 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) => {
+    expression: string;
+    scope: {
+        [x: string]: object;
+    };
+} | {
+    expression?: undefined;
+    scope?: undefined;
+};
+export { mapSize, mapStatus, mapDataSource, mapMode, mergeArrayValue, getFieldName, mapSchemaName, initializeRequestExpression, };

package/lib/form/utils.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.mergeArrayValue = exports.mapStatus = exports.mapSize = exports.mapSchemaName = exports.mapMode = exports.mapDataSource = exports.getFieldName = void 0;
+exports.mergeArrayValue = exports.mapStatus = exports.mapSize = exports.mapSchemaName = exports.mapMode = exports.mapDataSource = exports.initializeRequestExpression = exports.getFieldName = void 0;
 
 var _core = require("@formily/core");
 
@@ -201,5 +201,26 @@ var mergeArrayValue = function mergeArrayValue(arr, v) {
 
   return [].concat(_toConsumableArray(arr), [v]);
 };
+/**
+ * 初始化请求配置为表达式
+ * @param config 请求配置
+ * @param suffix scope名称后缀
+ * @returns 表达式和scope上下文
+ */
+
+
+exports.mergeArrayValue = mergeArrayValue;
+
+var initializeRequestExpression = function initializeRequestExpression(config, mode, suffix) {
+  if ((0, _utils.isPlainObj)(config)) {
+    var requestConfigName = "$requestConfig_".concat(suffix);
+    return {
+      expression: "{{".concat(mode, "($request,context,").concat(requestConfigName, ")}}"),
+      scope: _defineProperty({}, requestConfigName, config)
+    };
+  }
+
+  return {};
+};
 
-exports.mergeArrayValue = mergeArrayValue;
+exports.initializeRequestExpression = initializeRequestExpression;

package/lib/global.scss

@@ -0,0 +1,45 @@
+// transition 切换主题优化，暂时先写到 pro 里，后面加到基础组件里
+
+// table 行背景色
+tr.next-table-row{
+  transition: color 0s;
+}
+
+// normal 按钮
+button.next-btn.next-medium.next-btn-normal {
+  transition: color 0s;
+}
+
+// input 背景色
+.next-input.next-medium {
+  transition: color 0s;
+}
+
+// radio 背景色
+.next-radio-wrapper.checked .next-radio-inner:after {
+  transition: color 0s;
+}
+
+.next-radio-wrapper .next-radio-inner {
+  transition: color 0s;
+}
+
+// checkbox 背景色
+.next-checkbox-wrapper .next-checkbox-inner {
+  transition: color 0s;
+}
+
+// 侧导背景色
+.next-menu-item.next-nav-item {
+  transition: color 0s;
+}
+
+// 标签背景色
+.next-tag {
+  transition: color 0s;
+}
+
+// 可关闭tag
+.next-tag.next-tag.next-tag.next-tag-closable.next-tag-level-normal.next-tag-closable {
+  transition: color 0s;
+}