@teamix/pro 1.2.33 → 1.3.1

package/lib/form/Filter/index.js

@@ -103,34 +103,79 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       onInit = props.onInit,
       onReset = props.onReset,
       onExpand = props.onExpand,
-      otherProps = _objectWithoutProperties(props, _excluded); // 表单默认值初始化回调
+      otherProps = _objectWithoutProperties(props, _excluded);
 
+  var _useSpecialProps = (0, _useSpecialProps2.default)(props),
+      hasChangeDefault = _useSpecialProps.hasChangeDefault,
+      hasRequired = _useSpecialProps.hasRequired;
+
+  var _useState = (0, _react.useState)(!!expand),
+      _useState2 = _slicedToArray(_useState, 2),
+      panelVisible = _useState2[0],
+      setPanelVisible = _useState2[1];
+
+  var _useState3 = (0, _react.useState)([]),
+      _useState4 = _slicedToArray(_useState3, 2),
+      tagDataSource = _useState4[0],
+      setTagDataSource = _useState4[1];
+
+  var filterItem = (0, _react.useRef)([]);
+  var defaultForm = mode === 'panel' ? 'advanced' : 'simple';
+  var currentForm = (0, _react.useRef)(defaultForm);
+  var activeFilterValueRef = (0, _react.useRef)();
+  var prefixCls = (0, _utils.usePrefixCls)('', {
+    prefix: 'teamix-pro-form-query-filter'
+  });
+  /**
+   * 处理onInit与onFilter事件的触发问题
+   */
+
+  var filterEnable = (0, _react.useRef)('waiting');
 
-  var _onFormInit = function onFormInit(form, _ref, configFilterItem) {
+  var _onFormInit = function onFormInit(form, _ref) {
     var initialRequest = _ref.initialRequest,
-        onInit = _ref.onInit;
+        initialValues = _ref.initialValues;
 
     if (!form.mounted) {
-      form.loading = !!initialRequest;
+      // 借用form的loading属性来判断initialValues和initialRequest是否完成
+      form.setState({
+        loading: !!initialRequest || !!initialValues
+      });
     }
 
     var loadingField = Object.values(form.fields).filter(function (field) {
       return !!field.loading;
-    });
+    }); // 等待表单mounted + 字段loading结束 + form默认值初始化 => 表单初始化完成
 
-    if (form.mounted) {
-      if (loadingField.length === 0 && !form.loading) {
-        var onInitResult = onInit && onInit((0, _reactive.toJS)(form.values));
+    if (form.mounted && !loadingField.length && !form.loading) {
+      _onFormInit = function onFormInit() {}; // init后销毁 isFormInit 方法
 
-        if (onInitResult) {
-          // 根据onInit返回值，判断是否使用该事件执行筛选，使用过则添加筛选标签
-          configFilterItem && configFilterItem(form);
-        }
 
-        _onFormInit = function onFormInit() {};
+      var values = (0, _utils.getValidValues)(form.values);
+
+      if (!(0, _utils.isUsable)(values) || !hasChangeDefault) {
+        // 表单无默认值 或 无触发onChange的默认值配置，不会触发onFilter内的onInit，所以主动触发onInit
+        filterEnable.current = 'filter';
+        setTimeout(function () {
+          onInit === null || onInit === void 0 ? void 0 : onInit((0, _reactive.toJS)(form.values));
+        }, 0);
+
+        if (mode === 'panel') {
+          // 移除lightForm的默认值
+          // 设置Tag
+          configFilterItem(advancedForm);
+
+          if (!panelVisible) {
+            setTimeout(function () {
+              configTag();
+            }, 0);
+          }
+        }
+      } else {
+        filterEnable.current = 'initialized';
       }
     }
-  }; // 设置当前form
+  }; // 配置当前激活的form实例
 
 
   var setCurrentForm = function setCurrentForm(formName) {
@@ -140,9 +185,11 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       var form = formMap[formName];
       formRef.current = form;
 
-      formRef.current.updateTags = function () {
-        configFilterItem(form);
-      };
+      if (!formRef.current.updateTags) {
+        formRef.current.updateTags = function () {
+          configFilterItem(form);
+        };
+      }
     }
   }; // 创建简单筛选表单实例
 
