@teamix/pro 1.3.13 → 1.3.16

package/lib/form/Filter/useBindUrl.js

@@ -0,0 +1,129 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _hooks = require("@teamix/hooks");
+
+var _utils = require("@teamix/utils");
+
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+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; }
+
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+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; }
+
+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 _default = function _default(bindUrl, functions, formRef) {
+  // 预处理 bindUrl 参数（主要兼容 SelectGroup 组件）
+  var initializeBindUrl = function initializeBindUrl(options) {
+    return options ? _objectSpread(_objectSpread({}, options), {}, {
+      beforeStringify: function beforeStringify(values) {
+        var _Object$entries;
+
+        var beforeStringify = options.beforeStringify;
+
+        var newValues = _objectSpread({}, values);
+
+        (_Object$entries = Object.entries(values)) === null || _Object$entries === void 0 ? void 0 : _Object$entries.forEach(function (_ref) {
+          var _form$query;
+
+          var _ref2 = _slicedToArray(_ref, 2),
+              key = _ref2[0],
+              value = _ref2[1];
+
+          var form = formRef.current;
+          var field = (_form$query = form.query(key)) === null || _form$query === void 0 ? void 0 : _form$query.take();
+
+          if ((field === null || field === void 0 ? void 0 : field.component[0]) === 'SelectGroup') {
+            newValues[key] = value.map(function (_ref3) {
+              var key = _ref3.key,
+                  value = _ref3.value;
+              return key && value ? "".concat(key, "||").concat(value === null || value === void 0 ? void 0 : value.join('|')) : '';
+            });
+          }
+        });
+        return beforeStringify ? beforeStringify(newValues) : newValues;
+      }
+    }) : options;
+  }; // 通过 useUrlState 获取 url 上的参数和 url 配置方法
+
+
+  var _useUrlState = (0, _hooks.useUrlState)(undefined, initializeBindUrl(bindUrl)),
+      _useUrlState2 = _slicedToArray(_useUrlState, 2),
+      urlState = _useUrlState2[0],
+      setUrlState = _useUrlState2[1]; // 输出配置url参数的函数
+
+
+  var initializedFunctions = Object.entries(functions).reduce(function (prev, _ref4) {
+    var _ref5 = _slicedToArray(_ref4, 2),
+        key = _ref5[0],
+        fun = _ref5[1];
+
+    prev[key] = function (values) {
+      fun === null || fun === void 0 ? void 0 : fun(values);
+      setUrlState(values);
+    };
+
+    return prev;
+  }, {}); // 使用 url 参数配置 QueryFilter 默认值（移除非表单值，兼容数组数据，兼容 SelectGroup 组件）
+
+  var setValuesByUrlState = function setValuesByUrlState(form) {
+    if (urlState) {
+      var _Object$entries2;
+
+      (_Object$entries2 = Object.entries(urlState)) === null || _Object$entries2 === void 0 ? void 0 : _Object$entries2.forEach(function (_ref6) {
+        var _form$query2;
+
+        var _ref7 = _slicedToArray(_ref6, 2),
+            key = _ref7[0],
+            value = _ref7[1];
+
+        var field = (_form$query2 = form.query(key)) === null || _form$query2 === void 0 ? void 0 : _form$query2.take();
+
+        if (field) {
+          var newValue = value;
+
+          if (field.displayName === 'ArrayField') {
+            newValue = [].concat((0, _utils.isUsable)(newValue) ? newValue : []);
+          }
+
+          if (field.component[0] === 'SelectGroup') {
+            newValue = newValue.map(function (item) {
+              var _item$split = item === null || item === void 0 ? void 0 : item.split('||'),
+                  _item$split2 = _slicedToArray(_item$split, 2),
+                  key = _item$split2[0],
+                  value = _item$split2[1];
+
+              return {
+                key: key,
+                value: value === null || value === void 0 ? void 0 : value.split('|')
+              };
+            });
+          }
+
+          form.setValuesIn(key, newValue);
+        }
+      });
+    }
+  };
+
+  return _objectSpread({
+    setValuesByUrlState: setValuesByUrlState
+  }, initializedFunctions);
+};
+
+exports.default = _default;

package/lib/form/ProForm/index.d.ts

@@ -1,5 +1,4 @@
-import React from 'react';
-import type { ProFormProps } from '../typing';
+import type { ComposedProForm } from '../typing';
 import './index.scss';
-declare const ProForm: React.FC<ProFormProps>;
+declare const ProForm: ComposedProForm;
 export default ProForm;

package/lib/form/ProForm/index.js

@@ -11,13 +11,25 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
+var _utils = require("@teamix/utils");
+
 var _core = require("@formily/core");
 
 var _reactive = require("@formily/reactive");
 
 var _formily = require("@teamix/formily");
 
