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 @@ - + {{navMenu.meta.title}} - + {{navMenu.meta.title}} @@ -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; + } } } 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 @@ - - {{item.meta.title}} - + + + {{item.meta.title}} + + @@ -40,3 +42,9 @@ } } + + 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 @@ {{ pmenu.meta.title }} - + @@ -59,7 +59,7 @@ {{ pmenu.meta.title }} - + 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 @@ + + + + + + 子节点或详情页需要高亮的上级菜单路由地址 + 如父节点、链接或Iframe等没有视图的菜单不需要填写 隐藏菜单 + 隐藏面包屑 菜单不显示在导航中,但用户依然可以访问,例如详情页 @@ -59,9 +67,11 @@ name: "", path: "", component: "", + redirect: "", meta:{ title: "", icon: "", + active: "", type: "menu" } },