Merge branch 'main' into example

src/App.vue

@@ -4,6 +4,7 @@ import { NConfigProvider, darkTheme } from 'naive-ui';
 import type { WatermarkProps } from 'naive-ui';
 import { useAppStore } from './store/modules/app';
 import { useThemeStore } from './store/modules/theme';
+import { useAuthStore } from './store/modules/auth';
 import { naiveDateLocales, naiveLocales } from './locales/naive';
 
 defineOptions({
@@ -12,6 +13,7 @@ defineOptions({
 
 const appStore = useAppStore();
 const themeStore = useThemeStore();
+const authStore = useAuthStore();
 
 const naiveDarkTheme = computed(() => (themeStore.darkMode ? darkTheme : undefined));
 
@@ -24,8 +26,13 @@ const naiveDateLocale = computed(() => {
 });
 
 const watermarkProps = computed<WatermarkProps>(() => {
+  const content =
+    themeStore.watermark.enableUserName && authStore.userInfo.userName
+      ? authStore.userInfo.userName
+      : themeStore.watermark.text;
+
   return {
-    content: themeStore.watermark.text,
+    content,
     cross: true,
     fullscreen: true,
     fontSize: 16,

src/components/common/lang-switch.vue

@@ -31,13 +31,25 @@ const tooltipContent = computed(() => {
   return $t('icon.lang');
 });
 
+/** Add bottom margin to all options except the last one for proper visual separation */
+const dropdownOptions = computed(() => {
+  const lastIndex = props.langOptions.length - 1;
+
+  return props.langOptions.map((option, index) => ({
+    ...option,
+    props: {
+      class: index < lastIndex ? 'mb-1' : undefined
+    }
+  }));
+});
+
 function changeLang(lang: App.I18n.LangType) {
   emit('changeLang', lang);
 }
 </script>
 
 <template>
-  <NDropdown :value="lang" :options="langOptions" trigger="hover" @select="changeLang">
+  <NDropdown :value="lang" :options="dropdownOptions" trigger="hover" @select="changeLang">
     <div>
       <ButtonIcon :tooltip-content="tooltipContent" tooltip-placement="left">
         <SvgIcon icon="heroicons:language" />

src/layouts/modules/theme-drawer/modules/page-fun.vue

@@ -117,7 +117,10 @@ const isWrapperScrollMode = computed(() => themeStore.layout.scrollMode === 'wra
     <SettingItem key="8" :label="$t('theme.watermark.visible')">
       <NSwitch v-model:value="themeStore.watermark.visible" />
     </SettingItem>
-    <SettingItem v-if="themeStore.watermark.visible" key="8-1" :label="$t('theme.watermark.text')">
+    <SettingItem v-if="themeStore.watermark.visible" key="8-1" :label="$t('theme.watermark.enableUserName')">
+      <NSwitch v-model:value="themeStore.watermark.enableUserName" />
+    </SettingItem>
+    <SettingItem v-if="themeStore.watermark.visible" key="8-2" :label="$t('theme.watermark.text')">
       <NInput
         v-model:value="themeStore.watermark.text"
         autosize

src/locales/langs/en-us.ts

@@ -143,7 +143,8 @@ const local: App.I18n.Schema = {
     },
     watermark: {
       visible: 'Watermark Full Screen Visible',
-      text: 'Watermark Text'
+      text: 'Watermark Text',
+      enableUserName: 'Enable User Name Watermark'
     },
     themeDrawerTitle: 'Theme Configuration',
     pageFunTitle: 'Page Function',

src/locales/langs/zh-cn.ts

@@ -143,7 +143,8 @@ const local: App.I18n.Schema = {
     },
     watermark: {
       visible: '显示全屏水印',
-      text: '水印文本'
+      text: '水印文本',
+      enableUserName: '启用用户名水印'
     },
     themeDrawerTitle: '主题配置',
     pageFunTitle: '页面功能',

src/plugins/app.ts

@@ -95,7 +95,6 @@ async function getHtmlBuildTime(): Promise<string | null> {
     const res = await fetch(`${baseUrl}index.html?time=${Date.now()}`);
 
     if (!res.ok) {
-      console.error('getHtmlBuildTime error:', res.status, res.statusText);
       return null;
     }
 
@@ -103,7 +102,7 @@ async function getHtmlBuildTime(): Promise<string | null> {
     const match = html.match(/<meta name="buildTime" content="(.*)">/);
     return match?.[1] || null;
   } catch (error) {
-    console.error('getHtmlBuildTime error:', error);
+    window.console.error('getHtmlBuildTime error:', error);
     return null;
   }
 }

src/styles/css/global.css

@@ -10,4 +10,5 @@ body,
 
 html {
   overflow-x: hidden;
+  color: rgb(var(--base-text-color));
 }

src/theme/settings.ts

@@ -58,7 +58,8 @@ export const themeSettings: App.Theme.ThemeSetting = {
   },
   watermark: {
     visible: false,
-    text: 'SoybeanAdmin'
+    text: 'SoybeanAdmin',
+    enableUserName: false
   },
   tokens: {
     light: {

src/typings/app.d.ts

@@ -112,6 +112,8 @@ declare namespace App {
         visible: boolean;
         /** Watermark text */
         text: string;
+        /** Whether to use user name as watermark text */
+        enableUserName: boolean;
       };
       /** define some theme settings tokens, will transform to css variables */
       tokens: {
@@ -408,6 +410,7 @@ declare namespace App {
         watermark: {
           visible: string;
           text: string;
+          enableUserName: string;
         };
         themeDrawerTitle: string;
         pageFunTitle: string;

src/typings/vite-env.d.ts

@@ -25,7 +25,7 @@ declare namespace Env {
      *
      * This prefix is start with the icon prefix
      */
-    readonly VITE_ICON_LOCAL_PREFIX: 'local-icon';
+    readonly VITE_ICON_LOCAL_PREFIX: 'icon-local';
     /** backend service base url */
     readonly VITE_SERVICE_BASE_URL: string;
     /**

src/views/_builtin/iframe-page/[url].vue

@@ -1,19 +1,9 @@
 <script setup lang="ts">
-import { onActivated, onMounted } from 'vue';
-
 interface Props {
   url: string;
 }
 
 defineProps<Props>();
-
-onMounted(() => {
-  console.log('mounted');
-});
-
-onActivated(() => {
-  console.log('activated');
-});
 </script>
 
 <template>

src/views/alova/user/index.vue

@@ -177,7 +177,7 @@ const { columnChecks, columns } = useCheckedColumns<typeof fetchGetUserList>(()
 <template>
   <div class="min-h-500px flex-col-stretch gap-16px overflow-hidden lt-sm:overflow-auto">
     <UserSearch v-model:model="searchParams" @search="getDataByPage" />
-    <NCard :title="$t('page.manage.user.title')" :bordered="false" size="small" class="sm:flex-1-hidden card-wrapper">
+    <NCard :title="$t('page.manage.user.title')" :bordered="false" size="small" class="card-wrapper sm:flex-1-hidden">
       <template #header-extra>
         <TableHeaderOperation
           v-model:columns="columnChecks"

src/views/manage/menu/index.vue

@@ -228,7 +228,7 @@ init();
 
 <template>
   <div ref="wrapperRef" class="flex-col-stretch gap-16px overflow-hidden lt-sm:overflow-auto">
-    <NCard :title="$t('page.manage.menu.title')" :bordered="false" size="small" class="sm:flex-1-hidden card-wrapper">
+    <NCard :title="$t('page.manage.menu.title')" :bordered="false" size="small" class="card-wrapper sm:flex-1-hidden">
       <template #header-extra>
         <TableHeaderOperation
           v-model:columns="columnChecks"

src/views/manage/role/index.vue

@@ -140,7 +140,7 @@ function edit(id: number) {
 <template>
   <div class="min-h-500px flex-col-stretch gap-16px overflow-hidden lt-sm:overflow-auto">
     <RoleSearch v-model:model="searchParams" @reset="resetSearchParams" @search="getDataByPage" />
-    <NCard :title="$t('page.manage.role.title')" :bordered="false" size="small" class="sm:flex-1-hidden card-wrapper">
+    <NCard :title="$t('page.manage.role.title')" :bordered="false" size="small" class="card-wrapper sm:flex-1-hidden">
       <template #header-extra>
         <TableHeaderOperation
           v-model:columns="columnChecks"

src/views/manage/user/index.vue

@@ -171,7 +171,7 @@ function edit(id: number) {
 <template>
   <div class="min-h-500px flex-col-stretch gap-16px overflow-hidden lt-sm:overflow-auto">
     <UserSearch v-model:model="searchParams" @reset="resetSearchParams" @search="getDataByPage" />
-    <NCard :title="$t('page.manage.user.title')" :bordered="false" size="small" class="sm:flex-1-hidden card-wrapper">
+    <NCard :title="$t('page.manage.user.title')" :bordered="false" size="small" class="card-wrapper sm:flex-1-hidden">
       <template #header-extra>
         <TableHeaderOperation
           v-model:columns="columnChecks"

src/views/plugin/charts/vchart/data.ts

@@ -1,4 +1,5 @@
 import type {
+  IAnimationConfig,
   IAreaChartSpec,
   IBarChartSpec,
   ICircularProgressChartSpec,
@@ -7,7 +8,6 @@ import type {
   ILiquidChartSpec,
   IWordCloudChartSpec
 } from '@visactor/vchart';
-import type { IAnimationConfig } from '@visactor/vgrammar-core';
 
 export const shapeWordCloudSpec: IWordCloudChartSpec = {
   type: 'wordCloud',

src/views/plugin/excel/index.vue

@@ -167,7 +167,7 @@ function isTableColumnHasTitle<T>(column: NaiveUI.TableColumn<T>): column is Nai
 
 <template>
   <div class="min-h-500px flex-col-stretch gap-16px overflow-hidden lt-sm:overflow-auto">
-    <NCard title="Excel导出" :bordered="false" size="small" class="sm:flex-1-hidden card-wrapper">
+    <NCard title="Excel导出" :bordered="false" size="small" class="card-wrapper sm:flex-1-hidden">
       <template #header-extra>
         <NSpace align="end" wrap justify="end" class="lt-sm:w-200px">
           <NButton size="small" ghost type="primary" @click="exportExcel">

src/views/plugin/pdf/index.vue

@@ -62,7 +62,7 @@ async function handleDownload() {
           <NSkeleton v-if="loading" size="small" class="mt-12px" text :repeat="12" />
           <VuePdfEmbed
             ref="pdfRef"
-            class="overflow-auto container"
+            class="container overflow-auto"
             :class="{ 'h-0': loading }"
             :rotation="rotations[currentRotation]"
             :page="currentPage"