From 31cd6691c91ba9ba482815a58ce444ee441a8f8f Mon Sep 17 00:00:00 2001
From: ssongliu <73214554+ssongliu@users.noreply.github.com>
Date: Tue, 5 Sep 2023 22:04:11 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=B9=E5=99=A8=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E8=A1=8C=E6=95=B0=E5=A2=9E=E5=8A=A0=E6=89=80=E6=9C=89=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9=20(#2191)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Refs #2143
---
 backend/app/service/container.go              |  2 +-
 .../src/components/container-log/index.vue    | 32 ++++++++++----
 frontend/src/lang/modules/en.ts               |  2 +
 frontend/src/lang/modules/tw.ts               |  2 +
 frontend/src/lang/modules/zh.ts               |  2 +
 .../views/container/container/log/index.vue   | 43 +++++++++++++------
 6 files changed, 61 insertions(+), 22 deletions(-)

diff --git a/backend/app/service/container.go b/backend/app/service/container.go
index f2ff47108..7767385ec 100644
--- a/backend/app/service/container.go
+++ b/backend/app/service/container.go
@@ -567,7 +567,7 @@ func (u *ContainerService) ContainerLogs(wsConn *websocket.Conn, container, sinc
 	}
 	command := fmt.Sprintf("docker logs %s", container)
 	if tail != "0" {
-		command += " -n " + tail
+		command += " --tail " + tail
 	}
 	if since != "all" {
 		command += " --since " + since
diff --git a/frontend/src/components/container-log/index.vue b/frontend/src/components/container-log/index.vue
index 3ccd7532e..1afc4b1a9 100644
--- a/frontend/src/components/container-log/index.vue
+++ b/frontend/src/components/container-log/index.vue
@@ -1,15 +1,18 @@
 <template>
     <div>
         <div style="display: flex; flex-wrap: wrap">
-            <el-select @change="searchLogs" v-model="logSearch.mode" style="width: 150px">
+            <el-select @change="searchLogs" v-model="logSearch.mode" class="selectWidth">
                 <template #prefix>{{ $t('container.fetch') }}</template>
                 <el-option v-for="item in timeOptions" :key="item.label" :value="item.value" :label="item.label" />
             </el-select>
-            <el-input @change="searchLogs" class="margin-button" style="width: 100px" v-model.number="logSearch.tail">
-                <template #prefix>
-                    <div style="margin-left: 2px">{{ $t('container.lines') }}</div>
-                </template>
-            </el-input>
+            <el-select @change="searchLogs" class="margin-button selectWidth" v-model.number="logSearch.tail">
+                <template #prefix>{{ $t('container.lines') }}</template>
+                <el-option :value="0" :label="$t('commons.table.all')" />
+                <el-option :value="100" :label="100" />
+                <el-option :value="200" :label="200" />
+                <el-option :value="500" :label="500" />
+                <el-option :value="1000" :label="1000" />
+            </el-select>
             <div class="margin-button">
                 <el-checkbox border @change="searchLogs" v-model="logSearch.isWatch">
                     {{ $t('commons.button.watch') }}
@@ -89,7 +92,7 @@ const timeOptions = ref([
 ]);
 
 const searchLogs = async () => {
-    if (!Number(logSearch.tail) || Number(logSearch.tail) < 0) {
+    if (Number(logSearch.tail) < 0) {
         MsgError(i18n.global.t('container.linesHelper'));
         return;
     }
@@ -112,7 +115,17 @@ const searchLogs = async () => {
 };
 
 const onDownload = async () => {
-    downloadWithContent(logInfo.value, logSearch.container + '-' + dateFormatForName(new Date()) + '.log');
+    let msg =
+        logSearch.tail === 0
+            ? i18n.global.t('container.downLogHelper1', [logSearch.container])
+            : i18n.global.t('container.downLogHelper2', [logSearch.container, logSearch.tail]);
+    ElMessageBox.confirm(msg, i18n.global.t('file.download'), {
+        confirmButtonText: i18n.global.t('commons.button.confirm'),
+        cancelButtonText: i18n.global.t('commons.button.cancel'),
+        type: 'info',
+    }).then(async () => {
+        downloadWithContent(logInfo.value, logSearch.container + '-' + dateFormatForName(new Date()) + '.log');
+    });
 };
 
 interface DialogProps {
@@ -154,4 +167,7 @@ defineExpose({
 .margin-button {
     margin-left: 20px;
 }
+.selectWidth {
+    width: 150px;
+}
 </style>
diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts
index 2354c4958..16f277cae 100644
--- a/frontend/src/lang/modules/en.ts
+++ b/frontend/src/lang/modules/en.ts
@@ -510,6 +510,8 @@ const message = {
         lastHour: 'Last Hour',
         last10Min: 'Last 10 Minutes',
         cleanLog: 'Clean log',
+        downLogHelper1: 'Are you sure you want to download all logs for container {0}?',
+        downLogHelper2: 'Are you sure you want to download the recent {1} logs for container {0}?',
         cleanLogHelper:
             'Clearing logs requires restarting the container, and this operation cannot be rolled back. Do you want to continue?',
         newName: 'New name',
diff --git a/frontend/src/lang/modules/tw.ts b/frontend/src/lang/modules/tw.ts
index 8b1abced4..e0b84328d 100644
--- a/frontend/src/lang/modules/tw.ts
+++ b/frontend/src/lang/modules/tw.ts
@@ -497,6 +497,8 @@ const message = {
         lastHour: '最近 1 小時',
         last10Min: '最近 10 分鐘',
         cleanLog: '清空日誌',
+        downLogHelper1: '即將下載 {0} 容器所有日誌，是否繼續？',
+        downLogHelper2: '即將下載 {0} 容器最近 {1} 條日誌，是否繼續？',
         cleanLogHelper: '清空日誌需要重啟容器，該操作無法回滾，是否繼續？',
         newName: '新名稱',
         source: '資源使用率',
diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts
index 8b6b272bd..38ed96137 100644
--- a/frontend/src/lang/modules/zh.ts
+++ b/frontend/src/lang/modules/zh.ts
@@ -497,6 +497,8 @@ const message = {
         lastHour: '最近 1 小时',
         last10Min: '最近 10 分钟',
         cleanLog: '清空日志',
+        downLogHelper1: '即将下载 {0} 容器所有日志，是否继续？',
+        downLogHelper2: '即将下载 {0} 容器最近 {1} 条日志，是否继续？',
         cleanLogHelper: '清空日志需要重启容器，该操作无法回滚，是否继续？',
         newName: '新名称',
         source: '资源使用率',
diff --git a/frontend/src/views/container/container/log/index.vue b/frontend/src/views/container/container/log/index.vue
index be988362a..7be13d7cf 100644
--- a/frontend/src/views/container/container/log/index.vue
+++ b/frontend/src/views/container/container/log/index.vue
@@ -14,20 +14,18 @@
                 </DrawerHeader>
             </template>
             <div>
-                <el-select @change="searchLogs" style="width: 30%; float: left" v-model="logSearch.mode">
+                <el-select @change="searchLogs" class="fetchClass" v-model="logSearch.mode">
                     <template #prefix>{{ $t('container.fetch') }}</template>
                     <el-option v-for="item in timeOptions" :key="item.label" :value="item.value" :label="item.label" />
                 </el-select>
-                <el-input
-                    @change="searchLogs"
-                    class="margin-button"
-                    style="width: 20%; float: left"
-                    v-model.number="logSearch.tail"
-                >
-                    <template #prefix>
-                        <div style="margin-left: 2px">{{ $t('container.lines') }}</div>
-                    </template>
-                </el-input>
+                <el-select @change="searchLogs" class="tailClass" v-model.number="logSearch.tail">
+                    <template #prefix>{{ $t('container.lines') }}</template>
+                    <el-option :value="0" :label="$t('commons.table.all')" />
+                    <el-option :value="100" :label="100" />
+                    <el-option :value="200" :label="200" />
+                    <el-option :value="500" :label="500" />
+                    <el-option :value="1000" :label="1000" />
+                </el-select>
                 <div class="margin-button" style="float: left">
                     <el-checkbox border @change="searchLogs" v-model="logSearch.isWatch">
                         {{ $t('commons.button.watch') }}
@@ -134,7 +132,7 @@ watch(logVisiable, (val) => {
     if (screenfull.isEnabled && !val && !mobile.value) screenfull.exit();
 });
 const searchLogs = async () => {
-    if (!Number(logSearch.tail) || Number(logSearch.tail) < 0) {
+    if (Number(logSearch.tail) < 0) {
         MsgError(i18n.global.t('container.linesHelper'));
         return;
     }
@@ -157,7 +155,17 @@ const searchLogs = async () => {
 };
 
 const onDownload = async () => {
-    downloadWithContent(logInfo.value, logSearch.container + '-' + dateFormatForName(new Date()) + '.log');
+    let msg =
+        logSearch.tail === 0
+            ? i18n.global.t('container.downLogHelper1', [logSearch.container])
+            : i18n.global.t('container.downLogHelper2', [logSearch.container, logSearch.tail]);
+    ElMessageBox.confirm(msg, i18n.global.t('file.download'), {
+        confirmButtonText: i18n.global.t('commons.button.confirm'),
+        cancelButtonText: i18n.global.t('commons.button.cancel'),
+        type: 'info',
+    }).then(async () => {
+        downloadWithContent(logInfo.value, logSearch.container + '-' + dateFormatForName(new Date()) + '.log');
+    });
 };
 
 const onClean = async () => {
@@ -209,4 +217,13 @@ defineExpose({
 .fullScreen {
     border: none;
 }
+.tailClass {
+    width: 20%;
+    float: left;
+    margin-left: 20px;
+}
+.fetchClass {
+    width: 30%;
+    float: left;
+}
 </style>