From bfedd02d1d81925cf4921444f17e8cac26c9f774 Mon Sep 17 00:00:00 2001 From: ssongliu <73214554+ssongliu@users.noreply.github.com> Date: Fri, 2 Jun 2023 10:24:29 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E5=AE=B9=E5=99=A8?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=20(#1225)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + frontend/src/api/modules/container.ts | 2 +- frontend/src/lang/modules/en.ts | 1 + frontend/src/lang/modules/zh.ts | 1 + frontend/src/views/container/setting/index.vue | 1 + frontend/src/views/container/setting/log/index.vue | 2 +- frontend/src/views/container/volume/index.vue | 1 + 7 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index c475be831..044f178d3 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ dist/ install.sh docker.sh cmd/server/web/.DS_Store +cmd/server/.DS_Store diff --git a/frontend/src/api/modules/container.ts b/frontend/src/api/modules/container.ts index f7c1c8746..1384c20ac 100644 --- a/frontend/src/api/modules/container.ts +++ b/frontend/src/api/modules/container.ts @@ -152,7 +152,7 @@ export const updateDaemonJson = (key: string, value: string) => { return http.post(`/containers/daemonjson/update`, { key: key, value: value }, 60000); }; export const updateLogOption = (maxSize: string, maxFile: string) => { - return http.post(`/containers/logoption/update`, { maxSize: maxSize, maxFile: maxFile }, 60000); + return http.post(`/containers/logoption/update`, { logMaxSize: maxSize, logMaxFile: maxFile }, 60000); }; export const updateDaemonJsonByfile = (params: Container.DaemonJsonUpdateByFile) => { return http.post(`/containers/daemonjson/update/byfile`, params); diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts index a3880dee7..eb82dfcc4 100644 --- a/frontend/src/lang/modules/en.ts +++ b/frontend/src/lang/modules/en.ts @@ -17,6 +17,7 @@ const message = { confirm: 'Confirm', cancel: 'Cancel', reset: 'Reset', + restart: 'Restart', conn: 'Connect', disconn: 'Disconnect', clean: 'Clean', diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts index 26b2cb7a3..7bbcf68d0 100644 --- a/frontend/src/lang/modules/zh.ts +++ b/frontend/src/lang/modules/zh.ts @@ -17,6 +17,7 @@ const message = { confirm: '确认', cancel: '取消', reset: '重置', + restart: '重启', conn: '连接', disconn: '断开', clean: '清空', diff --git a/frontend/src/views/container/setting/index.vue b/frontend/src/views/container/setting/index.vue index 5f4e64b1a..67054032f 100644 --- a/frontend/src/views/container/setting/index.vue +++ b/frontend/src/views/container/setting/index.vue @@ -310,6 +310,7 @@ const handleIptables = () => { }; const onSubmitCloseIPtable = () => { save('IPtables', 'disable'); + iptablesVisiable.value = false; }; const onSubmitOpenIPtable = () => { save('IPtables', 'enable'); diff --git a/frontend/src/views/container/setting/log/index.vue b/frontend/src/views/container/setting/log/index.vue index cf5d4ae48..080937404 100644 --- a/frontend/src/views/container/setting/log/index.vue +++ b/frontend/src/views/container/setting/log/index.vue @@ -101,7 +101,7 @@ const onSave = async (formEl: FormInstance | undefined) => { const onSubmitSave = async () => { loading.value = true; - await updateLogOption(form.logMaxSize + '', form.logMaxFile + '') + await updateLogOption(form.logMaxSize + form.sizeUnit, form.logMaxFile + '') .then(() => { loading.value = false; drawerVisiable.value = false; diff --git a/frontend/src/views/container/volume/index.vue b/frontend/src/views/container/volume/index.vue index 73d81e37e..9a24b363f 100644 --- a/frontend/src/views/container/volume/index.vue +++ b/frontend/src/views/container/volume/index.vue @@ -90,6 +90,7 @@ import i18n from '@/lang'; import { useDeleteData } from '@/hooks/use-delete-data'; import router from '@/routers'; import { MsgSuccess } from '@/utils/message'; +import { ElMessageBox } from 'element-plus'; const loading = ref(); const detailInfo = ref();