@teamix/pro 1.2.11 → 1.2.15

package/es/form/Components/Text/index.js

@@ -1,8 +1,8 @@
 var _excluded = ["children", "className"];
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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; }
 

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

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

package/es/form/Filter/index.js

@@ -1,5 +1,4 @@
-var _excluded = ["schema", "triggerType", "onFilter"],
-    _excluded2 = ["schema", "triggerType", "onFilter"];
+var _excluded = ["schema", "triggerType", "onFilter"];
 
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
@@ -17,9 +16,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; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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; }
 
@@ -29,6 +28,7 @@ import { usePrefixCls, getMessage } from '@teamix/utils';
 import { createForm } from '@formily/core';
 import ProForm from '../ProForm';
 import { mergeArrayValue } from '../utils';
+import './index.scss';
 
 var getEventProps = function getEventProps(triggerType, onFilter) {
   var keydownEvent = {
@@ -89,47 +89,6 @@ var SimpleFilter = /*#__PURE__*/memo(function (props) {
 SimpleFilter.defaultProps = {
   triggerType: 'change'
 };
-/**
- * 查询筛选
- */
-
-var QueryFilter = /*#__PURE__*/memo(function (props) {
-  var schema = props.schema,
-      triggerType = props.triggerType,
-      onFilter = props.onFilter,
-      otherProps = _objectWithoutProperties(props, _excluded2);
-
-  var prefixCls = usePrefixCls('', {
-    prefix: 'teamix-pro-form-filter-query'
-  });
-  var querySchema = useMemo(function () {
-    return [{
-      component: 'QueryFilter',
-      props: {
-        placeholder: 'placeholder'
-      },
-      children: schema
-    }, {
-      type: 'void',
-      decorator: null,
-      component: 'Submit',
-      props: {
-        style: _objectSpread({}, triggerType === 'submit' ? {} : {
-          display: 'none'
-        })
-      }
-    }];
-  }, []);
-  var eventProps = getEventProps(triggerType, onFilter);
-  return /*#__PURE__*/React.createElement(ProForm, _objectSpread(_objectSpread(_objectSpread({
-    feedbackLayout: "none",
-    breakpoints: [],
-    bordered: false
-  }, otherProps), eventProps), {}, {
-    className: cls(prefixCls, props.className),
-    schema: querySchema
-  }));
-});
 /**
  * 高级筛选
  */
@@ -221,5 +180,5 @@ AdvancedFilter.defaultProps = {
   labelCol: 6,
   wrapperCol: 18
 };
-export { AdvancedFilter, SimpleFilter, QueryFilter };
+export { AdvancedFilter, SimpleFilter };
 export default AdvancedFilter;

package/es/form/Filter/index.scss

@@ -0,0 +1,25 @@
+@import '../global.scss';
+
+// 筛选
+.#{$teamix-pro-form}-filter-advanced,
+.#{$teamix-pro-form}-filter-simple {
+  .#{$form-item-cls}-feedback-layout-popover {
+    margin-bottom: 0;
+  }
+  .#{$css-prefix}date-picker2-input {
+    .#{$css-prefix}input {
+      width: inherit;
+      input {
+        width: inherit;
+      }
+    }
+  }
+}
+
+// 筛选和抽屉按钮
+.#{$teamix-pro-form}-filter-advanced,
+.#{$css-prefix}drawer-footer {
+  .#{$css-prefix}formily-button-group {
+    margin-top: 0;
+  }
+}

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

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

package/es/form/Filter/index2.js

