From 4cd91168d015c3c2713fe9f7d3262cfcc377f9a6 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 17 Jun 2018 07:33:45 +0800
Subject: [PATCH 01/16] no message

Former-commit-id: 895d89d45f2fba0e03d957afa473765628f59057 [formerly 895d89d45f2fba0e03d957afa473765628f59057 [formerly 895d89d45f2fba0e03d957afa473765628f59057 [formerly 895d89d45f2fba0e03d957afa473765628f59057 [formerly 47477927dac2d600bfa705b0d60f31941147f84f [formerly 5410928bf645f5aba6238ebd957eb96b0e4b2bfd]]]]]
Former-commit-id: 78b025433b20fb8d1935426357f006cf88d7a405
Former-commit-id: 75ada23c601546a8c975f97494d28df0fcbf659e
Former-commit-id: f5c226e3d07011451d8c09be8dc5d3371cfb645f [formerly 4701ba7c8e22eb0b78c2bc7981c6a0383a7685b2]
Former-commit-id: 1c74e1bb6d5ce67a5a759a8dcc1b87325b2340b5
Former-commit-id: 72c37ec7e5d61819d37fd4e399b8449267ecd8ee
Former-commit-id: 0f7bacdbb1f6f61e01164da9fc926cc28fe02ffc
Former-commit-id: a6c1a27f5df5b1589af7fdc083d9b789eea96ab6
Former-commit-id: ecb1d856d38639f31d05e35f0cafcac23632fcd4
---
 src/pages/demo/element/basic-layout/index.vue |   5 +
 src/router/index.js                           | 106 +++++++++---------
 2 files changed, 58 insertions(+), 53 deletions(-)
 create mode 100644 src/pages/demo/element/basic-layout/index.vue

diff --git a/src/pages/demo/element/basic-layout/index.vue b/src/pages/demo/element/basic-layout/index.vue
new file mode 100644
index 00000000..b39b59b4
--- /dev/null
+++ b/src/pages/demo/element/basic-layout/index.vue
@@ -0,0 +1,5 @@
+<template>
+  <d2-container>
+    qqq
+  </d2-container>
+</template>
diff --git a/src/router/index.js b/src/router/index.js
index 0a7f623b..d39a33b3 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -21,6 +21,59 @@ const routes = [
       }
     ]
   },
+  {
+    path: '/demo/business',
+    name: 'demo-business',
+    meta,
+    redirect: { name: 'demo-business-index' },
+    component: () => import('@/components/core/d2-layout-main/index.vue'),
+    children: (pre => [
+      { path: 'index', name: `${pre}index`, component: () => import('@/pages/demo/business/index/index.vue'), meta }
+    ])('demo-business-')
+  },
+  {
+    path: '/demo/chart',
+    name: 'demo-chart',
+    meta,
+    redirect: { name: 'demo-chart-index' },
+    component: () => import('@/components/core/d2-layout-main/index.vue'),
+    children: (pre => [
+      { path: 'all', name: `${pre}all`, component: () => import('@/pages/demo/chart/all/index.vue'), meta },
+      { path: 'demo/areaBase', name: `${pre}demo-areaBase`, component: () => import('@/pages/demo/chart/demo/areaBase.vue'), meta },
+      { path: 'demo/barBase', name: `${pre}demo-barBase`, component: () => import('@/pages/demo/chart/demo/barBase.vue'), meta },
+      { path: 'demo/columnBase', name: `${pre}demo-columnBase`, component: () => import('@/pages/demo/chart/demo/columnBase.vue'), meta },
+      { path: 'demo/lineBase', name: `${pre}demo-lineBase`, component: () => import('@/pages/demo/chart/demo/lineBase.vue'), meta },
+      { path: 'demo/lineStep', name: `${pre}demo-lineStep`, component: () => import('@/pages/demo/chart/demo/lineStep.vue'), meta },
+      { path: 'demo/nightingaleRoseBase', name: `${pre}demo-nightingaleRoseBase`, component: () => import('@/pages/demo/chart/demo/nightingaleRoseBase.vue'), meta },
+      { path: 'demo/PieBase', name: `${pre}demo-PieBase`, component: () => import('@/pages/demo/chart/demo/PieBase.vue'), meta },
+      { path: 'demo/radarBase', name: `${pre}demo-radarBase`, component: () => import('@/pages/demo/chart/demo/radarBase.vue'), meta },
+      { path: 'dynamicSize', name: `${pre}dynamicSize`, component: () => import('@/pages/demo/chart/dynamicSize/index.vue'), meta },
+      { path: 'index', name: `${pre}index`, component: () => import('@/pages/demo/chart/index/index.vue'), meta }
+    ])('demo-chart-')
+  },
+  {
+    path: '/demo/plugins',
+    name: 'demo-plugins',
+    meta,
+    redirect: { name: 'demo-plugins-index' },
+    component: () => import('@/components/core/d2-layout-main/index.vue'),
+    children: (pre => [
+      { path: 'build', name: `${pre}build`, component: () => import('@/pages/demo/plugins/build/index.vue'), meta },
+      { path: 'clipboard-polyfill', name: `${pre}clipboard-polyfill`, component: () => import('@/pages/demo/plugins/clipboard-polyfill/index.vue'), meta },
+      { path: 'day', name: `${pre}day`, component: () => import('@/pages/demo/plugins/day/index.vue'), meta },
+      { path: 'export/table', name: `${pre}export-table`, component: () => import('@/pages/demo/plugins/export/table.vue'), meta },
+      { path: 'export/txt', name: `${pre}export-txt`, component: () => import('@/pages/demo/plugins/export/txt.vue'), meta },
+      { path: 'i18n/demo1', name: `${pre}i18n-demo1`, component: () => import('@/pages/demo/plugins/i18n/demo1.vue'), meta },
+      { path: 'i18n/demo2', name: `${pre}i18n-demo2`, component: () => import('@/pages/demo/plugins/i18n/demo2.vue'), meta },
+      { path: 'import/csv', name: `${pre}import-csv`, component: () => import('@/pages/demo/plugins/import/csv.vue'), meta },
+      { path: 'import/xlsx', name: `${pre}import-xlsx`, component: () => import('@/pages/demo/plugins/import/xlsx.vue'), meta },
+      { path: 'index', name: `${pre}index`, component: () => import('@/pages/demo/plugins/index/index.vue'), meta },
+      { path: 'js-cookie', name: `${pre}js-cookie`, component: () => import('@/pages/demo/plugins/js-cookie/index.vue'), meta },
+      { path: 'mock/ajax', name: `${pre}mock-ajax`, component: () => import('@/pages/demo/plugins/mock/ajax.vue'), meta },
+      { path: 'mock/dpd', name: `${pre}mock-dpd`, component: () => import('@/pages/demo/plugins/mock/dpd.vue'), meta },
+      { path: 'mock/dtd', name: `${pre}mock-dtd`, component: () => import('@/pages/demo/plugins/mock/dtd.vue'), meta }
+    ])('demo-plugins-')
+  },
   {
     path: '/demo/components',
     name: 'demo-components',
@@ -48,59 +101,6 @@ const routes = [
       { path: 'scrollbar', name: `${pre}scrollbar`, component: () => import('@/pages/demo/components/scrollbar/index.vue'), meta }
     ])('demo-components-')
   },
