@teamix/pro 1.2.32 → 1.3.0

package/es/form/Filter/index.scss

@@ -1,8 +1,38 @@
 @import '../global.scss';
 
-// 筛选
-.#{$teamix-pro-form}-filter-advanced,
-.#{$teamix-pro-form}-filter-simple {
+$query-filter: #{$teamix-pro-form}-query-filter;
+
+.#{$query-filter} {
+  .#{$query-filter}-inline {
+    margin-right: 8px;
+    margin-bottom: 8px;
+  }
+  .#{$query-filter}-inline-hidden {
+    display: none;
+  }
+  .#{$query-filter}-tag-title {
+    margin-right: 12px;
+    color: var(--color-text1-8, #848484);
+  }
+  .#{$query-filter}-tag-content {
+    .#{$teamix-pro-field} {
+      display: inline-block;
+      .#{$css-prefix}form-preview {
+        color: var(--color-text1-2, #5a5a5a);
+        font-weight: bold;
+      }
+    }
+  }
+}
+
+.#{$query-filter}-advanced {
+  .#{$css-prefix}formily-button-group {
+    margin-top: 0;
+  }
+}
+.#{$query-filter}-advanced,
+.#{$query-filter}-simple,
+.#{$query-filter}-light {
   .#{$form-item-cls}-feedback-layout-popover {
     margin-bottom: 0;
   }
@@ -15,11 +45,3 @@
     }
   }
 }
-
-// 筛选和抽屉按钮
-.#{$teamix-pro-form}-filter-advanced,
-.#{$css-prefix}drawer-footer {
-  .#{$css-prefix}formily-button-group {
-    margin-top: 0;
-  }
-}

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

@@ -1,9 +1,13 @@
 import React from 'react';
-import { QueryFilterLayout } from './Layout';
-import type { QueryFilterProps } from '../typing';
+import type { IFilterProps } from '../typing';
 import './index2.scss';
 /**
- * 查询筛选
+ * 简单筛选
  */
-declare const QueryFilter: React.FC<QueryFilterProps>;
-export { QueryFilter, QueryFilterLayout };
+declare const SimpleFilter: React.FC<IFilterProps>;
+/**
+ * 高级筛选
+ */
+declare const AdvancedFilter: React.FC<IFilterProps>;
+export { AdvancedFilter, SimpleFilter };
+export default AdvancedFilter;

package/es/form/Filter/index2.js

@@ -1,400 +1,184 @@
-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; }
-
-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; }
+var _excluded = ["schema", "triggerType", "onFilter"];
 
 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 _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 _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); }); }; }
-
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
-function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
 function _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 React, { memo, useCallback, useMemo, useState, useRef, useEffect } from 'react';
-import cls from 'classnames';
-import debounce from 'lodash.debounce';
-import { Tag } from '@alicloudfe/components';
-import { createForm, onFormReact, onFormInputChange } from '@formily/core';
-import { toJS } from '@formily/reactive';
-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 { QueryFilterLayout } from './Layout';
-import useSpecialProps from './useSpecialProps';
-import './index2.scss';
-/**
- * 查询筛选
- */
-
-var QueryFilter = /*#__PURE__*/memo(function (props) {
-  var addonAfter = props.addonAfter,
-      addonBefore = props.addonBefore,
-      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); // 表单默认值初始化回调
-
-
-  var _onFormInit = function onFormInit(form, _ref, configFilterItem) {
-    var initialRequest = _ref.initialRequest,
-        onInit = _ref.onInit;
-
-    if (!form.mounted) {
-      form.loading = !!initialRequest;
-    }
-
-    var loadingField = Object.values(form.fields).filter(function (field) {
-      return !!field.loading;
-    });
-
-    if (form.mounted) {
-      if (loadingField.length === 0 && !form.loading) {
-        var onInitResult = onInit && onInit(toJS(form.values));
-
-        if (onInitResult) {
-          // 根据onInit返回值，判断是否使用该事件执行筛选，使用过则添加筛选标签
-          configFilterItem && configFilterItem(form);
-        }
-
-        _onFormInit = function onFormInit() {};
-      }
-    }
-  }; // 设置当前form
-
-
-  var setCurrentForm = function setCurrentForm(formName) {
-    currentForm.current = formName;
-
-    if (formRef) {
-      var form = formMap[formName];
-      formRef.current = form;
-
-      formRef.current.updateTags = function () {
-        configFilterItem(form);
-      };
-    }
-  }; // 创建简单筛选表单实例
+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; }
 
