diff --git a/frontend/packages/core/src/const/system/type.ts b/frontend/packages/core/src/const/system/type.ts index c4e7742c..abb0ab97 100644 --- a/frontend/packages/core/src/const/system/type.ts +++ b/frontend/packages/core/src/const/system/type.ts @@ -11,6 +11,7 @@ export type SystemTableListItem = { serviceNum: number, description:string; master:EntityItem; + state: string service_kind:'ai'|'rest', createTime:string; }; diff --git a/frontend/packages/core/src/pages/aiSetting/LocalModelList.tsx b/frontend/packages/core/src/pages/aiSetting/LocalModelList.tsx index 97b105e2..2d42d61c 100644 --- a/frontend/packages/core/src/pages/aiSetting/LocalModelList.tsx +++ b/frontend/packages/core/src/pages/aiSetting/LocalModelList.tsx @@ -110,6 +110,13 @@ const LocalModelList: React.FC = () => { const [searchWord, setSearchWord] = useState('') const localAiDeployRef = useRef() const EditLocalModelModalRef = useRef() + const [stateColumnMap] = useState<{ [k: string]: { text: string; className?: string } }>({ + normal: { text: '正常' }, + deploying: { text: '部署中', className: 'text-[#2196f3] cursor-pointer' }, + error: { text: '模型异常', className: 'text-[#ff4d4f]' }, + disabled: { text: '停用', className: 'text-[#999]' }, + deploying_error: { text: '部署失败', className: 'text-[#ff4d4f] cursor-pointer' } + }) const handleEdit = (record: ModelListData) => { modal.confirm({ @@ -289,15 +296,15 @@ const LocalModelList: React.FC = () => { ellipsis: true, render: (dom: React.ReactNode, entity: ModelListData) => ( .ant-typography]:text-[#2196f3] cursor-pointer' : entity?.state === 'error' ? '[&>.ant-typography]:text-[#ff4d4f] cursor-pointer' : ''}`} + className={`text-[13px] ${stateColumnMap[entity?.state as string]?.className}`} onClick={(e) => { - if (['deploying', 'error'].includes(entity?.state as string)) { + if (['deploying', 'deploying_error'].includes(entity?.state as string)) { e?.stopPropagation() openLogsModal(entity) } }} > - {dom} + {stateColumnMap[entity?.state as string]?.text || '-'} ) }, diff --git a/frontend/packages/core/src/pages/aiSetting/types.ts b/frontend/packages/core/src/pages/aiSetting/types.ts index c9930b55..053e73f8 100644 --- a/frontend/packages/core/src/pages/aiSetting/types.ts +++ b/frontend/packages/core/src/pages/aiSetting/types.ts @@ -1,6 +1,6 @@ export type ModelStatus = 'enabled' | 'abnormal' | 'disabled' export type KeyStatus = 'normal' | 'abnormal' | 'disabled' -export type ModelDeployStatus = 'normal' | 'disabled' | 'deploying' | 'error' | undefined +export type ModelDeployStatus = 'normal' | 'disabled' | 'deploying' | 'error' | 'deploying_error' | undefined export interface KeyData { id: string diff --git a/frontend/packages/core/src/pages/system/SystemList.tsx b/frontend/packages/core/src/pages/system/SystemList.tsx index 0c89b330..1cb6d07b 100644 --- a/frontend/packages/core/src/pages/system/SystemList.tsx +++ b/frontend/packages/core/src/pages/system/SystemList.tsx @@ -31,10 +31,10 @@ const SystemList: FC = () => { const [open, setOpen] = useState(false) const drawerFormRef = useRef(null) const { checkPermission, accessInit, getGlobalAccessData, state } = useGlobalContext() - const [stateColumnMap] = useState<{ [k: string]: { text: string } }>({ + const [stateColumnMap] = useState<{ [k: string]: { text: string; className?: string } }>({ normal: { text: '正常' }, - deploying: { text: '部署中' }, - error: { text: '异常' }, + deploying: { text: '部署中', className: 'text-[#2196f3]' }, + error: { text: '异常', className: 'text-[#ff4d4f]' }, public: { text: '公共服务' }, private: { text: '私有服务' } }) @@ -171,9 +171,9 @@ const SystemList: FC = () => { }) } if ((x.dataIndex as string) === 'state') { - x.render = (text: any, record: any) => ( + x.render = (dom: React.ReactNode, record: any) => ( { if (['deploying', 'error'].includes(record.state)) { e?.stopPropagation() diff --git a/frontend/packages/core/src/pages/system/serviceDeployment/ServiceDeployMentFooter.tsx b/frontend/packages/core/src/pages/system/serviceDeployment/ServiceDeployMentFooter.tsx index 9181b0f7..decba757 100644 --- a/frontend/packages/core/src/pages/system/serviceDeployment/ServiceDeployMentFooter.tsx +++ b/frontend/packages/core/src/pages/system/serviceDeployment/ServiceDeployMentFooter.tsx @@ -73,7 +73,7 @@ export const LogsFooter = (props: any) => { } return ( <> - {record.state === 'error' ? ( + {['deploying_error', 'error'].includes(record.state) ? (