-  {
-    path: '/demo/plugins',
-    name: 'demo-plugins',
-    meta,
-    redirect: { name: 'demo-plugins-index' },
-    component: () => import('@/components/core/d2-layout-main/index.vue'),
-    children: (pre => [
-      { path: 'build', name: `${pre}build`, component: () => import('@/pages/demo/plugins/build/index.vue'), meta },
-      { path: 'clipboard-polyfill', name: `${pre}clipboard-polyfill`, component: () => import('@/pages/demo/plugins/clipboard-polyfill/index.vue'), meta },
-      { path: 'day', name: `${pre}day`, component: () => import('@/pages/demo/plugins/day/index.vue'), meta },
-      { path: 'export/table', name: `${pre}export-table`, component: () => import('@/pages/demo/plugins/export/table.vue'), meta },
-      { path: 'export/txt', name: `${pre}export-txt`, component: () => import('@/pages/demo/plugins/export/txt.vue'), meta },
-      { path: 'i18n/demo1', name: `${pre}i18n-demo1`, component: () => import('@/pages/demo/plugins/i18n/demo1.vue'), meta },
-      { path: 'i18n/demo2', name: `${pre}i18n-demo2`, component: () => import('@/pages/demo/plugins/i18n/demo2.vue'), meta },
-      { path: 'import/csv', name: `${pre}import-csv`, component: () => import('@/pages/demo/plugins/import/csv.vue'), meta },
-      { path: 'import/xlsx', name: `${pre}import-xlsx`, component: () => import('@/pages/demo/plugins/import/xlsx.vue'), meta },
-      { path: 'index', name: `${pre}index`, component: () => import('@/pages/demo/plugins/index/index.vue'), meta },
-      { path: 'js-cookie', name: `${pre}js-cookie`, component: () => import('@/pages/demo/plugins/js-cookie/index.vue'), meta },
-      { path: 'mock/ajax', name: `${pre}mock-ajax`, component: () => import('@/pages/demo/plugins/mock/ajax.vue'), meta },
-      { path: 'mock/dpd', name: `${pre}mock-dpd`, component: () => import('@/pages/demo/plugins/mock/dpd.vue'), meta },
-      { path: 'mock/dtd', name: `${pre}mock-dtd`, component: () => import('@/pages/demo/plugins/mock/dtd.vue'), meta }
-    ])('demo-plugins-')
-  },
-  {
-    path: '/demo/chart',
-    name: 'demo-chart',
-    meta,
-    redirect: { name: 'demo-chart-index' },
-    component: () => import('@/components/core/d2-layout-main/index.vue'),
-    children: (pre => [
-      { path: 'all', name: `${pre}all`, component: () => import('@/pages/demo/chart/all/index.vue'), meta },
-      { path: 'demo/areaBase', name: `${pre}demo-areaBase`, component: () => import('@/pages/demo/chart/demo/areaBase.vue'), meta },
-      { path: 'demo/barBase', name: `${pre}demo-barBase`, component: () => import('@/pages/demo/chart/demo/barBase.vue'), meta },
-      { path: 'demo/columnBase', name: `${pre}demo-columnBase`, component: () => import('@/pages/demo/chart/demo/columnBase.vue'), meta },
-      { path: 'demo/lineBase', name: `${pre}demo-lineBase`, component: () => import('@/pages/demo/chart/demo/lineBase.vue'), meta },
-      { path: 'demo/lineStep', name: `${pre}demo-lineStep`, component: () => import('@/pages/demo/chart/demo/lineStep.vue'), meta },
-      { path: 'demo/nightingaleRoseBase', name: `${pre}demo-nightingaleRoseBase`, component: () => import('@/pages/demo/chart/demo/nightingaleRoseBase.vue'), meta },
-      { path: 'demo/PieBase', name: `${pre}demo-PieBase`, component: () => import('@/pages/demo/chart/demo/PieBase.vue'), meta },
-      { path: 'demo/radarBase', name: `${pre}demo-radarBase`, component: () => import('@/pages/demo/chart/demo/radarBase.vue'), meta },
-      { path: 'dynamicSize', name: `${pre}dynamicSize`, component: () => import('@/pages/demo/chart/dynamicSize/index.vue'), meta },
-      { path: 'index', name: `${pre}index`, component: () => import('@/pages/demo/chart/index/index.vue'), meta }
-    ])('demo-chart-')
-  },
-  {
-    path: '/demo/business',
-    name: 'demo-business',
-    meta,
-    redirect: { name: 'demo-business-index' },
-    component: () => import('@/components/core/d2-layout-main/index.vue'),
-    children: (pre => [
-      { path: 'index', name: `${pre}index`, component: () => import('@/pages/demo/business/index/index.vue'), meta }
-    ])('demo-business-')
-  },
   // 登陆
   {
     path: '/login',

From f38f431125ca00ee1b7723776c578931aa58ac3f Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 17 Jun 2018 07:49:23 +0800
Subject: [PATCH 02/16] no message

Former-commit-id: 1a2521be64c1c4ac98b1c387bedbafb2cbd10f6c [formerly 1ab36176496695dc01631a9639818540bbe63f53] [formerly 1a2521be64c1c4ac98b1c387bedbafb2cbd10f6c [formerly 1ab36176496695dc01631a9639818540bbe63f53] [formerly 1a2521be64c1c4ac98b1c387bedbafb2cbd10f6c [formerly 1ab36176496695dc01631a9639818540bbe63f53] [formerly 1ab36176496695dc01631a9639818540bbe63f53 [formerly b38bf3dd51b153d3260e3db660486ade1bc942fb [formerly 513fe4c73f47ad84999fe575e537a718df6f13e9]]]]]
Former-commit-id: 22144ee9fcc46683d9a55b916a4b6503944dfe88
Former-commit-id: a5c05d129e696ab37d0f12b43c17167f9a8e4b65
Former-commit-id: 27469f75fae640e7d096e468a9f6cd43b8756a1b [formerly a7d12f7a9e903b7a541e2d8305028562852e5b30]
Former-commit-id: c6767c0d6ca17324825f7c220e3c65686fd5cfae
Former-commit-id: 1fe19d6b85903b6d5ae0087a0b60b824bdd7b329
Former-commit-id: a62807e159f370e564bcc45e614e14ac9fcdc92d
Former-commit-id: 26294269fc487b6e0fccf33f55f1eea45ba8456a
Former-commit-id: 7ca93e8d4d9ff9abc891987bbe893111653f5724
---
 design.sketch.REMOVED.git-id                       |  2 +-
 .../image/logo/w500-element.png.REMOVED.git-id     |  1 +
 src/menu/index.js                                  | 11 +++++++++++
 src/pages/demo/element/index/index.vue             |  9 +++++++++
 src/router/index.js                                | 14 ++++++++++----
 5 files changed, 32 insertions(+), 5 deletions(-)
 create mode 100644 src/assets/image/logo/w500-element.png.REMOVED.git-id
 create mode 100644 src/pages/demo/element/index/index.vue

diff --git a/design.sketch.REMOVED.git-id b/design.sketch.REMOVED.git-id
index 519b415b..136e9924 100644
--- a/design.sketch.REMOVED.git-id
+++ b/design.sketch.REMOVED.git-id
@@ -1 +1 @@
-5180df7143acd2b32403b34a30d5c86f32288d1c
\ No newline at end of file
+90e4abc5ac31f491aa6d7e8f1bb912989f2480f3
\ No newline at end of file
diff --git a/src/assets/image/logo/w500-element.png.REMOVED.git-id b/src/assets/image/logo/w500-element.png.REMOVED.git-id
new file mode 100644
index 00000000..497869c2
--- /dev/null
+++ b/src/assets/image/logo/w500-element.png.REMOVED.git-id
@@ -0,0 +1 @@
+8953f5c6d828eec1b94f2c721975eb81297220e7
\ No newline at end of file
diff --git a/src/menu/index.js b/src/menu/index.js
index 4b146d03..a2262910 100644
--- a/src/menu/index.js
+++ b/src/menu/index.js
@@ -122,6 +122,16 @@ const demoChart = {
   ])('/demo/chart/')
 }
 
+// 路由菜单 组件库
+const demoElement = {
+  path: '/demo/element',
+  title: '组件库',
+  icon: 'puzzle-piece',
+  children: (pre => [
+    { path: `${pre}index`, title: '组件库首页' }
+  ])('/demo/element/')
+}
+
 // 菜单 侧边栏
 export const side = [
   demoPlugins,
@@ -141,6 +151,7 @@ export default [
     children: [
       demoPlugins,
       demoComponents,
+      demoElement,
       demoChart
     ]
   },
diff --git a/src/pages/demo/element/index/index.vue b/src/pages/demo/element/index/index.vue
new file mode 100644
index 00000000..8d4d1766
--- /dev/null
+++ b/src/pages/demo/element/index/index.vue
@@ -0,0 +1,9 @@
+<template>
+  <d2-container type="full">
+    <d2-demo-page-cover
+      title="Element"
+      sub-title="D2Admin 集成了许多实用插件">
+      <img src="@/assets/image/logo/w500-plugin.png">
+    </d2-demo-page-cover>
+  </d2-container>
+</template>
\ No newline at end of file
diff --git a/src/router/index.js b/src/router/index.js
index d39a33b3..5efc5b37 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -101,6 +101,16 @@ const routes = [
       { path: 'scrollbar', name: `${pre}scrollbar`, component: () => import('@/pages/demo/components/scrollbar/index.vue'), meta }
     ])('demo-components-')
   },
+  {
+    path: '/demo/element',
+    name: 'demo-element',
+    meta,
+    redirect: { name: 'demo-element-index' },
+    component: () => import('@/components/core/d2-layout-main/index.vue'),
+    children: (pre => [
+      { path: 'index', name: `${pre}index`, component: () => import('@/pages/demo/element/index/index.vue'), meta }
+    ])('demo-element-')
+  },
   // 登陆
   {
     path: '/login',
@@ -109,10 +119,6 @@ const routes = [
   }
 ]
 
