From 76618aa3a1aa22e070e782327884ab7d5c72cec1 Mon Sep 17 00:00:00 2001 From: jialin Date: Fri, 5 Jun 2026 22:17:16 +0800 Subject: [PATCH] fix(style): cluster detail --- .../cluster-management/cluster-detail.tsx | 6 ++-- .../components/detail/cluster-basic.tsx | 2 +- .../components/detail/cluster-system-load.tsx | 2 +- src/pages/resources/components/gpus.tsx | 10 +++++-- src/pages/resources/components/workers.tsx | 29 +++++++++++++------ .../resources/hooks/use-worker-columns.tsx | 5 +++- 6 files changed, 38 insertions(+), 16 deletions(-) diff --git a/src/pages/cluster-management/cluster-detail.tsx b/src/pages/cluster-management/cluster-detail.tsx index 69db24ee..b12f6549 100644 --- a/src/pages/cluster-management/cluster-detail.tsx +++ b/src/pages/cluster-management/cluster-detail.tsx @@ -62,13 +62,15 @@ const ClusterDetailModal = () => { key: 'workers', label: `Workers`, icon: , - children: + children: ( + + ) }, { key: 'gpus', label: `GPUs`, icon: , - children: + children: }, ...extraTabs ]} diff --git a/src/pages/cluster-management/components/detail/cluster-basic.tsx b/src/pages/cluster-management/components/detail/cluster-basic.tsx index 590383f9..af7ba0af 100644 --- a/src/pages/cluster-management/components/detail/cluster-basic.tsx +++ b/src/pages/cluster-management/components/detail/cluster-basic.tsx @@ -19,7 +19,7 @@ const Container = styled.div` height: 168px; .left { padding: 16px 24px; - width: 160px; + width: 124px; display: flex; flex-direction: column; align-items: center; diff --git a/src/pages/cluster-management/components/detail/cluster-system-load.tsx b/src/pages/cluster-management/components/detail/cluster-system-load.tsx index ba28bcac..6062a16d 100644 --- a/src/pages/cluster-management/components/detail/cluster-system-load.tsx +++ b/src/pages/cluster-management/components/detail/cluster-system-load.tsx @@ -15,7 +15,7 @@ const Container = styled.div` align-items: center; justify-content: space-between; font-size: 14px; - font-weight: 500; + font-weight: 400; color: var(--ant-color-text-tertiary); } diff --git a/src/pages/resources/components/gpus.tsx b/src/pages/resources/components/gpus.tsx index 7399a060..0ddefdcb 100644 --- a/src/pages/resources/components/gpus.tsx +++ b/src/pages/resources/components/gpus.tsx @@ -17,9 +17,10 @@ import useGPUColumns from '../hooks/use-gpu-columns'; // inside. interface GPUListProps { clusterId?: number; + source?: 'clusterDetail'; } -const GPUList: React.FC = ({ clusterId }) => { +const GPUList: React.FC = ({ clusterId, source }) => { const { dataSource, queryParams, @@ -109,7 +110,12 @@ const GPUList: React.FC = ({ clusterId }) => { handleInputChange={handleNameChange} handleSelectChange={handleClusterChange} selectOptions={clusterList} - showSelect={!clusterId} + showSelect={source !== 'clusterDetail'} + widths={ + source !== 'clusterDetail' + ? { select: 230, input: 230 } + : { input: 300 } + } > = ({ clusterId }) => { +const Workers: React.FC = ({ clusterId, source }) => { const { dataSource, rowSelection, @@ -248,6 +249,7 @@ const Workers: React.FC = ({ clusterId }) => { loadend: dataSource.loadend, firstLoad: extraStatus.firstLoad, sortOrder, + source, handleSelect }); @@ -260,7 +262,7 @@ const Workers: React.FC = ({ clusterId }) => { <> = ({ clusterId }) => { handleInputChange={handleNameChange} rowSelection={rowSelection} selectOptions={clusterData.list} + widths={ + source !== 'clusterDetail' + ? { select: 230, input: 230 } + : { input: 300 } + } right={ - + source === 'clusterDetail' ? ( + <> + ) : ( + + ) } > @@ -296,7 +307,7 @@ const Workers: React.FC = ({ clusterId }) => { rowKey="id" scroll={{ x: 900 }} onChange={handleTableChange} - rowSelection={rowSelection} + rowSelection={source === 'clusterDetail' ? undefined : rowSelection} pagination={{ size: 'middle', showSizeChanger: true, diff --git a/src/pages/resources/hooks/use-worker-columns.tsx b/src/pages/resources/hooks/use-worker-columns.tsx index aeb29714..f6b6f942 100644 --- a/src/pages/resources/hooks/use-worker-columns.tsx +++ b/src/pages/resources/hooks/use-worker-columns.tsx @@ -233,12 +233,14 @@ const useWorkerColumns = ({ loadend, firstLoad, sortOrder, + source, handleSelect }: { clusterData: { list: Global.BaseOption[]; data: Record; }; + source?: string; loadend: boolean; firstLoad: boolean; sortOrder: string[]; @@ -521,6 +523,7 @@ const useWorkerColumns = ({ { title: intl.formatMessage({ id: 'common.table.operation' }), key: 'operation', + hidden: source === 'clusterDetail', render: (_, record) => (