@@ -152,7 +199,9 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       validateFirst: true,
       effects: function effects() {
         (0, _core.onFormReact)(function (form) {
-          _onFormInit(form, props);
+          if (mode === 'inline') {
+            _onFormInit(form, props);
+          }
         });
       }
     });
@@ -163,7 +212,7 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       validateFirst: true,
       effects: function effects() {
         (0, _core.onFormInputChange)(function () {
-          setCurrentForm('light');
+          setCurrentForm('light'); // 主动修改轻量筛选值
         });
       }
     });
@@ -174,11 +223,12 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       validateFirst: true,
       effects: function effects() {
         (0, _core.onFormReact)(function (form) {
-          _onFormInit(form, props, configFilterItem);
+          if (mode === 'panel') {
+            _onFormInit(form, props);
+          }
         });
         (0, _core.onFormInputChange)(function (form) {
-          // 主动修改高级筛选值
-          setCurrentForm('advanced');
+          setCurrentForm('advanced'); // 主动修改高级筛选值
         });
       }
     });
@@ -187,34 +237,7 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     simple: simpleForm,
     light: lightForm,
     advanced: advancedForm
-  };
-
-  var _useSpecialProps = (0, _useSpecialProps2.default)(props),
-      hasDefault = _useSpecialProps.hasDefault,
-      hasAsyncDefault = _useSpecialProps.hasAsyncDefault,
-      hasRequired = _useSpecialProps.hasRequired;
-
-  var hasDefaultOrRequired = hasDefault || hasAsyncDefault || hasRequired;
-
-  var _useState = (0, _react.useState)(!!expand),
-      _useState2 = _slicedToArray(_useState, 2),
-      advancedFilterVisible = _useState2[0],
-      setAdvancedFilterVisible = _useState2[1];
-
-  var _useState3 = (0, _react.useState)([]),
-      _useState4 = _slicedToArray(_useState3, 2),
-      tagDataSource = _useState4[0],
-      setTagDataSource = _useState4[1];
-
-  var filterItem = (0, _react.useRef)([]);
-  var currentForm = (0, _react.useRef)(mode === 'panel' ? advancedFilterVisible ? 'advanced' : 'light' : 'simple');
-  var prefixCls = (0, _utils.usePrefixCls)('', {
-    prefix: 'teamix-pro-form-query-filter'
-  }); // 设置筛选数据
-
-  var configFilterItem = (0, _react.useCallback)(function (form) {
-    filterItem.current = getFilterDisplayValues(form);
-  }, []); // 获取筛选数据Label
+  }; // 获取筛选数据Label
 
   var getFilterDisplayValues = (0, _react.useCallback)(function (form) {
     var displayValues = (0, _useFormDisplayValues.getFormDisplayValues)(form);
@@ -242,7 +265,7 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
             index: index
           });
         });
-      } else if ((0, _utils.isSignificative)(value)) {
+      } else if ((0, _utils.isUsable)(value)) {
         filterData.push({
           key: key,
           type: _fieldTypeMap.default[component] || 'text',
@@ -252,28 +275,34 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       }
     });
     return filterData;
