linkmore-design 1.1.13-alpha.4 → 1.1.13-alpha.5

package/es/LmDrag/components/DndContainer.js

@@ -0,0 +1,121 @@
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import React from 'react';
+import { DragOverlay, DndContext, closestCenter, KeyboardSensor, PointerSensor, useSensor, useSensors } from '@dnd-kit/core';
+import { restrictToParentElement } from '@dnd-kit/modifiers';
+import { sortableKeyboardCoordinates } from '@dnd-kit/sortable';
+import SortableBox from './sortableBox';
+var DragOver = /*#__PURE__*/React.memo(function (_ref) {
+  var instance = _ref.instance;
+  var isDragging = instance.isDragging,
+      activeId = instance.activeId,
+      rowKey = instance.rowKey,
+      children = instance.children,
+      options = instance.options;
+  var item = activeId && options.find(function (v) {
+    return v[rowKey] === activeId;
+  });
+  return /*#__PURE__*/React.createElement(DragOverlay, {
+    adjustScale: false
+  }, isDragging ? children({
+    item: item,
+    listeners: {}
+  }) : null);
+});
+/*
+ * restrictToParentElement 拖拽限制在父元素内
+ */
+// 可拖拽容器
+
+var DndContainer = function DndContainer(_ref2) {
+  var options = _ref2.options,
+      rowKey = _ref2.rowKey,
+      children = _ref2.children,
+      move = _ref2.move;
+
+  var _React$useState = React.useState(false),
+      _React$useState2 = _slicedToArray(_React$useState, 2),
+      isDragging = _React$useState2[0],
+      setIsDragging = _React$useState2[1]; // 是否拖拽中
+
+
+  var _React$useState3 = React.useState(null),
+      _React$useState4 = _slicedToArray(_React$useState3, 2),
+      activeId = _React$useState4[0],
+      setActiveId = _React$useState4[1]; // 是否拖拽中
+
+
+  var sensors = useSensors(useSensor(PointerSensor), useSensor(KeyboardSensor, {
+    coordinateGetter: sortableKeyboardCoordinates
+  }));
+
+  var handleMove = function handleMove(activeItem, overItem) {
+    var fileMap = options.map(function (v) {
+      if (v[rowKey] === activeItem[rowKey]) {
+        return Object.assign({}, overItem);
+      }
+
+      if (v[rowKey] === overItem[rowKey]) {
+        return Object.assign({}, activeItem);
+      }
+
+      return v;
+    });
+    move === null || move === void 0 ? void 0 : move(activeItem, overItem, fileMap);
+  }; // 开始拖拽
+
+
+  var handleDragStart = function handleDragStart(_ref3) {
+    var active = _ref3.active;
+    setIsDragging(true);
+
+    if (!active) {
+      return;
+    }
+
+    setActiveId(active.id);
+  }; // 拖拽结束
+
+
+  var handleDragEnd = function handleDragEnd(event) {
+    var active = event.active,
+        over = event.over;
+    setActiveId(null); // 未移入时触发
+
+    if (!(over === null || over === void 0 ? void 0 : over.id)) {
+      return;
+    } // 移入时触发更新数据
+
+
+    if (active.id !== over.id) {
+      handleMove(active.data.current.item, over.data.current.item);
+    }
+  };
+
+  var instance = {
+    isDragging: isDragging,
+    activeId: activeId,
+    options: options,
+    rowKey: rowKey,
+    children: children,
+    move: move,
+    items: options === null || options === void 0 ? void 0 : options.map(function (v) {
+      return v[rowKey];
+    })
+  };
+  return /*#__PURE__*/React.createElement(DndContext, {
+    sensors: sensors,
+    onDragStart: handleDragStart,
+    onDragEnd: handleDragEnd,
+    onDragCancel: function onDragCancel() {
+      return setActiveId(null);
+    },
+    modifiers: [restrictToParentElement],
+    collisionDetection: closestCenter
+  }, /*#__PURE__*/React.createElement(SortableBox, {
+    instance: instance
+  }), /*#__PURE__*/React.createElement(DragOver, {
+    instance: instance
+  }));
+};
+
+export default DndContainer;

