{modelList.length
? modelList
- .filter((item) => item.is_popular)
+ .filter((item) => item.isPopular)
.map((item) => (
{
valueType: 'option',
render: (_: React.ReactNode, entity: any) => [
handleDelete(entity.id as string)}
@@ -285,7 +285,7 @@ const LoadBalancingPage = () => {
ref={pageListRef}
rowKey="id"
afterNewBtn={[
-
+
diff --git a/frontend/packages/core/src/pages/system/SystemList.tsx b/frontend/packages/core/src/pages/system/SystemList.tsx
index 1cb6d07b..e11f10b9 100644
--- a/frontend/packages/core/src/pages/system/SystemList.tsx
+++ b/frontend/packages/core/src/pages/system/SystemList.tsx
@@ -137,15 +137,15 @@ const SystemList: FC = () => {
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) => {
-
+
)}
>