From dad7680d16a531446e07f55d364c97b02ceba08c Mon Sep 17 00:00:00 2001
From: xlsea <m@xlsea.cn>
Date: Sat, 22 Feb 2025 11:15:13 +0800
Subject: [PATCH] =?UTF-8?q?stytle(1.4.0-beta1):=20=E7=A7=BB=E9=99=A4?=
 =?UTF-8?q?=E5=A4=9A=E4=BD=99=E6=B0=B4=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                             | 17 +++++++-----
 src/components/common/app-provider.vue  |  1 -
 src/components/common/app-watermark.vue | 37 -------------------------
 3 files changed, 10 insertions(+), 45 deletions(-)
 delete mode 100644 src/components/common/app-watermark.vue

diff --git a/src/App.vue b/src/App.vue
index cd1b555..3da2cff 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -5,6 +5,7 @@ import type { WatermarkProps } from 'naive-ui';
 import { useAppStore } from './store/modules/app';
 import { useThemeStore } from './store/modules/theme';
 import { naiveDateLocales, naiveLocales } from './locales/naive';
+import { useAuthStore } from './store/modules/auth';
 
 defineOptions({
   name: 'App'
@@ -12,7 +13,7 @@ defineOptions({
 
 const appStore = useAppStore();
 const themeStore = useThemeStore();
-
+const { userInfo } = useAuthStore();
 const naiveDarkTheme = computed(() => (themeStore.darkMode ? darkTheme : undefined));
 
 const naiveLocale = computed(() => {
@@ -24,17 +25,19 @@ const naiveDateLocale = computed(() => {
 });
 
 const watermarkProps = computed<WatermarkProps>(() => {
+  const appTitle = import.meta.env.VITE_APP_TITLE || themeStore.watermark.text;
   return {
-    content: themeStore.watermark?.text || 'SoybeanAdmin',
+    content: userInfo.userName ? `${userInfo.userName}@${appTitle} ${userInfo.username}` : appTitle,
     cross: true,
     fullscreen: true,
-    fontSize: 16,
-    lineHeight: 16,
-    width: 384,
-    height: 384,
+    fontSize: 14,
+    fontColor: themeStore.darkMode ? 'rgba(200, 200, 200, 0.03)' : 'rgba(200, 200, 200, 0.2)',
+    lineHeight: 14,
+    width: 200,
+    height: 300,
     xOffset: 12,
     yOffset: 60,
-    rotate: -15,
+    rotate: -18,
     zIndex: 9999
   };
 });
diff --git a/src/components/common/app-provider.vue b/src/components/common/app-provider.vue
index eb9a8cf..36a361a 100644
--- a/src/components/common/app-provider.vue
+++ b/src/components/common/app-provider.vue
@@ -30,7 +30,6 @@ const ContextHolder = defineComponent({
         <NMessageProvider>
           <ContextHolder />
           <slot></slot>
-          <AppWatermark />
         </NMessageProvider>
       </NNotificationProvider>
     </NDialogProvider>
diff --git a/src/components/common/app-watermark.vue b/src/components/common/app-watermark.vue
deleted file mode 100644
index dd8488e..0000000
--- a/src/components/common/app-watermark.vue
+++ /dev/null
@@ -1,37 +0,0 @@
-<script setup lang="ts">
-import { computed } from 'vue';
-import { useAuthStore } from '@/store/modules/auth';
-import { useThemeStore } from '@/store/modules/theme';
-
-defineOptions({
-  name: 'AppWatermark'
-});
-
-const { watermark } = useThemeStore();
-const { userInfo } = useAuthStore();
-
-const watermarkContent = computed(() => {
-  const appTitle = import.meta.env.VITE_APP_TITLE || 'Snail Job';
-  return userInfo.userName ? `${userInfo.userName}@${appTitle}` : appTitle;
-});
-</script>
-
-<template>
-  <NWatermark
-    v-if="watermark.visible"
-    :content="watermarkContent"
-    cross
-    fullscreen
-    :font-size="14"
-    :line-height="14"
-    :width="200"
-    :height="300"
-    :x-offset="12"
-    :y-offset="60"
-    :rotate="-18"
-    :z-index="999"
-    font-color="rgba(200, 200, 200, 0.3)"
-  />
-</template>
-
-<style scoped></style>