From abef357ec02116a10fa76ad74aa53c8c613a2a3d Mon Sep 17 00:00:00 2001
From: lyt <1105290566@qq.com>
Date: Mon, 31 May 2021 16:29:27 +0800
Subject: [PATCH] =?UTF-8?q?'admin-21.05.31:=E4=BF=AE=E5=A4=8D=E5=88=86?=
 =?UTF-8?q?=E6=A0=8F=E5=B8=83=E5=B1=80=E8=B7=AF=E7=94=B1=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?meta.isHide=E4=B8=BAtrue=E6=97=B6=E6=8A=A5=E9=94=99=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=8C=E6=84=9F=E8=B0=A2=E7=BE=A4=E5=8F=8B@29'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                | 11 +++++++++++
 package.json                                |  8 ++++----
 src/views/layout/component/columnsAside.vue |  2 ++
 3 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..e660d38
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,11 @@
+# <a href="https://gitee.com/lyt-top/vue-next-admin/tree/vue-prev-admin" target="_blank">vue-prev-admin 更新日志</a>
+
+🎉🎉🔥 `vue-prev-admin` 基于 vue2.x + webpack + element ui，适配手机、平板、pc 的后台开源免费模板库（vue3.x 请切换 master 分支）
+
+## 1.0.1
+
+`2021.05.31`
+
+- 🎉 新增 更新日志文件 `CHANGELOG.md`，以后每次更新都会在这里显示对应内容
+- 🌟 更新 依赖更新最新版本
+- 🐞 修复 分栏布局路由设置 `meta.isHide` 为 `true` 时报错问题，感谢群友@29
diff --git a/package.json b/package.json
index 4633a40..63263b0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "vue-prev-admin",
-	"version": "1.0.0",
+	"version": "1.0.1",
 	"private": true,
 	"scripts": {
 		"dev": "vue-cli-service serve",
@@ -11,10 +11,10 @@
 	"dependencies": {
 		"axios": "^0.21.1",
 		"clipboard": "^2.0.8",
-		"core-js": "^3.13.0",
+		"core-js": "^3.13.1",
 		"countup.js": "^2.0.7",
 		"echarts": "^5.1.1",
-		"element-ui": "^2.15.1",
+		"element-ui": "^2.15.2",
 		"nprogress": "^0.2.0",
 		"screenfull": "^5.1.0",
 		"sign-canvas": "^1.1.4",
@@ -34,7 +34,7 @@
 		"@vue/cli-service": "~4.5.13",
 		"babel-eslint": "^10.1.0",
 		"eslint": "^7.27.0",
-		"eslint-plugin-vue": "^7.9.0",
+		"eslint-plugin-vue": "^7.10.0",
 		"sass": "^1.34.0",
 		"sass-loader": "^10.1.1",
 		"vue-template-compiler": "^2.6.12"
diff --git a/src/views/layout/component/columnsAside.vue b/src/views/layout/component/columnsAside.vue
index b437c67..162e7fd 100644
--- a/src/views/layout/component/columnsAside.vue
+++ b/src/views/layout/component/columnsAside.vue
@@ -88,6 +88,7 @@ export default {
 			if (this.$store.state.routesList.routesList.length <= 0) return false;
 			this.columnsAsideList = this.filterRoutesFun(this.$store.state.routesList.routesList);
 			const resData = this.setSendChildren(this.$route.path);
+			if (Object.keys(resData).length <= 0) return false;
 			this.onColumnsAsideDown(resData.item[0].k);
 			this.bus.$emit('setSendColumnsChildren', resData);
 		},
@@ -121,6 +122,7 @@ export default {
 			this.routeSplit.shift();
 			const routeFirst = `/${this.routeSplit[0]}`;
 			const currentSplitRoute = this.columnsAsideList.find((v) => v.path === routeFirst);
+			if (!currentSplitRoute) return false;
 			// 延迟拿值，防止取不到
 			setTimeout(() => {
 				this.onColumnsAsideDown(currentSplitRoute.k);