@teamix/pro 1.3.13 → 1.3.16

package/es/table/utils/pureGenProColumnToColumn.js

@@ -0,0 +1,36 @@
+var _excluded = ["filters", "dataIndex"];
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+
+import { renderColumnsTitle, renderCell } from './pureColumnRender';
+/**
+ * ProColumn => Column，去掉操作列，过滤器相关逻辑
+ * 用于非 ProTable 比如 selectTable
+ */
+
+export default function genProColumnToColumn(columns) {
+  return columns.map(function (columnProps) {
+    var filters = columnProps.filters,
+        dataIndex = columnProps.dataIndex,
+        others = _objectWithoutProperties(columnProps, _excluded);
+
+    return _objectSpread(_objectSpread({
+      // 金钱样式默认右对齐
+      align: columnProps.valueType === 'money' ? 'right' : 'left'
+    }, others), {}, {
+      dataIndex: dataIndex === null || dataIndex === void 0 ? void 0 : dataIndex.toString(),
+      title: renderColumnsTitle(columnProps),
+      cell: function cell(value, index, record) {
+        return renderCell(value, columnProps, index, record);
+      }
+    });
+  });
+}

package/es/timeline/ProTimeLineItem/index.js

@@ -1,4 +1,4 @@
-var _excluded = ["_comment", "_shape", "status", "image", "icon", "title", "subTitle", "timeLeft", "content", "animation", "discription", "tags", "collapsible", "defaultCollapsed", "collapsed", "onCollapse", "dotRender"];
+var _excluded = ["_comment", "_shape", "status", "image", "icon", "title", "subTitle", "time", "timeLeft", "content", "animation", "discription", "tags", "collapsible", "defaultCollapsed", "collapsed", "onCollapse", "dotRender"];
 
 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; }
 
@@ -43,6 +43,7 @@ var ProTimeLineItem = function ProTimeLineItem(props) {
       icon = props.icon,
       title = props.title,
       subTitle = props.subTitle,
+      time = props.time,
       timeLeft = props.timeLeft,
       content = props.content,
       animation = props.animation,
@@ -54,8 +55,10 @@ var ProTimeLineItem = function ProTimeLineItem(props) {
       onCollapse = props.onCollapse,
       dotRender = props.dotRender,
       others = _objectWithoutProperties(props, _excluded);
-  /** 内容去折叠相关 */
 
+  var timeRight = time !== null && time !== void 0 ? time : subTitle; // 兼容 subTitle
+
+  /** 内容去折叠相关 */
 
   var _useState = useState(defaultCollapsed !== undefined ? defaultCollapsed : false),
       _useState2 = _slicedToArray(_useState, 2),
@@ -165,9 +168,9 @@ var ProTimeLineItem = function ProTimeLineItem(props) {
       }))
     }, title), tags && /*#__PURE__*/React.createElement("div", {
       className: classnames(cls('wrapper-right-top-tag-info'))
-    }, renderTag()), subTitle && /*#__PURE__*/React.createElement("div", {
+    }, renderTag()), timeRight && /*#__PURE__*/React.createElement("div", {
       className: classnames(cls('wrapper-right-top-subTitle-info'))
-    }, formatTime(subTitle))), discription && /*#__PURE__*/React.createElement("div", {
+    }, formatTime(timeRight))), discription && /*#__PURE__*/React.createElement("div", {
       className: classnames(cls('wrapper-right-discribe-info'))
     }, discription), /*#__PURE__*/React.createElement("div", {
       className: classnames(cls('wrapper-right-content-info'))
@@ -177,7 +180,7 @@ var ProTimeLineItem = function ProTimeLineItem(props) {
         'wrapper-right-content-info-open': showContent
       }))
     }, content))));
-  }, [_shape, timeLeft, image, title, tags, subTitle, discription, content, collapsible, collapsed, defaultCollapsed, onCollapseChanged]);
+  }, [_shape, timeLeft, image, title, tags, timeRight, discription, content, collapsible, collapsed, defaultCollapsed, onCollapseChanged]);
   /**
    * 重新渲染 timeline 节点
    * */

package/es/timeline/typing.d.ts