-var _utils = require("@teamix/utils");
+var _components = require("@alicloudfe/components");
+
+var _ProField = _interopRequireDefault(require("../Components/ProField"));
+
+var _Editable = require("../Components/Editable");
+
+var _FormGroup = _interopRequireDefault(require("../Components/FormGroup"));
+
+var _LightFilter = _interopRequireDefault(require("../Components/LightFilter"));
+
+var _index = _interopRequireDefault(require("../Components/Text/index"));
 
 var _SchemaForm = _interopRequireDefault(require("../SchemaForm"));
 
@@ -27,11 +39,13 @@ var _useAutoSubmit = _interopRequireDefault(require("./useAutoSubmit"));
 
 var _useInitialRequest = _interopRequireDefault(require("./useInitialRequest"));
 
+var _useFieldSchema = _interopRequireDefault(require("./useFieldSchema"));
+
 var _validate = _interopRequireDefault(require("../locales/validate"));
 
 require("./index.scss");
 
-var _excluded = ["form", "initialValues", "initialRequest", "schema", "scope", "context", "components", "children", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol", "breakpoints", "onChange", "onChangeType", "onSubmit", "onSubmitFailed", "onInitialComplete", "className", "validateFirst"];
+var _excluded = ["form", "initialValues", "initialRequest", "scope", "context", "components", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol", "breakpoints", "onChange", "onChangeType", "onSubmit", "onSubmitFailed", "onInitialComplete", "className", "validateFirst"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -50,15 +64,41 @@ 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; }
 
 (0, _core.registerValidateLocale)(_validate.default);
+var formilyComponents = {
+  FormLayout: _formily.FormLayout,
+  FormItem: _formily.FormItem,
+  ArrayCollapse: _formily.ArrayCollapse,
+  ArrayCards: _formily.ArrayCards,
+  ArrayItems: _formily.ArrayItems,
+  ArrayTable: _formily.ArrayTable,
+  Space: _formily.Space,
+  FormGrid: _formily.FormGrid,
+  FormTab: _formily.FormTab,
+  FormCollapse: _formily.FormCollapse,
+  FormStep: _formily.FormStep,
+  Editable: _formily.Editable,
+  FormDialogFooter: _formily.FormDialog.Footer,
+  FormDrawerFooter: _formily.FormDrawer.Footer,
+  FormButtonGroup: _formily.FormButtonGroup,
+  Submit: _formily.Submit,
+  Reset: _formily.Reset,
+  EditableDialog: _Editable.EditableDialog,
+  EditableDrawer: _Editable.EditableDrawer,
+  EditablePopover: _Editable.EditablePopover,
+  FormGroup: _FormGroup.default,
+  Upload: _formily.Upload,
+  SelectTable: _formily.SelectTable,
+  Affix: _components.Affix,
+  LightFilter: _LightFilter.default,
+  Text: _index.default
+};
 var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
   var outerForm = _ref.form,
       initialValues = _ref.initialValues,
       initialRequest = _ref.initialRequest,
-      schema = _ref.schema,
       scope = _ref.scope,
       context = _ref.context,
       components = _ref.components,
-      children = _ref.children,
       layout = _ref.layout,
       labelAlign = _ref.labelAlign,
       wrapperAlign = _ref.wrapperAlign,
@@ -93,9 +133,9 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
   }); // context需要实名不能解构
 
 
-  var mergedComponents = _objectSpread(_objectSpread({}, globalComponents), components);
+  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 ? {
@@ -114,12 +154,13 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       wrapperCol: (0, _utils2.mergeArrayValue)([24], wrapperCol)
     };
   }, [breakpoints, layout, labelAlign, wrapperAlign, labelCol, wrapperCol]);
+  var schema = (0, _useFieldSchema.default)(otherProps);
   (0, _react.useMemo)(function () {
     // 配置表单默认值
     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);
@@ -157,12 +198,19 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
     form: form,
     onAutoSubmit: onAutoSubmit,
     onAutoSubmitFailed: onSubmitFailed
-  }), /*#__PURE__*/_react.default.createElement(_SchemaForm.default, {
+  }), schema ? /*#__PURE__*/_react.default.createElement(_SchemaForm.default, {
     schema: schema,
     scope: mergedScope,
     components: mergedComponents
-  }), children);
+  }) : null, otherProps === null || otherProps === void 0 ? void 0 : otherProps.children);
 });
+
+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/index.scss

@@ -317,6 +317,13 @@
   }
 }
 
+// SelectTable
+.#{$teamix-pro-form}-select-table-column-tree
+  > .#{$css-prefix}table-cell-wrapper {
+  display: flex;
+  align-items: center;
+}
+
 /* hack todo remove */
 .#{$form-item-cls}-control-content-component {
   .#{$teamix-pro-field}-tooltip.#{$teamix-pro-field}-checkbox {

