From e15a49a2bde2cb9ed26fbac2bc332bd5ec9c50ae Mon Sep 17 00:00:00 2001
From: liqiang <1206709430@qq.com>
Date: Thu, 30 Jan 2025 12:40:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=A4=96=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/package.json                                  |  2 +-
 web/src/layout/routerView/iframes.vue             | 11 ++++++++++-
 web/src/layout/routerView/link.vue                | 15 ++++++++++++++-
 web/src/types/layout.d.ts                         |  1 +
 .../system/menu/components/MenuFormCom/index.vue  |  1 +
 5 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/web/package.json b/web/package.json
index 7022283..ca4c306 100644
--- a/web/package.json
+++ b/web/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "django-vue3-admin",
-	"version": "3.0.4",
+	"version": "3.1.0",
 	"description": "是一套全部开源的快速开发平台，毫无保留给个人免费使用、团体授权使用。\n    django-vue3-admin 基于RBAC模型的权限控制的一整套基础开发平台，权限粒度达到列级别，前后端分离，后端采用django + django-rest-framework，前端采用基于 vue3 + CompositionAPI + typescript + vite + element plus",
 	"license": "MIT",
 	"scripts": {
diff --git a/web/src/layout/routerView/iframes.vue b/web/src/layout/routerView/iframes.vue
index 6b8ef27..3cf7822 100644
--- a/web/src/layout/routerView/iframes.vue
+++ b/web/src/layout/routerView/iframes.vue
@@ -23,6 +23,7 @@
 <script setup lang="ts" name="layoutIframeView">
 import { computed, watch, ref, nextTick } from 'vue';
 import { useRoute } from 'vue-router';
+import {cookie} from "xe-utils";
 
 // 定义父组件传过来的值
 const props = defineProps({
@@ -49,7 +50,15 @@ const route = useRoute();
 
 // 处理 list 列表，当打开时，才进行加载
 const setIframeList = computed(() => {
-	return (<RouteItems>props.list).filter((v: RouteItem) => v.meta?.isIframeOpen);
+	return (<RouteItems>props.list).filter((v: RouteItem) => {
+    if (v.meta?.isIframeOpen) {
+        const isLink = v.meta?.isLink || '';
+      	if (isLink.includes("{{token}}")) {
+          v.meta.isLink = isLink.replace("{{token}}", cookie.get('token'))
+        }
+    }
+    return v.meta?.isIframeOpen
+  });
 });
 // 获取 iframe 当前路由 path
 const getRoutePath = computed(() => {
diff --git a/web/src/layout/routerView/link.vue b/web/src/layout/routerView/link.vue
index ccdc3a4..f69000c 100644
--- a/web/src/layout/routerView/link.vue
+++ b/web/src/layout/routerView/link.vue
@@ -17,19 +17,31 @@
 import { reactive, watch } from 'vue';
 import { useRoute } from 'vue-router';
 import { verifyUrl } from '/@/utils/toolsValidate';
+import {cookie} from "xe-utils";
 
 // 定义变量内容
 const route = useRoute();
 const state = reactive<LinkViewState>({
 	title: '',
 	isLink: '',
+  query: null
 });
 
 // 立即前往
 const onGotoFullPage = () => {
 	const { origin, pathname } = window.location;
+  if (state.isLink.includes("{{token}}")) {
+		state.isLink = state.isLink.replace("{{token}}", cookie.get('token'))
+	}
 	if (verifyUrl(<string>state.isLink)) window.open(state.isLink);
-	else window.open(`${origin}${pathname}#${state.isLink}`);
+	else {
+    function objectToUrlParams(obj: { [key: string]: string | number }): string {
+      return Object.keys(obj)
+          .map(key => encodeURIComponent(key) + '=' + encodeURIComponent(obj[key]))
+          .join('&');
+    }
+    window.open(`${origin}${pathname}#${state.isLink}?${objectToUrlParams(state.query)}`)
+  };
 };
 // 监听路由的变化，设置内容
 watch(
@@ -37,6 +49,7 @@ watch(
 	() => {
 		state.title = <string>route.meta.title;
 		state.isLink = <string>route.meta.isLink;
+    state.query = <any>route.query;
 	},
 	{
 		immediate: true,
diff --git a/web/src/types/layout.d.ts b/web/src/types/layout.d.ts
index 82904ef..4d7a029 100644
--- a/web/src/types/layout.d.ts
+++ b/web/src/types/layout.d.ts
@@ -56,4 +56,5 @@ declare type ParentViewState<T = any> = {
 declare type LinkViewState = {
 	title: string;
 	isLink: string;
+	query: any;
 };
diff --git a/web/src/views/system/menu/components/MenuFormCom/index.vue b/web/src/views/system/menu/components/MenuFormCom/index.vue
index d958a62..5f64d5a 100644
--- a/web/src/views/system/menu/components/MenuFormCom/index.vue
+++ b/web/src/views/system/menu/components/MenuFormCom/index.vue
@@ -85,6 +85,7 @@
 
 				<el-form-item v-if="!menuFormData.is_catalog && menuFormData.is_link" label="外链接" prop="link_url">
 					<el-input v-model="menuFormData.link_url" placeholder="请输入外链接地址" />
+          <el-alert :title="`输入{{token}}可自动替换系统 token `" type="info" />
 				</el-form-item>
 
 				<el-form-item v-if="!menuFormData.is_catalog" label="缓存">