From 7b487076fdcff5be8b8297a9aa53f7e7e1283389 Mon Sep 17 00:00:00 2001
From: chenhaodong <chenhaodong@develop.coolcto.com>
Date: Thu, 6 Jun 2019 17:16:07 +0800
Subject: [PATCH] fix

---
 src/components/mew-menu/index.js      | 16 ++++++++--------
 src/components/mew-menu/menu-item.vue | 20 +++++++++++++-------
 src/components/mew-menu/menu.vue      | 24 ++++++++++++------------
 src/components/mew-menu/mixin.js      |  6 +++---
 src/components/mew-menu/submenu.vue   | 10 +++++-----
 src/styles/components/menu.less       |  4 ++--
 src/utils/assist.js                   |  7 +++++++
 7 files changed, 50 insertions(+), 37 deletions(-)

diff --git a/src/components/mew-menu/index.js b/src/components/mew-menu/index.js
index b5cd748..47ecf15 100644
--- a/src/components/mew-menu/index.js
+++ b/src/components/mew-menu/index.js
@@ -1,10 +1,10 @@
-import Menu from './menu.vue';
-import MenuGroup from './menu-group.vue';
-import MenuItem from './menu-item.vue';
-import Submenu from './submenu.vue';
+import MewMenu from './menu.vue';
+import MewMenuGroup from './menu-group.vue';
+import MewMenuItem from './menu-item.vue';
+import MewSubmenu from './submenu.vue';
 
-Menu.Group = MenuGroup;
-Menu.Item = MenuItem;
-Menu.Sub = Submenu;
+MewMenu.Group = MewMenuGroup;
+MewMenu.Item = MewMenuItem;
+MewMenu.Sub = MewSubmenu;
 
-export default Menu;
\ No newline at end of file
+export default MewMenu;
\ No newline at end of file
diff --git a/src/components/mew-menu/menu-item.vue b/src/components/mew-menu/menu-item.vue
index 961be0a..4849cef 100644
--- a/src/components/mew-menu/menu-item.vue
+++ b/src/components/mew-menu/menu-item.vue
@@ -12,14 +12,14 @@
 </template>
 <script>
     import Emitter from '../../mixins/emitter';
