From 9bc751ffda3481a6e16c8d9b174a5a1994531b70 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 22 Jan 2024 17:56:13 +0800
Subject: [PATCH 1/2] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E5=A4=A7?=
 =?UTF-8?q?=E5=B1=8F=E6=B0=B4=E5=8D=B0=E5=B1=95=E7=A4=BA=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-backend/pom.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/core/core-backend/pom.xml b/core/core-backend/pom.xml
index 72a5f97b9e..13032ace70 100644
--- a/core/core-backend/pom.xml
+++ b/core/core-backend/pom.xml
@@ -101,6 +101,16 @@
                     <groupId>com.h2database</groupId>
                     <artifactId>h2</artifactId>
                 </dependency>
+                <dependency>
+                    <groupId>io.dataease</groupId>
+                    <artifactId>xpack-permissions</artifactId>
+                    <version>${project.version}</version>
+                </dependency>
+                <dependency>
+                    <groupId>io.dataease</groupId>
+                    <artifactId>xpack-base</artifactId>
+                    <version>${project.version}</version>
+                </dependency>
             </dependencies>
 
             <build>

From 4b6f21c6be168343bdd41b3cbb9ee62aac2a23e6 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 22 Jan 2024 18:51:18 +0800
Subject: [PATCH 2/2] =?UTF-8?q?style:=20=E4=BC=98=E5=8C=96=E5=A4=A7?=
 =?UTF-8?q?=E5=B1=8F=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/watermark/watermark.ts          | 14 +++++++-------
 core/core-frontend/src/utils/attr.ts               |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/core-frontend/src/components/watermark/watermark.ts b/core/core-frontend/src/components/watermark/watermark.ts
index 125e92ae10..9cf773c60d 100644
--- a/core/core-frontend/src/components/watermark/watermark.ts
+++ b/core/core-frontend/src/components/watermark/watermark.ts
@@ -41,17 +41,17 @@ export function watermark(settings, domId) {
   // 如果将水印列数设置为0，或水印列数设置过大，超过页面最大宽度，则重新计算水印列数和水印x轴间隔
   if (
     defaultSettings.watermark_cols === 0 ||
-    parseInt(
+    Math.round(
       defaultSettings.watermark_x +
         defaultSettings.watermark_width * defaultSettings.watermark_cols +
         defaultSettings.watermark_x_space * (defaultSettings.watermark_cols - 1)
     ) > page_width
   ) {
-    defaultSettings.watermark_cols = parseInt(
+    defaultSettings.watermark_cols = Math.round(
       (page_width - defaultSettings.watermark_x + defaultSettings.watermark_x_space) /
         (defaultSettings.watermark_width + defaultSettings.watermark_x_space)
     )
-    defaultSettings.watermark_x_space = parseInt(
+    defaultSettings.watermark_x_space = Math.round(
       (page_width -
         defaultSettings.watermark_x -
         defaultSettings.watermark_width * defaultSettings.watermark_cols) /
@@ -61,17 +61,17 @@ export function watermark(settings, domId) {
   // 如果将水印行数设置为0，或水印行数设置过大，超过页面最大长度，则重新计算水印行数和水印y轴间隔
   if (
     defaultSettings.watermark_rows === 0 ||
-    parseInt(
+    Math.round(
       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_rows = Math.round(
       (defaultSettings.watermark_y_space + page_height - defaultSettings.watermark_y) /
         (defaultSettings.watermark_height + defaultSettings.watermark_y_space)
     )
-    defaultSettings.watermark_y_space = parseInt(
+    defaultSettings.watermark_y_space = Math.round(
       (page_height -
         defaultSettings.watermark_y -
         defaultSettings.watermark_height * defaultSettings.watermark_rows) /
@@ -110,7 +110,7 @@ export function watermark(settings, domId) {
       mask_div.style.zIndex = '10'
       // 让水印不遮挡页面的点击事件
       mask_div.style.pointerEvents = 'none'
-      mask_div.style.opacity = defaultSettings.watermark_alpha
+      mask_div.style.opacity = defaultSettings.watermark_alpha + ''
       mask_div.style.fontSize = defaultSettings.watermark_fontsize
       mask_div.style.fontFamily = defaultSettings.watermark_font
       mask_div.style.color = defaultSettings.watermark_color
diff --git a/core/core-frontend/src/utils/attr.ts b/core/core-frontend/src/utils/attr.ts
index d5bbc5251d..341020af27 100644
--- a/core/core-frontend/src/utils/attr.ts
+++ b/core/core-frontend/src/utils/attr.ts
@@ -1,7 +1,7 @@
 export const positionData = [
   { key: 'left', label: 'X', min: -1000, max: 20000, step: 10 },
-  { key: 'top', label: 'Y', min: -1000, max: 20000, step: 10 },
   { key: 'width', label: 'W', min: 10, max: 20000, step: 10 },
+  { key: 'top', label: 'Y', min: -1000, max: 20000, step: 10 },
   { key: 'height', label: 'H', min: 10, max: 20000, step: 10 }
 ]