From 8ab22b0a02a3558faa280491daa364aac2be5cf7 Mon Sep 17 00:00:00 2001
From: lyt-Top <1105290566@qq.com>
Date: Tue, 22 Jun 2021 22:03:59 +0800
Subject: [PATCH] =?UTF-8?q?'admin-21.06.22:=E4=BF=AE=E5=A4=8D=E5=86=85?=
 =?UTF-8?q?=E5=B5=8Ciframe=E4=B8=8D=E5=8F=AF=E4=BD=BF=E7=94=A8=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md          | 7 +++++++
 package.json          | 4 ++--
 src/router/backEnd.ts | 6 ++++--
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f0d2212..233c51f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 🎉🎉🔥 `vue-next-admin` 基于 vue3.x 、Typescript、vite、Element plus 等，适配手机、平板、pc 的后台开源免费模板库（vue2.x 请切换 vue-prev-admin 分支）
 
+## 1.0.5
+
+`2021.06.22`
+
+- 🌟 更新 vite 降级为@vite2.3.7，降级方法 `cnpm install @vite2.3.7 --save-dev`，防止 element plus 字体图标消失
+- 🐞 修复 开启后端控制路由（isRequestRoutes = true）时，内嵌 iframe、外链不可使用的问题
+
 ## 1.0.4
 
 `2021.06.19`
diff --git a/package.json b/package.json
index dae2e36..10a3fb9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "vue-next-admin",
-	"version": "1.0.4",
+	"version": "1.0.5",
 	"scripts": {
 		"dev": "vite",
 		"build": "vite build",
@@ -46,7 +46,7 @@
 		"sass": "^1.35.1",
 		"sass-loader": "^12.1.0",
 		"typescript": "^4.3.4",
-		"vite": "^2.3.7",
+		"vite": "^2.3.8",
 		"vue-eslint-parser": "^7.6.0"
 	},
 	"browserslist": [
diff --git a/src/router/backEnd.ts b/src/router/backEnd.ts
index 78175f6..aa064c8 100644
--- a/src/router/backEnd.ts
+++ b/src/router/backEnd.ts
@@ -5,12 +5,14 @@ import { setAddRoute, setFilterMenuAndCacheTagsViewRoutes } from '/@/router/inde
 import { dynamicRoutes } from '/@/router/route';
 import { getMenuAdmin, getMenuTest } from '/@/api/menu/index';
 
+const layouModules: any = import.meta.glob('../layout/routerView/*.{vue,tsx}');
+const viewsModules: any = import.meta.glob('../views/**/*.{vue,tsx}');
 /**
  * 获取目录下的 .vue、.tsx 全部文件
  * @method import.meta.glob
  * @link 参考：https://cn.vitejs.dev/guide/features.html#json
  */
-const dynamicViewsModules: Record<string, Function> = import.meta.glob('../views/**/*.{vue,tsx}');
+const dynamicViewsModules: Record<string, Function> = Object.assign({}, { ...layouModules }, { ...viewsModules });
 
 /**
  * 后端控制路由：初始化方法，防止刷新时路由丢失
@@ -85,7 +87,7 @@ export function backEndComponent(routes: any) {
 export function dynamicImport(dynamicViewsModules: Record<string, Function>, component: string) {
 	const keys = Object.keys(dynamicViewsModules);
 	const matchKeys = keys.filter((key) => {
-		const k = key.replace('../views', '');
+		const k = key.replace(/..\/views|../, '');
 		return k.startsWith(`${component}`) || k.startsWith(`/${component}`);
 	});
 	if (matchKeys?.length === 1) {