fix(projects): 修复登录页面跳转问题

.vscode/settings.json

@@ -31,7 +31,8 @@
   "vue.server.hybridMode": true,
   "files.exclude": { "/docs": true },
   "search.exclude": {
-    "/docs": true
+    "/docs": true,
+    "**/dist/**": true
   },
   "cSpell.words": ["Axios", "tinymce"]
 }

src/enum/index.ts

@@ -4,5 +4,6 @@ export enum SetupStoreId {
   Auth = 'auth-store',
   Route = 'route-store',
   Tab = 'tab-store',
-  Notice = 'notice-store'
+  Notice = 'notice-store',
+  Dict = 'dict-store'
 }

src/store/modules/auth/index.ts

@@ -8,6 +8,7 @@ import { localStg } from '@/utils/storage';
 import { SetupStoreId } from '@/enum';
 import { useRouteStore } from '../route';
 import { useTabStore } from '../tab';
+import useNoticeStore from '../notice';
 import { clearAuthStorage, getToken } from './shared';
 
 export const useAuthStore = defineStore(SetupStoreId.Auth, () => {
@@ -15,6 +16,7 @@ export const useAuthStore = defineStore(SetupStoreId.Auth, () => {
   const authStore = useAuthStore();
   const routeStore = useRouteStore();
   const tabStore = useTabStore();
+  const noticeStore = useNoticeStore();
   const { toLogin, redirectFromLogin } = useRouterPush(false);
   const { loading: loginLoading, startLoading, endLoading } = useLoading();
 
@@ -48,6 +50,7 @@ export const useAuthStore = defineStore(SetupStoreId.Auth, () => {
       await toLogin();
     }
 
+    noticeStore.clearNotice();
     tabStore.cacheTabs();
     routeStore.resetStore();
   }

src/store/modules/dict/index.ts

@@ -1,8 +1,9 @@
 import { ref } from 'vue';
 import { defineStore } from 'pinia';
 import { $t } from '@/locales';
+import { SetupStoreId } from '@/enum';
 
-export const useDictStore = defineStore('dict', () => {
+export const useDictStore = defineStore(SetupStoreId.Dict, () => {
   const dictData = ref<{ [key: string]: Api.System.DictData[] }>({});
 
   const getDict = (key: string) => {

src/utils/sse.ts

@@ -1,6 +1,7 @@
 import { watch } from 'vue';
 import { useEventSource } from '@vueuse/core';
 import useNoticeStore from '@/store/modules/notice';
+import { $t } from '@/locales';
 import { localStg } from './storage';
 
 // 初始化
@@ -34,9 +35,14 @@ export const initSSE = (url: any) => {
       read: false,
       time: new Date().toLocaleString()
     });
+    let content = data.value;
+    const noticeType = content.match(/\[dict\.(.*?)\]/)?.[1];
+    if (noticeType) {
+      content = content.replace(`dict.${noticeType}`, $t(`dict.${noticeType}` as App.I18n.I18nKey));
+    }
     window.$notification?.create({
       title: '消息',
-      content: data.value,
+      content,
       type: 'success',
       duration: 3000
     });

src/views/_builtin/login/index.vue

@@ -39,8 +39,7 @@ const activeModule = computed(() => moduleMap[props.module || 'pwd-login']);
 </script>
 
 <template>
-  <!-- Copyright By https://github.com/Daymychen/art-design-pro/blob/main/src/components/core/views/login/LoginLeftView.vue -->
+  <div class="scroll box-border size-full flex">
-  <div class="box-border size-full flex">
     <div class="relative box-border hidden h-full w-65vw overflow-hidden bg-primary-50 xl:block dark:bg-primary-900">
       <div class="relative z-100 flex items-center pl-30px pt-30px">
         <SystemLogo class="text-32px text-primary" />
@@ -55,13 +54,13 @@ const activeModule = computed(() => moduleMap[props.module || 'pwd-login']);
       </div>
       <WaveBg />
     </div>
-    <header class="relative h-full flex-1 xl:m-auto sm:!w-full">
+    <div class="relative h-full flex-1 xl:m-auto sm:!w-full">
-      <div class="relative z-100 block flex items-center pl-30px pt-30px xl:hidden">
+      <header class="flex-y-center justify-between px-30px pt-30px xl:justify-end">
-        <SystemLogo class="text-32px text-primary" />
+        <div class="relative z-100 block flex items-center xl:hidden">
-        <h3 class="ml-10px text-20px font-400">{{ $t('system.title') }}</h3>
+          <SystemLogo class="text-32px text-primary" />
-      </div>
+          <h3 class="ml-10px text-20px font-400">{{ $t('system.title') }}</h3>
-      <div class="position-fixed right-30px top-24px z-100 flex items-center justify-end">
+        </div>
-        <div class="ml-15px inline-block flex cursor-pointer select-none p-5px">
+        <div class="flex items-center justify-end">
           <ThemeSchemaSwitch
             :theme-schema="themeStore.themeScheme"
             :show-tooltip="false"
@@ -77,14 +76,30 @@ const activeModule = computed(() => moduleMap[props.module || 'pwd-login']);
             @change-lang="appStore.changeLocale"
           />
         </div>
-      </div>
+      </header>
-      <main class="absolute inset-0 m-auto h-630px max-w-450px w-full overflow-hidden rounded-5px bg-cover px-24px">
+      <main class="mt-10% max-w-450px w-full rounded-5px bg-cover px-24px xl:absolute xl:m-auto">
         <Transition :name="themeStore.page.animateMode" mode="out-in" appear>
           <component :is="activeModule.component" />
         </Transition>
       </main>
-    </header>
+    </div>
   </div>
 </template>
 
-<style scoped></style>
+<style scoped>
+.scroll {
+  overflow: auto;
+}
+
+.scroll::-webkit-scrollbar {
+  display: none;
+}
+
+.scroll {
+  -ms-overflow-style: none;
+}
+
+.scroll {
+  scrollbar-width: none;
+}
+</style>

src/views/system/menu/modules/menu-operate-drawer.vue

@@ -38,6 +38,8 @@ const visible = defineModel<boolean>('visible', {
   default: false
 });
 
+const defaultIcon = import.meta.env.VITE_MENU_ICON;
+
 const iconType = ref<Api.System.IconType>('1');
 const { formRef, validate, restoreValidation } = useNaiveForm();
 const { createRequiredRule, createNumberRequiredRule } = useFormRules();
@@ -69,7 +71,7 @@ function createDefaultModel(): Model {
     visible: '0',
     status: '0',
     perms: '',
-    icon: undefined,
+    icon: defaultIcon,
     remark: ''
   };
 }
@@ -118,6 +120,7 @@ const localIconOptions = localIcons.map<SelectOption>(item => ({
 
 function handleInitModel() {
   queryList.value = [];
+  iconType.value = '1';
   Object.assign(model, createDefaultModel());
 
   if (props.operateType === 'edit' && props.rowData) {
@@ -208,7 +211,7 @@ async function handleSubmit() {
     visible: menuVisible,
     status,
     perms,
-    icon,
+    icon: icon || defaultIcon,
     component: processComponent(component),
     remark
   };

src/views/system/post/index.vue

@@ -323,11 +323,11 @@ function handleResetSearch() {
   }
 
   :deep(.n-tree-node) {
-    height: 33px;
+    height: 30px;
   }
 
   :deep(.n-tree-node-switcher) {
-    height: 33px;
+    height: 30px;
   }
 
   :deep(.n-tree-node-switcher__icon) {

src/views/system/user/index.vue

@@ -1,6 +1,6 @@
 <script setup lang="tsx">
 import { computed, ref } from 'vue';
-import { NButton, NDivider } from 'naive-ui';
+import { NAvatar, NButton, NDivider, NEllipsis } from 'naive-ui';
 import { useBoolean, useLoading } from '@sa/hooks';
 import { jsonClone } from '@sa/utils';
 import { fetchBatchDeleteUser, fetchGetDeptTree, fetchGetUserList, fetchUpdateUserStatus } from '@/service/api/system';
@@ -12,6 +12,7 @@ import { useDownload } from '@/hooks/business/download';
 import ButtonIcon from '@/components/custom/button-icon.vue';
 import { $t } from '@/locales';
 import StatusSwitch from '@/components/custom/status-switch.vue';
+import DictTag from '@/components/custom/dict-tag.vue';
 import UserOperateDrawer from './modules/user-operate-drawer.vue';
 import UserImportModal from './modules/user-import-modal.vue';
 import UserPasswordDrawer from './modules/user-password-drawer.vue';
@@ -65,41 +66,64 @@ const {
       key: 'index',
       title: $t('common.index'),
       align: 'center',
-      width: 64
+      width: 48
     },
     {
       key: 'userName',
       title: $t('page.system.user.userName'),
-      align: 'center',
+      align: 'left',
-      minWidth: 120,
+      width: 200,
-      ellipsis: true
+      ellipsis: true,
+      render: row => {
+        return (
+          <div class="flex items-center justify-center gap-2">
+            <NAvatar src={row.avatar} class="bg-primary">
+              {row.avatar ? undefined : row.nickName.charAt(0)}
+            </NAvatar>
+            <div class="max-w-160px flex flex-col">
+              <NEllipsis>{row.userName}</NEllipsis>
+              <NEllipsis>{row.nickName}</NEllipsis>
+            </div>
+          </div>
+        );
+      }
     },
     {
-      key: 'nickName',
+      key: 'sex',
-      title: $t('page.system.user.nickName'),
+      title: $t('page.system.user.sex'),
       align: 'center',
-      minWidth: 120,
+      width: 80,
-      ellipsis: true
+      ellipsis: true,
+      render(row) {
+        return <DictTag value={row.sex} dictCode="sys_user_sex" />;
+      }
     },
     {
       key: 'deptName',
       title: $t('page.system.user.deptName'),
       align: 'center',
-      minWidth: 120,
+      width: 120,
+      ellipsis: true
+    },
+    {
+      key: 'email',
+      title: $t('page.system.user.email'),
+      align: 'center',
+      width: 120,
       ellipsis: true
     },
     {
       key: 'phonenumber',
       title: $t('page.system.user.phonenumber'),
       align: 'center',
-      minWidth: 120,
+      width: 120,
       ellipsis: true
     },
     {
       key: 'status',
       title: $t('page.system.user.status'),
       align: 'center',
-      minWidth: 80,
+      width: 80,
       render(row) {
         return (
           <StatusSwitch
@@ -115,7 +139,7 @@ const {
       key: 'createTime',
       title: $t('page.system.user.createTime'),
       align: 'center',
-      minWidth: 120
+      width: 120
     },
     {
       key: 'operate',
@@ -341,7 +365,7 @@ function handleResetSearch() {
           :data="data"
           size="small"
           :flex-height="!appStore.isMobile"
-          :scroll-x="962"
+          :scroll-x="1200"
           :loading="loading"
           remote
           :row-key="row => row.userId"
@@ -391,11 +415,11 @@ function handleResetSearch() {
   }
 
   :deep(.n-tree-node) {
-    height: 25px;
+    height: 30px;
   }
 
   :deep(.n-tree-node-switcher) {
-    height: 25px;
+    height: 30px;
   }
 
   :deep(.n-tree-node-switcher__icon) {