From cf14fa53138e732e63ce10cecde76dd69b6f2662 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Thu, 29 Feb 2024 18:49:58 +0800
Subject: [PATCH] =?UTF-8?q?style(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20=E4=BB=AA?=
 =?UTF-8?q?=E8=A1=A8=E6=9D=BF=E9=A2=84=E8=A7=88=E6=A0=B7=E5=BC=8F=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/canvas/components/editor/Preview.vue      | 1 -
 .../src/components/canvas/customComponent/UserViewDialog.vue | 5 +++--
 core/frontend/src/components/canvas/tools/watermark.js       | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/core/frontend/src/components/canvas/components/editor/Preview.vue b/core/frontend/src/components/canvas/components/editor/Preview.vue
index c5a38a57cf..ae52caad24 100644
--- a/core/frontend/src/components/canvas/components/editor/Preview.vue
+++ b/core/frontend/src/components/canvas/components/editor/Preview.vue
@@ -865,7 +865,6 @@ export default {
     canvasScroll() {
       // 当滚动距离超过 100px 时显示返回顶部按钮，否则隐藏按钮
       this.backToTopBtnShow = this.$refs[this.previewOutRefId].scrollTop > 200
-      console.log('top=' + this.$refs[this.previewOutRefId].scrollTop + ';this.backToTopBtnShow=' + this.backToTopBtnShow)
       bus.$emit('onScroll')
     },
     initListen() {
diff --git a/core/frontend/src/components/canvas/customComponent/UserViewDialog.vue b/core/frontend/src/components/canvas/customComponent/UserViewDialog.vue
index 96a55972aa..d1c9eeddc2 100644
--- a/core/frontend/src/components/canvas/customComponent/UserViewDialog.vue
+++ b/core/frontend/src/components/canvas/customComponent/UserViewDialog.vue
@@ -4,7 +4,7 @@
     :class="isAbsoluteContainer ? 'abs-container' : ''"
   >
     <de-main-container
-      v-show="showChartCanvas"
+      v-if="showChartCanvas"
       v-loading="exportLoading"
       style="overflow: hidden"
       :element-loading-text="$t('panel.data_loading')"
@@ -70,8 +70,9 @@
         </div>
       </div>
     </de-main-container>
-    <de-main-container v-show="!showChartCanvas">
+    <de-main-container v-else>
       <table-normal
+        id="chartCanvas"
         :enable-scroll="false"
         :chart="chartTable"
         :show-summary="false"
diff --git a/core/frontend/src/components/canvas/tools/watermark.js b/core/frontend/src/components/canvas/tools/watermark.js
index ac9ceeb1e1..ede7b1129d 100644
--- a/core/frontend/src/components/canvas/tools/watermark.js
+++ b/core/frontend/src/components/canvas/tools/watermark.js
@@ -47,7 +47,6 @@ export function watermark(settings, domId, watermarkDomId = 'de-watermark-server
   defaultSettings.watermark_rows = parseInt((defaultSettings.watermark_y_space + page_height - defaultSettings.watermark_y) / (defaultSettings.watermark_height + defaultSettings.watermark_y_space))
   defaultSettings.watermark_y_space = parseInt(((page_height - defaultSettings.watermark_y) - defaultSettings.watermark_height * defaultSettings.watermark_rows) / (defaultSettings.watermark_rows - 1))
   defaultSettings.watermark_rows = defaultSettings.watermark_rows < 2 ? 2 : defaultSettings.watermark_rows
-  console.log('watermark_rows=' + defaultSettings.watermark_rows)
   defaultSettings.watermark_cols = defaultSettings.watermark_cols < 2 ? 2 : defaultSettings.watermark_cols
   let x
   let y