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

package/lib/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>, defaultValue?: Record<string, any> | Record<string, any>[], addInChild?: boolean) => 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/lib/LmEditTable/EditTable.js

@@ -494,7 +494,16 @@ var EditableCell = function EditableCell(props) {
   };
 
   var Control = function Control(con) {
+    var _a;
+
     var resultComponentProps = (0, _lodash.isFunction)(componentProps) ? componentProps === null || componentProps === void 0 ? void 0 : componentProps(record, col) : componentProps;
+
+    if ((0, _lodash.isFunction)(componentProps) && ((_a = col === null || col === void 0 ? void 0 : col.newOptions) === null || _a === void 0 ? void 0 : _a.length)) {
+      resultComponentProps = Object.assign(Object.assign({}, resultComponentProps), {
+        options: col === null || col === void 0 ? void 0 : col.newOptions
+      });
+    }
+
     var clearAttrComponentProps = (0, _lodash.omit)(resultComponentProps, ['optionOnly', 'isOnlyValue', 'quickcopy']);
 
     switch (con) {
@@ -521,8 +530,7 @@ var EditableCell = function EditableCell(props) {
 
       case 'inputRange':
         return /*#__PURE__*/_react.default.createElement(InputRange, Object.assign({
-          onChange: handleFormItemChange,
-          ref: inputRef
+          onChange: handleFormItemChange
         }, resultComponentProps, {
           record: record,
           rowIndex: rowIndex,
@@ -615,7 +623,6 @@ var EditableCell = function EditableCell(props) {
         return /*#__PURE__*/_react.default.createElement(Opetate, Object.assign({
           record: record,
           rowKey: rowKey,
-          ref: inputRef,
           handleAdd: handleTableRowAdd,
           handleDelete: handleTableRowDelete,
           getLength: getLength,
@@ -624,7 +631,8 @@ var EditableCell = function EditableCell(props) {
 
       case 'render':
         {
-          var render = resultComponentProps.render;
+          var _resultComponentProps = resultComponentProps,
+              render = _resultComponentProps.render;
           var fromData = form.getFieldsValue();
           return render === null || render === void 0 ? void 0 : render(Object.assign(Object.assign({}, !(0, _util.isObjEmpty)(fromData) ? Object.assign(Object.assign({}, record), (0, _defineProperty2.default)({}, dataIndex, fromData[dataIndex])) : record), {
             onChange: save
@@ -733,7 +741,8 @@ var EditableCell = function EditableCell(props) {
 var MemoEditableCell = /*#__PURE__*/(0, _react.memo)(EditableCell, function (prev, next) {
   var pickProps = ['record', 'colIndex'];
   var p = (0, _lodash.pick)(prev, pickProps);
-  var n = (0, _lodash.pick)(next, pickProps); // console.log(prev, next, '22', checkMemoShouldUploadSpecialFun(prev, next), isEqual(p, n))
+  var n = (0, _lodash.pick)(next, pickProps);
+  console.log(prev, next, 222); // console.log(prev, next, '22', checkMemoShouldUploadSpecialFun(prev, next), isEqual(p, n))
 
   /** TODO: 在record中带有children，子列表数据修改之后，会导致父级的record对比不一样 */
 
@@ -744,6 +753,8 @@ var MemoEditableCell = /*#__PURE__*/(0, _react.memo)(EditableCell, function (pre
   return (0, _lodash.isEqual)(p, n);
 });
 var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
+  var _a, _b;
+
   var defaultData = props.value,
       columns = props.columns,
       isEdit = props.isEdit,
@@ -787,19 +798,31 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var _useState7 = (0, _react.useState)({}),
       _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
       _valid = _useState8[0],
-      setValid = _useState8[1];
+      setValid = _useState8[1]; // const [localRowSelectList, setLocalRowSelectList] = useState([])
 
-  var _useState9 = (0, _react.useState)([]),
-      _useState10 = (0, _slicedToArray2.default)(_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 = (0, _ahooks.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 = (0, _slicedToArray2.default)(_useControllableValue3, 2),
+      localRowSelectList = _useControllableValue4[0],
+      setLocalRowSelectList = _useControllableValue4[1];
   /** 当前展开的列 */
 
 
-  var _useState11 = (0, _react.useState)([]),
-      _useState12 = (0, _slicedToArray2.default)(_useState11, 2),
-      expandedRowKeys = _useState12[0],
-      setExpandedRowKeys = _useState12[1];
+  var _useState9 = (0, _react.useState)([]),
+      _useState10 = (0, _slicedToArray2.default)(_useState9, 2),
+      expandedRowKeys = _useState10[0],
+      setExpandedRowKeys = _useState10[1];
 
   var dataSourceRef = (0, _react.useRef)(dataSource);
   var deepDataSourceRef = (0, _react.useRef)((0, _util.deepDataSourcePreKeys)(dataSource, _rowKey));
@@ -843,25 +866,20 @@ var EditTable = /*#__PURE__*/(0, _react.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)
+  // }
 
 
-  (0, _react.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;
 
@@ -951,7 +969,8 @@ var EditTable = /*#__PURE__*/(0, _react.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 = (0, _lodash.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中的数据 */
@@ -995,30 +1014,46 @@ var EditTable = /*#__PURE__*/(0, _react.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 = (0, _lodash.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;
+    console.log(record, isAppendInChindren, defaultRecord, '333', preKeys);
     var res = (0, _immer.produce)(dataSourceRef.current, function (draft) {
-      var _a, _b, _c, _d;
+      var _a, _b, _c, _d, _e;
 
-      if (preKeys.length > 1) {
+      if ((preKeys === null || preKeys === void 0 ? void 0 : preKeys.length) > 1) {
         var deeps = function deeps(children) {
           children === null || children === void 0 ? void 0 : children.forEach(function (item, index) {
-            var _a;
+            var _a, _b;
 
             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((0, _defineProperty2.default)({}, _rowKey, "".concat(Date.now())));
+                    if (Array.isArray(defaultRecord)) {
+                      var _a2;
+
+                      (_a = item === null || item === void 0 ? void 0 : item.children) === null || _a === void 0 ? void 0 : (_a2 = _a).push.apply(_a2, (0, _toConsumableArray2.default)(defaultRecord));
+                    } else {
+                      (_b = item === null || item === void 0 ? void 0 : item.children) === null || _b === void 0 ? void 0 : _b.push(defaultRecord || (0, _defineProperty2.default)({}, _rowKey, "".concat(Date.now())));
+                    }
                   } else {
-                    item.children = [(0, _defineProperty2.default)({}, _rowKey, "".concat(Date.now()))];
+                    if (Array.isArray(defaultRecord)) {
+                      item.children = (0, _toConsumableArray2.default)(defaultRecord);
+                    } else {
+                      item.children = [defaultRecord || (0, _defineProperty2.default)({}, _rowKey, "".concat(Date.now()))];
+                    }
                   }
 
                   !expandedRowKeys.includes(item[_rowKey]) && setExpandedRowKeys([].concat((0, _toConsumableArray2.default)(expandedRowKeys), [item[_rowKey]]));
                 } else {
-                  children.splice(index + 1, 0, (0, _defineProperty2.default)({}, _rowKey, "".concat(Date.now())));
+                  if (Array.isArray(defaultRecord)) {
+                    children.splice.apply(children, [index + 1, 0].concat((0, _toConsumableArray2.default)(defaultRecord)));
+                  } else {
+                    children.splice(index + 1, 0, defaultRecord || (0, _defineProperty2.default)({}, _rowKey, "".concat(Date.now())));
+                  }
                 }
               } else if (item.children) {
                 deeps(item.children);
@@ -1030,20 +1065,32 @@ var EditTable = /*#__PURE__*/(0, _react.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) {
           if (isAppendInChindren) {
             if ((_a = draft[index].children) === null || _a === void 0 ? void 0 : _a.length) {
-              (_b = draft[index].children) === null || _b === void 0 ? void 0 : _b.push((0, _defineProperty2.default)({}, _rowKey, "".concat(Date.now())));
+              if (Array.isArray(defaultRecord)) {
+                var _b2;
+
+                (_b = draft[index].children) === null || _b === void 0 ? void 0 : (_b2 = _b).push.apply(_b2, (0, _toConsumableArray2.default)(defaultRecord));
+              } else {
+                (_c = draft[index].children) === null || _c === void 0 ? void 0 : _c.push(defaultRecord || (0, _defineProperty2.default)({}, _rowKey, "".concat(Date.now())));
+              }
             } else {
-              draft[index].children = [(0, _defineProperty2.default)({}, _rowKey, "".concat(Date.now()))];
+              draft[index].children = Array.isArray(defaultRecord) ? (0, _toConsumableArray2.default)(defaultRecord) : [defaultRecord || (0, _defineProperty2.default)({}, _rowKey, "".concat(Date.now()))];
             }
 
-            !expandedRowKeys.includes((_c = draft[index]) === null || _c === void 0 ? void 0 : _c[_rowKey]) && setExpandedRowKeys([].concat((0, _toConsumableArray2.default)(expandedRowKeys), [(_d = draft[index]) === null || _d === void 0 ? void 0 : _d[_rowKey]]));
+            !expandedRowKeys.includes((_d = draft[index]) === null || _d === void 0 ? void 0 : _d[_rowKey]) && setExpandedRowKeys([].concat((0, _toConsumableArray2.default)(expandedRowKeys), [(_e = draft[index]) === null || _e === void 0 ? void 0 : _e[_rowKey]]));
           } else {
-            draft.splice(index + 1, 0, (0, _defineProperty2.default)({}, _rowKey, "".concat(Date.now())));
+            if (Array.isArray(defaultRecord)) {
+              console.log(1);
+              draft.splice.apply(draft, [index + 1, 0].concat((0, _toConsumableArray2.default)(defaultRecord)));
+            } else {
+              console.log(2);
+              draft.splice(index + 1, 0, defaultRecord || (0, _defineProperty2.default)({}, _rowKey, "".concat(Date.now())));
+            }
           }
         }
       }
@@ -1068,8 +1115,9 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     var hasOnlyOptionsDatas = columns.filter(function (item) {
       var _a;
 
-      return (_a = item === null || item === void 0 ? void 0 : item.componentProps) === null || _a === void 0 ? void 0 : _a.optionOnly;
-    });
+      var resultComponentProps = (0, _lodash.isFunction)(item === null || item === void 0 ? void 0 : item.componentProps) ? (_a = item === null || item === void 0 ? void 0 : item.componentProps) === null || _a === void 0 ? void 0 : _a.call(item, {}, item) : item === null || item === void 0 ? void 0 : item.componentProps;
+      return resultComponentProps === null || resultComponentProps === void 0 ? void 0 : resultComponentProps.optionOnly;
+    }); // const hasOnlyOptionsDatas = columns.filter((item) => item?.componentProps?.optionOnly)
 
     if (hasOnlyOptionsDatas.length) {
       return hasOnlyOptionsDatas === null || hasOnlyOptionsDatas === void 0 ? void 0 : hasOnlyOptionsDatas.map(function (item) {
@@ -1083,9 +1131,13 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 
   var DisableOptions = (0, _react.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 _a;
+
+      var resultComponentProps = (0, _lodash.isFunction)(item.componentProps) ? (_a = item.componentProps) === null || _a === void 0 ? void 0 : _a.call(item, {}, item) : item.componentProps;
+
+      var _ref9 = resultComponentProps || {},
+          optionOnly = _ref9.optionOnly,
+          options = _ref9.options;
 
       if (optionOnly && options) {
         var dataIndex = item.dataIndex;
@@ -1097,6 +1149,13 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
             disabled: !!dataIndexData.includes(o === null || o === void 0 ? void 0 : o.value)
           });
         });
+
+        if ((0, _lodash.isFunction)(item.componentProps)) {
+          return Object.assign(Object.assign({}, item), {
+            newOptions: newOptions
+          });
+        }
+
         return Object.assign(Object.assign({}, item), {
           componentProps: Object.assign(Object.assign({}, item.componentProps), {
             options: newOptions
@@ -1124,7 +1183,7 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       fixed: 'left',
       render: function render(_, record) {
         return /*#__PURE__*/_react.default.createElement(_DragHandle.default, {
-          id: record[_rowKey] || record.id
+          id: record[_rowKey] || (record === null || record === void 0 ? void 0 : record.id)
         });
       }
     } : null, indexCol ? (0, _lodash.isBoolean)(indexCol) ? {
@@ -1267,6 +1326,25 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   (0, _react.useImperativeHandle)(ref, function () {
     return {
       setRow: handleSave,
+      getCheckboxRecords: function getCheckboxRecords() {
+        return localRowSelectList.selectedRows;
+      },
+      deleteRowData: function deleteRowData(data) {
+        return handleTableRowDelete(data);
+      },
+      addRowData: function addRowData(data, defaultValue, addInChild) {
+        return handleTableRowAdd(data, addInChild, defaultValue);
+      },
+      clearSelect: function clearSelect() {
+        setLocalRowSelectList({
+          selectedRows: []
+        });
+      },
+      customSetCheckboxRecords: function customSetCheckboxRecords(value) {
+        setLocalRowSelectList({
+          selectedRows: value
+        });
+      },
       valid: function valid() {
         return _valid;
       }
@@ -1332,17 +1410,18 @@ var EditTable = /*#__PURE__*/(0, _react.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 (0, _lodash.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.default.createElement(_linkmoreDesign.Button, {
       className: "lm_editTable_add_bar",
@@ -1373,17 +1452,18 @@ var EditTable = /*#__PURE__*/(0, _react.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 (0, _lodash.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.default.createElement(_linkmoreDesign.Button, {
     className: "lm_editTable_add_bar",

package/lib/LmEditTable/sortableItemCol.js

@@ -26,21 +26,47 @@ var __rest = void 0 && (void 0).__rest || function (s, e) {
   return t;
 };
 
+// interface ItemType {
+//   children: React.ReactNode
+// }
+// interface ItemInstance {}
+// @ts-ignore
 var Item = /*#__PURE__*/(0, _react.forwardRef)(function (_a, ref) {
   var children = _a.children,
-      props = __rest(_a, ["children"]);
+      props = __rest(_a, ["children"]); // const rProps = omit({ ...props, ...children.props }, [
+  //   'isSticky',
+  //   'colStart',
+  //   'colEnd',
+  //   'prefixCls',
+  //   'fixLeft',
+  //   'fixRight',
+  //   'lastFixLeft',
+  //   'firstFixRight',
+  //   'lastFixRight',
+  //   'firstFixLeft',
+  //   'isSticky',
+  //   'additionalProps',
+  //   'rowType',
+  // ])
 
-  return /*#__PURE__*/_react.default.createElement("th", Object.assign({}, props, children.props, {
-    ref: ref
-  })); // <th {...props} ref={ref as any}>
-  //   {/* {(children as any)?.props?.children || children} */}
-  //   { children }
-  // </th>
+
+  return (
+    /*#__PURE__*/
+    // <th {...rProps} ref={ref as any} />
+    _react.default.createElement("th", Object.assign({}, props, children.props, {
+      ref: ref
+    })) // <th {...props} ref={ref as any}>
+    //   {(children as any)?.props?.children || children}
+    // </th>
+
+  );
 });
 
 function SortableItem(props) {
+  var id = props.id;
+
   var _useSortable = (0, _sortable.useSortable)({
-    id: props.id
+    id: id
   }),
       attributes = _useSortable.attributes,
       listeners = _useSortable.listeners,

package/lib/LmEditTable/util.js

@@ -84,7 +84,7 @@ function getExpandStatus(children) {
 }
 
 function checkMemoShouldUploadSpecialFun(prev, next) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
 
   var checkExpandStatus = getExpandStatus(prev.children) === getExpandStatus(next.children);
 
@@ -109,7 +109,14 @@ function checkMemoShouldUploadSpecialFun(prev, next) {
   }
 
   if ((((_c = prevCol === null || prevCol === void 0 ? void 0 : prevCol.componentProps) === null || _c === void 0 ? void 0 : _c.optionOnly) || ((_d = nextCol === null || nextCol === void 0 ? void 0 : nextCol.componentProps) === null || _d === void 0 ? void 0 : _d.optionOnly)) && !(0, _lodash.isEqual)((_e = prevCol === null || prevCol === void 0 ? void 0 : prevCol.componentProps) === null || _e === void 0 ? void 0 : _e.options, (_f = nextCol === null || nextCol === void 0 ? void 0 : nextCol.componentProps) === null || _f === void 0 ? void 0 : _f.options)) {
-    // return isEqual(prevCol?.componentProps?.options, nextCol?.componentProps?.options)
+    return false;
+  }
+
+  if ((((_g = prevCol === null || prevCol === void 0 ? void 0 : prevCol.componentProps) === null || _g === void 0 ? void 0 : _g.options) || ((_h = nextCol === null || nextCol === void 0 ? void 0 : nextCol.componentProps) === null || _h === void 0 ? void 0 : _h.options)) && !(0, _lodash.isEqual)((_j = prevCol === null || prevCol === void 0 ? void 0 : prevCol.componentProps) === null || _j === void 0 ? void 0 : _j.options, (_k = nextCol === null || nextCol === void 0 ? void 0 : nextCol.componentProps) === null || _k === void 0 ? void 0 : _k.options)) {
+    return false;
+  }
+
+  if (((0, _lodash.isFunction)(prevCol === null || prevCol === void 0 ? void 0 : prevCol.componentProps) || (0, _lodash.isFunction)(nextCol === null || nextCol === void 0 ? void 0 : nextCol.componentProps)) && !(0, _lodash.isEqual)(prevCol.newOptions, nextCol.newOptions) && !(0, _lodash.isEqual)(prevCol === null || prevCol === void 0 ? void 0 : prevCol.componentProps, nextCol === null || nextCol === void 0 ? void 0 : nextCol.componentProps)) {
     return false;
   }
 
@@ -118,13 +125,17 @@ function checkMemoShouldUploadSpecialFun(prev, next) {
     return false;
   }
 
+  if (next.className.indexOf('drag-visible') > -1) {
+    return (0, _lodash.isEqual)(prev.style, next.style);
+  }
+
   if (next.className.indexOf('ant-table-selection-column') > -1) {
-    return (0, _lodash.isEqual)((_h = (_g = prev.children) === null || _g === void 0 ? void 0 : _g[1]) === null || _h === void 0 ? void 0 : _h.props, (_k = (_j = next.children) === null || _j === void 0 ? void 0 : _j[1]) === null || _k === void 0 ? void 0 : _k.props);
+    return (0, _lodash.isEqual)((_m = (_l = prev.children) === null || _l === void 0 ? void 0 : _l[1]) === null || _m === void 0 ? void 0 : _m.props, (_p = (_o = next.children) === null || _o === void 0 ? void 0 : _o[1]) === null || _p === void 0 ? void 0 : _p.props);
   }
   /** 如果启用了快速复制功能，需要实时判断rowIndex与getLength */
 
 
-  if (((_l = prevCol === null || prevCol === void 0 ? void 0 : prevCol.componentProps) === null || _l === void 0 ? void 0 : _l.quickcopy) || ((_m = nextCol === null || nextCol === void 0 ? void 0 : nextCol.componentProps) === null || _m === void 0 ? void 0 : _m.quickcopy)) {
+  if (((_q = prevCol === null || prevCol === void 0 ? void 0 : prevCol.componentProps) === null || _q === void 0 ? void 0 : _q.quickcopy) || ((_r = nextCol === null || nextCol === void 0 ? void 0 : nextCol.componentProps) === null || _r === void 0 ? void 0 : _r.quickcopy)) {
     var pickProps = ['record', 'colIndex', 'rowIndex', 'getLength'];
     var p = (0, _lodash.pick)(prev, pickProps);
     var n = (0, _lodash.pick)(next, pickProps);

package/lib/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/lib/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);
 }

package/lib/LmFilter/style/variables.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);
 }

package/lib/LmUpload/LmUpload.js

@@ -85,7 +85,7 @@ var LmUpload = function LmUpload(_a, ref) {
     size: 100,
     fileSize: 10,
     fileSizeType: 'M',
-    uid: 'uid',
+    uid: 'fileName',
     accept: '',
     type: ['jpg', 'jpeg', 'png'],
     listType: 'card',
@@ -100,6 +100,7 @@ var LmUpload = function LmUpload(_a, ref) {
     itemRender: null,
     enabledPreview: true,
     enabledCrop: false,
+    enableDrag: false,
     enabledOss: false,
     // oss配置
     ossConfig: function ossConfig() {

package/lib/LmUpload/UploadList/ItemPictureCard.d.ts

@@ -1,6 +1,7 @@
-declare const PictureItem: ({ file, index, instance }: {
+declare const PictureItem: ({ file, index, instance, listeners }: {
     file: any;
     index: any;
     instance: any;
+    listeners: any;
 }) => JSX.Element;
 export default PictureItem;