From 4bb75999afd35860d1d8af2e9994bac2b1a2f316 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 2 Jul 2024 22:23:46 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=85=A8=E5=B1=8F=E6=97=B6=E5=87=BA=E7=8E=B0?=
 =?UTF-8?q?=E5=A4=9A=E4=B8=AA=E6=B8=85=E9=99=A4=E6=8C=89=E9=92=AE=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/visualization/CanvasOptBar.vue             | 2 +-
 core/core-frontend/src/components/watermark/watermark.ts      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/core-frontend/src/components/visualization/CanvasOptBar.vue b/core/core-frontend/src/components/visualization/CanvasOptBar.vue
index 04b81c8620..aef5ea60e3 100644
--- a/core/core-frontend/src/components/visualization/CanvasOptBar.vue
+++ b/core/core-frontend/src/components/visualization/CanvasOptBar.vue
@@ -79,7 +79,7 @@ const existLinkage = computed(() => {
   top: 2px;
   right: 2px;
   opacity: 0.8;
-  z-index: 20;
+  z-index: 1;
   position: absolute;
 }
 
diff --git a/core/core-frontend/src/components/watermark/watermark.ts b/core/core-frontend/src/components/watermark/watermark.ts
index 2014f1b88a..880aa3460a 100644
--- a/core/core-frontend/src/components/watermark/watermark.ts
+++ b/core/core-frontend/src/components/watermark/watermark.ts
@@ -8,7 +8,7 @@ export function watermark(settings, domId) {
     watermark_x: 20, // 水印起始位置x轴坐标
     watermark_y: 20, // 水印起始位置Y轴坐标
     watermark_rows: 60, // 水印行数
-    watermark_cols: 20, // 水印列数
+    watermark_cols: 60, // 水印列数
     watermark_x_space: 100, // 水印x轴间隔
     watermark_y_space: 50, // 水印y轴间隔
     watermark_color: '#aaa', // 水印字体颜色
@@ -45,7 +45,7 @@ export function watermark(settings, domId) {
       defaultSettings.watermark_x +
         defaultSettings.watermark_width * defaultSettings.watermark_cols +
         defaultSettings.watermark_x_space * (defaultSettings.watermark_cols - 1)
-    ) < page_width
+    ) > page_width
   ) {
     defaultSettings.watermark_cols = Math.floor(
       (page_width - defaultSettings.watermark_x + defaultSettings.watermark_x_space) /