@@ -0,0 +1,366 @@
+var _excluded = ["schema", "onChange", "onSubmit"],
+    _excluded2 = ["form", "schema", "onSubmit", "onChange"],
+    _excluded3 = ["schema", "onSubmit", "onChange", "onReset", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol"],
+    _excluded4 = ["addonAfter", "addonBefore", "onFilter", "mode", "expand"];
+
+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 _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 _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 _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 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 React, { memo, useCallback, useMemo, useState, useEffect } from 'react';
+import cls from 'classnames';
+import { Tag, Button, Badge } from '@alicloudfe/components';
+import TeamixIcon from '@teamix/icon';
+import { createForm } from '@formily/core';
+import { usePrefixCls, getMessage, isSignificative } from '@teamix/utils';
+import ProField from '../../field/index';
+import ProForm from '../ProForm';
+import fieldTypeMap from '../fieldTypeMap';
+import { getFormDisplayValues } from '../ProForm/useFormDisplayValues';
+import { mergeArrayValue } from '../utils';
+import './index2.scss';
+/**
+ * 简单筛选
+ */
+
+var SimpleFilter = /*#__PURE__*/memo(function (props) {
+  var schema = props.schema,
+      onChange = props.onChange,
+      onSubmit = props.onSubmit,
+      otherProps = _objectWithoutProperties(props, _excluded);
+
+  var prefixCls = usePrefixCls('', {
+    prefix: 'teamix-pro-form-query-filter-simple'
+  });
+  var simpleSchema = useMemo(function () {
+    return [{
+      component: 'FormFlex',
+      props: {
+        size: 8
+      },
+      children: schema
+    }, {
+      component: 'Submit',
+      props: {
+        style: {
+          display: 'none'
+        }
+      }
+    }];
+  }, [schema]);
+  return /*#__PURE__*/React.createElement(ProForm, _objectSpread(_objectSpread({}, otherProps), {}, {
+    className: cls(prefixCls, props.className),
+    schema: simpleSchema,
+    feedbackLayout: "popover",
+    breakpoints: [],
+    inset: true,
+    onSubmit: onSubmit,
+    onChange: onChange
+  }));
+});
+/**
+ * 轻量筛选
+ */
+
+var LightFilter = /*#__PURE__*/memo(function (props) {
+  var form = props.form,
+      schema = props.schema,
+      onSubmit = props.onSubmit,
+      onChange = props.onChange,
+      otherProps = _objectWithoutProperties(props, _excluded2);
+
+  var prefixCls = usePrefixCls('', {
+    prefix: 'teamix-pro-form-query-filter-light'
+  });
+  var LightSchema = useMemo(function () {
+    return [{
+      component: 'LightFilter',
+      children: schema
+    }, {
+      component: 'Submit',
+      props: {
+        style: {
+          display: 'none'
+        }
+      }
+    }];
+  }, [schema]); // useEffect(() => {
+  //   form.addEffects('onChange', () => {
+  //     onFieldValueChange('',(field:any) => {
+  //       console.log(field.value);
+  //     });
+  //   });
+  // }, [form, onChange]);
+
+  return /*#__PURE__*/React.createElement(ProForm, _objectSpread(_objectSpread({}, otherProps), {}, {
+    form: form,
+    className: cls(prefixCls, props.className),
+    schema: LightSchema,
+    feedbackLayout: "popover",
+    breakpoints: [],
+    bordered: false,
+    onSubmit: onSubmit,
+    onChange: onChange
+  }));
+});
+/**
+ * 高级筛选
+ */
+
+var AdvancedFilter = /*#__PURE__*/memo(function (props) {
+  var schema = props.schema,
+      onSubmit = props.onSubmit,
+      onChange = props.onChange,
+      onReset = props.onReset,
+      layout = props.layout,
+      labelAlign = props.labelAlign,
+      wrapperAlign = props.wrapperAlign,
+      labelCol = props.labelCol,
+      wrapperCol = props.wrapperCol,
+      otherProps = _objectWithoutProperties(props, _excluded3);
+
+  var prefixCls = usePrefixCls('', {
+    prefix: 'teamix-pro-form-query-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,
+              children: getMessage('reset')
+            }
+          }, {
+            component: 'Submit',
+            props: {
+              style: {
+                marginRight: -8
+              },
+              children: getMessage('search')
+            }
+          }]
+        }]
+      }])
+    }];
+  }, [schema, onReset]);
+  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]);
+  return /*#__PURE__*/React.createElement(ProForm, _objectSpread(_objectSpread(_objectSpread({
+    className: cls(prefixCls, props.className),
+    schema: gridSchema,
+    feedbackLayout: "popover"
+  }, otherProps), getTeamixLayout), {}, {
+    onSubmit: onSubmit
+  }));
+});
+AdvancedFilter.defaultProps = {
+  layout: 'horizontal',
+  labelAlign: 'right',
+  labelCol: 6,
+  wrapperCol: 18
+};
+/**
+ * 查询筛选
+ */
+
+var QueryFilter = /*#__PURE__*/memo(function (props) {
+  var addonAfter = props.addonAfter,
+      addonBefore = props.addonBefore,
+      onFilter = props.onFilter,
+      mode = props.mode,
+      expand = props.expand,
+      otherProps = _objectWithoutProperties(props, _excluded4);
+
+  var form = useMemo(function () {
+    return props.form || createForm({
+      validateFirst: true
+    });
+  }, []);
+
+  var _useState = useState(expand),
+      _useState2 = _slicedToArray(_useState, 2),
+      advancedFilterVisible = _useState2[0],
+      setAdvancedFilterVisible = _useState2[1];
+
+  var _useState3 = useState([]),
+      _useState4 = _slicedToArray(_useState3, 2),
+      tagDataSource = _useState4[0],
+      setTagDataSource = _useState4[1];
+
+  var prefixCls = usePrefixCls('', {
+    prefix: 'teamix-pro-form-query-filter'
+  }); // 展开收起高级筛选
+
+  var toggleAdvancedFilter = useCallback(function () {
+    setAdvancedFilterVisible(function (visible) {
+      return !visible;
+    });
+  }, []); // 获取标签数据
+
+  var getTagDataSource = useCallback(function (form) {
+    var displayValues = getFormDisplayValues(form);
+    return Object.entries(displayValues).map(function (_ref) {
+      var _data$displayValue;
+
+      var _ref2 = _slicedToArray(_ref, 2),
+          key = _ref2[0],
+          data = _ref2[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 onFormSubmit = useCallback(function (values) {
+    setTagDataSource(getTagDataSource(form));
+    onFilter && onFilter(values);
+  }, []); // 轻量表单onChange
+
+  var onLightValueChange = useCallback(function (values) {
+    form.reset();
+    setTagDataSource(getTagDataSource(form));
+    onFilter && onFilter(values);
+  }, [form]); // 简单表单onChange
+
+  var onSimpleValueChange = useCallback(function (values) {
+    setTagDataSource(getTagDataSource(form));
+    onFilter && onFilter(values);
+  }, []); // 关闭标签清空表单字段值
+
+  var onTagClose = useCallback(function (key) {
+    form.setValuesIn(key, undefined);
+  }, [form]); // 设置默认值标签数据
+
+  useEffect(function () {
+    setTagDataSource(getTagDataSource(form));
+  }, []);
+  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: "".concat(prefixCls, "-inline-form")
+  }, /*#__PURE__*/React.createElement(LightFilter, _objectSpread(_objectSpread({}, otherProps), {}, {
+    form: form,
+    onFilter: onLightValueChange,
+    onSubmit: onFormSubmit
+  }))), /*#__PURE__*/React.createElement("div", {
+    className: "".concat(prefixCls, "-toggle")
+  }, /*#__PURE__*/React.createElement(Badge, {
+    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: form,
+    onFilter: onSimpleValueChange,
+    onSubmit: onFormSubmit
+  })))), 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 (_ref3) {
+    var key = _ref3.key,
+        label = _ref3.label,
+        value = _ref3.value,
+        type = _ref3.type;
+    return /*#__PURE__*/React.createElement(Tag.Closeable, {
+      key: key,
+      afterClose: function afterClose() {
+        return onTagClose(key);
+      }
+    }, /*#__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
+    })));
+  }))), /*#__PURE__*/React.createElement("div", {
+    className: cls("".concat(prefixCls, "-advanced-wrap"), !advancedFilterVisible ? "".concat(prefixCls, "-advanced-wrap-hidden") : '')
+  }, /*#__PURE__*/React.createElement(AdvancedFilter, _objectSpread(_objectSpread({}, otherProps), {}, {
+    form: form,
+    onSubmit: onFormSubmit
+  })))) : null);
+});
+QueryFilter.defaultProps = {
+  mode: 'inline',
+  expand: false
+};
+export { QueryFilter };

package/es/form/Filter/index2.scss

@@ -0,0 +1,73 @@
+@import '../global.scss';
+
+$query-filter: #{$teamix-pro-form}-query-filter;
+
+.#{$query-filter} {
+  .#{$query-filter}-inline {
+    display: flex;
+    justify-content: space-between;
+  }
+  .#{$query-filter}-left {
+    display: flex;
+  }
+  .#{$query-filter}-addonBefore {
+    flex: 0 1 auto;
+    margin-right: 8px;
+  }
+  .#{$query-filter}-inline-form {
+    flex: 0 0 auto;
+    margin-right: 8px;
+    margin-bottom: 8px;
+  }
+  .#{$query-filter}-toggle {
+    margin-bottom: 8px;
+  }
+  .#{$query-filter}-addonAfter {
+    flex: 0 1 auto;
+    margin-left: 8px;
+  }
+  .#{$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}-tag-hidden {
+    display: none;
+  }
+  .#{$query-filter}-advanced-wrap {
+    padding: 16px;
+    background-color: var(--color-fill1-2, #f7f7f7);
+  }
+  .#{$query-filter}-advanced-wrap-hidden {
+    display: none;
+  }
+
+  .#{$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;
+    }
+    .#{$css-prefix}date-picker2-input {
+      .#{$css-prefix}input {
+        width: inherit;
+        input {
+          width: inherit;
+        }
+      }
+    }
+  }
+}