package/es/LmDrag/components/sortableBox.d.ts

@@ -0,0 +1,5 @@
+import React from 'react';
+declare const _default: React.MemoExoticComponent<({ instance }: {
+    instance: any;
+}) => JSX.Element>;
+export default _default;

package/es/LmDrag/components/sortableBox.js

@@ -0,0 +1,23 @@
+import React from 'react';
+import { SortableContext, rectSortingStrategy } from '@dnd-kit/sortable';
+import SortableItem from './sortableItem'; // rectSortingStrategy 可交换策略
+
+var SortableBox = function SortableBox(_ref) {
+  var instance = _ref.instance;
+  var items = instance.items,
+      rowKey = instance.rowKey,
+      options = instance.options;
+  return /*#__PURE__*/React.createElement(SortableContext, {
+    items: items,
+    strategy: rectSortingStrategy
+  }, options === null || options === void 0 ? void 0 : options.map(function (item, idx) {
+    return /*#__PURE__*/React.createElement(SortableItem, {
+      instance: instance,
+      index: idx,
+      key: item[rowKey] || idx,
+      item: item
+    });
+  }));
+};
+
+export default /*#__PURE__*/React.memo(SortableBox);

package/es/LmDrag/components/sortableItem.d.ts

@@ -0,0 +1,7 @@
+import React from 'react';
+declare const _default: React.MemoExoticComponent<({ index, item, instance }: {
+    index: any;
+    item: any;
+    instance: any;
+}) => JSX.Element>;
+export default _default;

package/es/LmDrag/components/sortableItem.js

@@ -0,0 +1,41 @@
+import React, { useMemo } from 'react';
+import { useSortable } from '@dnd-kit/sortable';
+import { CSS } from '@dnd-kit/utilities';
+
+var SortableItem = function SortableItem(_ref) {
+  var index = _ref.index,
+      item = _ref.item,
+      instance = _ref.instance;
+  var children = instance.children,
+      rowKey = instance.rowKey;
+
+  var _useSortable = useSortable({
+    id: item[rowKey] || index,
+    data: {
+      item: item
+    }
+  }),
+      attributes = _useSortable.attributes,
+      listeners = _useSortable.listeners,
+      setNodeRef = _useSortable.setNodeRef,
+      transform = _useSortable.transform,
+      transition = _useSortable.transition;
+
+  var resetStyle = useMemo(function () {
+    return {
+      transform: CSS.Transform.toString(transform),
+      transition: transition
+    };
+  }, [transform, transition]);
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", Object.assign({
+    className: "lm_drag_item",
+    ref: setNodeRef,
+    style: resetStyle
+  }, attributes), children === null || children === void 0 ? void 0 : children({
+    item: item,
+    listeners: listeners,
+    index: index
+  })));
+};
+
+export default /*#__PURE__*/React.memo(SortableItem);

package/es/LmDrag/index.d.ts

@@ -0,0 +1,10 @@
+import React, { ReactNode } from 'react';
+import LmDrag from './LmDrag';
+export default LmDrag;
+export { LmDrag };
+export interface LmDragProps {
+    options?: Array<any>;
+    rowKey: string;
+    move?: (activeId: string, overId: string, fileList: Array<any>) => void;
+    children?: ReactNode | React.FC | null;
+}

package/es/LmDrag/index.js

@@ -0,0 +1,3 @@
+import LmDrag from './LmDrag';
+export default LmDrag;
+export { LmDrag };

package/es/LmDrag/style/index.d.ts

@@ -0,0 +1 @@
+import './index.less';

package/es/LmDrag/style/index.js

@@ -0,0 +1 @@
+import "./index.css";

package/es/LmDrag/style/variables.d.ts

