From e7f4ff1f7a2744b098f0f0cc60d6c44264ea880f Mon Sep 17 00:00:00 2001
From: Yonghao Mei <73584269+mayinrain@users.noreply.github.com>
Date: Mon, 23 Dec 2024 15:49:11 +0800
Subject: [PATCH] Dev 1.10.0 webank (#689)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore: 1.9.0

* feat: 1.10.0

* fix

* upd: 新增loading展示
---
 .../globalHistoryManagement/viewHistory.vue   |  5 ++++-
 .../src/components/consoleComponent/term.vue  | 22 ++++++++++++++-----
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/linkis-web/src/apps/linkis/module/globalHistoryManagement/viewHistory.vue b/linkis-web/src/apps/linkis/module/globalHistoryManagement/viewHistory.vue
index 83e62d0002..2f65033523 100644
--- a/linkis-web/src/apps/linkis/module/globalHistoryManagement/viewHistory.vue
+++ b/linkis-web/src/apps/linkis/module/globalHistoryManagement/viewHistory.vue
@@ -49,7 +49,7 @@
       :visualParams="visualParams"
     />
     <ViewLog ref="logPanel" :inHistory="true" v-show="tabName === 'engineLog' && hasEngine" @back="showviewlog = false" />
-    <term ref="termRef" v-if="tabName === 'terminal'" :logs="termLogs" :script-view-state="scriptViewState" />
+    <term ref="termRef" v-if="tabName === 'terminal'" :logs="termLogs" :script-view-state="scriptViewState" :loading="termLogLoading" />
   </div>
 </template>
 <script>
@@ -109,6 +109,7 @@ export default {
       },
       codes: { code: '' },
       termLogs: '',
+      termLogLoading: false,
       engineLogs: '',
       fromLine: 1,
       isAdminModel: false,
@@ -211,7 +212,9 @@ export default {
       } else if(name === 'terminal') {
         if (['Scheduled', 'Running'].includes(this.$route.query.status) || !this.termLogs) {
           try {
+            this.termLogLoading = true;
             const res = await api.fetch(`/jobhistory/diagnosis-query?taskID=${this.$route.query.taskID}`, 'get')
+            this.termLogLoading = false;
             const { diagnosisMsg } = res;
             this.termLogs = diagnosisMsg;
           } catch (err) {
diff --git a/linkis-web/src/components/consoleComponent/term.vue b/linkis-web/src/components/consoleComponent/term.vue
index e7d05bc93c..6f1ada6e26 100644
--- a/linkis-web/src/components/consoleComponent/term.vue
+++ b/linkis-web/src/components/consoleComponent/term.vue
@@ -15,11 +15,19 @@
   ~ limitations under the License.
   -->
 <template>
-  <div 
-    ref="terminal" 
-    class="terminal-container"
-    :style="{ height: terminalHeight + 'px' }"
-  ></div>
+  <div>
+    <div
+      ref="terminal" 
+      class="terminal-container"
+      :style="{ height: terminalHeight + 'px' }"
+    >
+      <Spin
+        v-show="loading"
+        size="large"
+        fix/>
+    </div>
+  </div>
+  
 </template>
 
 <script>
@@ -39,6 +47,10 @@ export default {
       default: () => {
         return {};
       },
+    },
+    loading: {
+      type: Boolean,
+      default: false
     }
   },