@teamix/pro 1.2.34 → 1.2.35

package/dist/pro.js

@@ -52030,6 +52030,16 @@ function _objectSpread(target) {
   return target;
 }
 
+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);
+}
+
 function _slicedToArray(arr, i) {
   return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest();
 }
@@ -52179,34 +52189,38 @@ var precessValue = function precessValue() {
       valueAliasKey = _ref$key === void 0 ? 'key' : _ref$key;
 
   var result = [];
-  value.forEach(function (item) {
-    var resultItem = result.find(function (resultItem) {
-      return item[valueAliasKey] === resultItem[valueAliasKey];
-    });
 
-    if (resultItem) {
-      if (Array.isArray(item[valueAliasValue])) {
-        var _resultItem$valueAlia;
+  if (Array.isArray(value)) {
+    value.forEach(function (item) {
+      var resultItem = result.find(function (resultItem) {
+        return item[valueAliasKey] === resultItem[valueAliasKey];
+      });
 
-        (_resultItem$valueAlia = resultItem[valueAliasValue]).push.apply(_resultItem$valueAlia, _toConsumableArray(item[valueAliasValue]));
-      } else {
-        resultItem[valueAliasValue].push(item[valueAliasValue]);
-      }
-    } else {
-      if (Array.isArray(item.value)) {
-        var _newItem;
+      if (resultItem) {
+        if (Array.isArray(item[valueAliasValue])) {
+          var _resultItem$valueAlia;
 
-        var newItem = (_newItem = {}, _defineProperty(_newItem, valueAliasValue, item[valueAliasValue]), _defineProperty(_newItem, valueAliasKey, item[valueAliasKey]), _newItem);
-        result.push(newItem);
+          (_resultItem$valueAlia = resultItem[valueAliasValue]).push.apply(_resultItem$valueAlia, _toConsumableArray(item[valueAliasValue]));
+        } else {
+          resultItem[valueAliasValue].push(item[valueAliasValue]);
+        }
       } else {
-        var _newItem3;
+        if (Array.isArray(item.value)) {
+          var _newItem;
+
+          var newItem = (_newItem = {}, _defineProperty(_newItem, valueAliasValue, item[valueAliasValue]), _defineProperty(_newItem, valueAliasKey, item[valueAliasKey]), _newItem);
+          result.push(newItem);
+        } else {
+          var _newItem3;
 
-        var _newItem2 = (_newItem3 = {}, _defineProperty(_newItem3, valueAliasValue, [item[valueAliasValue]]), _defineProperty(_newItem3, valueAliasKey, item[valueAliasKey]), _newItem3);
+          var _newItem2 = (_newItem3 = {}, _defineProperty(_newItem3, valueAliasValue, [item[valueAliasValue]]), _defineProperty(_newItem3, valueAliasKey, item[valueAliasKey]), _newItem3);
 
-        result.push(_newItem2);
+          result.push(_newItem2);
+        }
       }
-    }
-  });
+    });
+  }
+
   return result;
 };
 
@@ -52235,7 +52249,7 @@ var FieldSelectGroup = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default()
   (0,use_deep_compare_effect__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .ZP)(function () {
     setFieldVal(precessValue(value, valueAlias));
     (0,_utils__WEBPACK_IMPORTED_MODULE_6__/* .bindRefValue */ .Dd)(precessValue(value, valueAlias), ref);
-  }, [value !== null && value !== void 0 ? value : []]);
+  }, [_typeof(value) === 'object' ? value !== null && value !== void 0 ? value : [] : []]);
 
   if (mode === 'edit') {
     return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default().createElement(_selectGroup__WEBPACK_IMPORTED_MODULE_7__/* ["default"] */ .Z, _objectSpread({
@@ -54796,22 +54810,40 @@ var Description = function Description(props) {
   var copyText = typeof render.descriptionCopy === 'string' ? render.descriptionCopy : render.description;
   var description = typeof (render === null || render === void 0 ? void 0 : render.descriptionEllipsis) === 'string' ? render.descriptionEllipsis : render === null || render === void 0 ? void 0 : render.description;
 
+  var renderEdit = function renderEdit(result) {
+    var _render$description;
+
+    return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_Edit__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z, {
+      result: result,
+      value: (_render$description = render.description) === null || _render$description === void 0 ? void 0 : _render$description.toString(),
+      renderEdit: render.descriptionRenderEdit,
+      editPopConfirmProps: render.descriptionEditPopConfirmProps,
+      editOnClick: render.descriptionEditOnClick
+    });
+  };
+
   var renderDescription = function renderDescription() {
-    var _ref, _render$description;
+    var _ref, _render$description2;
+
+    var result = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, (_ref = (_render$description2 = render === null || render === void 0 ? void 0 : render.description) !== null && _render$description2 !== void 0 ? _render$description2 : render.emptyText) !== null && _ref !== void 0 ? _ref : '');
 
     if (render === null || render === void 0 ? void 0 : render.descriptionCopy) {
-      return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_Copy__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z, {
+      result = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_Copy__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z, {
         result: /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, description),
         value: copyText,
         render: render
       });
     }
 
-    return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, (_ref = (_render$description = render === null || render === void 0 ? void 0 : render.description) !== null && _render$description !== void 0 ? _render$description : render.emptyText) !== null && _ref !== void 0 ? _ref : '');
+    if (render.descriptionEdit) {
+      result = renderEdit(result);
+    }
+
+    return result;
   };
 
   var renderDescriptionEllipsis = function renderDescriptionEllipsis() {
-    var _render$descriptionRo, _ref2, _render$description2;
+    var _render$descriptionRo, _ref2, _render$description3;
 
     var result = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_teamix_utils__WEBPACK_IMPORTED_MODULE_1__.Ellipsis, {
       className: cls({
@@ -54822,7 +54854,7 @@ var Description = function Description(props) {
       },
       rows: (_render$descriptionRo = render === null || render === void 0 ? void 0 : render.descriptionRows) !== null && _render$descriptionRo !== void 0 ? _render$descriptionRo : 1,
       tooltip: description
-    }, (_ref2 = (_render$description2 = render === null || render === void 0 ? void 0 : render.description) !== null && _render$description2 !== void 0 ? _render$description2 : render.emptyText) !== null && _ref2 !== void 0 ? _ref2 : '');
+    }, (_ref2 = (_render$description3 = render === null || render === void 0 ? void 0 : render.description) !== null && _render$description3 !== void 0 ? _render$description3 : render.emptyText) !== null && _ref2 !== void 0 ? _ref2 : '');
 
     if (render.descriptionCopy) {
       result = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_Copy__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z, {
@@ -54833,15 +54865,7 @@ var Description = function Description(props) {
     }
 
     if (render.descriptionEdit) {
-      var _render$description3;
-
-      result = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_Edit__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z, {
-        result: result,
-        value: (_render$description3 = render.description) === null || _render$description3 === void 0 ? void 0 : _render$description3.toString(),
-        renderEdit: render.descriptionRenderEdit,
-        editPopConfirmProps: render.descriptionEditPopConfirmProps,
-        editOnClick: render.descriptionEditOnClick
-      });
+      result = renderEdit(result);
     }
 
     return result;
@@ -55006,7 +55030,11 @@ var Edit = function Edit(props) {
       renderEdit = props.renderEdit,
       editPopConfirmProps = props.editPopConfirmProps,
       editOnClick = props.editOnClick,
-      render = props.render; // 设置浮层打开关闭 暴露给外层组件
+      render = props.render,
+      onVisibleChange = props.onVisibleChange;
+  (0,react__WEBPACK_IMPORTED_MODULE_3__.useEffect)(function () {
+    onVisibleChange === null || onVisibleChange === void 0 ? void 0 : onVisibleChange(editVisible);
+  }, [editVisible]); // 设置浮层打开关闭 暴露给外层组件
 
   var setPopConfirmVisibleFunc = function setPopConfirmVisibleFunc(status) {
     if (!status) {
@@ -62647,16 +62675,41 @@ var QueryFilter = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(funct
       onInit = props.onInit,
       onReset = props.onReset,
       onExpand = props.onExpand,
-      otherProps = _objectWithoutPropertiesLoose(props, _excluded); // 表单默认值初始化回调
+      otherProps = _objectWithoutPropertiesLoose(props, _excluded);
+
+  var _useSpecialProps = (0,_useSpecialProps__WEBPACK_IMPORTED_MODULE_14__/* ["default"] */ .Z)(props),
+      hasDefault = _useSpecialProps.hasDefault,
+      hasChangeDefault = _useSpecialProps.hasChangeDefault,
+      hasRequired = _useSpecialProps.hasRequired;
+
+  var hasDefaultOrRequired = hasDefault || hasRequired;
 
+  var _useState = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(!!expand),
+      panelVisible = _useState[0],
+      setPanelVisible = _useState[1];
+
+  var _useState2 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)([]),
+      tagDataSource = _useState2[0],
+      setTagDataSource = _useState2[1];
+
+  var filterItem = (0,react__WEBPACK_IMPORTED_MODULE_0__.useRef)([]);
+  var defaultForm = mode === 'panel' ? hasDefaultOrRequired || panelVisible ? 'advanced' : 'light' : 'simple';
+  var currentForm = (0,react__WEBPACK_IMPORTED_MODULE_0__.useRef)(defaultForm);
+  var prefixCls = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_6__.usePrefixCls)('', {
+    prefix: 'teamix-pro-form-query-filter'
+  });
+  /**
+   * 处理onInit与onFilter事件的触发问题
+   */
+
+  var filterEnable = (0,react__WEBPACK_IMPORTED_MODULE_0__.useRef)('waiting');
 
-  var _onFormInit = function onFormInit(form, _ref, configFilterItem) {
+  var _onFormInit = function onFormInit(form, _ref) {
     var initialRequest = _ref.initialRequest,
-        initialValues = _ref.initialValues,
-        onInit = _ref.onInit;
+        initialValues = _ref.initialValues;
 
     if (!form.mounted) {
-      // form的loading为自定义属性
+      // 在form上自定义loading属性使用
       form.setState({
         loading: !!initialRequest || !!initialValues
       });
@@ -62664,32 +62717,27 @@ var QueryFilter = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(funct
 
     var loadingField = Object.values(form.fields).filter(function (field) {
       return !!field.loading;
-    });
+    }); // 等待表单mounted + 字段loading结束 + form的loading结束 => 表单初始化完成
 
-    if (form.mounted) {
+    if (form.mounted && loadingField.length === 0 && !form.loading) {
       if (loadingField.length === 0 && !form.loading) {
-        // 仅执行一次onInit
-        _onFormInit = function onFormInit() {};
-
-        var onInitResult = onInit == null ? void 0 : onInit((0,_formily_reactive__WEBPACK_IMPORTED_MODULE_5__.toJS)(form.values));
+        _onFormInit = function onFormInit() {}; // init后销毁 isFormInit 方法
 
-        if (onInitResult) {
-          // 根据onInit返回值，判断是否使用该事件执行筛选，使用过则添加筛选标签
-          configFilterItem == null ? void 0 : configFilterItem(form);
-          configTag();
-        } // 防止onInit前后的无效onFilter
 
+        var values = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_6__.getValidValues)(form.values);
 
-        if (!Object.keys(form.initialValues).length) {
-          // 如果没有默认值，直接开启onFilter
-          filterEnable.current = true;
+        if (!(0,_teamix_utils__WEBPACK_IMPORTED_MODULE_6__.isUsable)(values) || !hasChangeDefault) {
+          // 表单无默认值 或 无触发onChange的默认值配置，不会触发onFilter内的onInit，所以主动触发onInit
+          setTimeout(function () {
+            onInit == null ? void 0 : onInit((0,_formily_reactive__WEBPACK_IMPORTED_MODULE_5__.toJS)(form.values));
+          }, 0);
+          filterEnable.current = 'filter';
         } else {
-          // 否则，拿onFilter的值与默认值进行比较
-          filterEnable.current = form.initialValues;
+          filterEnable.current = 'initialized';
         }
       }
     }
-  }; // 设置当前form
+  }; // 配置当前激活的form实例
 
 
   var setCurrentForm = function setCurrentForm(formName) {
@@ -62711,7 +62759,9 @@ var QueryFilter = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(funct
       validateFirst: true,
       effects: function effects() {
         (0,_formily_core__WEBPACK_IMPORTED_MODULE_4__.onFormReact)(function (form) {
-          _onFormInit(form, props);
+          if (defaultForm === 'simple') {
+            _onFormInit(form, props);
+          }
         });
       }
     });
@@ -62721,8 +62771,13 @@ var QueryFilter = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(funct
     return (0,_formily_core__WEBPACK_IMPORTED_MODULE_4__.createForm)({
       validateFirst: true,
       effects: function effects() {
+        (0,_formily_core__WEBPACK_IMPORTED_MODULE_4__.onFormReact)(function (form) {
+          if (defaultForm === 'light') {
+            _onFormInit(form, props);
+          }
+        });
         (0,_formily_core__WEBPACK_IMPORTED_MODULE_4__.onFormInputChange)(function () {
-          setCurrentForm('light');
+          setCurrentForm('light'); // 主动修改轻量筛选值
         });
       }
     });
@@ -62733,11 +62788,12 @@ var QueryFilter = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(funct
       validateFirst: true,
       effects: function effects() {
         (0,_formily_core__WEBPACK_IMPORTED_MODULE_4__.onFormReact)(function (form) {
-          _onFormInit(form, props, configFilterItem);
+          if (defaultForm === 'advanced') {
+            _onFormInit(form, props);
+          }
         });
         (0,_formily_core__WEBPACK_IMPORTED_MODULE_4__.onFormInputChange)(function (form) {
-          // 主动修改高级筛选值
-          setCurrentForm('advanced');
+          setCurrentForm('advanced'); // 主动修改高级筛选值
         });
       }
     });
@@ -62746,33 +62802,7 @@ var QueryFilter = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(funct
     simple: simpleForm,
     light: lightForm,
     advanced: advancedForm
-  };
-
-  var _useSpecialProps = (0,_useSpecialProps__WEBPACK_IMPORTED_MODULE_14__/* ["default"] */ .Z)(props),
-      hasDefault = _useSpecialProps.hasDefault,
-      hasAsyncDefault = _useSpecialProps.hasAsyncDefault,
-      hasRequired = _useSpecialProps.hasRequired;
-
-  var hasDefaultOrRequired = hasDefault || hasAsyncDefault || hasRequired;
-
-  var _useState = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(!!expand),
-      advancedFilterVisible = _useState[0],
-      setAdvancedFilterVisible = _useState[1];
-
-  var _useState2 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)([]),
-      tagDataSource = _useState2[0],
-      setTagDataSource = _useState2[1];
-
-  var filterItem = (0,react__WEBPACK_IMPORTED_MODULE_0__.useRef)([]);
-  var currentForm = (0,react__WEBPACK_IMPORTED_MODULE_0__.useRef)(mode === 'panel' ? advancedFilterVisible ? 'advanced' : 'light' : 'simple');
-  var filterEnable = (0,react__WEBPACK_IMPORTED_MODULE_0__.useRef)(false);
-  var prefixCls = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_6__.usePrefixCls)('', {
-    prefix: 'teamix-pro-form-query-filter'
-  }); // 设置筛选数据
-
-  var configFilterItem = (0,react__WEBPACK_IMPORTED_MODULE_0__.useCallback)(function (form) {
-    filterItem.current = getFilterDisplayValues(form);
-  }, []); // 获取筛选数据Label
+  }; // 获取筛选数据Label
 
   var getFilterDisplayValues = (0,react__WEBPACK_IMPORTED_MODULE_0__.useCallback)(function (form) {
     var displayValues = (0,_ProForm_useFormDisplayValues__WEBPACK_IMPORTED_MODULE_9__/* .getFormDisplayValues */ .z)(form);
@@ -62798,7 +62828,7 @@ var QueryFilter = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(funct
             index: index
           });
         });
-      } else if ((0,_teamix_utils__WEBPACK_IMPORTED_MODULE_6__.isSignificative)(value)) {
+      } else if ((0,_teamix_utils__WEBPACK_IMPORTED_MODULE_6__.isUsable)(value)) {
         filterData.push({
           key: key,
           type: _fieldTypeMap__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z[component] || 'text',
@@ -62808,63 +62838,56 @@ var QueryFilter = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(funct
       }
     });
     return filterData;
+  }, []); // 设置筛选数据
+
+  var configFilterItem = (0,react__WEBPACK_IMPORTED_MODULE_0__.useCallback)(function (form) {
+    filterItem.current = getFilterDisplayValues(form);
   }, []); // 设置标签数据
 
   var configTag = (0,react__WEBPACK_IMPORTED_MODULE_0__.useCallback)(function () {
     setTagDataSource(filterItem.current);
-  }, [filterItem.current]); // 展开收起高级筛选
+  }, []); // 展开收起高级筛选
 
   var toggleAdvancedFilter = (0,react__WEBPACK_IMPORTED_MODULE_0__.useCallback)(function () {
-    var result = !advancedFilterVisible;
+    var result = !panelVisible;
 
     if (result) {
       // 展开高级筛选，Light回填Advanced
       if (currentForm.current === 'light') {
-        advancedForm.setValues(lightForm.values);
+        Object.entries(lightForm.values || {}).map(function (_ref3) {
+          var key = _ref3[0],
+              value = _ref3[1];
+          // 有效值值回填，防止全部值回填改变，触发不必要的 reactions
+          advancedForm.setValuesIn(key, value);
+        });
       }
     } else {
       // 收起高级筛选，配置标签数据
       configTag();
     }
 
-    setAdvancedFilterVisible(result);
+    setPanelVisible(result);
     onExpand == null ? void 0 : onExpand(result);
-  }, [advancedFilterVisible, configTag, currentForm.current]); // 是否开启onFilter
-
-  var enableFilter = function enableFilter(values) {
-    var initialValues = JSON.stringify((0,_teamix_utils__WEBPACK_IMPORTED_MODULE_6__.getValidValues)(filterEnable.current));
-    var changeValues = JSON.stringify((0,_teamix_utils__WEBPACK_IMPORTED_MODULE_6__.getValidValues)(values));
-
-    if (filterEnable.current === true) {
-      return true;
-    } else if (initialValues === changeValues) {
-      filterEnable.current = true;
-      return false;
-    }
-
-    return false;
-  }; // 简单搜索Filter
-
+  }, [panelVisible, configTag]); // 简单搜索Filter
 
   var onSimpleFilter = (0,react__WEBPACK_IMPORTED_MODULE_0__.useCallback)( /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(values) {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(values) {
       return regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
-              if (enableFilter(values)) {
-                _context.next = 2;
+              if (!(currentForm.current === 'simple')) {
+                _context.next = 14;
                 break;
               }
 
-              return _context.abrupt("return");
-
-            case 2:
-              if (!(currentForm.current === 'simple')) {
-                _context.next = 7;
+              if (!(filterEnable.current === 'initialized')) {
+                _context.next = 9;
                 break;
               }
 
+              filterEnable.current = 'filter';
+
               if (!hasRequired) {
                 _context.next = 6;
                 break;
@@ -62874,9 +62897,28 @@ var QueryFilter = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(funct
               return simpleForm.validate();
 
             case 6:
+              onInit == null ? void 0 : onInit(values);
+              _context.next = 14;
+              break;
+
+            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 ? void 0 : onFilter(values);
 
-            case 7:
+            case 14:
             case "end":
               return _context.stop();
           }
@@ -62885,39 +62927,49 @@ var QueryFilter = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(funct
     }));
 
     return function (_x) {
-      return _ref3.apply(this, arguments);
+      return _ref4.apply(this, arguments);
     };
-  }(), [onFilter, currentForm.current, hasRequired, enableFilter]); // 轻量搜索Filter
+  }(), [onFilter, hasRequired, onInit]); // 轻量搜索Filter
 
   var onLightFilter = (0,react__WEBPACK_IMPORTED_MODULE_0__.useCallback)( /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(values) {
+    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 (enableFilter(values)) {
-                _context2.next = 2;
+              if (!(currentForm.current === 'light')) {
+                _context2.next = 14;
                 break;
               }
 
-              return _context2.abrupt("return");
-
-            case 2:
-              if (!(currentForm.current === 'light')) {
+              if (!(filterEnable.current === 'initialized')) {
                 _context2.next = 8;
                 break;
               }
 
+              filterEnable.current = 'filter';
+              onInit == null ? void 0 : onInit(values);
+              configFilterItem(advancedForm);
+              configTag();
+              _context2.next = 14;
+              break;
+
+            case 8:
+              if (!(filterEnable.current === 'filter')) {
+                _context2.next = 14;
+                break;
+              }
+
               onFilter == null ? void 0 : onFilter(values);
-              _context2.next = 6;
+              _context2.next = 12;
               return advancedForm.reset();
 
-            case 6:
+            case 12:
               // 不会触发高级筛选的onReset回调函数
               configFilterItem(advancedForm);
               configTag();
 
-            case 8:
+            case 14:
             case "end":
               return _context2.stop();
           }
@@ -62926,33 +62978,70 @@ var QueryFilter = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(funct
     }));
 
     return function (_x2) {
-      return _ref4.apply(this, arguments);
+      return _ref5.apply(this, arguments);
     };
-  }(), [onFilter, currentForm.current, enableFilter]); // 高级搜索Filter
+  }(), [onFilter, onInit]); // 高级搜索Filter by Submit
 
   var onAdvancedFilter = (0,react__WEBPACK_IMPORTED_MODULE_0__.useCallback)(function (values) {
-    if (!enableFilter(values)) {
-      return;
-    }
-
     setCurrentForm('advanced');
     onFilter == null ? void 0 : onFilter(values);
     configFilterItem(advancedForm);
     lightForm.reset();
-  }, [onFilter, currentForm.current, enableFilter]); // 高级搜索Change
-
-  var onAdvancedChange = (0,react__WEBPACK_IMPORTED_MODULE_0__.useCallback)(function (values) {
-    if (!enableFilter(values)) {
-      return;
-    }
-  }, [enableFilter]); // 高级搜索Reset
+  }, [onFilter]); // 高级搜索Reset
 
   var onAdvancedReset = (0,react__WEBPACK_IMPORTED_MODULE_0__.useCallback)(function () {
     setCurrentForm('advanced');
     onReset == null ? void 0 : onReset((0,_formily_reactive__WEBPACK_IMPORTED_MODULE_5__.toJS)(advancedForm.values));
     configFilterItem(advancedForm);
     lightForm.reset();
-  }, [onReset]); // 关闭标签清空表单字段值
+  }, [onReset]); // 高级搜索Filter by Change
+
+  var onAdvancedChange = (0,react__WEBPACK_IMPORTED_MODULE_0__.useCallback)( /*#__PURE__*/function () {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3(values) {
+      return regeneratorRuntime.wrap(function _callee3$(_context3) {
+        while (1) {
+          switch (_context3.prev = _context3.next) {
+            case 0:
+              if (!(currentForm.current === 'advanced')) {
+                _context3.next = 9;
+                break;
+              }
+
+              if (!(filterEnable.current === 'initialized')) {
+                _context3.next = 9;
+                break;
+              }
+
+              filterEnable.current = 'filter';
+
+              if (!hasRequired) {
+                _context3.next = 6;
+                break;
+              }
+
+              _context3.next = 6;
+              return advancedForm.validate();
+
+            case 6:
+              onInit == null ? void 0 : onInit(values);
+              configFilterItem(advancedForm);
+
+              if (!panelVisible) {
+                configTag();
+              }
+
+            case 9:
+            case "end":
+              return _context3.stop();
+          }
+        }
+      }, _callee3);
+    }));
+
+    return function (_x3) {
+      return _ref6.apply(this, arguments);
+    };
+  }(), [hasRequired, onInit]); // 关闭标签清空表单字段值
 
   var onTagClose = (0,react__WEBPACK_IMPORTED_MODULE_0__.useCallback)(function (key, index) {
     var newValue = undefined;
@@ -62972,7 +63061,8 @@ var QueryFilter = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(funct
     form.setState({
       loading: false
     });
-  }, []);
+  }, []); // 组件挂载
+
   (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
     setCurrentForm(currentForm.current);
   }, []);
