From eb9b588d885071a59896b0bce8ab173b8f87da13 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Wed, 20 Mar 2024 14:56:16 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E9=9B=86):=20=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=9B=86=E9=A2=84=E8=A7=88=E6=97=B6=EF=BC=8C=E5=BD=93?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=9C=A8loading=E6=97=B6=EF=BC=8C=E5=8F=AA?=
 =?UTF-8?q?=E5=9C=A8=E5=B1=80=E9=83=A8=E6=98=BE=E7=A4=BAloading=EF=BC=8C?=
 =?UTF-8?q?=E5=85=B6=E4=BB=96=E5=8C=BA=E5=9F=9F=E6=AF=94=E5=A6=82=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=EF=BC=8C=E5=8F=AF=E4=BB=A5=E6=AD=A3=E5=B8=B8=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/frontend/src/views/dataset/data/ViewTable.vue | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/core/frontend/src/views/dataset/data/ViewTable.vue b/core/frontend/src/views/dataset/data/ViewTable.vue
index f818a8a2b0..2b4c88d11f 100644
--- a/core/frontend/src/views/dataset/data/ViewTable.vue
+++ b/core/frontend/src/views/dataset/data/ViewTable.vue
@@ -114,6 +114,7 @@
         name="dataPreview"
       >
         <tab-data-preview
+          v-loading="tableLoading"
           :param="param"
           :table="table"
           :fields="fields"
@@ -286,6 +287,7 @@ export default {
       table: {
         name: ''
       },
+      tableLoading: false,
       fields: [],
       exportDatasetLoading: false,
       filedList: [],
@@ -376,6 +378,7 @@ export default {
         post('/dataset/table/getWithPermission/' + id, null)
           .then((response) => {
             this.table = response.data
+            this.$cancelRequest('/dataset/table/getPreviewData/**')
             this.initPreviewData(this.page)
           })
           .catch((res) => {
@@ -386,11 +389,12 @@ export default {
 
     initPreviewData(page) {
       if (this.table.id) {
+        this.tableLoading = true
         this.table.row = this.tableViewRowForm.row
         post(
           '/dataset/table/getPreviewData/' + page.page + '/' + page.pageSize,
           this.table,
-          true,
+          false,
           30000
         )
           .then((response) => {
@@ -408,6 +412,7 @@ export default {
               this.previewDataSuccess = false
             }
             this.lastRequestComplete = true
+            this.tableLoading = false
           })
           .catch((response) => {
             this.lastRequestComplete = true
@@ -419,6 +424,10 @@ export default {
               show: 0
             }
             this.previewDataSuccess = false
+            if(this.$currentHttpRequestList.some((item, key) => {
+              return key.indexOf('dataset/table/getPreviewData') > -1
+            })) return
+            this.tableLoading = false
           })
       }
     },