From 85feb8eca51fefb5599ef7d62a0573506f8186c3 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 17 Jun 2018 22:01:33 +0800
Subject: [PATCH 01/14] no message

Former-commit-id: bbe95260c05fd5ac64327c11878c4282024984ea [formerly bbe95260c05fd5ac64327c11878c4282024984ea [formerly bbe95260c05fd5ac64327c11878c4282024984ea [formerly bbe95260c05fd5ac64327c11878c4282024984ea [formerly 9b751df06c8f02063e581ca744af26d7069f3678 [formerly 748de5add439456e74e743aba79e454b54304154]]]]]
Former-commit-id: a2bfca6100720d05c1810eeb0be714d60bb3e869
Former-commit-id: 0b36af81ff46c83e6a1c0c1aa2b79c37f2c8e1fc
Former-commit-id: 6adaa82ec4f68d01b543c78bf5a5b2cb40a71222 [formerly 46ed0cbf974d00a3a7d57747b663a9a49cc72835]
Former-commit-id: 1bb639b7250da9358b10914b99706d6f2ca4a360
Former-commit-id: babce6ed663811e3d699e48a359884f2e161b158
Former-commit-id: de30cde1ef08f20cda01c6fe2ff96493150a5b22
Former-commit-id: 5e2e269aff0362eba8d094a235303478393a8f21
Former-commit-id: 68764b1c1cc3694f015e2224b60cf918d87534ff
---
 src/pages/demo/element/basic-layout/index.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/demo/element/basic-layout/index.vue b/src/pages/demo/element/basic-layout/index.vue
index c9bdd31a..262f4022 100644
--- a/src/pages/demo/element/basic-layout/index.vue
+++ b/src/pages/demo/element/basic-layout/index.vue
@@ -145,4 +145,3 @@
   background-color: #f9fafc;
 }
 </style>
-

From fb6f14130b1437460c5bf9836eebf3bf7258021b Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 17 Jun 2018 23:48:41 +0800
Subject: [PATCH 02/14] no message

Former-commit-id: 3e096d91cbee12ad8c1376d1d4c4da41840a1eff [formerly 3e096d91cbee12ad8c1376d1d4c4da41840a1eff [formerly 3e096d91cbee12ad8c1376d1d4c4da41840a1eff [formerly 3e096d91cbee12ad8c1376d1d4c4da41840a1eff [formerly 1a9c84319de506f18bdeba880396272f850d75f6 [formerly 6fe629e81577d65878db26efe99cce7d10b80323]]]]]
Former-commit-id: d30fc9b5c1622beb279933c036970b5026239d3e
Former-commit-id: b4600403749864943727db199a96607b3fc9a029
Former-commit-id: 9430d53202b8cfcf0123c7bcc57680a3b880fd40 [formerly 4b9a9bdbe9045dc18d8c016777c23be098748128]
Former-commit-id: 9be7c751160ce234e2626879cb7839e105f59717
Former-commit-id: 883b839603909fbecd4f31d10dcf0bf2517b9d30
Former-commit-id: fb0f9105bf16a55248fa1fc062e51f8588bf21eb
Former-commit-id: 2aeca8f982e0ddd499af2aeae5c732cc9f804df1
Former-commit-id: 9c82f2089a51d8d1532b60e7af3f282feee17b88
---
 src/menu/index.js                                 | 1 +
 src/pages/demo/element/basic-typography/index.vue | 7 +++++++
 src/router/index.js                               | 1 +
 3 files changed, 9 insertions(+)
 create mode 100644 src/pages/demo/element/basic-typography/index.vue

diff --git a/src/menu/index.js b/src/menu/index.js
index c715351e..e78d5eca 100644
--- a/src/menu/index.js
+++ b/src/menu/index.js
@@ -136,6 +136,7 @@ const demoElement = {
         { path: `${pre}basic-layout`, title: '布局' },
         { path: `${pre}basic-container`, title: '布局容器' },
         { path: `${pre}basic-color`, title: '颜色' },
+        { path: `${pre}basic-typography`, title: '字体' },
         { path: `${pre}basic-button`, title: '按钮' }
       ]
     }
diff --git a/src/pages/demo/element/basic-typography/index.vue b/src/pages/demo/element/basic-typography/index.vue
new file mode 100644
index 00000000..a6857ff9
--- /dev/null
+++ b/src/pages/demo/element/basic-typography/index.vue
@@ -0,0 +1,7 @@
+<template>
+  <d2-container type="ghost">
+    <el-card shadow="never">
+      <template slot="header">中文字体</template>
+    </el-card>
+  </d2-container>
+</template>
diff --git a/src/router/index.js b/src/router/index.js
index 5b53913c..df45d017 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-typography', name: `${pre}basic-typography`, component: () => import('@/pages/demo/element/basic-typography/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 1c11c67c325cef0005b3468f70b7881b78721440 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 17 Jun 2018 23:49:19 +0800
Subject: [PATCH 03/14] no message

Former-commit-id: ac5cf76357ee4f125a55d8ea2d8623f8453f9b7e [formerly ac5cf76357ee4f125a55d8ea2d8623f8453f9b7e [formerly ac5cf76357ee4f125a55d8ea2d8623f8453f9b7e [formerly ac5cf76357ee4f125a55d8ea2d8623f8453f9b7e [formerly 892134eab7cccb1e456098566ddd559e536e7c0e [formerly 2340e9e3358a01078b9f4b4fc6932327e7527222]]]]]
Former-commit-id: 01ff89fcf98379be190fb04a937d2a7bbde717d6
Former-commit-id: 7ca250e5ef9c271b0a00592a95abe91a4c5ea42b
Former-commit-id: 4bd96251e69a9b1d0b603c55a0ae71f20fd614ba [formerly 39f83f9b745fe36c94a84ade35130d1a1de8703b]
Former-commit-id: 2890c29318631cc180179cf3b13e65a0dbe1aea9
Former-commit-id: 5f403c5c4799c03b229bcfe325e455e7ac07f113
Former-commit-id: 16a8489777521fa6c771f1d80c389f10d46a0a95
Former-commit-id: be7f71febe7a657e600ffd5899ccfa6b65714479
Former-commit-id: 43028877acfdf3def0affecb3989f21534a62d25
---
 src/pages/demo/element/basic-typography/index.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/pages/demo/element/basic-typography/index.vue b/src/pages/demo/element/basic-typography/index.vue
index a6857ff9..4ecce535 100644
--- a/src/pages/demo/element/basic-typography/index.vue
+++ b/src/pages/demo/element/basic-typography/index.vue
@@ -1,7 +1,10 @@
 <template>
   <d2-container type="ghost">
-    <el-card shadow="never">
+    <el-card shadow="never" class="d2-mb">
       <template slot="header">中文字体</template>
     </el-card>
+    <el-card shadow="never">
+      <template slot="header">英文／数字字体</template>
+    </el-card>
   </d2-container>
 </template>

From c20fdebe3a07bd3b70926cdd948f55ebd2157a6d Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 18 Jun 2018 21:06:41 +0800
Subject: [PATCH 04/14] no message

Former-commit-id: d63b5bae5645a5727f8c1d2d123a9fed69d8333b [formerly d63b5bae5645a5727f8c1d2d123a9fed69d8333b [formerly d63b5bae5645a5727f8c1d2d123a9fed69d8333b [formerly d63b5bae5645a5727f8c1d2d123a9fed69d8333b [formerly a59aa74987e2519406b30df3fbd75f06196d1f84 [formerly 94a4692a08bd1bf4a14bc48bbc49b9a1496265fa]]]]]
Former-commit-id: 36e0293c6334d189140559150bd3477050dbacf9
Former-commit-id: a7f0c2023cba8b4af01637727fd0d6afeddf4a73
Former-commit-id: fb32d9e301456758eef95cbf6d22cc1b03e69837 [formerly 92ee4b0aa05ab92ed8ae8d746a4bb9581b3202ce]
Former-commit-id: f5e7b8309adf60ab634be06e40eafd04b52988ca
Former-commit-id: 0fc0aa7383bebded723782575f6967d7b4e65149
Former-commit-id: 7e5b6c0abd029b3bcf92738f639a1f3040b19497
Former-commit-id: 986e0d5e0c6812538ca6b6d4fda0889d0739a37e
Former-commit-id: 5d191db791849d887493433ef9b1101d5d0b0e9b
---
 src/menu/index.js                             |  3 +-
 src/pages/demo/element/basic-icon/index.vue   | 23 +++++
 .../demo/element/basic-typography/index.vue   | 83 ++++++++++++++++++-
 src/router/index.js                           |  1 +
 4 files changed, 108 insertions(+), 2 deletions(-)
 create mode 100644 src/pages/demo/element/basic-icon/index.vue

