From e317202e85fb1ffbe7a6544a8ec601d438e5814e Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 12 Jun 2018 09:26:32 +0800
Subject: [PATCH 01/20] no message

Former-commit-id: 43cda8a56782ad34aa47f18af671392015c96a97
Former-commit-id: a4f093cad7533863e8162398e231eb98c9f8c697
Former-commit-id: f574f1a366d1557c37f8b3a8cb1ba714dee6cff1
Former-commit-id: 5f5b5f3c4617aa115bcb2d738bfc76aeff787853
---
 src/pages/demo/business/user-center/home/index.vue | 4 +---
 src/pages/demo/components/layout/splitpane.vue     | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/pages/demo/business/user-center/home/index.vue b/src/pages/demo/business/user-center/home/index.vue
index 2ae077a6..32734de1 100644
--- a/src/pages/demo/business/user-center/home/index.vue
+++ b/src/pages/demo/business/user-center/home/index.vue
@@ -1,8 +1,6 @@
 <template>
   <d2-container type="full">
-    <template slot="header">
-      用户中心
-    </template>
+    <template slot="header">用户中心</template>
     doing...
   </d2-container>
 </template>
diff --git a/src/pages/demo/components/layout/splitpane.vue b/src/pages/demo/components/layout/splitpane.vue
index d229f501..e31a2231 100644
--- a/src/pages/demo/components/layout/splitpane.vue
+++ b/src/pages/demo/components/layout/splitpane.vue
@@ -1,6 +1,6 @@
 <template>
   <d2-container>
-    <template slot="header">基本示例</template>
+    <template slot="header">区域划分</template>
     <div style="height: 400px; margin: -16px;">
       <SplitPane :min-percent='20' :default-percent='30' split="vertical">
         <template slot="paneL"><div style="margin: 10px;">左</div></template>

From 1386d61cee5567322128bbb31132516941f953c2 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 12 Jun 2018 09:42:09 +0800
Subject: [PATCH 02/20] no message

Former-commit-id: 67884c24f35ac96b06aabef37e9fd375bccd47a8
Former-commit-id: dd0f0a39432d722c87c7bda08b94868687cfa157
Former-commit-id: b2db59c70e6f9b324cf2af00b0b5a7f895247459
Former-commit-id: d569ecec1b2c264ba11b981941fbefea45ebd4fc
---
 package.json                             |  1 +
 src/assets/style/theme/star/setting.scss |  2 +-
 src/menu/index.js                        |  1 +
 src/pages/demo/plugins/day/index.vue     | 14 ++++++++++++++
 src/router/index.js                      |  1 +
 5 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 src/pages/demo/plugins/day/index.vue

diff --git a/package.json b/package.json
index 9d756c5d..a712b59f 100755
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
     "axios": "^0.17.1",
     "clipboard-polyfill": "^2.4.1",
     "countup.js": "^1.9.3",
+    "dayjs": "^1.6.7",
     "element-ui": "^2.0.11",
     "file-saver": "^1.3.3",
     "github-markdown-css": "^2.10.0",
diff --git a/src/assets/style/theme/star/setting.scss b/src/assets/style/theme/star/setting.scss
index 0c16d9f7..b1376e6d 100644
--- a/src/assets/style/theme/star/setting.scss
+++ b/src/assets/style/theme/star/setting.scss
@@ -8,7 +8,7 @@ $theme-bg-image: '/static/image/bg/star-squashed.jpg';
 // container组件
 $theme-container-background-color: rgba(#FFF, .9);
 $theme-container-header-footer-background-color: rgba(#FFF, .6);
-$theme-container-border-inner: 1px solid #8fb0b1;
+$theme-container-border-inner: 1px solid #cecece;
 $theme-container-border-outer: none;
 
 // 顶栏和侧边栏中展开的菜单 hover 状态下
diff --git a/src/menu/index.js b/src/menu/index.js
index b2c53a76..70745af2 100644
--- a/src/menu/index.js
+++ b/src/menu/index.js
@@ -40,6 +40,7 @@ const demoPlugins = {
     },
     { path: `${pre}build`, title: '环境区分' },
     { path: `${pre}clipboard-polyfill`, title: '剪贴板访问' },
+    { path: `${pre}day`, title: '日期计算' },
     { path: `${pre}js-cookie`, title: 'Cookie 读写' },
     { path: `${pre}timeago`, title: '时间差计算' }
   ])('/demo/plugins/')
