@teamix/pro 1.2.13 → 1.2.17

package/lib/form/Components/LightFilter/index.scss

@@ -0,0 +1,74 @@
+@import '../../global.scss';
+
+$light-filter: #{teamix-pro-form}-light-filter;
+
+// LightFilter
+.#{$light-filter} {
+  display: flex;
+  width: 100%;
+  height: var(--search-normal-normal-m-height, 32px);
+  transition: box-shadow var(--active-transition);
+  &:hover,
+  &:focus {
+    box-shadow: var(--active-shadow);
+    border-color: var(--input-focus-border-color, #ababab);
+  }
+  .#{$light-filter}-main {
+    display: flex;
+    box-sizing: border-box;
+    border: var(--search-normal-normal-border-width, 1px) solid
+      var(--color-line1-2, #d9d9d9);
+    border-right: 0;
+    border-radius: var(--search-normal-corner, 2px);
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0;
+    // 表单项选择
+    .#{$light-filter}-select {
+      min-width: auto;
+      .#{$css-prefix}input {
+        min-width: auto;
+        border: 0;
+        box-shadow: none;
+        .#{$css-prefix}input-text-field {
+          padding-right: 0;
+        }
+      }
+      .#{$css-prefix}input {
+        height: $noborder-font-weight-medium;
+      }
+      .#{$css-prefix}input-control {
+        padding-right: 0;
+      }
+    }
+  }
+
+  // 按钮后缀
+  .#{$light-filter}-addonAfter {
+    .#{$css-prefix}btn {
+      border-top-left-radius: 0;
+      border-bottom-left-radius: 0;
+      .teamix-icon {
+        color: var(--color-line1-5, #ababab) !important;
+      }
+    }
+  }
+}
+
+// LightFilter无边框
+.#{$form-item-cls}-bordered-none {
+  .#{$form-item-cls}-control {
+    .#{$form-item-cls}-control-content {
+      .#{$form-item-cls}-control-content-component {
+        min-height: $noborder-font-weight-medium;
+        .#{$css-prefix}date-picker2-input {
+          border: 0;
+          box-shadow: none !important;
+        }
+        .#{$css-prefix}date-picker2-input.#{$css-prefix}date-picker2-input-medium,
+        .#{$css-prefix}input.#{$css-prefix}medium {
+          height: $noborder-font-weight-medium;
+        }
+      }
+    }
+  }
+}

package/lib/form/Components/ProField/index.js

@@ -29,9 +29,9 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-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/lib/form/Components/Text/index.js

@@ -17,9 +17,9 @@ var _excluded = ["children", "className"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-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/lib/form/Filter/index.js

@@ -1,6 +1,6 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -45,9 +45,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; }
 
@@ -96,7 +96,7 @@ var SimpleFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
         }
       }])
     }];
-  }, []);
+  }, [schema, triggerType]);
   var eventProps = getEventProps(triggerType, onFilter);
   return /*#__PURE__*/_react.default.createElement(_ProForm.default, _objectSpread(_objectSpread(_objectSpread({
     feedbackLayout: "popover",
@@ -174,7 +174,7 @@ var AdvancedFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
         }]
       }])
     }];
-  }, []);
+  }, [schema, onReset, triggerType]);
   var getTeamixLayout = (0, _react.useMemo)(function () {
     return {
       breakpoints: [990],

package/lib/form/Filter/index.scss

@@ -1,51 +1,5 @@
 @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}-simple {
-    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 {
-    color: var(--color-text1-2, #5a5a5a);
-    font-weight: bold;
-  }
-  .#{$query-filter}-tag-hidden {
-    display: none;
-  }
-  .#{$query-filter}-advanced {
-    padding: 16px;
-    background-color: var(--color-fill1-2, #f7f7f7);
-  }
-  .#{$query-filter}-advanced-hidden {
-    display: none;
-  }
-}
-
 // 筛选
 .#{$teamix-pro-form}-filter-advanced,
 .#{$teamix-pro-form}-filter-simple {

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

@@ -1,6 +1,6 @@
 import React from 'react';
 import type { QueryFilterProps } from '../typing';
-import './index.scss';
+import './index2.scss';
 /**
  * 查询筛选
  */

package/lib/form/Filter/index2.js

@@ -1,6 +1,6 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -19,15 +19,22 @@ var _core = require("@formily/core");
 
 var _utils = require("@teamix/utils");
 
+var _index = _interopRequireDefault(require("../../field/index"));
+
 var _ProForm = _interopRequireDefault(require("../ProForm"));
 
+var _fieldTypeMap = _interopRequireDefault(require("../fieldTypeMap"));
+
 var _useFormDisplayValues = require("../ProForm/useFormDisplayValues");
 
 var _utils2 = require("../utils");
 
-require("./index.scss");
+require("./index2.scss");
 
-var _excluded = ["schema", "triggerType", "onFilter"];
+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 _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -55,55 +62,27 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
 
 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 _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; }