-  var simpleForm = useMemo(function () {
-    return createForm({
-      validateFirst: true,
-      effects: function effects() {
-        onFormReact(function (form) {
-          _onFormInit(form, props);
-        });
-      }
-    });
-  }, []); // 创建轻量筛选表单实例
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-  var lightForm = useMemo(function () {
-    return createForm({
-      validateFirst: true,
-      effects: function effects() {
-        onFormInputChange(function () {
-          setCurrentForm('light');
-        });
-      }
-    });
-  }, []); // 创建高级筛选表单实例
+import React, { memo, useMemo } from 'react';
+import cls from 'classnames';
+import { usePrefixCls, getMessage } from '@teamix/utils';
+import { createForm } from '@formily/core';
+import ProForm from '../ProForm';
+import { mergeArrayValue } from '../utils';
+import './index2.scss';
 
-  var advancedForm = useMemo(function () {
-    return createForm({
-      validateFirst: true,
-      effects: function effects() {
-        onFormReact(function (form) {
-          _onFormInit(form, props, configFilterItem);
-        });
-        onFormInputChange(function (form) {
-          // 主动修改高级筛选值
-          setCurrentForm('advanced');
-        });
-      }
-    });
-  }, []);
-  var formMap = {
-    simple: simpleForm,
-    light: lightForm,
-    advanced: advancedForm
+var getEventProps = function getEventProps(triggerType, onFilter) {
+  var keydownEvent = {
+    onSubmit: onFilter
   };
+  var changeEvent = {
+    onChange: onFilter
+  };
+  var eventMap = {
+    keydown: keydownEvent,
+    change: _objectSpread(_objectSpread({}, keydownEvent), changeEvent),
+    submit: keydownEvent
+  };
+  return eventMap[triggerType];
+};
+/**
+ * 简单筛选
+ */
 
-  var _useSpecialProps = useSpecialProps(props),
-      hasDefault = _useSpecialProps.hasDefault,
-      hasAsyncDefault = _useSpecialProps.hasAsyncDefault,
-      hasRequired = _useSpecialProps.hasRequired;
-
-  var hasDefaultOrRequired = hasDefault || hasAsyncDefault || hasRequired;
-
-  var _useState = useState(!!expand || hasDefaultOrRequired),
-      _useState2 = _slicedToArray(_useState, 2),
-      advancedFilterVisible = _useState2[0],
-      setAdvancedFilterVisible = _useState2[1];
 
-  var _useState3 = useState([]),
-      _useState4 = _slicedToArray(_useState3, 2),
-      tagDataSource = _useState4[0],
-      setTagDataSource = _useState4[1];
+var SimpleFilter = /*#__PURE__*/memo(function (props) {
+  var schema = props.schema,
+      triggerType = props.triggerType,
+      onFilter = props.onFilter,
+      otherProps = _objectWithoutProperties(props, _excluded);
 
-  var filterItem = useRef([]);
-  var currentForm = useRef(mode === 'panel' ? advancedFilterVisible ? 'advanced' : 'light' : 'simple');
   var prefixCls = usePrefixCls('', {
-    prefix: 'teamix-pro-form-query-filter'
-  }); // 设置筛选数据
-
-  var configFilterItem = useCallback(function (form) {
-    filterItem.current = getFilterDisplayValues(form);
-  }, []); // 获取筛选数据Label
-
-  var getFilterDisplayValues = useCallback(function (form) {
-    var displayValues = getFormDisplayValues(form);
-    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];
-
-      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 () {
-    setTagDataSource(filterItem.current);
-  }, [filterItem.current]); // 展开收起高级筛选
-
-  var toggleAdvancedFilter = useCallback(function () {
-    var result = !advancedFilterVisible;
-
-    if (result) {
-      // 展开高级筛选，Light回填Advanced
-      if (currentForm.current === 'light') {
-        advancedForm.setValues(lightForm.values);
-      }
-    } else {
-      // 收起高级筛选，配置标签数据
-      configTag();
-    }
-
-    setAdvancedFilterVisible(result);
-    onExpand === null || onExpand === void 0 ? void 0 : onExpand(result);
-  }, [advancedFilterVisible, configTag, currentForm.current]); // 简单搜索Filter
-
-  var onSimpleFilter = useCallback( /*#__PURE__*/function () {
-    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 (!(currentForm.current === 'simple')) {
-                _context.next = 5;
-                break;
-              }
-
-              if (!hasRequired) {
-                _context.next = 4;
-                break;
-              }
-
-              _context.next = 4;
-              return simpleForm.validate();
-
-            case 4:
-              onFilter && onFilter(values);
-
-            case 5:
-            case "end":
-              return _context.stop();
-          }
-        }
-      }, _callee);
-    }));
-
-    return function (_x) {
-      return _ref4.apply(this, arguments);
-    };
-  }(), [onFilter, currentForm.current, hasRequired]); // 轻量搜索Filter
-
-  var onLightFilter = useCallback( /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(values) {
-      return regeneratorRuntime.wrap(function _callee2$(_context2) {
-        while (1) {
-          switch (_context2.prev = _context2.next) {
-            case 0:
-              if (!(currentForm.current === 'light')) {
-                _context2.next = 6;
-                break;
-              }
-
-              onFilter && onFilter(values);
-              _context2.next = 4;
-              return advancedForm.reset();
-
-            case 4:
-              // 不会触发高级筛选的onReset回调函数
-              configFilterItem(advancedForm);
-              configTag();
-
-            case 6:
-            case "end":
-              return _context2.stop();
-          }
+    prefix: 'teamix-pro-form-filter-simple'
+  });
+  var simpleSchema = useMemo(function () {
+    return [{
+      component: 'FormFlex',
+      props: {
+        size: 8
+      },
+      children: [].concat(_toConsumableArray(schema), [{
+        type: 'void',
+        decorator: null,
+        component: 'Submit',
+        props: {
+          style: _objectSpread({}, triggerType === 'submit' ? {} : {
+            display: 'none'
+          })
         }
-      }, _callee2);
-    }));
-
-    return function (_x2) {
-      return _ref5.apply(this, arguments);
-    };
-  }(), [onFilter, currentForm.current]); // 高级搜索Filter
-
-  var onAdvancedFilter = useCallback(function (values) {
-    setCurrentForm('advanced');
-    onFilter && onFilter(values);
-    configFilterItem(advancedForm);
-    lightForm.reset();
-  }, [onFilter, currentForm.current]); // 高级搜索Reset
-
-  var onAdvancedReset = useCallback(function () {
-    setCurrentForm('advanced');
-    onReset && onReset(toJS(advancedForm.values));
-    configFilterItem(advancedForm);
-    lightForm.reset();
-  }, [onReset]); // 关闭标签清空表单字段值
-
-  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));
-  }, []); // 异步默认值回调，设置form的loading状态为false
+      }])
+    }];
+  }, [schema, triggerType]);
+  var eventProps = getEventProps(triggerType, onFilter);
+  return /*#__PURE__*/React.createElement(ProForm, _objectSpread(_objectSpread(_objectSpread({
+    feedbackLayout: "popover",
+    breakpoints: [],
+    inset: true
+  }, otherProps), eventProps), {}, {
+    className: cls(prefixCls, props.className),
+    schema: simpleSchema
+  }));
+});
+SimpleFilter.defaultProps = {
+  triggerType: 'change'
+};
+/**
+ * 高级筛选
+ */
 
