diff --git a/react-ui/src/pages/AutoML/components/ExperimentInstance/index.tsx b/react-ui/src/pages/AutoML/components/ExperimentInstance/index.tsx index ab713f48..9c8ea687 100644 --- a/react-ui/src/pages/AutoML/components/ExperimentInstance/index.tsx +++ b/react-ui/src/pages/AutoML/components/ExperimentInstance/index.tsx @@ -8,7 +8,7 @@ import { elapsedTime, formatDate } from '@/utils/date'; import { to } from '@/utils/promise'; import { modalConfirm } from '@/utils/ui'; import { DoubleRightOutlined } from '@ant-design/icons'; -import { App, Button, Checkbox, ConfigProvider, Tooltip } from 'antd'; +import { App, Button, Checkbox, ConfigProvider, Typography } from 'antd'; import classNames from 'classnames'; import { useEffect, useMemo } from 'react'; import { ExperimentListType, experimentListConfig } from '../ExperimentList/config'; @@ -159,9 +159,9 @@ function ExperimentInstanceComponent({ {elapsedTime(item.create_time, item.finish_time)}
- - {formatDate(item.create_time)} - + + {formatDate(item.create_time)} +
{elapsedTime(item.create_time, item.finish_time)}
- - {formatDate(item.create_time)} - + + {formatDate(item.create_time)} +
diff --git a/react-ui/src/utils/table.tsx b/react-ui/src/utils/table.tsx index d3ec10d6..dedc0d6d 100644 --- a/react-ui/src/utils/table.tsx +++ b/react-ui/src/utils/table.tsx @@ -6,7 +6,7 @@ import { isEmpty } from '@/utils'; import { formatDate } from '@/utils/date'; -import { Tooltip } from 'antd'; +import { Typography } from 'antd'; import dayjs from 'dayjs'; export enum TableCellValueType { @@ -92,39 +92,52 @@ function tableCellRender( break; } - if (ellipsis && text) { - return ( - - {renderCell(text, type === TableCellValueType.Link, record, options?.onClick)} - - ); - } else { - return renderCell(text, type === TableCellValueType.Link, record, options?.onClick); - } + return renderCell(text, ellipsis, type, record, options?.onClick); }; } function renderCell( text: any | undefined | null, - isLink: boolean, + ellipsis: boolean, + type: TableCellValueType = TableCellValueType.Text, record: T, onClick?: (record: T, e: React.MouseEvent) => void, ) { - return isLink ? renderLink(text, record, onClick) : renderText(text); + return type === TableCellValueType.Link + ? renderLink(text, ellipsis, record, onClick) + : renderText(text, ellipsis); } -function renderText(text: any | undefined | null) { - return {!isEmpty(text) ? text : '--'}; +function renderText(text: any | undefined | null, ellipsis: boolean) { + return ( + + {!isEmpty(text) ? text : '--'} + + ); } function renderLink( text: any | undefined | null, + ellipsis: boolean, record: T, onClick?: (record: T, e: React.MouseEvent) => void, ) { return ( onClick?.(record, e)}> - {text} + {renderText(text, ellipsis)} ); }