From 3b37d5ae7281ad07147e11bab6d8762033850633 Mon Sep 17 00:00:00 2001 From: ssongliu <73214554+ssongliu@users.noreply.github.com> Date: Wed, 18 Jun 2025 11:48:57 +0800 Subject: [PATCH] fix: Upgrade the element version to 2.9.9 (#9158) --- agent/utils/docker/docker.go | 4 ++-- frontend/package.json | 2 +- .../src/layout/components/Sidebar/components/Collapse.vue | 2 +- frontend/src/views/cronjob/cronjob/operate/index.vue | 2 +- frontend/src/views/log/operation/index.vue | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/agent/utils/docker/docker.go b/agent/utils/docker/docker.go index 420e2bc66..6755587e7 100644 --- a/agent/utils/docker/docker.go +++ b/agent/utils/docker/docker.go @@ -144,14 +144,14 @@ func (c Client) NetworkExist(name string) bool { func CreateDefaultDockerNetwork() error { cli, err := NewClient() if err != nil { - global.LOG.Errorf("init docker client error %s", err.Error()) + global.LOG.Warnf("init docker client error %s", err.Error()) return err } defer cli.Close() if !cli.NetworkExist("1panel-network") { if err := cli.CreateNetwork("1panel-network"); err != nil { - global.LOG.Errorf("create default docker network error %s", err.Error()) + global.LOG.Warnf("create default docker network error %s", err.Error()) return err } } diff --git a/frontend/package.json b/frontend/package.json index a550bf355..f01d35282 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -38,7 +38,7 @@ "codemirror": "^6.0.1", "crypto-js": "^4.2.0", "echarts": "^5.5.0", - "element-plus": "^2.9.7", + "element-plus": "^2.9.9", "fit2cloud-ui-plus": "^1.2.2", "highlight.js": "^11.9.0", "js-base64": "^3.7.7", diff --git a/frontend/src/layout/components/Sidebar/components/Collapse.vue b/frontend/src/layout/components/Sidebar/components/Collapse.vue index e4fcd38a9..f9e7cb683 100644 --- a/frontend/src/layout/components/Sidebar/components/Collapse.vue +++ b/frontend/src/layout/components/Sidebar/components/Collapse.vue @@ -149,7 +149,7 @@ const loadNodes = async () => { globalStore.currentNode = 'local'; return; } - await listNodeOptions() + await listNodeOptions('') .then((res) => { if (!res) { nodes.value = []; diff --git a/frontend/src/views/cronjob/cronjob/operate/index.vue b/frontend/src/views/cronjob/cronjob/operate/index.vue index 2200a317d..c00576cd0 100644 --- a/frontend/src/views/cronjob/cronjob/operate/index.vue +++ b/frontend/src/views/cronjob/cronjob/operate/index.vue @@ -747,7 +747,7 @@ const form = reactive({ dbNameList: [], retainCopies: 7, - retryTimes: 0, + retryTimes: 3, timeout: 3600, timeoutItem: 3600, timeoutUint: 's', diff --git a/frontend/src/views/log/operation/index.vue b/frontend/src/views/log/operation/index.vue index f0c6f031c..b7edbed3c 100644 --- a/frontend/src/views/log/operation/index.vue +++ b/frontend/src/views/log/operation/index.vue @@ -165,7 +165,7 @@ const loadDetail = (log: string) => { }; const loadNodes = async () => { - await listNodeOptions() + await listNodeOptions('') .then((res) => { if (!res) { nodes.value = [];