@@ -60,8 +60,13 @@ export declare type ProTimeLineItemProps = {
     dotRender?: (index?: number, status?: string) => ReactNode;
     /**
      * 节点副标题
+     * @deprecated 弃用，请使用 `time`
      */
     subTitle?: ReactNode;
+    /**
+     * 右侧时间
+     */
+    time?: ReactNode;
     /**
      * 节点对应描述
      */

package/lib/actions/index.js

@@ -231,8 +231,18 @@ var ProActionButton = function ProActionButton(props) {
   }, tooltipProps);
 
   if (tooltip || disabledTooltip) {
-    var showToolTip = disabled ? disabledTooltip : tooltip;
-    content = /*#__PURE__*/_react.default.createElement(_components.Balloon.Tooltip, _objectSpread({}, baseToolTipProps), showToolTip);
+    if (tooltip && !disabledTooltip) {
+      if (!disabled) {
+        content = /*#__PURE__*/_react.default.createElement(_components.Balloon.Tooltip, _objectSpread({}, baseToolTipProps), tooltip);
+      }
+    } else if (!tooltip && disabledTooltip) {
+      if (disabled) {
+        content = /*#__PURE__*/_react.default.createElement(_components.Balloon.Tooltip, _objectSpread({}, baseToolTipProps), disabledTooltip);
+      }
+    } else if (tooltip && disabledTooltip) {
+      var showToolTip = disabled ? disabledTooltip : tooltip;
+      content = /*#__PURE__*/_react.default.createElement(_components.Balloon.Tooltip, _objectSpread({}, baseToolTipProps), showToolTip);
+    }
   }
 
   return content;
@@ -248,7 +258,10 @@ var ProActionMenuButtonItem = function ProActionMenuButtonItem(props) {
       _onClick2 = action.onClick,
       children = action.children,
       icon = action.icon,
-      disabled = action.disabled;
+      disabled = action.disabled,
+      tooltip = action.tooltip,
+      disabledTooltip = action.disabledTooltip,
+      tooltipProps = action.tooltipProps;
   var menuItemActionConfig = Object.assign({}, config, {
     trigger: 'onClick'
   });
@@ -262,9 +275,32 @@ var ProActionMenuButtonItem = function ProActionMenuButtonItem(props) {
       return _onClick2(e, context);
     }
   }) : _objectSpread({}, menuItemProps);
+  var content = buttonContent(children, icon, undefined, context);
+
+  var baseToolTipProps = _objectSpread({
+    triggerType: 'hover',
+    align: 't',
+    trigger: content
+  }, tooltipProps);
+
+  if (tooltip || disabledTooltip) {
+    if (tooltip && !disabledTooltip) {
+      if (!disabled) {
+        content = /*#__PURE__*/_react.default.createElement(_components.Balloon.Tooltip, _objectSpread({}, baseToolTipProps), tooltip);
+      }
+    } else if (!tooltip && disabledTooltip) {
+      if (disabled) {
+        content = /*#__PURE__*/_react.default.createElement(_components.Balloon.Tooltip, _objectSpread({}, baseToolTipProps), disabledTooltip);
+      }
+    } else if (tooltip && disabledTooltip) {
+      var showToolTip = disabled ? disabledTooltip : tooltip;
+      content = /*#__PURE__*/_react.default.createElement(_components.Balloon.Tooltip, _objectSpread({}, baseToolTipProps), showToolTip);
+    }
+  }
+
   return /*#__PURE__*/_react.default.createElement("div", _objectSpread({
     className: (0, _classnames.default)('teamix-pro-action-menu-item', "".concat((0, _utils.usePrefixCls)(), "menu-item"), _defineProperty({}, "".concat((0, _utils.usePrefixCls)(), "disabled"), disabled))
-  }, buttonProps), buttonContent(children, icon, undefined, context));
+  }, buttonProps), content);
 };
 
 function renderCommonActionButtonMenuItem(action, key, context) {

package/lib/actions/index.scss

@@ -121,3 +121,16 @@
     }
   }
 }
+
+// 针对弹层内的 table 在暗色模式下适配
+.next-dialog-body {
+  .teamix-pro-table, .next-table-empty {
+    background: var(--dialog-bg);
+  }
+}
+
+.next-drawer-body {
+  .teamix-pro-table, .next-table-empty {
+    background: var(--drawer-bg);
+  }
+}

package/lib/form/Filter/LightFilter.js

@@ -35,13 +35,9 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
-var lightFilterObs = (0, _reactive.observable)({
-  onFilter: function onFilter() {}
-});
 /**
  * 轻量筛选
  */
