From 04d1e3f1baeb4f4b7b6102ab51396550f13d0b17 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 26 Feb 2024 12:59:45 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=BD=93=E4=BB=AA=E8=A1=A8=E6=9D=BF=E8=BF=87=E9=95=BF?=
 =?UTF-8?q?=E6=97=B6=E5=AF=BC=E5=87=BA=E5=9B=BE=E7=89=87=E6=B0=B4=E5=8D=B0?=
 =?UTF-8?q?=E4=B8=8D=E5=85=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/canvas/components/editor/LinkOptBar.vue   | 2 +-
 core/frontend/src/components/canvas/tools/watermark.js   | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/core/frontend/src/components/canvas/components/editor/LinkOptBar.vue b/core/frontend/src/components/canvas/components/editor/LinkOptBar.vue
index dec52f3409..fccb881568 100644
--- a/core/frontend/src/components/canvas/components/editor/LinkOptBar.vue
+++ b/core/frontend/src/components/canvas/components/editor/LinkOptBar.vue
@@ -36,7 +36,7 @@
       </div>
       <div class="link-icon-active">
         <el-tooltip
-          :content="$t('panel.panel')"
+          :content="$t('panel.export_pdf')"
         >
           <svg-icon
             style="width: 16px;height: 16px"
diff --git a/core/frontend/src/components/canvas/tools/watermark.js b/core/frontend/src/components/canvas/tools/watermark.js
index a606127a74..ac9ceeb1e1 100644
--- a/core/frontend/src/components/canvas/tools/watermark.js
+++ b/core/frontend/src/components/canvas/tools/watermark.js
@@ -43,12 +43,11 @@ export function watermark(settings, domId, watermarkDomId = 'de-watermark-server
     defaultSettings.watermark_cols = parseInt((page_width - defaultSettings.watermark_x + defaultSettings.watermark_x_space) / (defaultSettings.watermark_width + defaultSettings.watermark_x_space))
     defaultSettings.watermark_x_space = parseInt((page_width - defaultSettings.watermark_x - defaultSettings.watermark_width * defaultSettings.watermark_cols) / (defaultSettings.watermark_cols - 1))
   }
-  // 如果将水印行数设置为0，或水印行数设置过大，超过页面最大长度，则重新计算水印行数和水印y轴间隔
-  if (defaultSettings.watermark_rows === 0 || (parseInt(defaultSettings.watermark_y + defaultSettings.watermark_height * defaultSettings.watermark_rows + defaultSettings.watermark_y_space * (defaultSettings.watermark_rows - 1)) > page_height)) {
-    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 = 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