Merge pull request #980 from iview/2.0

2.0

src/libs/util.js

@@ -255,6 +255,18 @@ export const findNodeUpper = (ele, tag) => {
   }
 }
 
+export const findNodeUpperByClasses = (ele, classes) => {
+  let parentNode = ele.parentNode
+  if (parentNode) {
+    let classList = parentNode.classList
+    if (classList && classes.every(className => classList.contains(className))) {
+      return parentNode
+    } else {
+      return findNodeUpperByClasses(parentNode, classes)
+    }
+  }
+}
+
 export const findNodeDownward = (ele, tag) => {
   const tagName = tag.toUpperCase()
   if (ele.childNodes.length) {

src/view/main/components/side-menu/collapsed-menu.vue

@@ -1,7 +1,7 @@
 <template>
-  <Dropdown @on-click="handleClick" transfer :placement="placement">
+  <Dropdown ref="dropdown" @on-click="handleClick" class="collased-menu-dropdown" :transfer="hideTitle" :placement="placement">
     <a class="drop-menu-a" type="text" @mouseover="handleMousemove($event, children)" :style="{textAlign: !hideTitle ? 'left' : ''}"><common-icon :size="rootIconSize" :color="textColor" :type="parentItem.icon"/><span class="menu-title" v-if="!hideTitle">{{ showTitle(parentItem) }}</span><Icon style="float: right;" v-if="!hideTitle" type="ios-arrow-forward" :size="16"/></a>
-    <DropdownMenu slot="list">
+    <DropdownMenu ref="dropdown" slot="list">
       <template v-for="child in children">
         <collapsed-menu v-if="showChildren(child)" :icon-size="iconSize" :parent-item="child" :key="`drop-${child.name}`"></collapsed-menu>
         <DropdownItem v-else :key="`drop-${child.name}`" :name="child.name"><common-icon :size="iconSize" :type="child.icon"/><span class="menu-title">{{ showTitle(child) }}</span></DropdownItem>
@@ -12,6 +12,7 @@
 <script>
 import mixin from './mixin'
 import itemMixin from './item-mixin'
+import { findNodeUpperByClasses } from '@/libs/util'
 
 export default {
   name: 'CollapsedMenu',
@@ -41,6 +42,10 @@ export default {
       const isOverflow = pageY + height < window.innerHeight
       this.placement = isOverflow ? 'right-start' : 'right-end'
     }
+  },
+  mounted () {
+    let dropdown = findNodeUpperByClasses(this.$refs.dropdown.$el, ['ivu-select-dropdown', 'ivu-dropdown-transfer'])
+    if (dropdown) dropdown.style.overflow = 'visible'
   }
 }
 </script>

src/view/main/main.vue

@@ -136,6 +136,7 @@ export default {
   },
   watch: {
     '$route' (newRoute) {
+      console.log(newRoute)
       this.setBreadCrumb(newRoute.matched)
       this.setTagNavList(getNewTagList(this.tagNavList, newRoute))
     }

src/view/tools-methods/tools-methods.vue

@@ -46,6 +46,7 @@ export default {
         route: route,
         type: 'push'
       })
+      console.log(route)
       this.$router.push(route)
     },
     createTagQuery () {