@teamix/pro 1.3.0 → 1.3.3

package/lib/actions/dialog-form.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { ProFormProps, ProFormSchema } from '../form';
+import { ProFormProps, ProFormSchema, ProFormType } from '../form';
 import { RequestAction } from './request';
 import { DialogAction } from './dialog';
 export interface DialogFormAction extends DialogAction {
@@ -12,9 +12,14 @@ export interface DialogFormAction extends DialogAction {
     /**
      * @deprecated 建议使用 schema 配置 ProFormProps 代替
      */
-    formProps?: Omit<ProFormProps, 'schema'>;
-    /** 同时支持两种配置方式，如果想完整定制表单，可使用完整的表单配置项 ProFormProps，否则可以只配置 ProFormSchema */
-    schema: ProFormSchema | ProFormProps;
+    formProps?: Omit<ProFormProps, 'schema' | 'form'>;
+    /** 同时支持两种配置方式:
+     * 如果想完整定制表单，可使用完整的表单配置项 ProFormProps，但不可以传 form 字段，可以通过 formRef 获取内部 form 实例。
+     * 否则可以只配置 ProFormSchema
+     */
+    schema: ProFormSchema | Omit<ProFormProps, 'form'>;
+    /** 外部传来的 formRef，用于获取内置 form 实例 */
+    formRef?: React.MutableRefObject<ProFormType | undefined>;
 }
 export declare function useDialogFormAction(action: DialogFormAction, context?: any): {
     [x: string]: (e: React.MouseEvent<HTMLElement, MouseEvent>) => Promise<void>;

package/lib/actions/dialog-form.js

@@ -23,7 +23,7 @@ var _dialog = _interopRequireDefault(require("./dialog"));
 var _utils2 = require("./utils");
 
 var _excluded = ["schema"],
-    _excluded2 = ["schema", "useFieldValuesForRequest", "initialValues", "initialRequest", "formProps", "size", "onFinish", "beforeRequest"];
+    _excluded2 = ["schema", "useFieldValuesForRequest", "initialValues", "initialRequest", "formProps", "size", "onFinish", "beforeRequest", "formRef"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -110,7 +110,8 @@ var DialogForm = function DialogForm(props) {
       schema = props.schema,
       formProps = props.formProps,
       context = props.context,
-      formRef = props.formRef;
+      formRef = props.formRef,
+      innerFormRef = props.innerFormRef;
 
   var _getSchemaAndFormProp = getSchemaAndFormProps(schema, formProps),
       formSchema = _getSchemaAndFormProp.schema,
@@ -127,7 +128,11 @@ var DialogForm = function DialogForm(props) {
 
   var history = (0, _reactRouterDom.useHistory)();
   (0, _react.useEffect)(function () {
-    formRef.current = form;
+    if (formRef) {
+      formRef.current = form;
+    }
+
+    innerFormRef.current = form;
 
     if (initialRequest) {
       setLoading(true);
@@ -162,9 +167,10 @@ function useDialogFormAction(action, context) {
       size = _action$size === void 0 ? 'small' : _action$size,
       _onFinish = action.onFinish,
       propsBeforeRequest = action.beforeRequest,
+      propsFormRef = action.formRef,
       others = _objectWithoutProperties(action, _excluded2);
 
-  var formRef = /*#__PURE__*/(0, _react.createRef)();
+  var innerFormRef = /*#__PURE__*/(0, _react.createRef)();
   return (0, _dialog.default)(Object.assign({
     size: size,
     closeable: true,
@@ -178,13 +184,14 @@ function useDialogFormAction(action, context) {
         context: contentContext
       };
       return /*#__PURE__*/_react.default.createElement(DialogForm, _objectSpread({
-        formRef: formRef
+        innerFormRef: innerFormRef,
+        formRef: propsFormRef
       }, dialogFormProps));
     },
     extendParams: useFieldValuesForRequest ? '{{fields}}' : undefined,
     beforeRequest: function beforeRequest(context) {
       return new Promise(function (resolve, reject) {
-        formRef.current.validate().then( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+        innerFormRef.current.validate().then( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
           var beforeRequestContext, requestContext;
           return regeneratorRuntime.wrap(function _callee$(_context) {
             while (1) {
@@ -220,7 +227,7 @@ function useDialogFormAction(action, context) {
 
                 case 13:
                   requestContext = Object.assign({
-                    fields: formRef.current.values
+                    fields: innerFormRef.current.values
                   }, _typeof(beforeRequestContext) === 'object' ? beforeRequestContext : {});
                   resolve(requestContext);
 
@@ -236,9 +243,9 @@ function useDialogFormAction(action, context) {
       });
     },
     onFinish: function onFinish() {
-      var _formRef$current;
+      var _innerFormRef$current;
 
-      _onFinish && _onFinish((_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.values);
+      _onFinish && _onFinish((_innerFormRef$current = innerFormRef.current) === null || _innerFormRef$current === void 0 ? void 0 : _innerFormRef$current.values);
     }
   }, others), context);
 }

package/lib/form/Components/LightFilter/index.d.ts

@@ -8,6 +8,7 @@ import './index.scss';
 interface ILightFiter {
     size?: 'small' | 'medium' | 'large';
     defaultFilterValue?: string;
+    filterValues?: string[];
     onFilterChange?: (schema?: any) => any;
     filterProps?: SelectProps;
     buttonProps?: ButtonProps;

package/lib/form/Components/LightFilter/index.js

@@ -78,14 +78,16 @@ var useMain = function useMain(active) {
 }; // 筛选项数据
 
 
-var useFilterItems = function useFilterItems() {
+var useFilterItems = function useFilterItems(filterValues) {
   var schema = (0, _react2.useFieldSchema)();
   var filterItems = [];
   schema.mapProperties(function (schema, name) {
-    filterItems.push({
-      label: schema.title,
-      value: schema.name
-    });
+    if (!filterValues || filterValues && filterValues.includes(schema.name)) {
+      filterItems.push({
+        label: schema.title,
+        value: schema.name
+      });
+    }
   });
   return filterItems;
 }; // 是否输入框类型的组件
@@ -99,12 +101,13 @@ var isInputCategory = function isInputCategory(currentSchema) {
 var LightFilter = (0, _react2.observer)(function (props) {
   var _filterItems$, _main$;
 
-  var filterItems = useFilterItems();
   var size = props.size,
       defaultFilterValue = props.defaultFilterValue,
+      filterValues = props.filterValues,
       onFilterChange = props.onFilterChange,
       filterProps = props.filterProps,
       buttonProps = props.buttonProps;
+  var filterItems = useFilterItems(filterValues);
 
   var _useState = (0, _react.useState)(defaultFilterValue || ((_filterItems$ = filterItems[0]) === null || _filterItems$ === void 0 ? void 0 : _filterItems$.value)),
       _useState2 = _slicedToArray(_useState, 2),

package/lib/form/Components/ProField/mapDateFormat.d.ts

@@ -0,0 +1,3 @@
+import { GeneralField } from '@formily/core';
+declare const mapDateFormat: (props: any, field: GeneralField) => {};
+export default mapDateFormat;

package/lib/form/Components/ProField/mapDateFormat.js

@@ -0,0 +1,125 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _shared = require("@formily/shared");
+
+var _utils = require("@teamix/utils");
+
+var _moment = _interopRequireDefault(require("moment"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+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 moment = function moment(date, format) {
+  return (0, _moment.default)((date === null || date === void 0 ? void 0 : date.toDate) ? date.toDate() : date, format);
+};
+
+var momentable = function momentable(value, format) {
+  return Array.isArray(value) ? value.map(function (val) {
+    return moment(val, format);
+  }) : value ? moment(value, format) : value;
+};
+
+var formatMomentValue = function formatMomentValue(value, format, placeholder) {
+  var formatDate = function formatDate(date, format) {
+    var i = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
+    if (!date) return placeholder;
+
+    if ((0, _utils.isArr)(format)) {
+      var _format = format[i];
+
+      if ((0, _utils.isFn)(_format)) {
+        return _format(date);
+      }
+
+      if ((0, _shared.isEmpty)(_format)) {
+        return date;
+      }
+
+      return moment(date).format(_format);
+    } else {
+      if ((0, _utils.isFn)(format)) {
+        return format(date);
+      }
+
+      if ((0, _shared.isEmpty)(format)) {
+        return date;
+      }
+
+      return moment(date).format(format);
+    }
+  };
+
+  if ((0, _utils.isArr)(value)) {
+    return value.map(function (val, index) {
+      return formatDate(val, format, index);
+    });
+  } else {
+    return value ? formatDate(value, format) : value || placeholder;
+  }
+};
+
+var mapDateFormatDatePicker2 = function mapDateFormatDatePicker2(type) {
+  var getDefaultFormat = function getDefaultFormat(props) {
+    var _type = props['type'] || type;
+
+    if (_type === 'month') {
+      return 'YYYY-MM';
+    } else if (_type === 'quarter') {
+      return 'YYYY-\\QQ';
+    } else if (_type === 'year') {
+      return 'YYYY';
+    } else if (_type === 'week') {
+      return 'YYYY-wo';
+    }
+
+    return props['showTime'] ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD';
+  };
+
+  return function (props) {
+    var format = props['format'] || getDefaultFormat(props);
+    var _onChange = props.onChange;
+    return _objectSpread(_objectSpread({}, props), {}, {
+      format: format === 'YYYY-MM-DD HH:mm:ss' ? 'YYYY-MM-DD' : format,
+      value: momentable(props.value, format === 'YYYY-wo' ? 'YYYY-w' : format),
+      onChange: function onChange(value) {
+        if (_onChange) {
+          _onChange(formatMomentValue(value, format));
+        }
+      }
+    });
+  };
+};
+
+var mapDateFormat = function mapDateFormat(props, field) {
+  var _ref = field.component || [],
+      _ref2 = _slicedToArray(_ref, 1),
+      component = _ref2[0];
+
+  console.log(component);
+  return {};
+};
+
+var _default = mapDateFormat;
+exports.default = _default;

package/lib/form/Filter/LightFilter.js

@@ -15,7 +15,7 @@ var _utils = require("@teamix/utils");
 
 var _ProForm = _interopRequireDefault(require("../ProForm"));
 
-var _excluded = ["form", "schema", "onSubmit", "onChange", "defaultFilterValue", "activeFilterValueRef"];
+var _excluded = ["form", "schema", "onSubmit", "onChange", "defaultFilterValue", "filterValues", "activeFilterValueRef"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -44,6 +44,7 @@ var LightFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       onSubmit = props.onSubmit,
       onChange = props.onChange,
       defaultFilterValue = props.defaultFilterValue,
+      filterValues = props.filterValues,
       activeFilterValueRef = props.activeFilterValueRef,
       otherProps = _objectWithoutProperties(props, _excluded);
 
@@ -66,15 +67,24 @@ var LightFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
   }, [form]); // 实际输出onFilter
 
   var onFilter = (0, _react.useCallback)(function () {
+    var _Object$keys;
+
     var key = filterValue.current;
-    var value = form.values[key];
-    onChange === null || onChange === void 0 ? void 0 : onChange(_defineProperty({}, key, value));
+    var value = form.values[key]; // 删除旧值
+
+    (_Object$keys = Object.keys(form.values)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.forEach(function (item) {
+      if (item !== key) {
+        form.setValuesIn(item, undefined);
+      }
+    });
+    onChange === null || onChange === void 0 ? void 0 : onChange(_defineProperty({}, key, value), value, key);
   }, [onChange]);
   var LightSchema = (0, _react.useMemo)(function () {
     return [{
       component: 'LightFilter',
       props: {
         defaultFilterValue: defaultFilterValue,
+        filterValues: filterValues,
         onFilterChange: onFilterChange,
         buttonProps: {
           onClick: onFilter

package/lib/form/Filter/SimpleFilter.js

@@ -103,7 +103,7 @@ var SimpleFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     } else {
       onChange === null || onChange === void 0 ? void 0 : onChange(values, name, value);
     }
-  }, [searchName, searchValue.current]);
+  }, [onChange, searchName, searchValue.current]);
   (0, _react.useEffect)(function () {
     var _props$form$initialVa, _props$form$initialVa2;
 

package/lib/form/Filter/index.js

@@ -45,7 +45,7 @@ var _useSpecialProps2 = _interopRequireDefault(require("./useSpecialProps"));
 
 require("./index.scss");
 
-var _excluded = ["addonAfter", "addonBefore", "mode", "purePanel", "expand", "formRef", "defaultFilterValue", "filterDebounce", "onFilter", "onInit", "onReset", "onExpand"];
+var _excluded = ["addonAfter", "addonBefore", "mode", "purePanel", "expand", "formRef", "defaultFilterValue", "filterValues", "filterDebounce", "onFilter", "onInit", "onReset", "onExpand", "onChange"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -98,11 +98,13 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       expand = props.expand,
       formRef = props.formRef,
       defaultFilterValue = props.defaultFilterValue,
+      filterValues = props.filterValues,
       filterDebounce = props.filterDebounce,
       onFilter = props.onFilter,
       onInit = props.onInit,
       onReset = props.onReset,
       onExpand = props.onExpand,
+      onChange = props.onChange,
       otherProps = _objectWithoutProperties(props, _excluded);
 
   var _useSpecialProps = (0, _useSpecialProps2.default)(props),
@@ -188,6 +190,7 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       if (!formRef.current.updateTags) {
         formRef.current.updateTags = function () {
           configFilterItem(form);
+          configTag();
         };
       }
     }
@@ -363,7 +366,13 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     return function (_x) {
       return _ref4.apply(this, arguments);
     };
-  }(), [onFilter, hasRequired, onInit]); // 轻量搜索Filter
+  }(), [onFilter, hasRequired, onInit]); // 简单搜索Change
+
+  var onSimpleChange = (0, _react.useCallback)(function (values, fieldValue, fieldName) {
+    if (currentForm.current === 'simple') {
+      onChange === null || onChange === void 0 ? void 0 : onChange(values, fieldValue, fieldName);
+    }
+  }, [onChange]); // 轻量搜索Filter
 
   var onLightFilter = (0, _react.useCallback)(function (values) {
     if (currentForm.current === 'light') {
@@ -381,7 +390,13 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
         configTag();
       }
     }
-  }, [onFilter]); // 高级搜索Filter by Submit
+  }, [onFilter]); // 轻量搜索Change
+
+  var onLightChange = (0, _react.useCallback)(function (values, fieldValue, fieldName) {
+    if (currentForm.current === 'light') {
+      onChange === null || onChange === void 0 ? void 0 : onChange(values, fieldValue, fieldName);
+    }
+  }, [onChange]); // 高级搜索Filter
 
   var onAdvancedFilter = (0, _react.useCallback)(function (values) {
     setCurrentForm('advanced');
@@ -401,9 +416,9 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     lightForm.reset('*', {
       forceClear: true
     });
-  }, [onReset]); // 高级搜索Filter by Change
+  }, [onReset]); // 高级搜索Init
 
-  var onAdvancedChange = (0, _react.useCallback)( /*#__PURE__*/function () {
+  var onAdvancedInit = (0, _react.useCallback)( /*#__PURE__*/function () {
     var _ref5 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(values) {
       return regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) {
@@ -448,7 +463,13 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     return function (_x2) {
       return _ref5.apply(this, arguments);
     };
-  }(), [hasRequired, onInit]); // 关闭标签清空表单字段值
+  }(), [hasRequired, onInit]); // 高级搜索Change
+
+  var onAdvancedChange = (0, _react.useCallback)(function (values, fieldValue, fieldName) {
+    if (currentForm.current === 'advanced') {
+      onChange === null || onChange === void 0 ? void 0 : onChange(values, fieldValue, fieldName);
+    }
+  }, [onChange]); // 关闭标签清空表单字段值
 
   var onTagClose = (0, _react.useCallback)(function (key, index) {
     var newValue = undefined;
@@ -468,7 +489,10 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     form.setState({
       loading: false
     });
-  }, []); // 组件挂载
+  }, []);
+  var debounceFun = (0, _lodash.default)(function (fun, props) {
+    return fun(props);
+  }, filterDebounce); // 组件挂载
 
   (0, _react.useEffect)(function () {
     setCurrentForm(currentForm.current);
@@ -484,20 +508,30 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       className: (0, _classnames.default)("".concat(prefixCls, "-inline"), purePanel || hasRequired ? "".concat(prefixCls, "-inline-hidden") : '')
     }, /*#__PURE__*/_react.default.createElement(_LightFilter.default, _objectSpread(_objectSpread({}, otherProps), {}, {
       defaultFilterValue: defaultFilterValue,
+      filterValues: filterValues,
       activeFilterValueRef: activeFilterValueRef,
       form: lightForm,
-      onChange: (0, _lodash.default)(onLightFilter, filterDebounce)
+      onChange: function onChange(values, fieldValue, fieldName) {
+        debounceFun(onLightFilter, values);
+        onLightChange(values, fieldValue, fieldName);
+      }
     }))) : /*#__PURE__*/_react.default.createElement("div", {
       className: "".concat(prefixCls, "-inline")
     }, /*#__PURE__*/_react.default.createElement(_SimpleFilter.default, _objectSpread(_objectSpread({}, otherProps), {}, {
       form: simpleForm,
-      onChange: (0, _lodash.default)(onSimpleFilter, filterDebounce),
+      onChange: function onChange(values, fieldValue, fieldName) {
+        debounceFun(onSimpleFilter, values);
+        onSimpleChange(values, fieldValue, fieldName);
+      },
       onSubmit: onSimpleFilter,
       onInitialComplete: onInitialComplete
     }))),
     panelContent: mode === 'panel' ? /*#__PURE__*/_react.default.createElement(_AdvancedFilter.default, _objectSpread(_objectSpread({}, otherProps), {}, {
       form: advancedForm,
-      onChange: (0, _lodash.default)(onAdvancedChange, filterDebounce),
+      onChange: function onChange(values, fieldValue, fieldName) {
+        debounceFun(onAdvancedInit, values);
+        onAdvancedChange(values, fieldValue, fieldName);
+      },
       onSubmit: onAdvancedFilter,
       onReset: onAdvancedReset,
       onInitialComplete: onInitialComplete

package/lib/form/ProForm/customComponent.js

@@ -9,6 +9,8 @@ var _react = require("@formily/react");
 
 var _reactive = require("@formily/reactive");
 
+var _utils = 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; }
@@ -22,7 +24,7 @@ var customComponent = function customComponent(component) {
       form: field.form,
       values: (0, _reactive.toJS)(field.form.values)
     });
-  }));
+  }, _utils.mapSize, _utils.mapStatus, _utils.mapDataSource));
 };
 
 exports.customComponent = customComponent;

package/lib/form/SchemaForm/adapterDecorator.js

@@ -26,7 +26,7 @@ var _default = function _default(decorator, component) {
     return decorator;
   }
 
-  if ([].concat(_toConsumableArray(Object.keys(_fieldTypeMap.default)), ['Upload', 'ArrayCards', 'ArrayCollapse', 'ArrayTable', 'ArrayItems']).includes(component)) {
+  if ([].concat(_toConsumableArray(Object.keys(_fieldTypeMap.default)), ['Upload', 'SelectTable', 'ArrayCards', 'ArrayCollapse', 'ArrayTable', 'ArrayItems']).includes(component)) {
     return 'FormItem';
   }
 

package/lib/form/SchemaForm/adapterType.js

@@ -54,11 +54,8 @@ var typeMap = (_typeMap = {
   Range: 'string',
   Search: 'array',
   SelectGroup: 'array',
-  ArrayCollapse: 'array',
-  ArrayCards: 'array',
-  ArrayTable: 'array',
-  ArrayItems: 'array'
-}, _defineProperty(_typeMap, 'Editable.Popover', 'object'), _defineProperty(_typeMap, 'Editable.Dialog', 'object'), _defineProperty(_typeMap, 'Editable.Drawer', 'object'), _typeMap);
+  SelectTable: 'array'
+}, _defineProperty(_typeMap, 'SelectTable.Column', 'string'), _defineProperty(_typeMap, "ArrayCollapse", 'array'), _defineProperty(_typeMap, "ArrayCards", 'array'), _defineProperty(_typeMap, "ArrayTable", 'array'), _defineProperty(_typeMap, "ArrayItems", 'array'), _defineProperty(_typeMap, 'Editable.Popover', 'object'), _defineProperty(_typeMap, 'Editable.Dialog', 'object'), _defineProperty(_typeMap, 'Editable.Drawer', 'object'), _typeMap);
 
 var _default = function _default(type, component) {
   return type || typeMap[component] || 'void';

package/lib/form/SchemaForm/index.js

@@ -57,12 +57,16 @@ var _initializeFormTab = _interopRequireDefault(require("./initializeFormTab"));
 
 var _initializeFormCollapse = _interopRequireDefault(require("./initializeFormCollapse"));
 
+var _initializeSelectTable = _interopRequireDefault(require("./initializeSelectTable"));
+
 var _reactions = require("./reactions");
 
 var _fieldTypeMap = _interopRequireDefault(require("../fieldTypeMap"));
 
 var _utils = require("../utils");
 
+var _utils2 = require("@teamix/utils");
+
 var _warning = _interopRequireDefault(require("../warning"));
 
 var _excluded = ["component", "type", "name", "decorator", "decoratorProps", "dataSource", "reactions", "rules", "children", "items", "tooltip", "request", "data"];
@@ -107,10 +111,16 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
   var schema = _ref.schema,
       scope = _ref.scope,
       components = _ref.components;
-  // 创建 SchemaField
+
+  // 获取全局配置
+  var _ref2 = (0, _utils2.getGlobalConfig)('ProForm') || {},
+      globalComponents = _ref2.components,
+      globalScope = _ref2.scope; // 创建 SchemaField
+
+
   var SchemaField = (0, _react.useMemo)(function () {
     return (0, _react2.createSchemaField)({
-      components: _objectSpread(_objectSpread({}, _ProField.default), {}, {
+      components: _objectSpread(_objectSpread(_objectSpread({}, globalComponents), _ProField.default), {}, {
         FormLayout: _formily.FormLayout,
         FormItem: _formily.FormItem,
         ArrayCollapse: _formily.ArrayCollapse,
@@ -133,6 +143,7 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
         EditablePopover: _Editable.EditablePopover,
         FormGroup: _FormGroup.default,
         Upload: _formily.Upload,
+        SelectTable: _formily.SelectTable,
         Affix: _components.Affix,
         LightFilter: _LightFilter.default,
         Text: _index.default
@@ -141,7 +152,7 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
   }, []); // 合并 schema 中 request 的 scope
 
   var mergedScope = (0, _react.useMemo)(function () {
-    return _objectSpread(_objectSpread({}, scope), {}, {
+    return _objectSpread(_objectSpread(_objectSpread({}, globalScope), scope), {}, {
       $request: _reactions.$request,
       $common: _reactions.$common,
       $dataSource: _reactions.$dataSource,
@@ -150,10 +161,10 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
   }, [scope]); // 格式化 schema
 
   var formatSchema = (0, _react.useCallback)(function (schema) {
-    var suffix = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
+    var parentSuffix = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
     var schemaProperties = {};
     schema === null || schema === void 0 ? void 0 : schema.forEach(function (item, index) {
-      suffix = "".concat(suffix).concat(index);
+      var suffix = "".concat(parentSuffix).concat(index);
       var newItem = (0, _warning.default)(item);
       var _newItem = newItem,
           originalComponent = _newItem.component; // 根据component的不同，初始化为内置的item
@@ -210,6 +221,11 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
 
         if (['FormCollapse'].includes(originalComponent)) {
           newItem = (0, _initializeFormCollapse.default)(newItem);
+        } // 初始化选择表格 - SelectTable
+
+
+        if (['SelectTable'].includes(originalComponent)) {
+          newItem = (0, _initializeSelectTable.default)(newItem);
         }
       }
 
@@ -244,10 +260,10 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
 
       var _initializeRequest = (0, _initializeRequest2.default)(request, "".concat(suffix, "r")),
           requestReactions = _initializeRequest.reactions,
-          requestScope = _initializeRequest.scope; // 初始化dataSource，如果readPretty为字符串表达式将失去loading等状态，仍可配置dataSource
+          requestScope = _initializeRequest.scope; // 初始化dataSource
 
 
-      var _initializeDataSource = (0, _initializeDataSource2.default)(dataSource, "".concat(suffix, "d"), newItem.readPretty),
+      var _initializeDataSource = (0, _initializeDataSource2.default)(dataSource, "".concat(suffix, "d")),
           defaultDataSource = _initializeDataSource.dataSource,
           dataSourceReactions = _initializeDataSource.reactions,
           dataSourceScope = _initializeDataSource.scope; // 初始化rules validator
@@ -260,10 +276,10 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
 
       var defaultReactions = (0, _initializeReactions.default)(reactions, [].concat(_toConsumableArray(requestReactions), _toConsumableArray(dataSourceReactions))); // 合并scope
 
-      Object.entries(_objectSpread(_objectSpread(_objectSpread({}, requestScope), dataSourceScope), rulesScope)).map(function (_ref2) {
-        var _ref3 = _slicedToArray(_ref2, 2),
-            k = _ref3[0],
-            v = _ref3[1];
+      Object.entries(_objectSpread(_objectSpread(_objectSpread({}, requestScope), dataSourceScope), rulesScope)).map(function (_ref3) {
+        var _ref4 = _slicedToArray(_ref3, 2),
+            k = _ref4[0],
+            v = _ref4[1];
 
         mergedScope[k] = v;
       });

package/lib/form/SchemaForm/initializeDataSource.d.ts

@@ -1,6 +1,6 @@
 import type { ProFormRequestConfig } from '../typing';
 interface IInitializeDataSource {
-    (requestConfig?: ProFormRequestConfig | any, suffix?: string, readPretty?: string | boolean): {
+    (requestConfig?: ProFormRequestConfig | any, suffix?: string): {
         dataSource?: any[];
         reactions: any[];
         scope: {

package/lib/form/SchemaForm/initializeDataSource.js

@@ -9,12 +9,12 @@ 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 initializeDataSource = function initializeDataSource(dataSource, suffix, readPretty) {
+var initializeDataSource = function initializeDataSource(dataSource, suffix) {
   if ((0, _utils.isPlainObj)(dataSource)) {
     var requestConfig = dataSource;
     var requestConfigName = "$requestConfig_".concat(suffix);
     return {
-      reactions: ["{{$dataSource($request,".concat(requestConfigName, ",context,").concat(readPretty, ")}}")],
+      reactions: ["{{$dataSource($request,".concat(requestConfigName, ",context)}}")],
       scope: _defineProperty({}, requestConfigName, requestConfig)
     };
   }

package/lib/form/SchemaForm/initializeSelectTable.d.ts

@@ -0,0 +1,3 @@
+import type { ProFormInitializeItem } from '../typing';
+declare const initialize: ProFormInitializeItem;
+export default initialize;