-
 var LightFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
   var _schema$;
 
@@ -54,10 +50,15 @@ var LightFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       activeFilterValueRef = props.activeFilterValueRef,
       otherProps = _objectWithoutProperties(props, _excluded);
 
-  var filterValue = (0, _react.useRef)(defaultFilterValue || ((_schema$ = schema[0]) === null || _schema$ === void 0 ? void 0 : _schema$.name));
+  var filterValue = (0, _react.useRef)(defaultFilterValue || (schema === null || schema === void 0 ? void 0 : (_schema$ = schema[0]) === null || _schema$ === void 0 ? void 0 : _schema$.name));
   var prefixCls = (0, _utils.usePrefixCls)('', {
     prefix: 'teamix-pro-form-query-filter-light'
   });
+  var lightFilterObs = (0, _react.useMemo)(function () {
+    return (0, _reactive.observable)({
+      onFilter: function onFilter() {}
+    });
+  }, []);
   (0, _react.useEffect)(function () {
     if (activeFilterValueRef) {
       activeFilterValueRef.current = filterValue.current;
@@ -108,7 +109,7 @@ var LightFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
   }, [schema, onFilterChange, defaultFilterValue]);
   (0, _react.useEffect)(function () {
     lightFilterObs.onFilter = onFilter;
-  }, [onChange]);
+  }, [onFilter]);
   return /*#__PURE__*/_react.default.createElement(_ProForm.default, _objectSpread(_objectSpread({}, otherProps), {}, {
     scope: _objectSpread(_objectSpread({}, otherProps === null || otherProps === void 0 ? void 0 : otherProps.scope), {}, {
       lightFilterObs: lightFilterObs

package/lib/form/Filter/index.js

@@ -43,9 +43,11 @@ var _Layout = require("./Layout");
 
 var _useSpecialProps2 = _interopRequireDefault(require("./useSpecialProps"));
 
+var _useBindUrl2 = _interopRequireDefault(require("./useBindUrl"));
+
 require("./index.scss");
 
-var _excluded = ["addonAfter", "addonBefore", "mode", "purePanel", "expand", "formRef", "defaultFilterValue", "filterValues", "filterDebounce", "onFilter", "onInit", "onReset", "onExpand", "onChange"];
+var _excluded = ["addonAfter", "addonBefore", "mode", "purePanel", "expand", "formRef", "defaultFilterValue", "filterValues", "filterDebounce", "bindUrl", "onFilter", "onInit", "onReset", "onExpand", "onChange"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -100,9 +102,10 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       defaultFilterValue = props.defaultFilterValue,
       filterValues = props.filterValues,
       filterDebounce = props.filterDebounce,
-      onFilter = props.onFilter,
-      onInit = props.onInit,
-      onReset = props.onReset,
+      bindUrl = props.bindUrl,
+      outerFilter = props.onFilter,
+      outerInit = props.onInit,
+      outerReset = props.onReset,
       onExpand = props.onExpand,
       onChange = props.onChange,
       otherProps = _objectWithoutProperties(props, _excluded);
@@ -121,15 +124,27 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       setTagDataSource = _useState4[1];
 
   var filterItem = (0, _react.useRef)([]);
-  var defaultForm = mode === 'panel' ? 'advanced' : 'simple';
-  var currentForm = (0, _react.useRef)(defaultForm);
+  var defaultFormName = mode === 'panel' ? 'advanced' : 'simple';
+  var currentFormName = (0, _react.useRef)(defaultFormName);
+  var currentForm = (0, _react.useRef)();
   var activeFilterValueRef = (0, _react.useRef)();
   var prefixCls = (0, _utils.usePrefixCls)('', {
     prefix: 'teamix-pro-form-query-filter'
   });
   var debounceFun = (0, _lodash.default)(function (fun, props) {
     return fun(props);
-  }, filterDebounce); // onInit
+  }, filterDebounce); // 绑定URL
+
+  var _useBindUrl = (0, _useBindUrl2.default)(bindUrl, {
+    onInit: outerInit,
+    onFilter: outerFilter,
+    onReset: outerReset
+  }, currentForm),
+      setValuesByUrlState = _useBindUrl.setValuesByUrlState,
+      onInit = _useBindUrl.onInit,
+      onFilter = _useBindUrl.onFilter,
+      onReset = _useBindUrl.onReset; // onInit
+
 
   var initialRequestRef = (0, _react.useRef)(!!(props === null || props === void 0 ? void 0 : props.initialRequest));
   var filterEnable = (0, _react.useRef)('waiting');
@@ -154,12 +169,11 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
                 break;
               }
 
-              onFormInit = function onFormInit() {}; // init后销毁 isFormInit 方法
-
+              onFormInit = undefined; // init后销毁 isFormInit 方法
 
-              filterEnable.current = 'filter';
+              setValuesByUrlState(form); // 配置URL参数到表单
 
-              if (!onInit) {
+              if (!outerInit) {
                 _context.next = 10;
                 break;
               }
@@ -168,7 +182,7 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
               return form.validate();
 
             case 8:
-              onInit === null || onInit === void 0 ? void 0 : onInit((0, _reactive.toJS)(form.values)); // 设置Tag
+              onInit((0, _reactive.toJS)(form.values)); // 设置Tag
 
               if (mode === 'panel') {
                 configFilterItem(advancedForm);
@@ -190,17 +204,110 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
 
 
   var setCurrentForm = function setCurrentForm(formName) {
-    currentForm.current = formName;
+    currentFormName.current = formName;
+    currentForm.current = formMap[formName];
+    var form = currentForm.current;
 
     if (formRef) {
-      var form = formMap[formName];
-      formRef.current = form;
+      formRef.current = form; // 自定义updateTags方法
 
       if (!formRef.current.updateTags) {
         formRef.current.updateTags = function () {
-          configFilterItem(form);
-          configTag();
+          updateTags(form);
         };
+      } // 自定义setAsyncValues方法
+
+
+      if (!formRef.current.setAsyncValues) {
+        formRef.current.setAsyncValues = /*#__PURE__*/function () {
+          var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(values) {
+            return regeneratorRuntime.wrap(function _callee2$(_context2) {
+              while (1) {
+                switch (_context2.prev = _context2.next) {
+                  case 0:
+                    form.setValues(values);
+
+                    if (!(filterEnable.current === 'filter' && formName === 'advanced')) {
+                      _context2.next = 6;
+                      break;
+                    }
+
+                    _context2.next = 4;
+                    return form.validate();
+
+                  case 4:
+                    onFilter((0, _reactive.toJS)(form.values));
+                    updateTags(form);
+
+                  case 6:
+                  case "end":
+                    return _context2.stop();
+                }
+              }
+            }, _callee2);
+          }));
+
+          return function (_x2) {
+            return _ref2.apply(this, arguments);
+          };
+        }();
+      } // 自定义triggerFilter方法
+
+
+      if (!formRef.current.triggerFilter) {
+        formRef.current.triggerFilter = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3() {
+          return regeneratorRuntime.wrap(function _callee3$(_context3) {
+            while (1) {
+              switch (_context3.prev = _context3.next) {
+                case 0:
+                  _context3.next = 2;
+                  return form.validate();
+
+                case 2:
+                  onFilter((0, _reactive.toJS)(form.values));
+
+                  if (formName === 'advanced') {
+                    updateTags(form);
+                  }
+
+                case 4:
+                case "end":
+                  return _context3.stop();
+              }
+            }
+          }, _callee3);
+        }));
+      } // 自定义triggerReset方法
+
+
+      if (!formRef.current.triggerReset) {
+        formRef.current.triggerReset = /*#__PURE__*/function () {
+          var _ref4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4(config) {
+            return regeneratorRuntime.wrap(function _callee4$(_context4) {
+              while (1) {
+                switch (_context4.prev = _context4.next) {
+                  case 0:
+                    simpleForm.reset('*', config);
+                    lightForm.reset('*', config);
+                    advancedForm.reset('*', config);
+
+                    if (formName === 'advanced') {
+                      onReset((0, _reactive.toJS)(advancedForm.values));
+                      updateTags(form);
+                    }
+
+                  case 4:
+                  case "end":
+                    return _context4.stop();
+                }
+              }
+            }, _callee4);
+          }));
+
+          return function (_x3) {
+            return _ref4.apply(this, arguments);
+          };
+        }();
       }
     }
   }; // 创建简单筛选表单实例
