fix #38

aliqin · Dec 3, 2017 · e65cfad · e65cfad
1 parent b7556f8
commit e65cfad
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 16 deletions.
diff --git a/dist/atui.js b/dist/atui.js
diff --git a/src/components/Menu/Menu.vue b/src/components/Menu/Menu.vue
@@ -32,7 +32,12 @@ export default {
       }
     },
     openOne: Boolean,
-    selectedKey: String
+    defaultSelectedKey: String
+  },
+  data () {
+    return {
+      selectedKey: this.defaultSelectedKey
+    }
   },
   components: {
     vSubMenu,
@@ -44,11 +49,12 @@ export default {
   },
   mounted () {
     let me = this
-    if (me.selectedKey) {
+    if (me.defaultSelectedKey) {
       me.$bus.$emit('Menu-searchItem', me.selectedKey)
     }
     me.$bus.$on('Menu-itemClicked', (item, uuid) => {
       me.$bus.$emit('Menu-searchItem', uuid)
+      me.selectedKey = uuid
       me.$emit('click', item, uuid)
     })
   }

diff --git a/src/components/Menu/MenuItem.vue b/src/components/Menu/MenuItem.vue
@@ -38,7 +38,9 @@ export default {
     this.$bus.$on('Menu-searchItem', (uuid) => {
       this.selectedStatus = this.uuid === uuid
       if (this.selectedStatus) {
-        this.$bus.$emit('Menu-open', this, this.uuid)
+        // this.$bus.$emit('Menu-open', this, this.uuid)
+        console.log(this.$parent.$parent)
+        this.$parent.$parent.open = true
       }
     })
   }

diff --git a/src/components/Menu/SubMenu.vue b/src/components/Menu/SubMenu.vue
@@ -57,6 +57,11 @@ export default {
   },
   mounted () {
     this.$forceUpdate()
+    // let me = this
+    // me.$bus.$on('Menu-open', (item, uuid) => {
+    //   console.log(me.$children)
+    //   // me.open = true
+    // })
   },
   watch: {
     open (val) {
@@ -79,12 +84,6 @@ export default {
       this.open = !this.open
     }
   },
-  events: {
-    // 当子menu选中时，自动打开父菜单
-    open () {
-      this.open = true
-    }
-  },
   transitions: {
     collapse: {
       afterEnter (el) {

diff --git a/src/components/Menu/demo/basic.md b/src/components/Menu/demo/basic.md
@@ -13,7 +13,7 @@ title:
 
 
 ````jsx
-<v-menu @click.native="click">
+<v-menu @click.native="click" default-selected-key="2">
   <v-sub-menu uuid="sub1" title="导航一">
     <v-menu-item-group title="分组1">
       <v-menu-item uuid="1">选项1</v-menu-item>