@arim-aisdc/public-components 2.3.82 → 2.3.84

package/dist/components/ConfigProvider/context.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import { ThemeType } from "../../../dist/components/ThemeProvider";
+import { ThemeType } from "../../../node_modules/@arim-aisdc/public-components";
 import type { VariablesJsonType } from './type';
 import { Locale } from '../../locales';
 export interface ConfigConsumerProps {

package/dist/components/TableMax/TableBody/VirtualRow.js

@@ -81,6 +81,9 @@ var VirtualRow = function VirtualRow(_ref) {
   var timerRef = useRef();
   var clickCountRef = useRef(0);
 
+  // 拖拽时的鼠标位置跟踪
+  var dragStartPosRef = useRef(null);
+
   // 优化：使用useMemo缓存计算结果
   var dropPreviewLineClassName = useMemo(function () {
     if (hoverRowIndex === row.index) {
@@ -114,7 +117,7 @@ var VirtualRow = function VirtualRow(_ref) {
     return row.getVisibleCells();
   }, [row, table.getState().columnVisibility]);
 
-  // 拖拽相关逻辑保持不变
+  // 拖拽相关逻辑
   var _useDrop = useDrop({
       accept: 'TABLE_ROW',
       drop: function drop(formDatas) {
@@ -125,7 +128,9 @@ var VirtualRow = function VirtualRow(_ref) {
         });
       },
       hover: function hover(item, monitor) {
-        if (monitor.isOver() && monitor.canDrop()) {
+        var clientOffset = monitor.getClientOffset();
+        if (clientOffset && monitor.isOver() && monitor.canDrop()) {
+          // 在hover时传递鼠标位置，触发滚动
           changeHoverRow({
             target: row,
             origin: item
@@ -149,14 +154,30 @@ var VirtualRow = function VirtualRow(_ref) {
           return row.index;
         });
         var isMultipleDrag = selectedRowsNumber > 1 && selectedRowsIndexList.includes(row.index);
+
+        // 记录拖拽开始时的位置
+        dragStartPosRef.current = {
+          x: 0,
+          y: 0
+        };
         return {
           draggedRow: row,
           isMultipleDrag: isMultipleDrag,
           draggedRows: isMultipleDrag ? selectedRows : [row],
-          sourceTableId: tableId
+          sourceTableId: tableId,
+          dragStartTime: Date.now()
         };
       },
-      type: 'TABLE_ROW'
+      type: 'TABLE_ROW',
+      end: function end(item, monitor) {
+        // 拖拽结束时的清理
+        dragStartPosRef.current = null;
+        var didDrop = monitor.didDrop();
+        if (!didDrop) {
+          // 拖拽取消时的处理
+          console.log('Drag cancelled');
+        }
+      }
     }),
     _useDrag2 = _slicedToArray(_useDrag, 3),
     isDragging = _useDrag2[0].isDragging,
@@ -168,17 +189,17 @@ var VirtualRow = function VirtualRow(_ref) {
         captureDraggingState: true
       });
     }
-  }, [canRowDrag]);
+  }, [canRowDrag, preview]);
   useEffect(function () {
     if (setSelectedRowDragging && row.getIsSelected()) {
       setSelectedRowDragging(isDragging);
     }
-  }, [isDragging, row.getIsSelected()]);
+  }, [isDragging, row.getIsSelected(), setSelectedRowDragging]);
   useUpdateEffect(function () {
     if (!isDragging) {
       clearHoverRowIndex();
     }
-  }, [isDragging]);
+  }, [isDragging, clearHoverRowIndex]);
   var handleCellRightClick = useCallback(function (e, cell) {
     onCellContextMenu(e, cell);
   }, [onCellContextMenu]);
@@ -203,7 +224,7 @@ var VirtualRow = function VirtualRow(_ref) {
     return baseStyle;
   }, [isDragging, selectedRowDragging, row.getIsSelected(), canRowDrag, editting, disableDragRowIds, row.id, rowStyle, virtualRowStart]);
 