-  var onInitialRequestComplete = useCallback(function (_, __, _ref6) {
-    var form = _ref6.form;
-    form.setState({
-      loading: false
-    });
+var AdvancedFilter = /*#__PURE__*/memo(function (props) {
+  var form = useMemo(function () {
+    return (props === null || props === void 0 ? void 0 : props.form) || createForm();
   }, []);
-  useEffect(function () {
-    setCurrentForm(currentForm.current);
-  }, []);
-  return /*#__PURE__*/React.createElement(QueryFilterLayout, {
+  var schema = props.schema,
+      triggerType = props.triggerType,
+      onFilter = props.onFilter,
+      onReset = props.onReset,
+      layout = props.layout,
+      labelAlign = props.labelAlign,
+      wrapperAlign = props.wrapperAlign,
+      labelCol = props.labelCol,
+      wrapperCol = props.wrapperCol;
+  var prefixCls = usePrefixCls('', {
+    prefix: 'teamix-pro-form-filter-advanced'
+  });
+  var gridSchema = useMemo(function () {
+    return [{
+      name: 'FormGrid',
+      component: 'FormGrid',
+      props: {
+        breakpoints: [480, 720, 990, 1200, Infinity],
+        maxColumns: [1, 2, 3, 3, 4],
+        columnGap: 16,
+        rowGap: 12
+      },
+      children: [].concat(_toConsumableArray(schema), [{
+        component: 'FormGrid.GridColumn',
+        props: {
+          gridSpan: -1
+        },
+        children: [{
+          component: 'FormButtonGroup',
+          props: {
+            align: 'right'
+          },
+          children: [{
+            component: 'Reset',
+            props: {
+              onResetValidateSuccess: onReset,
+              style: _objectSpread({}, triggerType === 'submit' ? {} : {
+                marginRight: -16
+              }),
+              children: getMessage('reset')
+            }
+          }, {
+            component: 'Submit',
+            props: {
+              style: _objectSpread({}, triggerType === 'submit' ? {
+                marginRight: -8
+              } : {
+                display: 'none'
+              }),
+              children: getMessage('search')
+            }
+          }]
+        }]
+      }])
+    }];
+  }, [schema, onReset, triggerType]);
+  var getTeamixLayout = useMemo(function () {
+    return {
+      breakpoints: [990],
+      layout: mergeArrayValue(['vertical'], layout),
+      labelAlign: mergeArrayValue(['left'], labelAlign),
+      wrapperAlign: mergeArrayValue(['left'], wrapperAlign),
+      labelCol: mergeArrayValue([24], labelCol),
+      wrapperCol: mergeArrayValue([24], wrapperCol)
+    };
+  }, [layout, labelAlign, wrapperAlign, labelCol, wrapperCol]);
+  var eventProps = getEventProps(triggerType, onFilter);
+  return /*#__PURE__*/React.createElement(ProForm, _objectSpread(_objectSpread(_objectSpread(_objectSpread({
+    feedbackLayout: "popover"
+  }, props), eventProps), getTeamixLayout), {}, {
+    form: form,
     className: cls(prefixCls, props.className),
-    addonBefore: addonBefore,
-    addonAfter: addonAfter,
-    expand: advancedFilterVisible,
-    onExpand: toggleAdvancedFilter,
-    count: tagDataSource.length,
-    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,
-        index = _ref7.index;
-    return /*#__PURE__*/React.createElement(Tag.Closeable, {
-      key: isNum(index) ? key + label : key,
-      afterClose: function afterClose() {
-        return onTagClose(key, index);
-      }
-    }, /*#__PURE__*/React.createElement("span", {
-      className: "".concat(prefixCls, "-tag-title")
-    }, label), /*#__PURE__*/React.createElement("span", {
-      className: "".concat(prefixCls, "-tag-content")
-    }, /*#__PURE__*/React.createElement(ProField, {
-      type: type,
-      value: value
-    })));
-  })) : null);
+    schema: gridSchema,
+    onSubmit: onFilter
+  }));
 });