-// routes[3].children.forEach(e => {
-//   console.log(`{ path: \`\${pre}${e.path}\`, title: 'title' }`)
-// })
-
 let router = new VueRouter({ routes })
 
 router.beforeEach((to, from, next) => {

From 5ea334f961b74cfba5e0b0b96b23221569c4edd2 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 17 Jun 2018 07:56:49 +0800
Subject: [PATCH 03/16] no message

Former-commit-id: 332061d0682849a971ab24b7769f64dad1277746 [formerly 332061d0682849a971ab24b7769f64dad1277746 [formerly 332061d0682849a971ab24b7769f64dad1277746 [formerly 332061d0682849a971ab24b7769f64dad1277746 [formerly fb22d13e499e20b4eacb47914e2190bade1641b5 [formerly ebfd4386a3b42dbdaa33f852bc6671b7c72faf0f]]]]]
Former-commit-id: 97999aaef119421f988fe1b7c615540702d65f74
Former-commit-id: 883a38e78e5dfcde10fd6b036bdace74c9cd14eb
Former-commit-id: 22acd06bcd8c6271f71188cf175c28a46165fd57 [formerly 88808f5eb3e8b5ae59319d3e07532a10ed3fa2df]
Former-commit-id: 68c9166cde9e071583b8d2927690b8fa792adcff
Former-commit-id: d1a249e2b65a1898ecddc6f4f140377a253cd18f
Former-commit-id: d59b3f7d9bb74da74ff6f2f963df3929f9f93efe
Former-commit-id: f6e729daecb4f49b5249a57d1b6a1e24e86488b8
Former-commit-id: f3a754767f65935428a7c90b8e55fc6959548743
---
 design.sketch.REMOVED.git-id                          | 2 +-
 src/assets/image/logo/w500-element.png.REMOVED.git-id | 2 +-
 src/pages/demo/element/index/index.vue                | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/design.sketch.REMOVED.git-id b/design.sketch.REMOVED.git-id
index 136e9924..d1b872e8 100644
--- a/design.sketch.REMOVED.git-id
+++ b/design.sketch.REMOVED.git-id
@@ -1 +1 @@
-90e4abc5ac31f491aa6d7e8f1bb912989f2480f3
\ No newline at end of file
+4b819d117b3b7e87effa763dbb04ba3280622cf1
\ No newline at end of file
diff --git a/src/assets/image/logo/w500-element.png.REMOVED.git-id b/src/assets/image/logo/w500-element.png.REMOVED.git-id
index 497869c2..3849adbf 100644
--- a/src/assets/image/logo/w500-element.png.REMOVED.git-id
+++ b/src/assets/image/logo/w500-element.png.REMOVED.git-id
@@ -1 +1 @@
-8953f5c6d828eec1b94f2c721975eb81297220e7
\ No newline at end of file
+96116cf6cd5a5755048348977ceaffcc3ab7b0c9
\ No newline at end of file
diff --git a/src/pages/demo/element/index/index.vue b/src/pages/demo/element/index/index.vue
index 8d4d1766..13bd31f2 100644
--- a/src/pages/demo/element/index/index.vue
+++ b/src/pages/demo/element/index/index.vue
@@ -1,9 +1,9 @@
 <template>
   <d2-container type="full">
     <d2-demo-page-cover
-      title="Element"
-      sub-title="D2Admin 集成了许多实用插件">
-      <img src="@/assets/image/logo/w500-plugin.png">
+      title="基础组件库"
+      sub-title="D2Admin 集成由饿了么出品的 ElementUI">
+      <img src="@/assets/image/logo/w500-element.png">
     </d2-demo-page-cover>
   </d2-container>
 </template>
\ No newline at end of file

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 04/16] 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 @@
+<template>
+  <d2-container>
+    <el-container class="d2-mb">
+      <el-header>顶栏</el-header>
+      <el-main>主体</el-main>
+    </el-container>
+    <el-container class="d2-mb">
+      <el-header>顶栏</el-header>
+      <el-main>主体</el-main>
+      <el-footer>底栏</el-footer>
+    </el-container>
+    <el-container class="d2-mb">
+      <el-aside width="200px">侧边栏</el-aside>
+      <el-main>主体</el-main>
+    </el-container>
+    <el-container class="d2-mb">
+      <el-header>顶栏</el-header>
+      <el-container>
+        <el-aside width="200px">侧边栏</el-aside>
+        <el-main>主体</el-main>
+      </el-container>
+    </el-container>
+    <el-container class="d2-mb">
+      <el-header>顶栏</el-header>
+      <el-container>
+        <el-aside width="200px">侧边栏</el-aside>
+        <el-container>
+          <el-main>主体</el-main>
+          <el-footer>底栏</el-footer>
+        </el-container>
+      </el-container>
+    </el-container>
+    <el-container class="d2-mb">
+      <el-aside width="200px">侧边栏</el-aside>
+      <el-container>
+        <el-header>顶栏</el-header>
+        <el-main>主体</el-main>
+      </el-container>
+    </el-container>
+    <el-container>
+      <el-aside width="200px">侧边栏</el-aside>
+      <el-container>
+        <el-header>顶栏</el-header>
+        <el-main>主体</el-main>
+        <el-footer>底栏</el-footer>
+      </el-container>
+    </el-container>
+  </d2-container>
+</template>
+
+<style lang="scss" scoped>
+.el-header, .el-footer {
+  background-color: #B3C0D1;
+  color: #333;
+  text-align: center;
+  line-height: 60px;
+}
+
+.el-aside {
+  background-color: #D3DCE6;
+  color: #333;
+  text-align: center;
+  line-height: 200px;
+}
+
+.el-main {
+  background-color: #E9EEF3;
+  color: #333;
+  text-align: center;
+  line-height: 160px;
+}
+
+body > .el-container {
+  margin-bottom: 40px;
+}
+
+.el-container:nth-child(5) .el-aside,
+.el-container:nth-child(6) .el-aside {
+  line-height: 260px;
+}
+
+.el-container:nth-child(7) .el-aside {
+  line-height: 320px;
+}
+</style>
+
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 @@
 <template>
-  <d2-container>
-    qqq
+  <d2-container type="ghost">
+    <el-card shadow="never" class="d2-mb">
+      <template slot="header">基础布局</template>
+      <el-row>
+        <el-col :span="24"><div class="grid-content bg-purple-dark"></div></el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12"><div class="grid-content bg-purple"></div></el-col>
+        <el-col :span="12"><div class="grid-content bg-purple-light"></div></el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="8"><div class="grid-content bg-purple"></div></el-col>
+        <el-col :span="8"><div class="grid-content bg-purple-light"></div></el-col>
+        <el-col :span="8"><div class="grid-content bg-purple"></div></el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="6"><div class="grid-content bg-purple"></div></el-col>
+        <el-col :span="6"><div class="grid-content bg-purple-light"></div></el-col>
+        <el-col :span="6"><div class="grid-content bg-purple"></div></el-col>
+        <el-col :span="6"><div class="grid-content bg-purple-light"></div></el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="4"><div class="grid-content bg-purple"></div></el-col>
+        <el-col :span="4"><div class="grid-content bg-purple-light"></div></el-col>
+        <el-col :span="4"><div class="grid-content bg-purple"></div></el-col>
+        <el-col :span="4"><div class="grid-content bg-purple-light"></div></el-col>
+        <el-col :span="4"><div class="grid-content bg-purple"></div></el-col>
+        <el-col :span="4"><div class="grid-content bg-purple-light"></div></el-col>
+      </el-row>
+    </el-card>
+    <el-card shadow="never" class="d2-mb">
+      <template slot="header">分栏间隔</template>
+      <el-row :gutter="20">
+        <el-col :span="6"><div class="grid-content bg-purple"></div></el-col>
+        <el-col :span="6"><div class="grid-content bg-purple"></div></el-col>
+        <el-col :span="6"><div class="grid-content bg-purple"></div></el-col>
+        <el-col :span="6"><div class="grid-content bg-purple"></div></el-col>
+      </el-row>
+    </el-card>
+    <el-card shadow="never" class="d2-mb">
+      <template slot="header">混合布局</template>
+      <el-row :gutter="20">
+        <el-col :span="16"><div class="grid-content bg-purple"></div></el-col>
+        <el-col :span="8"><div class="grid-content bg-purple"></div></el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="8"><div class="grid-content bg-purple"></div></el-col>
+        <el-col :span="8"><div class="grid-content bg-purple"></div></el-col>
+        <el-col :span="4"><div class="grid-content bg-purple"></div></el-col>
+        <el-col :span="4"><div class="grid-content bg-purple"></div></el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="4"><div class="grid-content bg-purple"></div></el-col>
+        <el-col :span="16"><div class="grid-content bg-purple"></div></el-col>
+        <el-col :span="4"><div class="grid-content bg-purple"></div></el-col>
+      </el-row>
+    </el-card>
+    <el-card shadow="never" class="d2-mb">
+      <template slot="header">分栏偏移</template>
+      <el-row :gutter="20">
+        <el-col :span="6"><div class="grid-content bg-purple"></div></el-col>
+        <el-col :span="6" :offset="6"><div class="grid-content bg-purple"></div></el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="6" :offset="6"><div class="grid-content bg-purple"></div></el-col>
+        <el-col :span="6" :offset="6"><div class="grid-content bg-purple"></div></el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12" :offset="6"><div class="grid-content bg-purple"></div></el-col>
+      </el-row>
+    </el-card>
+    <el-card shadow="never" class="d2-mb">
+      <template slot="header">对齐方式</template>
+      <el-row type="flex" class="row-bg">
+        <el-col :span="6"><div class="grid-content bg-purple"></div></el-col>
+        <el-col :span="6"><div class="grid-content bg-purple-light"></div></el-col>
+        <el-col :span="6"><div class="grid-content bg-purple"></div></el-col>
+      </el-row>
+      <el-row type="flex" class="row-bg" justify="center">
+        <el-col :span="6"><div class="grid-content bg-purple"></div></el-col>
+        <el-col :span="6"><div class="grid-content bg-purple-light"></div></el-col>
+        <el-col :span="6"><div class="grid-content bg-purple"></div></el-col>
+      </el-row>
+      <el-row type="flex" class="row-bg" justify="end">
+        <el-col :span="6"><div class="grid-content bg-purple"></div></el-col>
+        <el-col :span="6"><div class="grid-content bg-purple-light"></div></el-col>
+        <el-col :span="6"><div class="grid-content bg-purple"></div></el-col>
+      </el-row>
+      <el-row type="flex" class="row-bg" justify="space-between">
+        <el-col :span="6"><div class="grid-content bg-purple"></div></el-col>
+        <el-col :span="6"><div class="grid-content bg-purple-light"></div></el-col>
+        <el-col :span="6"><div class="grid-content bg-purple"></div></el-col>
+      </el-row>
+      <el-row type="flex" class="row-bg" justify="space-around">
+        <el-col :span="6"><div class="grid-content bg-purple"></div></el-col>
+        <el-col :span="6"><div class="grid-content bg-purple-light"></div></el-col>
+        <el-col :span="6"><div class="grid-content bg-purple"></div></el-col>
+      </el-row>
+    </el-card>
+    <el-card shadow="never" class="d2-mb">
+      <template slot="header">响应式布局</template>
+      <el-row :gutter="10">
+        <el-col :xs="8" :sm="6" :md="4" :lg="3" :xl="1"><div class="grid-content bg-purple"></div></el-col>
+        <el-col :xs="4" :sm="6" :md="8" :lg="9" :xl="11"><div class="grid-content bg-purple-light"></div></el-col>
+        <el-col :xs="4" :sm="6" :md="8" :lg="9" :xl="11"><div class="grid-content bg-purple"></div></el-col>
+        <el-col :xs="8" :sm="6" :md="4" :lg="3" :xl="1"><div class="grid-content bg-purple-light"></div></el-col>
+      </el-row>
+    </el-card>
   </d2-container>
 </template>
+
+<style lang="scss" scoped>
+.el-row {
+  margin-bottom: 20px;
+  &:last-child {
+    margin-bottom: 0;
+  }
+}
+.el-col {
+  border-radius: 4px;
+}
+.bg-purple-dark {
+  background: #99a9bf;
+}
+.bg-purple {
+  background: #d3dce6;
+}
+.bg-purple-light {
+  background: #e5e9f2;
+}
+.grid-content {
+  border-radius: 4px;
+  min-height: 36px;
+}
+.row-bg {
+  padding: 10px 0;
+  background-color: #f9fafc;
+}
+</style>
+
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-')
   },

From 56428ca55e549ac3ef987237b1c20dfd925eaf2d Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 17 Jun 2018 08:35:38 +0800
Subject: [PATCH 05/16] no message