@@ -212,7 +319,11 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       effects: function effects() {
         (0, _core.onFormReact)(function (form) {
           if (mode === 'inline') {
-            onFormInit(form);
+            var _onFormInit;
+
+            (_onFormInit = onFormInit) === null || _onFormInit === void 0 ? void 0 : _onFormInit(form).finally(function () {
+              return filterEnable.current = 'filter';
+            });
           }
         });
       }
@@ -236,7 +347,11 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       effects: function effects() {
         (0, _core.onFormReact)(function (form) {
           if (mode === 'panel') {
-            onFormInit(form);
+            var _onFormInit2;
+
+            (_onFormInit2 = onFormInit) === null || _onFormInit2 === void 0 ? void 0 : _onFormInit2(form).finally(function () {
+              return filterEnable.current = 'filter';
+            });
           }
         });
         (0, _core.onFormInputChange)(function (form) {
@@ -255,12 +370,12 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     var displayValues = (0, _useFormDisplayValues.getFormDisplayValues)(form);
     var originalData = Object.entries(displayValues);
     var filterData = [];
-    originalData.forEach(function (_ref2) {
+    originalData.forEach(function (_ref5) {
       var _data$displayValue;
 
-      var _ref3 = _slicedToArray(_ref2, 2),
-          key = _ref3[0],
-          data = _ref3[1];
+      var _ref6 = _slicedToArray(_ref5, 2),
+          key = _ref6[0],
+          data = _ref6[1];
 
       var value = (_data$displayValue = data.displayValue) !== null && _data$displayValue !== void 0 ? _data$displayValue : data.value;
       var component = data.component;
@@ -295,6 +410,11 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
 
   var configTag = (0, _react.useCallback)(function () {
     setTagDataSource(filterItem.current);
+  }, []); // 更新标签数据
+
+  var updateTags = (0, _react.useCallback)(function (form) {
+    configFilterItem(form);
+    configTag();
   }, []); // 展开收起高级筛选
 
   var toggleAdvancedFilter = (0, _react.useCallback)(function () {
@@ -302,7 +422,7 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
 
     if (result) {
       // 展开高级筛选，Light回填Advanced
-      if (currentForm.current === 'light') {
+      if (currentFormName.current === 'light') {
         var key = activeFilterValueRef.current;
         var value = lightForm.values[key];
         advancedForm.setValuesIn(key, value);
@@ -317,68 +437,66 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
   }, [panelVisible, configTag]); // 简单搜索Filter
 
   var onSimpleFilter = (0, _react.useCallback)( /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(values) {
-      return regeneratorRuntime.wrap(function _callee2$(_context2) {
+    var _ref7 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5(values) {
+      return regeneratorRuntime.wrap(function _callee5$(_context5) {
         while (1) {
-          switch (_context2.prev = _context2.next) {
+          switch (_context5.prev = _context5.next) {
             case 0:
-              _context2.next = 2;
+              _context5.next = 2;
               return simpleForm.validate();
 
             case 2:
-              onFilter === null || onFilter === void 0 ? void 0 : onFilter(values);
+              onFilter(values);
 
             case 3:
             case "end":
-              return _context2.stop();
+              return _context5.stop();
           }
         }
-      }, _callee2);
+      }, _callee5);
     }));
 
-    return function (_x2) {
-      return _ref4.apply(this, arguments);
+    return function (_x4) {
+      return _ref7.apply(this, arguments);
     };
   }(), [onFilter]); // 简单搜索Change
 
   var onSimpleChange = (0, _react.useCallback)(function (values, fieldValue, fieldName) {
-    if (currentForm.current === 'simple') {
+    if (currentFormName.current === 'simple') {
       onChange === null || onChange === void 0 ? void 0 : onChange(values, fieldValue, fieldName);
 
       if (filterEnable.current === 'filter') {
         debounceFun(onSimpleFilter, values);
       }
     }
-  }, [onChange]); // 轻量搜索Filter
+  }, [onChange, onSimpleFilter]); // 轻量搜索Filter
 
   var onLightFilter = (0, _react.useCallback)(function (values) {
     var _Object$keys;
 
-    onFilter === null || onFilter === void 0 ? void 0 : onFilter(values); // 清空advancedForm的值
+    onFilter(values); // 清空advancedForm的值
 
     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); // 配置Tag
-
-    configFilterItem(advancedForm);
-    configTag();
+    advancedForm.setValues(clearKeys);
+    updateTags(advancedForm);
   }, [onFilter]); // 轻量搜索Change
 
   var onLightChange = (0, _react.useCallback)(function (values, fieldValue, fieldName) {
-    if (currentForm.current === 'light') {
+    if (currentFormName.current === 'light') {
       onChange === null || onChange === void 0 ? void 0 : onChange(values, fieldValue, fieldName);
 
       if (filterEnable.current === 'filter') {
         debounceFun(onLightFilter, values);
       }
     }
-  }, [onChange]); // 高级搜索Filter
+  }, [onChange, onLightFilter]); // 高级搜索Filter
 
   var onAdvancedFilter = (0, _react.useCallback)(function (values) {
     setCurrentForm('advanced');
-    onFilter === null || onFilter === void 0 ? void 0 : onFilter(values);
+    onFilter(values);
     configFilterItem(advancedForm); // 清空lightForm的值
 
     lightForm.reset('*', {
@@ -388,7 +506,7 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
 
   var onAdvancedReset = (0, _react.useCallback)(function () {
     setCurrentForm('advanced');
-    onReset === null || onReset === void 0 ? void 0 : onReset((0, _reactive.toJS)(advancedForm.values));
+    onReset((0, _reactive.toJS)(advancedForm.values));
     configFilterItem(advancedForm); // 清空lightForm的值
 
     lightForm.reset('*', {
@@ -397,7 +515,7 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
   }, [onReset]); // 高级搜索Change
 
   var onAdvancedChange = (0, _react.useCallback)(function (values, fieldValue, fieldName) {
-    if (currentForm.current === 'advanced') {
+    if (currentFormName.current === 'advanced') {
       onChange === null || onChange === void 0 ? void 0 : onChange(values, fieldValue, fieldName);
     }
   }, [onChange]); // 关闭标签清空表单字段值
@@ -411,9 +529,8 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     }
 
     advancedForm.setValuesIn(key, newValue);
-    configFilterItem(advancedForm);
-    configTag();
-    onFilter === null || onFilter === void 0 ? void 0 : onFilter((0, _reactive.toJS)(advancedForm.values));
+    updateTags(advancedForm);
+    onFilter((0, _reactive.toJS)(advancedForm.values));
   }, [onFilter]); // initialRequest 的回调
 
   var onInitialComplete = (0, _react.useCallback)(function (form) {
@@ -424,7 +541,7 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
   }, []); // 组件挂载
 
   (0, _react.useEffect)(function () {
-    setCurrentForm(currentForm.current);
+    setCurrentForm(currentFormName.current);
   }, []);
   return /*#__PURE__*/_react.default.createElement(_Layout.QueryFilterLayout, {
     className: (0, _classnames.default)(prefixCls, props.className),
@@ -456,12 +573,12 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       onReset: onAdvancedReset,
       onInitialComplete: onInitialComplete
     })) : null
-  }, mode === 'panel' && !panelVisible ? /*#__PURE__*/_react.default.createElement(_components.Tag.Group, null, tagDataSource.map(function (_ref5) {
-    var key = _ref5.key,
-        label = _ref5.label,
-        value = _ref5.value,
-        type = _ref5.type,
-        index = _ref5.index;
+  }, mode === 'panel' && !panelVisible ? /*#__PURE__*/_react.default.createElement(_components.Tag.Group, null, tagDataSource.map(function (_ref8) {
+    var key = _ref8.key,
+        label = _ref8.label,
+        value = _ref8.value,
+        type = _ref8.type,
+        index = _ref8.index;
     return /*#__PURE__*/_react.default.createElement(_components.Tag.Closeable, {
       key: (0, _utils.isNum)(index) ? key + label : key,
       afterClose: function afterClose() {

package/lib/form/Filter/layout.scss

@@ -6,6 +6,10 @@ $query-filter-layout: #{$teamix-pro-form}-query-filter-layout;
   --panel-filter-bg: #1f1f1f;
 }
 
+.theme-hybridcloud {
+  --panel-filter-bg: var(--color-fill1-2);
+}
+
 .#{$query-filter-layout} {
   .#{$query-filter-layout}-inline {
     display: flex;

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

@@ -0,0 +1,2 @@
+declare const _default: (bindUrl: any, functions: any, formRef: any) => any;
+export default _default;