+  }, []); // 设置筛选数据
+
+  var configFilterItem = (0, _react.useCallback)(function (form) {
+    filterItem.current = getFilterDisplayValues(form);
   }, []); // 设置标签数据
 
   var configTag = (0, _react.useCallback)(function () {
     setTagDataSource(filterItem.current);
-  }, [filterItem.current]); // 展开收起高级筛选
+  }, []); // 展开收起高级筛选
 
   var toggleAdvancedFilter = (0, _react.useCallback)(function () {
-    var result = !advancedFilterVisible;
+    var result = !panelVisible;
 
     if (result) {
       // 展开高级筛选，Light回填Advanced
       if (currentForm.current === 'light') {
-        advancedForm.setValues(lightForm.values);
+        var key = activeFilterValueRef.current;
+        var value = lightForm.values[key];
+        advancedForm.setValuesIn(key, value);
       }
     } else {
       // 收起高级筛选，配置标签数据
       configTag();
     }
 
-    setAdvancedFilterVisible(result);
+    setPanelVisible(result);
     onExpand === null || onExpand === void 0 ? void 0 : onExpand(result);
-  }, [advancedFilterVisible, configTag, currentForm.current]); // 简单搜索Filter
+  }, [panelVisible, configTag]); // 简单搜索Filter
 
   var onSimpleFilter = (0, _react.useCallback)( /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(values) {
@@ -282,22 +311,48 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
           switch (_context.prev = _context.next) {
             case 0:
               if (!(currentForm.current === 'simple')) {
-                _context.next = 5;
+                _context.next = 14;
+                break;
+              }
+
+              if (!(filterEnable.current === 'initialized')) {
+                _context.next = 9;
                 break;
               }
 
+              filterEnable.current = 'filter';
+
               if (!hasRequired) {
-                _context.next = 4;
+                _context.next = 6;
                 break;
               }
 
-              _context.next = 4;
+              _context.next = 6;
               return simpleForm.validate();
 
-            case 4:
-              onFilter && onFilter(values);
+            case 6:
+              onInit === null || onInit === void 0 ? void 0 : onInit(values);
+              _context.next = 14;
+              break;
 
-            case 5:
+            case 9:
+              if (!(filterEnable.current === 'filter')) {
+                _context.next = 14;
+                break;
+              }
+
+              if (!hasRequired) {
+                _context.next = 13;
+                break;
+              }
+
+              _context.next = 13;
+              return simpleForm.validate();
+
+            case 13:
+              onFilter === null || onFilter === void 0 ? void 0 : onFilter(values);
+
+            case 14:
             case "end":
               return _context.stop();
           }
@@ -308,29 +363,81 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     return function (_x) {
       return _ref4.apply(this, arguments);
     };
-  }(), [onFilter, currentForm.current, hasRequired]); // 轻量搜索Filter
+  }(), [onFilter, hasRequired, onInit]); // 轻量搜索Filter
+
+  var onLightFilter = (0, _react.useCallback)(function (values) {
+    if (currentForm.current === 'light') {
+      if (filterEnable.current === 'filter') {
+        var _Object$keys;
+
+        onFilter === null || onFilter === void 0 ? void 0 : onFilter(values); // 清空advancedForm的值，配置Tag
+
+        var clearKeys = {};
+        (_Object$keys = Object.keys(advancedForm.values)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.forEach(function (key) {
+          clearKeys[key] = undefined;
+        });
+        advancedForm.setValues(clearKeys);
+        configFilterItem(advancedForm);
+        configTag();
+      }
+    }
+  }, [onFilter]); // 高级搜索Filter by Submit
+
+  var onAdvancedFilter = (0, _react.useCallback)(function (values) {
+    setCurrentForm('advanced');
+    onFilter === null || onFilter === void 0 ? void 0 : onFilter(values);
+    configFilterItem(advancedForm); // 清空lightForm的值
+
+    lightForm.reset('*', {
+      forceClear: true
+    });
+  }, [onFilter]); // 高级搜索Reset
+
+  var onAdvancedReset = (0, _react.useCallback)(function () {
+    setCurrentForm('advanced');
+    onReset === null || onReset === void 0 ? void 0 : onReset((0, _reactive.toJS)(advancedForm.values));
+    configFilterItem(advancedForm); // 清空lightForm的值
 
-  var onLightFilter = (0, _react.useCallback)( /*#__PURE__*/function () {
+    lightForm.reset('*', {
+      forceClear: true
+    });
+  }, [onReset]); // 高级搜索Filter by Change
+
+  var onAdvancedChange = (0, _react.useCallback)( /*#__PURE__*/function () {
     var _ref5 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(values) {
       return regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
-              if (!(currentForm.current === 'light')) {
+              if (!(currentForm.current === 'advanced')) {
+                _context2.next = 9;
+                break;
+              }
+
+              if (!(filterEnable.current === 'initialized')) {
+                _context2.next = 9;
+                break;
+              }
+
+              filterEnable.current = 'filter';
+
+              if (!hasRequired) {
                 _context2.next = 6;
                 break;
               }
 
-              onFilter && onFilter(values);
-              _context2.next = 4;
-              return advancedForm.reset();
+              _context2.next = 6;
+              return advancedForm.validate();
 
-            case 4:
-              // 不会触发高级筛选的onReset回调函数
+            case 6:
+              onInit === null || onInit === void 0 ? void 0 : onInit(values);
               configFilterItem(advancedForm);
-              configTag();
 
-            case 6:
+              if (!panelVisible) {
+                configTag();
+              }
+
+            case 9:
             case "end":
               return _context2.stop();
           }
@@ -341,21 +448,7 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     return function (_x2) {
       return _ref5.apply(this, arguments);
     };
-  }(), [onFilter, currentForm.current]); // 高级搜索Filter
-
-  var onAdvancedFilter = (0, _react.useCallback)(function (values) {
-    setCurrentForm('advanced');
-    onFilter && onFilter(values);
-    configFilterItem(advancedForm);
-    lightForm.reset();
-  }, [onFilter, currentForm.current]); // 高级搜索Reset
-
-  var onAdvancedReset = (0, _react.useCallback)(function () {
-    setCurrentForm('advanced');
-    onReset && onReset((0, _reactive.toJS)(advancedForm.values));
-    configFilterItem(advancedForm);
-    lightForm.reset();
-  }, [onReset]); // 关闭标签清空表单字段值
+  }(), [hasRequired, onInit]); // 关闭标签清空表单字段值
 
   var onTagClose = (0, _react.useCallback)(function (key, index) {
     var newValue = undefined;
@@ -368,15 +461,15 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     advancedForm.setValuesIn(key, newValue);
     configFilterItem(advancedForm);
     configTag();
-    onFilter && onFilter((0, _reactive.toJS)(advancedForm.values));
-  }, []); // 异步默认值回调，设置form的loading状态为false
+    onFilter === null || onFilter === void 0 ? void 0 : onFilter((0, _reactive.toJS)(advancedForm.values));
+  }, [onFilter]); // initialValues和initialRequest的回调
 