Former-commit-id: 4c963e6b2ac57585d996b3134c9da48ff3c67cc3 [formerly d814792f640f7852b18b1d5e88b6c696867a12f3] [formerly 4c963e6b2ac57585d996b3134c9da48ff3c67cc3 [formerly d814792f640f7852b18b1d5e88b6c696867a12f3] [formerly 4c963e6b2ac57585d996b3134c9da48ff3c67cc3 [formerly d814792f640f7852b18b1d5e88b6c696867a12f3] [formerly d814792f640f7852b18b1d5e88b6c696867a12f3 [formerly d60eb3d92af6d7aca69d0ae95f44b67f69e7e8ff [formerly 7e812f11ba838173e63c4bbff391365ef12c114d]]]]]
Former-commit-id: 1293be874322a65bea6cf7efb615f9ae73b1af9b
Former-commit-id: 0ee50845ebe6b38731f0dccdb7dd154624206257
Former-commit-id: bab7ae2c943acc69b077e700f55f9b9a16c78259 [formerly 465226c28beddf7b9fcadee5581a05799a5b9b4a]
Former-commit-id: 06413528d609e638694ffc338dbdd3a64db82513
Former-commit-id: 947ef33191cea3f9a413b5d3ffd54827b9808ea2
Former-commit-id: ddd4cc15d2f24aefe4f88740cba54fbbbfec974b
Former-commit-id: 8882f4cccfc06e694cc83f674db9ecb04bfb3a62
Former-commit-id: 5744c15f15117c5fdf4e320ab8bc3f66a92e3b46
---
 src/menu/index.js                            |  3 +-
 src/pages/demo/element/basic-color/index.vue | 72 ++++++++++++++++++++
 src/router/index.js                          |  1 +
 3 files changed, 75 insertions(+), 1 deletion(-)
 create mode 100644 src/pages/demo/element/basic-color/index.vue

diff --git a/src/menu/index.js b/src/menu/index.js
index 5d9d7607..f1cce48c 100644
--- a/src/menu/index.js
+++ b/src/menu/index.js
@@ -134,7 +134,8 @@ const demoElement = {
       title: '基础',
       children: [
         { path: `${pre}basic-layout`, title: '布局' },
-        { path: `${pre}basic-container`, title: '布局容器' }
+        { path: `${pre}basic-container`, title: '布局容器' },
+        { path: `${pre}basic-color`, title: '颜色' }
       ]
     }
   ])('/demo/element/')
diff --git a/src/pages/demo/element/basic-color/index.vue b/src/pages/demo/element/basic-color/index.vue
new file mode 100644
index 00000000..c7f2b77b
--- /dev/null
+++ b/src/pages/demo/element/basic-color/index.vue
@@ -0,0 +1,72 @@
+<template>
+  <d2-container type="ghost">
+    <el-card shadow="never" class="d2-mb">
+      <template slot="header">主色</template>
+      <el-row :gutter="20">
+        <el-col :span="6">
+          <div class="color color-primary">
+            <!-- <h1>$color-primary</h1> -->
+          </div>
+        </el-col>
+      </el-row>
+    </el-card>
+    <el-card shadow="never" class="d2-mb">
+      <template slot="header">辅助色</template>
+      <el-row :gutter="20">
+        <el-col :span="6">
+          <div class="color color-info"></div>
+        </el-col>
+        <el-col :span="6">
+          <div class="color color-success"></div>
+        </el-col>
+        <el-col :span="6">
+          <div class="color color-warning"></div>
+        </el-col>
+        <el-col :span="6">
+          <div class="color color-danger"></div>
+        </el-col>
+      </el-row>
+    </el-card>
+    <el-card shadow="never">
+      <template slot="header">中性色</template>
+      <el-row :gutter="20">
+        <el-col :span="6">
+          <div class="color color-info"></div>
+        </el-col>
+        <el-col :span="6">
+          <div class="color color-success"></div>
+        </el-col>
+        <el-col :span="6">
+          <div class="color color-warning"></div>
+        </el-col>
+        <el-col :span="6">
+          <div class="color color-danger"></div>
+        </el-col>
+      </el-row>
+    </el-card>
+  </d2-container>
+</template>
+
+<style lang="scss" scoped>
+@import '~@/assets/style/unit/_color.scss';
+.color {
+  border-radius: 4px;
+  height: 100px;
+}
+.color-primary {
+  background-color: $color-primary;
+}
+.color-info {
+  background-color: $color-info;
+}
+.color-success {
+  background-color: $color-success;
+}
+.color-warning {
+  background-color: $color-warning;
+}
+.color-danger {
+  background-color: $color-danger;
+}
+</style>
+
diff --git a/src/router/index.js b/src/router/index.js
index 3ef19f1b..a29d89c0 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -110,6 +110,7 @@ const routes = [
     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: 'basic-color', name: `${pre}basic-color`, component: () => import('@/pages/demo/element/basic-color/index.vue'), meta },
       { path: 'index', name: `${pre}index`, component: () => import('@/pages/demo/element/index/index.vue'), meta }
     ])('demo-element-')
   },

From a6e52e4a74f78b112af556dd1e315d00de00a072 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 17 Jun 2018 12:00:05 +0800
Subject: [PATCH 06/16] no message

Former-commit-id: 37c15613f04c755a95d4c0e5b3c86534c5694f7a [formerly f14135211d4d7dd1b3b9ed084aefd794c6f9cdcb] [formerly 37c15613f04c755a95d4c0e5b3c86534c5694f7a [formerly f14135211d4d7dd1b3b9ed084aefd794c6f9cdcb] [formerly 37c15613f04c755a95d4c0e5b3c86534c5694f7a [formerly f14135211d4d7dd1b3b9ed084aefd794c6f9cdcb] [formerly f14135211d4d7dd1b3b9ed084aefd794c6f9cdcb [formerly 347f5301d25da297c101d941af81a67f0a8d7240 [formerly dbde0ddc84a48a2bf821a4d019aa141abf78c676]]]]]
Former-commit-id: c1aff8b6f148067e928f23c48a7e46db8047897f
Former-commit-id: f0ec1a348c262479effc5288c7384b38984915b1
Former-commit-id: dbaf1d11571c2ac62a9710612478004b804baf67 [formerly f8af2ab177e82cecfd1eb61cef519e10b69d73d8]
Former-commit-id: 1c3e19c4069737d736aebe8c6d3161dbeef0a31f
Former-commit-id: aab7fd820f04c9423d82273ff5c1086037d0355d
Former-commit-id: db518aed306c55ccd671d8270c7fd233718836c9
Former-commit-id: 1454fa10f3f3c5de355b310a894ce8ef8640d44e
Former-commit-id: 53e42a082b9356f05921f415360a0e0bb7448250
---
 .../basic-color/components/color-info.vue     |  5 ++
 src/pages/demo/element/basic-color/index.vue  | 61 +++++++++++++++++--
 2 files changed, 61 insertions(+), 5 deletions(-)
 create mode 100644 src/pages/demo/element/basic-color/components/color-info.vue

diff --git a/src/pages/demo/element/basic-color/components/color-info.vue b/src/pages/demo/element/basic-color/components/color-info.vue
new file mode 100644
index 00000000..d22c7e27
--- /dev/null
+++ b/src/pages/demo/element/basic-color/components/color-info.vue
@@ -0,0 +1,5 @@
+<template>
+  <div>
+    <p>颜色</p>
+  </div>
+</template>
diff --git a/src/pages/demo/element/basic-color/index.vue b/src/pages/demo/element/basic-color/index.vue
index c7f2b77b..105ce536 100644
--- a/src/pages/demo/element/basic-color/index.vue
+++ b/src/pages/demo/element/basic-color/index.vue
@@ -5,7 +5,7 @@
       <el-row :gutter="20">
         <el-col :span="6">
           <div class="color color-primary">
-            <!-- <h1>$color-primary</h1> -->
+            <d2-demo-color-info/>
           </div>
         </el-col>
       </el-row>
@@ -29,33 +29,58 @@
     </el-card>
     <el-card shadow="never">
       <template slot="header">中性色</template>
+      <el-row :gutter="20" class="d2-mb">
+        <el-col :span="6">
+          <div class="color color-text-main"></div>
+        </el-col>
+        <el-col :span="6">
+          <div class="color color-text-normal"></div>
+        </el-col>
+        <el-col :span="6">
+          <div class="color color-text-sub"></div>
+        </el-col>
+        <el-col :span="6">
+          <div class="color color-text-placehoder"></div>
+        </el-col>
+      </el-row>
       <el-row :gutter="20">
         <el-col :span="6">
-          <div class="color color-info"></div>
+          <div class="color color-border-1"></div>
         </el-col>
         <el-col :span="6">
-          <div class="color color-success"></div>
+          <div class="color color-border-2"></div>
         </el-col>
         <el-col :span="6">
-          <div class="color color-warning"></div>
+          <div class="color color-border-3"></div>
         </el-col>
         <el-col :span="6">
-          <div class="color color-danger"></div>
+          <div class="color color-border-4"></div>
         </el-col>
       </el-row>
     </el-card>
   </d2-container>
 </template>
 
+<script>
+export default {
+  components: {
+    'd2-demo-color-info': () => import('./components/color-info.vue')
+  }
+}
+</script>
+
+
 <style lang="scss" scoped>
 @import '~@/assets/style/unit/_color.scss';
 .color {
   border-radius: 4px;
   height: 100px;
 }
+
 .color-primary {
   background-color: $color-primary;
 }
+
 .color-info {
   background-color: $color-info;
 }
@@ -68,5 +93,31 @@
 .color-danger {
   background-color: $color-danger;
 }
+
+.color-text-main {
+  background-color: $color-text-main;
+}
+.color-text-normal {
+  background-color: $color-text-normal;
+}
+.color-text-sub {
+  background-color: $color-text-sub;
+}
+.color-text-placehoder {
+  background-color: $color-text-placehoder;
+}
+
+.color-border-1 {
+  background-color: $color-border-1;
+}
+.color-border-2 {
+  background-color: $color-border-2;
+}
+.color-border-3 {
+  background-color: $color-border-3;
+}
+.color-border-4 {
+  background-color: $color-border-4;
+}
 </style>
 

From cdb076c9819fe510c77fc97067e49fc53e616d7c Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 17 Jun 2018 16:28:29 +0800
Subject: [PATCH 07/16] no message

