From a0feeb1966b9576c7cd495d4ca5bef38f9139533 Mon Sep 17 00:00:00 2001 From: Netfan Date: Mon, 31 Mar 2025 09:06:02 +0800 Subject: [PATCH] fix: watermark settings in the preferences modified accidentally (#5823) --- apps/web-antd/src/layouts/basic.vue | 2 +- apps/web-ele/src/layouts/basic.vue | 2 +- apps/web-naive/src/layouts/basic.vue | 2 +- packages/effects/hooks/src/use-watermark.ts | 4 ---- playground/src/layouts/basic.vue | 10 ++++++++-- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/apps/web-antd/src/layouts/basic.vue b/apps/web-antd/src/layouts/basic.vue index 51412956..1481dc5a 100644 --- a/apps/web-antd/src/layouts/basic.vue +++ b/apps/web-antd/src/layouts/basic.vue @@ -110,7 +110,7 @@ watch( async (enable) => { if (enable) { await updateWatermark({ - content: `${userStore.userInfo?.username}`, + content: `${userStore.userInfo?.username} - ${userStore.userInfo?.realName}`, }); } else { destroyWatermark(); diff --git a/apps/web-ele/src/layouts/basic.vue b/apps/web-ele/src/layouts/basic.vue index 51412956..1481dc5a 100644 --- a/apps/web-ele/src/layouts/basic.vue +++ b/apps/web-ele/src/layouts/basic.vue @@ -110,7 +110,7 @@ watch( async (enable) => { if (enable) { await updateWatermark({ - content: `${userStore.userInfo?.username}`, + content: `${userStore.userInfo?.username} - ${userStore.userInfo?.realName}`, }); } else { destroyWatermark(); diff --git a/apps/web-naive/src/layouts/basic.vue b/apps/web-naive/src/layouts/basic.vue index f75b3ddc..69189384 100644 --- a/apps/web-naive/src/layouts/basic.vue +++ b/apps/web-naive/src/layouts/basic.vue @@ -111,7 +111,7 @@ watch( async (enable) => { if (enable) { await updateWatermark({ - content: `${userStore.userInfo?.username}`, + content: `${userStore.userInfo?.username} - ${userStore.userInfo?.realName}`, }); } else { destroyWatermark(); diff --git a/packages/effects/hooks/src/use-watermark.ts b/packages/effects/hooks/src/use-watermark.ts index c3f56eaf..8484a082 100644 --- a/packages/effects/hooks/src/use-watermark.ts +++ b/packages/effects/hooks/src/use-watermark.ts @@ -2,8 +2,6 @@ import type { Watermark, WatermarkOptions } from 'watermark-js-plus'; import { nextTick, onUnmounted, readonly, ref } from 'vue'; -import { updatePreferences } from '@vben/preferences'; - const watermark = ref(); const unmountedHooked = ref(false); const cachedOptions = ref>({ @@ -48,7 +46,6 @@ export function useWatermark() { ...options, }; watermark.value = new Watermark(cachedOptions.value); - updatePreferences({ app: { watermark: true } }); await watermark.value?.create(); } @@ -69,7 +66,6 @@ export function useWatermark() { watermark.value.destroy(); watermark.value = undefined; } - updatePreferences({ app: { watermark: false } }); } // 只在第一次调用时注册卸载钩子,防止重复注册以致于在路由切换时销毁了水印 diff --git a/playground/src/layouts/basic.vue b/playground/src/layouts/basic.vue index a44f46e2..227ce955 100644 --- a/playground/src/layouts/basic.vue +++ b/playground/src/layouts/basic.vue @@ -1,7 +1,7 @@