From a49ee2d4b23748b65e0f771c7be8281cd22dde75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E7=BA=A2=E4=B8=BD?= <1181930680@qq.com>
Date: Sat, 12 Oct 2024 16:19:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B0=B4=E5=8D=B0=E5=BC=80?=
=?UTF-8?q?=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/App.vue | 11 ++++++++---
src/hooks/setting/useProjectSetting.ts | 3 +++
src/layout/components/Header/ProjectSetting.vue | 17 ++++++++++++++++-
src/settings/projectSetting.ts | 2 ++
src/store/modules/projectSetting.ts | 6 ++++++
5 files changed, 35 insertions(+), 4 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index 5d71f2a..f9a18ee 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -17,6 +17,7 @@
import { useLockscreenStore } from '@/store/modules/lockscreen';
import { useRoute } from 'vue-router';
import { PageEnum } from '@/enums/pageEnum';
+ import { useProjectSetting } from '@/hooks/setting/useProjectSetting';
import Watermark from '@/utils/wartermark';
const route = useRoute();
@@ -26,7 +27,7 @@
const lockTime = computed(() => useLockscreen.lockTime);
const zIndex = ref(3000);
-
+ const {getIsWaterMark} = useProjectSetting();
const LoginName = PageEnum.BASE_LOGIN_NAME;
let timer;
@@ -50,8 +51,12 @@
};
onMounted(() => {
- const waterText = import.meta.env.VITE_GLOB_APP_TITLE;
- Watermark.set(waterText)
+ if(getIsWaterMark.value) {
+ const waterText = import.meta.env.VITE_GLOB_APP_TITLE;
+ Watermark.set(waterText)
+ } else {
+ Watermark.del()
+ }
});
onUnmounted(() => {
// document.removeEventListener('mousedown', timekeeping);
diff --git a/src/hooks/setting/useProjectSetting.ts b/src/hooks/setting/useProjectSetting.ts
index 027fe02..cd81f3e 100644
--- a/src/hooks/setting/useProjectSetting.ts
+++ b/src/hooks/setting/useProjectSetting.ts
@@ -18,6 +18,8 @@ export function useProjectSetting() {
const getCrumbsSetting = computed(() => projectStore.crumbsSetting);
+ const getIsWaterMark = computed(() => projectStore.isWaterMark);
+
const getPermissionMode = computed(() => projectStore.permissionMode);
const getShowFooter = computed(() => projectStore.showFooter);
@@ -46,6 +48,7 @@ export function useProjectSetting() {
getPageAnimateType,
getMenuWidth,
getMenuMinWidth,
+ getIsWaterMark,
getIsProjectSetting,
};
}
diff --git a/src/layout/components/Header/ProjectSetting.vue b/src/layout/components/Header/ProjectSetting.vue
index 5aa360c..3cd40ac 100644
--- a/src/layout/components/Header/ProjectSetting.vue
+++ b/src/layout/components/Header/ProjectSetting.vue
@@ -246,6 +246,12 @@