Former-commit-id: 7f665079ef7e479fa12338d0256f3e49608244d4 [formerly 788bba9cbd8c937156878d9c9242ada154ab92fa] [formerly 7f665079ef7e479fa12338d0256f3e49608244d4 [formerly 788bba9cbd8c937156878d9c9242ada154ab92fa] [formerly 7f665079ef7e479fa12338d0256f3e49608244d4 [formerly 788bba9cbd8c937156878d9c9242ada154ab92fa] [formerly 788bba9cbd8c937156878d9c9242ada154ab92fa [formerly 21a5b2f6ef2253b2e6dd7d1fd48e3dfc939e09d3 [formerly c4b5be7dc728e2e90fc7a1b152f4dce5a8558b78]]]]]
Former-commit-id: 3c4d6356ac35b139746dc4f218df6f6c26d6ce33
Former-commit-id: 2139ddbe3312396d4fdbcf151af0442c6aa2588e
Former-commit-id: 406b1f3038bbe0b863ecb506d732d53d4e4337bf [formerly 9c46b17a51ac73a4df62980ef8e1236fb9a26c2f]
Former-commit-id: ab671a52deff72c27dc66ec7724d797227efa2f9
Former-commit-id: dc2f9c24240796c4738e484c69c740eb8e9a317a
Former-commit-id: 47e480aed8c63192d37b81d806899ca3f297a5d6
Former-commit-id: 2ff843b09c6fba78376c499014b379e997d7fbbc
Former-commit-id: 09a385163aab1314c145b6360d6771da3422c595
---
 .../basic-color/components/{color-info.vue => info.vue}       | 0
 src/pages/demo/element/basic-color/index.vue                  | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename src/pages/demo/element/basic-color/components/{color-info.vue => info.vue} (100%)

diff --git a/src/pages/demo/element/basic-color/components/color-info.vue b/src/pages/demo/element/basic-color/components/info.vue
similarity index 100%
rename from src/pages/demo/element/basic-color/components/color-info.vue
rename to src/pages/demo/element/basic-color/components/info.vue
diff --git a/src/pages/demo/element/basic-color/index.vue b/src/pages/demo/element/basic-color/index.vue
index 105ce536..6387f87b 100644
--- a/src/pages/demo/element/basic-color/index.vue
+++ b/src/pages/demo/element/basic-color/index.vue
@@ -5,7 +5,7 @@
       <el-row :gutter="20">
         <el-col :span="6">
           <div class="color color-primary">
-            <d2-demo-color-info/>
+            <d2-element-basic-color-info/>
           </div>
         </el-col>
       </el-row>
@@ -64,7 +64,7 @@
 <script>
 export default {
   components: {
-    'd2-demo-color-info': () => import('./components/color-info.vue')
+    'd2-element-basic-color-info': () => import('./components/info.vue')
   }
 }
 </script>

From 237974be7602b9e39c9ee4dc3bc702e0a0cc6862 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 17 Jun 2018 16:33:40 +0800
Subject: [PATCH 08/16] no message

Former-commit-id: 94443cd9ea652d9e8a8180031eef4b61a1f9dd45 [formerly a86d825acfe20d5ae82bffc584e6fb18c11036fb] [formerly 94443cd9ea652d9e8a8180031eef4b61a1f9dd45 [formerly a86d825acfe20d5ae82bffc584e6fb18c11036fb] [formerly 94443cd9ea652d9e8a8180031eef4b61a1f9dd45 [formerly a86d825acfe20d5ae82bffc584e6fb18c11036fb] [formerly a86d825acfe20d5ae82bffc584e6fb18c11036fb [formerly 0a3034ee1c3c67086d4855043a1672bf11bb832e [formerly 0092fc94aaf1fe81e43358068cd68c5fd0094593]]]]]
Former-commit-id: 7b5a9016b494e68ef07e7ddc50de55db659789d8
Former-commit-id: 685404744d1875ff1a33ab64374a4761a8c6c47a
Former-commit-id: 3f81105e10b114bd09eec24c3489a064112afce8 [formerly acac5e836299698997692e2763b18cdfe634cc8d]
Former-commit-id: f0784dce3d583b0128fbaeb74a0f3da43b610fb8
Former-commit-id: 98091f11b8619b2793f001ffa340aa0b782c3afd
Former-commit-id: 775d90248326683f150d2e85ba8e342b08c633af
Former-commit-id: 79c72f487b6290960495d3b092aefd244d239529
Former-commit-id: fb1f4fc1e8aaccc5fe41b4874024f92e3c9d7039
---
 .../element/basic-color/components/info.vue   | 26 +++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/pages/demo/element/basic-color/components/info.vue b/src/pages/demo/element/basic-color/components/info.vue
index d22c7e27..c0e7cfbc 100644
--- a/src/pages/demo/element/basic-color/components/info.vue
+++ b/src/pages/demo/element/basic-color/components/info.vue
@@ -1,5 +1,27 @@
 <template>
-  <div>
-    <p>颜色</p>
+  <div class="info" :class="theme">
+    <p>颜色名称</p>
+    <p>scss名称</p>
+    <p>颜色值</p>
   </div>
 </template>
