From 27836742a8ec4777b811ba63c65202fd3258ecc6 Mon Sep 17 00:00:00 2001 From: CityFun <31820853+zhengkunwang223@users.noreply.github.com> Date: Tue, 27 May 2025 11:52:18 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20add=20restart-docker=20option=20when=20a?= =?UTF-8?q?dding=20system=20proxy=20for=20the=20first=E2=80=A6=20(#8845)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/docker-proxy/dialog.vue | 5 +++++ frontend/src/views/setting/license/index.vue | 9 ++++++--- frontend/src/views/setting/panel/proxy/index.vue | 1 + 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/frontend/src/components/docker-proxy/dialog.vue b/frontend/src/components/docker-proxy/dialog.vue index 02ee80fcd..115f7ef87 100644 --- a/frontend/src/components/docker-proxy/dialog.vue +++ b/frontend/src/components/docker-proxy/dialog.vue @@ -32,6 +32,7 @@ const restart = ref(true); const em = defineEmits(['update:withDockerRestart', 'submit']); interface DialogProps { syncList: string; + open: boolean; } const emit = () => { em('update:withDockerRestart', false); @@ -42,6 +43,10 @@ const acceptParams = async (props: DialogProps): Promise => { emit(); return; } + if (props.open) { + open.value = true; + return; + } try { const res = await getSettingInfo(); if (res.data.proxyType === '' || res.data.proxyType === 'close') { diff --git a/frontend/src/views/setting/license/index.vue b/frontend/src/views/setting/license/index.vue index c123c81a9..72e94361f 100644 --- a/frontend/src/views/setting/license/index.vue +++ b/frontend/src/views/setting/license/index.vue @@ -165,9 +165,11 @@ const loadBindNode = (row: any) => { if (!row.bindNode && row.freeNodes?.length) { return row.bindNode; } - for (const item of row.freeNodes) { - if (item.addr === row.bindNode) { - return item.name === 'local' ? i18n.global.t('xpack.node.master') : item.addr; + if (row.freeNodes) { + for (const item of row.freeNodes) { + if (item.addr === row.bindNode) { + return item.name === 'local' ? i18n.global.t('xpack.node.master') : item.addr; + } } } return row.bindNode; @@ -214,6 +216,7 @@ const search = async () => { .then((res) => { loading.value = false; data.value = res.data.items || []; + console.log(data.value); for (const item of data.value) { item.productName = 'product-1panel-pro'; item.expiresAt = item.productPro === '0' ? '' : timestampToDate(Number(item.productPro)); diff --git a/frontend/src/views/setting/panel/proxy/index.vue b/frontend/src/views/setting/panel/proxy/index.vue index a923faeb7..842b1bd01 100644 --- a/frontend/src/views/setting/panel/proxy/index.vue +++ b/frontend/src/views/setting/panel/proxy/index.vue @@ -161,6 +161,7 @@ const submitChangePassword = async (formEl: FormInstance | undefined) => { if (isMasterProductPro.value && (params.proxyDocker || proxyDockerVisible.value)) { dockerProxyRef.value.acceptParams({ syncList: 'SyncSystemProxy', + open: true, }); } else { loading.value = true;