no message

Former-commit-id: eefb53c8936b6acd58b0604d25da7cfad73d8791
Former-commit-id: f7a9f9360bbd8e3dca3bba6c12c22775adc2a66e
Former-commit-id: f9f204a1e322195ea42d596fb749e31b3859de7f
This commit is contained in:
liyang
2018-06-10 08:58:44 +08:00
parent 5e1f4e9a36
commit bb2d9f7804
9 changed files with 22 additions and 20 deletions

View File

@@ -7,7 +7,7 @@
<script> <script>
export default { export default {
name: 'D2MenuItem', name: 'd2-menu-item',
props: { props: {
menu: { menu: {
type: Object, type: Object,

View File

@@ -13,7 +13,7 @@
<script> <script>
export default { export default {
name: 'D2Submenu', name: 'd2-sub-menu',
props: { props: {
menu: { menu: {
type: Object, type: Object,
@@ -22,7 +22,7 @@ export default {
} }
}, },
components: { components: {
D2MenuItem: () => import('../D2MenuItem/index.vue') 'd2-menu-item': () => import('../d2-menu-item/index.vue')
} }
} }
</script> </script>

View File

@@ -12,10 +12,10 @@
<script> <script>
import menus from '@/menu/index.js' import menus from '@/menu/index.js'
export default { export default {
name: 'HeaderMenu', name: 'd2-layout-main-header-menu',
components: { components: {
D2MenuItem: () => import('../D2MenuItem/index.vue'), 'd2-menu-item': () => import('../d2-menu-item/index.vue'),
D2Submenu: () => import('../D2Submenu/index.vue') 'd2-sub-menu': () => import('../d2-sub-menu/index.vue')
}, },
data () { data () {
return { return {

View File

@@ -7,7 +7,7 @@
<script> <script>
export default { export default {
name: 'HeaderRight', name: 'd2-layout-main-header-right',
components: { components: {
FullScreen: () => import('./components/FullScreen.vue'), FullScreen: () => import('./components/FullScreen.vue'),
UserDropdown: () => import('./components/UserDropdown.vue') UserDropdown: () => import('./components/UserDropdown.vue')

View File

@@ -18,6 +18,7 @@
<script> <script>
import { side } from '@/menu/index.js' import { side } from '@/menu/index.js'
export default { export default {
name: 'd2-layout-main-side-menu',
props: { props: {
collapse: { collapse: {
type: Boolean, type: Boolean,
@@ -26,8 +27,8 @@ export default {
} }
}, },
components: { components: {
D2MenuItem: () => import('../D2MenuItem/index.vue'), 'd2-menu-item': () => import('../d2-menu-item/index.vue'),
D2Submenu: () => import('../D2Submenu/index.vue') 'd2-sub-menu': () => import('../d2-sub-menu/index.vue')
}, },
data () { data () {
return { return {

View File

@@ -9,14 +9,14 @@
<div class="toggle-aside-btn" @click="collapse = !collapse"> <div class="toggle-aside-btn" @click="collapse = !collapse">
<d2-icon name="bars"/> <d2-icon name="bars"/>
</div> </div>
<HeaderMenu/> <d2-layout-main-header-menu/>
<HeaderRight/> <d2-layout-main-header-right/>
</el-header> </el-header>
<!-- 下面 主体 --> <!-- 下面 主体 -->
<el-container> <el-container>
<!-- 主体 侧边栏 --> <!-- 主体 侧边栏 -->
<el-aside :style="{width: collapse ? asideWidthCollapse : asideWidth}"> <el-aside :style="{width: collapse ? asideWidthCollapse : asideWidth}">
<SideMenu :collapse="collapse"/> <d2-layout-main-side-menu :collapse="collapse"/>
</el-aside> </el-aside>
<!-- 主体 --> <!-- 主体 -->
<el-main> <el-main>
@@ -30,10 +30,11 @@
<script> <script>
export default { export default {
name: 'd2-layout-main',
components: { components: {
SideMenu: () => import('./components/SideMenu'), 'd2-layout-main-side-menu': () => import('./components/side-menu'),
HeaderMenu: () => import('./components/HeaderMenu'), 'd2-layout-main-header-menu': () => import('./components/header-menu'),
HeaderRight: () => import('./components/HeaderRight') 'd2-layout-main-header-right': () => import('./components/header-right')
}, },
data () { data () {
return { return {

View File

@@ -9,7 +9,7 @@ const routes = [
{ {
path: '/', path: '/',
redirect: { name: 'index' }, redirect: { name: 'index' },
component: () => import('@/components/core/MainLayout/index.vue'), component: () => import('@/components/core/d2-layout-main/index.vue'),
children: [ children: [
{ {
path: 'index', path: 'index',
@@ -24,7 +24,7 @@ const routes = [
name: 'demo-components', name: 'demo-components',
meta: { requiresAuth: true }, meta: { requiresAuth: true },
redirect: { name: 'demo-components-index' }, redirect: { name: 'demo-components-index' },
component: () => import('@/components/core/MainLayout/index.vue'), component: () => import('@/components/core/d2-layout-main/index.vue'),
children: (pre => [ children: (pre => [
{ path: 'container/full', name: `${pre}container-full`, component: () => import('@/pages/demo/components/container/full.vue') }, { path: 'container/full', name: `${pre}container-full`, component: () => import('@/pages/demo/components/container/full.vue') },
{ path: 'container/ghost', name: `${pre}container-ghost`, component: () => import('@/pages/demo/components/container/ghost.vue') }, { path: 'container/ghost', name: `${pre}container-ghost`, component: () => import('@/pages/demo/components/container/ghost.vue') },
@@ -48,7 +48,7 @@ const routes = [
name: 'demo-plugins', name: 'demo-plugins',
meta: { requiresAuth: true }, meta: { requiresAuth: true },
redirect: { name: 'demo-plugins-index' }, redirect: { name: 'demo-plugins-index' },
component: () => import('@/components/core/MainLayout/index.vue'), component: () => import('@/components/core/d2-layout-main/index.vue'),
children: (pre => [ children: (pre => [
{ path: 'build', name: `${pre}build`, component: () => import('@/pages/demo/plugins/build/index.vue') }, { path: 'build', name: `${pre}build`, component: () => import('@/pages/demo/plugins/build/index.vue') },
{ path: 'clipboard-polyfill', name: `${pre}clipboard-polyfill`, component: () => import('@/pages/demo/plugins/clipboard-polyfill/index.vue') }, { path: 'clipboard-polyfill', name: `${pre}clipboard-polyfill`, component: () => import('@/pages/demo/plugins/clipboard-polyfill/index.vue') },
@@ -71,7 +71,7 @@ const routes = [
name: 'demo-chart', name: 'demo-chart',
meta: { requiresAuth: true }, meta: { requiresAuth: true },
redirect: { name: 'demo-chart-index' }, redirect: { name: 'demo-chart-index' },
component: () => import('@/components/core/MainLayout/index.vue'), component: () => import('@/components/core/d2-layout-main/index.vue'),
children: (pre => [ children: (pre => [
{ path: 'all', name: `${pre}all`, component: () => import('@/pages/demo/chart/all/index.vue') }, { path: 'all', name: `${pre}all`, component: () => import('@/pages/demo/chart/all/index.vue') },
{ path: 'demo/areaBase', name: `${pre}demo-areaBase`, component: () => import('@/pages/demo/chart/demo/areaBase.vue') }, { path: 'demo/areaBase', name: `${pre}demo-areaBase`, component: () => import('@/pages/demo/chart/demo/areaBase.vue') },
@@ -91,7 +91,7 @@ const routes = [
name: 'demo-business', name: 'demo-business',
meta: { requiresAuth: true }, meta: { requiresAuth: true },
redirect: { name: 'demo-business-index' }, redirect: { name: 'demo-business-index' },
component: () => import('@/components/core/MainLayout/index.vue'), component: () => import('@/components/core/d2-layout-main/index.vue'),
children: (pre => [ children: (pre => [
{ path: 'index', name: `${pre}index`, component: () => import('@/pages/demo/business/index/index.vue') } { path: 'index', name: `${pre}index`, component: () => import('@/pages/demo/business/index/index.vue') }
])('demo-business-') ])('demo-business-')