+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 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 _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; }
 
-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];
-};
+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; }
 
-var schemaTemp = [{
-  name: 'taskName',
-  title: '实例名称',
-  component: 'Input',
-  required: true,
-  props: {
-    style: {
-      width: 180
-    },
-    placeholder: '请输入'
-  }
-}];
 /**
  * 简单筛选
  */
-
 var SimpleFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
   var schema = props.schema,
-      triggerType = props.triggerType,
-      onFilter = props.onFilter,
+      onChange = props.onChange,
+      onSubmit = props.onSubmit,
       otherProps = _objectWithoutProperties(props, _excluded);
 
   var prefixCls = (0, _utils.usePrefixCls)('', {
-    prefix: 'teamix-pro-form-filter-simple'
+    prefix: 'teamix-pro-form-query-filter-simple'
   });
   var simpleSchema = (0, _react.useMemo)(function () {
     return [{
@@ -111,50 +90,89 @@ var SimpleFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       props: {
         size: 8
       },
-      children: [].concat(_toConsumableArray(schema), [{
-        type: 'void',
-        decorator: null,
-        component: 'Submit',
-        props: {
-          style: _objectSpread({}, triggerType === 'submit' ? {} : {
-            display: 'none'
-          })
+      children: schema
+    }, {
+      component: 'Submit',
+      props: {
+        style: {
+          display: 'none'
         }
-      }])
+      }
     }];
-  }, []);
-  var eventProps = getEventProps(triggerType, onFilter);
-  return /*#__PURE__*/_react.default.createElement(_ProForm.default, _objectSpread(_objectSpread(_objectSpread({
+  }, [schema]);
+  return /*#__PURE__*/_react.default.createElement(_ProForm.default, _objectSpread(_objectSpread({}, otherProps), {}, {
+    className: (0, _classnames.default)(prefixCls, props.className),
+    schema: simpleSchema,
     feedbackLayout: "popover",
     breakpoints: [],
-    inset: true
-  }, otherProps), eventProps), {}, {
+    inset: true,
+    onSubmit: onSubmit,
+    onChange: onChange
+  }));
+});
+/**
+ * 轻量筛选
+ */
+
+var LightFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
+  var form = props.form,
+      schema = props.schema,
+      onSubmit = props.onSubmit,
+      onChange = props.onChange,
+      otherProps = _objectWithoutProperties(props, _excluded2);
+
+  var prefixCls = (0, _utils.usePrefixCls)('', {
+    prefix: 'teamix-pro-form-query-filter-light'
+  });
+  var LightSchema = (0, _react.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.default.createElement(_ProForm.default, _objectSpread(_objectSpread({}, otherProps), {}, {
+    form: form,
     className: (0, _classnames.default)(prefixCls, props.className),
-    schema: simpleSchema
+    schema: LightSchema,
+    feedbackLayout: "popover",
+    breakpoints: [],
+    bordered: false,
+    onSubmit: onSubmit,
+    onChange: onChange
   }));
 });
-SimpleFilter.defaultProps = {
-  triggerType: 'change'
-};
 /**
  * 高级筛选
  */
 
 var AdvancedFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
-  var form = (0, _react.useMemo)(function () {
-    return (props === null || props === void 0 ? void 0 : props.form) || (0, _core.createForm)();
-  }, []);
   var schema = props.schema,
-      triggerType = props.triggerType,
-      onFilter = props.onFilter,
+      onSubmit = props.onSubmit,
+      onChange = props.onChange,
       onReset = props.onReset,
       layout = props.layout,
       labelAlign = props.labelAlign,
       wrapperAlign = props.wrapperAlign,
       labelCol = props.labelCol,
-      wrapperCol = props.wrapperCol;
+      wrapperCol = props.wrapperCol,
+      otherProps = _objectWithoutProperties(props, _excluded3);
+
   var prefixCls = (0, _utils.usePrefixCls)('', {
-    prefix: 'teamix-pro-form-filter-advanced'
+    prefix: 'teamix-pro-form-query-filter-advanced'
   });
   var gridSchema = (0, _react.useMemo)(function () {
     return [{
@@ -180,26 +198,21 @@ var AdvancedFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
             component: 'Reset',
             props: {
               onResetValidateSuccess: onReset,
-              style: _objectSpread({}, triggerType === 'submit' ? {} : {
-                marginRight: -16
-              }),
               children: (0, _utils.getMessage)('reset')
             }
           }, {
             component: 'Submit',
             props: {
-              style: _objectSpread({}, triggerType === 'submit' ? {
+              style: {
                 marginRight: -8
-              } : {
-                display: 'none'
-              }),
+              },
               children: (0, _utils.getMessage)('search')
             }
           }]
         }]
       }])
     }];
