@lemon-fe/components 0.1.93 → 0.1.99

package/es/Filter/index.js

@@ -227,7 +227,7 @@ function Filter(props) {
 
     var tab = {
       title: title,
-      value: form.getFieldsValue()
+      value: _objectSpread(_objectSpread({}, value), form.getFieldsValue())
     };
 
     if (index >= 0) {
@@ -398,7 +398,7 @@ function Filter(props) {
     var btnsWidth = simple ? 208 : 248;
     var btnsVisible = false;
     var size = 0;
-    var end = result.length;
+    var end = 0;
 
     for (var i = 0; i < result.length; i++) {
       var _compMap$get;
@@ -408,20 +408,18 @@ function Filter(props) {
       size += itemWidth;
 
       if (size > width - btnsWidth) {
-        end = i;
         btnsVisible = true;
         break;
       }
-    }
 
-    end = end || 1;
-    btnsVisible = btnsVisible && result.length > 1;
+      end = i;
+    }
 
     if (!collapsed) {
       return [getSet(result), btnsVisible];
     }
 
-    return [getSet(result.slice(0, end)), btnsVisible];
+    return [getSet(result.slice(0, end + 1)), btnsVisible];
   }, [data, width, collapsed, simple, activeKeys]),
       _useMemo2 = _slicedToArray(_useMemo, 2),
       cols = _useMemo2[0],
@@ -482,7 +480,7 @@ function Filter(props) {
         style: getColStyle(item.colSpan),
         className: className,
         key: item.key
-      }, item.renderFormItem());
+      }, item.renderFormItem(form));
     }
 
     if (!item.type) {
@@ -594,30 +592,30 @@ function Filter(props) {
       transform: 'rotate(180deg)'
     } : undefined
   }, /*#__PURE__*/React.createElement("defs", null, /*#__PURE__*/React.createElement("path", {
-    id: "a",
+    id: "filter-down",
     d: "M0 0h10v10H0z"
   })), /*#__PURE__*/React.createElement("g", {
     transform: "matrix(1 0 0 -1 0 10)",
     fill: "none",
     fillRule: "evenodd"
   }, /*#__PURE__*/React.createElement("mask", {
-    id: "b",
+    id: "filter-down-mask",
     fill: "#fff"
   }, /*#__PURE__*/React.createElement("use", {
-    xlinkHref: "#a",
+    xlinkHref: "#filter-down",
     transform: "rotate(-90 5 5)"
   })), /*#__PURE__*/React.createElement("use", {
     fillOpacity: "0",
     fill: "#C4C4C4",
     transform: "rotate(-90 5 5)",
-    xlinkHref: "#a"
+    xlinkHref: "#filter-down"
   }), /*#__PURE__*/React.createElement("path", {
     d: "M2.172 1.757 5 4.586l2.828-2.829M2.172 5.757 5 8.586l2.828-2.829",
     stroke: "currentColor",
     strokeLinecap: "round",
     strokeLinejoin: "round",
     strokeDasharray: "0,0",
-    mask: "url(#b)"
+    mask: "url(#filter-down-mask)"
   }))))))))));
 }
 

package/es/Filter/typings.d.ts

@@ -1,18 +1,18 @@
 import type { FormInstance } from 'antd';
 import type { CSSProperties, ReactElement, ReactNode } from 'react';
 
-export interface FilterItemType {
+export interface FilterItemType<T = any> {
   key: string;
   label?: string;
   type?: string;
   colSpan?: number;
   hideLabel?: boolean;
   extraProps?: Record<string, any>;
-  renderFormItem?: () => ReactElement;
+  renderFormItem?: (form: FormInstance<T>) => ReactElement;
 }
 
 export interface FilterProps<T extends Record<string, any> = Record<string, any>> {
-  data: FilterItemType[];
+  data: FilterItemType<T>[];
   defaultValue?: T;
   value?: T;
   onChange?: (value: T) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/components",
-  "version": "0.1.93",
+  "version": "0.1.99",
   "description": "> TODO: description",
   "author": "鲁盛杰 <lusj@cnlemon.net>",
   "homepage": "",
@@ -39,5 +39,5 @@
     "react": "^17.0.2",
     "react-dom": "^17.0.2"
   },
-  "gitHead": "6c934e2c6083e08ec81d7436e6a8eac6fe37da5f"
+  "gitHead": "3396819657479029eee6dc5c61c090848fa70884"
 }