fix:添加内部 iframe 展示网页，优化 permission 代码

flipped-aurora · Jan 20, 2025 · 0682000 · 0682000
1 parent ea7fa5c
commit 0682000
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 18 deletions.
diff --git a/web/src/permission.js b/web/src/permission.js
@@ -79,6 +79,11 @@ router.beforeEach(async (to, from) => {
 
   // 设置页面标题
   document.title = getPageTitle(to.meta.title, to)
+
+  if (to.meta.client) {
+    return true
+  }
+
   // 白名单路由处理
   if (WHITE_LIST.includes(to.name)) {
     if (

diff --git a/web/src/view/layout/aside/combinationMode.vue b/web/src/view/layout/aside/combinationMode.vue
@@ -127,12 +127,18 @@
       })
     if (index === route.name) return
     if (index.indexOf('http://') > -1 || index.indexOf('https://') > -1) {
-      query.url = decodeURIComponent(index)
-      router.push({
-        name: 'Iframe',
-        query,
-        params
-      })
+      if (index === 'Iframe') {
+        query.url = decodeURIComponent(index)
+        router.push({
+          name: 'Iframe',
+          query,
+          params
+        })
+        return
+      } else {
+        window.open(index, '_blank')
+        return
+      }
     } else {
       if (!top) {
         router.push({ name: index, query, params })

diff --git a/web/src/view/layout/aside/headMode.vue b/web/src/view/layout/aside/headMode.vue
@@ -70,12 +70,18 @@
       })
     if (index === route.name) return
     if (index.indexOf('http://') > -1 || index.indexOf('https://') > -1) {
-      query.url = decodeURIComponent(index)
-      router.push({
-        name: 'Iframe',
-        query,
-        params
-      })
+      if (index === 'Iframe') {
+        query.url = decodeURIComponent(index)
+        router.push({
+          name: 'Iframe',
+          query,
+          params
+        })
+        return
+      } else {
+        window.open(index, '_blank')
+        return
+      }
     } else {
       router.push({ name: index, query, params })
     }

diff --git a/web/src/view/layout/aside/normalMode.vue b/web/src/view/layout/aside/normalMode.vue
@@ -95,12 +95,18 @@
       })
     if (index === route.name) return
     if (index.indexOf('http://') > -1 || index.indexOf('https://') > -1) {
-      query.url = decodeURIComponent(index)
-      router.push({
-        name: 'Iframe',
-        query,
-        params
-      })
+      if (index === 'Iframe') {
+        query.url = decodeURIComponent(index)
+        router.push({
+          name: 'Iframe',
+          query,
+          params
+        })
+        return
+      } else {
+        window.open(index, '_blank')
+        return
+      }
     } else {
       router.push({ name: index, query, params })
     }