-  }, []);
+  }, [schema, onReset]);
   var getTeamixLayout = (0, _react.useMemo)(function () {
     return {
       breakpoints: [990],
@@ -210,18 +223,15 @@ var AdvancedFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       wrapperCol: (0, _utils2.mergeArrayValue)([24], wrapperCol)
     };
   }, [layout, labelAlign, wrapperAlign, labelCol, wrapperCol]);
-  var eventProps = getEventProps(triggerType, onFilter);
-  return /*#__PURE__*/_react.default.createElement(_ProForm.default, _objectSpread(_objectSpread(_objectSpread(_objectSpread({
-    feedbackLayout: "popover"
-  }, props), eventProps), getTeamixLayout), {}, {
-    form: form,
+  return /*#__PURE__*/_react.default.createElement(_ProForm.default, _objectSpread(_objectSpread(_objectSpread({
     className: (0, _classnames.default)(prefixCls, props.className),
     schema: gridSchema,
-    onSubmit: onFilter
+    feedbackLayout: "popover"
+  }, otherProps), getTeamixLayout), {}, {
+    onSubmit: onSubmit
   }));
 });
 AdvancedFilter.defaultProps = {
-  triggerType: 'change',
   layout: 'horizontal',
   labelAlign: 'right',
   labelCol: 6,
@@ -232,7 +242,20 @@ AdvancedFilter.defaultProps = {
  */
 
 var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
-  var _useState = (0, _react.useState)(true),
+  var addonAfter = props.addonAfter,
+      addonBefore = props.addonBefore,
+      onFilter = props.onFilter,
+      mode = props.mode,
+      expand = props.expand,
+      otherProps = _objectWithoutProperties(props, _excluded4);
+
+  var form = (0, _react.useMemo)(function () {
+    return props.form || (0, _core.createForm)({
+      validateFirst: true
+    });
+  }, []);
+
+  var _useState = (0, _react.useState)(expand),
       _useState2 = _slicedToArray(_useState, 2),
       advancedFilterVisible = _useState2[0],
       setAdvancedFilterVisible = _useState2[1];
@@ -240,17 +263,8 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
   var _useState3 = (0, _react.useState)([]),
       _useState4 = _slicedToArray(_useState3, 2),
       tagDataSource = _useState4[0],
-      setTagDataSource = _useState4[1]; // const [values, setValues] = useState<any>();
+      setTagDataSource = _useState4[1];
 
-
-  var form = (0, _react.useMemo)(function () {
-    return (props === null || props === void 0 ? void 0 : props.form) || (0, _core.createForm)({
-      validateFirst: true
-    });
-  }, []);
-  var schema = props.schema,
-      addonAfter = props.addonAfter,
-      addonBefore = props.addonBefore;
   var prefixCls = (0, _utils.usePrefixCls)('', {
     prefix: 'teamix-pro-form-query-filter'
   }); // 展开收起高级筛选
@@ -272,19 +286,38 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
 
       return {
         key: key,
+        type: _fieldTypeMap.default[data.component] || 'text',
         label: data.title,
         value: (_data$displayValue = data.displayValue) !== null && _data$displayValue !== void 0 ? _data$displayValue : data.value
       };
-    }); // .filter((item) => isValid(item.value));
-  }, []); // 表单值变化
+    }).filter(function (item) {
+      return (0, _utils.isSignificative)(item.value);
+    });
+  }, []); // 表单值提交
 
-  var onFormValueChange = (0, _react.useCallback)(function (values) {
+  var onFormSubmit = (0, _react.useCallback)(function (values) {
     setTagDataSource(getTagDataSource(form));
-  }, []);
-  console.log(tagDataSource); // useEffect(() => {
-  //   console.log(form.values);
-  // }, [form.values]);
+    onFilter && onFilter(values);
+  }, []); // 轻量表单onChange
+
+  var onLightValueChange = (0, _react.useCallback)(function (values) {
+    form.reset();
+    setTagDataSource(getTagDataSource(form));
+    onFilter && onFilter(values);
+  }, [form]); // 简单表单onChange
 
