@lemon-fe/components 0.1.86 → 0.1.90

package/es/Filter/index.js

@@ -328,17 +328,17 @@ function Filter(props) {
     });
   };
 
+  var handleFinish = function handleFinish(val) {
+    if (onChange) {
+      onChange(_objectSpread(_objectSpread({}, value), val));
+    }
+  };
+
   var handleTabChange = function handleTabChange(index) {
     if (index !== active) {
       setActive(index);
       form.setFieldsValue(tabs[index].value);
-      handleFinish();
-    }
-  };
-
-  var handleFinish = function handleFinish() {
-    if (onChange) {
-      onChange(_objectSpread({}, form.getFieldsValue(true)));
+      handleFinish(form.getFieldsValue());
     }
   };
 
@@ -375,6 +375,12 @@ function Filter(props) {
   };
 
   var _useMemo = useMemo(function () {
+    var getSet = function getSet(items) {
+      return new Set(items.map(function (item) {
+        return item.key;
+      }));
+    };
+
     var result = data.filter(function (item) {
       if (activeKeys.has(item.key)) {
         return true;
@@ -384,7 +390,7 @@ function Filter(props) {
     });
 
     if (!width) {
-      return [result, false];
+      return [getSet(result), false];
     }
 
     var btnsWidth = simple ? 208 : 248;
@@ -410,10 +416,10 @@ function Filter(props) {
     btnsVisible = btnsVisible && result.length > 1;
 
     if (!collapsed) {
-      return [result, btnsVisible];
+      return [getSet(result), btnsVisible];
     }
 
-    return [result.slice(0, end), btnsVisible];
+    return [getSet(result.slice(0, end)), btnsVisible];
   }, [data, width, collapsed, simple, activeKeys]),
       _useMemo2 = _slicedToArray(_useMemo, 2),
       cols = _useMemo2[0],
@@ -464,10 +470,15 @@ function Filter(props) {
     className: "".concat(prefixCls, "-tab-bar")
   }), /*#__PURE__*/React.createElement(FormLayout, {
     direction: "row"
-  }, cols.map(function (item) {
+  }, data.map(function (item) {
+    var className = classNames("".concat(prefixCls, "-form-item"), {
+      hidden: !cols.has(item.key) ? true : false
+    });
+
     if (item.renderFormItem) {
       return /*#__PURE__*/React.createElement("div", {
         style: getColStyle(item.colSpan),
+        className: className,
         key: item.key
       }, item.renderFormItem());
     }
@@ -484,6 +495,7 @@ function Filter(props) {
 
     return /*#__PURE__*/React.createElement("div", {
       style: getColStyle(item.colSpan || target.colSpan),
+      className: className,
       key: item.key
     }, /*#__PURE__*/React.createElement(Form.Item, {
       name: item.key,

package/es/Filter/index.less

@@ -7,6 +7,14 @@
     }
   }
 
+  &-form-item {
+    display: block;
+
+    &.hidden {
+      display: none;
+    }
+  }
+
   &-btn {
     padding: 6px;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/components",
-  "version": "0.1.86",
+  "version": "0.1.90",
   "description": "> TODO: description",
   "author": "鲁盛杰 <lusj@cnlemon.net>",
   "homepage": "",
@@ -39,5 +39,5 @@
     "react": "^17.0.2",
     "react-dom": "^17.0.2"
   },
-  "gitHead": "302c1b2083073d8197b5022a1ed7897dd069f3f7"
+  "gitHead": "a663b35b1cddf3fde745eaa0750d98758c08bd64"
 }