From e446090dd227b66709f23c96f9f91c07dee297f8 Mon Sep 17 00:00:00 2001
From: Argo Zhang <argo@live.ca>
Date: Tue, 15 Apr 2025 18:36:14 +0800
Subject: [PATCH 1/3] =?UTF-8?q?refactor:=20=E5=A2=9E=E5=8A=A0=E5=85=A8?=
 =?UTF-8?q?=E5=B1=80=E6=B0=B4=E5=8D=B0=E6=97=B6=E7=A7=BB=E5=8A=A8=E5=88=B0?=
 =?UTF-8?q?=E6=96=87=E6=A1=A3=E6=A0=B9=E8=8A=82=E7=82=B9=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Components/Watermark/Watermark.razor.js            | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/BootstrapBlazor/Components/Watermark/Watermark.razor.js b/src/BootstrapBlazor/Components/Watermark/Watermark.razor.js
index 50fe80f35a1..48b2c0962b5 100644
--- a/src/BootstrapBlazor/Components/Watermark/Watermark.razor.js
+++ b/src/BootstrapBlazor/Components/Watermark/Watermark.razor.js
@@ -102,13 +102,13 @@ const createWatermark = watermark => {
     if (mark) {
         mark.remove();
     }
+    el.appendChild(div);
 
-    if (bg.isPage) {
-        document.body.appendChild(div);
-    }
-    else {
-        el.appendChild(div);
+    if (options.isPage) {
+        document.body.setAttribute('data-bb-watermark', "true");
+        document.body.appendChild(el);
     }
+
     options.bg = bg;
     requestAnimationFrame(() => monitor(watermark));
 }

From 00c8a3cbb19cfcc92b138415316b7798817c8604 Mon Sep 17 00:00:00 2001
From: Argo Zhang <argo@live.ca>
Date: Tue, 15 Apr 2025 18:36:35 +0800
Subject: [PATCH 2/3] =?UTF-8?q?refactor:=20=E5=A2=9E=E5=8A=A0=E5=8F=98?=
 =?UTF-8?q?=E9=87=8F=E4=BF=9D=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Components/Watermark/Watermark.razor.js               | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/BootstrapBlazor/Components/Watermark/Watermark.razor.js b/src/BootstrapBlazor/Components/Watermark/Watermark.razor.js
index 48b2c0962b5..2b008b61534 100644
--- a/src/BootstrapBlazor/Components/Watermark/Watermark.razor.js
+++ b/src/BootstrapBlazor/Components/Watermark/Watermark.razor.js
@@ -179,8 +179,12 @@ const monitor = watermark => {
 
 const clearWatermark = watermark => {
     const { el, ob } = watermark;
-    ob.disconnect();
-    el.innerHTML = '';
+    if (ob) {
+        ob.disconnect();
+    }
+    if (el) {
+        el.innerHTML = '';
+    }
 }
 
 const getWatermark = props => {

From 33128c9875f1fb0676291e170dbc4783efbe0d79 Mon Sep 17 00:00:00 2001
From: Argo Zhang <argo@live.ca>
Date: Tue, 15 Apr 2025 18:36:54 +0800
Subject: [PATCH 3/3] =?UTF-8?q?refactor:=20=E5=AE=8C=E5=96=84=20dispose=20?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E9=98=B2=E6=AD=A2=20dom=20=E6=AE=8B=E7=95=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/BootstrapBlazor/Components/Watermark/Watermark.razor.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/BootstrapBlazor/Components/Watermark/Watermark.razor.js b/src/BootstrapBlazor/Components/Watermark/Watermark.razor.js
index 2b008b61534..cd69a9527a3 100644
--- a/src/BootstrapBlazor/Components/Watermark/Watermark.razor.js
+++ b/src/BootstrapBlazor/Components/Watermark/Watermark.razor.js
@@ -41,10 +41,12 @@ export function dispose(id) {
     Data.remove(id);
 
     if (watermark) {
-        const { ob } = watermark;
+        const { el, ob } = watermark;
         ob.disconnect();
 
         delete watermark.ob;
+        document.body.removeAttribute('data-bb-watermark');
+        el.remove();
     }
 }