From cb6f3f9e29c3cd15acca5cbec9a6e4177b0d89fc Mon Sep 17 00:00:00 2001
From: lijisanxiong <1518062161@qq.com>
Date: Thu, 21 Aug 2025 16:41:05 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat=EF=BC=9A=E6=96=B0=E5=A2=9E=E5=BA=94?=
 =?UTF-8?q?=E7=94=A8=E6=8C=82=E8=BD=BD=E6=97=B6=E6=B7=BB=E5=8A=A0=E6=B0=B4?=
 =?UTF-8?q?=E5=8D=B0=E9=80=BB=E8=BE=91=EF=BC=8C=E9=80=82=E9=85=8D=E5=BA=94?=
 =?UTF-8?q?=E7=94=A8=E5=85=A8=E5=B1=80=E5=8F=82=E6=95=B0=20watermark?=
 =?UTF-8?q?=EF=BC=88=E5=BA=94=E7=94=A8=E6=B0=B4=E5=8D=B0=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=EF=BC=89=EF=BC=8C=E5=8F=AF=E5=9C=A8=E5=BA=94?=
 =?UTF-8?q?=E7=94=A8=E8=87=AA=E5=AE=9A=E4=B9=89=E5=8F=82=E6=95=B0=E4=B8=AD?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=EF=BC=8C=E9=85=8D=E7=BD=AE=E7=A4=BA=E4=BE=8B?=
 =?UTF-8?q?=E5=8C=85=E6=8B=AC=E5=90=AF=E7=94=A8=E6=B0=B4=E5=8D=B0=EF=BC=88?=
 =?UTF-8?q?globalConfig.watermark.enable=3Dtrue=EF=BC=89=E3=80=81=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E6=98=BE=E7=A4=BA=E6=96=87=E6=9C=AC=EF=BC=88globalCon?=
 =?UTF-8?q?fig.watermark.text=3D=E6=B5=8B=E8=AF=95=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md        |  1 +
 src/web-app/App.tsx | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f79f7891..46735cc6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 ### Added
 
 - 第三方登录组件支持通过自定义补充参数指定需要展示的第三方登录方式
+- 新增应用挂载时添加水印逻辑，适配应用全局参数 watermark（应用水印配置参数），可在应用自定义参数中配置，配置示例包括启用水印（globalConfig.watermark.enable=true）、设置显示文本（globalConfig.watermark.text=测试内容）
 
 ## Fixed
 
diff --git a/src/web-app/App.tsx b/src/web-app/App.tsx
index 2f0b0387..abeac748 100644
--- a/src/web-app/App.tsx
+++ b/src/web-app/App.tsx
@@ -1,4 +1,4 @@
-import { defineComponent, onUnmounted } from 'vue';
+import { defineComponent, onUnmounted, onMounted, onBeforeUnmount } from 'vue';
 import { Modal, ViewMode } from '@ibiz-template/runtime';
 import { AppHooks } from '@ibiz-template/vue3-util';
 import './App.scss';
@@ -21,6 +21,19 @@ export default defineComponent({
     // 页面关闭
     window.addEventListener('unload', destroyAppHub);
 
+    // 水印销毁方法
+    let watermarkDestroy: void | null | (() => void);
+    onMounted(() => {
+      AppHooks.initedApp.tapPromise(async () => {
+        // 挂载应用水印，默认将水印挂载到body下
+        watermarkDestroy = ibiz.util.watermark.mount(ibiz.config.watermark);
+      });
+    });
+
+    onBeforeUnmount(() => {
+      watermarkDestroy?.();
+    });
+
     // 页面卸载
     onUnmounted(() => {
       destroyAppHub();
-- 
Gitee


From 25a7f88c39f5433c56e0acf69ce42a56b29e3d47 Mon Sep 17 00:00:00 2001
From: lijisanxiong <1518062161@qq.com>
Date: Thu, 21 Aug 2025 18:49:37 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat=EF=BC=9A=E6=9B=B4=E6=96=B0=E5=BA=94?=
 =?UTF-8?q?=E7=94=A8=E6=B0=B4=E5=8D=B0=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/web-app/App.tsx | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/web-app/App.tsx b/src/web-app/App.tsx
index abeac748..bf47f812 100644
--- a/src/web-app/App.tsx
+++ b/src/web-app/App.tsx
@@ -24,9 +24,14 @@ export default defineComponent({
     // 水印销毁方法
     let watermarkDestroy: void | null | (() => void);
     onMounted(() => {
-      AppHooks.initedApp.tapPromise(async () => {
+      AppHooks.initedApp.tapPromise(async ({ context }) => {
+        watermarkDestroy?.();
         // 挂载应用水印，默认将水印挂载到body下
-        watermarkDestroy = ibiz.util.watermark.mount(ibiz.config.watermark);
+        watermarkDestroy = ibiz.util.watermark.mount(
+          ibiz.config.watermark,
+          undefined,
+          { ...context, ...ibiz.appData?.context } as IContext,
+        );
       });
     });
 
-- 
Gitee