From b4c2d0d79c9cd91ce41bed22b0f8af6a1402ffa2 Mon Sep 17 00:00:00 2001
From: sakuya <81883387@qq.com>
Date: Sun, 6 Jun 2021 22:54:59 +0800
Subject: [PATCH] UP 1.1.5

---
 package.json                      |  2 +-
 src/config/index.js               |  2 +-
 src/layout/components/NavMenu.vue | 17 ++++++++++++++---
 src/layout/components/topbar.vue  | 14 +++++++++++---
 src/layout/index.vue              |  4 ++--
 src/router/index.js               |  1 +
 src/views/home/components/C2.vue  | 13 +++++++++++++
 src/views/setting/menu/save.vue   | 10 ++++++++++
 8 files changed, 53 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index f15a101e..22e189bf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "SCUI-Admin",
-	"version": "1.1.4",
+	"version": "1.1.5",
 	"private": true,
 	"scripts": {
 		"serve": "vue-cli-service serve",
diff --git a/src/config/index.js b/src/config/index.js
index 2de351d8..77e48f98 100644
--- a/src/config/index.js
+++ b/src/config/index.js
@@ -3,7 +3,7 @@ const DEFAULT_CONFIG = {
 	APP_NAME: "SCUI",
 
 	//版本号
-	APP_VER: "1.1.4",
+	APP_VER: "1.1.5",
 
 	//接口地址
 	API_URL: "",
diff --git a/src/layout/components/NavMenu.vue b/src/layout/components/NavMenu.vue
index d30e97f8..00f802a8 100644
--- a/src/layout/components/NavMenu.vue
+++ b/src/layout/components/NavMenu.vue
@@ -3,14 +3,14 @@
 		<el-alert title="无子集菜单" center type="info" :closable="false"></el-alert>
 	</div>
 	<template v-for="navMenu in navMenus" v-bind:key="navMenu">
-		<el-menu-item v-if="!navMenu.children" :index="navMenu.path">
+		<el-menu-item v-if="!hasChildren(navMenu)" :index="navMenu.path">
 			<a v-if="navMenu.meta&&navMenu.meta.type=='link'" :href="navMenu.path" target="_blank" @click.stop='a'></a>
 			<i v-if="navMenu.meta&&navMenu.meta.icon" :class="navMenu.meta.icon || 'el-icon-menu'"></i>
 			<template #title>
 				<span>{{navMenu.meta.title}}</span>
 			</template>
 		</el-menu-item>
-		<el-submenu v-if="navMenu.children" :index="navMenu.path">
+		<el-submenu v-else :index="navMenu.path">
 			<template #title>
 				<i v-if="navMenu.meta&&navMenu.meta.icon" :class="navMenu.meta.icon || 'el-icon-menu'"></i>
 				<span>{{navMenu.meta.title}}</span>
@@ -28,7 +28,18 @@
 			return {}
 		},
 		methods: {
-			a(){}
+			a(){},
+			hasChildren(item){
+				var flag = true
+				if (item.children) {
+					if (item.children.every(item => item.meta.hidden)){
+						flag = false
+					}
+				}else{
+					flag = false
+				}
+				return flag;
+			}
 		}
 	}
 </script>
diff --git a/src/layout/components/topbar.vue b/src/layout/components/topbar.vue
index 9a2c0f7e..c2d590f1 100644
--- a/src/layout/components/topbar.vue
+++ b/src/layout/components/topbar.vue
@@ -5,9 +5,11 @@
 				<i class="el-icon-s-fold"></i>
 			</div>
 			<el-breadcrumb separator-class="el-icon-arrow-right" class="hidden-sm-and-down">
-				<template v-for="(item) in breadList" v-bind:key="item" >
-					<el-breadcrumb-item v-if="item.path !='/'">{{item.meta.title}}</el-breadcrumb-item>
-				</template>
+				<transition-group name="breadcrumb" mode="out-in">
+					<template v-for="item in breadList" :key="item.meta.title" >
+						<el-breadcrumb-item v-if="item.path!='/' &&  !item.meta.hiddenBreadcrumb" :key="item.meta.title">{{item.meta.title}}</el-breadcrumb-item>
+					</template>
+				</transition-group>
 			</el-breadcrumb>
 		</div>
 		<div class="center-panel"></div>
@@ -40,3 +42,9 @@
 		}
 	}
 </script>
