feat(table): placement = top

Tencent · Sep 5, 2022 · 648b9c8 · 648b9c8
1 parent 72aef32
commit 648b9c8
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 13 deletions.
diff --git a/src/table/Ellipsis.tsx b/src/table/Ellipsis.tsx
@@ -4,16 +4,16 @@ import debounce from 'lodash/debounce';
 
 import { TNode } from '../common';
 import { isNodeOverflow } from '../_util/dom';
-import TPopup, { PopupProps } from '../popup';
+import Tooltip, { TooltipProps } from '../tooltip';
 import useConfig from '../hooks/useConfig';
 
 export interface EllipsisProps {
   content?: string | TNode;
   children?: string | TNode;
   popupContent?: string | number | TNode;
-  placement?: PopupProps['placement'];
+  placement?: TooltipProps['placement'];
   attach?: () => HTMLElement;
-  popupProps?: PopupProps;
+  tooltipProps?: TooltipProps;
   zIndex?: number;
 }
 
@@ -54,9 +54,9 @@ export default function Ellipsis(props: EllipsisProps) {
       zIndex: props.zIndex,
       attach: props.attach,
       placement: props.placement,
-      ...(props.popupProps || {}),
+      ...(props.tooltipProps || {}),
     };
-    content = <TPopup {...rProps}>{ellipsisContent}</TPopup>;
+    content = <Tooltip {...rProps}>{ellipsisContent}</Tooltip>;
   } else {
     content = ellipsisContent;
   }

diff --git a/src/table/THead.tsx b/src/table/THead.tsx
@@ -116,7 +116,7 @@ export default function THead(props: TheadProps) {
                   placement="bottom"
                   attach={theadRef.current ? () => theadRef.current.parentNode.parentNode as HTMLElement : undefined}
                   popupContent={content}
-                  popupProps={typeof col.ellipsisTitle === 'object' ? col.ellipsisTitle : undefined}
+                  tooltipProps={typeof col.ellipsisTitle === 'object' ? col.ellipsisTitle : undefined}
                 >
                   {innerTh}
                 </TEllipsis>

diff --git a/src/table/TR.tsx b/src/table/TR.tsx
@@ -137,17 +137,15 @@ export default function TR(props: TrProps) {
 
   function renderEllipsisCell(cellParams: BaseTableCellParams<TableRowData>, params: RenderEllipsisCellParams) {
     const { cellNode } = params;
-    const { col, colIndex } = cellParams;
-    // 前两列左对齐显示
-    const placement = colIndex < 2 ? 'top-left' : 'top-right';
+    const { col } = cellParams;
     const content = isFunction(col.ellipsis) ? col.ellipsis(cellParams) : undefined;
     const tableElement = props.tableElm;
     return (
       <TEllipsis
-        placement={placement}
+        placement={'top'}
         attach={tableElement ? () => tableElement : undefined}
         popupContent={content}
-        popupProps={typeof col.ellipsis === 'object' ? col.ellipsis : undefined}
+        tooltipProps={typeof col.ellipsis === 'object' ? col.ellipsis : undefined}
       >
         {cellNode}
       </TEllipsis>

diff --git a/src/table/hooks/useTableHeader.tsx b/src/table/hooks/useTableHeader.tsx
@@ -47,10 +47,10 @@ export default function useTableHeader({ columns }: UseTableHeaderParams) {
         <div className={tableSortClasses.title}>
           {col.ellipsis && ellipsisTitle !== false && ellipsisTitle !== null ? (
             <TEllipsis
-              placement="bottom-right"
+              placement="bottom"
               attach={attach ? () => attach : undefined}
               popupContent={content}
-              popupProps={typeof ellipsisTitle === 'object' ? ellipsisTitle : undefined}
+              tooltipProps={typeof ellipsisTitle === 'object' ? ellipsisTitle : undefined}
             >
               {title}
             </TEllipsis>