Browse Source
fix: watermark settings in the preferences modified accidentally (#5823)
pull/5825/head
Netfan
1 year ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with
11 additions and
9 deletions
-
apps/web-antd/src/layouts/basic.vue
-
apps/web-ele/src/layouts/basic.vue
-
apps/web-naive/src/layouts/basic.vue
-
packages/effects/hooks/src/use-watermark.ts
-
playground/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(); |
|
|
|
|
|
|
|
@ -110,7 +110,7 @@ watch( |
|
|
|
async (enable) => { |
|
|
|
if (enable) { |
|
|
|
await updateWatermark({ |
|
|
|
content: `${userStore.userInfo?.username}`, |
|
|
|
content: `${userStore.userInfo?.username} - ${userStore.userInfo?.realName}`, |
|
|
|
}); |
|
|
|
} else { |
|
|
|
destroyWatermark(); |
|
|
|
|
|
|
|
@ -111,7 +111,7 @@ watch( |
|
|
|
async (enable) => { |
|
|
|
if (enable) { |
|
|
|
await updateWatermark({ |
|
|
|
content: `${userStore.userInfo?.username}`, |
|
|
|
content: `${userStore.userInfo?.username} - ${userStore.userInfo?.realName}`, |
|
|
|
}); |
|
|
|
} else { |
|
|
|
destroyWatermark(); |
|
|
|
|
|
|
|
@ -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<Watermark>(); |
|
|
|
const unmountedHooked = ref<boolean>(false); |
|
|
|
const cachedOptions = ref<Partial<WatermarkOptions>>({ |
|
|
|
@ -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 } }); |
|
|
|
} |
|
|
|
|
|
|
|
// 只在第一次调用时注册卸载钩子,防止重复注册以致于在路由切换时销毁了水印
|
|
|
|
|
|
|
|
@ -1,7 +1,7 @@ |
|
|
|
<script lang="ts" setup> |
|
|
|
import type { NotificationItem } from '@vben/layouts'; |
|
|
|
|
|
|
|
import { computed, ref, watch } from 'vue'; |
|
|
|
import { computed, onBeforeMount, ref, watch } from 'vue'; |
|
|
|
|
|
|
|
import { AuthenticationLoginExpiredModal } from '@vben/common-ui'; |
|
|
|
import { VBEN_DOC_URL, VBEN_GITHUB_URL } from '@vben/constants'; |
|
|
|
@ -126,7 +126,7 @@ watch( |
|
|
|
async (enable) => { |
|
|
|
if (enable) { |
|
|
|
await updateWatermark({ |
|
|
|
content: `${userStore.userInfo?.username}`, |
|
|
|
content: `${userStore.userInfo?.username} - ${userStore.userInfo?.realName}`, |
|
|
|
}); |
|
|
|
} else { |
|
|
|
destroyWatermark(); |
|
|
|
@ -136,6 +136,12 @@ watch( |
|
|
|
immediate: true, |
|
|
|
}, |
|
|
|
); |
|
|
|
|
|
|
|
onBeforeMount(() => { |
|
|
|
if (preferences.app.watermark) { |
|
|
|
destroyWatermark(); |
|
|
|
} |
|
|
|
}); |
|
|
|
</script> |
|
|
|
|
|
|
|
<template> |
|
|
|
|