diff --git a/frontend/packages/common/src/const/type.ts b/frontend/packages/common/src/const/type.ts index 7bb3321a..47044c70 100644 --- a/frontend/packages/common/src/const/type.ts +++ b/frontend/packages/common/src/const/type.ts @@ -65,7 +65,7 @@ export type SimpleTeamItem = { } export type LocalModelItem = { id: string - is_popular: boolean + isPopular: boolean name: string size: string } diff --git a/frontend/packages/core/src/pages/aiSetting/LocalModelList.tsx b/frontend/packages/core/src/pages/aiSetting/LocalModelList.tsx index 2d42d61c..d23e89be 100644 --- a/frontend/packages/core/src/pages/aiSetting/LocalModelList.tsx +++ b/frontend/packages/core/src/pages/aiSetting/LocalModelList.tsx @@ -269,11 +269,15 @@ const LocalModelList: React.FC = () => { ] const openLogsModal = (record: any) => { + const closeModal = (reload = true) => { + reload && pageListRef.current?.reload() + modalInstance.destroy() + } const modalInstance = modal.confirm({ title: $t('部署过程'), content: , footer: () => { - return + return }, width: 600, okText: $t('确认'), diff --git a/frontend/packages/core/src/pages/guide/LocalAiDeploy.tsx b/frontend/packages/core/src/pages/guide/LocalAiDeploy.tsx index 68b8d071..07a83a72 100644 --- a/frontend/packages/core/src/pages/guide/LocalAiDeploy.tsx +++ b/frontend/packages/core/src/pages/guide/LocalAiDeploy.tsx @@ -40,9 +40,10 @@ const LocalAiDeploy = forwardRef((props: any, ref: any const tagList = data.models?.map((x: LocalModelItem) => { return { ...x, label: x.name, value: x.id } }) - tagList.unshift({ id: 'default', name: 'default' }) - form.setFieldValue('model', 'default') setTagList(tagList) + if (tagList.length) { + form.setFieldValue('model', tagList[0].id) + } } } else { message.error(msg || $t(RESPONSE_TIPS.error)) @@ -135,7 +136,7 @@ const LocalAiDeploy = forwardRef((props: any, ref: any
{modelList.length ? modelList - .filter((item) => item.is_popular) + .filter((item) => item.isPopular) .map((item) => ( { setOpen(false) } const openLogsModal = (record: any) => { - const closeModal = () => { + const closeModal = (reload = true) => { modalInstance.destroy() - manualReloadTable() + reload && manualReloadTable() } const modalInstance = modal.confirm({ title: $t('部署过程'), content: , footer: () => { - return + return }, width: 600, okText: $t('确认'), diff --git a/frontend/packages/core/src/pages/system/serviceDeployment/ServiceDeployMentFooter.tsx b/frontend/packages/core/src/pages/system/serviceDeployment/ServiceDeployMentFooter.tsx index 88f8675c..ee364a72 100644 --- a/frontend/packages/core/src/pages/system/serviceDeployment/ServiceDeployMentFooter.tsx +++ b/frontend/packages/core/src/pages/system/serviceDeployment/ServiceDeployMentFooter.tsx @@ -4,7 +4,7 @@ import { useFetch } from '@common/hooks/http.ts' import { BasicResponse, RESPONSE_TIPS, STATUS_CODE } from '@common/const/const' export const LogsFooter = (props: any) => { - const { record, modalInstance } = props + const { record, closeModal = () => {} } = props const { message, modal } = App.useApp() const { fetchData } = useFetch() const stopDeploy = () => { @@ -21,15 +21,12 @@ export const LogsFooter = (props: any) => { const { code, msg } = response if (code === STATUS_CODE.SUCCESS) { resolve(true) + closeModal() } else { message.error(msg || $t(RESPONSE_TIPS.error)) reject(false) } }) - .finally(() => { - resolve(true) - modalInstance.destroy() - }) }) }, width: 600, @@ -53,15 +50,12 @@ export const LogsFooter = (props: any) => { const { code, msg } = response if (code === STATUS_CODE.SUCCESS) { resolve(true) + closeModal() } else { message.error(msg || $t(RESPONSE_TIPS.error)) reject(false) } }) - .finally(() => { - resolve(true) - modalInstance.destroy() - }) }) }, width: 600, @@ -75,7 +69,7 @@ export const LogsFooter = (props: any) => { <> {['deploying_error', 'error'].includes(record.state) ? (
- + @@ -85,7 +79,7 @@ export const LogsFooter = (props: any) => { - +
)}