diff --git a/src/pages/demo/plugins/day/index.vue b/src/pages/demo/plugins/day/index.vue
new file mode 100644
index 00000000..72321dd9
--- /dev/null
+++ b/src/pages/demo/plugins/day/index.vue
@@ -0,0 +1,14 @@
+<template>
+  <d2-container type="full">
+    <template slot="header">日期计算</template>
+    <template slot="footer">
+      <a href="https://github.com/iamkun/dayjs">https://github.com/iamkun/dayjs</a>
+    </template>
+  </d2-container>
+</template>
+
+<script>
+import dayjs from 'dayjs'
+export default {
+}
+</script>
diff --git a/src/router/index.js b/src/router/index.js
index b7909d79..99c74da3 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -52,6 +52,7 @@ const routes = [
     children: (pre => [
       { path: 'build', name: `${pre}build`, component: () => import('@/pages/demo/plugins/build/index.vue') },
       { path: 'clipboard-polyfill', name: `${pre}clipboard-polyfill`, component: () => import('@/pages/demo/plugins/clipboard-polyfill/index.vue') },
+      { path: 'day', name: `${pre}day`, component: () => import('@/pages/demo/plugins/day/index.vue') },
       { path: 'export/table', name: `${pre}export-table`, component: () => import('@/pages/demo/plugins/export/table.vue') },
       { path: 'export/txt', name: `${pre}export-txt`, component: () => import('@/pages/demo/plugins/export/txt.vue') },
       { path: 'i18n/demo1', name: `${pre}i18n-demo1`, component: () => import('@/pages/demo/plugins/i18n/demo1.vue') },

From 6852f6155f4cfaee453d4c2c4665c9d9d4ccb96a Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 12 Jun 2018 10:01:49 +0800
Subject: [PATCH 03/20] no message

Former-commit-id: b66bab38b9ec766eb4807c6ac99311cfa7b1367e
Former-commit-id: 98aa28132f7dfb1386d534cccb9b00516bbe6df1
Former-commit-id: 95ede8da9db4ce854d573c3c28a46b6d8b35ed3e
Former-commit-id: f30802a28314382d7652ee1a9d6b75afd327ccf7
---
 src/assets/style/public-class.scss            | 52 +++++++------------
 src/assets/style/public.scss                  |  1 -
 src/assets/style/theme/theme.scss             | 10 ----
 src/assets/style/unit/_size.scss              |  1 -
 src/components/core/d2-container/index.vue    |  4 --
 src/pages/core/login/style.scss               |  2 +-
 src/pages/demo/components/icon/select.vue     |  4 +-
 src/pages/demo/components/layout/grid.vue     |  3 --
 .../mock/components/d2-demo-mock-card.vue     |  2 +-
 9 files changed, 23 insertions(+), 56 deletions(-)
 delete mode 100644 src/assets/style/unit/_size.scss

diff --git a/src/assets/style/public-class.scss b/src/assets/style/public-class.scss
index 33be9df6..2ac20e74 100644
--- a/src/assets/style/public-class.scss
+++ b/src/assets/style/public-class.scss
@@ -40,40 +40,26 @@
 }
 
 // 边距相关
-.#{$prefix}-m { margin: $margin; }
-.#{$prefix}-mt { margin-top: $margin; }
-.#{$prefix}-mr { margin-right: $margin; }
-.#{$prefix}-mb { margin-bottom: $margin; }
-.#{$prefix}-ml { margin-left: $margin; }
+$sizes: (0, 10, 15, 20);
 
-.#{$prefix}-m-10 { margin: 10px; }
-.#{$prefix}-mt-10 { margin-top: 10px; }
-.#{$prefix}-mr-10 { margin-right: 10px; }
-.#{$prefix}-mb-10 { margin-bottom: 10px; }
-.#{$prefix}-ml-10 { margin-left: 10px; }
+@for $index from 1 to 5 {
+  .#{$prefix}-m-#{nth($sizes, $index)} { margin: #{nth($sizes, $index)}px; }
+  .#{$prefix}-mt-#{nth($sizes, $index)} { margin-top: #{nth($sizes, $index)}px; }
+  .#{$prefix}-mr-#{nth($sizes, $index)} { margin-right: #{nth($sizes, $index)}px; }
+  .#{$prefix}-mb-#{nth($sizes, $index)} { margin-bottom: #{nth($sizes, $index)}px; }
+  .#{$prefix}-ml-#{nth($sizes, $index)} { margin-left: #{nth($sizes, $index)}px; }
+}
 
-.#{$prefix}-m-0 { margin: 0px; }
-.#{$prefix}-mt-0 { margin-top: 0px; }
-.#{$prefix}-mr-0 { margin-right: 0px; }
-.#{$prefix}-mb-0 { margin-bottom: 0px; }
-.#{$prefix}-ml-0 { margin-left: 0px; }
+// 快速使用
 
+.#{$prefix}-m { margin: 20px; }
+.#{$prefix}-mt { margin-top: 20px; }
+.#{$prefix}-mr { margin-right: 20px; }
+.#{$prefix}-mb { margin-bottom: 20px; }
+.#{$prefix}-ml { margin-left: 20px; }
 
-
-.#{$prefix}-p { padding: $margin; }
-.#{$prefix}-pt { padding-top: $margin; }
-.#{$prefix}-pr { padding-right: $margin; }
-.#{$prefix}-pb { padding-bottom: $margin; }
-.#{$prefix}-pl { padding-left: $margin; }
-
-.#{$prefix}-p-10 { padding: 10px; }
-.#{$prefix}-pt-10 { padding-top: 10px; }
-.#{$prefix}-pr-10 { padding-right: 10px; }
-.#{$prefix}-pb-10 { padding-bottom: 10px; }
-.#{$prefix}-pl-10 { padding-left: 10px; }
-
-.#{$prefix}-p-0 { padding: 0px; }
-.#{$prefix}-pt-0 { padding-top: 0px; }
-.#{$prefix}-pr-0 { padding-right: 0px; }
-.#{$prefix}-pb-0 { padding-bottom: 0px; }
-.#{$prefix}-pl-0 { padding-left: 0px; }
+.#{$prefix}-p { padding: 20px; }
+.#{$prefix}-pt { padding-top: 20px; }
+.#{$prefix}-pr { padding-right: 20px; }
+.#{$prefix}-pb { padding-bottom: 20px; }
+.#{$prefix}-pl { padding-left: 20px; }
diff --git a/src/assets/style/public.scss b/src/assets/style/public.scss
index 2fb6ad62..66aef37c 100644
--- a/src/assets/style/public.scss
+++ b/src/assets/style/public.scss
@@ -1,5 +1,4 @@
 @import '~@/assets/style/unit/_color.scss';
-@import '~@/assets/style/unit/_size.scss';
 
 // 工具类名统一前缀
 $prefix: d2;
diff --git a/src/assets/style/theme/theme.scss b/src/assets/style/theme/theme.scss
index 93198426..17c418d2 100644
--- a/src/assets/style/theme/theme.scss
+++ b/src/assets/style/theme/theme.scss
@@ -71,16 +71,6 @@
     .el-aside {
       transition: width .3s;
       overflow: inherit;
-      // 空菜单
-      .d2-side-menu-empty {
-        background-color: rgba(#000, .03);
-        margin: $margin;
-        margin-top: 0px;
-        border-radius: 4px;
-        line-height: 100px;
-        text-align: center;
-        color: $color-text-sub;
-      }
       // [菜单] 正常状态
       .el-menu {
         background-color: transparent;
diff --git a/src/assets/style/unit/_size.scss b/src/assets/style/unit/_size.scss
deleted file mode 100644
index c85cb481..00000000
--- a/src/assets/style/unit/_size.scss
+++ /dev/null
@@ -1 +0,0 @@
-$margin: 20px;
\ No newline at end of file
diff --git a/src/components/core/d2-container/index.vue b/src/components/core/d2-container/index.vue
index 84d2eb84..832402ac 100644
--- a/src/components/core/d2-container/index.vue
+++ b/src/components/core/d2-container/index.vue
@@ -45,15 +45,11 @@ export default {
 <style lang="scss">
 @import '~@/assets/style/public.scss';
 .container-component {
-  // margin-right: 20px;
-  // margin-bottom: 20px;
   position: absolute;
   top: 0px;
   bottom: 0px;
   left: 0px;
   right: 0px;
-  // padding-right: $margin;
-  // padding-bottom: $margin;
   overflow: auto;
 }
 @media (min-width: 576px) {
diff --git a/src/pages/core/login/style.scss b/src/pages/core/login/style.scss
index 5af98b12..01fa612c 100644
--- a/src/pages/core/login/style.scss
+++ b/src/pages/core/login/style.scss
@@ -61,6 +61,6 @@
   // 帮助按钮
   .button-help {
     width: 300px;
-    margin-top: $margin;
+    margin-top: 20px;
   }
 }
\ No newline at end of file
diff --git a/src/pages/demo/components/icon/select.vue b/src/pages/demo/components/icon/select.vue
index 9e5c2721..392d1a80 100644
--- a/src/pages/demo/components/icon/select.vue
+++ b/src/pages/demo/components/icon/select.vue
@@ -40,8 +40,8 @@ export default {
 <style lang="scss" scoped>
 @import '~@/assets/style/public.scss';
 .title-group {
-  margin-top: $margin;
-  margin-bottom: $margin / 2;
+  margin-top: 20px;
+  margin-bottom: 10px;
   &:first-child {
     margin-top: 0px;
   }
diff --git a/src/pages/demo/components/layout/grid.vue b/src/pages/demo/components/layout/grid.vue
index 2cd5d60a..abdb5d0c 100644
--- a/src/pages/demo/components/layout/grid.vue
+++ b/src/pages/demo/components/layout/grid.vue
@@ -94,9 +94,6 @@ export default {
     .el-card {
       height: 100%;
       @extend %unable-select;
-      // .el-card__header {
-      //   padding: 8px $margin;
-      // }
     }
     .vue-resizable-handle {
       opacity: .3;
diff --git a/src/pages/demo/plugins/mock/components/d2-demo-mock-card.vue b/src/pages/demo/plugins/mock/components/d2-demo-mock-card.vue
index 04491ceb..baec6a6e 100644
--- a/src/pages/demo/plugins/mock/components/d2-demo-mock-card.vue
+++ b/src/pages/demo/plugins/mock/components/d2-demo-mock-card.vue
@@ -47,7 +47,7 @@ export default {
 <style lang="scss" scoped>
 @import '~@/assets/style/public.scss';
 .col {
-  padding: $margin;
+  padding: 20px;
   border-radius: 4px;
   border-width: 1px;
   border-style: solid;

From 10ed0608f90ee476a07f25c9672d7650e412fb11 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 12 Jun 2018 11:04:16 +0800
Subject: [PATCH 04/20] no message

Former-commit-id: 37bb7bd8096cc3f7e152f0b5c2a364c5e4e6fef9
Former-commit-id: a45f6374b941f4e286249accf326e70dc82755e2
Former-commit-id: 4f50b4e5fbd283f3e112fd0cfdcb29ed876f790b
Former-commit-id: 658786ee9b6049a45e6bdaac66afd90f56fd83b8
---
 src/main.js                          |  9 ++++++---
 src/pages/demo/plugins/day/index.vue | 13 ++++++++++++-
 src/plugin/open/index.js             |  8 ++++++++
 3 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100644 src/plugin/open/index.js

diff --git a/src/main.js b/src/main.js
index 0135ca41..b712e985 100755
--- a/src/main.js
+++ b/src/main.js
@@ -33,18 +33,21 @@ import '@/mock/register'
 // vuex
 import store from '@/store/index.js'
 
-// 插件 log简化
-import pluginLog from '@/plugin/log'
 // 插件 导出文件
 import pluginImport from '@/plugin/import'
 // 插件 导出文件
 import pluginExport from '@/plugin/export'
+// 插件 log简化
+import pluginLog from '@/plugin/log'
+// 插件 打开页面
+import pluginOpen from '@/plugin/open'
 
 Vue.use(ElementUI)
 
-Vue.use(pluginLog)
 Vue.use(pluginImport)
 Vue.use(pluginExport)
+Vue.use(pluginLog)
+Vue.use(pluginOpen)
 
 Vue.config.productionTip = false
 
diff --git a/src/pages/demo/plugins/day/index.vue b/src/pages/demo/plugins/day/index.vue
index 72321dd9..2892ff42 100644
--- a/src/pages/demo/plugins/day/index.vue
+++ b/src/pages/demo/plugins/day/index.vue
@@ -2,7 +2,13 @@
   <d2-container type="full">
     <template slot="header">日期计算</template>
     <template slot="footer">
-      <a href="https://github.com/iamkun/dayjs">https://github.com/iamkun/dayjs</a>
+      <el-button-group>
+        <el-button size="mini">依赖</el-button>
+        <el-button size="mini" @click="$open(link)">
+          <d2-icon name="link"/>
+          {{link}}
+        </el-button>
+      </el-button-group>
     </template>
   </d2-container>
 </template>
@@ -10,5 +16,10 @@
 <script>
 import dayjs from 'dayjs'
 export default {
+  data () {
+    return {
+      link: 'https://github.com/iamkun/dayjs'
+    }
+  }
 }
 </script>
diff --git a/src/plugin/open/index.js b/src/plugin/open/index.js
new file mode 100644
index 00000000..1884ba99
--- /dev/null
+++ b/src/plugin/open/index.js
@@ -0,0 +1,8 @@
+export default {
+  install (Vue, options) {
+    // 打开一个url
+    Vue.prototype.$open = (url = 'https://github.com/FairyEver') => {
+      window.open(url)
+    }
+  }
+}

From f0747a53321f6b9d50d1db0eea2d3efb4a937fee Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 12 Jun 2018 11:10:21 +0800
Subject: [PATCH 05/20] no message

Former-commit-id: 8a731ca8028435e0ee780e4fa4d322a33f7f8c43
Former-commit-id: 200c1aaeb74abe28b6192ae9ee705bb471c39c23
Former-commit-id: fd4adc33b65c76c8504e66c4ac6c29394b5ad558
Former-commit-id: 535ae899ab441c76fc0011ec52f4342b05e3e4bd
---
 .../demo/d2-demo-link-btn/index.vue           | 22 +++++++++++++++++++
 src/components/demo/register.js               |  1 +
 src/pages/demo/plugins/day/index.vue          |  8 +------
 3 files changed, 24 insertions(+), 7 deletions(-)
 create mode 100644 src/components/demo/d2-demo-link-btn/index.vue

diff --git a/src/components/demo/d2-demo-link-btn/index.vue b/src/components/demo/d2-demo-link-btn/index.vue
new file mode 100644
index 00000000..fa234a18
--- /dev/null
+++ b/src/components/demo/d2-demo-link-btn/index.vue
@@ -0,0 +1,22 @@
+<template>
+  <el-button-group>
+    <el-button size="mini">依赖</el-button>
+    <el-button size="mini" @click="$open(link)">
+      <d2-icon name="link"/>
+      {{link}}
+    </el-button>
+  </el-button-group>
+</template>
+
+<script>
+export default {
+  name: 'd2-demo-link-btn',
+  props: {
+    link: {
+      type: String,
+      required: false,
+      default: 'https://github.com/FairyEver'
+    }
+  }
+}
+</script>
diff --git a/src/components/demo/register.js b/src/components/demo/register.js
index 6e102fec..8d9990d6 100644
--- a/src/components/demo/register.js
+++ b/src/components/demo/register.js
@@ -1,4 +1,5 @@
 import Vue from 'vue'
 
+Vue.component('d2-demo-link-btn', () => import('@/components/demo/d2-demo-link-btn'))
 Vue.component('d2-demo-page-header', () => import('@/components/demo/d2-demo-page-header'))
 Vue.component('d2-demo-page-cover', () => import('@/components/demo/d2-demo-page-cover'))
diff --git a/src/pages/demo/plugins/day/index.vue b/src/pages/demo/plugins/day/index.vue
index 2892ff42..3c99cea5 100644
--- a/src/pages/demo/plugins/day/index.vue
+++ b/src/pages/demo/plugins/day/index.vue
@@ -2,13 +2,7 @@
   <d2-container type="full">
     <template slot="header">日期计算</template>
     <template slot="footer">
-      <el-button-group>
-        <el-button size="mini">依赖</el-button>
-        <el-button size="mini" @click="$open(link)">
-          <d2-icon name="link"/>
-          {{link}}
-        </el-button>
-      </el-button-group>
+      <d2-demo-link-btn :link="link"/>
     </template>
   </d2-container>
 </template>

From 5f55a0e9be9c7e44d76c1f7e051942b6ad5fc7cd Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 12 Jun 2018 11:13:44 +0800
Subject: [PATCH 06/20] no message

Former-commit-id: 956da93856c738e00064eae4e23b2fa030469d82
Former-commit-id: 09bd6561aa5c3252e6c56917ce38c861f97b25be
Former-commit-id: 7c86886a561c440938a188a20b4b5f1b3d739b1e
Former-commit-id: 9f49f475139909e15a9f7a1708ce6e9091f4d125
---
 src/components/demo/d2-demo-link-btn/index.vue | 14 ++++++++++++--
 src/pages/demo/plugins/day/index.vue           |  2 +-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/components/demo/d2-demo-link-btn/index.vue b/src/components/demo/d2-demo-link-btn/index.vue
index fa234a18..8f59a2c1 100644
--- a/src/components/demo/d2-demo-link-btn/index.vue
+++ b/src/components/demo/d2-demo-link-btn/index.vue
@@ -1,8 +1,8 @@
 <template>
   <el-button-group>
-    <el-button size="mini">依赖</el-button>
+    <el-button v-if="title" size="mini">{{title}}</el-button>
     <el-button size="mini" @click="$open(link)">
-      <d2-icon name="link"/>
+      <d2-icon :name="icon"/>
       {{link}}
     </el-button>
   </el-button-group>
@@ -12,6 +12,16 @@
 export default {
   name: 'd2-demo-link-btn',
   props: {
+    title: {
+      type: String,
+      required: false,
+      default: ''
+    },
+    icon: {
+      type: String,
+      required: false,
+      default: 'link'
+    },
     link: {
       type: String,
       required: false,
diff --git a/src/pages/demo/plugins/day/index.vue b/src/pages/demo/plugins/day/index.vue
index 3c99cea5..4f6c0e1d 100644
--- a/src/pages/demo/plugins/day/index.vue
+++ b/src/pages/demo/plugins/day/index.vue
@@ -2,7 +2,7 @@
   <d2-container type="full">
     <template slot="header">日期计算</template>
     <template slot="footer">
-      <d2-demo-link-btn :link="link"/>
+      <d2-demo-link-btn title="依赖" :link="link"/>
     </template>
   </d2-container>
 </template>

From 7c5c4a43ccb1e5e4e1c5d5b2b2f4e2a598ae192b Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 12 Jun 2018 11:21:24 +0800
Subject: [PATCH 07/20] no message

Former-commit-id: 7519d155109ba47a492e27004e0b2d4aab03ecd7
Former-commit-id: 3027360427bca1eccb7f9806e5ade1e1772fc4d7
Former-commit-id: 4a050cfe7ac108244a0c31b28a2a7129d0b232be
Former-commit-id: b7b27c2bd164215661dbe44d270efe74ab538303
---
 src/menu/index.js                             | 11 +++++++--
 .../markdown/{index.vue => source.vue}        |  2 +-
 src/pages/demo/components/markdown/url.vue    |  6 +++++
 src/router/index.js                           |  3 ++-
 static/md/demo.md                             | 23 +++++++++++++++++++
 5 files changed, 41 insertions(+), 4 deletions(-)
 rename src/pages/demo/components/markdown/{index.vue => source.vue} (79%)
 create mode 100644 src/pages/demo/components/markdown/url.vue
 create mode 100644 static/md/demo.md

diff --git a/src/menu/index.js b/src/menu/index.js
index 70745af2..478e7507 100644
--- a/src/menu/index.js
+++ b/src/menu/index.js
@@ -80,11 +80,18 @@ const demoComponents = {
         { path: `${pre}icon/svg`, title: 'SVG图标组件' }
       ]
     },
+    {
+      path: `${pre}markdown`,
+      title: 'markdown 解析',
+      children: [
+        { path: `${pre}markdown/source`, title: '指定资源' },
+        { path: `${pre}markdown/url`, title: '异步加载文件' }
+      ]
+    },
     { path: `${pre}countup`, title: '数字动画' },
     { path: `${pre}editor-quill`, title: '富文本编辑器' },
     { path: `${pre}editor-simpleMDE`, title: 'markdown编辑器' },
-    { path: `${pre}highlight`, title: '代码高亮显示' },
-    { path: `${pre}markdown`, title: 'markdown解析' }
+    { path: `${pre}highlight`, title: '代码高亮显示' }
   ])('/demo/components/')
 }
 
diff --git a/src/pages/demo/components/markdown/index.vue b/src/pages/demo/components/markdown/source.vue
similarity index 79%
rename from src/pages/demo/components/markdown/index.vue
rename to src/pages/demo/components/markdown/source.vue
index e38e9ab4..5f4037ff 100644
--- a/src/pages/demo/components/markdown/index.vue
+++ b/src/pages/demo/components/markdown/source.vue
@@ -1,6 +1,6 @@
 <template>
   <d2-container>
-    <template slot="header">效果演示</template>
+    <template slot="header">指定资源</template>
     <d2-markdown :md="doc"/>
   </d2-container>
 </template>
diff --git a/src/pages/demo/components/markdown/url.vue b/src/pages/demo/components/markdown/url.vue
new file mode 100644
index 00000000..2f38a025
--- /dev/null
+++ b/src/pages/demo/components/markdown/url.vue
@@ -0,0 +1,6 @@
+<template>
+  <d2-container>
+    <template slot="header">异步加载文件</template>
+    <d2-markdown url="/static/md/demo.md"/>
+  </d2-container>
+</template>
diff --git a/src/router/index.js b/src/router/index.js
index 99c74da3..98255759 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -40,7 +40,8 @@ const routes = [
       { path: 'index', name: `${pre}index`, component: () => import('@/pages/demo/components/index/index.vue') },
       { path: 'layout/grid', name: `${pre}layout-grid`, component: () => import('@/pages/demo/components/layout/grid.vue') },
       { path: 'layout/splitpane', name: `${pre}layout-splitpane`, component: () => import('@/pages/demo/components/layout/splitpane.vue') },
-      { path: 'markdown', name: `${pre}markdown`, component: () => import('@/pages/demo/components/markdown/index.vue') }
+      { path: 'markdown/source', name: `${pre}markdown-source`, component: () => import('@/pages/demo/components/markdown/source.vue') },
+      { path: 'markdown/url', name: `${pre}markdown-url`, component: () => import('@/pages/demo/components/markdown/url.vue') }
     ])('demo-components-')
   },
   {
diff --git a/static/md/demo.md b/static/md/demo.md
new file mode 100644
index 00000000..301b283d
--- /dev/null
+++ b/static/md/demo.md
@@ -0,0 +1,23 @@
+# 一级标题
+
+| ID | Name | Email |
+| --- | --- | --- |
+| 0001 | FairyEver | 1711467488@qq.com |
+
+```
+alert('Hello World')
+```
+
+一般引用
+
+> 引用文字
+
+分享一个我很早前的一副设计作品 [in Lofter](http://fairyever.lofter.com/post/16ff00_6796fe8) 借此演示百度云链接的显示优化
+
+> https://pan.baidu.com/s/1kW6uUwB
+
+设计源文件
+
+> 链接: https://pan.baidu.com/s/1ggFW21l 密码: 877y
+
+[https://github.com/FairyEver](https://github.com/FairyEver)
\ No newline at end of file

From b32b84cdb1b0fd789a80c787f5d4ca3d92c32919 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 12 Jun 2018 11:26:12 +0800
Subject: [PATCH 08/20] no message

Former-commit-id: 1c069d76278e418a4025d9507b64394b78d6c1dc
Former-commit-id: 196c50502c7c5dd567997000db8007406f2c7866
Former-commit-id: ce840c9b082c237c18e93ca38dc704000e355341
Former-commit-id: 81026579f627bbcbafce3aebbe444b9678cc4530
---
 docs/zh/components/markdown.md                | 4 ++--
 docs/zh/guide/change-log.md                   | 3 ++-
 src/components/core/d2-markdown/index.vue     | 6 +++---
 src/pages/demo/components/container/card.vue  | 2 +-
 src/pages/demo/components/container/full.vue  | 2 +-
 src/pages/demo/components/container/ghost.vue | 2 +-
 src/pages/demo/components/markdown/source.vue | 2 +-
 src/pages/demo/plugins/mock/dpd.vue           | 2 +-
 src/pages/demo/plugins/mock/dtd.vue           | 2 +-
 9 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/docs/zh/components/markdown.md b/docs/zh/components/markdown.md
index ce9132ef..1a0f8235 100644
--- a/docs/zh/components/markdown.md
+++ b/docs/zh/components/markdown.md
@@ -5,7 +5,7 @@
 | 参数名 | 介绍 | 必选 | 值类型 | 可选值 | 默认值 |
 | --- | --- | --- | --- | --- | --- |
 | url | markdown文件地址 | 非 | String |  | 无 |
-| md | markdown内容 | 非 | String |  | 无 |
+| source | markdown内容 | 非 | String |  | 无 |
 | highlight | 代码高亮 | 非 | Boolean |  | false |
 | baidupan | 百度网盘分享链接显示优化 | 非 | Boolean |  | true |
 
@@ -26,7 +26,7 @@ const md = `# Header
 
 text`
 
-<d2-markdown :md="md"/>
+<d2-markdown :source="md"/>
 ```
 
 ## 百度网盘分享链接优化
diff --git a/docs/zh/guide/change-log.md b/docs/zh/guide/change-log.md
index 3b623983..96c4f3c6 100644
--- a/docs/zh/guide/change-log.md
+++ b/docs/zh/guide/change-log.md
@@ -10,11 +10,12 @@
 * [ 修改 ] 路由注册回归最简单的写法
 * [ 修复 ] 首次加载 loading 样式类名和程序内类名冲突，新的加载类名使用 `d2-app-loading` 前缀
 * [ 修改 ] 所有类似 `dd-` 的样式前缀(包括自动注册图标的id前缀)统一改为 `d2-`
-* [ 修复 ] 修复 `highlight` 组件和 `markdown` 组件的样式冲突
+* [ 修复 ] 修复 `d2-highlight` 组件和 `d2-markdown` 组件的样式冲突
 * [ 修改 ] 内置组件名称统一改为 `d2-` 前缀，统一使用横线连接 (kebab-case) 风格
 * [ 修改 ] 顶栏 logo 阴影删除
 * [ 新增 ] 主题系统
 * [ 新增 ] 三个主题，分别为 `d2admin 经典`，`简约线条`，`流星`
+* [ 修改 ] `d2-markdown` 组件 `md` 参数改名为 `source`
 
 ## v1.0.0
 
diff --git a/src/components/core/d2-markdown/index.vue b/src/components/core/d2-markdown/index.vue
index 512f3acd..d4f21c87 100644
--- a/src/components/core/d2-markdown/index.vue
+++ b/src/components/core/d2-markdown/index.vue
@@ -19,7 +19,7 @@ export default {
       required: false,
       default: ''
     },
-    md: {
+    source: {
       type: String,
       required: false,
       default: ''
@@ -45,7 +45,7 @@ export default {
   mounted () {
     if (this.url) {
       this.initWithUrl()
-    } else if (this.md) {
+    } else if (this.source) {
       this.initWithMd()
     } else {
       console.log('not mounted init')
@@ -54,7 +54,7 @@ export default {
   methods: {
     // 使用 md 初始化
     initWithMd () {
-      this.markedHTML = this.marked(this.md)
+      this.markedHTML = this.marked(this.source)
     },
     // 使用 url 初始化
     async initWithUrl () {
diff --git a/src/pages/demo/components/container/card.vue b/src/pages/demo/components/container/card.vue
index 49ccca78..a0b7ba8c 100644
--- a/src/pages/demo/components/container/card.vue
+++ b/src/pages/demo/components/container/card.vue
@@ -1,7 +1,7 @@
 <template>
   <d2-container>
     <template slot="header">我是插入到 header 中的内容</template>
-    <d2-markdown :md="doc"/>
+    <d2-markdown :source="doc"/>
   </d2-container>
 </template>
 
diff --git a/src/pages/demo/components/container/full.vue b/src/pages/demo/components/container/full.vue
index 0783ea0e..8b87b365 100644
--- a/src/pages/demo/components/container/full.vue
+++ b/src/pages/demo/components/container/full.vue
@@ -3,7 +3,7 @@
     <template slot="header">
       我是插入到 header 中的内容
     </template>
-    <d2-markdown :md="doc"/>
+    <d2-markdown :source="doc"/>
     <template slot="footer">
       我是插入到 footer 中的内容
     </template>
diff --git a/src/pages/demo/components/container/ghost.vue b/src/pages/demo/components/container/ghost.vue
index 6250aea8..cb58c0cb 100644
--- a/src/pages/demo/components/container/ghost.vue
+++ b/src/pages/demo/components/container/ghost.vue
@@ -1,7 +1,7 @@
 <template>
   <d2-container type="ghost">
     <el-card shadow="never" style="width: 50%;">
-      <d2-markdown :md="doc"/>
+      <d2-markdown :source="doc"/>
     </el-card>
   </d2-container>
 </template>
diff --git a/src/pages/demo/components/markdown/source.vue b/src/pages/demo/components/markdown/source.vue
index 5f4037ff..92d04893 100644
--- a/src/pages/demo/components/markdown/source.vue
+++ b/src/pages/demo/components/markdown/source.vue
@@ -1,7 +1,7 @@
 <template>
   <d2-container>
     <template slot="header">指定资源</template>
-    <d2-markdown :md="doc"/>
+    <d2-markdown :source="doc"/>
   </d2-container>
 </template>
 
diff --git a/src/pages/demo/plugins/mock/dpd.vue b/src/pages/demo/plugins/mock/dpd.vue
index c51f9585..47a8c488 100644
--- a/src/pages/demo/plugins/mock/dpd.vue
+++ b/src/pages/demo/plugins/mock/dpd.vue
@@ -2,7 +2,7 @@
   <d2-container type="ghost">
     <el-card shadow="never" class="d2-mb">
       <d2-demo-page-header slot="header" title="数据占位符"/>
-      <d2-markdown :md="doc"/>
+      <d2-markdown :source="doc"/>
     </el-card>
     <d2-demo-mock-card
       v-for="(item, index) in settingDPD"
diff --git a/src/pages/demo/plugins/mock/dtd.vue b/src/pages/demo/plugins/mock/dtd.vue
index 5ff55ec3..3eb7a3d9 100644
--- a/src/pages/demo/plugins/mock/dtd.vue
+++ b/src/pages/demo/plugins/mock/dtd.vue
@@ -2,7 +2,7 @@
   <d2-container type="ghost">
     <el-card shadow="never" class="d2-mb">
       <d2-demo-page-header slot="header" title="数据模板"/>
-      <d2-markdown :md="doc"/>
+      <d2-markdown :source="doc"/>
     </el-card>
     <d2-demo-mock-card
       v-for="(item, index) in settingDTD"

From 27defba2a02fbc37913319f7d1718c7fe336eafe Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 12 Jun 2018 11:30:24 +0800
Subject: [PATCH 09/20] no message

Former-commit-id: c7062e4971638ab3ad1a822f09f4c9cfd74c9763
Former-commit-id: a1f6cce14f392bcd42ea97467e52936a413a91af
Former-commit-id: 67a2e1c3547f6ece71b3c34e9db8022771827780
Former-commit-id: ed6d0e2b105eaa68aafc7603ebfa4e9f7174a8f1
---
 docs/zh/guide/change-log.md          | 1 +
 src/assets/style/fixed/markdown.scss | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/docs/zh/guide/change-log.md b/docs/zh/guide/change-log.md
index 96c4f3c6..864fd999 100644
--- a/docs/zh/guide/change-log.md
+++ b/docs/zh/guide/change-log.md
@@ -16,6 +16,7 @@
 * [ 新增 ] 主题系统
 * [ 新增 ] 三个主题，分别为 `d2admin 经典`，`简约线条`，`流星`
 * [ 修改 ] `d2-markdown` 组件 `md` 参数改名为 `source`
+* [ 修改 ] 删除了 `d2-markdown` 组件中图片的白色背景
 
 ## v1.0.0
 
diff --git a/src/assets/style/fixed/markdown.scss b/src/assets/style/fixed/markdown.scss
index cd71054f..32438f58 100644
--- a/src/assets/style/fixed/markdown.scss
+++ b/src/assets/style/fixed/markdown.scss
@@ -7,4 +7,7 @@
   h1, h2 {
     border-bottom: none;
   }
+  img {
+    background-color: transparent;
+  }
 }
\ No newline at end of file

From 02d4f0d15ba02b5852cdda7a4f3b323809524311 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 12 Jun 2018 11:33:17 +0800
Subject: [PATCH 10/20] no message

Former-commit-id: 3b9a5cccbba57bc7e953f9c780ff30e78ae44e60
Former-commit-id: 8b458627beed396dd69428df220fb8abad5b47ce
Former-commit-id: fcfc5bbbecac874f20d8ac9d6d1ae3a93062773b
Former-commit-id: f07ab4d2005b3b8fd1f3820eba8b22de7cfaeca4
---
 src/assets/style/theme/line/setting.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/assets/style/theme/line/setting.scss b/src/assets/style/theme/line/setting.scss
index 075996d9..acd1b0b5 100644
--- a/src/assets/style/theme/line/setting.scss
+++ b/src/assets/style/theme/line/setting.scss
@@ -13,7 +13,7 @@ $theme-container-border-outer: 1px solid $color-border-1;
 
 // 顶栏和侧边栏中展开的菜单 hover 状态下
 $theme-menu-item-color-hover: #293849;
-$theme-menu-item-background-color-hover: #ecf5ff;
+$theme-menu-item-background-color-hover: #EFEFEF;
 
 // 顶栏上的文字颜色
 $theme-header-item-color: $color-text-normal;

From 4467a81f1967725dfecce141b5f5bca48af71584 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 12 Jun 2018 13:55:46 +0800
Subject: [PATCH 11/20] no message

Former-commit-id: 502361a526f041cfc2b1f1f53f8d8d47a98c06ee
Former-commit-id: 1b167310e861bf5f7223106f5c148ebf21f01223
Former-commit-id: 6910d7543f0f0bfd3ede6767e09aea7b6fe67349
Former-commit-id: 6f704941663129079269f8f6c6f1d18a1256fe06
---
 src/pages/demo/plugins/day/index.vue | 38 ++++++++++++++++++++++++++--
 1 file changed, 36 insertions(+), 2 deletions(-)

diff --git a/src/pages/demo/plugins/day/index.vue b/src/pages/demo/plugins/day/index.vue
index 4f6c0e1d..aa8f5d20 100644
--- a/src/pages/demo/plugins/day/index.vue
+++ b/src/pages/demo/plugins/day/index.vue
@@ -1,6 +1,34 @@
 <template>
   <d2-container type="full">
-    <template slot="header">日期计算</template>
+    <template slot="header">
+      <el-button @click="handleReset">重新设置基础时间 this.now = dayjs()</el-button>
+    </template>
+    <h1>当前时间</h1>
+    <el-row :gutter="20" class="d2-mt">
+      <el-col :span="8"><el-card shadow="never"><d2-highlight slot="header" :code="`now.format()`"/>{{now.format()}}</el-card></el-col>
+    </el-row>
+    <h1>获取</h1>
+    <el-row :gutter="20" class="d2-mt">
+      <el-col :span="6"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`now.year()`"/>{{now.year()}}</el-card></el-col>
+      <el-col :span="6"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`now.month()`"/>{{now.month()}}</el-card></el-col>
+      <el-col :span="6"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`now.date()`"/>{{now.date()}}</el-card></el-col>
+      <el-col :span="6"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`now.day()`"/>{{now.day()}}</el-card></el-col>
+      <el-col :span="6"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`now.hour()`"/>{{now.hour()}}</el-card></el-col>
+      <el-col :span="6"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`now.minute()`"/>{{now.minute()}}</el-card></el-col>
+      <el-col :span="6"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`now.second()`"/>{{now.second()}}</el-card></el-col>
+      <el-col :span="6"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`now.millisecond()`"/>{{now.millisecond()}}</el-card></el-col>
+    </el-row>
+    <h1>设置</h1>
+    <el-row :gutter="20" class="d2-mt">
+      <el-col :span="8"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`now.set('month', 6).month()`"/>{{now.set('month', 6).month()}}</el-card></el-col>
+      <el-col :span="8"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`now.set('second', 30).second()`"/>{{now.set('second', 30).second()}}</el-card></el-col>
+      <el-col :span="8"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`now.set('hour', 4).hour()`"/>{{now.set('hour', 4).hour()}}</el-card></el-col>
+    </el-row>
+    <h1>操作</h1>
+    <el-row :gutter="20" class="d2-mt">
+      <el-col :span="12"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`now.add(1, 'day').format()`"/>{{now.add(1, 'day').format()}}</el-card></el-col>
+      <el-col :span="12"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`now.subtract(7, 'year').format()`"/>{{now.subtract(7, 'year').format()}}</el-card></el-col>
+    </el-row>
     <template slot="footer">
       <d2-demo-link-btn title="依赖" :link="link"/>
     </template>
@@ -12,7 +40,13 @@ import dayjs from 'dayjs'
 export default {
   data () {
     return {
-      link: 'https://github.com/iamkun/dayjs'
+      link: 'https://github.com/iamkun/dayjs',
+      now: dayjs()
+    }
+  },
+  methods: {
+    handleReset () {
+      this.now = dayjs()
     }
   }
 }

From 7b1bc25442e9d340574b3ae463b079c2ae95899a Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 12 Jun 2018 13:58:24 +0800
Subject: [PATCH 12/20] no message

Former-commit-id: 6ce049bb2f68b8bd2b5c134e1998f7f216e83aab
Former-commit-id: f4dc5811e8c243ec39438f266fdd3636bb9a88de
Former-commit-id: f1ac63385ea936bb705438762522f69c8d5a2d38
Former-commit-id: 39f31b022c66ea95a669e1294eeac554f5a39793
---
 src/pages/demo/plugins/day/index.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/pages/demo/plugins/day/index.vue b/src/pages/demo/plugins/day/index.vue
index aa8f5d20..46741d4f 100644
--- a/src/pages/demo/plugins/day/index.vue
+++ b/src/pages/demo/plugins/day/index.vue
@@ -28,6 +28,8 @@
     <el-row :gutter="20" class="d2-mt">
       <el-col :span="12"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`now.add(1, 'day').format()`"/>{{now.add(1, 'day').format()}}</el-card></el-col>
       <el-col :span="12"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`now.subtract(7, 'year').format()`"/>{{now.subtract(7, 'year').format()}}</el-card></el-col>
+      <el-col :span="12"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`now.startOf('year').format()`"/>{{now.startOf('year').format()}}</el-card></el-col>
+      <el-col :span="12"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`now.endOf('month').format()`"/>{{now.endOf('month').format()}}</el-card></el-col>
     </el-row>
     <template slot="footer">
       <d2-demo-link-btn title="依赖" :link="link"/>

From 045b22b49f3517061e2b3b271eed0010fecd801a Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 12 Jun 2018 14:03:28 +0800
Subject: [PATCH 13/20] no message

Former-commit-id: e297efd52f1f4acaddcd05584e542256ca0599bf
Former-commit-id: 2aecbb6ff7d6565b32a998faa41022a1cda2d609
Former-commit-id: e5aa7230e9141b6e1190fcba37df3d20c202e826
Former-commit-id: 620b25bbe48233f277cb31d91b0e43d377cca688
---
 src/pages/demo/plugins/day/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/demo/plugins/day/index.vue b/src/pages/demo/plugins/day/index.vue
index 46741d4f..1dfe39cd 100644
--- a/src/pages/demo/plugins/day/index.vue
+++ b/src/pages/demo/plugins/day/index.vue
@@ -5,7 +5,7 @@
     </template>
     <h1>当前时间</h1>
     <el-row :gutter="20" class="d2-mt">
-      <el-col :span="8"><el-card shadow="never"><d2-highlight slot="header" :code="`now.format()`"/>{{now.format()}}</el-card></el-col>
+      <el-col :span="8"><el-card shadow="never"><d2-highlight slot="header" :code="`now.format('YYYY MM DD')`"/>{{now.format('YYYY MM DD')}}</el-card></el-col>
     </el-row>
     <h1>获取</h1>
     <el-row :gutter="20" class="d2-mt">

From 49c889eea27fa2df86fd180c76db90795fc422e0 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 12 Jun 2018 14:07:53 +0800
Subject: [PATCH 14/20] no message

Former-commit-id: 5d2e14eea813273c5b4b4c3188624e48ac7c1bbf
Former-commit-id: 593f978832489c73187f7ce17a19e2aeda313346
Former-commit-id: a82579933079a36b903277aa1376a1d9205f2135
Former-commit-id: 05ea65c4d379ec32fd1681c061ba4b69b2ad08cc
---
 src/pages/demo/plugins/day/index.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/pages/demo/plugins/day/index.vue b/src/pages/demo/plugins/day/index.vue
index 1dfe39cd..5b07e09c 100644
--- a/src/pages/demo/plugins/day/index.vue
+++ b/src/pages/demo/plugins/day/index.vue
@@ -5,7 +5,7 @@
     </template>
     <h1>当前时间</h1>
     <el-row :gutter="20" class="d2-mt">
-      <el-col :span="8"><el-card shadow="never"><d2-highlight slot="header" :code="`now.format('YYYY MM DD')`"/>{{now.format('YYYY MM DD')}}</el-card></el-col>
+      <el-col :span="8"><el-card shadow="never"><d2-highlight slot="header" :code="`now.format('YYYY年M月D日 HH:mm:ss')`"/>{{now.format('YYYY年M月D日 HH:mm:ss')}}</el-card></el-col>
     </el-row>
     <h1>获取</h1>
     <el-row :gutter="20" class="d2-mt">
@@ -26,10 +26,10 @@
     </el-row>
     <h1>操作</h1>
     <el-row :gutter="20" class="d2-mt">
-      <el-col :span="12"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`now.add(1, 'day').format()`"/>{{now.add(1, 'day').format()}}</el-card></el-col>
-      <el-col :span="12"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`now.subtract(7, 'year').format()`"/>{{now.subtract(7, 'year').format()}}</el-card></el-col>
-      <el-col :span="12"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`now.startOf('year').format()`"/>{{now.startOf('year').format()}}</el-card></el-col>
-      <el-col :span="12"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`now.endOf('month').format()`"/>{{now.endOf('month').format()}}</el-card></el-col>
+      <el-col :span="12"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`now.add(1, 'day').format('YYYY年M月D日 HH:mm:ss')`"/>{{now.add(1, 'day').format('YYYY年M月D日 HH:mm:ss')}}</el-card></el-col>
+      <el-col :span="12"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`now.subtract(7, 'year').format('YYYY年M月D日 HH:mm:ss')`"/>{{now.subtract(7, 'year').format('YYYY年M月D日 HH:mm:ss')}}</el-card></el-col>
+      <el-col :span="12"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`now.startOf('year').format('YYYY年M月D日 HH:mm:ss')`"/>{{now.startOf('year').format('YYYY年M月D日 HH:mm:ss')}}</el-card></el-col>
+      <el-col :span="12"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`now.endOf('month').format('YYYY年M月D日 HH:mm:ss')`"/>{{now.endOf('month').format('YYYY年M月D日 HH:mm:ss')}}</el-card></el-col>
     </el-row>
     <template slot="footer">
       <d2-demo-link-btn title="依赖" :link="link"/>

From 014234cff73c24d67d634694ea363855696b046b Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 12 Jun 2018 14:38:36 +0800
Subject: [PATCH 15/20] no message

Former-commit-id: a21f8679ae68ee309018e5ee3b0f7b3a00782d5d
Former-commit-id: 4fa8e25e8e7048b64b0b3ce4c3fd6f2dc60f83bf
Former-commit-id: da990408bf8c93f57f48d10d4d1088dd750ad651
Former-commit-id: 2d2c8420f8c2c89d37c0bf016c6680abc45ab2a7
---
 src/pages/demo/plugins/day/index.vue | 51 ++++++++++++++++++++--------
 1 file changed, 36 insertions(+), 15 deletions(-)

diff --git a/src/pages/demo/plugins/day/index.vue b/src/pages/demo/plugins/day/index.vue
index 5b07e09c..cafe332a 100644
--- a/src/pages/demo/plugins/day/index.vue
+++ b/src/pages/demo/plugins/day/index.vue
@@ -9,27 +9,48 @@
     </el-row>
     <h1>获取</h1>
     <el-row :gutter="20" class="d2-mt">
-      <el-col :span="6"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`now.year()`"/>{{now.year()}}</el-card></el-col>
-      <el-col :span="6"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`now.month()`"/>{{now.month()}}</el-card></el-col>
-      <el-col :span="6"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`now.date()`"/>{{now.date()}}</el-card></el-col>
-      <el-col :span="6"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`now.day()`"/>{{now.day()}}</el-card></el-col>
-      <el-col :span="6"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`now.hour()`"/>{{now.hour()}}</el-card></el-col>
-      <el-col :span="6"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`now.minute()`"/>{{now.minute()}}</el-card></el-col>
-      <el-col :span="6"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`now.second()`"/>{{now.second()}}</el-card></el-col>
-      <el-col :span="6"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`now.millisecond()`"/>{{now.millisecond()}}</el-card></el-col>
+      <el-col :span="6"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`//获取年\nnow.year()`"/>{{now.year()}}</el-card></el-col>
+      <el-col :span="6"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`//获取月\nnow.month()`"/>{{now.month()}}</el-card></el-col>
+      <el-col :span="6"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`//获取日\nnow.date()`"/>{{now.date()}}</el-card></el-col>
+      <el-col :span="6"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`//获取星期\nnow.day()`"/>{{now.day()}}</el-card></el-col>
+      <el-col :span="6"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`//获取小时\nnow.hour()`"/>{{now.hour()}}</el-card></el-col>
+      <el-col :span="6"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`//获取分钟\nnow.minute()`"/>{{now.minute()}}</el-card></el-col>
+      <el-col :span="6"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`//获取秒\nnow.second()`"/>{{now.second()}}</el-card></el-col>
+      <el-col :span="6"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`//获取毫秒\nnow.millisecond()`"/>{{now.millisecond()}}</el-card></el-col>
     </el-row>
     <h1>设置</h1>
     <el-row :gutter="20" class="d2-mt">
-      <el-col :span="8"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`now.set('month', 6).month()`"/>{{now.set('month', 6).month()}}</el-card></el-col>
-      <el-col :span="8"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`now.set('second', 30).second()`"/>{{now.set('second', 30).second()}}</el-card></el-col>
-      <el-col :span="8"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`now.set('hour', 4).hour()`"/>{{now.set('hour', 4).hour()}}</el-card></el-col>
+      <el-col :span="8"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`//设置月份\nnow.set('month', 6).month()`"/>{{now.set('month', 6).month()}}</el-card></el-col>
+      <el-col :span="8"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`//设置秒\nnow.set('second', 30).second()`"/>{{now.set('second', 30).second()}}</el-card></el-col>
+      <el-col :span="8"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`//设置小时\nnow.set('hour', 4).hour()`"/>{{now.set('hour', 4).hour()}}</el-card></el-col>
     </el-row>
     <h1>操作</h1>
     <el-row :gutter="20" class="d2-mt">
-      <el-col :span="12"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`now.add(1, 'day').format('YYYY年M月D日 HH:mm:ss')`"/>{{now.add(1, 'day').format('YYYY年M月D日 HH:mm:ss')}}</el-card></el-col>
-      <el-col :span="12"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`now.subtract(7, 'year').format('YYYY年M月D日 HH:mm:ss')`"/>{{now.subtract(7, 'year').format('YYYY年M月D日 HH:mm:ss')}}</el-card></el-col>
-      <el-col :span="12"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`now.startOf('year').format('YYYY年M月D日 HH:mm:ss')`"/>{{now.startOf('year').format('YYYY年M月D日 HH:mm:ss')}}</el-card></el-col>
-      <el-col :span="12"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`now.endOf('month').format('YYYY年M月D日 HH:mm:ss')`"/>{{now.endOf('month').format('YYYY年M月D日 HH:mm:ss')}}</el-card></el-col>
+      <el-col :span="12"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`//增加\nnow.add(1, 'day').format('YYYY年M月D日 HH:mm:ss')`"/>{{now.add(1, 'day').format('YYYY年M月D日 HH:mm:ss')}}</el-card></el-col>
+      <el-col :span="12"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`//减少\nnow.subtract(7, 'year').format('YYYY年M月D日 HH:mm:ss')`"/>{{now.subtract(7, 'year').format('YYYY年M月D日 HH:mm:ss')}}</el-card></el-col>
+      <el-col :span="12"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`//开头时间\nnow.startOf('year').format('YYYY年M月D日 HH:mm:ss')`"/>{{now.startOf('year').format('YYYY年M月D日 HH:mm:ss')}}</el-card></el-col>
+      <el-col :span="12"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`//末尾时间\nnow.endOf('month').format('YYYY年M月D日 HH:mm:ss')`"/>{{now.endOf('month').format('YYYY年M月D日 HH:mm:ss')}}</el-card></el-col>
+    </el-row>
+    <h1>显示</h1>
+    <el-row :gutter="20" class="d2-mt">
+      <el-col :span="12"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`//格式化\nnow.format('YYYY-M-D HH:mm:ss')`"/>{{now.format('YYYY-M-D HH:mm:ss')}}</el-card></el-col>
+      <el-col :span="12"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`//时间差\nnow.diff(now.subtract(1, 'day'), 'days')`"/>{{now.diff(now.subtract(1, 'day'), 'days')}}</el-card></el-col>
+      <el-col :span="12"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`//Unix 时间戳 (毫秒)\nnow.valueOf()`"/>{{now.valueOf()}}</el-card></el-col>
+      <el-col :span="12"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`//Unix 时间戳 (秒)\nnow.unix()`"/>{{now.unix()}}</el-card></el-col>
+      <el-col :span="12"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`//天数 (月)\nnow.daysInMonth()`"/>{{now.daysInMonth()}}</el-card></el-col>
+      <el-col :span="12"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`//Date 对象\nnow.toDate()`"/>{{now.toDate()}}</el-card></el-col>
+      <el-col :span="12"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`//数组\nnow.toArray()`"/>{{now.toArray()}}</el-card></el-col>
+      <el-col :span="12"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`//序列化 Dayjs 对象时会返回 ISO 8601 格式的字符串\nnow.toJSON()`"/>{{now.toJSON()}}</el-card></el-col>
+      <el-col :span="12"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`//ISO 8601 字符串\nnow.toISOString()`"/>{{now.toISOString()}}</el-card></el-col>
+      <el-col :span="12"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`//字符串\nnow.toString()`"/>{{now.toString()}}</el-card></el-col>
+      <el-col :span="24"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`//对象\nnow.toObject()`"/>{{now.toObject()}}</el-card></el-col>
+    </el-row>
+    <h1>查询</h1>
+    <el-row :gutter="20" class="d2-mt">
+      <el-col :span="12"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`//是否之前\nnow.isBefore(now.add(1, 'day'), 'days')`"/>{{now.isBefore(now.add(1, 'day'), 'days')}}</el-card></el-col>
+      <el-col :span="12"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`//是否之前\nnow.isBefore(now.subtract(1, 'day'), 'days')`"/>{{now.isBefore(now.subtract(1, 'day'), 'days')}}</el-card></el-col>
+      <el-col :span="12"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`//是否相同\nnow.isSame(now)`"/>{{now.isSame(now)}}</el-card></el-col>
+      <el-col :span="12"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`//是否相同\nnow.isSame(now.add(1, 'day'), 'days')`"/>{{now.isSame(now.add(1, 'day'), 'days')}}</el-card></el-col>
     </el-row>
     <template slot="footer">
       <d2-demo-link-btn title="依赖" :link="link"/>

From 56fc9810aa0c82a10cb5f2a26f6b46f9bb1ec2a1 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 12 Jun 2018 14:40:51 +0800
Subject: [PATCH 16/20] no message

Former-commit-id: 9249e500f849ae91a4e8783fa74e58dc24e4fc70
Former-commit-id: 755aa7c79d89a30c04a6bf1481c240e592f7e8b1
Former-commit-id: ca2c34ab8db6ec5dab33cfc46f6c6db018821986
Former-commit-id: 77aab8d057ed28c63c2640196034d97726ade62c
---
 src/pages/demo/plugins/day/index.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/pages/demo/plugins/day/index.vue b/src/pages/demo/plugins/day/index.vue
index cafe332a..68f9fa08 100644
--- a/src/pages/demo/plugins/day/index.vue
+++ b/src/pages/demo/plugins/day/index.vue
@@ -47,10 +47,12 @@
     </el-row>
     <h1>查询</h1>
     <el-row :gutter="20" class="d2-mt">
-      <el-col :span="12"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`//是否之前\nnow.isBefore(now.add(1, 'day'), 'days')`"/>{{now.isBefore(now.add(1, 'day'), 'days')}}</el-card></el-col>
-      <el-col :span="12"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`//是否之前\nnow.isBefore(now.subtract(1, 'day'), 'days')`"/>{{now.isBefore(now.subtract(1, 'day'), 'days')}}</el-card></el-col>
+      <el-col :span="12"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`//是否之前\nnow.isBefore(now.add(1, 'day'))`"/>{{now.isBefore(now.add(1, 'day'))}}</el-card></el-col>
+      <el-col :span="12"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`//是否之前\nnow.isBefore(now.subtract(1, 'day'))`"/>{{now.isBefore(now.subtract(1, 'day'))}}</el-card></el-col>
       <el-col :span="12"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`//是否相同\nnow.isSame(now)`"/>{{now.isSame(now)}}</el-card></el-col>
-      <el-col :span="12"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`//是否相同\nnow.isSame(now.add(1, 'day'), 'days')`"/>{{now.isSame(now.add(1, 'day'), 'days')}}</el-card></el-col>
+      <el-col :span="12"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`//是否相同\nnow.isSame(now.add(1, 'day'))`"/>{{now.isSame(now.add(1, 'day'))}}</el-card></el-col>
+      <el-col :span="12"><el-card shadow="never"><d2-highlight slot="header" :code="`//是否之后\nnow.isAfter(now.add(1, 'day'))`"/>{{now.isAfter(now.add(1, 'day'))}}</el-card></el-col>
+      <el-col :span="12"><el-card shadow="never"><d2-highlight slot="header" :code="`//是否之后\nnow.isAfter(now.subtract(1, 'day'))`"/>{{now.isAfter(now.subtract(1, 'day'))}}</el-card></el-col>
     </el-row>
     <template slot="footer">
       <d2-demo-link-btn title="依赖" :link="link"/>

From 56de1dff88c6884dc267476ffbf4ad992add0940 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 12 Jun 2018 14:42:03 +0800
Subject: [PATCH 17/20] no message

Former-commit-id: 2db6a2c3ae6846c94a5a83fc4d57a57f15d09fb5
Former-commit-id: 8a391f4e966d76c91333cbd71581c30db0568e92
Former-commit-id: 96add1cebd5611da5a92fad36876e93fb6bdabd7
Former-commit-id: 7da0be812a588221b6767a7533d5f35c18922d20
---
 src/pages/demo/plugins/day/index.vue | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/pages/demo/plugins/day/index.vue b/src/pages/demo/plugins/day/index.vue
index 68f9fa08..96afb64a 100644
--- a/src/pages/demo/plugins/day/index.vue
+++ b/src/pages/demo/plugins/day/index.vue
@@ -13,23 +13,23 @@
       <el-col :span="6"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`//获取月\nnow.month()`"/>{{now.month()}}</el-card></el-col>
       <el-col :span="6"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`//获取日\nnow.date()`"/>{{now.date()}}</el-card></el-col>
       <el-col :span="6"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`//获取星期\nnow.day()`"/>{{now.day()}}</el-card></el-col>
-      <el-col :span="6"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`//获取小时\nnow.hour()`"/>{{now.hour()}}</el-card></el-col>
-      <el-col :span="6"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`//获取分钟\nnow.minute()`"/>{{now.minute()}}</el-card></el-col>
-      <el-col :span="6"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`//获取秒\nnow.second()`"/>{{now.second()}}</el-card></el-col>
-      <el-col :span="6"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`//获取毫秒\nnow.millisecond()`"/>{{now.millisecond()}}</el-card></el-col>
+      <el-col :span="6"><el-card shadow="never"><d2-highlight slot="header" :code="`//获取小时\nnow.hour()`"/>{{now.hour()}}</el-card></el-col>
+      <el-col :span="6"><el-card shadow="never"><d2-highlight slot="header" :code="`//获取分钟\nnow.minute()`"/>{{now.minute()}}</el-card></el-col>
+      <el-col :span="6"><el-card shadow="never"><d2-highlight slot="header" :code="`//获取秒\nnow.second()`"/>{{now.second()}}</el-card></el-col>
+      <el-col :span="6"><el-card shadow="never"><d2-highlight slot="header" :code="`//获取毫秒\nnow.millisecond()`"/>{{now.millisecond()}}</el-card></el-col>
     </el-row>
     <h1>设置</h1>
     <el-row :gutter="20" class="d2-mt">
-      <el-col :span="8"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`//设置月份\nnow.set('month', 6).month()`"/>{{now.set('month', 6).month()}}</el-card></el-col>
-      <el-col :span="8"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`//设置秒\nnow.set('second', 30).second()`"/>{{now.set('second', 30).second()}}</el-card></el-col>
-      <el-col :span="8"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`//设置小时\nnow.set('hour', 4).hour()`"/>{{now.set('hour', 4).hour()}}</el-card></el-col>
+      <el-col :span="8"><el-card shadow="never"><d2-highlight slot="header" :code="`//设置月份\nnow.set('month', 6).month()`"/>{{now.set('month', 6).month()}}</el-card></el-col>
+      <el-col :span="8"><el-card shadow="never"><d2-highlight slot="header" :code="`//设置秒\nnow.set('second', 30).second()`"/>{{now.set('second', 30).second()}}</el-card></el-col>
+      <el-col :span="8"><el-card shadow="never"><d2-highlight slot="header" :code="`//设置小时\nnow.set('hour', 4).hour()`"/>{{now.set('hour', 4).hour()}}</el-card></el-col>
     </el-row>
     <h1>操作</h1>
     <el-row :gutter="20" class="d2-mt">
       <el-col :span="12"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`//增加\nnow.add(1, 'day').format('YYYY年M月D日 HH:mm:ss')`"/>{{now.add(1, 'day').format('YYYY年M月D日 HH:mm:ss')}}</el-card></el-col>
       <el-col :span="12"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`//减少\nnow.subtract(7, 'year').format('YYYY年M月D日 HH:mm:ss')`"/>{{now.subtract(7, 'year').format('YYYY年M月D日 HH:mm:ss')}}</el-card></el-col>
-      <el-col :span="12"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`//开头时间\nnow.startOf('year').format('YYYY年M月D日 HH:mm:ss')`"/>{{now.startOf('year').format('YYYY年M月D日 HH:mm:ss')}}</el-card></el-col>
-      <el-col :span="12"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`//末尾时间\nnow.endOf('month').format('YYYY年M月D日 HH:mm:ss')`"/>{{now.endOf('month').format('YYYY年M月D日 HH:mm:ss')}}</el-card></el-col>
+      <el-col :span="12"><el-card shadow="never"><d2-highlight slot="header" :code="`//开头时间\nnow.startOf('year').format('YYYY年M月D日 HH:mm:ss')`"/>{{now.startOf('year').format('YYYY年M月D日 HH:mm:ss')}}</el-card></el-col>
+      <el-col :span="12"><el-card shadow="never"><d2-highlight slot="header" :code="`//末尾时间\nnow.endOf('month').format('YYYY年M月D日 HH:mm:ss')`"/>{{now.endOf('month').format('YYYY年M月D日 HH:mm:ss')}}</el-card></el-col>
     </el-row>
     <h1>显示</h1>
     <el-row :gutter="20" class="d2-mt">

From 4e73b6a8ae1ce024bed0d0700f030444aa753beb Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 12 Jun 2018 14:46:06 +0800
Subject: [PATCH 18/20] no message

Former-commit-id: f58840c1101079b689ec6376a6d96942dead56ec
Former-commit-id: c1e5ba6f07491ff8377a007cc683cd666384786d
Former-commit-id: 629df5101526aec60b23ab0d8530460838dbc6ab
Former-commit-id: c748110bbd601fb5d51744f8c0074a55bbd9a0ab
---
 src/pages/demo/plugins/day/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/demo/plugins/day/index.vue b/src/pages/demo/plugins/day/index.vue
index 96afb64a..96b81ad6 100644
--- a/src/pages/demo/plugins/day/index.vue
+++ b/src/pages/demo/plugins/day/index.vue
@@ -3,7 +3,7 @@
     <template slot="header">
       <el-button @click="handleReset">重新设置基础时间 this.now = dayjs()</el-button>
     </template>
-    <h1>当前时间</h1>
+    <h1 class="d2-mt-0">当前时间</h1>
     <el-row :gutter="20" class="d2-mt">
       <el-col :span="8"><el-card shadow="never"><d2-highlight slot="header" :code="`now.format('YYYY年M月D日 HH:mm:ss')`"/>{{now.format('YYYY年M月D日 HH:mm:ss')}}</el-card></el-col>
     </el-row>
@@ -43,7 +43,7 @@
       <el-col :span="12"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`//序列化 Dayjs 对象时会返回 ISO 8601 格式的字符串\nnow.toJSON()`"/>{{now.toJSON()}}</el-card></el-col>
       <el-col :span="12"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`//ISO 8601 字符串\nnow.toISOString()`"/>{{now.toISOString()}}</el-card></el-col>
       <el-col :span="12"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`//字符串\nnow.toString()`"/>{{now.toString()}}</el-card></el-col>
-      <el-col :span="24"><el-card shadow="never" class="d2-mb"><d2-highlight slot="header" :code="`//对象\nnow.toObject()`"/>{{now.toObject()}}</el-card></el-col>
+      <el-col :span="24"><el-card shadow="never"><d2-highlight slot="header" :code="`//对象\nnow.toObject()`"/>{{now.toObject()}}</el-card></el-col>
     </el-row>
     <h1>查询</h1>
     <el-row :gutter="20" class="d2-mt">

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

Former-commit-id: 393b0dcb5b150dba8c885950b4e7ff014694b0a3
Former-commit-id: 474f4843c60b88e4caafcf172c30e47a07efd93b
Former-commit-id: 8c7c236ef02b6ebe012640406ff1dc48e11c6290
Former-commit-id: 2baf360fdad8b6026a87bf379cf48e0e18d06bbb
---
 docs/.vuepress/config.js                 |  3 +-
 docs/zh/plugins/timeago.md               | 49 -----------------
 package.json                             |  1 -
 src/menu/index.js                        |  3 +-
 src/pages/demo/plugins/timeago/index.vue | 70 ------------------------
 src/router/index.js                      |  3 +-
 6 files changed, 3 insertions(+), 126 deletions(-)
 delete mode 100644 docs/zh/plugins/timeago.md
 delete mode 100644 src/pages/demo/plugins/timeago/index.vue

diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js
index 6c579c98..d04bed04 100644
--- a/docs/.vuepress/config.js
+++ b/docs/.vuepress/config.js
@@ -70,8 +70,7 @@ function sideBarPlugins () {
     'data-export',
     'data-import',
     'i18n',
-    'mock',
-    'timeago'
+    'mock'
   ]
 }
 
diff --git a/docs/zh/plugins/timeago.md b/docs/zh/plugins/timeago.md
deleted file mode 100644
index 6f80a927..00000000
--- a/docs/zh/plugins/timeago.md
+++ /dev/null
@@ -1,49 +0,0 @@
-# 时间差计算
-
-``` js
-import timeago from 'timeago.js'
-export default {
-  data () {
-    return {
-      // 打开页面时间
-      openPageDate: new Date(),
-      // 打开页面已经过去的时间
-      openPageDateAgo: '',
-      // 打开页面时间计时器
-      dateTimeRangeTimer: null,
-      // 起止时间
-      dateTimeRange: [new Date(2018, 0, 1, 0, 0), new Date()],
-      // 上面起止时间的计算结果
-      dateTimeRangeAgo: ''
-    }
-  },
-  mounted () {
-    // 刷新打开页面过去的时间
-    this.refreshOpenPageDateAgo()
-    this.dateTimeRangeTimer = setInterval(this.refreshOpenPageDateAgo, 1000)
-    // 刷新起止时间的计算结果
-    this.refreshDateTimeRangeAgo()
-  },
-  beforeDestroy () {
-    // 清空计时器
-    clearInterval(this.dateTimeRangeTimer)
-  },
-  watch: {
-    dateTimeRange () {
-      // 刷新起止时间的计算结果
-      this.refreshDateTimeRangeAgo()
-    }
-  },
-  methods: {
-    // 计算打开页面过了多久
-    refreshOpenPageDateAgo () {
-      this.openPageDateAgo = timeago().format(this.openPageDate, 'zh_CN')
-    },
-    // 计算起止时间间隔
-    refreshDateTimeRangeAgo () {
-      const timeagoInstance = timeago(this.dateTimeRange[1])
-      this.dateTimeRangeAgo = timeagoInstance.format(this.dateTimeRange[0], 'zh_CN')
-    }
-  }
-}
-```
\ No newline at end of file
diff --git a/package.json b/package.json
index a712b59f..380540b8 100755
--- a/package.json
+++ b/package.json
@@ -32,7 +32,6 @@
     "path-posix": "^1.0.0",
     "quill": "^1.3.4",
     "simplemde": "^1.11.2",
-    "timeago.js": "^3.0.2",
     "vue": "^2.5.2",
     "vue-grid-layout": "^2.1.11",
     "vue-i18n": "^7.4.2",
diff --git a/src/menu/index.js b/src/menu/index.js
index 478e7507..c899a097 100644
--- a/src/menu/index.js
+++ b/src/menu/index.js
@@ -41,8 +41,7 @@ const demoPlugins = {
     { path: `${pre}build`, title: '环境区分' },
     { path: `${pre}clipboard-polyfill`, title: '剪贴板访问' },
     { path: `${pre}day`, title: '日期计算' },
-    { path: `${pre}js-cookie`, title: 'Cookie 读写' },
-    { path: `${pre}timeago`, title: '时间差计算' }
+    { path: `${pre}js-cookie`, title: 'Cookie 读写' }
   ])('/demo/plugins/')
 }
 
diff --git a/src/pages/demo/plugins/timeago/index.vue b/src/pages/demo/plugins/timeago/index.vue
deleted file mode 100644
index 2aa51096..00000000
--- a/src/pages/demo/plugins/timeago/index.vue
+++ /dev/null
@@ -1,70 +0,0 @@
-<template>
-  <d2-container type="ghost">
-    <el-card shadow="never" class="d2-mb">
-      <div class="d2-text-center">
-        <h1 style="font-size: 30px;">您在{{openPageDateAgo}}打开的此页面</h1>
-        <p style="font-size: 10px;">请稍等一下 10秒后会开始自动刷新</p>
-      </div>
-    </el-card>
-    <el-card shadow="never">
-      <div class="d2-text-center">
-        <h1 style="font-size: 30px;">{{dateTimeRangeAgo}}</h1>
-        <el-date-picker
-          v-model="dateTimeRange"
-          type="datetimerange"
-          range-separator="至"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期">
-        </el-date-picker>
-      </div>
-    </el-card>
-  </d2-container>
-</template>
-
-<script>
-import timeago from 'timeago.js'
-export default {
-  data () {
-    return {
-      // 打开页面时间
-      openPageDate: new Date(),
-      // 打开页面已经过去的时间
-      openPageDateAgo: '',
-      // 打开页面时间计时器
-      dateTimeRangeTimer: null,
-      // 起止时间
-      dateTimeRange: [new Date(2018, 0, 1, 0, 0), new Date()],
-      // 上面起止时间的计算结果
-      dateTimeRangeAgo: ''
-    }
-  },
-  mounted () {
-    // 刷新打开页面过去的时间
-    this.refreshOpenPageDateAgo()
-    this.dateTimeRangeTimer = setInterval(this.refreshOpenPageDateAgo, 1000)
-    // 刷新起止时间的计算结果
-    this.refreshDateTimeRangeAgo()
-  },
-  beforeDestroy () {
-    // 清空计时器
-    clearInterval(this.dateTimeRangeTimer)
-  },
-  watch: {
-    dateTimeRange () {
-      // 刷新起止时间的计算结果
-      this.refreshDateTimeRangeAgo()
-    }
-  },
-  methods: {
-    // 计算打开页面过了多久
-    refreshOpenPageDateAgo () {
-      this.openPageDateAgo = timeago().format(this.openPageDate, 'zh_CN')
-    },
-    // 计算起止时间间隔
-    refreshDateTimeRangeAgo () {
-      const timeagoInstance = timeago(this.dateTimeRange[1])
-      this.dateTimeRangeAgo = timeagoInstance.format(this.dateTimeRange[0], 'zh_CN')
-    }
-  }
-}
-</script>
diff --git a/src/router/index.js b/src/router/index.js
index 98255759..1672cfce 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -64,8 +64,7 @@ const routes = [
       { path: 'js-cookie', name: `${pre}js-cookie`, component: () => import('@/pages/demo/plugins/js-cookie/index.vue') },
       { path: 'mock/ajax', name: `${pre}mock-ajax`, component: () => import('@/pages/demo/plugins/mock/ajax.vue') },
       { path: 'mock/dpd', name: `${pre}mock-dpd`, component: () => import('@/pages/demo/plugins/mock/dpd.vue') },
-      { path: 'mock/dtd', name: `${pre}mock-dtd`, component: () => import('@/pages/demo/plugins/mock/dtd.vue') },
-      { path: 'timeago', name: `${pre}timeago`, component: () => import('@/pages/demo/plugins/timeago/index.vue') }
+      { path: 'mock/dtd', name: `${pre}mock-dtd`, component: () => import('@/pages/demo/plugins/mock/dtd.vue') }
     ])('demo-plugins-')
   },
   {

From 4e4716ba76484ebcb7b8b937d67b29ef8f02e9ab Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 12 Jun 2018 14:55:16 +0800
Subject: [PATCH 20/20] no message

Former-commit-id: b4c02e0d9a6b63ae319d99265ebac78b0dae8b6d
Former-commit-id: 93e31da0bb4f7780fa6c7690f3f827ce5e844364
Former-commit-id: 26081ed6c2f5cc75b497079b1fa389b3a562495e
Former-commit-id: 9e62ce0b855d8f8ee4a584a325f5863f4f17757f
---
 docs/zh/guide/README.md     | 2 +-
 docs/zh/guide/change-log.md | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/zh/guide/README.md b/docs/zh/guide/README.md
index d71c350e..961128fb 100644
--- a/docs/zh/guide/README.md
+++ b/docs/zh/guide/README.md
@@ -34,7 +34,7 @@ d2admin-vue-element（以下简称 d2admin）是一个管理系统前端模板
 * 图表自适应可拖拽大小的卡片容器（示例）
 * 简化剪贴板操作
 * 简化Cookie操作
-* 时间计算工具
+* 时间日期计算工具
 * 导入 Excel （ xlsx 格式 + CSV 格式 ）
 * 数据导出 Excel （ xlsx 格式 + CSV 格式 ）
 * 数据导出文本
diff --git a/docs/zh/guide/change-log.md b/docs/zh/guide/change-log.md
index 864fd999..f0b14fae 100644
--- a/docs/zh/guide/change-log.md
+++ b/docs/zh/guide/change-log.md
@@ -17,6 +17,7 @@
 * [ 新增 ] 三个主题，分别为 `d2admin 经典`，`简约线条`，`流星`
 * [ 修改 ] `d2-markdown` 组件 `md` 参数改名为 `source`
 * [ 修改 ] 删除了 `d2-markdown` 组件中图片的白色背景
+* [ 修改 ] 删除 `timeago` 插件，更换为更强大的 `dayjs`
 
 ## v1.0.0