+
+<style scoped>
+	.breadcrumb-enter-active,.breadcrumb-leave-active {transition: all 0.3s;}
+	.breadcrumb-enter-from,.breadcrumb-leave-active {opacity: 0;transform: translateX(20px);}
+	.breadcrumb-leave-active {position: absolute;}
+</style>
diff --git a/src/layout/index.vue b/src/layout/index.vue
index 6240ee1d..472b4b95 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -24,7 +24,7 @@
 					<h2>{{ pmenu.meta.title }}</h2>
 				</div>
 				<div class="adminui-side-scroll">
-					<el-menu :default-active="$route.fullPath" router :collapse="menuIsCollapse">
+					<el-menu :default-active="$route.meta.active || $route.fullPath" router :collapse="menuIsCollapse">
 						<NavMenu :navMenus="nextMenu"></NavMenu>
 					</el-menu>
 				</div>
@@ -59,7 +59,7 @@
 					<h2>{{ pmenu.meta.title }}</h2>
 				</div>
 				<div class="adminui-side-scroll">
-					<el-menu :default-active="$route.fullPath" router :collapse="menuIsCollapse">
+					<el-menu :default-active="$route.meta.active || $route.fullPath" router :collapse="menuIsCollapse">
 						<NavMenu :navMenus="nextMenu"></NavMenu>
 					</el-menu>
 				</div>
diff --git a/src/router/index.js b/src/router/index.js
index db7d98d8..322dda53 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -140,6 +140,7 @@ function filterAsyncRouter(routerMap) {
 			path: item.path,
 			name: item.name,
 			meta: item.meta,
+			redirect: item.redirect,
 			children: item.children ? filterAsyncRouter(item.children) : null,
 			component: loadComponent(item.component)
 		}
diff --git a/src/views/home/components/C2.vue b/src/views/home/components/C2.vue
index 8c4a7c87..2b5cb0d5 100644
--- a/src/views/home/components/C2.vue
+++ b/src/views/home/components/C2.vue
@@ -22,6 +22,19 @@
 		data() {
 			return {
 				activities: [
+					{
+						content: [
+							"[新增] 统计列表、日历计划模板",
+							"[新增] 表单表格组件",
+							"[新增] 面包屑动画",
+							"[新增] 路由meta.active属性",
+							"[新增] 路由meta.hiddenBreadcrumb属性",
+							"[新增] 路由redirect属性",
+							"[优化] 子菜单隐藏无效",
+							"[修复] scEcharts动画失效"
+						],
+						timestamp: '2021-06-06'
+					},
 					{
 						content: [
 							"[优化] 代码生成器重构移位"
diff --git a/src/views/setting/menu/save.vue b/src/views/setting/menu/save.vue
index 32e5c01e..b04b6e65 100644
--- a/src/views/setting/menu/save.vue
+++ b/src/views/setting/menu/save.vue
@@ -29,12 +29,20 @@
 				<el-form-item label="路由地址" prop="path">
 					<el-input v-model="form.path" clearable placeholder=""></el-input>
 				</el-form-item>
+				<el-form-item label="重定向" prop="redirect">
+					<el-input v-model="form.redirect" clearable placeholder=""></el-input>
+				</el-form-item>
+				<el-form-item label="菜单高亮" prop="active">
+					<el-input v-model="form.active" clearable placeholder=""></el-input>
+					<div class="el-form-item-msg">子节点或详情页需要高亮的上级菜单路由地址</div>
+				</el-form-item>
 				<el-form-item label="视图" prop="component">
 					<el-autocomplete v-model="form.component" :fetch-suggestions="querySearch" :debounce="10" clearable placeholder=""></el-autocomplete>
 					<div class="el-form-item-msg">如父节点、链接或Iframe等没有视图的菜单不需要填写</div>
 				</el-form-item>
 				<el-form-item label="是否隐藏" prop="meta.hidden">
 					<el-checkbox v-model="form.meta.hidden">隐藏菜单</el-checkbox>
+					<el-checkbox v-model="form.meta.hiddenBreadcrumb">隐藏面包屑</el-checkbox>
 					<div class="el-form-item-msg">菜单不显示在导航中，但用户依然可以访问，例如详情页</div>
 				</el-form-item>
 				<el-form-item>
@@ -59,9 +67,11 @@
 					name: "",
 					path: "",
 					component: "",
+					redirect: "",
 					meta:{
 						title: "",
 						icon: "",
+						active: "",
 						type: "menu"
 					}
 				},