package/es/form/ProForm/index.js

@@ -1,8 +1,8 @@
 var _excluded = ["form", "initialValues", "initialRequest", "schema", "scope", "context", "components", "children", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol", "breakpoints", "onChange", "onSubmit", "onSubmitFailed", "className"];
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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; }
 

package/es/form/ProForm/index.scss

@@ -32,11 +32,11 @@
     > .#{$form-item-cls}-control-content {
       > .#{$form-item-cls}-control-content-component {
         line-height: initial;
-        > .teamix-pro-field-checkbox,
-        .teamix-pro-field-radio,
-        .teamix-pro-field-switch,
-        .teamix-pro-field-colorradio,
-        .teamix-pro-field-range,
+        > .#{$teamix-pro-field}-checkbox,
+        .#{$teamix-pro-field}-radio,
+        .#{$teamix-pro-field}-switch,
+        .#{$teamix-pro-field}-colorradio,
+        .#{$teamix-pro-field}-range,
         .#{$css-prefix}btn-text {
           line-height: var(--form-element-medium-height, 32px);
         }
@@ -160,11 +160,11 @@
       margin-right: 4px;
     }
   }
-  .teamix-pro-field-money button,
-  .teamix-pro-field-icon button {
+  .#{$teamix-pro-field}-money button,
+  .#{$teamix-pro-field}-icon button {
     border: 0 !important;
   }
