修复 svgicon组件不设置颜色不能正常使用本地svg图标的问题

修复 通过路由去登录受布局滚动条影响的问题
修复 token未过期通过cookie获取会去登录的问题

src/components/svgIcon/index.vue

@@ -25,6 +25,7 @@ const props = defineProps({
   // svg 颜色
   color: {
     type: String,
+    default: () => 'currentColor',
   },
 })
 

src/layout/main/classic.vue

@@ -43,7 +43,7 @@ const initScrollBarHeight = () => {
     setTimeout(() => {
       updateScrollbar()
       // '!' not null 断言操作符，不执行运行时检查
-      layoutMainRef.value!.layoutMainScrollbarRef.wrapRef.scrollTop = 0
+      if (layoutMainRef.value) layoutMainRef.value!.layoutMainScrollbarRef.wrapRef.scrollTop = 0
     }, 500)
   })
 }

src/layout/main/columns.vue

@@ -33,17 +33,17 @@ const { themeConfig } = storeToRefs(storesThemeConfig)
 // 重置滚动条高度
 const updateScrollbar = () => {
   // 更新父级 scrollbar
-  layoutScrollbarRef.value.update()
+  layoutScrollbarRef.value?.update()
   // 更新子级 scrollbar
-  layoutMainRef.value!.layoutMainScrollbarRef.update()
+  layoutMainRef.value?.layoutMainScrollbarRef.update()
 }
 // 重置滚动条高度，由于组件是异步引入的
 const initScrollBarHeight = () => {
   nextTick(() => {
     setTimeout(() => {
       updateScrollbar()
-      layoutScrollbarRef.value.wrapRef.scrollTop = 0
-      layoutMainRef.value!.layoutMainScrollbarRef.wrapRef.scrollTop = 0
+      if (layoutScrollbarRef.value) layoutScrollbarRef.value.wrapRef.scrollTop = 0
+      if (layoutMainRef.value) layoutMainRef.value!.layoutMainScrollbarRef.wrapRef.scrollTop = 0
     }, 500)
   })
 }

src/layout/main/defaults.vue

@@ -32,17 +32,17 @@ const { themeConfig } = storeToRefs(storesThemeConfig)
 // 重置滚动条高度
 const updateScrollbar = () => {
   // 更新父级 scrollbar
-  layoutScrollbarRef.value.update()
+  layoutScrollbarRef.value?.update()
   // 更新子级 scrollbar
-  layoutMainRef.value!.layoutMainScrollbarRef.update()
+  layoutMainRef.value?.layoutMainScrollbarRef.update()
 }
 // 重置滚动条高度，由于组件是异步引入的
 const initScrollBarHeight = () => {
   nextTick(() => {
     setTimeout(() => {
       updateScrollbar()
-      layoutScrollbarRef.value.wrapRef.scrollTop = 0
-      layoutMainRef.value!.layoutMainScrollbarRef.wrapRef.scrollTop = 0
+      if (layoutScrollbarRef.value) layoutScrollbarRef.value.wrapRef.scrollTop = 0
+      if (layoutMainRef.value) layoutMainRef.value!.layoutMainScrollbarRef.wrapRef.scrollTop = 0
     }, 500)
   })
 }

src/layout/main/transverse.vue

@@ -23,14 +23,14 @@ const route = useRoute()
 
 // 重置滚动条高度，更新子级 scrollbar
 const updateScrollbar = () => {
-  layoutMainRef.value!.layoutMainScrollbarRef.update()
+  layoutMainRef.value?.layoutMainScrollbarRef.update()
 }
 // 重置滚动条高度，由于组件是异步引入的
 const initScrollBarHeight = () => {
   nextTick(() => {
     setTimeout(() => {
       updateScrollbar()
-      layoutMainRef.value!.layoutMainScrollbarRef.wrapRef.scrollTop = 0
+      if (layoutMainRef.value) layoutMainRef.value!.layoutMainScrollbarRef.wrapRef.scrollTop = 0
     }, 500)
   })
 }

src/router/backEnd.ts

@@ -3,7 +3,6 @@ import { RouteRecordRaw } from 'vue-router'
 import pinia from '/@/stores/index'
 import { useUserInfo } from '/@/stores/userInfo'
 import { useRequestOldRoutes } from '/@/stores/requestOldRoutes'
-import { Session } from '/@/utils/storage'
 import { NextLoading } from '/@/utils/loading'
 import { dynamicRoutes, notFoundAndNoPower } from '/@/router/route'
 import { formatTwoStageRoutes, formatFlatteningRoutes, router } from '/@/router/index'
@@ -12,6 +11,7 @@ import { useTagsViewRoutes } from '/@/stores/tagsViewRoutes'
 // import { useMenuApi } from '/@/api/menu/index'
 import { AuthApi } from '/@/api/admin/Auth'
 import { listToTree } from '/@/utils/tree'
+import { getToken } from '/@/api/admin/http-client'
 
 // 后端控制路由
 
@@ -39,7 +39,7 @@ export async function initBackEndControlRoutes() {
   // 界面 loading 动画开始执行
   if (window.nextLoading === undefined) NextLoading.start()
   // 无 token 停止执行下一步
-  if (!Session.get('token')) return false
+  if (!getToken()) return false
   // 触发初始化用户信息 pinia
   // https://gitee.com/lyt-top/vue-next-admin/issues/I5F1HP
   await useUserInfo().setUserInfos()

src/router/frontEnd.ts

@@ -3,11 +3,11 @@ import { storeToRefs } from 'pinia'
 import { formatTwoStageRoutes, formatFlatteningRoutes, router } from '/@/router/index'
 import { dynamicRoutes, notFoundAndNoPower } from '/@/router/route'
 import pinia from '/@/stores/index'
-import { Session } from '/@/utils/storage'
 import { useUserInfo } from '/@/stores/userInfo'
 import { useTagsViewRoutes } from '/@/stores/tagsViewRoutes'
 import { useRoutesList } from '/@/stores/routesList'
 import { NextLoading } from '/@/utils/loading'
+import { getToken } from '/@/api/admin/http-client'
 
 // 前端控制路由
 
@@ -22,7 +22,7 @@ export async function initFrontEndControlRoutes() {
   // 界面 loading 动画开始执行
   if (window.nextLoading === undefined) NextLoading.start()
   // 无 token 停止执行下一步
-  if (!Session.get('token')) return false
+  if (!getToken()) return false
   // 触发初始化用户信息 pinia
   // https://gitee.com/lyt-top/vue-next-admin/issues/I5F1HP
   await useUserInfo(pinia).setUserInfos()

src/router/index.ts

@@ -11,7 +11,7 @@ import { Session, Local } from '/@/utils/storage'
 import { staticRoutes, notFoundAndNoPower } from '/@/router/route'
 import { initFrontEndControlRoutes } from '/@/router/frontEnd'
 import { initBackEndControlRoutes } from '/@/router/backEnd'
-import { adminTokenKey } from '/@/api/admin/http-client'
+import { adminTokenKey, getToken } from '/@/api/admin/http-client'
 import { ElMessage } from 'element-plus'
 
 /**
@@ -97,7 +97,7 @@ export function formatTwoStageRoutes(arr: any) {
 router.beforeEach(async (to, from, next) => {
   NProgress.configure({ showSpinner: false })
   if (to.meta.title) NProgress.start()
-  const token = Session.get('token')
+  const token = getToken()
   if (to.path === '/login' && !token) {
     next()
     NProgress.done()