From f65f8f2df5ee5c7b41459f19b643d4b7d63fc1e5 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Fri, 1 Mar 2024 17:34:33 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A8=E6=A0=BC=E7=B1=BB=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E6=94=BE=E5=A4=A7=E6=98=BE=E7=A4=BA=E5=AD=97=E4=BD=93=E7=AD=89?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=B8=8E=E6=98=8E=E7=BB=86=E6=94=BE=E5=A4=A7?=
 =?UTF-8?q?=E4=BF=9D=E6=8C=81=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canvas/components/editor/Preview.vue      | 28 ++++++++++++-------
 .../canvas/customComponent/UserView.vue       |  4 +--
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/core/frontend/src/components/canvas/components/editor/Preview.vue b/core/frontend/src/components/canvas/components/editor/Preview.vue
index b9cda64c1a..3501333161 100644
--- a/core/frontend/src/components/canvas/components/editor/Preview.vue
+++ b/core/frontend/src/components/canvas/components/editor/Preview.vue
@@ -508,24 +508,25 @@ export default {
       },
       deep: true
     },
+    mainHeight: {
+      handler(newVal, oldVla) {
+        this.$nextTick(() => {
+          this.reloadWatermark()
+        })
+      },
+      deep: true
+    },
     canvasInfoTempStyle: {
       handler(newVal, oldVla) {
-        const _this = this
-        _this.$nextTick(() => {
-          if (_this.screenShotStatues) {
-            _this.initWatermark('preview-temp-canvas-main')
-          } else {
-            _this.initWatermark()
-          }
+        this.$nextTick(() => {
+          this.reloadWatermark()
         })
       },
       deep: true
     },
     screenShotStatues: {
       handler(newVal, oldVla) {
-        if (this.screenShotStatues) {
-          this.initWatermark('preview-temp-canvas-main')
-        }
+        this.reloadWatermark()
       }
     }
   },
@@ -564,6 +565,13 @@ export default {
     bus.$off('trigger-reset-button', this.triggerResetButton)
   },
   methods: {
+    reloadWatermark() {
+      if (this.screenShotStatues) {
+        this.initWatermark('preview-temp-canvas-main')
+      } else {
+        this.initWatermark()
+      }
+    },
     filterLoaded(p) {
       buildAfterFilterLoaded(this.filterMap, p)
       this.filterMapCache = {}
diff --git a/core/frontend/src/components/canvas/customComponent/UserView.vue b/core/frontend/src/components/canvas/customComponent/UserView.vue
index c522a3565e..16dcf2f8fe 100644
--- a/core/frontend/src/components/canvas/customComponent/UserView.vue
+++ b/core/frontend/src/components/canvas/customComponent/UserView.vue
@@ -1111,9 +1111,9 @@ export default {
         tableChart.customAttr.color.tableFontColor = '#7c7e81'
         tableChart.customAttr.color.enableTableCrossBG = false
         tableChart.customAttr.size.showTableHeader = true
-        tableChart.customAttr.size.tableTitleFontSize = 14
-        tableChart.customAttr.size.tableItemFontSize = 14
       }
+      tableChart.customAttr.size.tableTitleFontSize = 14
+      tableChart.customAttr.size.tableItemFontSize = 14
       tableChart.customAttr.size.tableColumnFreezeHead = 0
       tableChart.customAttr.size.tableRowFreezeHead = 0
       tableChart.customAttr.color.tableStripe = true