@@ -0,0 +1 @@
+import './variables.less';

package/es/LmDrag/style/variables.js

@@ -0,0 +1 @@
+import "./variables.css";

package/es/LmDrag/wrapper/Root.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+declare const _default: React.ForwardRefExoticComponent<Pick<any, string | number | symbol> & React.RefAttributes<unknown>>;
+export default _default;

package/es/LmDrag/wrapper/Root.js

@@ -0,0 +1,12 @@
+import React, { forwardRef, useImperativeHandle } from 'react';
+import Drag from '../components/DndContainer';
+
+var Root = function Root(props, ref) {
+  // 向外暴露出的方法
+  useImperativeHandle(ref, function () {
+    return {};
+  });
+  return /*#__PURE__*/React.createElement(Drag, Object.assign({}, props));
+};
+
+export default /*#__PURE__*/forwardRef(Root);

package/es/LmEditTable/EditTable.d.ts

@@ -23,6 +23,18 @@ interface ILmEditTable extends TableProps<any> {
     };
     /** 是否为强制更新 */
     shouldUpdate?: boolean;
+    rowSelection?: TableProps<any>['rowSelection'] & {
+        selectedRows?: Record<string, any>;
+    };
+}
+export interface CountdownHandle {
+    setRow: (data: any) => void;
+    getCheckboxRecords: () => any[];
+    clearSelect: () => void;
+    customSetCheckboxRecords: (data: any[]) => void;
+    deleteRowData: (record: string | Record<string, any>) => void;
+    addRowData: (record: string | Record<string, any>, addInChind: boolean, defaultValue?: Record<string, any>) => void;
+    valid: () => void;
 }
 interface ILmColumns extends TableColumnType<any> {
     editable?: 'input' | 'number' | 'inputRange' | 'date' | 'select' | 'multiple' | 'checkbox' | 'radio' | 'switch' | 'upload' | 'operate' | 'lm_edit_opetate' | 'render';
@@ -37,11 +49,11 @@ interface ILmColumns extends TableColumnType<any> {
 export declare type TLmEditTable = {
     onChange?: (data: any[]) => void;
     columns: ILmColumns[];
-    virtual: boolean;
+    virtual?: boolean;
 } & ILmEditTable;
 declare const _default: React.MemoExoticComponent<React.ForwardRefExoticComponent<{
     onChange?: (data: any[]) => void;
     columns: ILmColumns[];
-    virtual: boolean;
-} & ILmEditTable & React.RefAttributes<unknown>>>;
+    virtual?: boolean;
+} & ILmEditTable & React.RefAttributes<CountdownHandle>>>;
 export default _default;

package/es/LmEditTable/EditTable.js

@@ -54,7 +54,7 @@ import { PlusCircleOutlined } from '@ant-design/icons';
 import moment from 'moment';
 import { arrayMove } from '@dnd-kit/sortable';
 import { Button, Checkbox, IconFont, Input, InputNumber, Radio, Select, Table, Switch, DatePicker, Form, Popover } from 'linkmore-design';
-import { get, set, isFunction, omit, isEqual, pick, isBoolean } from 'lodash';
+import { get, set, isFunction, omit, isEqual, pick, isBoolean, isObject } from 'lodash';
 import React, { forwardRef, useContext, useEffect, useImperativeHandle, useMemo, useRef, useState, memo, useCallback } from 'react';
 import { useControllableValue } from 'ahooks';
 import { produce } from 'immer';
@@ -488,8 +488,7 @@ var EditableCell = function EditableCell(props) {
 
       case 'inputRange':
         return /*#__PURE__*/React.createElement(InputRange, Object.assign({
-          onChange: handleFormItemChange,
-          ref: inputRef
+          onChange: handleFormItemChange
         }, resultComponentProps, {
           record: record,
           rowIndex: rowIndex,
@@ -582,7 +581,6 @@ var EditableCell = function EditableCell(props) {
         return /*#__PURE__*/React.createElement(Opetate, Object.assign({
           record: record,
           rowKey: rowKey,
-          ref: inputRef,
           handleAdd: handleTableRowAdd,
           handleDelete: handleTableRowDelete,
           getLength: getLength,
@@ -711,6 +709,8 @@ var MemoEditableCell = /*#__PURE__*/memo(EditableCell, function (prev, next) {
   return isEqual(p, n);
 });
 var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
+  var _a, _b;
+
   var defaultData = props.value,
       columns = props.columns,
       isEdit = props.isEdit,
@@ -754,19 +754,31 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
   var _useState7 = useState({}),
       _useState8 = _slicedToArray(_useState7, 2),
       _valid = _useState8[0],
-      setValid = _useState8[1];
+      setValid = _useState8[1]; // const [localRowSelectList, setLocalRowSelectList] = useState([])
 
-  var _useState9 = useState([]),
-      _useState10 = _slicedToArray(_useState9, 2),
-      localRowSelectList = _useState10[0],
-      setLocalRowSelectList = _useState10[1];
+
+  var transformRowSelect = function transformRowSelect(selectedRowKeys, selectedRows, info) {
+    var _a;
+
+    return (_a = rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.onChange) === null || _a === void 0 ? void 0 : _a.call(rowSelection, selectedRowKeys, selectedRows, info);
+  };
+
+  var _useControllableValue3 = useControllableValue({
+    value: {
+      selectedRows: (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRows) || (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRowKeys) || []
+    },
+    onChange: (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.onChange) ? transformRowSelect : undefined
+  }),
+      _useControllableValue4 = _slicedToArray(_useControllableValue3, 2),
+      localRowSelectList = _useControllableValue4[0],
+      setLocalRowSelectList = _useControllableValue4[1];
   /** 当前展开的列 */
 
 
-  var _useState11 = useState([]),
-      _useState12 = _slicedToArray(_useState11, 2),
-      expandedRowKeys = _useState12[0],
-      setExpandedRowKeys = _useState12[1];
+  var _useState9 = useState([]),
+      _useState10 = _slicedToArray(_useState9, 2),
+      expandedRowKeys = _useState10[0],
+      setExpandedRowKeys = _useState10[1];
 
   var dataSourceRef = useRef(dataSource);
   var deepDataSourceRef = useRef(deepDataSourcePreKeys(dataSource, _rowKey));
@@ -810,25 +822,20 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
     setDataSource(res); // onChange?.(res)
   };
   /** 本地缓存一个选择数据 */
+  // useEffect(() => {
+  //   if (rowSelection) {
+  //     const { selectedRowKeys } = rowSelection
+  //     if (selectedRowKeys) {
+  //       setLocalRowSelectList(localRowSelectList || [])
+  //     }
+  //   }
+  // }, [rowSelection])
+  // const editTableRowChange = (selectRows) => {
+  //   setLocalRowSelectList(selectRows)
+  //   ;(rowSelection?.onChange as any)?.(selectRows)
+  // }
 
 
-  useEffect(function () {
-    if (rowSelection) {
-      var selectedRowKeys = rowSelection.selectedRowKeys;
-
-      if (selectedRowKeys) {
-        setLocalRowSelectList(localRowSelectList || []);
-      }
-    }
-  }, [rowSelection]);
-
-  var editTableRowChange = function editTableRowChange(selectRows) {
-    var _a;
-
-    setLocalRowSelectList(selectRows);
-    (_a = rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.onChange) === null || _a === void 0 ? void 0 : _a.call(rowSelection, selectRows);
-  };
-
   var handleSave = function handleSave(row, options) {
     var _a, _b;
 
@@ -918,7 +925,8 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
   var handleTableRowDelete = function handleTableRowDelete(key) {
     var _a, _b, _c;
 
-    var preKeys = (_b = (_a = deepDataSourceRef === null || deepDataSourceRef === void 0 ? void 0 : deepDataSourceRef.current) === null || _a === void 0 ? void 0 : _a[key]) === null || _b === void 0 ? void 0 : _b.preKeys;
+    var rkey = isObject(key) ? key[_rowKey] : key;
+    var preKeys = (_b = (_a = deepDataSourceRef === null || deepDataSourceRef === void 0 ? void 0 : deepDataSourceRef.current) === null || _a === void 0 ? void 0 : _a[rkey]) === null || _b === void 0 ? void 0 : _b.preKeys;
 
     if (preKeys.length > 1) {
       /** 说明删除的是children中的数据 */
@@ -962,10 +970,11 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
   /** 快捷添加 */
 
 
-  var handleTableRowAdd = function handleTableRowAdd(record, isAppendInChindren) {
+  var handleTableRowAdd = function handleTableRowAdd(record, isAppendInChindren, defaultRecord) {
     var _a, _b;
 
-    var preKeys = (_b = (_a = deepDataSourceRef === null || deepDataSourceRef === void 0 ? void 0 : deepDataSourceRef.current) === null || _a === void 0 ? void 0 : _a[record[_rowKey]]) === null || _b === void 0 ? void 0 : _b.preKeys;
+    var rkey = isObject(record) ? record[_rowKey] : record;
+    var preKeys = (_b = (_a = deepDataSourceRef === null || deepDataSourceRef === void 0 ? void 0 : deepDataSourceRef.current) === null || _a === void 0 ? void 0 : _a[rkey]) === null || _b === void 0 ? void 0 : _b.preKeys;
     var res = produce(dataSourceRef.current, function (draft) {
       var _a, _b, _c, _d;
 
@@ -975,17 +984,17 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
             var _a;
 
             if (preKeys === null || preKeys === void 0 ? void 0 : preKeys.includes(item[_rowKey])) {
-              if (item[_rowKey] === record[_rowKey]) {
+              if (item[_rowKey] === rkey) {
                 if (isAppendInChindren) {
                   if (item === null || item === void 0 ? void 0 : item.children) {
-                    (_a = item === null || item === void 0 ? void 0 : item.children) === null || _a === void 0 ? void 0 : _a.push(_defineProperty({}, _rowKey, "".concat(Date.now())));
+                    (_a = item === null || item === void 0 ? void 0 : item.children) === null || _a === void 0 ? void 0 : _a.push(defaultRecord || _defineProperty({}, _rowKey, "".concat(Date.now())));
                   } else {
-                    item.children = [_defineProperty({}, _rowKey, "".concat(Date.now()))];
+                    item.children = [defaultRecord || _defineProperty({}, _rowKey, "".concat(Date.now()))];
                   }
 
                   !expandedRowKeys.includes(item[_rowKey]) && setExpandedRowKeys([].concat(_toConsumableArray(expandedRowKeys), [item[_rowKey]]));
                 } else {
-                  children.splice(index + 1, 0, _defineProperty({}, _rowKey, "".concat(Date.now())));
+                  children.splice(index + 1, 0, defaultRecord || _defineProperty({}, _rowKey, "".concat(Date.now())));
                 }
               } else if (item.children) {
                 deeps(item.children);
@@ -997,7 +1006,7 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
         deeps(draft);
       } else {
         var index = draft.findIndex(function (item) {
-          return record[_rowKey] === item[_rowKey];
+          return rkey === item[_rowKey];
         });
 
         if (index !== -1) {
@@ -1015,6 +1024,7 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
         }
       }
     });
+    console.log(preKeys, '--preKeys', res);
     setDataSource(res);
   };
 
@@ -1050,9 +1060,9 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
 
   var DisableOptions = useMemo(function () {
     var newColumns = columns === null || columns === void 0 ? void 0 : columns.map(function (item) {
-      var _ref5 = item.componentProps || {},
-          optionOnly = _ref5.optionOnly,
-          options = _ref5.options;
+      var _ref7 = item.componentProps || {},
+          optionOnly = _ref7.optionOnly,
+          options = _ref7.options;
 
       if (optionOnly && options) {
         var dataIndex = item.dataIndex;
@@ -1235,6 +1245,25 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
   useImperativeHandle(ref, function () {
     return {
       setRow: handleSave,
+      getCheckboxRecords: function getCheckboxRecords() {
+        return localRowSelectList.selectedRows;
+      },
+      deleteRowData: function deleteRowData(data) {
+        return handleTableRowDelete(data);
+      },
+      addRowData: function addRowData(data, addInChind, defaultValue) {
+        return handleTableRowAdd(data, addInChind, defaultValue);
+      },
+      clearSelect: function clearSelect() {
+        setLocalRowSelectList({
+          selectedRows: []
+        });
+      },
+      customSetCheckboxRecords: function customSetCheckboxRecords(value) {
+        setLocalRowSelectList({
+          selectedRows: value
+        });
+      },
       valid: function valid() {
         return _valid;
       }
@@ -1300,17 +1329,18 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
       bordered: true,
       pagination: false,
       // components={tableComponents}
-      rowSelection: !rowSelection ? undefined : {
+      rowSelection: !rowSelection ? undefined : Object.assign(Object.assign({
         fixed: true,
         type: 'checkbox',
-        columnWidth: 36,
-        selectedRowKeys: localRowSelectList === null || localRowSelectList === void 0 ? void 0 : localRowSelectList.map(function (v) {
-          return v[_rowKey];
+        columnWidth: 36
+      }, rowSelection), {
+        selectedRowKeys: (_a = localRowSelectList === null || localRowSelectList === void 0 ? void 0 : localRowSelectList.selectedRows) === null || _a === void 0 ? void 0 : _a.map(function (v) {
+          return isObject(v) ? v[_rowKey] : v;
         }),
-        onChange: function onChange(selectedRowKeys, selectedRows) {
-          editTableRowChange(selectedRows);
+        onChange: function onChange(selectedRowKeys, selectedRows, info) {
+          setLocalRowSelectList(selectedRowKeys, selectedRows, info);
         }
-      },
+      }),
       dataSource: dataSource
     })))), isShowAddAction && /*#__PURE__*/React.createElement(Button, {
       className: "lm_editTable_add_bar",
@@ -1341,17 +1371,18 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
         return setExpandedRowKeys(expandedRows);
       }
     },
-    rowSelection: !rowSelection ? undefined : {
+    rowSelection: !rowSelection ? undefined : Object.assign(Object.assign({
       fixed: true,
       type: 'checkbox',
-      columnWidth: 36,
-      selectedRowKeys: localRowSelectList === null || localRowSelectList === void 0 ? void 0 : localRowSelectList.map(function (v) {
-        return v[_rowKey];
+      columnWidth: 36
+    }, rowSelection), {
+      selectedRowKeys: (_b = localRowSelectList === null || localRowSelectList === void 0 ? void 0 : localRowSelectList.selectedRows) === null || _b === void 0 ? void 0 : _b.map(function (v) {
+        return isObject(v) ? v[_rowKey] : v;
       }),
-      onChange: function onChange(selectedRowKeys, selectedRows) {
-        editTableRowChange(selectedRows);
+      onChange: function onChange(selectedRowKeys, selectedRows, info) {
+        setLocalRowSelectList(selectedRowKeys, selectedRows, info);
       }
-    },
+    }),
     dataSource: dataSource
   })), isShowAddAction && /*#__PURE__*/React.createElement(Button, {
     className: "lm_editTable_add_bar",

package/es/LmEditTable/sortableItemCol.js

@@ -13,12 +13,14 @@ var __rest = this && this.__rest || function (s, e) {
 
 import React, { forwardRef } from 'react';
 import { useSortable } from '@dnd-kit/sortable';
+import { omit } from 'lodash';
 import { CSS } from '@dnd-kit/utilities';
 var Item = /*#__PURE__*/forwardRef(function (_a, ref) {
   var children = _a.children,
       props = __rest(_a, ["children"]);
 
-  return /*#__PURE__*/React.createElement("th", Object.assign({}, props, children.props, {
+  var rProps = omit(Object.assign(Object.assign({}, props), children.props), ['isSticky', 'colStart', 'colEnd', 'prefixCls', 'fixLeft', 'fixRight', 'lastFixLeft', 'firstFixRight', 'lastFixRight', 'firstFixLeft', 'isSticky', 'additionalProps', 'rowType']);
+  return /*#__PURE__*/React.createElement("th", Object.assign({}, rProps, {
     ref: ref
   })); // <th {...props} ref={ref as any}>
   //   {/* {(children as any)?.props?.children || children} */}

package/es/LmFilter/components/DropdownFIlter.js

@@ -201,7 +201,7 @@ var ItemLabel = /*#__PURE__*/_react.default.memo(function (_ref3) {
     } catch (error) {
       return filterValue;
     }
-  }, [type, filterValue]);
+  }, [type, data, filterValue]);
 
   if (isString) {
     return /*#__PURE__*/_react.default.createElement("span", null, String);
@@ -216,7 +216,8 @@ var FilterItem = /*#__PURE__*/_react.default.memo(function (_ref4) {
   var filterValue = instance.filterValue,
       setFilterValue = instance.setFilterValue;
   var title = item.title,
-      colon = item.colon; // 是否有筛选值/是否处于筛选状态
+      colon = item.colon,
+      clearIconTrigger = item.clearIconTrigger; // 是否有筛选值/是否处于筛选状态
 
   var active = (0, _react.useMemo)(function () {
     return (0, _utils.getIsHas)(filterValue);
@@ -231,6 +232,29 @@ var FilterItem = /*#__PURE__*/_react.default.memo(function (_ref4) {
       e.stopPropagation();
       setFilterValue((0, _utils.getValueForType)(item.type));
     }
+  }; // Icon展示方式
+
+
+  var Icon = function Icon() {
+    // hover时出现清空
+    if (clearIconTrigger === 'hover') {
+      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
+        type: "lmweb-close-circle-fill",
+        onClick: handleClear,
+        className: "icon_clear"
+      }), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
+        type: "lmweb-down",
+        className: "icon_down"
+      }));
+    } // 日期类型并且未选中时返回日期自带icon
+
+
+    if (item.type === 'date' && !active) return null; // 选中时展示清楚按钮
+
+    return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
+      type: active ? 'lmweb-close-circle-fill' : 'lmweb-down',
+      onClick: handleClear
+    });
   };
 
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (title || showColon) && /*#__PURE__*/_react.default.createElement("div", {
@@ -244,10 +268,7 @@ var FilterItem = /*#__PURE__*/_react.default.memo(function (_ref4) {
     item: item
   })), /*#__PURE__*/_react.default.createElement("div", {
     className: "filter_item_icon addon_after"
-  }, item.type !== 'date' || active ? /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
-    type: active ? 'lmweb-close-circle-fill' : 'lmweb-down',
-    onClick: handleClear
-  }) : null));
+  }, /*#__PURE__*/_react.default.createElement(Icon, null)));
 });
 /*
  * css样式控制

package/es/LmFilter/style/index.css

@@ -108,6 +108,18 @@
 .lm_filter_basic_item .filter_item_icon.addon_before {
   color: var(--font-color);
 }
+.lm_filter_basic_item .filter_item_icon .icon_clear {
+  display: none;
+  opacity: 0;
+}
+.lm_filter_basic_item .filter_item_icon:hover .icon_down {
+  display: none;
+  opacity: 0;
+}
+.lm_filter_basic_item .filter_item_icon:hover .icon_clear {
+  display: inline-block;
+  opacity: 1;
+}
 .lm_filter_basic_item.expand .filter_item_icon.addon_after {
   transform: rotateX(180deg);
 }