浏览代码

修复外链跳转问题

yanglzh 3 年之前
父节点
当前提交
4dbd0a4623
共有 2 个文件被更改,包括 10 次插入7 次删除
  1. 9 6
      src/layout/routerView/link.vue
  2. 1 1
      src/router/backEnd.ts

+ 9 - 6
src/layout/routerView/link.vue

@@ -1,9 +1,9 @@
 <template>
-	<div class="layout-view-bg-white flex layout-view-link" :style="{ height: `calc(100vh - ${setLinkHeight}` }">
-		<a :href="currentRoutemeta?.isLink" target="_blank" rel="opener" class="flex-margin">
-			{{ currentRoutemeta?.title.indexOf('.')>0?$t(currentRoutemeta?.title):currentRoutemeta?.title }}:{{ currentRoutemeta?.isLink }}
-		</a>
-	</div>
+  <div class="layout-view-bg-white flex layout-view-link" :style="{ height: `calc(100vh - ${setLinkHeight}` }">
+    <a :href="currentRouteMeta?.linkUrl" target="_blank" rel="opener" class="flex-margin">
+      {{ currentRouteMeta?.title.indexOf('.')>0?$t(currentRouteMeta?.title):currentRouteMeta?.title }}:{{ currentRouteMeta?.linkUrl }}
+    </a>
+  </div>
 </template>
 
 <script lang="ts">
@@ -15,11 +15,13 @@ import { useStore } from '/@/store/index';
 interface LinkViewState {
 	currentRouteMeta: {
 		isLink: string;
+		linkUrl: string;
 		title: string;
 	};
 }
 interface LinkViewRouteMeta extends RouteMeta {
 	isLink: string;
+	linkUrl: string;
 	title: string;
 }
 
@@ -31,6 +33,7 @@ export default defineComponent({
 		const state = reactive<LinkViewState>({
 			currentRouteMeta: {
 				isLink: '',
+				linkUrl: '',
 				title: '',
 			},
 		});
@@ -44,7 +47,7 @@ export default defineComponent({
 		watch(
 			() => route.path,
 			() => {
-				state.currentRouteMeta = <LinkViewRouteMeta>route.meta;
+				state.currentRouteMeta = route.meta as LinkViewRouteMeta;
 			},
 			{
 				immediate: true,

+ 1 - 1
src/router/backEnd.ts

@@ -89,7 +89,7 @@ export function backEndComponent(routes: any) {
 			isHide: item.isHide,
 			isIframe: item.isIframe,
 			isKeepAlive: item.isKeepAlive,
-			isLink: item.isLink,
+			isLink: item.linkUrl || item.isLink,
 			linkUrl: item.linkUrl,
 			title: item.title,
 		}