From 7a6f12ea868fb89ca54eac578dbfdba8ad491579 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Sun, 17 Jun 2018 08:18:58 +0800 Subject: [PATCH] no message Former-commit-id: 8716d744cb5216d2c2f93ecdcbfbf1510bc54a74 [formerly 7ee47c9e097922d154644d6173540bb7cd74ba39] [formerly 8716d744cb5216d2c2f93ecdcbfbf1510bc54a74 [formerly 7ee47c9e097922d154644d6173540bb7cd74ba39] [formerly 8716d744cb5216d2c2f93ecdcbfbf1510bc54a74 [formerly 7ee47c9e097922d154644d6173540bb7cd74ba39] [formerly 7ee47c9e097922d154644d6173540bb7cd74ba39 [formerly a23389c71af615511175cbb0e65154fc75cf7c33 [formerly d4a736009a19aa5c55783e8a2e9626f8ed058c6e]]]]] Former-commit-id: 6228f01bb2ebceff2880b65b2fc1c61b67a9e184 Former-commit-id: a7f038093f9c7d12882418356c361366341fb5a1 Former-commit-id: 35610da41a483ddcf52eb76d5cbed92c2ee3f029 [formerly 023da26a08d0ef67883f8a85cacd525288b8a697] Former-commit-id: 3b3539db72f06a74db40c118f4703e764fca2ad9 Former-commit-id: dc9a2919bff93b6e7bdfd455e1deecceff6bb5e7 Former-commit-id: 4c3e5d1ea74969bb0c76c9049d0981d1d5e0342e Former-commit-id: 8d73f1f8579f9b04ae91814a36abdf3afc949e2e Former-commit-id: f53f91feedcc764b947ecdc77400470a8ced1543 --- src/menu/index.js | 11 +- .../demo/element/basic-container/index.vue | 86 +++++++++++ src/pages/demo/element/basic-layout/index.vue | 140 +++++++++++++++++- src/router/index.js | 2 + 4 files changed, 236 insertions(+), 3 deletions(-) create mode 100644 src/pages/demo/element/basic-container/index.vue diff --git a/src/menu/index.js b/src/menu/index.js index a2262910..5d9d7607 100644 --- a/src/menu/index.js +++ b/src/menu/index.js @@ -128,7 +128,15 @@ const demoElement = { title: '组件库', icon: 'puzzle-piece', children: (pre => [ - { path: `${pre}index`, title: '组件库首页' } + { path: `${pre}index`, title: '组件库首页' }, + { + path: `${pre}basic`, + title: '基础', + children: [ + { path: `${pre}basic-layout`, title: '布局' }, + { path: `${pre}basic-container`, title: '布局容器' } + ] + } ])('/demo/element/') } @@ -136,6 +144,7 @@ const demoElement = { export const side = [ demoPlugins, demoComponents, + demoElement, demoChart ] diff --git a/src/pages/demo/element/basic-container/index.vue b/src/pages/demo/element/basic-container/index.vue new file mode 100644 index 00000000..e4ebfe69 --- /dev/null +++ b/src/pages/demo/element/basic-container/index.vue @@ -0,0 +1,86 @@ + + + + diff --git a/src/pages/demo/element/basic-layout/index.vue b/src/pages/demo/element/basic-layout/index.vue index b39b59b4..f53ec7e1 100644 --- a/src/pages/demo/element/basic-layout/index.vue +++ b/src/pages/demo/element/basic-layout/index.vue @@ -1,5 +1,141 @@ + + + diff --git a/src/router/index.js b/src/router/index.js index 5efc5b37..3ef19f1b 100755 --- a/src/router/index.js +++ b/src/router/index.js @@ -108,6 +108,8 @@ const routes = [ redirect: { name: 'demo-element-index' }, component: () => import('@/components/core/d2-layout-main/index.vue'), children: (pre => [ + { path: 'basic-layout', name: `${pre}basic-layout`, component: () => import('@/pages/demo/element/basic-layout/index.vue'), meta }, + { path: 'basic-container', name: `${pre}basic-container`, component: () => import('@/pages/demo/element/basic-container/index.vue'), meta }, { path: 'index', name: `${pre}index`, component: () => import('@/pages/demo/element/index/index.vue'), meta } ])('demo-element-') },