@arim-aisdc/public-components 2.3.98 → 2.3.99

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

@@ -79,7 +79,16 @@ var OriginalRow = function OriginalRow(_ref) {
     dateFormat = _useConfig.dateFormat;
   var timerRef = useRef();
   var clickCountRef = useRef(0);
-
+  // const [tooltipOpen, setTooltipOpen] = useState(false); 
+  var _useState = useState({}),
+    _useState2 = _slicedToArray(_useState, 2),
+    tooltipStates = _useState2[0],
+    setTooltipStates = _useState2[1];
+  var handleTooltipChange = function handleTooltipChange(cellId, open) {
+    setTooltipStates(function (prev) {
+      return _objectSpread(_objectSpread({}, prev), {}, _defineProperty({}, cellId, open));
+    });
+  };
   // 优化：使用useMemo缓存计算结果
   var dropPreviewLineClassName = useMemo(function () {
     if (hoverRowIndex === row.index) {
@@ -177,6 +186,7 @@ var OriginalRow = function OriginalRow(_ref) {
   // 优化：分离单击和双击逻辑，避免定时器延迟
   var handleRowClick = useCallback(function (evt) {
     clickCountRef.current++;
+    setTooltipStates({});
     if (clickCountRef.current === 1) {
       timerRef.current = setTimeout(function () {
         // 单击逻辑
@@ -297,13 +307,13 @@ var OriginalRow = function OriginalRow(_ref) {
   var handleCellRightClick = useCallback(function (e, cell) {
     onCellContextMenu(e, cell);
   }, [onCellContextMenu]);
-  var _useState = useState({
+  var _useState3 = useState({
       title: ' ',
       color: ''
     }),
-    _useState2 = _slicedToArray(_useState, 2),
-    tooltipConfig = _useState2[0],
-    setTooltipConfig = _useState2[1];
+    _useState4 = _slicedToArray(_useState3, 2),
+    tooltipConfig = _useState4[0],
+    setTooltipConfig = _useState4[1];
   var onOpenChange = useCallback(function (open) {
     if (open) {
       setTooltipConfig((getRowHoverTipConfig === null || getRowHoverTipConfig === void 0 ? void 0 : getRowHoverTipConfig(row.original)) || {
@@ -377,6 +387,9 @@ var OriginalRow = function OriginalRow(_ref) {
       }, getCellProps === null || getCellProps === void 0 ? void 0 : getCellProps(cell.getContext())), {}, {
         children: EditableCell(_objectSpread(_objectSpread({}, cell.column.columnDef), {}, {
           tableTooltip: tableTooltip,
+          cellId: cell.id,
+          tooltipOpen: tooltipStates[cell.id] || false,
+          onTooltipChange: handleTooltipChange,
           editing: columnEditing,
           dataIndex: accessorKey,
           title: header,
@@ -409,7 +422,7 @@ var OriginalRow = function OriginalRow(_ref) {
     }
   }, [
   // 依赖项保持不变
-  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(), row.getIsExpanded()]);
+  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(), row.getIsExpanded(), tooltipStates]);
   var rowCom = function rowCom() {
     var renderCell = function renderCell(cell) {
       var _cellClassName2;
@@ -449,6 +462,9 @@ var OriginalRow = function OriginalRow(_ref) {
       }, getCellProps === null || getCellProps === void 0 ? void 0 : getCellProps(cell.getContext())), {}, {
         children: EditableCell(_objectSpread(_objectSpread({}, cell.column.columnDef), {}, {
           tableTooltip: tableTooltip,
+          cellId: cell.id,
+          tooltipOpen: tooltipStates[cell.id] || false,
+          onTooltipChange: handleTooltipChange,
           editing: columnEditing,
           dataIndex: accessorKey,
           title: header,

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

@@ -80,6 +80,15 @@ var VirtualRow = function VirtualRow(_ref) {
     dateFormat = _useConfig.dateFormat;
   var timerRef = useRef();
   var clickCountRef = useRef(0);
+  var _useState = useState({}),
+    _useState2 = _slicedToArray(_useState, 2),
+    tooltipStates = _useState2[0],
+    setTooltipStates = _useState2[1];
+  var handleTooltipChange = function handleTooltipChange(cellId, open) {
+    setTooltipStates(function (prev) {
+      return _objectSpread(_objectSpread({}, prev), {}, _defineProperty({}, cellId, open));
+    });
+  };
 
   // 拖拽时的鼠标位置跟踪
   var dragStartPosRef = useRef(null);
@@ -227,6 +236,7 @@ var VirtualRow = function VirtualRow(_ref) {
   // 点击事件处理逻辑
   var handleRowClick = useCallback(function (evt) {
     clickCountRef.current++;
+    setTooltipStates({});
     if (clickCountRef.current === 1) {
       timerRef.current = setTimeout(function () {
         if (clickCountRef.current === 1) {
@@ -344,13 +354,13 @@ var VirtualRow = function VirtualRow(_ref) {
   var rowMouseLeave = useCallback(function () {
     onRowMouseLeave === null || onRowMouseLeave === void 0 || onRowMouseLeave(row);
   }, [row, onRowMouseLeave]);
-  var _useState = useState({
+  var _useState3 = useState({
       title: ' ',
       color: ''
     }),
-    _useState2 = _slicedToArray(_useState, 2),
-    tooltipConfig = _useState2[0],
-    setTooltipConfig = _useState2[1];
+    _useState4 = _slicedToArray(_useState3, 2),
+    tooltipConfig = _useState4[0],
+    setTooltipConfig = _useState4[1];
   var onOpenChange = useCallback(function (open) {
     if (open) {
       setTooltipConfig((getRowHoverTipConfig === null || getRowHoverTipConfig === void 0 ? void 0 : getRowHoverTipConfig(row.original)) || {
@@ -425,6 +435,9 @@ var VirtualRow = function VirtualRow(_ref) {
         children: EditableCell(_objectSpread(_objectSpread({}, cell.column.columnDef), {}, {
           width: cell.column.getSize(),
           tableTooltip: tableTooltip,
+          cellId: cell.id,
+          tooltipOpen: tooltipStates[cell.id] || false,
+          onTooltipChange: handleTooltipChange,
           editing: columnEditing,
           dataIndex: accessorKey,
           title: header,
@@ -452,7 +465,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, rowStyles, row.getVisibleCells(), row.getIsSelected(), row.getIsExpanded(), table.getState().columnSizing]);
+  }, [row, row.id, rowEditing, tableId, editting, canRowDrag, disableDragRowIds, isDragging, selectedRowDragging, rowStyle, handleRowClick, rowMouseEnter, rowMouseLeave, rowClassNames, cellClassName, theme, table, handleCellRightClick, getCellProps, tableTooltip, onEditValueChange, dateFormat, rowStyles, row.getVisibleCells(), row.getIsSelected(), row.getIsExpanded(), table.getState().columnSizing, tooltipStates, handleTooltipChange]);
   var rowCom = function rowCom() {
     var renderCell = function renderCell(cell) {
       var _cellClassName2;
@@ -493,6 +506,9 @@ var VirtualRow = function VirtualRow(_ref) {
         children: EditableCell(_objectSpread(_objectSpread({}, cell.column.columnDef), {}, {
           width: cell.column.getSize(),
           tableTooltip: tableTooltip,
+          cellId: cell.id,
+          tooltipOpen: tooltipStates[cell.id] || false,
+          onTooltipChange: handleTooltipChange,
           editing: columnEditing,
           dataIndex: accessorKey,
           title: header,

package/dist/components/TableMax/TableHeader/Cell.js

@@ -20,7 +20,7 @@ import { Tooltip } from 'antd';
 import { useMemo } from 'react';
 import { useDrag, useDrop } from 'react-dnd';
 import { useConfig } from "../../ConfigProvider";
-import { ColumnType } from "../type";
+import { ColumnType } from "../index";
 import { ColumnFilter } from "../components/ColumnFilterV2";
 import Sort from "../components/ColumnSort";
 import "./index.less";

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

@@ -1,6 +1,6 @@
 import React from 'react';
 import './tableMax.less';
-import { type TableMaxProps } from './type';
+import { type TableMaxProps } from './index';
 export type ColumnSizing = Record<string, number>;
 export declare const CACHE_MAX_AGE: number;
 declare const _default: React.MemoExoticComponent<React.ForwardRefExoticComponent<TableMaxProps & React.RefAttributes<unknown>>>;

package/dist/components/TableMax/TableMax.js

@@ -35,7 +35,7 @@ import customSortFns, { setDefaultSortFn } from "./components/ColumnSort/customS
 import PaginationV2 from "./components/PaginationV2";
 import { useColumnWidth } from "./hooks/useColumnWidth";
 import "./tableMax.less";
-import { ColumnType } from "./type";
+import { ColumnType } from "./index";
 import { downloadExcel, getFormatFilters, getFormatFiltersV2, getFormatSorting, operationColumnNoTooltips } from "./utils";
 import { useTableScrollShadow } from "./hooks/useTableScrollShadow";
 import { ExportTableData } from "./components/Export";

package/dist/components/TableMax/components/ColumnEdit/index.d.ts

@@ -30,6 +30,9 @@ interface EditableCellProps extends React.HTMLAttributes<HTMLElement> {
     editComDisabled?: boolean;
     onEditValueChange?: (field: string, value: any, extra?: any) => void;
     width?: number;
+    tooltipOpen?: boolean;
+    onTooltipChange?: (cellId: string, open: boolean) => void;
+    cellId?: string;
 }
 export declare const EditableCell: React.FC<EditableCellProps>;
 export {};

package/dist/components/TableMax/components/ColumnEdit/index.js

@@ -32,7 +32,14 @@ export var EditableCell = function EditableCell(_ref) {
     _ref$editComDisabled = _ref.editComDisabled,
     editComDisabled = _ref$editComDisabled === void 0 ? false : _ref$editComDisabled,
     onEditValueChange = _ref.onEditValueChange,
-    width = _ref.width;
+    width = _ref.width,
+    tooltipOpen = _ref.tooltipOpen,
+    onTooltipChange = _ref.onTooltipChange,
+    cellId = _ref.cellId;
+  // const [tooltipOpen, setTooltipOpen] = useState(false);
+  // const handleClick = () => {
+  //   setTooltipOpen(false);  // 点击时关闭 tooltip
+  // };
   var getEditComponent = function getEditComponent(dataIndex) {
     switch (editComType) {
       case InputType.InputNumber:
@@ -122,9 +129,14 @@ export var EditableCell = function EditableCell(_ref) {
     }) : ((_ref2 = ellipsis !== null && ellipsis !== void 0 ? ellipsis : columnTooltip) !== null && _ref2 !== void 0 ? _ref2 : tableTooltip) ? /*#__PURE__*/_jsx(Tooltip, {
       placement: "top",
       title: children,
-      mouseEnterDelay: 0.5
-      // trigger="click"
-      ,
+      mouseEnterDelay: 0.5,
+      open: tooltipOpen,
+      onOpenChange: function onOpenChange(open) {
+        return onTooltipChange(cellId, open);
+      },
+      getPopupContainer: function getPopupContainer() {
+        return document.body;
+      },
       overlayClassName: "tableMaxCellTooltip",
       children: /*#__PURE__*/_jsx("div", {
         className: "ellipsis",

package/dist/components/TableMax/components/ColumnSetting/index.js

@@ -14,7 +14,7 @@ import React, { useEffect, useLayoutEffect, useMemo, useRef, useState } from 're
 import { useDrag, useDrop } from 'react-dnd';
 import { createPortal } from 'react-dom';
 import { useConfig } from "../../../ConfigProvider";
-import { ColumnType } from "../../type";
+import { ColumnType } from "../../index";
 import "./index.less";
 import { useTranslation } from "../../../../hooks/useTranslation";
 import { jsx as _jsx } from "react/jsx-runtime";

package/dist/components/TableMax/components/Export/useTableExport.d.ts

@@ -1,4 +1,4 @@
-import { TableMaxColumnType } from '../../type';
+import { type TableMaxColumnType } from '../../index';
 export interface StreamExportOptions {
     fileName?: string;
     sheetName?: string;

package/dist/components/TableMax/components/Export/useTableExport.js

@@ -16,7 +16,7 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 import { useCallback, useState, useRef } from 'react';
 import * as XLSX from 'xlsx';
 import { message } from 'antd';
-import { ColumnType } from "../../type";
+import { ColumnType } from "../../index";
 var defaultApplyCellLogic = function defaultApplyCellLogic(value, columnId, originalRow, column) {
   var cell = column.cell,
     accessorKey = column.accessorKey,
@@ -58,7 +58,6 @@ var defaultApplyCellLogic = function defaultApplyCellLogic(value, columnId, orig
   }
   return value !== null && value !== void 0 ? value : '';
 };
-var EnableExportColumnTypeList = [ColumnType.Selection, ColumnType.Darg, ColumnType.PlaceHolder, ColumnType.Expander, ColumnType.Index];
 function fetchWithRetry(_x) {
   return _fetchWithRetry.apply(this, arguments);
 }
@@ -136,6 +135,7 @@ function _fetchWithRetry() {
   return _fetchWithRetry.apply(this, arguments);
 }
 export var useTableExport = function useTableExport() {
+  var EnableExportColumnTypeList = [ColumnType.Selection, ColumnType.Darg, ColumnType.PlaceHolder, ColumnType.Expander, ColumnType.Index];
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     exporting = _useState2[0],

package/dist/components/TableMax/index.d.ts

@@ -1,8 +1,7 @@
 import TableMax from './TableMax';
-export { ColumnType } from './type';
 export { InputType } from './components/ColumnEdit';
 export { FilterType } from './components/ColumnFilterV2';
 export type { FilterFnType } from './components/ColumnFilterV2';
 export type { SortFnType } from './components/ColumnSort/customSortFns';
-export type { ColumnPinningConfigType, ColumnVisibleConfigType, TableMaxColumnType, TableMaxProps } from './type';
+export { type ColumnPinningConfigType, type ColumnVisibleConfigType, type TableMaxColumnType, type TableMaxProps, ColumnType } from './type';
 export default TableMax;

package/dist/components/TableMax/index.js

@@ -1,5 +1,7 @@
 import TableMax from "./TableMax";
-export { ColumnType } from "./type";
+
+// export { ColumnType } from './type';
 export { InputType } from "./components/ColumnEdit";
 export { FilterType } from "./components/ColumnFilterV2";
+export { ColumnType } from "./type";
 export default TableMax;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arim-aisdc/public-components",
-  "version": "2.3.98",
+  "version": "2.3.99",
   "description": "前端组件库",
   "license": "MIT",
   "main": "dist/index.js",