@teamix/pro 1.3.12 → 1.3.15

package/lib/form/Filter/index.js

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

package/lib/form/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,7 +133,7 @@ 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支持断点下的属性更新
 
@@ -114,6 +154,7 @@ 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) {
@@ -157,12 +198,17 @@ 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);
 });
+
+ProForm.Field = function () {
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
+};
+
 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,97 @@
+"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 field.reduce(function (prev, curr, index) {
+    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）
+
+
+    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);
+
+    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;
+  }, []);
+};
+/**
+ * 获取 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 : []).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 属性 ）
+
+  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
   };
 };