package/lib/form/ProForm/useFieldSchema.d.ts

@@ -0,0 +1,7 @@
+declare const _default: ({ children, schema }: any) => any;
+/**
+ * 获取 ProForm 的 schema 配置，通过合并 Field 字段 或者 schema 配置
+ * @param props ProForm 组件的 props
+ * @returns schema 配置
+ */
+export default _default;

package/lib/form/ProForm/useFieldSchema.js

@@ -0,0 +1,118 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _utils = require("@teamix/utils");
+
+var _excluded = ["id", "children", "reactions"],
+    _excluded2 = ["id", "children", "reactions"];
+
+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; }
+
+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; }
+
+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; }
+
+/**
+ * 合并 Field 字段 props 和 ProForm schema 配置，生成完整的 Field 字段 schema
+ * @param field Field 字段
+ * @param extra 额外的 schema 配置（存在递归，可能是子级 schema ）
+ * @param wholeExtra 完整的额外 schema 配置
+ * @returns schema 配置
+ */
+var getMergedSchema = function getMergedSchema(field, extra, wholeExtra) {
+  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);
+
+    var displayName = curr === null || curr === void 0 ? void 0 : (_curr$type = curr.type) === null || _curr$type === void 0 ? void 0 : _curr$type.displayName; // 自定义组件
+
+    var type = curr === null || curr === void 0 ? void 0 : curr.type; // 基本Dom元素
+
+    if (displayName === 'ProFormField') {
+      // 获取字段额外的 schema 配置（From ProForm）
+      var extraFieldProps = extra[index] || {};
+
+      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) : []
+      });
+    }
+
+    return prev;
+  }, []);
+};
+/**
+ * 获取 ProForm 的 schema 配置，通过合并 Field 字段 或者 schema 配置
+ * @param props ProForm 组件的 props
+ * @returns schema 配置
+ */
+
+
+var _default = function _default(_ref3) {
+  var children = _ref3.children,
+      schema = _ref3.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 : []);
+  } // 正常使用 ProForm 的 schema 渲染表单
+
+
+  return schema;
+};
+
+exports.default = _default;

package/lib/form/SchemaForm/index.js

@@ -11,20 +11,6 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _react2 = require("@formily/react");
 
-var _components = require("@alicloudfe/components");
-
-var _formily = require("@teamix/formily");
-
-var _ProField = _interopRequireDefault(require("../Components/ProField"));
-
-var _Editable = require("../Components/Editable");
-
-var _FormGroup = _interopRequireDefault(require("../Components/FormGroup"));
-
-var _LightFilter = _interopRequireDefault(require("../Components/LightFilter"));
-
-var _index = _interopRequireDefault(require("../Components/Text/index"));
-
 var _adapterType = _interopRequireDefault(require("./adapterType"));
 
 var _adapterComponent = _interopRequireDefault(require("./adapterComponent"));
@@ -109,39 +95,10 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
   var schema = _ref.schema,
       scope = _ref.scope,
       components = _ref.components;
-  var schemaScopeRef = (0, _react.useRef)({}); // 创建 SchemaField，添加内置组件
+  var schemaScopeRef = (0, _react.useRef)({}); // 创建 SchemaField
 
   var SchemaField = (0, _react.useMemo)(function () {
-    return (0, _react2.createSchemaField)({
-      components: _objectSpread(_objectSpread({}, _ProField.default), {}, {
-        FormLayout: _formily.FormLayout,
-        FormItem: _formily.FormItem,
-        ArrayCollapse: _formily.ArrayCollapse,
-        ArrayCards: _formily.ArrayCards,
-        ArrayItems: _formily.ArrayItems,
-        ArrayTable: _formily.ArrayTable,
-        Space: _formily.Space,
-        FormGrid: _formily.FormGrid,
-        FormTab: _formily.FormTab,
-        FormCollapse: _formily.FormCollapse,
-        FormStep: _formily.FormStep,
-        Editable: _formily.Editable,
-        FormDialogFooter: _formily.FormDialog.Footer,
-        FormDrawerFooter: _formily.FormDrawer.Footer,
-        FormButtonGroup: _formily.FormButtonGroup,
-        Submit: _formily.Submit,
-        Reset: _formily.Reset,
-        EditableDialog: _Editable.EditableDialog,
-        EditableDrawer: _Editable.EditableDrawer,
-        EditablePopover: _Editable.EditablePopover,
-        FormGroup: _FormGroup.default,
-        Upload: _formily.Upload,
-        SelectTable: _formily.SelectTable,
-        Affix: _components.Affix,
-        LightFilter: _LightFilter.default,
-        Text: _index.default
-      })
-    });
+    return (0, _react2.createSchemaField)();
   }, []); // 格式化 schema
 
   var formatSchema = (0, _react.useCallback)(function (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;
         };