From a163daa07a51b694db6fe52bc9f5e3c50b8f866f Mon Sep 17 00:00:00 2001
From: "zhigang.li" <zhigang.li@tendcloud.com>
Date: Mon, 15 Jan 2018 14:45:50 +0800
Subject: [PATCH] Add logical treatment to 'accordion'

---
 examples/routers/menu.vue       | 18 +++++++++++++++++-
 src/components/menu/menu.vue    | 11 +++++++++--
 src/components/menu/submenu.vue |  4 ++--
 src/utils/assist.js             | 10 ++++++++++
 4 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/examples/routers/menu.vue b/examples/routers/menu.vue
index bfb686f6..46b09935 100644
--- a/examples/routers/menu.vue
+++ b/examples/routers/menu.vue
@@ -1,6 +1,6 @@
 <template>
     <div>
-        <Menu :theme="theme1" active-name="1" @on-select="handleSelect" @on-open-change="handleOpen" :open-names="openArr">
+        <Menu :theme="theme1" active-name="1" accordion @on-select="handleSelect" @on-open-change="handleOpen" :open-names="openArr">
             <Menu-item name="1">
                 <Icon type="ios-paper"></Icon>
                 一级1
@@ -41,6 +41,22 @@
                             </MenuItem>
                         </MenuGroup>
                     </Submenu>
+                    <Submenu name="3-3-4">
+                        <template slot="title">
+                            <Icon type="stats-bars"></Icon>
+                            三级4
+                        </template>
+                        <Menu-item name="3-3-4-1">四级1</Menu-item>
+                        <Menu-item name="3-3-4-2">四级2</Menu-item>
+                    </Submenu>
+                </Submenu>
+                <Submenu name="3-4">
+                    <template slot="title">
+                        <Icon type="stats-bars"></Icon>
+                        二级4
+                    </template>
+                    <Menu-item name="3-4-1">三级1</Menu-item>
+                    <Menu-item name="3-4-2">三级2</Menu-item>
                 </Submenu>
             </Submenu>
             <Menu-item name="4">
diff --git a/src/components/menu/menu.vue b/src/components/menu/menu.vue
index a3cf40af..187859a7 100644
--- a/src/components/menu/menu.vue
+++ b/src/components/menu/menu.vue
@@ -2,7 +2,7 @@
     <ul :class="classes" :style="styles"><slot></slot></ul>
 </template>
 <script>
-    import { oneOf, findComponentsDownward } from '../../utils/assist';
+    import { oneOf, findComponentsDownward, findBrothersComponents } from '../../utils/assist';
     import Emitter from '../../mixins/emitter';
 
     const prefixCls = 'ivu-menu';
@@ -82,7 +82,14 @@
                 } else {
                     this.openNames.push(name);
                     if (this.accordion) {
-                        this.openNames.splice(0, this.openNames.length);
+                        let currentSubmenu = {};
+                        findComponentsDownward(this, 'Submenu').forEach(item => {
+                            if (item.name === name) currentSubmenu = item;
+                        });
+                        findBrothersComponents(currentSubmenu, 'Submenu').forEach(item => {
+                            let index = this.openNames.indexOf(item.name);
+                            this.openNames.splice(index, index >= 0 ? 1 : 0);
+                        });
                         this.openNames.push(name);
                     }
                 }
diff --git a/src/components/menu/submenu.vue b/src/components/menu/submenu.vue
index 5ce1d905..9c14b48c 100644
--- a/src/components/menu/submenu.vue
+++ b/src/components/menu/submenu.vue
@@ -1,6 +1,6 @@
 <template>
     <li :class="classes" @mouseenter="handleMouseenter" @mouseleave="handleMouseleave">
-        <div :class="[prefixCls + '-submenu-title']" ref="reference" @click="handleClick" :style="titleStyle">
+        <div :class="[prefixCls + '-submenu-title']" ref="reference" @click.stop="handleClick" :style="titleStyle">
             <slot name="title"></slot>
             <Icon type="ios-arrow-down" :class="[prefixCls + '-submenu-title-icon']"></Icon>
         </div>
@@ -112,7 +112,7 @@
                 if (this.mode === 'horizontal') return;
                 const opened = this.opened;
                 if (this.accordion) {
-                    this.parent.$children.forEach(item => {
+                    this.$parent.$children.forEach(item => {
                         if (item.$options.name === 'Submenu') item.opened = false;
                     });
                 }
diff --git a/src/utils/assist.js b/src/utils/assist.js
index 707122de..33828da7 100644
--- a/src/utils/assist.js
+++ b/src/utils/assist.js
@@ -228,6 +228,16 @@ export function findComponentsUpward (context, componentName) {
     }
 }
 
+// Find brothers components
+export function findBrothersComponents (context, componentName) {
+    let res = context.$parent.$children.filter(item => {
+        return item.$options.name === componentName;
+    });
+    let index = res.indexOf(context);
+    res.splice(index, 1);
+    return res;
+}
+
 /* istanbul ignore next */
 const trim = function(string) {
     return (string || '').replace(/^[\s\uFEFF]+|[\s\uFEFF]+$/g, '');