Merge branch '0.3.6' into vue-next

Author: vanoneang

README.md

@@ -9,7 +9,7 @@
   <a href="#简介">简介</a>&nbsp;|&nbsp;<a href="#快速上手">快速上手</a>&nbsp;|&nbsp;<a href="#版本日志">版本日志</a>
 </p>
 
-![](https://img.shields.io/badge/版本-0.2.1-3963bc.svg)
+![](https://img.shields.io/badge/版本-0.3.5-3963bc.svg)
 ![](https://img.shields.io/badge/node-8.11.0+-3963bc.svg)
 ![](https://img.shields.io/badge/脚手架-vuecli3-3963bc.svg)
 ![](https://img.shields.io/badge/license-MIT-3963bc.svg)
@@ -25,17 +25,19 @@ Lin-CMS 可以有效的帮助开发者提高 CMS 的开发效率。
 
 Lin-CMS 是一套前后端完整的解决方案，后端部署请移步：
 
+[lin-cms-koa](https://github.com/TaleLin/lin-cms-koa)
+
 [lin-cms-flask](https://github.com/TaleLin/lin-cms-flask)
 
-[lin-cms-koa](https://github.com/TaleLin/lin-cms-koa)
+[lin-cms-spring-boot](https://github.com/TaleLin/lin-cms-spring-boot)
 
 ### 注意
 
 **Lin-CMS 是工程类开源项目，不能保证无缝升级**
 
 ### 文档地址
 
-[http://doc.cms.7yue.pro/](http://doc.cms.7yue.pro/)
+[http://doc.cms.talelin.com/](http://doc.cms.talelin.com/)
 
 ### 线上 Demo
 
@@ -91,13 +93,13 @@ npm run serve or yarn (run) serve
 <br>
 <img class="QR-img" src="http://i1.sleeve.7yue.pro/wechat-account.jpeg" width="150" height="150">
 
-QQ群搜索：林间有风 或 643205479
+QQ群搜索：Lin CMS 官方交流群 或 814597236
 
-<img src="https://consumerminiaclprd01.blob.core.chinacloudapi.cn/miniappbackground/sfgmember/lin/qrcode_1558012902375.jpg" width="150" height="205" >
+<img src="https://consumerminiaclprd01.blob.core.chinacloudapi.cn/miniappbackground/sfgmember/lin/lin-cms.png" width="150" height="205" >
 
 ## 版本日志
 
-最新版本 `0.3.4`
+最新版本 `0.3.5`
 
 ### 0.3.5
 

src/component/layout/breadcrumb.vue

@@ -21,10 +21,6 @@ export default {
       return this.stageInfo.map(item => item.title).filter(item => !!item)
     },
   },
-  // created() {},
-  // mounted() {},
-  // watch: {},
-  // components: {},
 }
 </script>
 

src/plugin/custom/stage-config.js

@@ -12,7 +12,7 @@ const CustomRouter = {
       title: 'upload 图像上传',
       type: 'view',
       name: 'ImgsUploadDemo',
-      route: '/upload-image/stage1',
+      route: '/custom/upload-image',
       filePath: 'plugin/custom/view/upload-image.vue',
       inNav: true,
       icon: 'iconfont icon-zidingyi',

src/router/home-router.js

@@ -1,12 +1,14 @@
 import stageConfig from '@/config/stage' // 引入舞台配置
 
+console.log('stageConfig', stageConfig)
+
 // 深度遍历配置树, 摘取叶子节点作为路由部分
 function deepTravel(config, fuc) {
   if (Array.isArray(config)) {
     config.forEach(subConfig => {
       deepTravel(subConfig, fuc)
     })
-  } else if (config.children) {
+  } else if (config.children && config.children.length) {
     config.children.forEach(subConfig => {
       deepTravel(subConfig, fuc)
     })
@@ -33,4 +35,6 @@ deepTravel(stageConfig, viewConfig => {
   homeRouter.push(viewRouter)
 })
 
+console.log(homeRouter)
+
 export default homeRouter

src/store/getter.js

@@ -27,25 +27,34 @@ export const readedMessages = state => state.readedMessages
 
 export const unreadMessages = state => state.unreadMessages
 
+/**
+ * 在侧边栏展示时，如果当前路由 children 属性为空，则删除该路由
+ * @param {*} arr 路由配置项数据
+ */
 function IterationDelateMenuChildren(arr) {
   if (arr.length) {
     for (const i in arr) {
       if (arr[i].children && !arr[i].children.length) {
-        delete arr[i] // eslint-disable-line
-      } else if (arr[i].children && !arr[i].children.length) {
+        delete arr[i]
+      } else if (arr[i].children && arr[i].children.length) {
         IterationDelateMenuChildren(arr[i].children)
       }
     }
   }
   return arr
 }
 
+/**
+ * Shaking 掉无限制路由
+ * @param {array} stageConfig 路由配置项数据
+ * @param {array} permissions 当前登录管理员所拥有的权限集合
+ * @param {object} currentUser 当前登录管理员
+ */
 function permissionShaking(stageConfig, permissions, currentUser) {
-  // eslint-disable-line
   const shookConfig = stageConfig.filter(route => {
     if (Util.hasPermission(permissions, route, currentUser)) {
       if (route.children && route.children.length) {
-        route.children = permissionShaking(route.children, permissions, currentUser) // eslint-disable-line
+        route.children = permissionShaking(route.children, permissions, currentUser)
       }
       return true
     }
@@ -176,7 +185,7 @@ export const getStageInfo = state => {
       return result
     }
 
-    if (stages.children) {
+    if (stages.children && stages.children.length) {
       result = findStage(stages.children, name)
       if (result) {
         result.unshift(stages)