@@ -62980,7 +63070,7 @@ var QueryFilter = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(funct
     className: classnames__WEBPACK_IMPORTED_MODULE_1___default()(prefixCls, props.className),
     addonBefore: addonBefore,
     addonAfter: addonAfter,
-    expand: advancedFilterVisible,
+    expand: panelVisible,
     onExpand: toggleAdvancedFilter,
     count: tagDataSource.length,
     inlineContent: mode === 'panel' ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
@@ -63004,12 +63094,12 @@ var QueryFilter = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(funct
       onReset: onAdvancedReset,
       onInitialComplete: onInitialComplete
     })) : null
-  }, mode === 'panel' && !advancedFilterVisible ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_3__.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__WEBPACK_IMPORTED_MODULE_0___default().createElement(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_3__.Tag.Group, null, tagDataSource.map(function (_ref7) {
+    var key = _ref7.key,
+        label = _ref7.label,
+        value = _ref7.value,
+        type = _ref7.type,
+        index = _ref7.index;
     return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_3__.Tag.Closeable, {
       key: (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_6__.isNum)(index) ? key + label : key,
       afterClose: function afterClose() {
@@ -63238,8 +63328,9 @@ AdvancedFilter.defaultProps = {
 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) {
@@ -63247,13 +63338,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,_teamix_utils__WEBPACK_IMPORTED_MODULE_0__.isSignificative)(value);
+          children = item.children; // 字符串变量配置default值会触发onChange
+
+      hasChangeDefault = hasChangeDefault || !!((0,_teamix_utils__WEBPACK_IMPORTED_MODULE_0__.isPureObj)(dataSource) && (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_0__.isStr)(value) && value.indexOf('.dataSource'));
+      hasDefault = hasDefault || (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_0__.isUsable)(value);
       hasRequired = hasRequired || required || !!rules;
-      hasAsyncDefault = hasAsyncDefault || !!request || // 如果dataSource是异步且default取自dataSource
-      !!((0,_teamix_utils__WEBPACK_IMPORTED_MODULE_0__.isPlainObj)(dataSource) && (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_0__.isStr)(value) && value.indexOf('.dataSource'));
 
       if (children != null && children.length) {
         hasDefaultOrRule(children);
@@ -63264,7 +63354,7 @@ var useSpecialProps = function useSpecialProps(props) {
   hasDefaultOrRule(props.schema);
   return {
     hasDefault: hasDefault,
-    hasAsyncDefault: hasAsyncDefault,
+    hasChangeDefault: hasChangeDefault,
     hasRequired: hasRequired
   };
 };
@@ -63985,10 +64075,10 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
       var _initializeRequest = (0,_initializeRequest__WEBPACK_IMPORTED_MODULE_12__/* ["default"] */ .Z)(request, suffix + "r"),
           requestReactions = _initializeRequest.reactions,
-          requestScope = _initializeRequest.scope; // 初始化dataSource
+          requestScope = _initializeRequest.scope; // 初始化dataSource，如果readPretty为字符串表达式将失去loading等状态，仍可配置dataSource
 
 
-      var _initializeDataSource = (0,_initializeDataSource__WEBPACK_IMPORTED_MODULE_14__/* ["default"] */ .Z)(dataSource, suffix + "d"),
+      var _initializeDataSource = (0,_initializeDataSource__WEBPACK_IMPORTED_MODULE_14__/* ["default"] */ .Z)(dataSource, suffix + "d", newItem.readPretty),
           defaultDataSource = _initializeDataSource.dataSource,
           dataSourceReactions = _initializeDataSource.reactions,
           dataSourceScope = _initializeDataSource.scope; // 初始化rules validator
@@ -64237,14 +64327,14 @@ var initialize = function initialize(item) {
 /* harmony import */ var _teamix_utils__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(80653);
 
 
-var initializeDataSource = function initializeDataSource(dataSource, suffix) {
+var initializeDataSource = function initializeDataSource(dataSource, suffix, readPretty) {
   if ((0,_teamix_utils__WEBPACK_IMPORTED_MODULE_0__.isPlainObj)(dataSource)) {
     var _scope;
 
     var _requestConfig = dataSource;
     var requestConfigName = "$requestConfig_" + suffix;
     return {
-      reactions: ["{{$dataSource($request," + requestConfigName + ",context)}}"],
+      reactions: ["{{$dataSource($request," + requestConfigName + ",context," + readPretty + ")}}"],
       scope: (_scope = {}, _scope[requestConfigName] = _requestConfig, _scope)
     };
   }
@@ -64856,28 +64946,41 @@ var $validator = function $validator(services, requestConfig, context) {
 }; // 配置DataSource
 
 
-var $dataSource = function $dataSource(services, requestConfig, context) {
+var $dataSource = function $dataSource(services, requestConfig, context, readPretty) {
   return function (field) {
-    field.setState({
-      loading: true,
-      readOnly: true
-    });
-    return services(field, requestConfig, context, 'dataSource').then(function (res) {
+    if (!readPretty) {
+      field.setState({
+        loading: true,
+        readOnly: true
+      });
+    }
+
+    return services(field, requestConfig, context).then(function (res) {
       var isValueInDataSource = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_0__.getValueByValue)(res, field.value);
       var clearValue = isValueInDataSource ? {} : {
         value: undefined
       };
-      field.setState(_objectSpread({
-        dataSource: res,
-        loading: false,
-        readOnly: false
-      }, clearValue));
+
+      if (!readPretty) {
+        field.setState(_objectSpread({
+          dataSource: res,
+          loading: false,
+          readOnly: false
+        }, clearValue));
+      } else {
+        field.setState({
+          dataSource: res
+        });
+      }
+
       return requestConfig.onComplete && requestConfig.onComplete(res, field, context);
     })["catch"](function () {
-      field.setState({
-        loading: false,
-        readOnly: false
-      });
+      if (!readPretty) {
+        field.setState({
+          loading: false,
+          readOnly: false
+        });
+      }
     });
   };
 };
@@ -65666,7 +65769,7 @@ _teamix_icon__WEBPACK_IMPORTED_MODULE_14__/* ["default"].setConfig */ .Z.setConf
  // export * from './sidebar';
 
 
-var version = '1.2.34';
+var version = '1.2.35';
 
 
 /***/ }),
@@ -68605,8 +68708,8 @@ var getColorAndStyle = function getColorAndStyle(color, backgroundColor, backgro
   var isColorPresetColor = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_5__.isPresetColor)(color);
   var isBgColorPresetColor = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_5__.isPresetColor)(backgroundColor);
   var className = classnames__WEBPACK_IMPORTED_MODULE_2___default()((_classnames = {}, _classnames["" + (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_5__.getColorClassName)(color)] = isColorPresetColor, _classnames["" + (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_5__.getBackgroundColorClassName)(backgroundColor)] = isBgColorPresetColor, _classnames["" + cls("bg-type-" + backgroundType)] = !!backgroundType, _classnames));
-  var styleColor = isColorPresetColor ? undefined : color;
-  var styleBgColor = isBgColorPresetColor ? undefined : backgroundColor;
+  var styleColor = isColorPresetColor ? (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_5__.getColor)(color) : color;
+  var styleBgColor = isBgColorPresetColor ? (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_5__.getColor)(color) : backgroundColor;
   var style = {
     color: styleColor,
     backgroundColor: styleBgColor
@@ -71426,8 +71529,8 @@ var ProTable = function ProTable(props) {
   var normalDataFilterForm = normalDataFilterFormRef.current;
   var fullscreenDataFilterForm = fullscreenDataFilterFormRef.current; // 传给 QueryFilter 的 formRef
 
-  var dataFilterFormRef = !fullscreenState ? normalDataFilterFormRef : fullscreenDataFilterFormRef;
-  var dataFilterForm = dataFilterFormRef.current; // 整个内容区是否超过一屏。用于表格在非全屏模式下的吸底
+  var dataFilterFormRef = !fullscreenState ? normalDataFilterFormRef : fullscreenDataFilterFormRef; // let dataFilterForm = dataFilterFormRef.current;
+  // 整个内容区是否超过一屏。用于表格在非全屏模式下的吸底
 
   var _useState15 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false),
       footerSuctionState = _useState15[0],
@@ -71635,12 +71738,12 @@ var ProTable = function ProTable(props) {
       _request(params);
     },
     reset: function reset() {
-      var _actionRef$current4, _request2;
+      var _actionRef$current4, _dataFilterFormRef$cu, _request2;
 
       (propsDataFilter == null ? void 0 : propsDataFilter.onReset) && (propsDataFilter == null ? void 0 : propsDataFilter.onReset()); // 清空列过滤参数
 
       (_actionRef$current4 = actionRef.current) == null ? void 0 : _actionRef$current4.setFilterRules == null ? void 0 : _actionRef$current4.setFilterRules({});
-      dataFilterForm == null ? void 0 : dataFilterForm.reset();
+      (_dataFilterFormRef$cu = dataFilterFormRef.current) == null ? void 0 : _dataFilterFormRef$cu.reset();
       setCurrentPage(1);
 
       _request((_request2 = {}, _request2[targetPageKey] = 1, _request2));
@@ -71662,7 +71765,8 @@ var ProTable = function ProTable(props) {
       pageSize: pageSize
     },
     data: data,
-    dataFilterForm: dataFilterForm,
+    dataFilterForm: dataFilterFormRef.current,
+    dataFilterFormRef: dataFilterFormRef,
     normalDataFilterForm: normalDataFilterForm,
     fullscreenDataFilterForm: fullscreenDataFilterForm,
     filterEnableRef: filterEnableRef,
@@ -71757,7 +71861,7 @@ var ProTable = function ProTable(props) {
   }); // 请求函数
 
   function _request(params, noLoading, filterParams) {
-    var _actionRef$current$ge, _actionRef$current5, _objectSpread2;
+    var _dataFilterFormRef$cu2, _actionRef$current$ge, _actionRef$current5, _objectSpread2;
 
     // 如果没有传 url 且没有 customRequest，直接返回
     if (!url && !customRequest) {
@@ -71770,7 +71874,7 @@ var ProTable = function ProTable(props) {
 
     var sortParams = targetFormatSort(sort); // 筛选区请求参数
 
-    var dataFilterParams = filterParams != null ? filterParams : dataFilterForm == null ? void 0 : dataFilterForm.values; // 列过滤请求参数
+    var dataFilterParams = filterParams != null ? filterParams : (_dataFilterFormRef$cu2 = dataFilterFormRef.current) == null ? void 0 : _dataFilterFormRef$cu2.values; // 列过滤请求参数
 
     var columnsFilterParams = (_actionRef$current$ge = (_actionRef$current5 = actionRef.current) == null ? void 0 : _actionRef$current5.getFilterRules == null ? void 0 : _actionRef$current5.getFilterRules()) != null ? _actionRef$current$ge : {}; // 格式化后的请求参数
 
@@ -71869,6 +71973,7 @@ var ProTable = function ProTable(props) {
   }, propsDataFilter), {}, {
     onInit: function onInit(values) {
       // 表单初始化请求处理
+      console.log('onInit');
       (propsDataFilter == null ? void 0 : propsDataFilter.onInit) && (propsDataFilter == null ? void 0 : propsDataFilter.onInit(values));
       !fullscreenState && _request({}, false, values);
       return true;
@@ -71876,7 +71981,8 @@ var ProTable = function ProTable(props) {
     onFilter: function onFilter(values) {
       var _actionRef$current6, _request3;
 
-      // 全屏状态，判断全屏表单onFilter是否禁用
+      console.log('onFilter'); // 全屏状态，判断全屏表单onFilter是否禁用
+
       if (fullscreenState && !filterEnableRef.current.fullscreen) {
         filterEnableRef.current.fullscreen = true;
         return;
@@ -71896,10 +72002,10 @@ var ProTable = function ProTable(props) {
       _request((_request3 = {}, _request3[targetPageKey] = 1, _request3), false, values);
     },
     onReset: function onReset(values) {
-      var _request4;
+      var _dataFilterFormRef$cu3, _request4;
 
       (propsDataFilter == null ? void 0 : propsDataFilter.onReset) && (propsDataFilter == null ? void 0 : propsDataFilter.onReset());
-      dataFilterForm == null ? void 0 : dataFilterForm.reset();
+      (_dataFilterFormRef$cu3 = dataFilterFormRef.current) == null ? void 0 : _dataFilterFormRef$cu3.reset();
       setCurrentPage(1);
 
       _request((_request4 = {}, _request4[targetPageKey] = 1, _request4), false, values);