v2.6.5版本更新 (#1757)

* feature:增加资源加载loading

* feature:修正sql无法落盘的问题

* fixed: 修复切换角色出现404的问题。

* 删除selectImage.vue中chooseImg下多余的console.log(url)

---------

Co-authored-by: krank <emosick@qq.com>
Co-authored-by: Qing Liang <106448173+xue-ding-e@users.noreply.github.com>

web/src/permission.js

@@ -3,6 +3,8 @@ import { useRouterStore } from '@/pinia/modules/router'
 import getPageTitle from '@/utils/page'
 import router from '@/router'
 import Nprogress from 'nprogress'
+import 'nprogress/nprogress.css'
+Nprogress.configure({ showSpinner: false, ease: 'ease', speed: 500 })
 
 const whiteList = ['Login', 'Init']
 
@@ -75,6 +77,11 @@ router.beforeEach(async(to, from) => {
   } else {
     // 不在白名单中并且已经登录的时候
     if (token) {
+      console.log(sessionStorage.getItem("needCloseAll"))
+      if(sessionStorage.getItem("needToHome") === 'true') {
+        sessionStorage.removeItem("needToHome")
+        return { path: '/'}
+      }
       // 添加flag防止多次获取动态路由和栈溢出
       if (!routerStore.asyncRouterFlag && whiteList.indexOf(from.name) < 0) {
         await getRouter(userStore)
@@ -110,13 +117,23 @@ router.beforeEach(async(to, from) => {
   }
 })
 
+const removeLoading = () => {
+  const element = document.getElementById('gva-loading-box');
+  if (element) {
+    element.remove();
+  }
+}
+
 router.afterEach(() => {
   // 路由加载完成后关闭进度条
   document.getElementsByClassName('main-cont main-right')[0]?.scrollTo(0, 0)
+  removeLoading()
   Nprogress.done()
 })
 
 router.onError(() => {
   // 路由发生错误后销毁进度条
+  removeLoading()
   Nprogress.remove()
 })
+