+  var onSimpleValueChange = (0, _react.useCallback)(function (values) {
+    setTagDataSource(getTagDataSource(form));
+    onFilter && onFilter(values);
+  }, []); // 关闭标签清空表单字段值
+
+  var onTagClose = (0, _react.useCallback)(function (key) {
+    form.setValuesIn(key, undefined);
+  }, [form]); // 设置默认值标签数据
+
+  (0, _react.useEffect)(function () {
+    setTagDataSource(getTagDataSource(form));
+  }, []);
   return /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)(prefixCls, props.className)
   }, /*#__PURE__*/_react.default.createElement("div", {
@@ -293,11 +326,13 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     className: "".concat(prefixCls, "-left")
   }, addonBefore ? /*#__PURE__*/_react.default.createElement("div", {
     className: "".concat(prefixCls, "-addonBefore")
-  }, addonBefore) : null, /*#__PURE__*/_react.default.createElement("div", {
-    className: "".concat(prefixCls, "-simple")
-  }, /*#__PURE__*/_react.default.createElement(SimpleFilter, {
-    schema: schemaTemp
-  })), /*#__PURE__*/_react.default.createElement("div", {
+  }, addonBefore) : null, mode === 'panel' ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
+    className: "".concat(prefixCls, "-inline-form")
+  }, /*#__PURE__*/_react.default.createElement(LightFilter, _objectSpread(_objectSpread({}, otherProps), {}, {
+    form: form,
+    onFilter: onLightValueChange,
+    onSubmit: onFormSubmit
+  }))), /*#__PURE__*/_react.default.createElement("div", {
     className: "".concat(prefixCls, "-toggle")
   }, /*#__PURE__*/_react.default.createElement(_components.Badge, {
     count: tagDataSource.length,
@@ -313,30 +348,45 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     type: "up-line"
   }) : /*#__PURE__*/_react.default.createElement(_icon.default, {
     type: "filter-line"
-  }), (0, _utils.getMessage)('advancedFilter'))))), addonAfter ? /*#__PURE__*/_react.default.createElement("div", {
+  }), (0, _utils.getMessage)('advancedFilter'))))) : /*#__PURE__*/_react.default.createElement("div", {
+    className: "".concat(prefixCls, "-inline-form")
+  }, /*#__PURE__*/_react.default.createElement(SimpleFilter, _objectSpread(_objectSpread({}, otherProps), {}, {
+    form: form,
+    onFilter: onSimpleValueChange,
+    onSubmit: onFormSubmit
+  })))), addonAfter ? /*#__PURE__*/_react.default.createElement("div", {
     className: "".concat(prefixCls, "-addonAfter")
-  }, addonAfter) : null), /*#__PURE__*/_react.default.createElement("div", {
+  }, addonAfter) : null), mode === 'panel' ? /*#__PURE__*/_react.default.createElement("div", {
     className: "".concat(prefixCls, "-panel")
   }, /*#__PURE__*/_react.default.createElement("div", {
-    className: (0, _classnames.default)("".concat(prefixCls, "-tag"), !advancedFilterVisible ? "".concat(prefixCls, "-tag-hidden") : '')
+    className: (0, _classnames.default)("".concat(prefixCls, "-tag"), advancedFilterVisible ? "".concat(prefixCls, "-tag-hidden") : '')
   }, /*#__PURE__*/_react.default.createElement(_components.Tag.Group, null, tagDataSource.map(function (_ref3) {
     var key = _ref3.key,
         label = _ref3.label,
-        value = _ref3.value;
+        value = _ref3.value,
+        type = _ref3.type;
     return /*#__PURE__*/_react.default.createElement(_components.Tag.Closeable, {
       key: key,
-      afterClose: console.log
+      afterClose: function afterClose() {
+        return onTagClose(key);
+      }
     }, /*#__PURE__*/_react.default.createElement("span", {
       className: "".concat(prefixCls, "-tag-title")
     }, label), /*#__PURE__*/_react.default.createElement("span", {
       className: "".concat(prefixCls, "-tag-content")
-    }, value));
+    }, /*#__PURE__*/_react.default.createElement(_index.default, {
+      type: type,
+      value: value
+    })));
   }))), /*#__PURE__*/_react.default.createElement("div", {
-    className: (0, _classnames.default)("".concat(prefixCls, "-advanced"), !advancedFilterVisible ? "".concat(prefixCls, "-advanced-hidden") : '')
-  }, /*#__PURE__*/_react.default.createElement(AdvancedFilter, _objectSpread(_objectSpread({
-    form: form
-  }, props), {}, {
-    onFilter: onFormValueChange
-  })))));
+    className: (0, _classnames.default)("".concat(prefixCls, "-advanced-wrap"), !advancedFilterVisible ? "".concat(prefixCls, "-advanced-wrap-hidden") : '')
+  }, /*#__PURE__*/_react.default.createElement(AdvancedFilter, _objectSpread(_objectSpread({}, otherProps), {}, {
+    form: form,
+    onSubmit: onFormSubmit
+  })))) : null);
 });
-exports.QueryFilter = QueryFilter;
+exports.QueryFilter = QueryFilter;
+QueryFilter.defaultProps = {
+  mode: 'inline',
+  expand: false
+};