-QueryFilter.defaultProps = {
-  mode: 'inline',
-  expand: false,
-  filterDebounce: 300
+AdvancedFilter.defaultProps = {
+  triggerType: 'change',
+  layout: 'horizontal',
+  labelAlign: 'right',
+  labelCol: 6,
+  wrapperCol: 18
 };
-export { QueryFilter, QueryFilterLayout };
+export { AdvancedFilter, SimpleFilter };
+export default AdvancedFilter;

package/es/form/Filter/index2.scss

@@ -1,38 +1,8 @@
 @import '../global.scss';
 
-$query-filter: #{$teamix-pro-form}-query-filter;
-
-.#{$query-filter} {
-  .#{$query-filter}-inline {
-    margin-right: 8px;
-    margin-bottom: 8px;
-  }
-  .#{$query-filter}-inline-hidden {
-    display: none;
-  }
-  .#{$query-filter}-tag-title {
-    margin-right: 12px;
-    color: var(--color-text1-8, #848484);
-  }
-  .#{$query-filter}-tag-content {
-    .#{$teamix-pro-field} {
-      display: inline-block;
-      .#{$css-prefix}form-preview {
-        color: var(--color-text1-2, #5a5a5a);
-        font-weight: bold;
-      }
-    }
-  }
-}
-
-.#{$query-filter}-advanced {
-  .#{$css-prefix}formily-button-group {
-    margin-top: 0;
-  }
-}
-.#{$query-filter}-advanced,
-.#{$query-filter}-simple,
-.#{$query-filter}-light {
+// 筛选
+.#{$teamix-pro-form}-filter-advanced,
+.#{$teamix-pro-form}-filter-simple {
   .#{$form-item-cls}-feedback-layout-popover {
     margin-bottom: 0;
   }
@@ -45,3 +15,11 @@ $query-filter: #{$teamix-pro-form}-query-filter;
     }
   }
 }
+
+// 筛选和抽屉按钮
+.#{$teamix-pro-form}-filter-advanced,
+.#{$css-prefix}drawer-footer {
+  .#{$css-prefix}formily-button-group {
+    margin-top: 0;
+  }
+}