sheng/mes-ui-d2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

no message

Browse Source 
Former-commit-id: 410a22d6d18828f6f8ba8b9b1b36f2d2563d15be [formerly 410a22d6d18828f6f8ba8b9b1b36f2d2563d15be [formerly 410a22d6d18828f6f8ba8b9b1b36f2d2563d15be [formerly 410a22d6d18828f6f8ba8b9b1b36f2d2563d15be [formerly c31bba0bcbe5dbbe311023f64cdce8ad0d3f9276 [formerly eb8211779aea015240ac95b0534324fd4c84dc67]]]]]
Former-commit-id: 47cded5f6aa6bab091b8a0871c4b7f03fcc32c15
Former-commit-id: b91a00e9032f7240777ad683b69ad87c9c9a3d1e
Former-commit-id: 9f00370a010a33f093521145e9c86bda0d7202d6 [formerly 1308aa9caab6092d9330825d070b2300fbd126ba]
Former-commit-id: 1c8d194ca4a214c568c55e1f012f33cfb1038c64
Former-commit-id: 0a1a134939dbe74bd406d1382f325e5c63131bc9
Former-commit-id: 9cab1bd5916dd249f16ede6d8806e1538300efee
Former-commit-id: b5a4e2a15bcf9f241ee4840cdbdd8c8430b10d8a
Former-commit-id: c6a72c1ecac32ea176ea48ffeba0078e49c38f88
This commit is contained in:
liyang
2018-06-27 16:07:01 +08:00
parent 926701ea70
commit 64685a2db6
6 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.eslintignore
View File

@@ -3,3 +3,4 @@
/dist/ /dist/
/*.js /*.js
/src/plugin/vue-bigdata-table /src/plugin/vue-bigdata-table
/src/pages/demo/charts

18
src/assets/style/theme/theme.scss
View File

@@ -52,12 +52,19 @@
float: left; float: left;
border-bottom: none; border-bottom: none;
background-color: transparent; background-color: transparent;
.el-menu-item { %header-menu-item {
@extend %unable-select; @extend %unable-select;
i.fa {
font-size: 16px;
margin-right: 4px;
}
}
.el-menu-item {
@extend %header-menu-item;
border-bottom: none; border-bottom: none;
} }
.el-submenu { .el-submenu {
@extend %unable-select; @extend %header-menu-item;
.el-submenu__title { .el-submenu__title {
border-bottom: none; border-bottom: none;
} }
@@ -227,17 +234,21 @@
transition: border-top-color 0s; transition: border-top-color 0s;
color: $theme-header-item-color; color: $theme-header-item-color;
background: $theme-header-item-background-color; background: $theme-header-item-background-color;
i.fa { color: inherit; }
&:hover { &:hover {
color: $theme-header-item-color-hover; color: $theme-header-item-color-hover;
background: $theme-header-item-background-color-hover; background: $theme-header-item-background-color-hover;
i.fa { color: inherit; }
} }
&:focus { &:focus {
color: $theme-header-item-color-focus; color: $theme-header-item-color-focus;
background: $theme-header-item-background-color-focus; background: $theme-header-item-background-color-focus;
i.fa { color: inherit; }
} }
&.is-active { &.is-active {
color: $theme-header-item-color-active; color: $theme-header-item-color-active;
background: $theme-header-item-background-color-active; background: $theme-header-item-background-color-active;
i.fa { color: inherit; }
} }
} }
.el-submenu { .el-submenu {
@@ -245,12 +256,14 @@
transition: border-top-color 0s; transition: border-top-color 0s;
color: $theme-header-item-color; color: $theme-header-item-color;
background: $theme-header-item-background-color; background: $theme-header-item-background-color;
i.fa { color: inherit; }
.el-submenu__icon-arrow { .el-submenu__icon-arrow {
color: $theme-header-item-color; color: $theme-header-item-color;
} }
&:hover { &:hover {
color: $theme-header-item-color-hover; color: $theme-header-item-color-hover;
background: $theme-header-item-background-color-hover; background: $theme-header-item-background-color-hover;
i.fa { color: inherit; }
.el-submenu__icon-arrow { .el-submenu__icon-arrow {
color: $theme-header-item-color-hover; color: $theme-header-item-color-hover;
} }
@@ -258,6 +271,7 @@
&:focus { &:focus {
color: $theme-header-item-color-focus; color: $theme-header-item-color-focus;
background: $theme-header-item-background-color-focus; background: $theme-header-item-background-color-focus;
i.fa { color: inherit; }
.el-submenu__icon-arrow { .el-submenu__icon-arrow {
color: $theme-header-item-color-focus; color: $theme-header-item-color-focus;
} }

2
src/components/core/d2-layout-main/components/-menu-item/index.vue
View File

@@ -1,6 +1,6 @@
<template> <template>
<el-menu-item :index="menu.path || uniqueid"> <el-menu-item :index="menu.path || uniqueid">
<i v-if="menu.icon" :class="`fa fa-${menu.icon}`"></i> <i :class="`fa fa-${menu.icon || 'file-o'}`"></i>
<span slot="title">{{menu.title}}</span> <span slot="title">{{menu.title}}</span>
</el-menu-item> </el-menu-item>
</template> </template>

6
src/components/core/d2-layout-main/components/-menu-side/index.vue
View File

@@ -1,6 +1,6 @@
<template> <template>
<div style="height: 100%;"> <div style="height: 100%;">
<el-scrollbar v-if="menus.length > 0 && !collapse"> <el-scrollbar v-if="menus.length > 0">
<div :style="{ height: `${asideHeight}px` }"> <div :style="{ height: `${asideHeight}px` }">
<el-menu <el-menu
:collapse="collapse" :collapse="collapse"
@@ -60,7 +60,9 @@ export default {
this.menus = _side.length > 0 ? _side[0].children : [] this.menus = _side.length > 0 ? _side[0].children : []
this.active = val[val.length - 1].path this.active = val[val.length - 1].path
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.menu.activeIndex = this.active if (this.menus.length > 0) {
this.$refs.menu.activeIndex = this.active
}
}) })
}, },
immediate: true immediate: true

2
src/components/core/d2-layout-main/components/-menu-sub/index.vue
View File

@@ -1,7 +1,7 @@
<template> <template>
<el-submenu :index="menu.path || uniqueid"> <el-submenu :index="menu.path || uniqueid">
<template slot="title"> <template slot="title">
<i v-if="menu.icon" :class="`fa fa-${menu.icon}`"></i> <i :class="`fa fa-${menu.icon || 'folder-o'}`"></i>
<span slot="title">{{menu.title}}</span> <span slot="title">{{menu.title}}</span>
</template> </template>
<template v-for="(child, childIndex) in menu.children"> <template v-for="(child, childIndex) in menu.children">

2
src/menu/index.js.REMOVED.git-id
View File

@@ -1 +1 @@
bf6d527e9d3ed7e689157c558539c615f6d69190 bdea6a7f1b965319df811436ddcfcd42f0051ff2