@teamix/pro 1.2.26 → 1.2.30

package/dist/pro.min.js.LICENSE.txt

@@ -24,6 +24,8 @@ object-assign
 * (c) Sindre Sorhus; MIT License
 */
 
+/*! js-cookie v3.0.1 | MIT */
+
 /** @license React v16.13.1
  * react-is.production.min.js
  *

package/es/actions/index.d.ts

@@ -41,6 +41,7 @@ export interface ProActionCommonProps {
 export interface ProActionMenuButtonProps extends ProActionCommonProps, Omit<MenuButtonProps, 'visible'> {
     actions: ProActionProps[];
     icon?: string;
+    noArrow?: boolean;
 }
 export declare const ProActionMenuButton: (props: ProActionMenuButtonProps) => JSX.Element;
 export interface ProActionDividerProps extends ProActionCommonProps {
@@ -61,9 +62,7 @@ export declare type ProActionGroupProps = {
      */
     moreText?: string;
     /** 更多按钮的配置，只有在actions数量超过max时才有效 */
-    more?: string | (ProActionButtonProps & {
-        noArrow?: boolean;
-    });
+    more?: string | Omit<ProActionMenuButtonProps, 'actions'>;
     /** 是否有分割线，只有type="text"时生效，默认有分割线 */
     divider?: boolean;
 } & React.HTMLAttributes<HTMLElement>;

package/es/actions/index.js

@@ -1,12 +1,11 @@
 var _excluded = ["type"],
     _excluded2 = ["config", "icon", "iconSize", "type", "context", "children", "visible", "onClick"],
     _excluded3 = ["loading"],
-    _excluded4 = ["icon", "iconSize", "label", "actions", "children", "context", "type"],
+    _excluded4 = ["icon", "iconSize", "label", "actions", "children", "context", "type", "className", "noArrow"],
     _excluded5 = ["context", "text"],
