update element-ui
This commit is contained in:
		@@ -14,7 +14,7 @@
 | 
				
			|||||||
  },
 | 
					  },
 | 
				
			||||||
  "dependencies": {
 | 
					  "dependencies": {
 | 
				
			||||||
    "axios": "0.17.1",
 | 
					    "axios": "0.17.1",
 | 
				
			||||||
    "element-ui": "2.0.8",
 | 
					    "element-ui": "2.3.4",
 | 
				
			||||||
    "js-cookie": "2.2.0",
 | 
					    "js-cookie": "2.2.0",
 | 
				
			||||||
    "normalize.css": "7.0.0",
 | 
					    "normalize.css": "7.0.0",
 | 
				
			||||||
    "nprogress": "0.2.0",
 | 
					    "nprogress": "0.2.0",
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -2,18 +2,21 @@
 | 
				
			|||||||
  // 主体区域
 | 
					  // 主体区域
 | 
				
			||||||
  .main-container {
 | 
					  .main-container {
 | 
				
			||||||
    min-height: 100%;
 | 
					    min-height: 100%;
 | 
				
			||||||
    transition: margin-left 0.28s;
 | 
					    transition: margin-left .28s;
 | 
				
			||||||
    margin-left: 180px;
 | 
					    margin-left: 180px;
 | 
				
			||||||
  } // 侧边栏
 | 
					  }
 | 
				
			||||||
 | 
					  // 侧边栏
 | 
				
			||||||
  .sidebar-container {
 | 
					  .sidebar-container {
 | 
				
			||||||
    transition: width 0.28s;
 | 
					    transition: width .28s;
 | 
				
			||||||
    width: 180px!important;
 | 
					    width: 180px !important;
 | 
				
			||||||
    height: 100%;
 | 
					    height: 100%;
 | 
				
			||||||
    position: fixed;
 | 
					    position: fixed;
 | 
				
			||||||
 | 
					    font-size: 0px;
 | 
				
			||||||
    top: 0;
 | 
					    top: 0;
 | 
				
			||||||
    bottom: 0;
 | 
					    bottom: 0;
 | 
				
			||||||
    left: 0;
 | 
					    left: 0;
 | 
				
			||||||
    z-index: 1001;
 | 
					    z-index: 1001;
 | 
				
			||||||
 | 
					    overflow: hidden;
 | 
				
			||||||
    a {
 | 
					    a {
 | 
				
			||||||
      display: inline-block;
 | 
					      display: inline-block;
 | 
				
			||||||
      width: 100%;
 | 
					      width: 100%;
 | 
				
			||||||
@@ -23,78 +26,48 @@
 | 
				
			|||||||
    }
 | 
					    }
 | 
				
			||||||
    .el-menu {
 | 
					    .el-menu {
 | 
				
			||||||
      border: none;
 | 
					      border: none;
 | 
				
			||||||
      width: 100%;
 | 
					      width: 100% !important;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
  .hideSidebar {
 | 
					  .hideSidebar {
 | 
				
			||||||
    .sidebar-container,.sidebar-container .el-menu {
 | 
					    .sidebar-container {
 | 
				
			||||||
      width: 36px!important;
 | 
					      width: 36px !important;
 | 
				
			||||||
      // overflow: inherit;
 | 
					 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    .main-container {
 | 
					    .main-container {
 | 
				
			||||||
      margin-left: 36px;
 | 
					      margin-left: 36px;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
  }
 | 
					 | 
				
			||||||
  .hideSidebar {
 | 
					 | 
				
			||||||
    .submenu-title-noDropdown {
 | 
					    .submenu-title-noDropdown {
 | 
				
			||||||
      padding-left: 10px!important;
 | 
					      padding-left: 10px !important;
 | 
				
			||||||
      position: relative;
 | 
					      position: relative;
 | 
				
			||||||
      span {
 | 
					      .el-tooltip {
 | 
				
			||||||
        height: 0;
 | 
					        padding: 0 10px !important;
 | 
				
			||||||
        width: 0;
 | 
					 | 
				
			||||||
        overflow: hidden;
 | 
					 | 
				
			||||||
        visibility: hidden;
 | 
					 | 
				
			||||||
        transition: opacity .3s cubic-bezier(.55, 0, .1, 1);
 | 
					 | 
				
			||||||
        opacity: 0;
 | 
					 | 
				
			||||||
        display: inline-block;
 | 
					 | 
				
			||||||
      }
 | 
					 | 
				
			||||||
      &:hover {
 | 
					 | 
				
			||||||
        span {
 | 
					 | 
				
			||||||
          display: block;
 | 
					 | 
				
			||||||
          border-radius: 3px;
 | 
					 | 
				
			||||||
          z-index: 1002;
 | 
					 | 
				
			||||||
          width: 140px;
 | 
					 | 
				
			||||||
          height: 56px;
 | 
					 | 
				
			||||||
          visibility: visible;
 | 
					 | 
				
			||||||
          position: absolute;
 | 
					 | 
				
			||||||
          right: -145px;
 | 
					 | 
				
			||||||
          text-align: left;
 | 
					 | 
				
			||||||
          text-indent: 20px;
 | 
					 | 
				
			||||||
          top: 0px;
 | 
					 | 
				
			||||||
          background-color: $subMenuBg!important;
 | 
					 | 
				
			||||||
          opacity: 1;
 | 
					 | 
				
			||||||
        }
 | 
					 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    .el-submenu {
 | 
					    .el-submenu {
 | 
				
			||||||
      &>.el-submenu__title {
 | 
					      &>.el-submenu__title {
 | 
				
			||||||
        padding-left: 10px!important;
 | 
					        padding-left: 10px !important;
 | 
				
			||||||
        &>span {
 | 
					        &>span {
 | 
				
			||||||
          display: none;
 | 
					          height: 0;
 | 
				
			||||||
 | 
					          width: 0;
 | 
				
			||||||
 | 
					          overflow: hidden;
 | 
				
			||||||
 | 
					          visibility: hidden;
 | 
				
			||||||
 | 
					          display: inline-block;
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
        .el-submenu__icon-arrow {
 | 
					        .el-submenu__icon-arrow {
 | 
				
			||||||
          display: none;
 | 
					          display: none;
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
      .nest-menu {
 | 
					 | 
				
			||||||
        .el-submenu__icon-arrow {
 | 
					 | 
				
			||||||
          display: block!important;
 | 
					 | 
				
			||||||
        }
 | 
					 | 
				
			||||||
        span {
 | 
					 | 
				
			||||||
          display: inline-block!important;
 | 
					 | 
				
			||||||
        }
 | 
					 | 
				
			||||||
      }
 | 
					 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
  .nest-menu .el-submenu>.el-submenu__title,
 | 
					  .nest-menu .el-submenu>.el-submenu__title,
 | 
				
			||||||
  .el-submenu .el-menu-item {
 | 
					  .el-submenu .el-menu-item {
 | 
				
			||||||
    min-width: 180px!important;
 | 
					    min-width: 180px !important;
 | 
				
			||||||
    background-color: $subMenuBg!important;
 | 
					    background-color: $subMenuBg !important;
 | 
				
			||||||
    &:hover {
 | 
					    &:hover {
 | 
				
			||||||
      background-color: $menuHover!important;
 | 
					      background-color: $menuHover !important;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
  .el-menu--collapse .el-menu .el-submenu{
 | 
					  .el-menu--collapse .el-menu .el-submenu {
 | 
				
			||||||
    min-width: 180px!important;
 | 
					    min-width: 180px !important;
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -2,17 +2,18 @@
 | 
				
			|||||||
  <div class="menu-wrapper">
 | 
					  <div class="menu-wrapper">
 | 
				
			||||||
    <template v-for="item in routes" v-if="!item.hidden&&item.children">
 | 
					    <template v-for="item in routes" v-if="!item.hidden&&item.children">
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      <router-link v-if="item.children.length===1 && !item.children[0].children && !item.alwaysShow" :to="item.path+'/'+item.children[0].path" :key="item.children[0].name">
 | 
					      <router-link v-if="item.children.length===1 && !item.children[0].children && !item.alwaysShow" :to="item.path+'/'+item.children[0].path"
 | 
				
			||||||
 | 
					        :key="item.children[0].name">
 | 
				
			||||||
        <el-menu-item :index="item.path+'/'+item.children[0].path" :class="{'submenu-title-noDropdown':!isNest}">
 | 
					        <el-menu-item :index="item.path+'/'+item.children[0].path" :class="{'submenu-title-noDropdown':!isNest}">
 | 
				
			||||||
          <svg-icon v-if="item.children[0].meta&&item.children[0].meta.icon" :icon-class="item.children[0].meta.icon"></svg-icon>
 | 
					          <svg-icon v-if="item.children[0].meta&&item.children[0].meta.icon" :icon-class="item.children[0].meta.icon"></svg-icon>
 | 
				
			||||||
          <span v-if="item.children[0].meta&&item.children[0].meta.title">{{item.children[0].meta.title}}</span>
 | 
					          <span v-if="item.children[0].meta&&item.children[0].meta.title" slot="title">{{item.children[0].meta.title}}</span>
 | 
				
			||||||
        </el-menu-item>
 | 
					        </el-menu-item>
 | 
				
			||||||
      </router-link>
 | 
					      </router-link>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      <el-submenu v-else :index="item.name||item.path" :key="item.name">
 | 
					      <el-submenu v-else :index="item.name||item.path" :key="item.name">
 | 
				
			||||||
        <template slot="title">
 | 
					        <template slot="title">
 | 
				
			||||||
          <svg-icon v-if="item.meta&&item.meta.icon" :icon-class="item.meta.icon"></svg-icon>
 | 
					          <svg-icon v-if="item.meta&&item.meta.icon" :icon-class="item.meta.icon"></svg-icon>
 | 
				
			||||||
          <span v-if="item.meta&&item.meta.title">{{item.meta.title}}</span>
 | 
					          <span v-if="item.meta&&item.meta.title" slot="title">{{item.meta.title}}</span>
 | 
				
			||||||
        </template>
 | 
					        </template>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        <template v-for="child in item.children" v-if="!child.hidden">
 | 
					        <template v-for="child in item.children" v-if="!child.hidden">
 | 
				
			||||||
@@ -21,7 +22,7 @@
 | 
				
			|||||||
          <router-link v-else :to="item.path+'/'+child.path" :key="child.name">
 | 
					          <router-link v-else :to="item.path+'/'+child.path" :key="child.name">
 | 
				
			||||||
            <el-menu-item :index="item.path+'/'+child.path">
 | 
					            <el-menu-item :index="item.path+'/'+child.path">
 | 
				
			||||||
              <svg-icon v-if="child.meta&&child.meta.icon" :icon-class="child.meta.icon"></svg-icon>
 | 
					              <svg-icon v-if="child.meta&&child.meta.icon" :icon-class="child.meta.icon"></svg-icon>
 | 
				
			||||||
              <span v-if="child.meta&&child.meta.title">{{child.meta.title}}</span>
 | 
					              <span v-if="child.meta&&child.meta.title" slot="title">{{child.meta.title}}</span>
 | 
				
			||||||
            </el-menu-item>
 | 
					            </el-menu-item>
 | 
				
			||||||
          </router-link>
 | 
					          </router-link>
 | 
				
			||||||
        </template>
 | 
					        </template>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,6 +1,15 @@
 | 
				
			|||||||
<template>
 | 
					<template>
 | 
				
			||||||
  <scroll-bar>
 | 
					  <scroll-bar>
 | 
				
			||||||
    <el-menu mode="vertical" unique-opened :default-active="$route.path" :collapse="isCollapse" background-color="#304156" text-color="#fff" active-text-color="#409EFF">
 | 
					    <el-menu
 | 
				
			||||||
 | 
					      mode="vertical"
 | 
				
			||||||
 | 
					      :collapse-transition="false"
 | 
				
			||||||
 | 
					      :show-timeout="200"
 | 
				
			||||||
 | 
					      :default-active="$route.path"
 | 
				
			||||||
 | 
					      :collapse="isCollapse"
 | 
				
			||||||
 | 
					      background-color="#304156"
 | 
				
			||||||
 | 
					      text-color="#bfcbd9"
 | 
				
			||||||
 | 
					      active-text-color="#409EFF"
 | 
				
			||||||
 | 
					    >
 | 
				
			||||||
      <sidebar-item :routes="routes"></sidebar-item>
 | 
					      <sidebar-item :routes="routes"></sidebar-item>
 | 
				
			||||||
    </el-menu>
 | 
					    </el-menu>
 | 
				
			||||||
  </scroll-bar>
 | 
					  </scroll-bar>
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user