-  // 点击事件处理逻辑保持不变
+  // 点击事件处理逻辑
   var handleRowClick = useCallback(function (evt) {
     clickCountRef.current++;
     if (clickCountRef.current === 1) {
@@ -225,7 +246,7 @@ var VirtualRow = function VirtualRow(_ref) {
         timerRef.current = undefined;
       }
     }
-  }, [row, table, canSelection, selectionWithoutChecked, setRowHighLightId, setRowSelectedId, selectedRowChange, onSelectChange, selectRowWhenClick, editting, onRowMouseClick, onRowMouseDoubleClick, canEditRowWhenDClick, handleEditRowWhenDClick, table.getState().columnSizing]);
+  }, [row, table, canSelection, selectionWithoutChecked, setRowHighLightId, setRowSelectedId, selectedRowChange, onSelectChange, selectRowWhenClick, editting, onRowMouseClick, onRowMouseDoubleClick, canEditRowWhenDClick, handleEditRowWhenDClick]);
   var handleSingleClick = useCallback(function (evt) {
     onRowMouseClick === null || onRowMouseClick === void 0 || onRowMouseClick(row);
     if (!row.getCanSelect()) {
@@ -240,7 +261,7 @@ var VirtualRow = function VirtualRow(_ref) {
     } else {
       handleSingleSelection(evt);
     }
-  }, [row, canSelection, selectRowWhenClick, setRowHighLightId]);
+  }, [row, canSelection, selectRowWhenClick, setRowHighLightId, onRowMouseClick]);
   var handleDoubleClick = useCallback(function (evt) {
     onRowMouseDoubleClick === null || onRowMouseDoubleClick === void 0 || onRowMouseDoubleClick(row);
     if (canEditRowWhenDClick) {
@@ -248,10 +269,70 @@ var VirtualRow = function VirtualRow(_ref) {
     }
   }, [row, onRowMouseDoubleClick, canEditRowWhenDClick, handleEditRowWhenDClick]);
 
-  // 其他事件处理函数保持不变...
+  // 选择点击处理
   var handleSelectionClick = useCallback(function (evt) {
-    // ... 选择逻辑保持不变
+    if (selectionWithoutChecked) {
+      if (evt.ctrlKey) {
+        handleCtrlSelection();
+      } else if (evt.shiftKey) {
+        handleShiftSelection();
+      } else {
+        handleSingleRowSelection();
+      }
+    } else {
+      if (evt.shiftKey) {
+        handleShiftSelectionWithCheckbox();
+      } else {
+        handleToggleSelection();
+      }
+    }
   }, [row, table, selectionWithoutChecked]);
+  var handleCtrlSelection = useCallback(function () {
+    var selectionConfig = _objectSpread({}, table.getState().rowSelection);
+    if (!row.getIsSelected()) {
+      selectionConfig[row.id] = true;
+    } else if (Object.keys(selectionConfig).length > 1) {
+      delete selectionConfig[row.id];
+    }
+    // setRowSelection({ ...selectionConfig });
+  }, [row, table]);
+  var handleShiftSelection = useCallback(function () {
+    var min = Math.min(initselectedIndex || 0, row.index);
+    var max = Math.max(initselectedIndex || 0, row.index);
+    var selectionConfig = {};
+    table.getRowModel().rows.filter(function (row) {
+      return row.index >= min && row.index <= max;
+    }).forEach(function (row) {
+      selectionConfig[row.id] = true;
+    });
+
+    // setRowSelection(selectionConfig);
+  }, [row, table]);
+  var handleSingleRowSelection = useCallback(function () {
+    initselectedIndex = row.index;
+    // setRowSelection({ [row?.id]: true });
+  }, [row, table]);
+  var handleShiftSelectionWithCheckbox = useCallback(function () {
+    var selectionConfig = _objectSpread({}, table.getState().rowSelection);
+    var min = Math.min(initselectedIndex || 0, row.index);
+    var max = Math.max(initselectedIndex || 0, row.index);
+    table.getRowModel().rows.filter(function (row) {
+      return row.index >= min && row.index <= max;
+    }).forEach(function (row) {
+      selectionConfig[row.id] = true;
+    });
+
+    // setRowSelection(selectionConfig);
+  }, [row, table]);
+  var handleToggleSelection = useCallback(function () {
+    if (!row.getIsSelected()) {
+      initselectedIndex = row.index;
+    }
+    var selectionConfig = _objectSpread(_objectSpread({}, table.getState().rowSelection), {}, _defineProperty({}, row.id, !row.getIsSelected()));
+    if (row.getCanSelect()) {
+      // setRowSelection(selectionConfig);
+    }
+  }, [row, table]);
   var handleSingleSelection = useCallback(function (evt) {
     setRowSelectedId === null || setRowSelectedId === void 0 || setRowSelectedId(row === null || row === void 0 ? void 0 : row.id);
     selectedRowChange === null || selectedRowChange === void 0 || selectedRowChange(row);
@@ -371,9 +452,7 @@ var VirtualRow = function VirtualRow(_ref) {
       console.error('Error rendering row:', error);
       return null;
     }
-  }, [
-  // 依赖项保持不变
-  row, row.id, rowEditing, tableId, editting, canRowDrag, disableDragRowIds, isDragging, selectedRowDragging, rowStyle, handleRowClick, rowMouseEnter, rowMouseLeave, rowClassNames, cellClassName, theme, table, handleCellRightClick, getCellProps, tableTooltip, onEditValueChange, dateFormat, row.getVisibleCells(), row.getIsSelected(), rowStyles, table.getState().columnSizing, row.getIsExpanded(), table.getExpandedRowModel()]);
+  }, [row, row.id, rowEditing, tableId, editting, canRowDrag, disableDragRowIds, isDragging, selectedRowDragging, rowStyle, handleRowClick, rowMouseEnter, rowMouseLeave, rowClassNames, cellClassName, theme, table, handleCellRightClick, getCellProps, tableTooltip, onEditValueChange, dateFormat, rowStyles]);
   var rowCom = function rowCom() {
     var renderCell = function renderCell(cell) {
       var _cellClassName2;

package/dist/components/TableMax/TableBody/VirtualRow1.d.ts

@@ -0,0 +1,62 @@
+import { DropSide, OnSelectChangeType } from "../type";
+import { Table } from '@tanstack/react-table';
+import React, { Dispatch, ReactNode, SetStateAction } from 'react';
+import './index.less';
+type IRowProps = {
+    table: Table<any>;
+    tableId: string;
+    row: any;
+    rowSelectedId?: string;
+    setRowSelectedId?: Dispatch<SetStateAction<string | undefined>>;
+    rowHighLightId: string;
+    setRowHighLightId?: Dispatch<SetStateAction<string | undefined>>;
+    selectedRowChange?: (row: any) => void;
+    onSelectChange?: OnSelectChangeType;
+    tableBodyRef: any;
+    canSelection?: boolean;
+    selectionWithoutChecked?: boolean;
+    reorderRow?: (targetRowIndex: any, draggedRowIndex: any) => void;
+    canRowDrag?: boolean;
+    rowClassName?: (row: any) => string[];
+    cellClassName?: (cell: any) => string[];
+    rowStyle?: object;
+    getCellProps?: (ctx: any) => object;
+    editting?: boolean;
+    rowEditing?: boolean;
+    renderSubComponent?: (value: {
+        row: any;
+    }) => ReactNode;
+    selectedRowDragging?: boolean;
+    setSelectedRowDragging?: Dispatch<SetStateAction<boolean>>;
+    onRowMouseEnter?: (row: any) => void;
+    onRowMouseLeave?: (row: any) => void;
+    onRowMouseClick?: (row: any) => void;
+    onRowMouseDoubleClick?: (row: any) => void;
+    disableDragRowIds?: any[];
+    selectRowWhenClick: boolean;
+    handleEditRowWhenDClick: (row: any) => void;
+    canEditRowWhenDClick: boolean;
+    theme: string;
+    dragBeforeStart?: (datas: any) => boolean;
+    rowKey?: string;
+    onCellContextMenu: (e: React.MouseEvent, cell: any) => void;
+    /**获取行hover时的tip信息 */
+    getRowHoverTipConfig?: (row: any) => {
+        title: string;
+        color: string;
+    };
+    tableTooltip: boolean;
+    changeHoverRow: (params: {
+        target?: any;
+        origin?: any;
+    }) => void;
+    clearHoverRowIndex: () => void;
+    hoverRowIndex: number;
+    dropSide: DropSide;
+    onEditValueChange?: (field: string, value: any, extra?: any) => void;
+    setRowSelection?: Function;
+    openMemo?: boolean;
+    virtualRowStart?: number;
+};
+declare const VirtualRow: ({ tableBodyRef, table, tableId, row, rowSelectedId, setRowSelectedId, rowHighLightId, setRowHighLightId, selectedRowChange, onSelectChange, canSelection, selectionWithoutChecked, reorderRow, canRowDrag, rowClassName, cellClassName, rowStyle, getCellProps, editting, rowEditing, renderSubComponent, selectedRowDragging, setSelectedRowDragging, onRowMouseEnter, onRowMouseLeave, onRowMouseClick, onRowMouseDoubleClick, disableDragRowIds, selectRowWhenClick, handleEditRowWhenDClick, canEditRowWhenDClick, theme, dragBeforeStart, onCellContextMenu, getRowHoverTipConfig, tableTooltip, changeHoverRow, clearHoverRowIndex, hoverRowIndex, dropSide, onEditValueChange, setRowSelection, openMemo, virtualRowStart, }: IRowProps) => import("react/jsx-runtime").JSX.Element;
+export { VirtualRow };