-    _excluded6 = ["noArrow", "className"],
-    _excluded7 = ["key", "actions"],
-    _excluded8 = ["key", "config"],
-    _excluded9 = ["type", "divider", "max", "moreText", "more", "context", "actions", "className"];
+    _excluded6 = ["key", "actions"],
+    _excluded7 = ["key", "config"],
+    _excluded8 = ["type", "divider", "max", "moreText", "more", "context", "actions", "className"];
 
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
@@ -243,6 +242,8 @@ export var ProActionMenuButton = function ProActionMenuButton(props) {
       context = props.context,
       _props$type2 = props.type,
       type = _props$type2 === void 0 ? 'primary' : _props$type2,
+      className = props.className,
+      noArrow = props.noArrow,
       others = _objectWithoutProperties(props, _excluded4);
 
   return /*#__PURE__*/React.createElement(MenuButton, _objectSpread({
@@ -256,7 +257,10 @@ export var ProActionMenuButton = function ProActionMenuButton(props) {
       v2: true
     },
     type: type,
-    label: buttonContent(label || children, icon, iconSize, context)
+    label: buttonContent(label || children, icon, iconSize, context),
+    className: cls(className, {
+      'teamix-pro-actions-text-menu-btn-no-arrow': noArrow
+    })
   }, others), actions.map(function (action, i) {
     return renderCommonActionButtonMenuItem(action, action.key || i, context);
   }));
@@ -316,14 +320,12 @@ function renderCommonActionButton(button, context, isTypeText) {
 }
 
 function getDefaultMoreButton(type, more) {
-  var noArrowClassName = 'teamix-pro-actions-text-menu-btn-no-arrow';
   var defaultConfig = type === 'button' ? {
     children: getMessage('more')
   } : {
     icon: 'more-line',
-    // iconSize: 'small',
     autoWidth: false,
-    className: noArrowClassName
+    noArrow: true
   };
 
   if (!more) {
@@ -338,13 +340,7 @@ function getDefaultMoreButton(type, more) {
     return Object.assign(defaultConfig, moreConfig);
   }
 
-  var noArrow = moreConfig.noArrow,
-      className = moreConfig.className,
-      others = _objectWithoutProperties(moreConfig, _excluded6);
-
-  return _objectSpread({
-    className: cls(className, _defineProperty({}, "".concat(noArrowClassName), noArrow))
-  }, others);
+  return moreConfig;
 }
 
 var MAX_ACTTIONS = 4;
@@ -361,7 +357,7 @@ function getActionConfig(action, index, context) {
   if (action.actions) {
     var _key = action.key,
         actions = action.actions,
-        _others = _objectWithoutProperties(action, _excluded7);
+        _others = _objectWithoutProperties(action, _excluded6);
 
     return _objectSpread({
       key: getKey(index, _key),
@@ -373,7 +369,7 @@ function getActionConfig(action, index, context) {
 
   var key = action.key,
       config = action.config,
-      others = _objectWithoutProperties(action, _excluded8);
+      others = _objectWithoutProperties(action, _excluded7);
 
   return _objectSpread({
     key: getKey(index, key),
@@ -394,7 +390,7 @@ export function ProActionGroup(props) {
       _props$actions = props.actions,
       actions = _props$actions === void 0 ? [] : _props$actions,
       className = props.className,
-      containerProps = _objectWithoutProperties(props, _excluded9);
+      containerProps = _objectWithoutProperties(props, _excluded8);
 
   var isTypeText = type === 'text';
   var filteredActions = actions.map(function (action, index) {

package/es/form/Filter/AdvancedFilter.js

@@ -53,7 +53,7 @@ var AdvancedFilter = /*#__PURE__*/memo(function (props) {
       props: {
         breakpoints: [480, 720, 990, 1200, Infinity],
         maxColumns: [1, 2, 3, 3, 4],
-        maxWidth: [480, 360, 330, 330, 300],
+        maxWidth: [480, 360, 330, 400],
         columnGap: 16,
         rowGap: 12
       },

package/es/form/Filter/Layout.d.ts

@@ -0,0 +1,5 @@
+import React from 'react';
+import type { QueryFilterLayoutProps } from '../typing';
+import './layout.scss';
+declare const QueryFilterLayout: React.FC<QueryFilterLayoutProps>;
+export { QueryFilterLayout };

package/es/form/Filter/Layout.js

@@ -0,0 +1,82 @@
+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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+import React, { useCallback, useState } from 'react';
+import cls from 'classnames';
+import { Button, Badge } from '@alicloudfe/components';
+import TeamixIcon from '@teamix/icon';
+import { usePrefixCls, getMessage, isValid } from '@teamix/utils';
+import './layout.scss';
+
+var QueryFilterLayout = function QueryFilterLayout(_ref) {
+  var className = _ref.className,
+      addonBefore = _ref.addonBefore,
+      addonAfter = _ref.addonAfter,
+      inlineContent = _ref.inlineContent,
+      panelContent = _ref.panelContent,
+      count = _ref.count,
+      expand = _ref.expand,
+      onExpand = _ref.onExpand,
+      children = _ref.children;
+  var prefixCls = usePrefixCls('', {
+    prefix: 'teamix-pro-form-query-filter-layout'
+  });
+
+  var _useState = useState(!!expand),
+      _useState2 = _slicedToArray(_useState, 2),
+      visible = _useState2[0],
+      setVisible = _useState2[1];
+
+  var onClick = useCallback(function () {
+    setVisible(!visible);
+    onExpand === null || onExpand === void 0 ? void 0 : onExpand(!visible);
+  }, [visible]);
+  return /*#__PURE__*/React.createElement("div", {
+    className: cls(prefixCls, className)
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "".concat(prefixCls, "-inline")
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "".concat(prefixCls, "-left")
+  }, addonBefore ? /*#__PURE__*/React.createElement("div", {
+    className: "".concat(prefixCls, "-addonBefore")
+  }, addonBefore) : null, inlineContent, isValid(panelContent) ? /*#__PURE__*/React.createElement("div", {
+    className: "".concat(prefixCls, "-toggle")
+  }, /*#__PURE__*/React.createElement(Badge, {
+    count: count,
+    style: _objectSpread({
+      backgroundColor: 'var(--color-brand1-6, #0064c8)',
+      color: 'var(--color-white, #fff)'
+    }, visible ? {
+      display: 'none'
+    } : {})
+  }, /*#__PURE__*/React.createElement(Button, {
+    onClick: onClick
+  }, visible ? /*#__PURE__*/React.createElement(TeamixIcon, {
+    type: "up-line"
+  }) : /*#__PURE__*/React.createElement(TeamixIcon, {
+    type: "filter-line"
+  }), getMessage('advancedFilter')))) : null), addonAfter ? /*#__PURE__*/React.createElement("div", {
+    className: "".concat(prefixCls, "-addonAfter")
+  }, addonAfter) : null), /*#__PURE__*/React.createElement("div", {
+    className: cls("".concat(prefixCls, "-panel"), visible && isValid(panelContent) ? '' : "".concat(prefixCls, "-panel-hidden"))
+  }, panelContent), /*#__PURE__*/React.createElement("div", {
+    className: "".concat(prefixCls, "-children")
+  }, children));
+};
+
+export { QueryFilterLayout };

package/es/form/Filter/SimpleFilter.js

@@ -10,14 +10,16 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-import React, { memo, useMemo } from 'react';
+import React, { memo, useCallback, useMemo, useRef } from 'react';
 import cls from 'classnames';
 import { usePrefixCls } from '@teamix/utils';
-import ProForm from '../ProForm';
+import ProForm from '../ProForm'; // 初始化Search组件，内置部分属性
 
 var initializeSearch = function initializeSearch(schema) {
-  return schema.map(function (item) {
+  var searchName;
+  var initializedSchema = schema.map(function (item) {
     if (item.component === 'Search') {
+      searchName = item.name;
       return _objectSpread(_objectSpread({}, item), {}, {
         decoratorProps: _objectSpread(_objectSpread({}, item.decoratorProps), {}, {
           inset: false
@@ -30,6 +32,10 @@ var initializeSearch = function initializeSearch(schema) {
 
     return item;
   });
+  return {
+    searchName: searchName,
+    initializedSchema: initializedSchema
+  };
 };
 /**
  * 简单筛选
@@ -37,6 +43,8 @@ var initializeSearch = function initializeSearch(schema) {
 
 
 var SimpleFilter = /*#__PURE__*/memo(function (props) {
+  var searchValue = useRef(undefined);
+
   var schema = props.schema,
       onChange = props.onChange,
       onSubmit = props.onSubmit,
@@ -45,13 +53,18 @@ var SimpleFilter = /*#__PURE__*/memo(function (props) {
   var prefixCls = usePrefixCls('', {
     prefix: 'teamix-pro-form-query-filter-simple'
   });
+
+  var _initializeSearch = initializeSearch(schema),
+      searchName = _initializeSearch.searchName,
+      initializedSchema = _initializeSearch.initializedSchema;
+
   var simpleSchema = useMemo(function () {
     return [{
       component: 'FormFlex',
       props: {
         size: 8
       },
-      children: initializeSearch(schema)
+      children: initializedSchema
     }, {
       component: 'Submit',
       props: {
@@ -60,7 +73,18 @@ var SimpleFilter = /*#__PURE__*/memo(function (props) {
         }
       }
     }];
-  }, [schema]);
+  }, [initializedSchema]);
+  var onInnerChange = useCallback(function (values, value, name) {
+    // 处理Search组件，Select切换时不触发onChange
+    if (searchName === name) {
+      if (searchValue.current !== value[1]) {
+        onChange === null || onChange === void 0 ? void 0 : onChange(values, name, value);
+        searchValue.current = value[1];
+      }
+    } else {
+      onChange === null || onChange === void 0 ? void 0 : onChange(values, name, value);
+    }
+  }, [searchName, searchValue.current]);
   return /*#__PURE__*/React.createElement(ProForm, _objectSpread(_objectSpread({}, otherProps), {}, {
     className: cls(prefixCls, props.className),
     schema: simpleSchema,
@@ -68,7 +92,7 @@ var SimpleFilter = /*#__PURE__*/memo(function (props) {
     breakpoints: [],
     inset: true,
     onSubmit: onSubmit,
-    onChange: onChange
+    onChange: onInnerChange
   }));
 });
 export default SimpleFilter;

package/es/form/Filter/index2.d.ts

@@ -1,8 +1,9 @@
 import React from 'react';
+import { QueryFilterLayout } from './Layout';
 import type { QueryFilterProps } from '../typing';
 import './index2.scss';
 /**
  * 查询筛选
  */
 declare const QueryFilter: React.FC<QueryFilterProps>;
-export { QueryFilter };
+export { QueryFilter, QueryFilterLayout };

package/es/form/Filter/index2.js

@@ -1,4 +1,4 @@
-var _excluded = ["addonAfter", "addonBefore", "onFilter", "onInit", "onReset", "mode", "expand", "formRef", "defaultFilterValue"];
+var _excluded = ["addonAfter", "addonBefore", "mode", "expand", "formRef", "defaultFilterValue", "filterDebounce", "onFilter", "onInit", "onReset", "onExpand"];
 
 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; }
 
@@ -6,6 +6,14 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
@@ -28,68 +36,36 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 
 import React, { memo, useCallback, useMemo, useState, useRef, useEffect } from 'react';
 import cls from 'classnames';
-import { Tag, Button, Badge } from '@alicloudfe/components';
-import TeamixIcon from '@teamix/icon';
+import debounce from 'lodash.debounce';
+import { Tag } from '@alicloudfe/components';
 import { createForm, onFormReact, onFormInputChange } from '@formily/core';
 import { toJS } from '@formily/reactive';
-import { usePrefixCls, getMessage, isSignificative, isStr, isPlainObj } from '@teamix/utils';
+import { usePrefixCls, isSignificative, isNum } from '@teamix/utils';
 import ProField from '../../field/index';
 import fieldTypeMap from '../fieldTypeMap';
 import { getFormDisplayValues } from '../ProForm/useFormDisplayValues';
 import SimpleFilter from './SimpleFilter';
 import LightFilter from './LightFilter';
 import AdvancedFilter from './AdvancedFilter';
-import debounce from 'lodash.debounce';
-import './index2.scss'; // 获取Schema是否包含默认值、异步默认值、必选校验等
-
-var getSpecialProps = function getSpecialProps(props) {
-  var initialValues = props.initialValues,
-      initialRequest = props.initialRequest;
-  var hasDefault = !!initialValues;
-  var hasAsyncDefault = !!initialRequest;
-  var hasRequired = false;
-
-  var hasDefaultOrRule = function hasDefaultOrRule(schema) {
-    schema.forEach(function (item) {
-      var value = item.default,
-          required = item.required,
-          rules = item.rules,
-          request = item.request,
-          dataSource = item.dataSource,
-          children = item.children;
-      hasDefault = hasDefault || isSignificative(value);
-      hasRequired = hasRequired || required || !!rules;
-      hasAsyncDefault = hasAsyncDefault || !!request || // 如果dataSource是异步且default取自dataSource
-      !!(isPlainObj(dataSource) && isStr(value) && value.indexOf('.dataSource'));
-
-      if (children === null || children === void 0 ? void 0 : children.length) {
-        hasDefaultOrRule(children);
-      }
-    });
-  };
-
-  hasDefaultOrRule(props.schema);
-  return {
-    hasDefault: hasDefault,
-    hasAsyncDefault: hasAsyncDefault,
-    hasRequired: hasRequired
-  };
-};
+import { QueryFilterLayout } from './Layout';
+import useSpecialProps from './useSpecialProps';
+import './index2.scss';
 /**
  * 查询筛选
  */
 
-
 var QueryFilter = /*#__PURE__*/memo(function (props) {
   var addonAfter = props.addonAfter,
       addonBefore = props.addonBefore,
-      onFilter = props.onFilter,
-      onInit = props.onInit,
-      onReset = props.onReset,
       mode = props.mode,
       expand = props.expand,
       formRef = props.formRef,
       defaultFilterValue = props.defaultFilterValue,
+      filterDebounce = props.filterDebounce,
+      onFilter = props.onFilter,
+      onInit = props.onInit,
+      onReset = props.onReset,
+      onExpand = props.onExpand,
       otherProps = _objectWithoutProperties(props, _excluded); // 表单默认值初始化回调
 
 
@@ -176,10 +152,10 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
     advanced: advancedForm
   };
 
-  var _getSpecialProps = getSpecialProps(props),
-      hasDefault = _getSpecialProps.hasDefault,
-      hasAsyncDefault = _getSpecialProps.hasAsyncDefault,
-      hasRequired = _getSpecialProps.hasRequired;
+  var _useSpecialProps = useSpecialProps(props),
+      hasDefault = _useSpecialProps.hasDefault,
+      hasAsyncDefault = _useSpecialProps.hasAsyncDefault,
+      hasRequired = _useSpecialProps.hasRequired;
 
   var hasDefaultOrRequired = hasDefault || hasAsyncDefault || hasRequired;
 
@@ -205,22 +181,40 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
 
   var getFilterDisplayValues = useCallback(function (form) {
     var displayValues = getFormDisplayValues(form);
-    return Object.entries(displayValues).map(function (_ref2) {
+    var originalData = Object.entries(displayValues);
+    var filterData = [];
+    originalData.forEach(function (_ref2) {
       var _data$displayValue;
 
       var _ref3 = _slicedToArray(_ref2, 2),
           key = _ref3[0],
           data = _ref3[1];
 
-      return {
-        key: key,
-        type: fieldTypeMap[data.component] || 'text',
-        label: data.title,
-        value: (_data$displayValue = data.displayValue) !== null && _data$displayValue !== void 0 ? _data$displayValue : data.value
-      };
-    }).filter(function (item) {
-      return isSignificative(item.value);
+      var value = (_data$displayValue = data.displayValue) !== null && _data$displayValue !== void 0 ? _data$displayValue : data.value;
+      var component = data.component;
+
+      if (component === 'SelectGroup') {
+        var _data$value;
+
+        (_data$value = data.value) === null || _data$value === void 0 ? void 0 : _data$value.forEach(function (item, index) {
+          filterData.push({
+            key: key,
+            type: fieldTypeMap['MultipleSelect'],
+            label: item.key,
+            value: item.value,
+            index: index
+          });
+        });
+      } else if (isSignificative(value)) {
+        filterData.push({
+          key: key,
+          type: fieldTypeMap[component] || 'text',
+          label: data.title,
+          value: value
+        });
+      }
     });
+    return filterData;
   }, []); // 设置标签数据
 
   var configTag = useCallback(function () {
@@ -241,6 +235,7 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
     }
 
     setAdvancedFilterVisible(result);
+    onExpand === null || onExpand === void 0 ? void 0 : onExpand(result);
   }, [advancedFilterVisible, configTag, currentForm.current]); // 简单搜索Filter
 
   var onSimpleFilter = useCallback( /*#__PURE__*/function () {
@@ -325,8 +320,15 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
     lightForm.reset();
   }, [onReset]); // 关闭标签清空表单字段值
 
-  var onTagClose = useCallback(function (key) {
-    advancedForm.setValuesIn(key, undefined);
+  var onTagClose = useCallback(function (key, index) {
+    var newValue = undefined;
+
+    if (isNum(index)) {
+      newValue = _toConsumableArray(advancedForm.getValuesIn(key));
+      newValue.splice(index, 1);
+    }
+
+    advancedForm.setValuesIn(key, newValue);
     configFilterItem(advancedForm);
     configTag();
     onFilter && onFilter(toJS(advancedForm.values));
@@ -341,57 +343,44 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
   useEffect(function () {
     setCurrentForm(currentForm.current);
   }, []);
-  return /*#__PURE__*/React.createElement("div", {
-    className: cls(prefixCls, props.className)
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "".concat(prefixCls, "-inline")
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "".concat(prefixCls, "-left")
-  }, addonBefore ? /*#__PURE__*/React.createElement("div", {
-    className: "".concat(prefixCls, "-addonBefore")
-  }, addonBefore) : null, mode === 'panel' ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
-    className: cls("".concat(prefixCls, "-inline-form"), hasDefaultOrRequired ? "".concat(prefixCls, "-inline-form-hidden") : '')
-  }, /*#__PURE__*/React.createElement(LightFilter, _objectSpread(_objectSpread({}, otherProps), {}, {
-    defaultFilterValue: defaultFilterValue,
-    form: lightForm,
-    onChange: debounce(onLightFilter, 300)
-  }))), /*#__PURE__*/React.createElement("div", {
-    className: "".concat(prefixCls, "-toggle")
-  }, /*#__PURE__*/React.createElement(Badge, {
+  return /*#__PURE__*/React.createElement(QueryFilterLayout, {
+    className: cls(prefixCls, props.className),
+    addonBefore: addonBefore,
+    addonAfter: addonAfter,
+    expand: advancedFilterVisible,
+    onExpand: toggleAdvancedFilter,
     count: tagDataSource.length,
-    style: _objectSpread({
-      backgroundColor: 'var(--color-brand1-6, #0064c8)',
-      color: 'var(--color-white, #fff)'
-    }, advancedFilterVisible ? {
-      display: 'none'
-    } : {})
-  }, /*#__PURE__*/React.createElement(Button, {
-    onClick: toggleAdvancedFilter
-  }, advancedFilterVisible ? /*#__PURE__*/React.createElement(TeamixIcon, {
-    type: "up-line"
-  }) : /*#__PURE__*/React.createElement(TeamixIcon, {
-    type: "filter-line"
-  }), getMessage('advancedFilter'))))) : /*#__PURE__*/React.createElement("div", {
-    className: "".concat(prefixCls, "-inline-form")
-  }, /*#__PURE__*/React.createElement(SimpleFilter, _objectSpread(_objectSpread({}, otherProps), {}, {
-    form: simpleForm,
-    onChange: debounce(onSimpleFilter, 300),
-    onSubmit: onSimpleFilter
-  })))), addonAfter ? /*#__PURE__*/React.createElement("div", {
-    className: "".concat(prefixCls, "-addonAfter")
-  }, addonAfter) : null), mode === 'panel' ? /*#__PURE__*/React.createElement("div", {
-    className: "".concat(prefixCls, "-panel")
-  }, /*#__PURE__*/React.createElement("div", {
-    className: cls("".concat(prefixCls, "-tag"), advancedFilterVisible ? "".concat(prefixCls, "-tag-hidden") : '')
-  }, /*#__PURE__*/React.createElement(Tag.Group, null, tagDataSource.map(function (_ref7) {
+    inlineContent: mode === 'panel' ? /*#__PURE__*/React.createElement("div", {
+      className: cls("".concat(prefixCls, "-inline"), hasDefaultOrRequired ? "".concat(prefixCls, "-inline-hidden") : '')
+    }, /*#__PURE__*/React.createElement(LightFilter, _objectSpread(_objectSpread({}, otherProps), {}, {
+      defaultFilterValue: defaultFilterValue,
+      form: lightForm,
+      onChange: debounce(onLightFilter, filterDebounce)
+    }))) : /*#__PURE__*/React.createElement("div", {
+      className: "".concat(prefixCls, "-inline")
+    }, /*#__PURE__*/React.createElement(SimpleFilter, _objectSpread(_objectSpread({}, otherProps), {}, {
+      form: simpleForm,
+      onChange: debounce(onSimpleFilter, filterDebounce),
+      onSubmit: onSimpleFilter
+    }))),
+    panelContent: mode === 'panel' ? /*#__PURE__*/React.createElement(AdvancedFilter, _objectSpread(_objectSpread({}, otherProps), {}, {
+      initialRequest: otherProps.initialRequest ? _objectSpread(_objectSpread({}, otherProps.initialRequest), {}, {
+        onComplete: onInitialRequestComplete
+      }) : undefined,
+      form: advancedForm,
+      onSubmit: onAdvancedFilter,
+      onReset: onAdvancedReset
+    })) : null
+  }, mode === 'panel' && !advancedFilterVisible ? /*#__PURE__*/React.createElement(Tag.Group, null, tagDataSource.map(function (_ref7) {
     var key = _ref7.key,
         label = _ref7.label,
         value = _ref7.value,
-        type = _ref7.type;
+        type = _ref7.type,
+        index = _ref7.index;
     return /*#__PURE__*/React.createElement(Tag.Closeable, {
-      key: key,
+      key: isNum(index) ? key + label : key,
       afterClose: function afterClose() {
-        return onTagClose(key);
+        return onTagClose(key, index);
       }
     }, /*#__PURE__*/React.createElement("span", {
       className: "".concat(prefixCls, "-tag-title")
@@ -401,19 +390,11 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
       type: type,
       value: value
     })));
-  }))), /*#__PURE__*/React.createElement("div", {
-    className: cls("".concat(prefixCls, "-advanced-wrap"), !advancedFilterVisible ? "".concat(prefixCls, "-advanced-wrap-hidden") : '')
-  }, /*#__PURE__*/React.createElement(AdvancedFilter, _objectSpread(_objectSpread({}, otherProps), {}, {
-    initialRequest: otherProps.initialRequest ? _objectSpread(_objectSpread({}, otherProps.initialRequest), {}, {
-      onComplete: onInitialRequestComplete
-    }) : undefined,
-    form: advancedForm,
-    onSubmit: onAdvancedFilter,
-    onReset: onAdvancedReset
-  })))) : null);
+  })) : null);
 });
 QueryFilter.defaultProps = {
   mode: 'inline',
-  expand: false
+  expand: false,
+  filterDebounce: 300
 };
-export { QueryFilter };
+export { QueryFilter, QueryFilterLayout };