@teamix/pro 1.3.1 → 1.3.4

package/es/actions/dialog-form.js

@@ -1,5 +1,5 @@
 var _excluded = ["schema"],
-    _excluded2 = ["schema", "useFieldValuesForRequest", "initialValues", "initialRequest", "formProps", "size", "onFinish", "beforeRequest", "formRef"];
+    _excluded2 = ["schema", "useFieldValuesForRequest", "initialValues", "initialRequest", "formProps", "size", "onFinish", "beforeRequest", "formRef", "extendParams"];
 
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
@@ -147,6 +147,7 @@ export function useDialogFormAction(action, context) {
       _onFinish = action.onFinish,
       propsBeforeRequest = action.beforeRequest,
       propsFormRef = action.formRef,
+      propsExtendParams = action.extendParams,
       others = _objectWithoutProperties(action, _excluded2);
 
   var innerFormRef = /*#__PURE__*/createRef();
@@ -167,10 +168,12 @@ export function useDialogFormAction(action, context) {
         formRef: propsFormRef
       }, dialogFormProps));
     },
-    extendParams: useFieldValuesForRequest ? '{{fields}}' : undefined,
+    extendParams: useFieldValuesForRequest ? ['{{fields}}', propsExtendParams] : propsExtendParams,
     beforeRequest: function beforeRequest(context) {
       return new Promise(function (resolve, reject) {
         innerFormRef.current.validate().then( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+          var _innerFormRef$current;
+
           var beforeRequestContext, requestContext;
           return regeneratorRuntime.wrap(function _callee$(_context) {
             while (1) {
@@ -206,7 +209,7 @@ export function useDialogFormAction(action, context) {
 
                 case 13:
                   requestContext = Object.assign({
-                    fields: innerFormRef.current.values
+                    fields: (_innerFormRef$current = innerFormRef.current) === null || _innerFormRef$current === void 0 ? void 0 : _innerFormRef$current.values
                   }, _typeof(beforeRequestContext) === 'object' ? beforeRequestContext : {});
                   resolve(requestContext);
 
@@ -222,9 +225,9 @@ export function useDialogFormAction(action, context) {
       });
     },
     onFinish: function onFinish() {
-      var _innerFormRef$current;
+      var _innerFormRef$current2;
 
-      _onFinish && _onFinish((_innerFormRef$current = innerFormRef.current) === null || _innerFormRef$current === void 0 ? void 0 : _innerFormRef$current.values);
+      _onFinish && _onFinish((_innerFormRef$current2 = innerFormRef.current) === null || _innerFormRef$current2 === void 0 ? void 0 : _innerFormRef$current2.values);
     }
   }, others), context);
 }

package/es/actions/dialog.js

@@ -32,7 +32,7 @@ import classnames from 'classnames';
 import { useHistory } from 'react-router-dom';
 import { Dialog, Drawer } from '@alicloudfe/components';
 import PopConfirm from '@teamix/pop-confirm';
-import { getTargetValue, uuid, getMessage } from '@teamix/utils';
+import { getTargetValue, getMessage } from '@teamix/utils';
 import ProForm, { createForm } from '../form';
 import { renderProMessage } from '../utils/message';
 import { eventHandler } from './base';
@@ -210,9 +210,7 @@ export function useDialogAction(action, actionContext) {
     var dialogContext = Object.assign({}, context, {
       hide: hide
     });
-    var dialogContent = Component ? /*#__PURE__*/React.createElement(Component, _objectSpread({
-      key: uuid()
-    }, addContext(componentProps, dialogContext))) : addContextForReactNode(content, dialogContext);
+    var dialogContent = Component ? /*#__PURE__*/React.createElement(Component, _objectSpread({}, addContext(componentProps, dialogContext))) : addContextForReactNode(content, dialogContext);
 
     var quickShowProps = _objectSpread(_objectSpread((_objectSpread2 = {}, _defineProperty(_objectSpread2, "".concat(isPop ? 'onConfirm' : 'onOk'), onOk), _defineProperty(_objectSpread2, "title", addContextForReactNode(title, dialogContext)), _defineProperty(_objectSpread2, "content", /*#__PURE__*/React.createElement(React.Fragment, null, beforeContent && /*#__PURE__*/React.createElement("div", {
       className: "teamix-pro-dialog-before-content"

package/es/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/es/form/Components/LightFilter/index.js

@@ -56,14 +56,16 @@ var useMain = function useMain(active) {
 }; // 筛选项数据
 
 
-var useFilterItems = function useFilterItems() {
+var useFilterItems = function useFilterItems(filterValues) {
   var schema = 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;
 }; // 是否输入框类型的组件
@@ -77,12 +79,13 @@ var isInputCategory = function isInputCategory(currentSchema) {
 var LightFilter = 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 = useState(defaultFilterValue || ((_filterItems$ = filterItems[0]) === null || _filterItems$ === void 0 ? void 0 : _filterItems$.value)),
       _useState2 = _slicedToArray(_useState, 2),

package/es/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/es/form/Components/ProField/mapDateFormat.js

@@ -0,0 +1,113 @@
+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; }
+
+import { isEmpty } from '@formily/shared';
+import { isArr, isFn } from '@teamix/utils';
+import Moment from 'moment';
+
+var moment = function moment(date, format) {
+  return Moment((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 (isArr(format)) {
+      var _format = format[i];
+
+      if (isFn(_format)) {
+        return _format(date);
+      }
+
+      if (isEmpty(_format)) {
+        return date;
+      }
+
+      return moment(date).format(_format);
+    } else {
+      if (isFn(format)) {
+        return format(date);
+      }
+
+      if (isEmpty(format)) {
+        return date;
+      }
+
+      return moment(date).format(format);
+    }
+  };
+
+  if (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 {};
+};
+
+export default mapDateFormat;

package/es/form/Filter/LightFilter.js

@@ -1,4 +1,4 @@
-var _excluded = ["form", "schema", "onSubmit", "onChange", "defaultFilterValue", "activeFilterValueRef"];
+var _excluded = ["form", "schema", "onSubmit", "onChange", "defaultFilterValue", "filterValues", "activeFilterValueRef"];
 
 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; }
 
@@ -26,6 +26,7 @@ var LightFilter = /*#__PURE__*/memo(function (props) {
       onSubmit = props.onSubmit,
       onChange = props.onChange,
       defaultFilterValue = props.defaultFilterValue,
+      filterValues = props.filterValues,
       activeFilterValueRef = props.activeFilterValueRef,
       otherProps = _objectWithoutProperties(props, _excluded);
 
@@ -48,15 +49,24 @@ var LightFilter = /*#__PURE__*/memo(function (props) {
   }, [form]); // 实际输出onFilter
 
   var onFilter = 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 = useMemo(function () {
     return [{
       component: 'LightFilter',
       props: {
         defaultFilterValue: defaultFilterValue,
+        filterValues: filterValues,
         onFilterChange: onFilterChange,
         buttonProps: {
           onClick: onFilter

package/es/form/Filter/SimpleFilter.js

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

package/es/form/Filter/index.js

@@ -1,4 +1,4 @@
-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 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; }
 
@@ -62,11 +62,13 @@ var QueryFilter = /*#__PURE__*/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 = useSpecialProps(props),
@@ -152,6 +154,7 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
       if (!formRef.current.updateTags) {
         formRef.current.updateTags = function () {
           configFilterItem(form);
+          configTag();
         };
       }
     }
@@ -327,7 +330,13 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
     return function (_x) {
       return _ref4.apply(this, arguments);
     };
-  }(), [onFilter, hasRequired, onInit]); // 轻量搜索Filter
+  }(), [onFilter, hasRequired, onInit]); // 简单搜索Change
+
+  var onSimpleChange = useCallback(function (values, fieldValue, fieldName) {
+    if (currentForm.current === 'simple') {
+      onChange === null || onChange === void 0 ? void 0 : onChange(values, fieldValue, fieldName);
+    }
+  }, [onChange]); // 轻量搜索Filter
 
   var onLightFilter = useCallback(function (values) {
     if (currentForm.current === 'light') {
@@ -345,7 +354,13 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
         configTag();
       }
     }
-  }, [onFilter]); // 高级搜索Filter by Submit
+  }, [onFilter]); // 轻量搜索Change
+
+  var onLightChange = useCallback(function (values, fieldValue, fieldName) {
+    if (currentForm.current === 'light') {
+      onChange === null || onChange === void 0 ? void 0 : onChange(values, fieldValue, fieldName);
+    }
+  }, [onChange]); // 高级搜索Filter
 
   var onAdvancedFilter = useCallback(function (values) {
     setCurrentForm('advanced');
@@ -365,9 +380,9 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
     lightForm.reset('*', {
       forceClear: true
     });
-  }, [onReset]); // 高级搜索Filter by Change
+  }, [onReset]); // 高级搜索Init
 
-  var onAdvancedChange = useCallback( /*#__PURE__*/function () {
+  var onAdvancedInit = useCallback( /*#__PURE__*/function () {
     var _ref5 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(values) {
       return regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) {
@@ -412,7 +427,13 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
     return function (_x2) {
       return _ref5.apply(this, arguments);
     };
-  }(), [hasRequired, onInit]); // 关闭标签清空表单字段值
+  }(), [hasRequired, onInit]); // 高级搜索Change
+
+  var onAdvancedChange = useCallback(function (values, fieldValue, fieldName) {
+    if (currentForm.current === 'advanced') {
+      onChange === null || onChange === void 0 ? void 0 : onChange(values, fieldValue, fieldName);
+    }
+  }, [onChange]); // 关闭标签清空表单字段值
 
   var onTagClose = useCallback(function (key, index) {
     var newValue = undefined;
@@ -432,7 +453,10 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
     form.setState({
       loading: false
     });
-  }, []); // 组件挂载
+  }, []);
+  var debounceFun = debounce(function (fun, props) {
+    return fun(props);
+  }, filterDebounce); // 组件挂载
 
   useEffect(function () {
     setCurrentForm(currentForm.current);
@@ -448,20 +472,30 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
       className: cls("".concat(prefixCls, "-inline"), purePanel || hasRequired ? "".concat(prefixCls, "-inline-hidden") : '')
     }, /*#__PURE__*/React.createElement(LightFilter, _objectSpread(_objectSpread({}, otherProps), {}, {
       defaultFilterValue: defaultFilterValue,
+      filterValues: filterValues,
       activeFilterValueRef: activeFilterValueRef,
       form: lightForm,
-      onChange: debounce(onLightFilter, filterDebounce)
+      onChange: function onChange(values, fieldValue, fieldName) {
+        debounceFun(onLightFilter, values);
+        onLightChange(values, fieldValue, fieldName);
+      }
     }))) : /*#__PURE__*/React.createElement("div", {
       className: "".concat(prefixCls, "-inline")
     }, /*#__PURE__*/React.createElement(SimpleFilter, _objectSpread(_objectSpread({}, otherProps), {}, {
       form: simpleForm,
-      onChange: debounce(onSimpleFilter, filterDebounce),
+      onChange: function onChange(values, fieldValue, fieldName) {
+        debounceFun(onSimpleFilter, values);
+        onSimpleChange(values, fieldValue, fieldName);
+      },
       onSubmit: onSimpleFilter,
       onInitialComplete: onInitialComplete
     }))),
     panelContent: mode === 'panel' ? /*#__PURE__*/React.createElement(AdvancedFilter, _objectSpread(_objectSpread({}, otherProps), {}, {
       form: advancedForm,
-      onChange: debounce(onAdvancedChange, filterDebounce),
+      onChange: function onChange(values, fieldValue, fieldName) {
+        debounceFun(onAdvancedInit, values);
+        onAdvancedChange(values, fieldValue, fieldName);
+      },
       onSubmit: onAdvancedFilter,
       onReset: onAdvancedReset,
       onInitialComplete: onInitialComplete

package/es/form/ProForm/customComponent.js

@@ -6,6 +6,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 import { connect, mapProps } from '@formily/react';
 import { toJS } from '@formily/reactive';
+import { mapSize, mapStatus, mapDataSource } from '../utils';
 
 var customComponent = function customComponent(component) {
   return connect(component, mapProps(function (props, field) {
@@ -14,7 +15,7 @@ var customComponent = function customComponent(component) {
       form: field.form,
       values: toJS(field.form.values)
     });
-  }));
+  }, mapSize, mapStatus, mapDataSource));
 };
 
 export { customComponent };

package/es/form/ProForm/useFormDisplayValues.js

@@ -12,7 +12,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import { useForm } from '@formily/react';
 import { toJS } from '@formily/reactive';
-import { isArr, isPlainObj, isSignificative, getValueByValue } from '@teamix/utils';
+import { isArr, isPlainObj, isUsable, getValueByValue } from '@teamix/utils';
 import fieldTypeMap from '../fieldTypeMap';
 /**
  * 获取表单值的可显示值
@@ -44,7 +44,7 @@ var getDisplayValues = function getDisplayValues(form, values) {
 
   var isFieldValue = Object.keys(fieldTypeMap).includes(field === null || field === void 0 ? void 0 : field.component[0]); // 判断值的类型，递归获取每个值在该结构中的完整路径
 
-  if (!isSignificative(values)) {
+  if (!isUsable(values)) {
     displayValues = {};
   } else if (isPlainObj(values) && !isFieldValue) {
     // 如果值是布局对象的值

package/es/form/SchemaForm/adapterDecorator.js

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

package/es/form/SchemaForm/adapterType.js

@@ -47,11 +47,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);
 export default (function (type, component) {
   return type || typeMap[component] || 'void';
 });

package/es/form/SchemaForm/index.js

@@ -33,7 +33,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 import React, { memo, useCallback, useMemo } from 'react';
 import { createSchemaField } from '@formily/react';
 import { Affix } from '@alicloudfe/components';
-import { Upload, FormLayout, FormItem, ArrayCollapse, ArrayCards, ArrayItems, ArrayTable, Space, FormGrid, FormTab, FormCollapse, FormStep, Editable, FormDialog, FormDrawer, FormButtonGroup, Submit, Reset } from '@teamix/formily';
+import { Upload, SelectTable, FormLayout, FormItem, ArrayCollapse, ArrayCards, ArrayItems, ArrayTable, Space, FormGrid, FormTab, FormCollapse, FormStep, Editable, FormDialog, FormDrawer, FormButtonGroup, Submit, Reset } from '@teamix/formily';
 import ProFieldComponents from '../Components/ProField';
 import { EditableDialog, EditableDrawer, EditablePopover } from '../Components/Editable';
 import FormGroup from '../Components/FormGroup';
@@ -55,18 +55,26 @@ import initializeFormGroup from './initializeFormGroup';
 import initializeFormStep from './initializeFormStep';
 import initializeFormTab from './initializeFormTab';
 import initializeFormCollapse from './initializeFormCollapse';
+import initializeSelectTable from './initializeSelectTable';
 import { $request, $common, $dataSource, $validator } from './reactions';
 import fieldTypeMap from '../fieldTypeMap';
 import { getFieldName, mapSchemaName } from '../utils';
+import { getGlobalConfig } from '@teamix/utils';
 import warning from '../warning';
 export default /*#__PURE__*/memo(function (_ref) {
   var schema = _ref.schema,
       scope = _ref.scope,
       components = _ref.components;
-  // 创建 SchemaField
+
+  // 获取全局配置
+  var _ref2 = getGlobalConfig('ProForm') || {},
+      globalComponents = _ref2.components,
+      globalScope = _ref2.scope; // 创建 SchemaField
+
+
   var SchemaField = useMemo(function () {
     return createSchemaField({
-      components: _objectSpread(_objectSpread({}, ProFieldComponents), {}, {
+      components: _objectSpread(_objectSpread(_objectSpread({}, globalComponents), ProFieldComponents), {}, {
         FormLayout: FormLayout,
         FormItem: FormItem,
         ArrayCollapse: ArrayCollapse,
@@ -89,6 +97,7 @@ export default /*#__PURE__*/memo(function (_ref) {
         EditablePopover: EditablePopover,
         FormGroup: FormGroup,
         Upload: Upload,
+        SelectTable: SelectTable,
         Affix: Affix,
         LightFilter: LightFilter,
         Text: Text
@@ -97,7 +106,7 @@ export default /*#__PURE__*/memo(function (_ref) {
   }, []); // 合并 schema 中 request 的 scope
 
   var mergedScope = useMemo(function () {
-    return _objectSpread(_objectSpread({}, scope), {}, {
+    return _objectSpread(_objectSpread(_objectSpread({}, globalScope), scope), {}, {
       $request: $request,
       $common: $common,
       $dataSource: $dataSource,
@@ -166,6 +175,11 @@ export default /*#__PURE__*/memo(function (_ref) {
 
         if (['FormCollapse'].includes(originalComponent)) {
           newItem = initializeFormCollapse(newItem);
+        } // 初始化选择表格 - SelectTable
+
+
+        if (['SelectTable'].includes(originalComponent)) {
+          newItem = initializeSelectTable(newItem);
         }
       }
 
@@ -200,13 +214,14 @@ export default /*#__PURE__*/memo(function (_ref) {
 
       var _initializeRequest = initializeRequest(request, "".concat(suffix, "r")),
           requestReactions = _initializeRequest.reactions,
-          requestScope = _initializeRequest.scope; // 初始化dataSource，如果readPretty为字符串表达式将失去loading等状态，仍可配置dataSource
+          requestScope = _initializeRequest.scope; // 初始化dataSource
 
 
-      var _initializeDataSource = initializeDataSource(dataSource, "".concat(suffix, "d"), newItem.readPretty),
+      var _initializeDataSource = initializeDataSource(dataSource, "".concat(suffix, "d")),
           defaultDataSource = _initializeDataSource.dataSource,
           dataSourceReactions = _initializeDataSource.reactions,
-          dataSourceScope = _initializeDataSource.scope; // 初始化rules validator
+          dataSourceScope = _initializeDataSource.scope,
+          dataSourceData = _initializeDataSource.data; // 初始化rules validator
 
 
       var _initializeRules = initializeRules(rules, "".concat(suffix, "v")),
@@ -216,10 +231,10 @@ export default /*#__PURE__*/memo(function (_ref) {
 
       var defaultReactions = initializeReactions(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;
       });
@@ -231,9 +246,9 @@ export default /*#__PURE__*/memo(function (_ref) {
         rules: defaultRules,
         reactions: defaultReactions,
         dataSource: defaultDataSource,
-        data: data || {
-          placeholder: true
-        }
+        data: _objectSpread(_objectSpread(_objectSpread({}, data), dataSourceData), {}, {
+          __placeholder: true
+        })
       })); // 递归子组件
 
       var recursiveProperties = (children === null || children === void 0 ? void 0 : children.length) ? {

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

@@ -1,11 +1,12 @@
 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: {
             [x: string]: any;
         };
+        data?: any;
     };
 }
 declare const initializeDataSource: IInitializeDataSource;

package/es/form/SchemaForm/initializeDataSource.js

@@ -2,13 +2,19 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 import { isPlainObj } from '@teamix/utils';
 
-var initializeDataSource = function initializeDataSource(dataSource, suffix, readPretty) {
+var initializeDataSource = function initializeDataSource(dataSource, suffix) {
   if (isPlainObj(dataSource)) {
+    var _requestConfig$extraC;
+
     var requestConfig = dataSource;
     var requestConfigName = "$requestConfig_".concat(suffix);
     return {
-      reactions: ["{{$dataSource($request,".concat(requestConfigName, ",context,").concat(readPretty, ")}}")],
-      scope: _defineProperty({}, requestConfigName, requestConfig)
+      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
+      }
     };
   }
 

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

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