linkmore-design 1.1.21 → 1.1.22

package/dist/LmDrag/LmDrag.d.ts

@@ -1,5 +1,4 @@
 import React from 'react';
-declare const _default: React.ForwardRefExoticComponent<Pick<{
-    [x: string]: any;
-}, string | number> & React.RefAttributes<unknown>>;
+import { LmDragProps } from '..';
+declare const _default: React.ForwardRefExoticComponent<LmDragProps & React.RefAttributes<unknown>>;
 export default _default;

package/dist/LmEditTable/EditTable.d.ts

@@ -22,6 +22,16 @@ 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;
+    valid: () => void;
 }
 interface ILmColumns extends TableColumnType<any> {
     editable?: 'input' | 'number' | 'inputRange' | 'date' | 'select' | 'multiple' | 'checkbox' | 'radio' | 'switch' | 'upload' | 'operate' | 'lm_edit_opetate' | 'render';
@@ -33,12 +43,12 @@ interface ILmColumns extends TableColumnType<any> {
     componentProps?: Record<string, any>;
     relevanceCols?: boolean;
 }
-export declare type TLmEditTable = {
+export declare type TLmEditTable = ILmEditTable & {
     onChange?: (data: any[]) => void;
     columns: ILmColumns[];
-} & ILmEditTable;
-declare const _default: React.MemoExoticComponent<React.ForwardRefExoticComponent<{
+};
+declare const _default: React.MemoExoticComponent<React.ForwardRefExoticComponent<ILmEditTable & {
     onChange?: (data: any[]) => void;
     columns: ILmColumns[];
-} & ILmEditTable & React.RefAttributes<unknown>>>;
+} & React.RefAttributes<CountdownHandle>>>;
 export default _default;

package/dist/index.d.ts

@@ -51,6 +51,7 @@ export type { TooltipProps } from './Tooltip';
 export { default as Form } from './Form';
 export { default as Spin } from './Spin';
 export { default as LmEditTable } from './LmEditTable';
+export type { CountdownHandle, TLmEditTable } from './LmEditTable/EditTable';
 export { default as List } from './List';
 export { default as LMQuickMenu } from './QuickMenu';
 export { default as DatePicker } from './DatePicker';

package/dist/index.umd.js

@@ -90813,7 +90813,8 @@
     var filterValue = instance.filterValue,
         setFilterValue = instance.setFilterValue;
     var title = item.title,
-        colon = item.colon; // 是否有筛选值/是否处于筛选状态
+        colon = item.colon,
+        clearIconTrigger = item.clearIconTrigger; // 是否有筛选值/是否处于筛选状态
 
     var active = React.useMemo(function () {
       return getIsHas(filterValue);
@@ -90828,6 +90829,29 @@
         e.stopPropagation();
         setFilterValue(getValueForType(item.type));
       }
+    }; // Icon展示方式
+
+
+    var Icon = function Icon() {
+      // hover时出现清空
+      if (clearIconTrigger === 'hover') {
+        return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(IconFont, {
+          type: "lmweb-close-circle-fill",
+          onClick: handleClear,
+          className: "icon_clear"
+        }), /*#__PURE__*/React__default['default'].createElement(IconFont, {
+          type: "lmweb-down",
+          className: "icon_down"
+        }));
+      } // 日期类型并且未选中时返回日期自带icon
+
+
+      if (item.type === 'date' && !active) return null; // 选中时展示清楚按钮
+
+      return /*#__PURE__*/React__default['default'].createElement(IconFont, {
+        type: active ? 'lmweb-close-circle-fill' : 'lmweb-down',
+        onClick: handleClear
+      });
     };
 
     return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, (title || showColon) && /*#__PURE__*/React__default['default'].createElement("div", {
@@ -90841,10 +90865,7 @@
       item: item
     })), /*#__PURE__*/React__default['default'].createElement("div", {
       className: "filter_item_icon addon_after"
-    }, item.type !== 'date' || active ? /*#__PURE__*/React__default['default'].createElement(IconFont, {
-      type: active ? 'lmweb-close-circle-fill' : 'lmweb-down',
-      onClick: handleClear
-    }) : null));
+    }, /*#__PURE__*/React__default['default'].createElement(Icon, null)));
   });
   /*
    * css样式控制
@@ -182244,13 +182265,13 @@
       });
     };
 
-    return /*#__PURE__*/React__default['default'].createElement("div", {
+    return /*#__PURE__*/React__default['default'].createElement("div", _objectSpread({
       className: classnames('lm_upload_item', 'lm_upload_item_card', isError && 'lm_upload_item_error'),
       style: {
         height: size,
         width: size
       }
-    }, /*#__PURE__*/React__default['default'].createElement("div", {
+    }, listeners || {}), /*#__PURE__*/React__default['default'].createElement("div", {
       className: "lm_upload_item_thumb"
     }, isError || !isImg ? renderThumb(resetFile) : /*#__PURE__*/React__default['default'].createElement(Image$1, {
       width: resetSize.width,
@@ -182271,13 +182292,6 @@
       style: {
         fontSize: resetSize.fontSize
       }
-    })), /*#__PURE__*/React__default['default'].createElement("div", _objectSpread({
-      className: "action_preview"
-    }, listeners), /*#__PURE__*/React__default['default'].createElement(IconFont, {
-      type: "lmweb-drag",
-      style: {
-        fontSize: resetSize.fontSize
-      }
     })), !readOnly && /*#__PURE__*/React__default['default'].createElement("div", {
       className: "action_delete",
       onClick: function onClick() {
@@ -313397,6 +313411,8 @@
   };
 
   var EditTable$1 = /*#__PURE__*/React.forwardRef(function (props, ref) {
+    var _localRowSelectList$s2;
+
     var defaultData = props.value,
         columns = props.columns,
         isEdit = props.isEdit,
@@ -313435,24 +313451,36 @@
     var _useState5 = React.useState({}),
         _useState6 = _slicedToArray$1(_useState5, 2),
         _valid = _useState6[0],
-        setValid = _useState6[1];
+        setValid = _useState6[1]; // const [localRowSelectList, setLocalRowSelectList] = useState([])
+
+
+    var transformRowSelect = function transformRowSelect(selectedRowKeys, selectedRows, info) {
+      var _rowSelection$onChang;
+
+      return rowSelection === null || rowSelection === void 0 ? void 0 : (_rowSelection$onChang = rowSelection.onChange) === null || _rowSelection$onChang === void 0 ? void 0 : _rowSelection$onChang.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$1(_useControllableValue3, 2),
+        localRowSelectList = _useControllableValue4[0],
+        setLocalRowSelectList = _useControllableValue4[1];
 
     var _useState7 = React.useState([]),
         _useState8 = _slicedToArray$1(_useState7, 2),
-        localRowSelectList = _useState8[0],
-        setLocalRowSelectList = _useState8[1];
-
-    var _useState9 = React.useState([]),
-        _useState10 = _slicedToArray$1(_useState9, 2),
-        sortEditTable = _useState10[0],
-        setCallBackFalg = _useState10[1];
+        sortEditTable = _useState8[0],
+        setCallBackFalg = _useState8[1];
     /** 当前展开的列 */
 
 
-    var _useState11 = React.useState([]),
-        _useState12 = _slicedToArray$1(_useState11, 2),
-        expandedRowKeys = _useState12[0],
-        setExpandedRowKeys = _useState12[1];
+    var _useState9 = React.useState([]),
+        _useState10 = _slicedToArray$1(_useState9, 2),
+        expandedRowKeys = _useState10[0],
+        setExpandedRowKeys = _useState10[1];
 
     var dataSourceRef = React.useRef([]);
     var sortDataSorceRef = React.useRef([]);
@@ -313474,10 +313502,10 @@
       var _arrayMove;
 
       var oldIndex = columns.findIndex(function (item) {
-        return item.dataIndex === active;
+        return item['dataIndex'] === active;
       });
       var newIndex = columns.findIndex(function (item) {
-        return item.dataIndex === over;
+        return item['dataIndex'] === over;
       });
       filterChange === null || filterChange === void 0 ? void 0 : filterChange((_arrayMove = arrayMove(columns, oldIndex, newIndex)) === null || _arrayMove === void 0 ? void 0 : _arrayMove.map(function (item, index) {
         return _objectSpread(_objectSpread({}, item), {}, {
@@ -313526,25 +313554,19 @@
           sortDataSorceRef.current = dataSource;
         }
       }
-    }, [dataSource]);
-    /** 本地缓存一个选择数据 */
-
-    React.useEffect(function () {
-      if (rowSelection) {
-        var selectedRowKeys = rowSelection.selectedRowKeys;
-
-        if (selectedRowKeys) {
-          setLocalRowSelectList(localRowSelectList || []);
-        }
-      }
-    }, [rowSelection]);
-
-    var editTableRowChange = function editTableRowChange(selectRows) {
-      var _rowSelection$onChang;
-
-      setLocalRowSelectList(selectRows);
-      rowSelection === null || rowSelection === void 0 ? void 0 : (_rowSelection$onChang = rowSelection.onChange) === null || _rowSelection$onChang === void 0 ? void 0 : _rowSelection$onChang.call(rowSelection, selectRows);
-    };
+    }, [dataSource]); // /** 本地缓存一个选择数据 */
+    // useEffect(() => {
+    //   if (rowSelection) {
+    //     const { selectedRowKeys } = rowSelection
+    //     if (selectedRowKeys) {
+    //       setLocalRowSelectList(localRowSelectList || [])
+    //     }
+    //   }
+    // }, [rowSelection])
+    // const editTableRowChange = (selectRows) => {
+    //   setLocalRowSelectList(selectRows);
+    //   // (rowSelection?.onChange as any)?.(selectRows)
+    // }
 
     var handleSave = function handleSave(row, options) {
       var _deepDataSourceRef$cu, _deepDataSourceRef$cu2;
@@ -313754,12 +313776,12 @@
       var hasOnlyOptionsDatas = columns.filter(function (item) {
         var _item$componentProps;
 
-        return item === null || item === void 0 ? void 0 : (_item$componentProps = item.componentProps) === null || _item$componentProps === void 0 ? void 0 : _item$componentProps.optionOnly;
+        return item === null || item === void 0 ? void 0 : (_item$componentProps = item['componentProps']) === null || _item$componentProps === void 0 ? void 0 : _item$componentProps.optionOnly;
       });
 
       if (hasOnlyOptionsDatas.length) {
         return hasOnlyOptionsDatas === null || hasOnlyOptionsDatas === void 0 ? void 0 : hasOnlyOptionsDatas.map(function (item) {
-          return item.dataIndex;
+          return item['dataIndex'];
         });
       }
 
@@ -313769,7 +313791,7 @@
 
     var DisableOptions = React.useMemo(function () {
       var newColumns = columns === null || columns === void 0 ? void 0 : columns.map(function (item) {
-        var _ref8 = item.componentProps || {},
+        var _ref8 = item['componentProps'] || {},
             optionOnly = _ref8.optionOnly,
             options = _ref8.options;
 
@@ -313784,7 +313806,7 @@
             });
           });
           return _objectSpread(_objectSpread({}, item), {}, {
-            componentProps: _objectSpread(_objectSpread({}, item.componentProps), {}, {
+            componentProps: _objectSpread(_objectSpread({}, item['componentProps']), {}, {
               options: newOptions
             })
           });
@@ -313829,7 +313851,7 @@
       });
       localColumns = localColumns.map(function (item, index) {
         return _objectSpread(_objectSpread({}, item), {}, {
-          order: [null, undefined].includes(item.order) ? index : item.order
+          order: [null, undefined].includes(item['order']) ? index : item['order']
         });
       }).sort(function (a, b) {
         return a.order - b.order;
@@ -313978,6 +314000,19 @@
     React.useImperativeHandle(ref, function () {
       return {
         setRow: handleSave,
+        getCheckboxRecords: function getCheckboxRecords() {
+          return localRowSelectList.selectedRows;
+        },
+        clearSelect: function clearSelect() {
+          setLocalRowSelectList({
+            selectedRows: []
+          });
+        },
+        customSetCheckboxRecords: function customSetCheckboxRecords(value) {
+          setLocalRowSelectList({
+            selectedRows: value
+          });
+        },
         valid: function valid() {
           return _valid;
         }
@@ -313988,6 +314023,8 @@
     }, [isEdit, isAdd, isHoverEdit]);
 
     if (colSortOpen) {
+      var _localRowSelectList$s;
+
       return /*#__PURE__*/React__default['default'].createElement("div", {
         className: "lm_editTable_warpper"
       }, /*#__PURE__*/React__default['default'].createElement(DndContainer$1, {
@@ -314003,17 +314040,19 @@
         bordered: true,
         pagination: false,
         // components={tableComponents}
-        rowSelection: !rowSelection ? undefined : {
+        rowSelection: !rowSelection ? undefined : _objectSpread(_objectSpread({
           fixed: true,
           type: 'checkbox',
-          columnWidth: 36,
-          selectedRowKeys: localRowSelectList.map(function (v) {
-            return v[_rowKey];
+          columnWidth: 36
+        }, rowSelection), {}, {
+          selectedRowKeys: localRowSelectList === null || localRowSelectList === void 0 ? void 0 : (_localRowSelectList$s = localRowSelectList.selectedRows) === null || _localRowSelectList$s === void 0 ? void 0 : _localRowSelectList$s.map(function (v) {
+            return lodash.isObject(v) ? v[_rowKey] : v;
           }),
-          onChange: function onChange(selectedRowKeys, selectedRows) {
-            editTableRowChange(selectedRows);
+          onChange: function onChange(selectedRowKeys, selectedRows, info) {
+            // editTableRowChange(selectedRowKeys, selectedRows, info)
+            setLocalRowSelectList(selectedRowKeys, selectedRows, info);
           }
-        },
+        }),
         dataSource: dataSource
       })))), isShowAddAction && /*#__PURE__*/React__default['default'].createElement(LMButton, {
         className: "lm_editTable_add_bar",
@@ -314044,17 +314083,18 @@
           return setExpandedRowKeys(expandedRows);
         }
       },
-      rowSelection: !rowSelection ? undefined : {
+      rowSelection: !rowSelection ? undefined : _objectSpread(_objectSpread({
         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: localRowSelectList === null || localRowSelectList === void 0 ? void 0 : (_localRowSelectList$s2 = localRowSelectList.selectedRows) === null || _localRowSelectList$s2 === void 0 ? void 0 : _localRowSelectList$s2.map(function (v) {
+          return 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['default'].createElement(LMButton, {
       className: "lm_editTable_add_bar",