+
+<script>
+export default {
+  props: {
+    theme: {
+      type: String,
+      required: false,
+      default: 'light' // dark
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.info {
+  &.light {
+    color: #FFF;
+  }
+}
+</style>

From 15a9d161085c14252279f6d1ee5676d62185a549 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 17 Jun 2018 16:36:04 +0800
Subject: [PATCH 09/16] no message

Former-commit-id: 3178255ce8968c40aa21087166fd127bc27e0e44 [formerly 4df003ff6c110b96bb343009751b77f4db59d085] [formerly 3178255ce8968c40aa21087166fd127bc27e0e44 [formerly 4df003ff6c110b96bb343009751b77f4db59d085] [formerly 3178255ce8968c40aa21087166fd127bc27e0e44 [formerly 4df003ff6c110b96bb343009751b77f4db59d085] [formerly 4df003ff6c110b96bb343009751b77f4db59d085 [formerly dc2f10a6ddcef909a41abe6380d99ea226cc02b1 [formerly 18517916c243f31ea9ea0689d406722e67734985]]]]]
Former-commit-id: b82633472a6ff1b304cc09bb6307af753f18496c
Former-commit-id: 21c5414edad1ea16dd42a601e7aa474d355004d1
Former-commit-id: 8ff26d026b1286a140252b23dbdc73d6a997f235 [formerly af1884b26233e68da3f480bacd84ff6157c3db2f]
Former-commit-id: 7f69dcb4b1342eed2edba0078318ed68d25ab389
Former-commit-id: 2172557f323fee29dfa7dbb82a44407891a377cb
Former-commit-id: 9dd17bbdfd893a191e44146107e1c8bc96ee831e
Former-commit-id: e70a99d94d3168f687edff37fc09aa0e765797cf
Former-commit-id: 3c5812d062be4250e02addc6757c8976b9b318b8
---
 .../element/basic-color/components/info.vue   | 21 ++++++++++++++++---
 src/pages/demo/element/basic-color/index.vue  |  2 +-
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/pages/demo/element/basic-color/components/info.vue b/src/pages/demo/element/basic-color/components/info.vue
index c0e7cfbc..1f33a070 100644
--- a/src/pages/demo/element/basic-color/components/info.vue
+++ b/src/pages/demo/element/basic-color/components/info.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="info" :class="theme">
-    <p>颜色名称</p>
-    <p>scss名称</p>
-    <p>颜色值</p>
+    <p>{{name}}</p>
+    <p>{{sass}}</p>
+    <p>{{color}}</p>
   </div>
 </template>
 
@@ -13,6 +13,21 @@ export default {
       type: String,
       required: false,
       default: 'light' // dark
+    },
+    name: {
+      type: String,
+      required: false,
+      default: ''
+    },
+    sass: {
+      type: String,
+      required: false,
+      default: ''
+    },
+    color: {
+      type: String,
+      required: false,
+      default: ''
     }
   }
 }
diff --git a/src/pages/demo/element/basic-color/index.vue b/src/pages/demo/element/basic-color/index.vue
index 6387f87b..03d40bbf 100644
--- a/src/pages/demo/element/basic-color/index.vue
+++ b/src/pages/demo/element/basic-color/index.vue
@@ -5,7 +5,7 @@
       <el-row :gutter="20">
         <el-col :span="6">
           <div class="color color-primary">
-            <d2-element-basic-color-info/>
+            <d2-element-basic-color-info name="Blue" sass="$color-primary" color="#409EFF"/>
           </div>
         </el-col>
       </el-row>

From ced07f64827ea8a24ae039e7a8068b9826e91cac Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 17 Jun 2018 16:38:07 +0800
Subject: [PATCH 10/16] no message

Former-commit-id: 95ba53857ce2605573ccbd0664a8da4f440c98ce [formerly 95ba53857ce2605573ccbd0664a8da4f440c98ce [formerly 95ba53857ce2605573ccbd0664a8da4f440c98ce [formerly 95ba53857ce2605573ccbd0664a8da4f440c98ce [formerly e561c27647d85623d1ecf664156125f4f4c3264c [formerly 97f85687f9f9c30af88b0ef5b2396ce5d5f2dae0]]]]]
Former-commit-id: ae5475b94414dc1fd31325e72b12d4485fe9c656
Former-commit-id: b0a70a39a6475aff6d8ae95eeaae91555c52f4c8
Former-commit-id: 9730cb2e3f1ab5c439c6154fbc2471683332489b [formerly 6921ebdf5b8d85583b06cbc59b090191f585af43]
Former-commit-id: 31908c28490465fd77b990f4837c0c379c6cdc15
Former-commit-id: 8bcd2437c477f842789acdd597f6dc12be234dea
Former-commit-id: 64bbcbb2efb49d5aed8adefd0284e3eca6c81048
Former-commit-id: 87192c97623e612e03599dbc06a922dff00a2dd2
Former-commit-id: a73089881ef10b83ef35cbeceb1a56610f26c6fc
---
 .../element/basic-color/components/info.vue   |  3 ++
 src/pages/demo/element/basic-color/index.vue  | 48 ++++++++++++++-----
 2 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/src/pages/demo/element/basic-color/components/info.vue b/src/pages/demo/element/basic-color/components/info.vue
index 1f33a070..ae1bc219 100644
--- a/src/pages/demo/element/basic-color/components/info.vue
+++ b/src/pages/demo/element/basic-color/components/info.vue
@@ -35,6 +35,9 @@ export default {
 
 <style lang="scss" scoped>
 .info {
+  &.dark {
+    color: #333;
+  }
   &.light {
     color: #FFF;
   }
diff --git a/src/pages/demo/element/basic-color/index.vue b/src/pages/demo/element/basic-color/index.vue
index 03d40bbf..ae6316c1 100644
--- a/src/pages/demo/element/basic-color/index.vue
+++ b/src/pages/demo/element/basic-color/index.vue
@@ -14,16 +14,24 @@
       <template slot="header">辅助色</template>
       <el-row :gutter="20">
         <el-col :span="6">
-          <div class="color color-info"></div>
+          <div class="color color-info">
+            <d2-element-basic-color-info name="Blue" sass="$color-primary" color="#409EFF"/>
+          </div>
         </el-col>
         <el-col :span="6">
-          <div class="color color-success"></div>
+          <div class="color color-success">
+            <d2-element-basic-color-info name="Blue" sass="$color-primary" color="#409EFF"/>
+          </div>
         </el-col>
         <el-col :span="6">
-          <div class="color color-warning"></div>
+          <div class="color color-warning">
+            <d2-element-basic-color-info name="Blue" sass="$color-primary" color="#409EFF"/>
+          </div>
         </el-col>
         <el-col :span="6">
-          <div class="color color-danger"></div>
+          <div class="color color-danger">
+            <d2-element-basic-color-info name="Blue" sass="$color-primary" color="#409EFF"/>
+          </div>
         </el-col>
       </el-row>
     </el-card>
@@ -31,30 +39,46 @@
       <template slot="header">中性色</template>
       <el-row :gutter="20" class="d2-mb">
         <el-col :span="6">
-          <div class="color color-text-main"></div>
+          <div class="color color-text-main">
+            <d2-element-basic-color-info name="Blue" sass="$color-primary" color="#409EFF"/>
+          </div>
         </el-col>
         <el-col :span="6">
-          <div class="color color-text-normal"></div>
+          <div class="color color-text-normal">
+            <d2-element-basic-color-info name="Blue" sass="$color-primary" color="#409EFF"/>
+          </div>
         </el-col>
         <el-col :span="6">
-          <div class="color color-text-sub"></div>
+          <div class="color color-text-sub">
+            <d2-element-basic-color-info name="Blue" sass="$color-primary" color="#409EFF"/>
+          </div>
         </el-col>
         <el-col :span="6">
-          <div class="color color-text-placehoder"></div>
+          <div class="color color-text-placehoder">
+            <d2-element-basic-color-info name="Blue" sass="$color-primary" color="#409EFF"/>
+          </div>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="6">
-          <div class="color color-border-1"></div>
+          <div class="color color-border-1">
+            <d2-element-basic-color-info theme="dark" name="Blue" sass="$color-primary" color="#409EFF"/>
+          </div>
         </el-col>
         <el-col :span="6">
-          <div class="color color-border-2"></div>
+          <div class="color color-border-2">
+            <d2-element-basic-color-info theme="dark" name="Blue" sass="$color-primary" color="#409EFF"/>
+          </div>
         </el-col>
         <el-col :span="6">
-          <div class="color color-border-3"></div>
+          <div class="color color-border-3">
+            <d2-element-basic-color-info theme="dark" name="Blue" sass="$color-primary" color="#409EFF"/>
+          </div>
         </el-col>
         <el-col :span="6">
-          <div class="color color-border-4"></div>
+          <div class="color color-border-4">
+            <d2-element-basic-color-info theme="dark" name="Blue" sass="$color-primary" color="#409EFF"/>
+          </div>
         </el-col>
       </el-row>
     </el-card>

From 7fa19b599f61081d9668f7cb1eb2389817a50ad6 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 17 Jun 2018 19:12:36 +0800
Subject: [PATCH 11/16] no message

Former-commit-id: 5c288bc63a74b39b847dfbb82f6e1e199dd2c462 [formerly 7612efeb07112998a4b7423d7fc8159ae559165b] [formerly 5c288bc63a74b39b847dfbb82f6e1e199dd2c462 [formerly 7612efeb07112998a4b7423d7fc8159ae559165b] [formerly 5c288bc63a74b39b847dfbb82f6e1e199dd2c462 [formerly 7612efeb07112998a4b7423d7fc8159ae559165b] [formerly 7612efeb07112998a4b7423d7fc8159ae559165b [formerly 5961bc32a761d873c0163f3891802393647d7145 [formerly b1932ef852390a7c523500fcfcb7db30d7450dda]]]]]
Former-commit-id: 7b8f0ae5e9ffba301668fcf050ed597d1a724453
Former-commit-id: 29ede6dc0a8515bb3749a85065561500da60a0ff
Former-commit-id: 0f14969cb2ed4ec2db02e12d29168c982ab6a431 [formerly f1a6c6f7d45f6f5f41fbccc5bf10d5372f4e9286]
Former-commit-id: bdcc6d127e4c9e967612648a7be771db4c327cc4
Former-commit-id: fa28621a5111b0a83fcf8447649084a4e7c164ed
Former-commit-id: d1d8318a1f1ac8a751902ab2ec0ca6ecca887bef
Former-commit-id: d079dc6c22106b846e65cb401e84f61ee0bdcd2e
Former-commit-id: 0d738c6ff6e52e9f35f8305bc446e2191d20b99d
---
 .../theme/tomorrow-night-blue/setting.scss    |  2 +-
 .../element/basic-color/components/info.vue   | 20 ++++++++++++++++---
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/assets/style/theme/tomorrow-night-blue/setting.scss b/src/assets/style/theme/tomorrow-night-blue/setting.scss
index a3381ecf..92f54dfe 100644
--- a/src/assets/style/theme/tomorrow-night-blue/setting.scss
+++ b/src/assets/style/theme/tomorrow-night-blue/setting.scss
@@ -1,7 +1,7 @@
 // 主题名称
 $theme-name: 'tomorrow-night-blue';
 // 主题背景颜色
-$theme-bg-color: #002147;
+$theme-bg-color: #002253;
 // 主题背景图片
 $theme-bg-image: none;
 // 主题背景图片遮罩
diff --git a/src/pages/demo/element/basic-color/components/info.vue b/src/pages/demo/element/basic-color/components/info.vue
index ae1bc219..f394b953 100644
--- a/src/pages/demo/element/basic-color/components/info.vue
+++ b/src/pages/demo/element/basic-color/components/info.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="info" :class="theme">
-    <p>{{name}}</p>
-    <p>{{sass}}</p>
-    <p>{{color}}</p>
+    <p class="name">{{name}}</p>
+    <p class="sass">{{sass}}</p>
+    <p class="color">{{color}}</p>
   </div>
 </template>
 
@@ -35,6 +35,20 @@ export default {
 
 <style lang="scss" scoped>
 .info {
+  padding: 10px;
+  p {
+    margin: 0px;
+  }
+  .name {
+    font-size: 14px;
+    font-weight: bold;
+  }
+  .sass {
+    font-size: 12px;
+  }
+  .color {
+    font-size: 12px;
+  }
   &.dark {
     color: #333;
   }

From bdeccada8d1ff205cf0126d496ab070b79e4067f Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 17 Jun 2018 21:18:19 +0800
Subject: [PATCH 12/16] no message

Former-commit-id: 000a9d9d626e71f5b5c99652c0d6c45ef5aa9d69 [formerly 000a9d9d626e71f5b5c99652c0d6c45ef5aa9d69 [formerly 000a9d9d626e71f5b5c99652c0d6c45ef5aa9d69 [formerly 000a9d9d626e71f5b5c99652c0d6c45ef5aa9d69 [formerly 547e4e7ac2549898f76063bebd208b880f016d14 [formerly 4ff0de895a8eb4b5152ff66de15b961e38af8328]]]]]
Former-commit-id: 72f10cd4eb7daacac5f582d29c08a1b5dbafacbc
Former-commit-id: 6e97a9ba3b8876d0a518732439db610fa8139d2b
Former-commit-id: d35cb423c8af5c656de77f651bd32909452ee20e [formerly 830b3b7daa95ae228a2237e520dbd5fcae92a529]
Former-commit-id: 14774b8cca6c7f2144fac733737f31f1e213c9e7
Former-commit-id: ad96ca69897373fc9086a76e989093102a2a4cf8
Former-commit-id: 69cd07e473a130ba88962243fcc139f1d192f642
Former-commit-id: c80ab02dd1e332db4e39a51b2c5f58faa7d7d59b
Former-commit-id: 201595ab2f34cfe9bc4ec38b043d63ceedf016f9
---
 src/pages/demo/element/basic-color/components/info.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/pages/demo/element/basic-color/components/info.vue b/src/pages/demo/element/basic-color/components/info.vue
index f394b953..ae49a5c7 100644
--- a/src/pages/demo/element/basic-color/components/info.vue
+++ b/src/pages/demo/element/basic-color/components/info.vue
@@ -40,14 +40,16 @@ export default {
     margin: 0px;
   }
   .name {
-    font-size: 14px;
+    font-size: 16px;
     font-weight: bold;
   }
   .sass {
     font-size: 12px;
+    margin-top: 4px;
   }
   .color {
     font-size: 12px;
+    opacity: .7;
   }
   &.dark {
     color: #333;

From 7f85a58fa96b17af2d2d8bb0e97c31b5bf965481 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 17 Jun 2018 21:34:36 +0800
Subject: [PATCH 13/16] no message

Former-commit-id: d390c6bd156541c342e63b7ca2006566215970e2 [formerly d390c6bd156541c342e63b7ca2006566215970e2 [formerly d390c6bd156541c342e63b7ca2006566215970e2 [formerly d390c6bd156541c342e63b7ca2006566215970e2 [formerly 2dc295303aec6f86742989a98ed6f7c43029a414 [formerly 3e1d7ce28acea9b8bed7290335daa08bf05156b2]]]]]
Former-commit-id: a5d62803107022b06aa106d8ca88d8f77ee9ce3e
Former-commit-id: e75933de048f3c0f3ea068a2b0c1547c034aaa82
Former-commit-id: 09556c88fb74ce8397b9db6fb0ba16bd484a554d [formerly 01fdd6991ee08383b54bc500fbba797b181c2c48]
Former-commit-id: 2eabd249cc075e6dcf1ba1a5e20187059e43a454
Former-commit-id: 25db52dca2e3d7f63dfce196d5e7a214f7943601
Former-commit-id: 44d4f2017d5b150f10d39b51d22e1e3f2f7ad7b3
Former-commit-id: ac52f903747a173fa61f75b9f8637a0adb2e38c5
Former-commit-id: 9757d5c22e7fff13f6e644b7a9a7097f6999b167
---
 src/pages/demo/element/basic-color/components/info.vue | 1 +
 src/pages/demo/element/basic-color/index.vue           | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/demo/element/basic-color/components/info.vue b/src/pages/demo/element/basic-color/components/info.vue
index ae49a5c7..c985cd6b 100644
--- a/src/pages/demo/element/basic-color/components/info.vue
+++ b/src/pages/demo/element/basic-color/components/info.vue
@@ -50,6 +50,7 @@ export default {
   .color {
     font-size: 12px;
     opacity: .7;
+    margin-top: 2px;
   }
   &.dark {
     color: #333;
diff --git a/src/pages/demo/element/basic-color/index.vue b/src/pages/demo/element/basic-color/index.vue
index ae6316c1..949d913a 100644
--- a/src/pages/demo/element/basic-color/index.vue
+++ b/src/pages/demo/element/basic-color/index.vue
@@ -98,7 +98,7 @@ export default {
 @import '~@/assets/style/unit/_color.scss';
 .color {
   border-radius: 4px;
-  height: 100px;
+  height: 90px;
 }
 
 .color-primary {

From 524fb55a4992301d6afb83686bd4e606e27b6adb Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 17 Jun 2018 21:42:42 +0800
Subject: [PATCH 14/16] no message

Former-commit-id: 7e46f409fa33922c33bd4ad0a0c5d654768ebebb [formerly 7e46f409fa33922c33bd4ad0a0c5d654768ebebb [formerly 7e46f409fa33922c33bd4ad0a0c5d654768ebebb [formerly 7e46f409fa33922c33bd4ad0a0c5d654768ebebb [formerly 639bac1eb7272e8fa79619ab271db639cd01f4ab [formerly 3a8f6872690e37750e9d79f242ac7c01573cd936]]]]]
Former-commit-id: 146c61b0ea624506fd2b2ab828424bf6b37e2bd2
Former-commit-id: bf27ab0bd3a124f3a1fb6fc5c0dbffdaedbd6184
Former-commit-id: ef6a06017b9b54324f9432e5680c24c752a8d301 [formerly 362516e7d88d3b1413a9cf6e8afb47daffbb7e5b]
Former-commit-id: f9fa709d029db4d4ad5c31d032e04fb6f3ec1f75
Former-commit-id: 65fa6c6e7966ba50155bca9a5de5d524a623a03d
Former-commit-id: ab97ea314ebfa4dde0b2fed58cfe5586ed39b98a
Former-commit-id: c99315c684744f738b51482b5f1139e5789b5fc9
Former-commit-id: ac3a541857ea308892db57dec0426c581bf286c5
---
 src/menu/index.js                             |  3 +-
 src/pages/demo/element/basic-button/index.vue | 41 +++++++++++++++++++
 src/pages/demo/element/basic-color/index.vue  |  4 ++
 .../demo/element/basic-container/index.vue    |  8 ++++
 src/pages/demo/element/basic-layout/index.vue |  7 ++++
 src/router/index.js                           |  1 +
 6 files changed, 63 insertions(+), 1 deletion(-)
 create mode 100644 src/pages/demo/element/basic-button/index.vue

diff --git a/src/menu/index.js b/src/menu/index.js
index f1cce48c..42bbecb0 100644
--- a/src/menu/index.js
+++ b/src/menu/index.js
@@ -135,7 +135,8 @@ const demoElement = {
       children: [
         { path: `${pre}basic-layout`, title: '布局' },
         { path: `${pre}basic-container`, title: '布局容器' },
-        { path: `${pre}basic-color`, title: '颜色' }
+        { path: `${pre}basic-color`, title: '颜色' },
+        { path: `${pre}basic-button`, title: '按钮' }
       ]
     }
   ])('/demo/element/')
diff --git a/src/pages/demo/element/basic-button/index.vue b/src/pages/demo/element/basic-button/index.vue
new file mode 100644
index 00000000..c635a132
--- /dev/null
+++ b/src/pages/demo/element/basic-button/index.vue
@@ -0,0 +1,41 @@
+<template>
+  <d2-container>
+
+    <el-row class="d2-mb">
+      <el-button>默认按钮</el-button>
+      <el-button type="primary">主要按钮</el-button>
+      <el-button type="success">成功按钮</el-button>
+      <el-button type="info">信息按钮</el-button>
+      <el-button type="warning">警告按钮</el-button>
+      <el-button type="danger">危险按钮</el-button>
+    </el-row>
+
+    <el-row class="d2-mb">
+      <el-button plain>朴素按钮</el-button>
+      <el-button type="primary" plain>主要按钮</el-button>
+      <el-button type="success" plain>成功按钮</el-button>
+      <el-button type="info" plain>信息按钮</el-button>
+      <el-button type="warning" plain>警告按钮</el-button>
+      <el-button type="danger" plain>危险按钮</el-button>
+    </el-row>
+
+    <el-row class="d2-mb">
+      <el-button round>圆角按钮</el-button>
+      <el-button type="primary" round>主要按钮</el-button>
+      <el-button type="success" round>成功按钮</el-button>
+      <el-button type="info" round>信息按钮</el-button>
+      <el-button type="warning" round>警告按钮</el-button>
+      <el-button type="danger" round>危险按钮</el-button>
+    </el-row>
+
+    <el-row class="d2-mb">
+      <el-button icon="el-icon-search" circle></el-button>
+      <el-button type="primary" icon="el-icon-edit" circle></el-button>
+      <el-button type="success" icon="el-icon-check" circle></el-button>
+      <el-button type="info" icon="el-icon-message" circle></el-button>
+      <el-button type="warning" icon="el-icon-star-off" circle></el-button>
+      <el-button type="danger" icon="el-icon-delete" circle></el-button>
+    </el-row>
+    
+  </d2-container>
+</template>
diff --git a/src/pages/demo/element/basic-color/index.vue b/src/pages/demo/element/basic-color/index.vue
index 949d913a..15883b83 100644
--- a/src/pages/demo/element/basic-color/index.vue
+++ b/src/pages/demo/element/basic-color/index.vue
@@ -1,5 +1,6 @@
 <template>
   <d2-container type="ghost">
+    
     <el-card shadow="never" class="d2-mb">
       <template slot="header">主色</template>
       <el-row :gutter="20">
@@ -10,6 +11,7 @@
         </el-col>
       </el-row>
     </el-card>
+    
     <el-card shadow="never" class="d2-mb">
       <template slot="header">辅助色</template>
       <el-row :gutter="20">
@@ -35,6 +37,7 @@
         </el-col>
       </el-row>
     </el-card>
+    
     <el-card shadow="never">
       <template slot="header">中性色</template>
       <el-row :gutter="20" class="d2-mb">
@@ -82,6 +85,7 @@
         </el-col>
       </el-row>
     </el-card>
+    
   </d2-container>
 </template>
 
diff --git a/src/pages/demo/element/basic-container/index.vue b/src/pages/demo/element/basic-container/index.vue
index e4ebfe69..bd401677 100644
--- a/src/pages/demo/element/basic-container/index.vue
+++ b/src/pages/demo/element/basic-container/index.vue
@@ -1,18 +1,22 @@
 <template>
   <d2-container>
+    
     <el-container class="d2-mb">
       <el-header>顶栏</el-header>
       <el-main>主体</el-main>
     </el-container>
+    
     <el-container class="d2-mb">
       <el-header>顶栏</el-header>
       <el-main>主体</el-main>
       <el-footer>底栏</el-footer>
     </el-container>
+    
     <el-container class="d2-mb">
       <el-aside width="200px">侧边栏</el-aside>
       <el-main>主体</el-main>
     </el-container>
+    
     <el-container class="d2-mb">
       <el-header>顶栏</el-header>
       <el-container>
@@ -20,6 +24,7 @@
         <el-main>主体</el-main>
       </el-container>
     </el-container>
+    
     <el-container class="d2-mb">
       <el-header>顶栏</el-header>
       <el-container>
@@ -30,6 +35,7 @@
         </el-container>
       </el-container>
     </el-container>
+    
     <el-container class="d2-mb">
       <el-aside width="200px">侧边栏</el-aside>
       <el-container>
@@ -37,6 +43,7 @@
         <el-main>主体</el-main>
       </el-container>
     </el-container>
+
     <el-container>
       <el-aside width="200px">侧边栏</el-aside>
       <el-container>
@@ -45,6 +52,7 @@
         <el-footer>底栏</el-footer>
       </el-container>
     </el-container>
+    
   </d2-container>
 </template>
 
diff --git a/src/pages/demo/element/basic-layout/index.vue b/src/pages/demo/element/basic-layout/index.vue
index f53ec7e1..c9bdd31a 100644
--- a/src/pages/demo/element/basic-layout/index.vue
+++ b/src/pages/demo/element/basic-layout/index.vue
@@ -1,5 +1,6 @@
 <template>
   <d2-container type="ghost">
+    
     <el-card shadow="never" class="d2-mb">
       <template slot="header">基础布局</template>
       <el-row>
@@ -29,6 +30,7 @@
         <el-col :span="4"><div class="grid-content bg-purple-light"></div></el-col>
       </el-row>
     </el-card>
+    
     <el-card shadow="never" class="d2-mb">
       <template slot="header">分栏间隔</template>
       <el-row :gutter="20">
@@ -38,6 +40,7 @@
         <el-col :span="6"><div class="grid-content bg-purple"></div></el-col>
       </el-row>
     </el-card>
+    
     <el-card shadow="never" class="d2-mb">
       <template slot="header">混合布局</template>
       <el-row :gutter="20">
@@ -56,6 +59,7 @@
         <el-col :span="4"><div class="grid-content bg-purple"></div></el-col>
       </el-row>
     </el-card>
+    
     <el-card shadow="never" class="d2-mb">
       <template slot="header">分栏偏移</template>
       <el-row :gutter="20">
@@ -70,6 +74,7 @@
         <el-col :span="12" :offset="6"><div class="grid-content bg-purple"></div></el-col>
       </el-row>
     </el-card>
+    
     <el-card shadow="never" class="d2-mb">
       <template slot="header">对齐方式</template>
       <el-row type="flex" class="row-bg">
@@ -98,6 +103,7 @@
         <el-col :span="6"><div class="grid-content bg-purple"></div></el-col>
       </el-row>
     </el-card>
+    
     <el-card shadow="never" class="d2-mb">
       <template slot="header">响应式布局</template>
       <el-row :gutter="10">
@@ -107,6 +113,7 @@
         <el-col :xs="8" :sm="6" :md="4" :lg="3" :xl="1"><div class="grid-content bg-purple-light"></div></el-col>
       </el-row>
     </el-card>
+    
   </d2-container>
 </template>
 
diff --git a/src/router/index.js b/src/router/index.js
index a29d89c0..5b53913c 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -111,6 +111,7 @@ const routes = [
       { 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: 'basic-color', name: `${pre}basic-color`, component: () => import('@/pages/demo/element/basic-color/index.vue'), meta },
+      { path: 'basic-button', name: `${pre}basic-button`, component: () => import('@/pages/demo/element/basic-button/index.vue'), meta },
       { path: 'index', name: `${pre}index`, component: () => import('@/pages/demo/element/index/index.vue'), meta }
     ])('demo-element-')
   },

From b06fb1993cff288480f238cd054cf0ee3cae9505 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 17 Jun 2018 21:52:38 +0800
Subject: [PATCH 15/16] no message

Former-commit-id: 659d6d98fc932ccba8cc52c0df21a8d5b0c6327c [formerly 2d84b342a1f747ee1b89dc5042f8fe601690d524] [formerly 659d6d98fc932ccba8cc52c0df21a8d5b0c6327c [formerly 2d84b342a1f747ee1b89dc5042f8fe601690d524] [formerly 659d6d98fc932ccba8cc52c0df21a8d5b0c6327c [formerly 2d84b342a1f747ee1b89dc5042f8fe601690d524] [formerly 2d84b342a1f747ee1b89dc5042f8fe601690d524 [formerly 13a983d08e04bc458e4084e000965c5f6f61f749 [formerly 59cf4ec9f4d5aad08fdf0dcad1e740fdc778655c]]]]]
Former-commit-id: 24b3be3657964f68c4639c76618232caf8186f69
Former-commit-id: ef7b5a4e02c590f5071e4072b125734fef912a6b
Former-commit-id: 821b320432d3dc7740eaae0f8f65a7a23567295b [formerly 87f8b5f8c001f7a842f15562d75b0b3ef6a4f1af]
Former-commit-id: 84db370247c9ce4166a745a8b29bfb615e1d28e5
Former-commit-id: 751f87983b70f29ed51814f0be7768bccf9c8132
Former-commit-id: c19f2c1f27b40b78329733de7c5aafdf8442c3ea
Former-commit-id: de2f936928e1dbf1504963363d85603e64caa215
Former-commit-id: 5a4b4cca6d2f656e8d0b525b689cf26fc3cc0a9a
---
 src/pages/demo/element/basic-button/index.vue | 75 +++++++++++++++++--
 1 file changed, 70 insertions(+), 5 deletions(-)

diff --git a/src/pages/demo/element/basic-button/index.vue b/src/pages/demo/element/basic-button/index.vue
index c635a132..8312c574 100644
--- a/src/pages/demo/element/basic-button/index.vue
+++ b/src/pages/demo/element/basic-button/index.vue
@@ -1,6 +1,7 @@
 <template>
   <d2-container>
 
+    <h1 class="d2-mt-0">基础用法</h1>
     <el-row class="d2-mb">
       <el-button>默认按钮</el-button>
       <el-button type="primary">主要按钮</el-button>
@@ -9,7 +10,6 @@
       <el-button type="warning">警告按钮</el-button>
       <el-button type="danger">危险按钮</el-button>
     </el-row>
-
     <el-row class="d2-mb">
       <el-button plain>朴素按钮</el-button>
       <el-button type="primary" plain>主要按钮</el-button>
@@ -18,7 +18,6 @@
       <el-button type="warning" plain>警告按钮</el-button>
       <el-button type="danger" plain>危险按钮</el-button>
     </el-row>
-
     <el-row class="d2-mb">
       <el-button round>圆角按钮</el-button>
       <el-button type="primary" round>主要按钮</el-button>
@@ -27,8 +26,7 @@
       <el-button type="warning" round>警告按钮</el-button>
       <el-button type="danger" round>危险按钮</el-button>
     </el-row>
-
-    <el-row class="d2-mb">
+    <el-row>
       <el-button icon="el-icon-search" circle></el-button>
       <el-button type="primary" icon="el-icon-edit" circle></el-button>
       <el-button type="success" icon="el-icon-check" circle></el-button>
@@ -36,6 +34,73 @@
       <el-button type="warning" icon="el-icon-star-off" circle></el-button>
       <el-button type="danger" icon="el-icon-delete" circle></el-button>
     </el-row>
-    
+
+    <h1>禁用状态</h1>
+    <el-row class="d2-mb">
+      <el-button disabled>默认按钮</el-button>
+      <el-button type="primary" disabled>主要按钮</el-button>
+      <el-button type="success" disabled>成功按钮</el-button>
+      <el-button type="info" disabled>信息按钮</el-button>
+      <el-button type="warning" disabled>警告按钮</el-button>
+      <el-button type="danger" disabled>危险按钮</el-button>
+    </el-row>
+    <el-row>
+      <el-button plain disabled>朴素按钮</el-button>
+      <el-button type="primary" plain disabled>主要按钮</el-button>
+      <el-button type="success" plain disabled>成功按钮</el-button>
+      <el-button type="info" plain disabled>信息按钮</el-button>
+      <el-button type="warning" plain disabled>警告按钮</el-button>
+      <el-button type="danger" plain disabled>危险按钮</el-button>
+    </el-row>
+
+    <h1>文字按钮</h1>
+    <el-row>
+      <el-button type="text">文字按钮</el-button>
+      <el-button type="text" disabled>文字按钮</el-button>
+    </el-row>
+
+    <h1>图标按钮</h1>
+    <el-row>
+      <el-button type="primary" icon="el-icon-edit"></el-button>
+      <el-button type="primary" icon="el-icon-share"></el-button>
+      <el-button type="primary" icon="el-icon-delete"></el-button>
+      <el-button type="primary" icon="el-icon-search">搜索</el-button>
+      <el-button type="primary">上传<i class="el-icon-upload el-icon--right"></i></el-button>
+    </el-row>
+
+    <h1>按钮组</h1>
+    <el-row>
+      <el-button-group>
+        <el-button type="primary" icon="el-icon-arrow-left">上一页</el-button>
+        <el-button type="primary">下一页<i class="el-icon-arrow-right el-icon--right"></i></el-button>
+      </el-button-group>
+      <el-button-group>
+        <el-button type="primary" icon="el-icon-edit"></el-button>
+        <el-button type="primary" icon="el-icon-share"></el-button>
+        <el-button type="primary" icon="el-icon-delete"></el-button>
+      </el-button-group>
+    </el-row>
+
+    <h1>加载中</h1>
+    <el-row>
+      <el-button type="primary" :loading="true">加载中</el-button>
+    </el-row>
+
+    <h1>不同尺寸</h1>
+    <el-row>
+      <el-row class="d2-mb">
+        <el-button>默认按钮</el-button>
+        <el-button size="medium">中等按钮</el-button>
+        <el-button size="small">小型按钮</el-button>
+        <el-button size="mini">超小按钮</el-button>
+      </el-row>
+      <el-row>
+        <el-button round>默认按钮</el-button>
+        <el-button size="medium" round>中等按钮</el-button>
+        <el-button size="small" round>小型按钮</el-button>
+        <el-button size="mini" round>超小按钮</el-button>
+      </el-row>
+    </el-row>
+
   </d2-container>
 </template>

From c082268d33992619764941da676301e0ce3bf4d4 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 17 Jun 2018 21:53:53 +0800
Subject: [PATCH 16/16] no message

Former-commit-id: 225160f53f9abc2e733485705ab6f9e6eed41947 [formerly 225160f53f9abc2e733485705ab6f9e6eed41947 [formerly 225160f53f9abc2e733485705ab6f9e6eed41947 [formerly 225160f53f9abc2e733485705ab6f9e6eed41947 [formerly a226187e04f0a5485f77902e64915a674a3e9903 [formerly ad80b33658020f26154714023429d6f597cff368]]]]]
Former-commit-id: e60a742687fcdc395c9211b6cb09358566166cd5
Former-commit-id: 152b63a3ab949e4e9f5472fc6929291943be991b
Former-commit-id: 11b75332f217fb9b5da2fede808e99692768823b [formerly b02dc90ba34a65ae32b411aab3f0da488ea48fae]
Former-commit-id: 1e798ff463305103a1eac5d4fb5a853d6b926e83
Former-commit-id: 2fbbd93eba944f3c3d805f93524485008436bb14
Former-commit-id: b733cdc12c565725f1c0636814bcf2e9b7fd1606
Former-commit-id: d8496f0ac013ea7650a5862adfea2d42742273ca
Former-commit-id: adf0500b04ad95160759161d2088b0a080299a0e
---
 src/menu/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/menu/index.js b/src/menu/index.js
index 42bbecb0..c715351e 100644
--- a/src/menu/index.js
+++ b/src/menu/index.js
@@ -158,7 +158,7 @@ export default [
   },
   {
     path: '/demo',
-    title: '功能',
+    title: '集成功能',
     children: [
       demoPlugins,
       demoComponents,