[17025][ui] optimize queryLog to avoid infinite recursive

Author: taochaoquan-bosch

dolphinscheduler-ui/src/views/projects/task/instance/batch-task.tsx

@@ -46,8 +46,6 @@ import totalCount from '@/utils/tableTotalCount'
 const BatchTaskInstance = defineComponent({
   name: 'task-instance',
   setup() {
-    const uiSettingStore = useUISettingStore()
-    const logTimer = uiSettingStore.getLogTimer
     const { t, variables, getTableData, createColumns } = useTable()
 
     const requestTableData = () => {
@@ -114,9 +112,7 @@ const BatchTaskInstance = defineComponent({
       variables.showModalRef = false
     }
 
-    let getLogsID: number
-
-    const getLogs = (row: any, logTimer: number) => {
+    const getLogs = (row: any) => {
       const { state } = useAsyncState(
         queryLog({
           taskInstanceId: Number(row.id),
@@ -125,23 +121,10 @@ const BatchTaskInstance = defineComponent({
         }).then((res: any) => {
           variables.logRef += res.message || ''
           if (res && res.message !== '') {
-            variables.limit += 1000
             variables.skipLineNum += res.lineNum
-            getLogs(row, logTimer)
+            getLogs(row)
           } else {
             variables.logLoadingRef = false
-            if (logTimer !== 0) {
-              if (typeof getLogsID === 'number') {
-                clearTimeout(getLogsID)
-              }
-              getLogsID = setTimeout(() => {
-                variables.logRef = ''
-                variables.limit = 1000
-                variables.skipLineNum = 0
-                variables.logLoadingRef = true
-                getLogs(row, logTimer)
-              }, logTimer * 1000)
-            }
           }
         }),
         {}
@@ -154,7 +137,7 @@ const BatchTaskInstance = defineComponent({
       variables.logRef = ''
       variables.limit = 1000
       variables.skipLineNum = 0
-      getLogs(row, logTimer)
+      getLogs(row)
     }
 
     const trim = getCurrentInstance()?.appContext.config.globalProperties.trim
@@ -172,7 +155,7 @@ const BatchTaskInstance = defineComponent({
       () => variables.showModalRef,
       () => {
         if (variables.showModalRef) {
-          getLogs(variables.row, logTimer)
+          getLogs(variables.row)
         } else {
           variables.row = {}
           variables.logRef = ''

dolphinscheduler-ui/src/views/projects/task/instance/stream-task.tsx

@@ -48,8 +48,6 @@ const BatchTaskInstance = defineComponent({
   name: 'task-instance',
   setup() {
     let setIntervalP: number
-    const uiSettingStore = useUISettingStore()
-    const logTimer = uiSettingStore.getLogTimer
     const { t, variables, getTableData, createColumns } = useTable()
 
     const onUpdatePageSize = () => {
@@ -96,7 +94,7 @@ const BatchTaskInstance = defineComponent({
       variables.showModalRef = false
     }
 
-    const getLogs = (row: any, logTimer: number) => {
+    const getLogs = (row: any) => {
       const { state } = useAsyncState(
         queryLog({
           taskInstanceId: Number(row.id),
@@ -105,18 +103,10 @@ const BatchTaskInstance = defineComponent({
         }).then((res: any) => {
           variables.logRef += res.message || ''
           if (res && res.message !== '') {
-            variables.limit += 1000
             variables.skipLineNum += res.lineNum
-            getLogs(row, logTimer)
+            getLogs(row)
           } else {
             variables.logLoadingRef = false
-            setTimeout(() => {
-              variables.logRef = ''
-              variables.limit = 1000
-              variables.skipLineNum = 0
-              variables.logLoadingRef = true
-              getLogs(row, logTimer)
-            }, logTimer * 1000)
           }
         }),
         {}
@@ -129,7 +119,7 @@ const BatchTaskInstance = defineComponent({
       variables.logRef = ''
       variables.limit = 1000
       variables.skipLineNum = 0
-      getLogs(row, logTimer)
+      getLogs(row)
     }
 
     const trim = getCurrentInstance()?.appContext.config.globalProperties.trim
@@ -154,7 +144,7 @@ const BatchTaskInstance = defineComponent({
       () => variables.showModalRef,
       () => {
         if (variables.showModalRef) {
-          getLogs(variables.row, logTimer)
+          getLogs(variables.row)
         } else {
           variables.row = {}
           variables.logRef = ''

dolphinscheduler-ui/src/views/projects/workflow/components/dag/index.tsx

@@ -88,9 +88,6 @@ export default defineComponent({
     const route = useRoute()
     const theme = useThemeStore()
 
-    const uiSettingStore = useUISettingStore()
-    const logTimer = uiSettingStore.getLogTimer
-
     // Whether the graph can be operated
     provide('readonly', toRef(props, 'readonly'))
 
@@ -246,12 +243,10 @@ export default defineComponent({
       taskModalVisible.value = false
       viewLog(taskId, taskType)
 
-      getLogs(logTimer)
+      getLogs()
     }
 
-    let getLogsID: number
-
-    const getLogs = (logTimer: number) => {
+    const getLogs = () => {
       const { state } = useAsyncState(
         queryLog({
           taskInstanceId: nodeVariables.logTaskId,
@@ -260,21 +255,10 @@ export default defineComponent({
         }).then((res: any) => {
           nodeVariables.logRef += res.message || ''
           if (res && res.message !== '') {
-            nodeVariables.limit += 1000
             nodeVariables.skipLineNum += res.lineNum
-            getLogs(logTimer)
+            getLogs()
           } else {
             nodeVariables.logLoadingRef = false
-            if (logTimer !== 0) {
-              if (typeof getLogsID === 'number') {
-                clearTimeout(getLogsID)
-              }
-              getLogsID = setTimeout(() => {
-                nodeVariables.limit += 1000
-                nodeVariables.skipLineNum += 1000
-                getLogs(logTimer)
-              }, logTimer * 1000)
-            }
           }
         }),
         {}
@@ -283,11 +267,11 @@ export default defineComponent({
       return state
     }
 
-    const refreshLogs = (logTimer: number) => {
+    const refreshLogs = () => {
       nodeVariables.logRef = ''
       nodeVariables.limit = 1000
       nodeVariables.skipLineNum = 0
-      getLogs(logTimer)
+      getLogs()
     }
 
     const handleExecuteTask = (