Merge branch 'master' of http://139.196.39.194:9021/chenc/cd-work-flow-web

src/components/menu/index.js

@@ -61,6 +61,7 @@ export default {
     methods: {
     // select menu item
         onOpenChange (openKeys) {
+          console.log("============1=========");
             // 在水平模式下时执行，并且不再执行后续
             // if (this.mode === 'horizontal') {
             if (this.mode === 'vertical') {
@@ -80,6 +81,7 @@ export default {
             }
         },
         updateMenu () {
+          console.log("============2=========");
             const routes = this.$route.matched.concat()
             const { hidden } = this.$route.meta
             if (routes.length >= 3 && hidden) {
@@ -98,19 +100,21 @@ export default {
             }
             // update-begin-author:taoyan date:20190510 for:online表单菜单点击展开的一级目录不对
             if (!this.selectedKeys || this.selectedKeys[0].indexOf(':') < 0) {
-                this.collapsed ? (this.cachedOpenKeys = openKeys) : (this.openKeys = openKeys)
+                // this.collapsed ? (this.cachedOpenKeys = openKeys) : (this.openKeys = openKeys)
             }
             // update-end-author:taoyan date:20190510 for:online表单菜单点击展开的一级目录不对
         },
 
         // render
         renderItem (menu) {
+          console.log("============3=========");
             if (!menu.hidden) {
                 return menu.children && !menu.alwaysShow ? this.renderSubMenu(menu) : this.renderMenuItem(menu)
             }
             return null
         },
         renderMenuItem (menu) {
+          console.log("============4=========");
             const target = menu.meta.target || null
             const tag = (target && 'a') || 'router-link'
             let props = { to: { name: menu.name } }
@@ -139,6 +143,7 @@ export default {
             )
         },
         renderSubMenu (menu) {
+          console.log("============5=========");
             const itemArr = []
             if (!menu.alwaysShow) {
                 menu.children.forEach(item => itemArr.push(this.renderItem(item)))
@@ -154,6 +159,7 @@ export default {
             )
         },
         renderIcon (icon) {
+          console.log("============6=========");
             if (icon === 'none' || icon === undefined) {
                 return null
             }