Fix flipped-aurora#1365 (flipped-aurora#1469)

JunIce · web-flow · commit 9480f96d2b61 · 2023-07-14T21:21:25.000+08:00
* fix(web): 修复默认不存在时跳转问题

* feature(web): 图片组件增加预览
diff --git a/web/src/components/customPic/index.vue b/web/src/components/customPic/index.vue
@@ -9,7 +9,7 @@
       <img v-else :src="noAvatar" class="avatar">
     </template>
     <template v-if="picType === 'file'">
-      <img :src="file" class="file">
+      <el-image :src="file" class="file" :preview-src-list="previewSrcList" :preview-teleported="true"/>
     </template>
   </span>
 </template>
@@ -34,6 +34,10 @@ const props = defineProps({
     type: String,
     required: false,
     default: ''
+  },
+  preview: {
+    type: Boolean,
+    default: false
   }
 })
 
@@ -61,6 +65,7 @@ const file = computed(() => {
   }
   return props.picSrc
 })
+const previewSrcList = computed(() => props.preview ? [file.value] : [])
 
 </script>
 
diff --git a/web/src/permission.js b/web/src/permission.js
@@ -51,7 +51,11 @@ router.beforeEach(async(to, from) => {
       }
       // token 可以解析但是却是不存在的用户 id 或角色 id 会导致无限调用
       if (userStore.userInfo?.authority?.defaultRouter != null) {
-        return { name: userStore.userInfo.authority.defaultRouter }
+        if (router.hasRoute(userStore.userInfo.authority.defaultRouter)) {
+          return { name: userStore.userInfo.authority.defaultRouter }
+        } else {
+          return { path: '/layout/404' }
+        }
       } else {
         // 强制退出账号
         userStore.ClearStorage()
@@ -72,7 +76,11 @@ router.beforeEach(async(to, from) => {
       if (!routerStore.asyncRouterFlag && whiteList.indexOf(from.name) < 0) {
         await getRouter(userStore)
         if (userStore.token) {
-          return { ...to, replace: true }
+          if (router.hasRoute(userStore.userInfo.authority.defaultRouter)) {
+            return { ...to, replace: true }
+          } else {
+            return { path: '/layout/404' }
+          }
         } else {
           return {
             name: 'Login',
diff --git a/web/src/pinia/modules/user.js b/web/src/pinia/modules/user.js
@@ -65,7 +65,13 @@ export const useUserStore = defineStore('user', () => {
         asyncRouters.forEach(asyncRouter => {
           router.addRoute(asyncRouter)
         })
-        await router.replace({ name: userInfo.value.authority.defaultRouter })
+
+        if (!router.hasRoute(userInfo.value.authority.defaultRouter)) {
+          ElMessage.error("请联系管理员进行授权")
+        } else {
+          await router.replace({ name: userInfo.value.authority.defaultRouter })
+        }
+
         loadingInstance.value.close()
 
         const isWin = ref(/windows/i.test(navigator.userAgent))
diff --git a/web/src/view/example/upload/upload.vue b/web/src/view/example/upload/upload.vue
@@ -33,7 +33,7 @@
       <el-table :data="tableData">
         <el-table-column align="left" label="预览" width="100">
           <template #default="scope">
-            <CustomPic pic-type="file" :pic-src="scope.row.url" />
+            <CustomPic pic-type="file" :pic-src="scope.row.url" preview/>
           </template>
         </el-table-column>
         <el-table-column align="left" label="日期" prop="UpdatedAt" width="180">
