@lemon-fe/components 0.1.70 → 0.1.74

package/es/Filter/index.js

@@ -408,9 +408,9 @@ function Filter(props) {
       }
     });
     rows.push(currRow);
-    value += simple ? 180 : 220;
+    value += simple ? 208 : 248;
 
-    if (currRow.length > 0 && value > width) {
+    if (currRow.length > 0 && value >= width + getColStyle(1).width) {
       rows.push([]);
     }
 

package/es/Popup/index.d.ts

@@ -3,13 +3,18 @@ import type { ModalProps } from 'antd/lib/modal';
 export interface PopupProps<ValueType> extends ModalProps {
     value?: ValueType;
     onChange?: (value?: ValueType) => void;
+    /**
+     * @description  渲染函数，这个函数不是作为组件渲染的，偷懒可以直接传入组件，如果需要考虑优化参考demo的传入方式
+     */
     component: (params: {
         value?: ValueType;
         onChange: (value: ValueType) => void;
     }) => ReactElement | null;
     formatLabel?: (value: ValueType) => string;
     beforeOk?: (value: ValueType) => ValueType | PromiseLike<ValueType>;
-    children?: ReactElement;
+    children?: JSX.Element | ((props: {
+        value?: ValueType;
+    }) => JSX.Element);
     allowClear?: boolean;
     disabled?: boolean;
     autoFocus?: boolean;
@@ -19,7 +24,7 @@ export interface PopupProps<ValueType> extends ModalProps {
     bordered?: boolean;
     onClick?: () => void;
 }
-interface ValuedPopupProps<ValueType> extends Omit<PopupProps<ValueType>, 'value' | 'onChange'> {
+interface ValuedPopupProps<ValueType> extends Omit<PopupProps<ValueType>, 'value' | 'onChange' | 'allowClear'> {
     value: ValueType;
     onChange?: (value: ValueType) => void;
 }

package/es/Popup/index.js

@@ -26,7 +26,7 @@ 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; }
 
-import React, { useState, cloneElement, useRef } from 'react';
+import React, { useState, cloneElement, useRef, isValidElement } from 'react';
 import { Modal, Input, message } from 'antd';
 import { CloseCircleFilled } from '@ant-design/icons';
 import { PREFIX_CLS } from '../constants';
@@ -151,7 +151,11 @@ function Popup(props) {
   var label = valueProp ? formatLabel ? formatLabel(valueProp) : valueProp : undefined;
   var trigger;
 
-  if (children) {
+  if (typeof children === 'function') {
+    trigger = children({
+      value: valueProp
+    });
+  } else if ( /*#__PURE__*/isValidElement(children)) {
     trigger = showLabel ? /*#__PURE__*/cloneElement(children, undefined, label) : children;
   } else {
     trigger = /*#__PURE__*/React.createElement(Input, {

package/es/SiderTree/index.d.ts

@@ -13,7 +13,7 @@ interface Props<KeyType> extends Omit<TreeProps, 'onSelect' | 'selectedKeys' | '
     onSelect?: (node: TreeData<KeyType>, info: {
         event: 'select';
         selected: boolean;
-        node: EventDataNode;
+        node: EventDataNode<DataNode>;
         selectedNodes: DataNode[];
         nativeEvent: MouseEvent;
     }) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/components",
-  "version": "0.1.70",
+  "version": "0.1.74",
   "description": "> TODO: description",
   "author": "鲁盛杰 <lusj@cnlemon.net>",
   "homepage": "",
@@ -36,10 +36,10 @@
     "@types/color-string": "^1.5.2",
     "@types/lodash": "^4.14.179",
     "@types/react-resizable": "^1.7.4",
-    "antd": "^4.20.2",
+    "antd": "^4.21.6",
     "rc-resize-observer": "^1.2.0",
     "react": "^17.0.2",
     "react-dom": "^17.0.2"
   },
-  "gitHead": "46b0cf9ea5f30f15b92816311117cfb815a47330"
+  "gitHead": "4ee13e359f887a2e5baf92cfbf18e4b8eba8f200"
 }