-    import { findComponentUpward } from '../../utils/assist';
+    import { findComponentUpward, findBrothersComponents, findComponentsDownward } from '../../utils/assist';
     import mixin from './mixin';
     import mixinsLink from '../../mixins/link';
 
     const prefixCls = 'ivu-menu';
 
     export default {
-        name: 'MenuItem',
+        name: 'MewMenuItem',
         mixins: [ Emitter, mixin, mixinsLink ],
         props: {
             name: {
@@ -60,16 +60,22 @@
                 if (new_window || this.target === '_blank') {
                     // 如果是 new_window，直接新开窗口就行，无需发送状态
                     this.handleCheckClick(event, new_window);
-                    let parentMenu = findComponentUpward(this, 'Menu');
+                    let parentMenu = findComponentUpward(this, 'MewMenu');
                     if (parentMenu) parentMenu.handleEmitSelectEvent(this.name);
                 } else {
-                    let parent = findComponentUpward(this, 'Submenu');
+                    let parent = findComponentUpward(this, 'MewSubmenu');
 
                     if (parent) {
-                        this.dispatch('Submenu', 'on-menu-item-select', this.name);
+                        this.dispatch('MewSubmenu', 'on-menu-item-select', this.name);
                     } else {
-                        this.dispatch('Menu', 'on-menu-item-select', this.name);
+                        this.dispatch('MewMenu', 'on-menu-item-select', this.name);
                     }
+                    findBrothersComponents(this, 'SideMenuItem',false).forEach(item => {
+                        findComponentsDownward(item, 'MewSubmenu').forEach(item => {
+                            item.active = false;
+                            item.opened = false
+                        });
+                    });
 
                     this.handleCheckClick(event, new_window);
                 }
@@ -79,7 +85,7 @@
             this.$on('on-update-active-name', (name) => {
                 if (this.name === name) {
                     this.active = true;
-                    this.dispatch('Submenu', 'on-update-active-name', name);
+                    this.dispatch('MewSubmenu', 'on-update-active-name', name);
                 } else {
                     this.active = false;
                 }
diff --git a/src/components/mew-menu/menu.vue b/src/components/mew-menu/menu.vue
index 392b57a..8cc8219 100644
--- a/src/components/mew-menu/menu.vue
+++ b/src/components/mew-menu/menu.vue
@@ -8,7 +8,7 @@
     const prefixCls = 'ivu-menu';
 
     export default {
-        name: 'Menu',
+        name: 'MewMenu',
         mixins: [ Emitter ],
         props: {
             mode: {
@@ -73,53 +73,53 @@
                 if (this.currentActiveName === undefined) {
                     this.currentActiveName = -1;
                 }
-                this.broadcast('Submenu', 'on-update-active-name', false);
-                this.broadcast('MenuItem', 'on-update-active-name', this.currentActiveName);
+                this.broadcast('MewSubmenu', 'on-update-active-name', false);
+                this.broadcast('MewMenuItem', 'on-update-active-name', this.currentActiveName);
             },
             updateOpenKeys (name) {
                 let names = [...this.openedNames];
                 const index = names.indexOf(name);
-                if (this.accordion) findComponentsDownward(this, 'Submenu').forEach(item => {
+                if (this.accordion) findComponentsDownward(this, 'MewSubmenu').forEach(item => {
                     item.opened = false;
                 });
                 if (index >= 0) {
                     let currentSubmenu = null;
-                    findComponentsDownward(this, 'Submenu').forEach(item => {
+                    findComponentsDownward(this, 'MewSubmenu').forEach(item => {
                         if (item.name === name) {
                             currentSubmenu = item;
                             item.opened = false;
                         }
                     });
-                    findComponentsUpward(currentSubmenu, 'Submenu').forEach(item => {
+                    findComponentsUpward(currentSubmenu, 'MewSubmenu').forEach(item => {
                         item.opened = true;
                     });
-                    findComponentsDownward(currentSubmenu, 'Submenu').forEach(item => {
+                    findComponentsDownward(currentSubmenu, 'MewSubmenu').forEach(item => {
                         item.opened = false;
                     });
                 } else {
                     if (this.accordion) {
                         let currentSubmenu = null;
-                        findComponentsDownward(this, 'Submenu').forEach(item => {
+                        findComponentsDownward(this, 'MewSubmenu').forEach(item => {
                             if (item.name === name) {
                                 currentSubmenu = item;
                                 item.opened = true;
                             }
                         });
-                        findComponentsUpward(currentSubmenu, 'Submenu').forEach(item => {
+                        findComponentsUpward(currentSubmenu, 'MewSubmenu').forEach(item => {
                             item.opened = true;
                         });
                     } else {
-                        findComponentsDownward(this, 'Submenu').forEach(item => {
+                        findComponentsDownward(this, 'MewSubmenu').forEach(item => {
                             if (item.name === name) item.opened = true;
                         });
                     }
                 }
-                let openedNames = findComponentsDownward(this, 'Submenu').filter(item => item.opened).map(item => item.name);
+                let openedNames = findComponentsDownward(this, 'MewSubmenu').filter(item => item.opened).map(item => item.name);
                 this.openedNames = [...openedNames];
                 this.$emit('on-open-change', openedNames);
             },
             updateOpened () {
-                const items = findComponentsDownward(this, 'Submenu');
+                const items = findComponentsDownward(this, 'MewSubmenu');
 
                 if (items.length) {
                     items.forEach(item => {
diff --git a/src/components/mew-menu/mixin.js b/src/components/mew-menu/mixin.js
index 6c7be91..0a90e96 100644
--- a/src/components/mew-menu/mixin.js
+++ b/src/components/mew-menu/mixin.js
@@ -2,15 +2,15 @@ import { findComponentUpward, findComponentsUpward } from '../../utils/assist';
 export default {
     data () {
         return {
-            menu: findComponentUpward(this, 'Menu')
+            menu: findComponentUpward(this, 'MewMenu')
         };
     },
     computed: {
         hasParentSubmenu () {
-            return !!findComponentUpward(this, 'Submenu');
+            return !!findComponentUpward(this, 'MewSubmenu');
         },
         parentSubmenuNum () {
-            return findComponentsUpward(this, 'Submenu').length;
+            return findComponentsUpward(this, 'MewSubmenu').length;
         },
         mode () {
             return this.menu.mode;
diff --git a/src/components/mew-menu/submenu.vue b/src/components/mew-menu/submenu.vue
index e4e5ae1..c496a9b 100644
--- a/src/components/mew-menu/submenu.vue
+++ b/src/components/mew-menu/submenu.vue
@@ -28,7 +28,7 @@
     const prefixCls = 'ivu-menu';
 
     export default {
-        name: 'Submenu',
+        name: 'MewSubmenu',
         mixins: [ Emitter, mixin ],
         components: { Icon, Drop, CollapseTransition },
         props: {
@@ -78,7 +78,7 @@
             },
             // 3.4.0, global setting customArrow 有值时，arrow 赋值空
             arrowType () {
-                let type = 'ios-arrow-down';
+                let type = 'ios-arrow-forward';
 
                 if (this.$IVIEW) {
                     if (this.$IVIEW.menu.customArrow) {
@@ -166,12 +166,12 @@
         mounted () {
             this.$on('on-menu-item-select', (name) => {
                 if (this.mode === 'horizontal') this.opened = false;
-                this.dispatch('Menu', 'on-menu-item-select', name);
+                this.dispatch('MewMenu', 'on-menu-item-select', name);
                 return true;
             });
             this.$on('on-update-active-name', (status) => {
-                if (findComponentUpward(this, 'Submenu')) this.dispatch('Submenu', 'on-update-active-name', status);
-                if (findComponentsDownward(this, 'Submenu')) findComponentsDownward(this, 'Submenu').forEach(item => {
+                if (findComponentUpward(this, 'MewSubmenu')) this.dispatch('MewSubmenu', 'on-update-active-name', status);
+                if (findComponentsDownward(this, 'MewSubmenu')) findComponentsDownward(this, 'MewSubmenu').forEach(item => {
                     item.active = false;
                 });
                 this.active = status;
diff --git a/src/styles/components/menu.less b/src/styles/components/menu.less
index 0b67f70..45da131 100644
--- a/src/styles/components/menu.less
+++ b/src/styles/components/menu.less
@@ -178,7 +178,6 @@
         transform: rotate(180deg);
     }
     &-vertical &-opened > * > &-submenu-title-icon{
-        transform: translateY(-50%) rotate(180deg);
     }
 
     &-vertical &-submenu{
@@ -240,6 +239,7 @@
         &-active:not(.@{menu-prefix-cls}-submenu){
             /*wynn*/
             color: @mew-common-color;
+            background: #f6f6f6;
             //border-right: 2px solid @primary-color;
         }
     }
@@ -266,7 +266,7 @@
     &-dark&-vertical &-opened{
         background: @menu-dark-active-bg;
         .@{menu-prefix-cls}-submenu-title{
-            background: @menu-dark-title;
+            background: #f6f6f6;
         }
 
         .@{menu-prefix-cls}-submenu-has-parent-submenu{
diff --git a/src/utils/assist.js b/src/utils/assist.js
index 49929ce..eaea607 100644
--- a/src/utils/assist.js
+++ b/src/utils/assist.js
@@ -235,8 +235,15 @@ export function findComponentsUpward (context, componentName) {
 // Find brothers components
 export function findBrothersComponents (context, componentName, exceptMe = true) {
     let res = context.$parent.$children.filter(item => {
+    if(componentName === "SideMenuItem"){
+        console.log(item)
+        console.log(item.$options.name)
+    }
         return item.$options.name === componentName;
     });
+    if(componentName === "SideMenuItem"){
+        console.log(res)
+    }
     let index = res.findIndex(item => item._uid === context._uid);
     if (exceptMe) res.splice(index, 1);
     return res;
--
libgit2 0.21.4