@lemon-fe/components 0.1.67 → 0.1.70

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/FormLayout/index.d.ts

@@ -5,7 +5,7 @@ interface Props {
     /**
      * @description 布局类型
      * 栅格系统同antd，总计24列，默认占8列
-     * flex 弹性型，默认占24列
+     * flex 弹性型，默认占24列，完全按照百分比进行布局
      * @default default
      */
     layout?: 'default' | 'flex';

package/es/FormLayout/index.less

@@ -75,6 +75,12 @@
     }
   }
 
+  &-layout-flex > div > .ant-form-item,
+  &-layout-flex &-col {
+    width: 100%;
+    min-width: 0;
+  }
+
   &-row {
     .row();
   }
@@ -87,13 +93,11 @@
     &-col-@{value} {
       .col(@value);
     }
-  });
 
-  &-layout-flex > div > .ant-form-item,
-  &-layout-flex &-col {
-    width: 100%;
-    max-width: 100%;
-  }
+    &-layout-flex &-col-@{value} {
+      width: percentage((@value / 24));
+    }
+  });
 }
 
 @media (max-width: 575px) {

package/es/SelectView/index.d.ts

@@ -45,6 +45,7 @@ interface Props<RecordType, ParamsType> {
             onChange: (value: Partial<ParamsType>) => void;
             style?: CSSProperties;
         }) => ReactElement;
+        onChange?: (value: ParamsType) => void;
     };
     rowSelection?: TableRowSelection<RecordType>;
 }

package/es/SelectView/index.js

@@ -24,7 +24,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import React, { useEffect, useMemo, useRef, useState } from 'react';
 import { Tabs, Button } from 'antd';
 import { get } from 'lodash';
 import Filter from '../Filter';
@@ -111,11 +111,15 @@ export default function SelectView(props) {
     onChange === null || onChange === void 0 ? void 0 : onChange(newRows);
   };
 
-  var handleChangeParams = useCallback(function (mParams) {
-    setParams(function (prev) {
-      return _objectSpread(_objectSpread({}, prev), mParams);
-    });
-  }, []);
+  var handleChangeParams = function handleChangeParams(mParams) {
+    var nextParams = _objectSpread(_objectSpread({}, params), mParams);
+
+    if (filter === null || filter === void 0 ? void 0 : filter.onChange) {
+      filter.onChange(nextParams);
+    }
+
+    setParams(nextParams);
+  };
 
   var handleValuesChange = function handleValuesChange(changedValues, allValues) {
     var _filter$onValuesChang;

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.70",
   "description": "> TODO: description",
   "author": "鲁盛杰 <lusj@cnlemon.net>",
   "homepage": "",
@@ -41,5 +41,5 @@
     "react": "^17.0.2",
     "react-dom": "^17.0.2"
   },
-  "gitHead": "1fe5e8d52171f59161e288c4bfc6cea56fd5a4d8"
+  "gitHead": "46b0cf9ea5f30f15b92816311117cfb815a47330"
 }