-  var onInitialRequestComplete = (0, _react.useCallback)(function (_, __, _ref6) {
-    var form = _ref6.form;
+  var onInitialComplete = (0, _react.useCallback)(function (form) {
     form.setState({
       loading: false
     });
-  }, []);
+  }, []); // 组件挂载
+
   (0, _react.useEffect)(function () {
     setCurrentForm(currentForm.current);
   }, []);
@@ -384,13 +477,14 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     className: (0, _classnames.default)(prefixCls, props.className),
     addonBefore: addonBefore,
     addonAfter: addonAfter,
-    expand: advancedFilterVisible,
+    expand: panelVisible,
     onExpand: toggleAdvancedFilter,
     count: tagDataSource.length,
     inlineContent: mode === 'panel' ? /*#__PURE__*/_react.default.createElement("div", {
-      className: (0, _classnames.default)("".concat(prefixCls, "-inline"), purePanel || hasDefaultOrRequired ? "".concat(prefixCls, "-inline-hidden") : '')
+      className: (0, _classnames.default)("".concat(prefixCls, "-inline"), purePanel || hasRequired ? "".concat(prefixCls, "-inline-hidden") : '')
     }, /*#__PURE__*/_react.default.createElement(_LightFilter.default, _objectSpread(_objectSpread({}, otherProps), {}, {
       defaultFilterValue: defaultFilterValue,
+      activeFilterValueRef: activeFilterValueRef,
       form: lightForm,
       onChange: (0, _lodash.default)(onLightFilter, filterDebounce)
     }))) : /*#__PURE__*/_react.default.createElement("div", {
@@ -398,22 +492,22 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     }, /*#__PURE__*/_react.default.createElement(_SimpleFilter.default, _objectSpread(_objectSpread({}, otherProps), {}, {
       form: simpleForm,
       onChange: (0, _lodash.default)(onSimpleFilter, filterDebounce),
-      onSubmit: onSimpleFilter
+      onSubmit: onSimpleFilter,
+      onInitialComplete: onInitialComplete
     }))),
     panelContent: mode === 'panel' ? /*#__PURE__*/_react.default.createElement(_AdvancedFilter.default, _objectSpread(_objectSpread({}, otherProps), {}, {
-      initialRequest: otherProps.initialRequest ? _objectSpread(_objectSpread({}, otherProps.initialRequest), {}, {
-        onComplete: onInitialRequestComplete
-      }) : undefined,
       form: advancedForm,
+      onChange: (0, _lodash.default)(onAdvancedChange, filterDebounce),
       onSubmit: onAdvancedFilter,
-      onReset: onAdvancedReset
+      onReset: onAdvancedReset,
+      onInitialComplete: onInitialComplete
     })) : null