diff --git a/src/menu/index.js b/src/menu/index.js
index e78d5eca..d3df29ed 100644
--- a/src/menu/index.js
+++ b/src/menu/index.js
@@ -135,8 +135,9 @@ 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-typography`, title: '字体' },
+        { path: `${pre}basic-icon`, title: '图标' },
         { path: `${pre}basic-button`, title: '按钮' }
       ]
     }
diff --git a/src/pages/demo/element/basic-icon/index.vue b/src/pages/demo/element/basic-icon/index.vue
new file mode 100644
index 00000000..d981f9c8
--- /dev/null
+++ b/src/pages/demo/element/basic-icon/index.vue
@@ -0,0 +1,23 @@
+<template>
+  <d2-container>
+    <template slot="header">图标</template>
+    <h1 class="d2-mt-0">
+      d2admin 已经集成 FontAwesome 图表库，提供约 1,000 个图标；并且准备好了图标组件
+    </h1>
+    <p>如果你愿意，你还可以随意使用 SVG 图标</p>
+    <el-button-group>
+      <el-button @click="$router.push({ path: '/demo/components/icon/list' })">
+        <d2-icon name="link"/>
+        图标列表
+      </el-button>
+      <el-button @click="$router.push({ path: '/demo/components/icon/icon' })">
+        <d2-icon name="link"/>
+        图标组件
+      </el-button>
+      <el-button @click="$router.push({ path: '/demo/components/icon/svg' })">
+        <d2-icon name="link"/>
+        svg 图标组件
+      </el-button>
+    </el-button-group>
+  </d2-container>
+</template>
diff --git a/src/pages/demo/element/basic-typography/index.vue b/src/pages/demo/element/basic-typography/index.vue
index 4ecce535..8632c179 100644
--- a/src/pages/demo/element/basic-typography/index.vue
+++ b/src/pages/demo/element/basic-typography/index.vue
@@ -2,9 +2,90 @@
   <d2-container type="ghost">
     <el-card shadow="never" class="d2-mb">
       <template slot="header">中文字体</template>
+      <el-row :gutter="10">
+        <el-col :span="6">
+          <el-card shadow="never">
+            <template slot="header">PingFang SC</template>
+            <p class="basic-typography-text typography-style-1">和畅惠风</p>
+          </el-card>
+        </el-col>
+        <el-col :span="6">
+          <el-card shadow="never">
+            <template slot="header">Hiragino Sans GB</template>
+            <p class="basic-typography-text typography-style-2">和畅惠风</p>
+          </el-card>
+        </el-col>
+        <el-col :span="6">
+          <el-card shadow="never">
+            <template slot="header">Microsoft YaHei</template>
+            <p class="basic-typography-text typography-style-3">和畅惠风</p>
+          </el-card>
+        </el-col>
+      </el-row>
+    </el-card>
+    <el-card shadow="never" class="d2-mb">
+      <template slot="header">英文／数字字体</template>
+      <el-row :gutter="10">
+        <el-col :span="6">
+          <el-card shadow="never">
+            <template slot="header">Helvetica Neue</template>
+            <p class="basic-typography-text typography-style-4">RGag</p>
+          </el-card>
+        </el-col>
+        <el-col :span="6">
+          <el-card shadow="never">
+            <template slot="header">Helvetica</template>
+            <p class="basic-typography-text typography-style-5">RGag</p>
+          </el-card>
+        </el-col>
+        <el-col :span="6">
+          <el-card shadow="never">
+            <template slot="header">Arial</template>
+            <p class="basic-typography-text typography-style-6">RGag</p>
+          </el-card>
+        </el-col>
+      </el-row>
     </el-card>
     <el-card shadow="never">
-      <template slot="header">英文／数字字体</template>
+      <template slot="header">Font-family 代码</template>
+      <d2-highlight :code="code"/>
     </el-card>
   </d2-container>
 </template>
+
+<script>
+export default {
+  data () {
+    return {
+      code: 'font-family: "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif;'
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.basic-typography-text {
+  font-size: 48px;
+  margin: 0px;
+  padding: 0px;
+  line-height: 80px;
+  &.typography-style-1 {
+    font-family: PingFang SC;
+  }
+  &.typography-style-2 {
+    font-family: Hiragino Sans GB;
+  }
+  &.typography-style-3 {
+    font-family: Microsoft YaHei;
+  }
+  &.typography-style-4 {
+    font-family: Helvetica Neue;
+  }
+  &.typography-style-5 {
+    font-family: Helvetica;
+  }
+  &.typography-style-6 {
+    font-family: Arial;
+  }
+}
+</style>
diff --git a/src/router/index.js b/src/router/index.js
index df45d017..565c331d 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -112,6 +112,7 @@ const routes = [
       { 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-typography', name: `${pre}basic-typography`, component: () => import('@/pages/demo/element/basic-typography/index.vue'), meta },
+      { path: 'basic-icon', name: `${pre}basic-icon`, component: () => import('@/pages/demo/element/basic-icon/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 62f31cf90c3fc7781031d1d4cb2206edd22920fb Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 18 Jun 2018 21:09:34 +0800
Subject: [PATCH 05/14] no message

Former-commit-id: c158093370551ee9c31817038c17e703437e6654 [formerly c158093370551ee9c31817038c17e703437e6654 [formerly c158093370551ee9c31817038c17e703437e6654 [formerly c158093370551ee9c31817038c17e703437e6654 [formerly 07f35e754f5c16bff0b10cc43140e82f1a6df22c [formerly 99258e4841574a4703fdb353a61a06ea25853272]]]]]
Former-commit-id: 4679968486593f3089e704692b74d71bf573bf16
Former-commit-id: 923bc8abcc4f7814cc86c1eca1399040da4b5af6
Former-commit-id: 0518eee275cca052bfdd25e8a8ce79c93bb00c4a [formerly edc7495659d3cee914fb12df43ab98340a5be073]
Former-commit-id: 592ea1a18dbbd099a3abbe1d2d5f50d3a5ebb307
Former-commit-id: 27d35051495887dcc12eda0c18a983c3bf86fa97
Former-commit-id: 0ed49042b648a347b2ff839373c8143aa62535bc
Former-commit-id: f1a0414756a72b8e957bb0b89d53e0ce00b50eed
Former-commit-id: 7c64ebc943a66ad7ae50ff757bb7794bb539406a
---
 src/menu/index.js                           | 7 +++++++
 src/pages/demo/element/form-radio/index.vue | 5 +++++
 src/router/index.js                         | 1 +
 3 files changed, 13 insertions(+)
 create mode 100644 src/pages/demo/element/form-radio/index.vue

diff --git a/src/menu/index.js b/src/menu/index.js
index d3df29ed..a798a434 100644
--- a/src/menu/index.js
+++ b/src/menu/index.js
@@ -140,6 +140,13 @@ const demoElement = {
         { path: `${pre}basic-icon`, title: '图标' },
         { path: `${pre}basic-button`, title: '按钮' }
       ]
+    },
+    {
+      path: `${pre}form`,
+      title: '表单',
+      children: [
+        { path: `${pre}form-radio`, title: '单选框' }
+      ]
     }
   ])('/demo/element/')
 }
diff --git a/src/pages/demo/element/form-radio/index.vue b/src/pages/demo/element/form-radio/index.vue
new file mode 100644
index 00000000..c2988d92
--- /dev/null
+++ b/src/pages/demo/element/form-radio/index.vue
@@ -0,0 +1,5 @@
+<template>
+  <d2-container>
+    radio
+  </d2-container>
+</template>
diff --git a/src/router/index.js b/src/router/index.js
index 565c331d..e8ad3f33 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -114,6 +114,7 @@ const routes = [
       { path: 'basic-typography', name: `${pre}basic-typography`, component: () => import('@/pages/demo/element/basic-typography/index.vue'), meta },
       { path: 'basic-icon', name: `${pre}basic-icon`, component: () => import('@/pages/demo/element/basic-icon/index.vue'), meta },
       { path: 'basic-button', name: `${pre}basic-button`, component: () => import('@/pages/demo/element/basic-button/index.vue'), meta },
+      { path: 'form-radio', name: `${pre}form-radio`, component: () => import('@/pages/demo/element/form-radio/index.vue'), meta },
       { path: 'index', name: `${pre}index`, component: () => import('@/pages/demo/element/index/index.vue'), meta }
     ])('demo-element-')
   },

From cc27691c63eaa712b67e70937d74a25354746ef3 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 18 Jun 2018 21:24:05 +0800
Subject: [PATCH 06/14] no message

Former-commit-id: fe46fb0206c8ea6d15663139bd90a1817d8fdc08 [formerly fe46fb0206c8ea6d15663139bd90a1817d8fdc08 [formerly fe46fb0206c8ea6d15663139bd90a1817d8fdc08 [formerly fe46fb0206c8ea6d15663139bd90a1817d8fdc08 [formerly e01f61adac026dd29444b3cdd1c33c44cae88ff6 [formerly 5a1eb146ef7e1d86af1b2bfa0e1b32daeabe9aa1]]]]]
Former-commit-id: eadaba48d8685b7f9eac4db3a6cacd293678184b
Former-commit-id: 8a929e4aa95d1a2cd6db04e69e489560417d0ecc
Former-commit-id: a4e3e9bde0550931f3915e829b4faad5421ba13b [formerly a5f5efc9e7c8ca190083629e072a499e81ee7fe9]
Former-commit-id: f0352c07bc46b0bf78765b2dd17b3b460b47f49c
Former-commit-id: db2c298a898799227f0e55e732c94663d860c1e6
Former-commit-id: b64f3984e4acd4c87310ec71d14fb5347543db87
Former-commit-id: 143dba586ebad09eeb226bb331e11577108ca0c8
Former-commit-id: 41ab3c6fda669388ee452ac1d5e623b3361b5ca8
---
 src/pages/demo/element/form-radio/index.vue | 98 ++++++++++++++++++++-
 1 file changed, 97 insertions(+), 1 deletion(-)

diff --git a/src/pages/demo/element/form-radio/index.vue b/src/pages/demo/element/form-radio/index.vue
index c2988d92..50f7a020 100644
--- a/src/pages/demo/element/form-radio/index.vue
+++ b/src/pages/demo/element/form-radio/index.vue
@@ -1,5 +1,101 @@
 <template>
   <d2-container>
-    radio
+    <el-row>
+      <el-col :span="12">
+
+        <h1 class="d2-mt-0">基础用法</h1>
+        <el-row>
+          <el-radio v-model="radio" label="1">备选项</el-radio>
+          <el-radio v-model="radio" label="2">备选项</el-radio>
+        </el-row>
+        
+        <h1>禁用状态</h1>
+        <el-row>
+          <el-radio disabled v-model="radio" label="1">备选项</el-radio>
+          <el-radio disabled v-model="radio" label="2">备选项</el-radio>
+        </el-row>
+
+        <h1>单选框组</h1>
+        <el-row>
+          <el-radio-group v-model="radio">
+            <el-radio label="1">备选项1</el-radio>
+            <el-radio label="2">备选项2</el-radio>
+            <el-radio label="3">备选项3</el-radio>
+          </el-radio-group>
+        </el-row>
+
+        <h1>带有边框</h1>
+        <div>
+          <el-radio v-model="radio" label="1" border>备选项1</el-radio>
+          <el-radio v-model="radio" label="2" border>备选项2</el-radio>
+        </div>
+        <div style="margin-top: 20px">
+          <el-radio v-model="radio" label="1" border size="medium">备选项1</el-radio>
+          <el-radio v-model="radio" label="2" border size="medium">备选项2</el-radio>
+        </div>
+        <div style="margin-top: 20px">
+          <el-radio-group v-model="radio" size="small">
+            <el-radio label="1" border>备选项1</el-radio>
+            <el-radio label="2" border disabled>备选项2</el-radio>
+          </el-radio-group>
+        </div>
+        <div style="margin-top: 20px">
+          <el-radio-group v-model="radio" size="mini" disabled>
+            <el-radio label="1" border>备选项1</el-radio>
+            <el-radio label="2" border>备选项2</el-radio>
+          </el-radio-group>
+        </div>
+
+      </el-col>
+      <el-col :span="12">
+
+        <h1>单选框组</h1>
+        <div>
+          <el-radio-group v-model="radio2">
+            <el-radio-button label="上海"></el-radio-button>
+            <el-radio-button label="北京"></el-radio-button>
+            <el-radio-button label="广州"></el-radio-button>
+            <el-radio-button label="深圳"></el-radio-button>
+          </el-radio-group>
+        </div>
+        <div style="margin-top: 20px">
+          <el-radio-group v-model="radio2" size="medium">
+            <el-radio-button label="上海" ></el-radio-button>
+            <el-radio-button label="北京"></el-radio-button>
+            <el-radio-button label="广州"></el-radio-button>
+            <el-radio-button label="深圳"></el-radio-button>
+          </el-radio-group>
+        </div>
+        <div style="margin-top: 20px">
+          <el-radio-group v-model="radio2" size="small">
+            <el-radio-button label="上海"></el-radio-button>
+            <el-radio-button label="北京" disabled ></el-radio-button>
+            <el-radio-button label="广州"></el-radio-button>
+            <el-radio-button label="深圳"></el-radio-button>
+          </el-radio-group>
+        </div>
+        <div style="margin-top: 20px">
+          <el-radio-group v-model="radio2" disabled size="mini">
+            <el-radio-button label="上海"></el-radio-button>
+            <el-radio-button label="北京"></el-radio-button>
+            <el-radio-button label="广州"></el-radio-button>
+            <el-radio-button label="深圳"></el-radio-button>
+          </el-radio-group>
+        </div>
+
+      </el-col>
+    </el-row>
   </d2-container>
 </template>
+
+<script>
+export default {
+  data () {
+    return {
+      radio: '1',
+      radio2: '上海'
+    }
+  }
+}
+</script>
+

From 2784d44bcff636f7ab435a55e626ad431694276b Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 18 Jun 2018 21:25:40 +0800
Subject: [PATCH 07/14] no message

Former-commit-id: 8c644e33fbf3101fa1889159301c2dfbddc4ec69 [formerly 8c644e33fbf3101fa1889159301c2dfbddc4ec69 [formerly 8c644e33fbf3101fa1889159301c2dfbddc4ec69 [formerly 8c644e33fbf3101fa1889159301c2dfbddc4ec69 [formerly f97c2c6b6395362292adb7489f63e0b57f0ef22e [formerly aaf6a907ec48d7764beb1a60039ad95550ad36e1]]]]]
Former-commit-id: 537d650c2b362d4aa4efcfaae7967c1d5b1d9755
Former-commit-id: a423d1b49a8075760be5742df9601828a172a4db
Former-commit-id: 06cb658c3dea9d95a3702d08a3138f0b4c3a1b2e [formerly 701cb43e476b6a851c1564c86d83e83889885477]
Former-commit-id: b609e3e12d16355e27730a4713417aa24d191f26
Former-commit-id: e94f8ebc9e163af9cd83bbd5efc4555aae9f985b
Former-commit-id: 8d6638ae5425df9ae074db9ef79f5c84d308bfe6
Former-commit-id: 25216c343095387880f1c6a3ce172507f410385c
Former-commit-id: e56a79cb85bc2a4e8a24fd9e66bed31359be49f5
---
 src/pages/demo/element/form-radio/index.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/demo/element/form-radio/index.vue b/src/pages/demo/element/form-radio/index.vue
index 50f7a020..814fd066 100644
--- a/src/pages/demo/element/form-radio/index.vue
+++ b/src/pages/demo/element/form-radio/index.vue
@@ -20,7 +20,6 @@
           <el-radio-group v-model="radio">
             <el-radio label="1">备选项1</el-radio>
             <el-radio label="2">备选项2</el-radio>
-            <el-radio label="3">备选项3</el-radio>
           </el-radio-group>
         </el-row>
 

From 32419282df82b4730dd9d808804628404f7aea5a Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 18 Jun 2018 22:49:17 +0800
Subject: [PATCH 08/14] no message

Former-commit-id: 6856f455071ef5c5f909a9b136eac2b2cbf3eabd [formerly 6856f455071ef5c5f909a9b136eac2b2cbf3eabd [formerly 6856f455071ef5c5f909a9b136eac2b2cbf3eabd [formerly 6856f455071ef5c5f909a9b136eac2b2cbf3eabd [formerly c09ce04902dac955b5d5779951f61ebf5ab67b69 [formerly df56ec98ae2616c48d6a8089fcf4637b549422d1]]]]]
Former-commit-id: 159f08de0ca46d3b987977daaf6002a706fef695
Former-commit-id: 07fcc5bf9ccf2b4e63f34e01e00bb6fa32f6caba
Former-commit-id: 4d05bf6f6e5ac45c7dfc55d84034224b05de9ff5 [formerly df34a1a4b969928749708e0c5baec05e8d5823fb]
Former-commit-id: 5ef9e5ad7cb819c4627380ac1a6c47c8c15e3927
Former-commit-id: a4903c4f7caa1c14a8566185df59b2db4bb544ea
Former-commit-id: 4f846abc0f664e161a2584da1dd6bb5e4c7750d6
Former-commit-id: 1d140fc9ddd1df8e83da63f5839491bd139c8005
Former-commit-id: aa8fc9388d29e9f2fb8fe368f62335f7af2df788
---
 src/menu/index.js                             |   3 +-
 .../demo/element/form-checkbox/index.vue      | 104 ++++++++++++++++++
 src/router/index.js                           |   1 +
 3 files changed, 107 insertions(+), 1 deletion(-)
 create mode 100644 src/pages/demo/element/form-checkbox/index.vue

diff --git a/src/menu/index.js b/src/menu/index.js
index a798a434..f3b7be18 100644
--- a/src/menu/index.js
+++ b/src/menu/index.js
@@ -145,7 +145,8 @@ const demoElement = {
       path: `${pre}form`,
       title: '表单',
       children: [
-        { path: `${pre}form-radio`, title: '单选框' }
+        { path: `${pre}form-radio`, title: '单选框' },
+        { path: `${pre}form-checkbox`, title: '多选框' }
       ]
     }
   ])('/demo/element/')
diff --git a/src/pages/demo/element/form-checkbox/index.vue b/src/pages/demo/element/form-checkbox/index.vue
new file mode 100644
index 00000000..974621b4
--- /dev/null
+++ b/src/pages/demo/element/form-checkbox/index.vue
@@ -0,0 +1,104 @@
+<template>
+  <d2-container>
+    <el-row>
+      <el-col :span="12">
+
+        <h1 class="d2-mt-0">基础用法</h1>
+        <el-row>
+          <el-checkbox v-model="checked1">备选项1</el-checkbox>
+          <el-checkbox v-model="checked2">备选项2</el-checkbox>
+        </el-row>
+
+        <h1>禁用状态</h1>
+        <el-row>
+          <el-checkbox v-model="checked1" disabled>备选项1</el-checkbox>
+          <el-checkbox v-model="checked2" disabled>备选项2</el-checkbox>
+        </el-row>
+
+        <h1>多选框组</h1>
+        <el-checkbox-group v-model="checkList">
+          <el-checkbox label="复选框 A"></el-checkbox>
+          <el-checkbox label="复选框 B"></el-checkbox>
+          <el-checkbox label="复选框 C"></el-checkbox>
+          <el-checkbox label="禁用" disabled></el-checkbox>
+          <el-checkbox label="选中且禁用" disabled></el-checkbox>
+        </el-checkbox-group>
+
+        <h1>indeterminate 状态</h1>
+        <el-checkbox :indeterminate="true" label="复选框"></el-checkbox>
+
+        <h1>可选项目数量的限制</h1>
+        <el-checkbox-group 
+          v-model="checkedCities"
+          :min="1"
+          :max="2">
+          <el-checkbox v-for="city in cities" :label="city" :key="city">{{city}}</el-checkbox>
+        </el-checkbox-group>
+
+      </el-col>
+      <el-col :span="12">
+
+        <h1>按钮样式</h1>
+        <div>
+          <el-checkbox-group v-model="checkboxGroup1">
+            <el-checkbox-button v-for="city in cities" :label="city" :key="city">{{city}}</el-checkbox-button>
+          </el-checkbox-group>
+        </div>
+        <div style="margin-top: 20px">
+          <el-checkbox-group v-model="checkboxGroup1" size="medium">
+            <el-checkbox-button v-for="city in cities" :label="city" :key="city">{{city}}</el-checkbox-button>
+          </el-checkbox-group>
+        </div>
+        <div style="margin-top: 20px">
+          <el-checkbox-group v-model="checkboxGroup1" size="small">
+            <el-checkbox-button v-for="city in cities" :label="city" :disabled="city === '北京'" :key="city">{{city}}</el-checkbox-button>
+          </el-checkbox-group>
+        </div>
+        <div style="margin-top: 20px">
+          <el-checkbox-group v-model="checkboxGroup1" size="mini" disabled>
+            <el-checkbox-button v-for="city in cities" :label="city" :key="city">{{city}}</el-checkbox-button>
+          </el-checkbox-group>
+        </div>
+
+        <h1>带有边框</h1>
+        <div>
+          <el-checkbox v-model="checked1" label="备选项1" border></el-checkbox>
+          <el-checkbox v-model="checked2" label="备选项2" border></el-checkbox>
+        </div>
+        <div style="margin-top: 20px">
+          <el-checkbox v-model="checked1" label="备选项1" border size="medium"></el-checkbox>
+          <el-checkbox v-model="checked2" label="备选项2" border size="medium"></el-checkbox>
+        </div>
+        <div style="margin-top: 20px">
+          <el-checkbox-group v-model="checkboxGroup2" size="small">
+            <el-checkbox label="备选项1" border></el-checkbox>
+            <el-checkbox label="备选项2" border disabled></el-checkbox>
+          </el-checkbox-group>
+        </div>
+        <div style="margin-top: 20px">
+          <el-checkbox-group v-model="checkboxGroup2" size="mini" disabled>
+            <el-checkbox label="备选项1" border></el-checkbox>
+            <el-checkbox label="备选项2" border></el-checkbox>
+          </el-checkbox-group>
+        </div>
+
+      </el-col>
+    </el-row>
+  </d2-container>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      checked1: true,
+      checked2: false,
+      checkList: ['选中且禁用', '复选框 A'],
+      checkedCities: ['上海', '北京'],
+      cities: ['上海', '北京', '广州', '深圳'],
+      checkboxGroup1: ['上海'],
+      checkboxGroup2: []
+    }
+  }
+}
+</script>
diff --git a/src/router/index.js b/src/router/index.js
index e8ad3f33..fd2bccd5 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -115,6 +115,7 @@ const routes = [
       { path: 'basic-icon', name: `${pre}basic-icon`, component: () => import('@/pages/demo/element/basic-icon/index.vue'), meta },
       { path: 'basic-button', name: `${pre}basic-button`, component: () => import('@/pages/demo/element/basic-button/index.vue'), meta },
       { path: 'form-radio', name: `${pre}form-radio`, component: () => import('@/pages/demo/element/form-radio/index.vue'), meta },
+      { path: 'form-checkbox', name: `${pre}form-checkbox`, component: () => import('@/pages/demo/element/form-checkbox/index.vue'), meta },
       { path: 'index', name: `${pre}index`, component: () => import('@/pages/demo/element/index/index.vue'), meta }
     ])('demo-element-')
   },

From d3cbc38ae830df19a0afd224aa3709b093a42421 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 18 Jun 2018 23:10:46 +0800
Subject: [PATCH 09/14] no message

Former-commit-id: e7813238ffff55b887f8951ee45f342f4c626303 [formerly e7813238ffff55b887f8951ee45f342f4c626303 [formerly e7813238ffff55b887f8951ee45f342f4c626303 [formerly e7813238ffff55b887f8951ee45f342f4c626303 [formerly b55667d3d7441ec5b726e8b3750c9989ce6b37ad [formerly 16a5bcf9cbecccf3f42c6192284a37f1640a5dee]]]]]
Former-commit-id: 8892f31e8d2cfc49a1d249edd17b976fcd777a1e
Former-commit-id: 2842d0b65ae587bf55a943debec8f8e49e7cde50
Former-commit-id: 7764509dc507ca044e743df95a8846bc57706295 [formerly cf6157f7480ac2cc7008eb34f033b5d68303f9cd]
Former-commit-id: 43f24b32fcd00f3b5c3c7296140abcfff081c6c6
Former-commit-id: e2324d5c741ce637f92e42a70b618cb8a0e94f35
Former-commit-id: f3845a24d98bc2a261aec86c3273ca139e5073ac
Former-commit-id: fe6f2d71196a70c085957eccc43a99e81e2bf1b1
Former-commit-id: b95b3807da9f4b536da864469e888fc5231d0843
---
 src/components/demo/d2-demo-link-btn/index.vue | 2 +-
 src/menu/index.js                              | 3 ++-
 src/pages/demo/element/form-input/index.vue    | 5 +++++
 src/router/index.js                            | 1 +
 4 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 src/pages/demo/element/form-input/index.vue

diff --git a/src/components/demo/d2-demo-link-btn/index.vue b/src/components/demo/d2-demo-link-btn/index.vue
index 8f59a2c1..dcd7ba0d 100644
--- a/src/components/demo/d2-demo-link-btn/index.vue
+++ b/src/components/demo/d2-demo-link-btn/index.vue
@@ -1,6 +1,6 @@
 <template>
   <el-button-group>
-    <el-button v-if="title" size="mini">{{title}}</el-button>
+    <el-button v-if="title" size="mini" @click="$open(link)">{{title}}</el-button>
     <el-button size="mini" @click="$open(link)">
       <d2-icon :name="icon"/>
       {{link}}
diff --git a/src/menu/index.js b/src/menu/index.js
index f3b7be18..ce847ed2 100644
--- a/src/menu/index.js
+++ b/src/menu/index.js
@@ -146,7 +146,8 @@ const demoElement = {
       title: '表单',
       children: [
         { path: `${pre}form-radio`, title: '单选框' },
-        { path: `${pre}form-checkbox`, title: '多选框' }
+        { path: `${pre}form-checkbox`, title: '多选框' },
+        { path: `${pre}form-input`, title: '输入框' }
       ]
     }
   ])('/demo/element/')
diff --git a/src/pages/demo/element/form-input/index.vue b/src/pages/demo/element/form-input/index.vue
new file mode 100644
index 00000000..595f8422
--- /dev/null
+++ b/src/pages/demo/element/form-input/index.vue
@@ -0,0 +1,5 @@
+<template>
+  <d2-container>
+    <d2-demo-link-btn title="组件示例尚未移植完成 现请参阅右侧链接" link="http://element.eleme.io/#/zh-CN"/>
+  </d2-container>
+</template>
diff --git a/src/router/index.js b/src/router/index.js
index fd2bccd5..b1bb9d7d 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -116,6 +116,7 @@ const routes = [
       { path: 'basic-button', name: `${pre}basic-button`, component: () => import('@/pages/demo/element/basic-button/index.vue'), meta },
       { path: 'form-radio', name: `${pre}form-radio`, component: () => import('@/pages/demo/element/form-radio/index.vue'), meta },
       { path: 'form-checkbox', name: `${pre}form-checkbox`, component: () => import('@/pages/demo/element/form-checkbox/index.vue'), meta },
+      { path: 'form-input', name: `${pre}form-input`, component: () => import('@/pages/demo/element/form-input/index.vue'), meta },
       { path: 'index', name: `${pre}index`, component: () => import('@/pages/demo/element/index/index.vue'), meta }
     ])('demo-element-')
   },

From 0769fbfba9374d40e075e885ace0b02be4f1ad1f Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 18 Jun 2018 23:36:43 +0800
Subject: [PATCH 10/14] no message

Former-commit-id: acad39cb616568ea7e1b0ebb0ffc7aed16e08997 [formerly acad39cb616568ea7e1b0ebb0ffc7aed16e08997 [formerly acad39cb616568ea7e1b0ebb0ffc7aed16e08997 [formerly acad39cb616568ea7e1b0ebb0ffc7aed16e08997 [formerly bdf1c64495c5c7fa27e307b38e42a3e6d280d92d [formerly 58565a96b39916e745b55826e63ed895f21cfda2]]]]]
Former-commit-id: 8f62968bff79229c94b384ee7291001f6cada3c4
Former-commit-id: c60acdb2bf8096ba89cdd8461c6fdabaaa27ab38
Former-commit-id: 827999f168db4599abddb0f9258fdbdc95374b15 [formerly 7438c4954adca1be44f4c11a4252bbb10209b0a6]
Former-commit-id: 72c43531780707e0b97d037566c5f4770bb236c6
Former-commit-id: 2f2f1beffffe7da15c3ee1b0b9dca01830f24333
Former-commit-id: a47f952a32735afaae3c0f025eea45375e78122e
Former-commit-id: 07ef34d8f14cab068d3abcd7704c955367381c9d
Former-commit-id: 211866083884fa61d93c0c8e82001056961705a1
---
 src/pages/demo/element/form-input/index.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/pages/demo/element/form-input/index.vue b/src/pages/demo/element/form-input/index.vue
index 595f8422..b81590a2 100644
--- a/src/pages/demo/element/form-input/index.vue
+++ b/src/pages/demo/element/form-input/index.vue
@@ -1,5 +1,7 @@
 <template>
   <d2-container>
-    <d2-demo-link-btn title="组件示例尚未移植完成 现请参阅右侧链接" link="http://element.eleme.io/#/zh-CN"/>
+    <h1 class="d2-mt-0">该页面尚未完成组件示例搬运</h1>
+    <p>D2Admin 的构建依托于由饿了么出品的 ElementUI，欲了解更多该组件的信息请查阅以下链接</p>
+    <d2-demo-link-btn title="Element" link="http://element.eleme.io/#/zh-CN"/>
   </d2-container>
 </template>

From 5449688589a745d476d5a84396377dd51c3ea3b8 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 18 Jun 2018 23:46:50 +0800
Subject: [PATCH 11/14] no message

Former-commit-id: 8910f59bf73bf8509411842359b5dc38e208bb46 [formerly 8910f59bf73bf8509411842359b5dc38e208bb46 [formerly 8910f59bf73bf8509411842359b5dc38e208bb46 [formerly 8910f59bf73bf8509411842359b5dc38e208bb46 [formerly dd9dd5327eeba2b6c9ce4a1def34aa092d1e2062 [formerly ea11827d08ed68772e9a91d3403590d1f8f1d427]]]]]
Former-commit-id: 2cb91e5b8a63f90bafedf1177e9aa5c18bfb08bb
Former-commit-id: f2a8670f1ca819b85bbb2c39fbe2aa1f33d9e82a
Former-commit-id: 03a5e17caa5e0ffe309a465acc2f9b9fc5723060 [formerly 361b282e4ba4efd616ccc74904dc76fcb1fe6589]
Former-commit-id: 293c98cf32a1515bf8cd483391879ba369dabb77
Former-commit-id: 14d000623a06a4770640fcd4cb40a4dc2aeeaef1
Former-commit-id: 9ea9b7ad9ab85ed68de0dccba07dcd204075f65f
Former-commit-id: e4e04b965389dacea290723d09cc4f4ff89374a3
Former-commit-id: ed67ccd55722166de0f41d1bdf5ca67c1d199361
---
 src/menu/index.js                                  | 5 ++++-
 src/pages/demo/element/form-cascader/index.vue     | 7 +++++++
 src/pages/demo/element/form-input-number/index.vue | 7 +++++++
 src/pages/demo/element/form-select/index.vue       | 7 +++++++
 src/router/index.js                                | 3 +++
 5 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 src/pages/demo/element/form-cascader/index.vue
 create mode 100644 src/pages/demo/element/form-input-number/index.vue
 create mode 100644 src/pages/demo/element/form-select/index.vue

diff --git a/src/menu/index.js b/src/menu/index.js
index ce847ed2..005e8fcb 100644
--- a/src/menu/index.js
+++ b/src/menu/index.js
@@ -147,7 +147,10 @@ const demoElement = {
       children: [
         { path: `${pre}form-radio`, title: '单选框' },
         { path: `${pre}form-checkbox`, title: '多选框' },
-        { path: `${pre}form-input`, title: '输入框' }
+        { path: `${pre}form-input`, title: '输入框' },
+        { path: `${pre}form-input-number`, title: '计数器' },
+        { path: `${pre}form-select`, title: '选择器' },
+        { path: `${pre}form-cascader`, title: '级联选择器' }
       ]
     }
   ])('/demo/element/')
diff --git a/src/pages/demo/element/form-cascader/index.vue b/src/pages/demo/element/form-cascader/index.vue
new file mode 100644
index 00000000..b81590a2
--- /dev/null
+++ b/src/pages/demo/element/form-cascader/index.vue
@@ -0,0 +1,7 @@
+<template>
+  <d2-container>
+    <h1 class="d2-mt-0">该页面尚未完成组件示例搬运</h1>
+    <p>D2Admin 的构建依托于由饿了么出品的 ElementUI，欲了解更多该组件的信息请查阅以下链接</p>
+    <d2-demo-link-btn title="Element" link="http://element.eleme.io/#/zh-CN"/>
+  </d2-container>
+</template>
diff --git a/src/pages/demo/element/form-input-number/index.vue b/src/pages/demo/element/form-input-number/index.vue
new file mode 100644
index 00000000..b81590a2
--- /dev/null
+++ b/src/pages/demo/element/form-input-number/index.vue
@@ -0,0 +1,7 @@
+<template>
+  <d2-container>
+    <h1 class="d2-mt-0">该页面尚未完成组件示例搬运</h1>
+    <p>D2Admin 的构建依托于由饿了么出品的 ElementUI，欲了解更多该组件的信息请查阅以下链接</p>
+    <d2-demo-link-btn title="Element" link="http://element.eleme.io/#/zh-CN"/>
+  </d2-container>
+</template>
diff --git a/src/pages/demo/element/form-select/index.vue b/src/pages/demo/element/form-select/index.vue
new file mode 100644
index 00000000..b81590a2
--- /dev/null
+++ b/src/pages/demo/element/form-select/index.vue
@@ -0,0 +1,7 @@
+<template>
+  <d2-container>
+    <h1 class="d2-mt-0">该页面尚未完成组件示例搬运</h1>
+    <p>D2Admin 的构建依托于由饿了么出品的 ElementUI，欲了解更多该组件的信息请查阅以下链接</p>
+    <d2-demo-link-btn title="Element" link="http://element.eleme.io/#/zh-CN"/>
+  </d2-container>
+</template>
diff --git a/src/router/index.js b/src/router/index.js
index b1bb9d7d..55519527 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -117,6 +117,9 @@ const routes = [
       { path: 'form-radio', name: `${pre}form-radio`, component: () => import('@/pages/demo/element/form-radio/index.vue'), meta },
       { path: 'form-checkbox', name: `${pre}form-checkbox`, component: () => import('@/pages/demo/element/form-checkbox/index.vue'), meta },
       { path: 'form-input', name: `${pre}form-input`, component: () => import('@/pages/demo/element/form-input/index.vue'), meta },
+      { path: 'form-input-number', name: `${pre}form-input-number`, component: () => import('@/pages/demo/element/form-input-number/index.vue'), meta },
+      { path: 'form-select', name: `${pre}form-select`, component: () => import('@/pages/demo/element/form-select/index.vue'), meta },
+      { path: 'form-cascader', name: `${pre}form-cascader`, component: () => import('@/pages/demo/element/form-cascader/index.vue'), meta },
       { path: 'index', name: `${pre}index`, component: () => import('@/pages/demo/element/index/index.vue'), meta }
     ])('demo-element-')
   },

From da91ea7e04b19ef9d946b66da525451a53f2d3fb Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 18 Jun 2018 23:58:29 +0800
Subject: [PATCH 12/14] no message

Former-commit-id: a0c0728527719f8b17f57d21b1272dac8eb84a28 [formerly a0c0728527719f8b17f57d21b1272dac8eb84a28 [formerly a0c0728527719f8b17f57d21b1272dac8eb84a28 [formerly a0c0728527719f8b17f57d21b1272dac8eb84a28 [formerly e4942e02601f72b1fa9fb12d55cefc411172684d [formerly 9cd728219dde5a1999cb4e0819f2736676de5fbd]]]]]
Former-commit-id: f61b0a8c5dd7cb7f2d57cd61229dc441ab4713ba
Former-commit-id: ca292c0a1308e70474b6cbc1c962d70365dcff85
Former-commit-id: 37dfdd44bdbf252ccb7e963dc4ba2f71fdb28773 [formerly 68311a8c655e257c5e691fb11331e9d989040797]
Former-commit-id: 3d0f7c675b8719a4d702f5a17b66142672e36c1c
Former-commit-id: 48a2a1a96d9781a312308fa02debb13ff8c6d1d1
Former-commit-id: 15a2dee9d035beb02e92ee028c373e2573621b45
Former-commit-id: c9f57159d76e30f81ae08bc4e3a6dec252c78d21
Former-commit-id: 9e1f868fb2ac6b2f87b93b006afb29b34f9d6f5f
---
 src/menu/index.js                             |  12 +-
 .../demo/element/form-color-picker/index.vue  |   7 +
 .../demo/element/form-date-picker/index.vue   |   7 +
 .../element/form-datetime-picker/index.vue    |   7 +
 src/pages/demo/element/form-form/index.vue    |   7 +
 src/pages/demo/element/form-rate/index.vue    |   7 +
 src/pages/demo/element/form-slider/index.vue  |   7 +
 src/pages/demo/element/form-switch/index.vue  |   7 +
 .../demo/element/form-time-picker/index.vue   |   7 +
 .../demo/element/form-transfer/index.vue      |   7 +
 src/pages/demo/element/form-upload/index.vue  |   7 +
 src/router/index.js                           | 155 ------------------
 src/router/index.js.REMOVED.git-id            |   1 +
 13 files changed, 82 insertions(+), 156 deletions(-)
 create mode 100644 src/pages/demo/element/form-color-picker/index.vue
 create mode 100644 src/pages/demo/element/form-date-picker/index.vue
 create mode 100644 src/pages/demo/element/form-datetime-picker/index.vue
 create mode 100644 src/pages/demo/element/form-form/index.vue
 create mode 100644 src/pages/demo/element/form-rate/index.vue
 create mode 100644 src/pages/demo/element/form-slider/index.vue
 create mode 100644 src/pages/demo/element/form-switch/index.vue
 create mode 100644 src/pages/demo/element/form-time-picker/index.vue
 create mode 100644 src/pages/demo/element/form-transfer/index.vue
 create mode 100644 src/pages/demo/element/form-upload/index.vue
 delete mode 100755 src/router/index.js
 create mode 100644 src/router/index.js.REMOVED.git-id

diff --git a/src/menu/index.js b/src/menu/index.js
index 005e8fcb..2871e53d 100644
--- a/src/menu/index.js
+++ b/src/menu/index.js
@@ -150,7 +150,17 @@ const demoElement = {
         { path: `${pre}form-input`, title: '输入框' },
         { path: `${pre}form-input-number`, title: '计数器' },
         { path: `${pre}form-select`, title: '选择器' },
-        { path: `${pre}form-cascader`, title: '级联选择器' }
+        { path: `${pre}form-cascader`, title: '级联选择器' },
+        { path: `${pre}form-switch`, title: '开关' },
+        { path: `${pre}form-slider`, title: '滑块' },
+        { path: `${pre}form-time-picker`, title: '时间选择器' },
+        { path: `${pre}form-date-picker`, title: '日期选择器' },
+        { path: `${pre}form-datetime-picker`, title: '日期时间选择器' },
+        { path: `${pre}form-upload`, title: '上传' },
+        { path: `${pre}form-rate`, title: '评分' },
+        { path: `${pre}form-color-picker`, title: '颜色选择器' },
+        { path: `${pre}form-transfer`, title: '穿梭框' },
+        { path: `${pre}form-form`, title: '表单' }
       ]
     }
   ])('/demo/element/')
diff --git a/src/pages/demo/element/form-color-picker/index.vue b/src/pages/demo/element/form-color-picker/index.vue
new file mode 100644
index 00000000..b81590a2
--- /dev/null
+++ b/src/pages/demo/element/form-color-picker/index.vue
@@ -0,0 +1,7 @@
+<template>
+  <d2-container>
+    <h1 class="d2-mt-0">该页面尚未完成组件示例搬运</h1>
+    <p>D2Admin 的构建依托于由饿了么出品的 ElementUI，欲了解更多该组件的信息请查阅以下链接</p>
+    <d2-demo-link-btn title="Element" link="http://element.eleme.io/#/zh-CN"/>
+  </d2-container>
+</template>
diff --git a/src/pages/demo/element/form-date-picker/index.vue b/src/pages/demo/element/form-date-picker/index.vue
new file mode 100644
index 00000000..b81590a2
--- /dev/null
+++ b/src/pages/demo/element/form-date-picker/index.vue
@@ -0,0 +1,7 @@
+<template>
+  <d2-container>
+    <h1 class="d2-mt-0">该页面尚未完成组件示例搬运</h1>
+    <p>D2Admin 的构建依托于由饿了么出品的 ElementUI，欲了解更多该组件的信息请查阅以下链接</p>
+    <d2-demo-link-btn title="Element" link="http://element.eleme.io/#/zh-CN"/>
+  </d2-container>
+</template>
diff --git a/src/pages/demo/element/form-datetime-picker/index.vue b/src/pages/demo/element/form-datetime-picker/index.vue
new file mode 100644
index 00000000..b81590a2
--- /dev/null
+++ b/src/pages/demo/element/form-datetime-picker/index.vue
@@ -0,0 +1,7 @@
+<template>
+  <d2-container>
+    <h1 class="d2-mt-0">该页面尚未完成组件示例搬运</h1>
+    <p>D2Admin 的构建依托于由饿了么出品的 ElementUI，欲了解更多该组件的信息请查阅以下链接</p>
+    <d2-demo-link-btn title="Element" link="http://element.eleme.io/#/zh-CN"/>
+  </d2-container>
+</template>
diff --git a/src/pages/demo/element/form-form/index.vue b/src/pages/demo/element/form-form/index.vue
new file mode 100644
index 00000000..b81590a2
--- /dev/null
+++ b/src/pages/demo/element/form-form/index.vue
@@ -0,0 +1,7 @@
+<template>
+  <d2-container>
+    <h1 class="d2-mt-0">该页面尚未完成组件示例搬运</h1>
+    <p>D2Admin 的构建依托于由饿了么出品的 ElementUI，欲了解更多该组件的信息请查阅以下链接</p>
+    <d2-demo-link-btn title="Element" link="http://element.eleme.io/#/zh-CN"/>
+  </d2-container>
+</template>
diff --git a/src/pages/demo/element/form-rate/index.vue b/src/pages/demo/element/form-rate/index.vue
new file mode 100644
index 00000000..b81590a2
--- /dev/null
+++ b/src/pages/demo/element/form-rate/index.vue
@@ -0,0 +1,7 @@
+<template>
+  <d2-container>
+    <h1 class="d2-mt-0">该页面尚未完成组件示例搬运</h1>
+    <p>D2Admin 的构建依托于由饿了么出品的 ElementUI，欲了解更多该组件的信息请查阅以下链接</p>
+    <d2-demo-link-btn title="Element" link="http://element.eleme.io/#/zh-CN"/>
+  </d2-container>
+</template>
diff --git a/src/pages/demo/element/form-slider/index.vue b/src/pages/demo/element/form-slider/index.vue
new file mode 100644
index 00000000..b81590a2
--- /dev/null
+++ b/src/pages/demo/element/form-slider/index.vue
@@ -0,0 +1,7 @@
+<template>
+  <d2-container>
+    <h1 class="d2-mt-0">该页面尚未完成组件示例搬运</h1>
+    <p>D2Admin 的构建依托于由饿了么出品的 ElementUI，欲了解更多该组件的信息请查阅以下链接</p>
+    <d2-demo-link-btn title="Element" link="http://element.eleme.io/#/zh-CN"/>
+  </d2-container>
+</template>
diff --git a/src/pages/demo/element/form-switch/index.vue b/src/pages/demo/element/form-switch/index.vue
new file mode 100644
index 00000000..b81590a2
--- /dev/null
+++ b/src/pages/demo/element/form-switch/index.vue
@@ -0,0 +1,7 @@
+<template>
+  <d2-container>
+    <h1 class="d2-mt-0">该页面尚未完成组件示例搬运</h1>
+    <p>D2Admin 的构建依托于由饿了么出品的 ElementUI，欲了解更多该组件的信息请查阅以下链接</p>
+    <d2-demo-link-btn title="Element" link="http://element.eleme.io/#/zh-CN"/>
+  </d2-container>
+</template>
diff --git a/src/pages/demo/element/form-time-picker/index.vue b/src/pages/demo/element/form-time-picker/index.vue
new file mode 100644
index 00000000..b81590a2
--- /dev/null
+++ b/src/pages/demo/element/form-time-picker/index.vue
@@ -0,0 +1,7 @@
+<template>
+  <d2-container>
+    <h1 class="d2-mt-0">该页面尚未完成组件示例搬运</h1>
+    <p>D2Admin 的构建依托于由饿了么出品的 ElementUI，欲了解更多该组件的信息请查阅以下链接</p>
+    <d2-demo-link-btn title="Element" link="http://element.eleme.io/#/zh-CN"/>
+  </d2-container>
+</template>
diff --git a/src/pages/demo/element/form-transfer/index.vue b/src/pages/demo/element/form-transfer/index.vue
new file mode 100644
index 00000000..b81590a2
--- /dev/null
+++ b/src/pages/demo/element/form-transfer/index.vue
@@ -0,0 +1,7 @@
+<template>
+  <d2-container>
+    <h1 class="d2-mt-0">该页面尚未完成组件示例搬运</h1>
+    <p>D2Admin 的构建依托于由饿了么出品的 ElementUI，欲了解更多该组件的信息请查阅以下链接</p>
+    <d2-demo-link-btn title="Element" link="http://element.eleme.io/#/zh-CN"/>
+  </d2-container>
+</template>
diff --git a/src/pages/demo/element/form-upload/index.vue b/src/pages/demo/element/form-upload/index.vue
new file mode 100644
index 00000000..b81590a2
--- /dev/null
+++ b/src/pages/demo/element/form-upload/index.vue
@@ -0,0 +1,7 @@
+<template>
+  <d2-container>
+    <h1 class="d2-mt-0">该页面尚未完成组件示例搬运</h1>
+    <p>D2Admin 的构建依托于由饿了么出品的 ElementUI，欲了解更多该组件的信息请查阅以下链接</p>
+    <d2-demo-link-btn title="Element" link="http://element.eleme.io/#/zh-CN"/>
+  </d2-container>
+</template>
diff --git a/src/router/index.js b/src/router/index.js
deleted file mode 100755
index 55519527..00000000
--- a/src/router/index.js
+++ /dev/null
@@ -1,155 +0,0 @@
-import Vue from 'vue'
-import VueRouter from 'vue-router'
-import Cookies from 'js-cookie'
-
-const meta = { requiresAuth: true }
-
-Vue.use(VueRouter)
-
-const routes = [
-  // 首页
-  {
-    path: '/',
-    redirect: { name: 'index' },
-    component: () => import('@/components/core/d2-layout-main/index.vue'),
-    children: [
-      {
-        path: 'index',
-        name: 'index',
-        meta,
-        component: () => import('@/pages/core/index/index.vue')
-      }
-    ]
-  },
-  {
-    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',
-    meta,
-    redirect: { name: 'demo-components-index' },
-    component: () => import('@/components/core/d2-layout-main/index.vue'),
-    children: (pre => [
-      { path: 'bigdata-table', name: `${pre}bigdata-table`, component: () => import('@/pages/demo/components/bigdata-table/index.vue'), meta },
-      { path: 'container/full', name: `${pre}container-full`, component: () => import('@/pages/demo/components/container/full.vue'), meta },
-      { path: 'container/ghost', name: `${pre}container-ghost`, component: () => import('@/pages/demo/components/container/ghost.vue'), meta },
-      { path: 'container/card', name: `${pre}container-card`, component: () => import('@/pages/demo/components/container/card.vue'), meta },
-      { path: 'countup', name: `${pre}countup`, component: () => import('@/pages/demo/components/countup/index.vue'), meta },
-      { path: 'editor-quill', name: `${pre}editor-quill`, component: () => import('@/pages/demo/components/editor-quill/index.vue'), meta },
-      { path: 'editor-simpleMDE', name: `${pre}editor-simpleMDE`, component: () => import('@/pages/demo/components/editor-simpleMDE/index.vue'), meta },
-      { path: 'highlight', name: `${pre}highlight`, component: () => import('@/pages/demo/components/highlight/index.vue'), meta },
-      { path: 'icon/icon', name: `${pre}icon-icon`, component: () => import('@/pages/demo/components/icon/icon.vue'), meta },
-      { path: 'icon/list', name: `${pre}icon-list`, component: () => import('@/pages/demo/components/icon/list.vue'), meta },
-      { path: 'icon/select', name: `${pre}icon-select`, component: () => import('@/pages/demo/components/icon/select.vue'), meta },
-      { path: 'icon/svg', name: `${pre}icon-svg`, component: () => import('@/pages/demo/components/icon/svg.vue'), meta },
-      { path: 'index', name: `${pre}index`, component: () => import('@/pages/demo/components/index/index.vue'), meta },
-      { path: 'layout/grid', name: `${pre}layout-grid`, component: () => import('@/pages/demo/components/layout/grid.vue'), meta },
-      { path: 'layout/splitpane', name: `${pre}layout-splitpane`, component: () => import('@/pages/demo/components/layout/splitpane.vue'), meta },
-      { path: 'markdown/source', name: `${pre}markdown-source`, component: () => import('@/pages/demo/components/markdown/source.vue'), meta },
-      { path: 'markdown/url', name: `${pre}markdown-url`, component: () => import('@/pages/demo/components/markdown/url.vue'), meta },
-      { 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: '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-typography', name: `${pre}basic-typography`, component: () => import('@/pages/demo/element/basic-typography/index.vue'), meta },
-      { path: 'basic-icon', name: `${pre}basic-icon`, component: () => import('@/pages/demo/element/basic-icon/index.vue'), meta },
-      { path: 'basic-button', name: `${pre}basic-button`, component: () => import('@/pages/demo/element/basic-button/index.vue'), meta },
-      { path: 'form-radio', name: `${pre}form-radio`, component: () => import('@/pages/demo/element/form-radio/index.vue'), meta },
-      { path: 'form-checkbox', name: `${pre}form-checkbox`, component: () => import('@/pages/demo/element/form-checkbox/index.vue'), meta },
-      { path: 'form-input', name: `${pre}form-input`, component: () => import('@/pages/demo/element/form-input/index.vue'), meta },
-      { path: 'form-input-number', name: `${pre}form-input-number`, component: () => import('@/pages/demo/element/form-input-number/index.vue'), meta },
-      { path: 'form-select', name: `${pre}form-select`, component: () => import('@/pages/demo/element/form-select/index.vue'), meta },
-      { path: 'form-cascader', name: `${pre}form-cascader`, component: () => import('@/pages/demo/element/form-cascader/index.vue'), meta },
-      { path: 'index', name: `${pre}index`, component: () => import('@/pages/demo/element/index/index.vue'), meta }
-    ])('demo-element-')
-  },
-  // 登陆
-  {
-    path: '/login',
-    name: 'login',
-    component: () => import('@/pages/core/login/index.vue')
-  }
-]
-
-let router = new VueRouter({ routes })
-
-router.beforeEach((to, from, next) => {
-  // 验证当前路由所有的匹配中是否需要有登陆验证的
-  if (to.matched.some(r => r.meta.requiresAuth)) {
-    // 这里暂时将cookie里是否存有token作为验证是否登陆的条件
-    // 请根据自身业务需要修改
-    if (Cookies.get('token')) {
-      next()
-    } else {
-      // 没有登陆的时候跳转到登陆界面
-      next({
-        name: 'login'
-      })
-    }
-  } else {
-    // 不需要身份校验 直接通过
-    next()
-  }
-})
-
-export default router
diff --git a/src/router/index.js.REMOVED.git-id b/src/router/index.js.REMOVED.git-id
new file mode 100644
index 00000000..ea981d45
--- /dev/null
+++ b/src/router/index.js.REMOVED.git-id
@@ -0,0 +1 @@
+e7a207dac2e68bd2f67dba3415969d3781afb14c
\ No newline at end of file

From 04b354538782cc8b3bd2430268d8ea52eeb67d59 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 19 Jun 2018 08:53:25 +0800
Subject: [PATCH 13/14] no message

Former-commit-id: 2d9baa5f953968c9e176ec204e0d1f0016b8e5e7 [formerly 2d9baa5f953968c9e176ec204e0d1f0016b8e5e7 [formerly 2d9baa5f953968c9e176ec204e0d1f0016b8e5e7 [formerly 2d9baa5f953968c9e176ec204e0d1f0016b8e5e7 [formerly fae47b04b168a836e0f8d668d31aad807adc55e6 [formerly 69b39e633e0a0b0e6f31194b3da511f1dd5c758e]]]]]
Former-commit-id: 8609c28d1f7218b9ca13c31df58ce2e61d9e1e1c
Former-commit-id: 4790fb17bb6642f4d713ed97b9e56f2c4eb3ec3d
Former-commit-id: 8957550b8de7fc893bfb94506f84b4384b76a5d7 [formerly 39ea0131d6a6e2c1223b5ce13873daf57c2a9512]
Former-commit-id: 2844c6c4aecc35d0dd16db0750de805dda9b92bc
Former-commit-id: ab039265b1a43a75eec326f1ec02356376df7933
Former-commit-id: d8f79704be9d946f1dc4a41fbd3cae191da9328c
Former-commit-id: cecc64f8a1809d694514c492357afd8d1f3b42d3
Former-commit-id: 84ec19500cce31f75b4833f21918df8c24cdad96
---
 src/menu/index.js                             | 34 +++++++++++++++++++
 src/pages/demo/element/data-badge/index.vue   |  7 ++++
 .../demo/element/data-pagination/index.vue    |  7 ++++
 .../demo/element/data-progress/index.vue      |  7 ++++
 src/pages/demo/element/data-table/index.vue   |  7 ++++
 src/pages/demo/element/data-tag/index.vue     |  7 ++++
 src/pages/demo/element/data-tree/index.vue    |  7 ++++
 .../element/navigation-breadcrumb/index.vue   |  7 ++++
 .../element/navigation-dropdown/index.vue     |  7 ++++
 .../demo/element/navigation-menu/index.vue    |  7 ++++
 .../demo/element/navigation-steps/index.vue   |  7 ++++
 .../demo/element/navigation-tabs/index.vue    |  7 ++++
 src/pages/demo/element/notice-alert/index.vue |  7 ++++
 .../demo/element/notice-loading/index.vue     |  7 ++++
 .../demo/element/notice-message-box/index.vue |  7 ++++
 .../demo/element/notice-message/index.vue     |  7 ++++
 .../element/notice-notification/index.vue     |  7 ++++
 src/router/index.js.REMOVED.git-id            |  2 +-
 18 files changed, 147 insertions(+), 1 deletion(-)
 create mode 100644 src/pages/demo/element/data-badge/index.vue
 create mode 100644 src/pages/demo/element/data-pagination/index.vue
 create mode 100644 src/pages/demo/element/data-progress/index.vue
 create mode 100644 src/pages/demo/element/data-table/index.vue
 create mode 100644 src/pages/demo/element/data-tag/index.vue
 create mode 100644 src/pages/demo/element/data-tree/index.vue
 create mode 100644 src/pages/demo/element/navigation-breadcrumb/index.vue
 create mode 100644 src/pages/demo/element/navigation-dropdown/index.vue
 create mode 100644 src/pages/demo/element/navigation-menu/index.vue
 create mode 100644 src/pages/demo/element/navigation-steps/index.vue
 create mode 100644 src/pages/demo/element/navigation-tabs/index.vue
 create mode 100644 src/pages/demo/element/notice-alert/index.vue
 create mode 100644 src/pages/demo/element/notice-loading/index.vue
 create mode 100644 src/pages/demo/element/notice-message-box/index.vue
 create mode 100644 src/pages/demo/element/notice-message/index.vue
 create mode 100644 src/pages/demo/element/notice-notification/index.vue

diff --git a/src/menu/index.js b/src/menu/index.js
index 2871e53d..af929d8e 100644
--- a/src/menu/index.js
+++ b/src/menu/index.js
@@ -162,6 +162,40 @@ const demoElement = {
         { path: `${pre}form-transfer`, title: '穿梭框' },
         { path: `${pre}form-form`, title: '表单' }
       ]
+    },
+    {
+      path: `${pre}data`,
+      title: '数据',
+      children: [
+        { path: `${pre}data-table`, title: '表格' },
+        { path: `${pre}data-tag`, title: '标签' },
+        { path: `${pre}data-progress`, title: '进度条' },
+        { path: `${pre}data-tree`, title: '树形控件' },
+        { path: `${pre}data-pagination`, title: '分页' },
+        { path: `${pre}data-badge`, title: '标记' }
+      ]
+    },
+    {
+      path: `${pre}notice`,
+      title: '消息',
+      children: [
+        { path: `${pre}notice-alert`, title: '警告' },
+        { path: `${pre}notice-loading`, title: '加载' },
+        { path: `${pre}notice-message`, title: '消息提示' },
+        { path: `${pre}notice-message-box`, title: '弹框' },
+        { path: `${pre}notice-notification`, title: '通知' }
+      ]
+    },
+    {
+      path: `${pre}navigation`,
+      title: '导航',
+      children: [
+        { path: `${pre}navigation-menu`, title: '导航菜单' },
+        { path: `${pre}navigation-tabs`, title: '标签页' },
+        { path: `${pre}navigation-breadcrumb`, title: '面包屑' },
+        { path: `${pre}navigation-dropdown`, title: '下拉菜单' },
+        { path: `${pre}navigation-steps`, title: '步骤条' }
+      ]
     }
   ])('/demo/element/')
 }
diff --git a/src/pages/demo/element/data-badge/index.vue b/src/pages/demo/element/data-badge/index.vue
new file mode 100644
index 00000000..b81590a2
--- /dev/null
+++ b/src/pages/demo/element/data-badge/index.vue
@@ -0,0 +1,7 @@
+<template>
+  <d2-container>
+    <h1 class="d2-mt-0">该页面尚未完成组件示例搬运</h1>
+    <p>D2Admin 的构建依托于由饿了么出品的 ElementUI，欲了解更多该组件的信息请查阅以下链接</p>
+    <d2-demo-link-btn title="Element" link="http://element.eleme.io/#/zh-CN"/>
+  </d2-container>
+</template>
diff --git a/src/pages/demo/element/data-pagination/index.vue b/src/pages/demo/element/data-pagination/index.vue
new file mode 100644
index 00000000..b81590a2
--- /dev/null
+++ b/src/pages/demo/element/data-pagination/index.vue
@@ -0,0 +1,7 @@
+<template>
+  <d2-container>
+    <h1 class="d2-mt-0">该页面尚未完成组件示例搬运</h1>
+    <p>D2Admin 的构建依托于由饿了么出品的 ElementUI，欲了解更多该组件的信息请查阅以下链接</p>
+    <d2-demo-link-btn title="Element" link="http://element.eleme.io/#/zh-CN"/>
+  </d2-container>
+</template>
diff --git a/src/pages/demo/element/data-progress/index.vue b/src/pages/demo/element/data-progress/index.vue
new file mode 100644
index 00000000..b81590a2
--- /dev/null
+++ b/src/pages/demo/element/data-progress/index.vue
@@ -0,0 +1,7 @@
+<template>
+  <d2-container>
+    <h1 class="d2-mt-0">该页面尚未完成组件示例搬运</h1>
+    <p>D2Admin 的构建依托于由饿了么出品的 ElementUI，欲了解更多该组件的信息请查阅以下链接</p>
+    <d2-demo-link-btn title="Element" link="http://element.eleme.io/#/zh-CN"/>
+  </d2-container>
+</template>
diff --git a/src/pages/demo/element/data-table/index.vue b/src/pages/demo/element/data-table/index.vue
new file mode 100644
index 00000000..b81590a2
--- /dev/null
+++ b/src/pages/demo/element/data-table/index.vue
@@ -0,0 +1,7 @@
+<template>
+  <d2-container>
+    <h1 class="d2-mt-0">该页面尚未完成组件示例搬运</h1>
+    <p>D2Admin 的构建依托于由饿了么出品的 ElementUI，欲了解更多该组件的信息请查阅以下链接</p>
+    <d2-demo-link-btn title="Element" link="http://element.eleme.io/#/zh-CN"/>
+  </d2-container>
+</template>
diff --git a/src/pages/demo/element/data-tag/index.vue b/src/pages/demo/element/data-tag/index.vue
new file mode 100644
index 00000000..b81590a2
--- /dev/null
+++ b/src/pages/demo/element/data-tag/index.vue
@@ -0,0 +1,7 @@
+<template>
+  <d2-container>
+    <h1 class="d2-mt-0">该页面尚未完成组件示例搬运</h1>
+    <p>D2Admin 的构建依托于由饿了么出品的 ElementUI，欲了解更多该组件的信息请查阅以下链接</p>
+    <d2-demo-link-btn title="Element" link="http://element.eleme.io/#/zh-CN"/>
+  </d2-container>
+</template>
diff --git a/src/pages/demo/element/data-tree/index.vue b/src/pages/demo/element/data-tree/index.vue
new file mode 100644
index 00000000..b81590a2
--- /dev/null
+++ b/src/pages/demo/element/data-tree/index.vue
@@ -0,0 +1,7 @@
+<template>
+  <d2-container>
+    <h1 class="d2-mt-0">该页面尚未完成组件示例搬运</h1>
+    <p>D2Admin 的构建依托于由饿了么出品的 ElementUI，欲了解更多该组件的信息请查阅以下链接</p>
+    <d2-demo-link-btn title="Element" link="http://element.eleme.io/#/zh-CN"/>
+  </d2-container>
+</template>
diff --git a/src/pages/demo/element/navigation-breadcrumb/index.vue b/src/pages/demo/element/navigation-breadcrumb/index.vue
new file mode 100644
index 00000000..b81590a2
--- /dev/null
+++ b/src/pages/demo/element/navigation-breadcrumb/index.vue
@@ -0,0 +1,7 @@
+<template>
+  <d2-container>
+    <h1 class="d2-mt-0">该页面尚未完成组件示例搬运</h1>
+    <p>D2Admin 的构建依托于由饿了么出品的 ElementUI，欲了解更多该组件的信息请查阅以下链接</p>
+    <d2-demo-link-btn title="Element" link="http://element.eleme.io/#/zh-CN"/>
+  </d2-container>
+</template>
diff --git a/src/pages/demo/element/navigation-dropdown/index.vue b/src/pages/demo/element/navigation-dropdown/index.vue
new file mode 100644
index 00000000..b81590a2
--- /dev/null
+++ b/src/pages/demo/element/navigation-dropdown/index.vue
@@ -0,0 +1,7 @@
+<template>
+  <d2-container>
+    <h1 class="d2-mt-0">该页面尚未完成组件示例搬运</h1>
+    <p>D2Admin 的构建依托于由饿了么出品的 ElementUI，欲了解更多该组件的信息请查阅以下链接</p>
+    <d2-demo-link-btn title="Element" link="http://element.eleme.io/#/zh-CN"/>
+  </d2-container>
+</template>
diff --git a/src/pages/demo/element/navigation-menu/index.vue b/src/pages/demo/element/navigation-menu/index.vue
new file mode 100644
index 00000000..b81590a2
--- /dev/null
+++ b/src/pages/demo/element/navigation-menu/index.vue
@@ -0,0 +1,7 @@
+<template>
+  <d2-container>
+    <h1 class="d2-mt-0">该页面尚未完成组件示例搬运</h1>
+    <p>D2Admin 的构建依托于由饿了么出品的 ElementUI，欲了解更多该组件的信息请查阅以下链接</p>
+    <d2-demo-link-btn title="Element" link="http://element.eleme.io/#/zh-CN"/>
+  </d2-container>
+</template>
diff --git a/src/pages/demo/element/navigation-steps/index.vue b/src/pages/demo/element/navigation-steps/index.vue
new file mode 100644
index 00000000..b81590a2
--- /dev/null
+++ b/src/pages/demo/element/navigation-steps/index.vue
@@ -0,0 +1,7 @@
+<template>
+  <d2-container>
+    <h1 class="d2-mt-0">该页面尚未完成组件示例搬运</h1>
+    <p>D2Admin 的构建依托于由饿了么出品的 ElementUI，欲了解更多该组件的信息请查阅以下链接</p>
+    <d2-demo-link-btn title="Element" link="http://element.eleme.io/#/zh-CN"/>
+  </d2-container>
+</template>
diff --git a/src/pages/demo/element/navigation-tabs/index.vue b/src/pages/demo/element/navigation-tabs/index.vue
new file mode 100644
index 00000000..b81590a2
--- /dev/null
+++ b/src/pages/demo/element/navigation-tabs/index.vue
@@ -0,0 +1,7 @@
+<template>
+  <d2-container>
+    <h1 class="d2-mt-0">该页面尚未完成组件示例搬运</h1>
+    <p>D2Admin 的构建依托于由饿了么出品的 ElementUI，欲了解更多该组件的信息请查阅以下链接</p>
+    <d2-demo-link-btn title="Element" link="http://element.eleme.io/#/zh-CN"/>
+  </d2-container>
+</template>
diff --git a/src/pages/demo/element/notice-alert/index.vue b/src/pages/demo/element/notice-alert/index.vue
new file mode 100644
index 00000000..b81590a2
--- /dev/null
+++ b/src/pages/demo/element/notice-alert/index.vue
@@ -0,0 +1,7 @@
+<template>
+  <d2-container>
+    <h1 class="d2-mt-0">该页面尚未完成组件示例搬运</h1>
+    <p>D2Admin 的构建依托于由饿了么出品的 ElementUI，欲了解更多该组件的信息请查阅以下链接</p>
+    <d2-demo-link-btn title="Element" link="http://element.eleme.io/#/zh-CN"/>
+  </d2-container>
+</template>
diff --git a/src/pages/demo/element/notice-loading/index.vue b/src/pages/demo/element/notice-loading/index.vue
new file mode 100644
index 00000000..b81590a2
--- /dev/null
+++ b/src/pages/demo/element/notice-loading/index.vue
@@ -0,0 +1,7 @@
+<template>
+  <d2-container>
+    <h1 class="d2-mt-0">该页面尚未完成组件示例搬运</h1>
+    <p>D2Admin 的构建依托于由饿了么出品的 ElementUI，欲了解更多该组件的信息请查阅以下链接</p>
+    <d2-demo-link-btn title="Element" link="http://element.eleme.io/#/zh-CN"/>
+  </d2-container>
+</template>
diff --git a/src/pages/demo/element/notice-message-box/index.vue b/src/pages/demo/element/notice-message-box/index.vue
new file mode 100644
index 00000000..b81590a2
--- /dev/null
+++ b/src/pages/demo/element/notice-message-box/index.vue
@@ -0,0 +1,7 @@
+<template>
+  <d2-container>
+    <h1 class="d2-mt-0">该页面尚未完成组件示例搬运</h1>
+    <p>D2Admin 的构建依托于由饿了么出品的 ElementUI，欲了解更多该组件的信息请查阅以下链接</p>
+    <d2-demo-link-btn title="Element" link="http://element.eleme.io/#/zh-CN"/>
+  </d2-container>
+</template>
diff --git a/src/pages/demo/element/notice-message/index.vue b/src/pages/demo/element/notice-message/index.vue
new file mode 100644
index 00000000..b81590a2
--- /dev/null
+++ b/src/pages/demo/element/notice-message/index.vue
@@ -0,0 +1,7 @@
+<template>
+  <d2-container>
+    <h1 class="d2-mt-0">该页面尚未完成组件示例搬运</h1>
+    <p>D2Admin 的构建依托于由饿了么出品的 ElementUI，欲了解更多该组件的信息请查阅以下链接</p>
+    <d2-demo-link-btn title="Element" link="http://element.eleme.io/#/zh-CN"/>
+  </d2-container>
+</template>
diff --git a/src/pages/demo/element/notice-notification/index.vue b/src/pages/demo/element/notice-notification/index.vue
new file mode 100644
index 00000000..b81590a2
--- /dev/null
+++ b/src/pages/demo/element/notice-notification/index.vue
@@ -0,0 +1,7 @@
+<template>
+  <d2-container>
+    <h1 class="d2-mt-0">该页面尚未完成组件示例搬运</h1>
+    <p>D2Admin 的构建依托于由饿了么出品的 ElementUI，欲了解更多该组件的信息请查阅以下链接</p>
+    <d2-demo-link-btn title="Element" link="http://element.eleme.io/#/zh-CN"/>
+  </d2-container>
+</template>
diff --git a/src/router/index.js.REMOVED.git-id b/src/router/index.js.REMOVED.git-id
index ea981d45..4af3e04e 100644
--- a/src/router/index.js.REMOVED.git-id
+++ b/src/router/index.js.REMOVED.git-id
@@ -1 +1 @@
-e7a207dac2e68bd2f67dba3415969d3781afb14c
\ No newline at end of file
+bd37d84b4c901b54d19d0a24b5711c434d27091c
\ No newline at end of file

From 15664ecb22e4b3a261efa5370c2889a380330994 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 19 Jun 2018 09:12:46 +0800
Subject: [PATCH 14/14] no message

Former-commit-id: 91414d57c521d86a4af438c3dbbd34162bc31378 [formerly 91414d57c521d86a4af438c3dbbd34162bc31378 [formerly 91414d57c521d86a4af438c3dbbd34162bc31378 [formerly 91414d57c521d86a4af438c3dbbd34162bc31378 [formerly 3b946bfea3dd55f4ad025f090cfaeae4fac9a28c [formerly 5153f714441a7d876774eaa6d55744e16ed5fcb8]]]]]
Former-commit-id: 1e06a6c53addf4a8075c9f1d000742b23cebbed0
Former-commit-id: c28f1665f2087d98d520252982020977f14beaaf
Former-commit-id: 861fa4731fcc366f8f4eb0b0641545343862b748 [formerly a73b45f88d1fc1516d9e2222439f32903fed1577]
Former-commit-id: 7bc6377cd55e0df0a2a49fd6332b8421737673f4
Former-commit-id: 5c5256ed22a02a8cc55e60fa2440fdf28aaf2935
Former-commit-id: 78a5699730a165b269459e88ed7fc8ac1e39436e
Former-commit-id: b67828d9f2fd56f41954e4c83c6fa69ac780c2ff
Former-commit-id: 09c9894edd924a9299a232f710f476c6d0f2ac77
---
 src/menu/index.js                                | 12 ++++++++++++
 src/pages/demo/element/others-card/index.vue     |  7 +++++++
 src/pages/demo/element/others-carousel/index.vue |  7 +++++++
 src/pages/demo/element/others-collapse/index.vue |  7 +++++++
 src/pages/demo/element/others-dialog/index.vue   |  7 +++++++
 src/pages/demo/element/others-popover/index.vue  |  7 +++++++
 src/pages/demo/element/others-tooltip/index.vue  |  7 +++++++
 src/router/index.js.REMOVED.git-id               |  2 +-
 8 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 src/pages/demo/element/others-card/index.vue
 create mode 100644 src/pages/demo/element/others-carousel/index.vue
 create mode 100644 src/pages/demo/element/others-collapse/index.vue
 create mode 100644 src/pages/demo/element/others-dialog/index.vue
 create mode 100644 src/pages/demo/element/others-popover/index.vue
 create mode 100644 src/pages/demo/element/others-tooltip/index.vue

diff --git a/src/menu/index.js b/src/menu/index.js
index af929d8e..bd54a5a2 100644
--- a/src/menu/index.js
+++ b/src/menu/index.js
@@ -196,6 +196,18 @@ const demoElement = {
         { path: `${pre}navigation-dropdown`, title: '下拉菜单' },
         { path: `${pre}navigation-steps`, title: '步骤条' }
       ]
+    },
+    {
+      path: `${pre}others`,
+      title: '其它',
+      children: [
+        { path: `${pre}others-dialog`, title: '对话框' },
+        { path: `${pre}others-tooltip`, title: '文字提示' },
+        { path: `${pre}others-popover`, title: '弹出框' },
+        { path: `${pre}others-card`, title: '卡片' },
+        { path: `${pre}others-carousel`, title: '走马灯' },
+        { path: `${pre}others-collapse`, title: '折叠面板' }
+      ]
     }
   ])('/demo/element/')
 }
diff --git a/src/pages/demo/element/others-card/index.vue b/src/pages/demo/element/others-card/index.vue
new file mode 100644
index 00000000..b81590a2
--- /dev/null
+++ b/src/pages/demo/element/others-card/index.vue
@@ -0,0 +1,7 @@
+<template>
+  <d2-container>
+    <h1 class="d2-mt-0">该页面尚未完成组件示例搬运</h1>
+    <p>D2Admin 的构建依托于由饿了么出品的 ElementUI，欲了解更多该组件的信息请查阅以下链接</p>
+    <d2-demo-link-btn title="Element" link="http://element.eleme.io/#/zh-CN"/>
+  </d2-container>
+</template>
diff --git a/src/pages/demo/element/others-carousel/index.vue b/src/pages/demo/element/others-carousel/index.vue
new file mode 100644
index 00000000..b81590a2
--- /dev/null
+++ b/src/pages/demo/element/others-carousel/index.vue
@@ -0,0 +1,7 @@
+<template>
+  <d2-container>
+    <h1 class="d2-mt-0">该页面尚未完成组件示例搬运</h1>
+    <p>D2Admin 的构建依托于由饿了么出品的 ElementUI，欲了解更多该组件的信息请查阅以下链接</p>
+    <d2-demo-link-btn title="Element" link="http://element.eleme.io/#/zh-CN"/>
+  </d2-container>
+</template>
diff --git a/src/pages/demo/element/others-collapse/index.vue b/src/pages/demo/element/others-collapse/index.vue
new file mode 100644
index 00000000..b81590a2
--- /dev/null
+++ b/src/pages/demo/element/others-collapse/index.vue
@@ -0,0 +1,7 @@
+<template>
+  <d2-container>
+    <h1 class="d2-mt-0">该页面尚未完成组件示例搬运</h1>
+    <p>D2Admin 的构建依托于由饿了么出品的 ElementUI，欲了解更多该组件的信息请查阅以下链接</p>
+    <d2-demo-link-btn title="Element" link="http://element.eleme.io/#/zh-CN"/>
+  </d2-container>
+</template>
diff --git a/src/pages/demo/element/others-dialog/index.vue b/src/pages/demo/element/others-dialog/index.vue
new file mode 100644
index 00000000..b81590a2
--- /dev/null
+++ b/src/pages/demo/element/others-dialog/index.vue
@@ -0,0 +1,7 @@
+<template>
+  <d2-container>
+    <h1 class="d2-mt-0">该页面尚未完成组件示例搬运</h1>
+    <p>D2Admin 的构建依托于由饿了么出品的 ElementUI，欲了解更多该组件的信息请查阅以下链接</p>
+    <d2-demo-link-btn title="Element" link="http://element.eleme.io/#/zh-CN"/>
+  </d2-container>
+</template>
diff --git a/src/pages/demo/element/others-popover/index.vue b/src/pages/demo/element/others-popover/index.vue
new file mode 100644
index 00000000..b81590a2
--- /dev/null
+++ b/src/pages/demo/element/others-popover/index.vue
@@ -0,0 +1,7 @@
+<template>
+  <d2-container>
+    <h1 class="d2-mt-0">该页面尚未完成组件示例搬运</h1>
+    <p>D2Admin 的构建依托于由饿了么出品的 ElementUI，欲了解更多该组件的信息请查阅以下链接</p>
+    <d2-demo-link-btn title="Element" link="http://element.eleme.io/#/zh-CN"/>
+  </d2-container>
+</template>
diff --git a/src/pages/demo/element/others-tooltip/index.vue b/src/pages/demo/element/others-tooltip/index.vue
new file mode 100644
index 00000000..b81590a2
--- /dev/null
+++ b/src/pages/demo/element/others-tooltip/index.vue
@@ -0,0 +1,7 @@
+<template>
+  <d2-container>
+    <h1 class="d2-mt-0">该页面尚未完成组件示例搬运</h1>
+    <p>D2Admin 的构建依托于由饿了么出品的 ElementUI，欲了解更多该组件的信息请查阅以下链接</p>
+    <d2-demo-link-btn title="Element" link="http://element.eleme.io/#/zh-CN"/>
+  </d2-container>
+</template>
diff --git a/src/router/index.js.REMOVED.git-id b/src/router/index.js.REMOVED.git-id
index 4af3e04e..90adffa6 100644
--- a/src/router/index.js.REMOVED.git-id
+++ b/src/router/index.js.REMOVED.git-id
@@ -1 +1 @@
-bd37d84b4c901b54d19d0a24b5711c434d27091c
\ No newline at end of file
+98262236d74b49a612e6be6ba8cac9307d0fc023
\ No newline at end of file