@lemon-fe/components 0.1.67 → 0.1.68

package/es/Filter/index.js

@@ -376,7 +376,7 @@ function Filter(props) {
 
   var _useMemo = useMemo(function () {
     var result = data.filter(function (item) {
-      if (activeKeys.has(item.key) && compMap.has(item.type)) {
+      if (activeKeys.has(item.key)) {
         return true;
       }
 
@@ -391,7 +391,9 @@ function Filter(props) {
     var currRow = [];
     var value = 0;
     result.forEach(function (item) {
-      var itemWidth = getColStyle(item.colSpan || compMap.get(item.type).colSpan).width;
+      var _compMap$get;
+
+      var itemWidth = getColStyle(item.colSpan || (item.type ? (_compMap$get = compMap.get(item.type)) === null || _compMap$get === void 0 ? void 0 : _compMap$get.colSpan : 1)).width;
 
       if (value + itemWidth > width) {
         if (currRow.length > 0) {
@@ -470,12 +472,27 @@ function Filter(props) {
   }), /*#__PURE__*/React.createElement(FormLayout, {
     direction: "row"
   }, cols.map(function (item) {
+    if (item.renderFormItem) {
+      return /*#__PURE__*/React.createElement("div", {
+        style: getColStyle(item.colSpan),
+        key: item.key
+      }, item.renderFormItem());
+    }
+
+    if (!item.type) {
+      return null;
+    }
+
     var target = compMap.get(item.type);
+
+    if (target === undefined) {
+      return null;
+    }
+
     return /*#__PURE__*/React.createElement("div", {
       style: getColStyle(item.colSpan || target.colSpan),
       key: item.key
     }, /*#__PURE__*/React.createElement(Form.Item, {
-      key: item.key,
       name: item.key,
       label: item.hideLabel ? undefined : item.label
     }, target.render(item)));

package/es/Filter/typings.d.ts

@@ -1,13 +1,14 @@
 import type { FormInstance } from 'antd';
-import type { CSSProperties, ReactNode } from 'react';
+import type { CSSProperties, ReactElement, ReactNode } from 'react';
 
 export interface FilterItemType {
   key: string;
   label?: string;
-  type: string;
+  type?: string;
   colSpan?: number;
   hideLabel?: boolean;
   extraProps?: Record<string, any>;
+  renderFormItem?: () => ReactElement;
 }
 
 export interface FilterProps<T extends Record<string, any> = Record<string, any>> {

package/es/overrides.less

@@ -170,6 +170,10 @@ a[title='站长统计'] {
   font-size: 16px;
 }
 
+.ant-select-sm .ant-select-arrow {
+  font-size: 14px;
+}
+
 /** input */
 @input-padding-horizontal-base: 8px;
 @input-icon-color: rgba(51, 51, 51, 0.7);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/components",
-  "version": "0.1.67",
+  "version": "0.1.68",
   "description": "> TODO: description",
   "author": "鲁盛杰 <lusj@cnlemon.net>",
   "homepage": "",
@@ -41,5 +41,5 @@
     "react": "^17.0.2",
     "react-dom": "^17.0.2"
   },
-  "gitHead": "1fe5e8d52171f59161e288c4bfc6cea56fd5a4d8"
+  "gitHead": "c78284f7973b457f109c8b655a3d67c8ffca6d67"
 }