From e290b4a489bf29940656d57a687ac00a503281d6 Mon Sep 17 00:00:00 2001
From: wisonic-s <shaochuan.wu@fit2cloud.com>
Date: Wed, 15 Nov 2023 21:10:32 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20echarts=E8=A1=A8=E6=A0=BC=E9=9A=90?=
 =?UTF-8?q?=E8=97=8F=E8=A1=A8=E5=A4=B4=E5=90=8C=E6=97=B6=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canvas/customComponent/UserView.vue       |  1 -
 .../chart/components/table/TableNormal.vue    | 33 +++++++++----------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/core/frontend/src/components/canvas/customComponent/UserView.vue b/core/frontend/src/components/canvas/customComponent/UserView.vue
index 1696f01aed..37965f1b64 100644
--- a/core/frontend/src/components/canvas/customComponent/UserView.vue
+++ b/core/frontend/src/components/canvas/customComponent/UserView.vue
@@ -108,7 +108,6 @@
     <table-normal
       v-else-if="tableShowFlag"
       :ref="element.propValue.id"
-      :show-summary="chart.type === 'table-normal'"
       :chart="chart"
       :track-menu="trackMenu"
       class="table-class"
diff --git a/core/frontend/src/views/chart/components/table/TableNormal.vue b/core/frontend/src/views/chart/components/table/TableNormal.vue
index f64a96ab6d..c0518b44ec 100644
--- a/core/frontend/src/views/chart/components/table/TableNormal.vue
+++ b/core/frontend/src/views/chart/components/table/TableNormal.vue
@@ -123,11 +123,6 @@ export default {
         return {}
       }
     },
-    showSummary: {
-      type: Boolean,
-      required: false,
-      default: true
-    },
     enableScroll: {
       type: Boolean,
       required: false,
@@ -214,7 +209,8 @@ export default {
         left: '0px',
         top: '0px'
       },
-      pointParam: null
+      pointParam: null,
+      showSummary: true
     }
   },
   computed: {
@@ -362,8 +358,7 @@ export default {
         })
       }
 
-      this.$refs.plxTable.reloadData(data)
-      this.$nextTick(() => {
+      this.$refs.plxTable.reloadData(data).then(() => {
         this.initStyle()
       })
       window.addEventListener('resize', this.calcHeightDelay)
@@ -455,8 +450,10 @@ export default {
           }
           if (customAttr.size.showTableHeader === false) {
             this.showHeader = false
+            this.showSummary = false
           } else {
             this.showHeader = true
+            this.showSummary = this.chart.type === 'table-normal'
           }
 
           const autoBreakLine = customAttr.size.tableAutoBreakLine ? customAttr.size.tableAutoBreakLine : DEFAULT_SIZE.tableAutoBreakLine
@@ -503,16 +500,18 @@ export default {
       }
       // 修改footer合计样式
       const table = document.getElementsByClassName(this.chart.id)
-      for (let i = 0; i < table.length; i++) {
-        const s_table = table[i].getElementsByClassName('elx-table--footer')
-        let s = ''
-        for (const i in this.table_header_class) {
-          s += (i === 'fontSize' ? 'font-size' : i) + ':' + this.table_header_class[i] + ';'
+      this.$refs.plxTable.updateFooter().then(() => {
+        for (let i = 0; i < table.length; i++) {
+          const s_table = table[i].getElementsByClassName('elx-table--footer')
+          let s = ''
+          for (const i in this.table_header_class) {
+            s += (i === 'fontSize' ? 'font-size' : i) + ':' + this.table_header_class[i] + ';'
+          }
+          for (let i = 0; i < s_table.length; i++) {
+            s_table[i].setAttribute('style', s)
+          }
         }
-        for (let i = 0; i < s_table.length; i++) {
-          s_table[i].setAttribute('style', s)
-        }
-      }
+      })
     },
     getRowStyle({ row, rowIndex }) {
       if (rowIndex % 2 !== 0) {