From d7143d1bc718e4a92742d65d9ea6dad503f4491b Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Wed, 29 Jun 2022 10:43:18 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=86=E5=9B=BE=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E6=BB=9A=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canvas/custom-component/UserViewDialog.vue   |  2 +-
 .../views/chart/components/table/TableNormal.vue | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/frontend/src/components/canvas/custom-component/UserViewDialog.vue b/frontend/src/components/canvas/custom-component/UserViewDialog.vue
index 1352335832..ec0c4557d6 100644
--- a/frontend/src/components/canvas/custom-component/UserViewDialog.vue
+++ b/frontend/src/components/canvas/custom-component/UserViewDialog.vue
@@ -19,7 +19,7 @@
       </div>
     </de-main-container>
     <de-main-container v-show="!showChartCanvas">
-      <table-normal :chart="chartTable" :show-summary="false" class="table-class" />
+      <table-normal :enable-scroll="false" :chart="chartTable" :show-summary="false" class="table-class" />
     </de-main-container>
   </de-container>
 </template>
diff --git a/frontend/src/views/chart/components/table/TableNormal.vue b/frontend/src/views/chart/components/table/TableNormal.vue
index a675b1833d..149773d2b3 100644
--- a/frontend/src/views/chart/components/table/TableNormal.vue
+++ b/frontend/src/views/chart/components/table/TableNormal.vue
@@ -24,8 +24,7 @@
           sortable
           :title="field.name"
           :width="columnWidth"
-        >
-        </ux-table-column>
+        />
       </ux-grid>
 
       <el-row v-show="showPage" class="table-page">
@@ -74,6 +73,11 @@ export default {
       type: Boolean,
       required: false,
       default: true
+    },
+    enableScroll: {
+      type: Boolean,
+      required: false,
+      default: true
     }
   },
   data() {
@@ -230,9 +234,11 @@ export default {
             this.height = 'auto'
           }
 
-          this.$nextTick(() => {
-            this.initScroll()
-          })
+          if (this.enableScroll) {
+            this.$nextTick(() => {
+              this.initScroll()
+            })
+          }
         }
       })
     },