@arim-aisdc/public-components 2.0.24 → 2.0.25

package/dist/assets/iconfont/table/iconfont.css

@@ -1,47 +1,45 @@
 @font-face {
-  font-family: "iconfont-table"; /* Project id 4453758 */
-  src: url('iconfont.woff2?t=1727342206392') format('woff2'),
-       url('iconfont.woff?t=1727342206392') format('woff'),
-       url('iconfont.ttf?t=1727342206392') format('truetype');
+  font-family: iconfont-table; /* Project id 4453758 */
+  src: url('iconfont.ttf?t=1728885230733') format('truetype');
 }
 
 .iconfont-table {
-  font-family: "iconfont-table" !important;
+  font-family: iconfont-table !important;
   font-size: 16px;
   font-style: normal;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
 }
 
-.icon-table-midu:before {
+.icon-table-midu::before {
   content: "\e87d";
 }
 
-.icon-table-delete:before {
+.icon-table-delete::before {
   content: "\e87c";
 }
 
-.icon-table-shuaxin:before {
+.icon-table-shuaxin::before {
   content: "\e87b";
 }
 
-.icon-table-upload:before {
+.icon-table-upload::before {
   content: "\e878";
 }
 
-.icon-table-download:before {
+.icon-table-download::before {
   content: "\e87a";
 }
 
-.icon-table-shezhi:before {
+.icon-table-shezhi::before {
   content: "\e643";
 }
 
-.icon-table-zhexian:before {
+.icon-table-zhexian::before {
   content: "\e644";
 }
 
-.icon-table-biaoge:before {
+.icon-table-biaoge::before {
   content: "\e645";
 }
 

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

@@ -16,6 +16,8 @@ export interface ConfigConsumerProps {
     root?: string;
     /** 空数据图标组件 */
     renderEmpty?: (theme?: ThemeType) => React.ReactNode;
+    /**request函数 用于下载*/
+    request?: (...params: any[]) => Promise<Blob>;
 }
 export declare const DEFAULT_CONTEXT: {
     theme: string;

package/dist/components/CustomForm/CustomForm.js

@@ -340,6 +340,7 @@ var CustomForm = function CustomForm(_ref, ref) {
           onChange: function onChange(e) {
             return commonChange(e, item);
           },
+          disabled: item === null || item === void 0 ? void 0 : item.disabled,
           children: item.setting.map(function (el, num) {
             return /*#__PURE__*/_jsx(Radio, {
               value: el.value,

package/dist/components/CustomForm/index.less

@@ -45,12 +45,12 @@
   }
 }
 
-.xmTtn {
-  width: 76px;
-  height: 32px;
-  border-radius: 2px;
-  padding: 0 !important;
-}
+// .xmTtn {
+//   width: 76px;
+//   height: 32px;
+//   border-radius: 2px;
+//   padding: 0 !important;
+// }
 
 .xmTtn + .xmTtn {
   margin-left: 16px;

package/dist/components/GlobalTip/MessageTip/MessageTip.d.ts

@@ -1,3 +1,4 @@
+import './index.less';
 import { MessageTipPropType } from './type';
 declare const MessageTip: {
     success: (info: MessageTipPropType) => void;

package/dist/components/GlobalTip/MessageTip/MessageTip.js

@@ -5,13 +5,14 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { message } from 'antd';
+import "./index.less";
 import { jsx as _jsx } from "react/jsx-runtime";
 var defaultTipIconMap = {
   success: 'iconfont-theme-dark-four icon-theme-dark-four-successful',
   error: 'iconfont-theme-dark-four icon-theme-dark-four-error',
   info: 'iconfont-theme-dark-four icon-theme-dark-four-information',
   attention: 'iconfont-theme-dark-four icon-theme-dark-four-warning',
-  loading: 'iconfont-theme-dark-four icon-theme-dark-four-loading'
+  loading: 'anticon-loading-spin iconfont-theme-dark-four icon-theme-dark-four-loading'
 };
 var messageConfig = function messageConfig(_ref) {
   var key = _ref.key,
@@ -22,7 +23,7 @@ var messageConfig = function messageConfig(_ref) {
     _ref$tipIconMap = _ref.tipIconMap,
     tipIconMap = _ref$tipIconMap === void 0 ? defaultTipIconMap : _ref$tipIconMap;
   var defaultDuration = tipCode === 'loading' ? 0 : 2;
-  message.success({
+  message.open({
     key: key,
     icon: /*#__PURE__*/_jsx("span", {
       className: "".concat(tipCode, "Icon"),

package/dist/components/GlobalTip/MessageTip/index.less

@@ -0,0 +1,15 @@
+.anticon-loading-spin {
+  display: inline-block;
+  animation: loong 1s infinite linear;
+
+  // &:before {
+  //   display: inline-block;
+  // animation: loong 1s infinite linear;
+  // -webkit-animation: loong 1s infinite linear
+  // }
+}
+@keyframes loong {
+  100% {
+    transform: rotate(360deg);
+  }
+}

package/dist/components/GlobalTip/ModalTip/ModalTip.js

@@ -70,7 +70,8 @@ var updateModal = function updateModal(_ref3) {
     _ref3$duration = _ref3.duration,
     duration = _ref3$duration === void 0 ? 3000 : _ref3$duration,
     afterClose = _ref3.afterClose;
-  console.log('==================', modal);
+  // console.log('==================', modal);
+
   if (modal) {
     modal.update(_objectSpread(_objectSpread({}, config({
       tipCode: tipCode,

package/dist/components/QueryFilter/index.less

@@ -39,13 +39,13 @@
   }
 }
 
-.xmTtn {
-  width: 76px;
-  height: 32px;
-  border-radius: 2px;
-  // margin-bottom: 8px;
-  padding: 0 !important;
-}
+// .xmTtn {
+//   width: 76px;
+//   height: 32px;
+//   border-radius: 2px;
+//   // margin-bottom: 8px;
+//   padding: 0 !important;
+// }
 
 // .xmTtnDefault {
 //     background: rgba(245, 245, 245, 1);

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

@@ -1,4 +1,4 @@
-import { OnSelectChangeType } from "../type";
+import { DropSide, OnSelectChangeType } from "../type";
 import { Table } from '@tanstack/react-table';
 import { Dispatch, ReactNode, SetStateAction } from 'react';
 import './index.less';
@@ -51,6 +51,13 @@ type IRowProps = {
         color: string;
     };
     tableTooltip: boolean;
+    changeHoverRow: (params: {
+        target?: any;
+        origin?: any;
+    }) => void;
+    clearHoverRowIndex: () => void;
+    hoverRowIndex: number;
+    dropSide: DropSide;
 };
-declare const Row: ({ 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, rowHeight, disableDragRowIds, selectRowWhenClick, handleEditRowWhenDClick, canEditRowWhenDClick, theme, dragBeforeStart, shadowColumnInfo, onCellContextMenu, getRowHoverTipConfig, tableTooltip, }: IRowProps) => import("react/jsx-runtime").JSX.Element;
+declare const Row: ({ 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, rowHeight, disableDragRowIds, selectRowWhenClick, handleEditRowWhenDClick, canEditRowWhenDClick, theme, dragBeforeStart, shadowColumnInfo, onCellContextMenu, getRowHoverTipConfig, tableTooltip, changeHoverRow, clearHoverRowIndex, hoverRowIndex, dropSide, }: IRowProps) => import("react/jsx-runtime").JSX.Element;
 export default Row;

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

@@ -10,13 +10,14 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+import { DropSide } from "../type";
 import { flexRender } from '@tanstack/react-table';
 import { Tooltip } from 'antd';
 import { useEffect, useMemo, useRef, useState } from 'react';
 import { useDrag, useDrop } from 'react-dnd';
 import { getEmptyImage } from 'react-dnd-html5-backend';
-import { EditableCell } from "../components/ColumnEdit";
 import { getPinningStyle } from "../TableHeader/utils";
+import { EditableCell } from "../components/ColumnEdit";
 import "./index.less";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
@@ -61,19 +62,37 @@ var Row = function Row(_ref) {
     shadowColumnInfo = _ref.shadowColumnInfo,
     onCellContextMenu = _ref.onCellContextMenu,
     getRowHoverTipConfig = _ref.getRowHoverTipConfig,
-    tableTooltip = _ref.tableTooltip;
+    tableTooltip = _ref.tableTooltip,
+    changeHoverRow = _ref.changeHoverRow,
+    clearHoverRowIndex = _ref.clearHoverRowIndex,
+    hoverRowIndex = _ref.hoverRowIndex,
+    dropSide = _ref.dropSide;
+  var dropPreviewLineClassName = useMemo(function () {
+    if (hoverRowIndex === row.index) {
+      return dropSide === DropSide.Top ? 'showTopBorder' : 'showBottomBorder';
+    } else {
+      return '';
+    }
+  }, [hoverRowIndex, dropSide]);
   var timerRef = useRef();
   var _useDrop = useDrop({
       accept: 'TABLE_ROW',
       drop: function drop(formDatas
       //  monitor
       ) {
-        // console.log('drop-row', monitor, row);
+        clearHoverRowIndex();
         return reorderRow === null || reorderRow === void 0 ? void 0 : reorderRow(formDatas, {
           hoverRow: row,
           targetTableId: tableId
         });
-        // return reorderRow?.(draggedRow, { ...row, tableId });
+      },
+      hover: function hover(item, monitor) {
+        if (monitor.isOver() && monitor.canDrop()) {
+          changeHoverRow({
+            target: row,
+            origin: item
+          });
+        }
       }
     }),
     _useDrop2 = _slicedToArray(_useDrop, 2),
@@ -262,6 +281,9 @@ var Row = function Row(_ref) {
     canSelection && !selectRowWhenClick && String(row.id) === String(rowHighLightId) // 多选并且点击行时不选中，高亮状态单独管理
     ;
   }, [row.id, row.getIsSelected(), rowSelectedId, selectRowWhenClick, rowHighLightId, canSelection]);
+
+  // console.log('row render', row.id);
+
   var rowCom = function rowCom() {
     var _row;
     return /*#__PURE__*/_jsx("tr", {
@@ -277,7 +299,7 @@ var Row = function Row(_ref) {
       onClick: rowClickOrDoubleClick,
       onMouseEnter: rowMouseEnter,
       onMouseLeave: rowMouseLeave,
-      className: "tbody-tr ".concat(isHighLight ? 'tbody-tr-selected' : '', " ").concat((rowClassName === null || rowClassName === void 0 ? void 0 : rowClassName(row).map(function (item) {
+      className: "tbody-tr ".concat(isHighLight ? 'tbody-tr-selected' : '', " ").concat(dropPreviewLineClassName, " ").concat((rowClassName === null || rowClassName === void 0 ? void 0 : rowClassName(row).map(function (item) {
         return "".concat(item, "-").concat(theme);
       }).join(' ')) || ''),
       children: (_row = row["getVisibleCells"]) === null || _row === void 0 ? void 0 : _row.call(row).map(function (cell) {

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

@@ -69,6 +69,7 @@ type TableBodyPropsType = {
         color: string;
     };
     tableTooltip: boolean;
+    compactMode: boolean;
 };
-declare const TableBody: ({ tableBodyRef, table, tableId, theme, reorderRow, rowSelectedId, setRowSelectedId, rowHighLightId, setRowHighLightId, selectedRowChange, onSelectChange, canSelection, selectionWithoutChecked, tableContainerWidth, selectedRowDragging, setSelectedRowDragging, canRowDrag, rowKey, loading, rowClassName, cellClassName, rowStyle, getCellProps, rowHeight, renderSubComponent, onRowMouseEnter, onRowMouseLeave, onRowMouseClick, onRowMouseDoubleClick, disableDragRowIds, selectRowWhenClick, datas, canEditRowWhenDClick, editingRowId, handleEditRowWhenDClick, dragBeforeStart, shadowColumnInfo, getContextMenu, onClickContextMenu, getRowHoverTipConfig, tableTooltip, }: TableBodyPropsType) => import("react/jsx-runtime").JSX.Element;
+declare const TableBody: ({ tableBodyRef, table, tableId, theme, reorderRow, rowSelectedId, setRowSelectedId, rowHighLightId, setRowHighLightId, selectedRowChange, onSelectChange, canSelection, selectionWithoutChecked, tableContainerWidth, selectedRowDragging, setSelectedRowDragging, canRowDrag, rowKey, loading, rowClassName, cellClassName, rowStyle, getCellProps, rowHeight, renderSubComponent, onRowMouseEnter, onRowMouseLeave, onRowMouseClick, onRowMouseDoubleClick, disableDragRowIds, selectRowWhenClick, datas, canEditRowWhenDClick, editingRowId, handleEditRowWhenDClick, dragBeforeStart, shadowColumnInfo, getContextMenu, onClickContextMenu, getRowHoverTipConfig, tableTooltip, compactMode, }: TableBodyPropsType) => import("react/jsx-runtime").JSX.Element;
 export default TableBody;

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

@@ -16,7 +16,8 @@ import { Spin } from 'antd';
 import { useDrop } from 'react-dnd';
 import { CustomDragLayer } from "../components/CustomDragerLayer";
 // import RowContent from "../components/RowContent";
-
+import { DropSide } from "../type";
+import { events, useEventBus } from "../../..";
 import { useCallback, useMemo, useState } from 'react';
 import { createPortal } from 'react-dom';
 import { useConfig } from "../../ConfigProvider";
@@ -69,7 +70,8 @@ var TableBody = function TableBody(_ref) {
     getContextMenu = _ref.getContextMenu,
     onClickContextMenu = _ref.onClickContextMenu,
     getRowHoverTipConfig = _ref.getRowHoverTipConfig,
-    tableTooltip = _ref.tableTooltip;
+    tableTooltip = _ref.tableTooltip,
+    compactMode = _ref.compactMode;
   var _useConfig = useConfig(),
     root = _useConfig.root;
   var headerGroups = table.getHeaderGroups();
@@ -85,6 +87,66 @@ var TableBody = function TableBody(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     contextMenuData = _useState2[0],
     setContextMenuData = _useState2[1];
+  // 拖动时显示放置的位置
+  var _useState3 = useState(undefined),
+    _useState4 = _slicedToArray(_useState3, 2),
+    hoverRowIndex = _useState4[0],
+    setHoverRowIndex = _useState4[1];
+  var _useState5 = useState(undefined),
+    _useState6 = _slicedToArray(_useState5, 2),
+    dropSide = _useState6[0],
+    setDropSide = _useState6[1]; // 放在目标的上侧或者下侧
+  // 清除hover行信息
+  var clearHoverRowIndex = useCallback(function () {
+    setHoverRowIndex(undefined);
+  }, []);
+  // 当前table在hover时进行广播
+  var publishCurTableHoveringEvent = function publishCurTableHoveringEvent() {
+    events.emit('TABLE_HOVERING', tableId);
+  };
+
+  // 接收广播:其他table在hover时，取消当前table的hover
+  var receiveCurTableHoveringEvent = useCallback(function (hoveringTableId) {
+    if (hoveringTableId !== tableId) {
+      clearHoverRowIndex();
+    }
+  }, []);
+  useEventBus('TABLE_HOVERING', receiveCurTableHoveringEvent);
+
+  // 拖动时，即时修改hover信息
+  var changeHoverRow = useCallback(function (_ref2) {
+    var _origin$draggedRow, _origin$draggedRows;
+    var target = _ref2.target,
+      origin = _ref2.origin;
+    publishCurTableHoveringEvent();
+    var targetRowIndex = target === null || target === void 0 ? void 0 : target.index;
+    var originRowIndex = origin === null || origin === void 0 || (_origin$draggedRow = origin.draggedRow) === null || _origin$draggedRow === void 0 ? void 0 : _origin$draggedRow.index;
+    var originRowIndexList = (origin === null || origin === void 0 || (_origin$draggedRows = origin.draggedRows) === null || _origin$draggedRows === void 0 ? void 0 : _origin$draggedRows.map(function (row) {
+      return row.index;
+    })) || [];
+    // console.log('hover :>> ', targetRowIndex, originRowIndex);
+    if (tableId === origin.sourceTableId && originRowIndexList.includes(targetRowIndex)) {
+      clearHoverRowIndex();
+    } else if (targetRowIndex !== hoverRowIndex) {
+      setHoverRowIndex(targetRowIndex);
+      if (tableId !== origin.sourceTableId) {
+        // 表格之间拖动
+        setDropSide(DropSide.Top);
+      } else {
+        // 表格内部拖动
+        setDropSide(targetRowIndex > originRowIndex ? DropSide.Bottom : DropSide.Top);
+      }
+    }
+  }, [hoverRowIndex]);
+  // 拖动到最后一行下面的空白处，在最后一行数据上展示预览位置
+  var addToLast = useCallback(function () {
+    publishCurTableHoveringEvent();
+    var lastIndex = table.getRowModel().rows.length - 1;
+    if (lastIndex !== hoverRowIndex) {
+      setHoverRowIndex(lastIndex);
+      setDropSide(DropSide.Bottom);
+    }
+  }, [hoverRowIndex]);
 
   // cell右键菜单
   var handleCellContextMenu = function handleCellContextMenu(e, cell) {
@@ -221,10 +283,18 @@ var TableBody = function TableBody(_ref) {
           return undefined;
         }
         // console.log('drop-table-empty did');
+        clearHoverRowIndex();
         return reorderRow === null || reorderRow === void 0 ? void 0 : reorderRow(formDatas, {
           hoverRow: undefined,
           targetTableId: tableId
         });
+      },
+      hover: function hover(item, monitor) {
+        if (monitor.isOver({
+          shallow: true
+        }) && monitor.canDrop()) {
+          addToLast();
+        }
       }
     }),
     _useDrop4 = _slicedToArray(_useDrop3, 2),
@@ -291,7 +361,11 @@ var TableBody = function TableBody(_ref) {
         shadowColumnInfo: shadowColumnInfo,
         onCellContextMenu: handleCellContextMenu,
         getRowHoverTipConfig: getRowHoverTipConfig,
-        tableTooltip: tableTooltip
+        tableTooltip: tableTooltip,
+        changeHoverRow: changeHoverRow,
+        clearHoverRowIndex: clearHoverRowIndex,
+        hoverRowIndex: hoverRowIndex,
+        dropSide: dropSide
       }, row.id);
     });
   };
@@ -301,6 +375,9 @@ var TableBody = function TableBody(_ref) {
     var _table$getRowModel$ro;
     return !loading && datas.length !== 0 && ((_table$getRowModel$ro = table.getRowModel().rows) === null || _table$getRowModel$ro === void 0 ? void 0 : _table$getRowModel$ro.length) !== 0;
   }, [loading, datas.length, (_table$getRowModel$ro2 = table.getRowModel().rows) === null || _table$getRowModel$ro2 === void 0 ? void 0 : _table$getRowModel$ro2.length]);
+
+  // console.log('body render :>>');
+
   return (
     /*#__PURE__*/
     // 修复筛选数据为空时，滚动条丢失
@@ -313,7 +390,8 @@ var TableBody = function TableBody(_ref) {
         theme: theme,
         rowSelectedId: rowSelectedId,
         table: table,
-        tableId: tableId
+        tableId: tableId,
+        compactMode: compactMode
       }),
       // document.body,
       root ? document.querySelector(root) : document.body), showTable ? /*#__PURE__*/_jsx("div", {

package/dist/components/TableMax/TableBody/index.less

@@ -31,8 +31,8 @@ table {
 .tbody-tr-selected > .tbody-tr-td,
 .tbody-tr-selected > .tbody-tr-td-drag {
   background-color: @globalColor0;
-  height: 39px;
-  line-height: 39px;
+  height: 32px;
+  line-height: 32px;
   // overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
@@ -53,6 +53,40 @@ table {
   }
 }
 
+.showTopBorder {
+  // border-top: 2px solid @global-primary-color;
+  position: relative;
+
+  &::after {
+    content: '';
+    display: block;
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 0;
+    border-top: 2px dashed @global-primary-color;
+    z-index: 999;
+  }
+}
+
+.showBottomBorder {
+  // border-bottom: 2px solid @global-primary-color;
+  position: relative;
+
+  &::after {
+    content: '';
+    display: block;
+    position: absolute;
+    left: 0;
+    bottom: 0;
+    width: 100%;
+    height: 0;
+    border-bottom: 2px dashed @global-primary-color;
+    z-index: 999;
+  }
+}
+
 .tbody-tr-td-drag:hover {
   cursor: move;
 }
@@ -68,16 +102,6 @@ table {
   }
 }
 
-// .tbody-tr-subrow-light {
-//   border-bottom: 1px solid var(--tableColor2, rgba(94, 97, 117, 0.4));
-//   background: #fbfbfb;
-// }
-
-// .tbody-tr-subrow-dark {
-//   border-bottom: 1px solid #848695;
-//   background: rgba(94, 97, 117, 0.4);
-// }
-
 .table-loading {
   display: flex;
   flex-direction: column;

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

@@ -11,6 +11,7 @@ type ICellType = {
     getHeaderCellProps?: (columns: TableMaxColumnType[]) => object;
     columnResizeMode: ColumnResizeMode;
     disableColumnDrag?: boolean;
+    headerRowNum: number;
 };
-declare const Cell: ({ tableContentRef, header, table, hasGroup, canSorting, getHeaderCellProps, disableColumnDrag, }: ICellType) => import("react/jsx-runtime").JSX.Element;
+declare const Cell: ({ tableContentRef, header, table, hasGroup, canSorting, getHeaderCellProps, disableColumnDrag, headerRowNum, }: ICellType) => import("react/jsx-runtime").JSX.Element;
 export default Cell;

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

@@ -38,7 +38,8 @@ var Cell = function Cell(_ref) {
     hasGroup = _ref.hasGroup,
     canSorting = _ref.canSorting,
     getHeaderCellProps = _ref.getHeaderCellProps,
-    disableColumnDrag = _ref.disableColumnDrag;
+    disableColumnDrag = _ref.disableColumnDrag,
+    headerRowNum = _ref.headerRowNum;
   var _useConfig = useConfig(),
     root = _useConfig.root;
   var cannotDragColumn = [ColumnType.Darg, ColumnType.Selection, ColumnType.Expander, ColumnType.PlaceHolder];
@@ -107,7 +108,7 @@ var Cell = function Cell(_ref) {
         style: {
           textAlign: columns ? 'center' : 'left'
         },
-        children: [columnDef.ellipsis ? /*#__PURE__*/_jsx(Tooltip, {
+        children: [!cannotDragColumn.includes(header.column.id) ? /*#__PURE__*/_jsx(Tooltip, {
           placement: "topLeft"
           // @ts-ignore
           ,
@@ -115,6 +116,9 @@ var Cell = function Cell(_ref) {
           mouseEnterDelay: 0.5,
           children: /*#__PURE__*/_jsx("div", {
             className: "cell-left-header",
+            style: {
+              WebkitLineClamp: headerRowNum
+            },
             children:
             // @ts-ignore
             flexRender(columnDef.header, header.getContext())

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

@@ -17,6 +17,7 @@ type TableHeaderProps = {
         rightFirstColumnId: string;
     };
     disableColumnDrag?: boolean;
+    headerRowNum: number;
 };
-declare const TableHeader: ({ tableContentRef, table, canFilter, enableFilters, canSorting, hasGroup, getHeaderCellProps, columnResizeMode, shadowColumnInfo, disableColumnDrag, }: TableHeaderProps) => import("react/jsx-runtime").JSX.Element;
+declare const TableHeader: ({ tableContentRef, table, canFilter, enableFilters, canSorting, hasGroup, getHeaderCellProps, columnResizeMode, shadowColumnInfo, disableColumnDrag, rowHeight, headerRowNum, }: TableHeaderProps) => import("react/jsx-runtime").JSX.Element;
 export default TableHeader;

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

@@ -24,7 +24,9 @@ var TableHeader = function TableHeader(_ref) {
     getHeaderCellProps = _ref.getHeaderCellProps,
     columnResizeMode = _ref.columnResizeMode,
     shadowColumnInfo = _ref.shadowColumnInfo,
-    disableColumnDrag = _ref.disableColumnDrag;
+    disableColumnDrag = _ref.disableColumnDrag,
+    rowHeight = _ref.rowHeight,
+    headerRowNum = _ref.headerRowNum;
   var headerGroups = table.getHeaderGroups();
   var headers = (headerGroups === null || headerGroups === void 0 || (_headerGroups = headerGroups[headerGroups.length - 1]) === null || _headerGroups === void 0 ? void 0 : _headerGroups.headers) || [];
   var leftLastColumnId = shadowColumnInfo.leftLastColumnId,
@@ -43,7 +45,7 @@ var TableHeader = function TableHeader(_ref) {
         return /*#__PURE__*/_jsx("tr", {
           className: "table-thead-tr cus-table-thead-tr",
           style: {
-            height: hasGroup && headerGroup.depth === 0 ? '40px' : 'auto',
+            height: hasGroup && headerGroup.depth === 0 ? "".concat(rowHeight, "px") : 'auto',
             width: '100%'
           },
           children: headerGroup.headers.map(function (header) {
@@ -59,7 +61,8 @@ var TableHeader = function TableHeader(_ref) {
                 canSorting: canSorting,
                 getHeaderCellProps: getHeaderCellProps,
                 columnResizeMode: columnResizeMode,
-                disableColumnDrag: disableColumnDrag
+                disableColumnDrag: disableColumnDrag,
+                headerRowNum: headerRowNum
               }, header.id)
             }, header.id);
           })

package/dist/components/TableMax/TableHeader/index.less

@@ -21,12 +21,13 @@ table {
 
 .cell-wapper {
   background: @globalColor_14;
-  height: 40px;
-  line-height: 40px;
+  height: fit-content;
+  line-height: 16px;
   display: flex;
   font-weight: 400;
-  padding: 0 8px;
+  padding: 8px;
   text-align: left;
+  font-size: 14px;
   // border-bottom: 1px solid @tableColor2;
 
   .cell-left {
@@ -42,10 +43,15 @@ table {
     align-items: center;
 
     .cell-left-header {
-      display: inline-block;
+      display: box;
+      -webkit-box-orient: vertical;
       overflow: hidden;
       text-overflow: ellipsis;
-      white-space: nowrap;
+      white-space: normal;
+
+      .ant-checkbox-wrapper {
+        line-height: 16px;
+      }
     }
   }
 
@@ -181,13 +187,13 @@ table {
 
     .custom-light-picker {
       padding: 4px;
-      background:  @global-curd-input-background-color;
+      background: @global-curd-input-background-color;
     }
 
     .custom-light-input-affix-wrapper,
     .custom-light-input,
     .custom-light-picker-input .custom-light-picker-clear {
-      background:  @global-curd-input-background-color;
+      background: @global-curd-input-background-color;
     }
   }
 }

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

@@ -1,7 +1,7 @@
 import { RowData } from '@tanstack/react-table';
 import React from 'react';
 import './tableMax.less';
-import type { TableContextType, TableMaxProps } from './type';
+import { type TableContextType, type TableMaxProps } from './type';
 declare module '@tanstack/react-table' {
     interface TableMeta<TData extends RowData> {
         updateData: (rowIndex: number, columnId: string, value: unknown) => void;