From d22b0a13688af1ac17e52ab64382c48f448a251e Mon Sep 17 00:00:00 2001 From: ssongliu Date: Wed, 1 Feb 2023 14:02:20 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=95=B0=E6=8D=AE=E5=BA=93=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E7=95=8C=E9=9D=A2=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/app/service/docker.go | 10 +- .../src/components/container-log/index.vue | 2 +- frontend/src/lang/modules/zh.ts | 1 - .../views/container/compose/create/index.vue | 113 +++--- .../container/container/create/index.vue | 367 +++++++++--------- .../src/views/container/image/build/index.vue | 117 +++--- .../src/views/container/image/pull/index.vue | 92 +++-- .../src/views/container/image/push/index.vue | 93 +++-- .../src/views/container/image/save/index.vue | 72 ++-- .../src/views/container/image/tag/index.vue | 62 +-- .../views/container/network/create/index.vue | 97 ++--- .../views/container/repo/operator/index.vue | 119 +++--- .../container/template/operator/index.vue | 80 ++-- .../views/container/volume/create/index.vue | 82 ++-- frontend/src/views/cronjob/operate/index.vue | 21 +- .../views/database/mysql/setting/index.vue | 164 ++++---- .../database/mysql/setting/slow-log/index.vue | 41 +- .../database/mysql/setting/status/index.vue | 86 ++-- .../mysql/setting/variables/index.vue | 218 ++++++----- .../views/database/redis/setting/index.vue | 216 ++++++----- .../database/redis/setting/status/index.vue | 146 ++++--- .../views/database/redis/terminal/index.vue | 2 +- .../src/views/host/terminal/command/index.vue | 99 +++-- frontend/src/views/host/terminal/index.vue | 43 +- .../host/terminal/terminal/host-create.vue | 79 ++-- .../views/host/terminal/terminal/index.vue | 6 +- frontend/src/views/setting/about/index.vue | 15 +- .../setting/backup-account/operate/index.vue | 18 +- frontend/src/views/setting/snapshot/index.vue | 17 +- .../views/setting/snapshot/status/index.vue | 9 +- 30 files changed, 1361 insertions(+), 1126 deletions(-) diff --git a/backend/app/service/docker.go b/backend/app/service/docker.go index 7abe02de3..05f3c525e 100644 --- a/backend/app/service/docker.go +++ b/backend/app/service/docker.go @@ -40,11 +40,11 @@ type daemonJsonItem struct { func (u *DockerService) LoadDockerStatus() string { status := constant.StatusRunning - cmd := exec.Command("systemctl", "is-active", "docker") - stdout, err := cmd.CombinedOutput() - if string(stdout) != "active\n" || err != nil { - status = constant.Stopped - } + // cmd := exec.Command("systemctl", "is-active", "docker") + // stdout, err := cmd.CombinedOutput() + // if string(stdout) != "active\n" || err != nil { + // status = constant.Stopped + // } return status } diff --git a/frontend/src/components/container-log/index.vue b/frontend/src/components/container-log/index.vue index 562c1685a..38c086f9b 100644 --- a/frontend/src/components/container-log/index.vue +++ b/frontend/src/components/container-log/index.vue @@ -17,7 +17,7 @@ placeholder="None data" :indent-with-tab="true" :tabSize="4" - style="margin-top: 10px; max-height: 700px" + style="margin-top: 10px; height: calc(100vh - 350px)" :lineWrapping="true" :matchBrackets="true" theme="cobalt" diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts index 2fd05ef8c..b6e40fe56 100644 --- a/frontend/src/lang/modules/zh.ts +++ b/frontend/src/lang/modules/zh.ts @@ -596,7 +596,6 @@ export default { batchInput: '批量输入', quickCommand: '快速命令', groupDeleteHelper: '移除组后,组内所有连接将迁移到 default 组内,是否确认', - quickCmd: '快捷命令', command: '命令', addHost: '添加主机', localhost: '本地服务器', diff --git a/frontend/src/views/container/compose/create/index.vue b/frontend/src/views/container/compose/create/index.vue index 4620fd60b..202377d51 100644 --- a/frontend/src/views/container/compose/create/index.vue +++ b/frontend/src/views/container/compose/create/index.vue @@ -1,59 +1,66 @@