-  .teamix-pro-field-color-swatch {
+  .#{$teamix-pro-field}-color-swatch {
     box-shadow: none !important;
   }
   .#{$css-prefix}date-picker2-input,
@@ -230,14 +230,12 @@
   }
 }
 
-// 筛选和抽屉按钮
-.#{$teamix-pro-form}-filter-advanced,
+// 抽屉按钮
 .#{$css-prefix}drawer-footer {
   .#{$css-prefix}formily-button-group {
     margin-top: 0;
   }
 }
-
 .#{$teamix-pro-form}-button-affix-auto.#{$css-prefix}affix,
 .#{$teamix-pro-form}-button-affix-always.#{$css-prefix}affix {
   left: 0;
@@ -259,22 +257,6 @@
   }
 }
 
-// 高级筛选
-.#{$teamix-pro-form}-filter-advanced,
-.#{$teamix-pro-form}-filter-simple {
-  .#{$form-item-cls}-feedback-layout-popover {
-    margin-bottom: 0;
-  }
-  .#{$css-prefix}date-picker2-input {
-    .#{$css-prefix}input {
-      width: inherit;
-      input {
-        width: inherit;
-      }
-    }
-  }
-}
-
 // ArrayItems
 .#{$css-prefix}formily-array-items {
   .#{$css-prefix}formily-grid-layout {
@@ -291,7 +273,7 @@
 
 /* hack todo remove */
 .#{$form-item-cls}-control-content-component {
-  .teamix-pro-field-tooltip.teamix-pro-field-checkbox {
+  .#{$teamix-pro-field}-tooltip.#{$teamix-pro-field}-checkbox {
     .teamix-pro-lable-icon-tip-icon {
       transform: translate(0px, 4px);
     }