-  }, mode === 'panel' && !advancedFilterVisible ? /*#__PURE__*/_react.default.createElement(_components.Tag.Group, null, tagDataSource.map(function (_ref7) {
-    var key = _ref7.key,
-        label = _ref7.label,
-        value = _ref7.value,
-        type = _ref7.type,
-        index = _ref7.index;
+  }, mode === 'panel' && !panelVisible ? /*#__PURE__*/_react.default.createElement(_components.Tag.Group, null, tagDataSource.map(function (_ref6) {
+    var key = _ref6.key,
+        label = _ref6.label,
+        value = _ref6.value,
+        type = _ref6.type,
+        index = _ref6.index;
     return /*#__PURE__*/_react.default.createElement(_components.Tag.Closeable, {
       key: (0, _utils.isNum)(index) ? key + label : key,
       afterClose: function afterClose() {

package/lib/form/Filter/useSpecialProps.d.ts

@@ -1,6 +1,6 @@
 declare const useSpecialProps: (props: any) => {
     hasDefault: boolean;
-    hasAsyncDefault: boolean;
+    hasChangeDefault: boolean;
     hasRequired: boolean;
 };
 export default useSpecialProps;

package/lib/form/Filter/useSpecialProps.js

@@ -11,8 +11,9 @@ var _utils = require("@teamix/utils");
 var useSpecialProps = function useSpecialProps(props) {
   var initialValues = props.initialValues,
       initialRequest = props.initialRequest;
-  var hasDefault = !!initialValues;
-  var hasAsyncDefault = !!initialRequest;
+  var hasChangeDefault = !!initialValues || !!initialRequest; // 会触发onChange的默认值
+
+  var hasDefault = hasChangeDefault;
   var hasRequired = false;
 
   var hasDefaultOrRule = function hasDefaultOrRule(schema) {
@@ -20,13 +21,12 @@ var useSpecialProps = function useSpecialProps(props) {
       var value = item.default,
           required = item.required,
           rules = item.rules,
-          request = item.request,
           dataSource = item.dataSource,
-          children = item.children;
-      hasDefault = hasDefault || (0, _utils.isSignificative)(value);
+          children = item.children; // 字符串变量配置default值会触发onChange
+
+      hasChangeDefault = hasChangeDefault || !!((0, _utils.isPureObj)(dataSource) && (0, _utils.isStr)(value) && value.indexOf('.dataSource'));
+      hasDefault = hasDefault || (0, _utils.isUsable)(value);
       hasRequired = hasRequired || required || !!rules;
-      hasAsyncDefault = hasAsyncDefault || !!request || // 如果dataSource是异步且default取自dataSource
-      !!((0, _utils.isPlainObj)(dataSource) && (0, _utils.isStr)(value) && value.indexOf('.dataSource'));
 
       if (children === null || children === void 0 ? void 0 : children.length) {
         hasDefaultOrRule(children);
@@ -37,7 +37,7 @@ var useSpecialProps = function useSpecialProps(props) {
   hasDefaultOrRule(props.schema);
   return {
     hasDefault: hasDefault,
-    hasAsyncDefault: hasAsyncDefault,
+    hasChangeDefault: hasChangeDefault,
     hasRequired: hasRequired
   };
 };

package/lib/form/ProForm/index.js

@@ -31,7 +31,7 @@ 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", "onSubmit", "onSubmitFailed", "className"];
+var _excluded = ["form", "initialValues", "initialRequest", "schema", "scope", "context", "components", "children", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol", "breakpoints", "onChange", "onSubmit", "onSubmitFailed", "onInitialComplete", "className"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -68,6 +68,7 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       onChange = _ref.onChange,
       onSubmit = _ref.onSubmit,
       onSubmitFailed = _ref.onSubmitFailed,
+      onInitialComplete = _ref.onInitialComplete,
       className = _ref.className,
       otherProps = _objectWithoutProperties(_ref, _excluded);
 
@@ -118,13 +119,12 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
   (0, _react.useEffect)(function () {
     if (initialValues) {
       form.setInitialValues(initialValues);
+      onInitialComplete === null || onInitialComplete === void 0 ? void 0 : onInitialComplete(form);
     } else if (initialRequest) {
       (0, _useInitialRequest.default)(initialRequest).then(function (values) {
         form.setInitialValues(values);
       }).finally(function () {
-        initialRequest.onComplete && initialRequest.onComplete(undefined, undefined, {
-          form: form
-        });
+        onInitialComplete === null || onInitialComplete === void 0 ? void 0 : onInitialComplete(form);
       });
     }
   }, []); // 配置国际化

package/lib/form/ProForm/index.scss

@@ -197,14 +197,14 @@
     margin-right: 4px;
   }
 }
-// 数组类ArrayItem Icon 居中
-.#{$form-array}-items-item-inner {
-  .#{$css-prefix}space-item {
-    > .#{$css-prefix}formily-icon {
-      margin-top: 9px;
-    }
-  }
-}
+// 数组类ArrayItem Icon 居中（移除，通过align:center配置）
+// .#{$form-array}-items-item-inner {
+//   .#{$css-prefix}space-item {
+//     > .#{$css-prefix}formily-icon {
+//       margin-top: 9px;
+//     }
+//   }
+// }
 
 // Editable预览态行高
 .#{$css-prefix}formily-editable-content {

package/lib/form/SchemaForm/index.js

@@ -150,10 +150,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
@@ -244,10 +244,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
+          requestScope = _initializeRequest.scope; // 初始化dataSource，如果readPretty为字符串表达式将失去loading等状态，仍可配置dataSource
 
 
-      var _initializeDataSource = (0, _initializeDataSource2.default)(dataSource, "".concat(suffix, "d")),
+      var _initializeDataSource = (0, _initializeDataSource2.default)(dataSource, "".concat(suffix, "d"), newItem.readPretty),
           defaultDataSource = _initializeDataSource.dataSource,
           dataSourceReactions = _initializeDataSource.reactions,
           dataSourceScope = _initializeDataSource.scope; // 初始化rules validator

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

@@ -1,6 +1,6 @@
 import type { ProFormRequestConfig } from '../typing';
 interface IInitializeDataSource {
-    (requestConfig?: ProFormRequestConfig | any, suffix?: string): {
+    (requestConfig?: ProFormRequestConfig | any, suffix?: string, readPretty?: string | boolean): {
         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) {
+var initializeDataSource = function initializeDataSource(dataSource, suffix, readPretty) {
   if ((0, _utils.isPlainObj)(dataSource)) {
     var requestConfig = dataSource;
     var requestConfigName = "$requestConfig_".concat(suffix);
     return {
-      reactions: ["{{$dataSource($request,".concat(requestConfigName, ",context)}}")],
+      reactions: ["{{$dataSource($request,".concat(requestConfigName, ",context,").concat(readPretty, ")}}")],
       scope: _defineProperty({}, requestConfigName, requestConfig)
     };
   }

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

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