From 008c369a9b1aced26b74b32e6c85541d00fd0511 Mon Sep 17 00:00:00 2001
From: zhengkunwang <31820853+zhengkunwang223@users.noreply.github.com>
Date: Thu, 26 Dec 2024 10:18:47 +0800
Subject: [PATCH] feat(task): fix Issue Where Task Logs Continue Periodic
 Requests After Being Opened (#7567)

---
 core/constant/common.go                    |  9 +++++----
 frontend/src/api/modules/log.ts            |  2 +-
 frontend/src/components/log-file/index.vue | 23 ++++++++++------------
 frontend/src/components/task-log/index.vue |  5 +++++
 4 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/core/constant/common.go b/core/constant/common.go
index 19154d166..31994d0ad 100644
--- a/core/constant/common.go
+++ b/core/constant/common.go
@@ -45,7 +45,7 @@ var WebUrlMap = map[string]struct{}{
 	"/apps/all":       {},
 	"/apps/installed": {},
 	"/apps/upgrade":   {},
-	"apps/setting":    {},
+	"/apps/setting":   {},
 
 	"/containers":           {},
 	"/containers/container": {},
@@ -56,7 +56,7 @@ var WebUrlMap = map[string]struct{}{
 	"/containers/compose":   {},
 	"/containers/template":  {},
 	"/containers/setting":   {},
-	"containers/dashboard":  {},
+	"/containers/dashboard": {},
 
 	"/cronjobs": {},
 
@@ -88,6 +88,7 @@ var WebUrlMap = map[string]struct{}{
 	"/logs/website":   {},
 	"/logs/system":    {},
 	"/logs/ssh":       {},
+	"/logs/task":      {},
 
 	"/settings":               {},
 	"/settings/panel":         {},
@@ -134,8 +135,8 @@ var WebUrlMap = map[string]struct{}{
 	"/xpack/alert/log":         {},
 	"/xpack/alert/setting":     {},
 	"/xpack/setting":           {},
-	"xpack/node":               {},
-	"xpack/waf/stat":           {},
+	"/xpack/node":              {},
+	"/xpack/waf/stat":          {},
 }
 
 var DynamicRoutes = []string{
diff --git a/frontend/src/api/modules/log.ts b/frontend/src/api/modules/log.ts
index 5ba843a69..cd7808097 100644
--- a/frontend/src/api/modules/log.ts
+++ b/frontend/src/api/modules/log.ts
@@ -26,5 +26,5 @@ export const searchTasks = (req: Log.SearchTaskReq) => {
 };
 
 export const countExecutingTask = () => {
-    return http.get<number>(`/tasks/executing/count`);
+    return http.get<number>(`/logs/tasks/executing/count`);
 };
diff --git a/frontend/src/components/log-file/index.vue b/frontend/src/components/log-file/index.vue
index 45e13ea65..e4b3254e0 100644
--- a/frontend/src/components/log-file/index.vue
+++ b/frontend/src/components/log-file/index.vue
@@ -1,5 +1,5 @@
 <template>
-    <div v-loading="isLoading">
+    <div v-loading="initLog && isLoading">
         <div v-if="defaultButton">
             <el-checkbox border v-model="tailLog" class="float-left" @change="changeTail(false)">
                 {{ $t('commons.button.watch') }}
@@ -94,6 +94,7 @@ const maxPage = ref(0);
 const minPage = ref(0);
 let timer: NodeJS.Timer | null = null;
 const logPath = ref('');
+const initLog = ref(false);
 
 const firstLoading = ref(false);
 const logs = ref<string[]>([]);
@@ -213,6 +214,7 @@ const getContent = async (pre: boolean) => {
         }
 
         nextTick(() => {
+            console.log('pre', pre);
             if (pre) {
                 logContainer.value.scrollTop = 2000;
             } else {
@@ -249,10 +251,14 @@ const getContent = async (pre: boolean) => {
 
 const onCloseLog = async () => {
     tailLog.value = false;
-    clearInterval(Number(timer));
+    if (timer) {
+        clearInterval(Number(timer));
+        timer = null;
+    }
     timer = null;
     isLoading.value = false;
     emit('update:isReading', false);
+    initLog.value = false;
 };
 
 watch(
@@ -263,6 +269,7 @@ watch(
 );
 
 const init = async () => {
+    initLog.value = true;
     if (props.config.tail) {
         tailLog.value = props.config.tail;
     } else {
@@ -287,20 +294,10 @@ onMounted(async () => {
 });
 
 onUnmounted(() => {
+    console.log('onUnmounted');
     onCloseLog();
 });
 
-onMounted(async () => {
-    firstLoading.value = true;
-    await init();
-    nextTick(() => {
-        if (logContainer.value) {
-            logContainer.value.scrollTop = totalHeight.value;
-            containerHeight.value = logContainer.value.getBoundingClientRect().height;
-        }
-    });
-});
-
 defineExpose({ changeTail, onDownload, clearLog });
 </script>
 <style lang="scss" scoped>
diff --git a/frontend/src/components/task-log/index.vue b/frontend/src/components/task-log/index.vue
index 0ec28f348..a758a76c0 100644
--- a/frontend/src/components/task-log/index.vue
+++ b/frontend/src/components/task-log/index.vue
@@ -25,6 +25,10 @@ defineProps({
         type: String,
         default: '30%',
     },
+    tail: {
+        type: Boolean,
+        default: true,
+    },
 });
 
 const config = reactive({
@@ -33,6 +37,7 @@ const config = reactive({
     taskOperate: '',
     resourceID: 0,
     taskType: '',
+    tail: true,
 });
 const open = ref(false);