From 229be3c546a1fef5019d45d8b5cd8ab382849267 Mon Sep 17 00:00:00 2001
From: han_feng <han_feng@foxmail.com>
Date: Thu, 15 Nov 2018 11:30:26 +0800
Subject: [PATCH 01/23] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=B8=A6=E5=8F=82?=
 =?UTF-8?q?=E8=B7=AF=E7=94=B1=E7=BC=93=E5=AD=98=E6=A1=88=E4=BE=8B=EF=BC=8C?=
 =?UTF-8?q?=E9=A1=BA=E4=BE=BF=E8=A7=A3=E5=86=B3=20issues=20#133?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 539ba541e07a43a03b22a16bec8b680ce6011d61 [formerly 539ba541e07a43a03b22a16bec8b680ce6011d61 [formerly 539ba541e07a43a03b22a16bec8b680ce6011d61 [formerly 539ba541e07a43a03b22a16bec8b680ce6011d61 [formerly 26a4e88c8572d7b498fea2791fb9dc428a93d8d3 [formerly 1407c6c3eadde6eb7e539898d13282bf5ec520dc]]]]]
Former-commit-id: 46a26343895210835e3d6c0afc5e046e973054f9
Former-commit-id: b281a46d9e588702e651751d175f876f8e5c0cec
Former-commit-id: 9b9466a5d46d2908a74a0730237f965bec36cad5 [formerly 908c29cced36962c1ae58d0194fa5d96b18b36de]
Former-commit-id: 52f5fe7e02ae4f3421c6aa1ac6bb70369e69855a
Former-commit-id: 7e7de54f344d5178c5083b456eadf6f34b3ceafe
Former-commit-id: 98c5518762f16cc81feb63c7dd700f3b9fced766
Former-commit-id: 1cccd8fcd156848ca8fa8edfa9ae522cce786882
Former-commit-id: 57fb744f0537412125f9eaa360b81e9bae575a43
---
 .../header-aside/components/tabs/index.vue    |  4 +--
 .../demo/playground/page-cache/params.vue     | 26 +++++++++++++++----
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/layout/header-aside/components/tabs/index.vue b/src/layout/header-aside/components/tabs/index.vue
index 45b4e029..39f9f63b 100644
--- a/src/layout/header-aside/components/tabs/index.vue
+++ b/src/layout/header-aside/components/tabs/index.vue
@@ -19,8 +19,8 @@
           @edit="handleTabsEdit"
           @contextmenu.native="handleContextmenu">
           <el-tab-pane
-            v-for="(page, index) in opened"
-            :key="index"
+            v-for="page in opened"
+            :key="page.fullPath"
             :label="page.meta.title || '未命名'"
             :name="page.fullPath"/>
         </el-tabs>
diff --git a/src/pages/demo/playground/page-cache/params.vue b/src/pages/demo/playground/page-cache/params.vue
index 7ce777ba..8a512920 100644
--- a/src/pages/demo/playground/page-cache/params.vue
+++ b/src/pages/demo/playground/page-cache/params.vue
@@ -3,19 +3,35 @@
     <template slot="header">这个页面会被 keep-alive</template>
     <h2 class="d2-mt-0">编号：{{id}}</h2>
     <p class="d2-mt-0">在下面的输入框输入任意字符后，切换到其它页面，再回到此页时输入框文字保留，证明被缓存</p>
-    <el-input v-model="value" placeholder="input here"></el-input>
+    <!-- 使用 el-input 会出现显示值与 v-model 不一致的情况，解决问题前暂时使用 input -->
+    <input v-model="data.value" placeholder="input here" />
   </d2-container>
 </template>
 
 <script>
+const datas = {}
+
 export default {
   name: 'demo-playground-page-cache-params',
   props: {
-    id: String
+    id: {
+      type: String,
+      required: true
+    }
   },
-  data () {
-    return {
-      value: ''
+  computed: {
+    /**
+     * 带参路由多组参数使用同一个组件实例，需要在组件内部对多个参数的情况进行统一处理
+     * 这里简单演示如何根据 id 管理多组数据对象
+     */
+    data: function () {
+      const id = this.id
+      let data = datas[id]
+      if (!data) {
+        data = { value: '' }
+        datas[id] = data
+      }
+      return data
     }
   }
 }

From e471cccad2a9e58255d21b9df40c9047af3eac18 Mon Sep 17 00:00:00 2001
From: han_feng <han_feng@foxmail.com>
Date: Thu, 15 Nov 2018 11:44:26 +0800
Subject: [PATCH 02/23] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=9B=A0=E5=BD=93?=
 =?UTF-8?q?=E5=89=8Dtheme=E6=94=B9=E5=90=8D=E6=88=96=E8=A2=AB=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E5=AF=BC=E8=87=B4=E6=8C=81=E4=B9=85=E5=8C=96=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=8A=A0=E8=BD=BD=E5=BC=82=E5=B8=B8=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 625d8496dfae1a9c333570366984895175077acf [formerly 916001d3e57fa400864f4689ddc7373d07e4b545] [formerly 625d8496dfae1a9c333570366984895175077acf [formerly 916001d3e57fa400864f4689ddc7373d07e4b545] [formerly 625d8496dfae1a9c333570366984895175077acf [formerly 916001d3e57fa400864f4689ddc7373d07e4b545] [formerly 916001d3e57fa400864f4689ddc7373d07e4b545 [formerly 5a149d2414f743b3558dbb66eab0d9831bf676ee [formerly 626d4fc39f13c3b8cbe3088850eafc0f00c77b95]]]]]
Former-commit-id: 6f211854865cc0119d4105dd27136656e1428f6b
Former-commit-id: 1b643c97bc4a1c63e0f840693c659a70a357506c
Former-commit-id: c685693f0f72dc96bb3b1c19e637966a27211cf9 [formerly 44d490a3ed57ecaf6570a3b44373c1408244e374]
Former-commit-id: 3726d62671a67f821582e3327dce966b67be1584
Former-commit-id: 021b55854c39dab55da4f9d2d630c631b6dbef3c
Former-commit-id: 131996f42d6a8838c0161148670985c8e714c7f0
Former-commit-id: 2ee66f826cc63a182b1307d882a15d03bd135afd
Former-commit-id: 230f5dbe791bc3485049ab8980bcfb33e4768f0b
---
 src/store/modules/d2admin/modules/theme.js | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/store/modules/d2admin/modules/theme.js b/src/store/modules/d2admin/modules/theme.js
index c2460310..ae653514 100644
--- a/src/store/modules/d2admin/modules/theme.js
+++ b/src/store/modules/d2admin/modules/theme.js
@@ -48,12 +48,25 @@ export default {
     load ({ state, commit, dispatch }) {
       return new Promise(async resolve => {
         // store 赋值
-        state.activeName = await dispatch('d2admin/db/get', {
+        let activeName = await dispatch('d2admin/db/get', {
           dbName: 'sys',
           path: 'theme.activeName',
           defaultValue: state.list[0].name,
           user: true
         }, { root: true })
+        // 检查这个主题在主题列表里是否存在
+        if (state.list.find(e => e.name === activeName)) {
+          state.activeName = activeName
+        } else {
+          state.activeName = state.list[0].name
+          // 持久化
+          await dispatch('d2admin/db/set', {
+            dbName: 'sys',
+            path: 'theme.activeName',
+            value: state.activeName,
+            user: true
+          }, { root: true })
+        }
         // 将 vuex 中的主题应用到 dom
         commit('dom')
         // end

From 8379102b405addf149a10a6a9aac79a151c4b871 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Thu, 8 Nov 2018 09:35:31 +0800
Subject: [PATCH 03/23] =?UTF-8?q?=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: a691bed1d3831eff972236144a57b6b9cba32f1d [formerly a691bed1d3831eff972236144a57b6b9cba32f1d [formerly a691bed1d3831eff972236144a57b6b9cba32f1d [formerly a691bed1d3831eff972236144a57b6b9cba32f1d [formerly 5e41ab23bd0ceef291a36c9ef8fde5a7aa4278ad [formerly 841fabfa756d397bd6258cd648970c754e0dca3c]]]]]
Former-commit-id: 13233ef25e853383f1cf1a1437faf079f5f333ff
Former-commit-id: e90f61299f0acee023daa0021b301e6e26e35a67
Former-commit-id: 78275758a8c367652dbd950bdf54b98fdd9d4abf [formerly c8926288ba8a113e1066991d2a26326db69e1586]
Former-commit-id: 645448b80ba2f67dc1d8a2cb18054c501508bc6f
Former-commit-id: 869f9d8698c412fdedeb8e388942cd00c5f0c7bc
Former-commit-id: 89a9c4e1d39c99220284f6516c6f5491cd54212d
Former-commit-id: c68a320534e9b90ea4c6f12c5489bb2c86105973
Former-commit-id: 79576a305f61a7330298b452744bbc3c5b985c51
---
 .../components/d2-container-full.vue          | 10 +++++--
 .../components/mixins/scroll.normal.js        | 26 +++++++++++++++++++
 2 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 src/components/d2-container/components/mixins/scroll.normal.js

diff --git a/src/components/d2-container/components/d2-container-full.vue b/src/components/d2-container/components/d2-container-full.vue
index e789a244..bc66cc79 100644
--- a/src/components/d2-container/components/d2-container-full.vue
+++ b/src/components/d2-container/components/d2-container-full.vue
@@ -3,7 +3,7 @@
     <div v-if="$slots.header" class="d2-container-full__header" ref="header">
       <slot name="header"/>
     </div>
-    <div class="d2-container-full__body">
+    <div class="d2-container-full__body" ref="body">
       <slot/>
     </div>
     <div v-if="$slots.footer" class="d2-container-full__footer" ref="footer">
@@ -13,7 +13,13 @@
 </template>
 
 <script>
+import scroll from './mixins/scroll.normal'
 export default {
-  name: 'd2-container-full'
+  name: 'd2-container-full',
+  mixins: [
+    scroll({
+      ref: 'body'
+    })
+  ]
 }
 </script>
diff --git a/src/components/d2-container/components/mixins/scroll.normal.js b/src/components/d2-container/components/mixins/scroll.normal.js
new file mode 100644
index 00000000..34e800d6
--- /dev/null
+++ b/src/components/d2-container/components/mixins/scroll.normal.js
@@ -0,0 +1,26 @@
+// 提供滚动方面的功能
+// 非滚动优化模式通用
+
+import { throttle } from 'lodash'
+
+/**
+ * 根据配置输出 mixin 设置
+ * @param {String} ref 滚动容器 ref 名称
+ */
+export default function ({ ref }) {
+  return {
+    data () {
+      return {
+        throttledHandleScroll: throttle(() => {
+          console.log(this.$refs[ref].scrollTop)
+        }, 300)
+      }
+    },
+    mounted () {
+      this.$refs[ref].addEventListener('scroll', this.throttledHandleScroll)
+    },
+    beforeDestroy () {
+      this.$refs[ref].removeEventListener('scroll', this.throttledHandleScroll)
+    }
+  }
+}

From 7cd729772360803c71cd680b08a612d5020705ab Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Thu, 8 Nov 2018 23:08:07 +0800
Subject: [PATCH 04/23] =?UTF-8?q?=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 1ada65d8ae7f042e9fb184148e21b8ecdfc940e1 [formerly 1ada65d8ae7f042e9fb184148e21b8ecdfc940e1 [formerly 1ada65d8ae7f042e9fb184148e21b8ecdfc940e1 [formerly 1ada65d8ae7f042e9fb184148e21b8ecdfc940e1 [formerly 3b2fffc792fa182bbfd7f639f75935ee95000ebc [formerly d9516320f8cf3e50148bb1e44171e656f9dc0a4a]]]]]
Former-commit-id: 6bdc2ca75847c570d857c46164c707a2290bf1fb
Former-commit-id: 7dfb5a24d74fba2e52aee345cadb43bbba884819
Former-commit-id: 7925a7906733ee3aad78c370bd7ecc3b193d3648 [formerly dd2fdf6fee672dba3c00db857902e2b17b8a4853]
Former-commit-id: 6db2895d3e7239333ccdb55844423e48cb34f29a
Former-commit-id: f576d9ebe24fc8e9613511ed1b86c942e56bc167
Former-commit-id: 9c070d963ad7ded364a6c1cce264076c1aa4b550
Former-commit-id: 099433557a963bfe1647a807e8d129e200281e01
Former-commit-id: 063ae4244f815db3de163f6aa61a57015fb0f181
---
 .../components/d2-container-full.vue          | 14 ++-
 .../components/mixins/scroll.normal.js        | 56 +++++++----
 src/components/d2-container/index.vue         |  6 +-
 src/menu/modules/demo-components.js           |  3 +-
 src/pages/demo/components/container/api.vue   | 96 +++++++++++++++++++
 .../container/components/d2-demo-article.vue  | 45 +++++----
 src/router/modules/components.js              |  1 +
 7 files changed, 181 insertions(+), 40 deletions(-)
 create mode 100644 src/pages/demo/components/container/api.vue

diff --git a/src/components/d2-container/components/d2-container-full.vue b/src/components/d2-container/components/d2-container-full.vue
index bc66cc79..0c8a719a 100644
--- a/src/components/d2-container/components/d2-container-full.vue
+++ b/src/components/d2-container/components/d2-container-full.vue
@@ -17,9 +17,15 @@ import scroll from './mixins/scroll.normal'
 export default {
   name: 'd2-container-full',
   mixins: [
-    scroll({
-      ref: 'body'
-    })
-  ]
+    scroll
+  ],
+  mounted () {
+    // 增加滚动事件监听
+    this.addScrollListener()
+  },
+  beforeDestroy () {
+    // 移除滚动事件监听
+    this.removeScrollListener()
+  }
 }
 </script>
diff --git a/src/components/d2-container/components/mixins/scroll.normal.js b/src/components/d2-container/components/mixins/scroll.normal.js
index 34e800d6..f057628b 100644
--- a/src/components/d2-container/components/mixins/scroll.normal.js
+++ b/src/components/d2-container/components/mixins/scroll.normal.js
@@ -3,24 +3,48 @@
 
 import { throttle } from 'lodash'
 
-/**
- * 根据配置输出 mixin 设置
- * @param {String} ref 滚动容器 ref 名称
- */
-export default function ({ ref }) {
-  return {
-    data () {
-      return {
-        throttledHandleScroll: throttle(() => {
-          console.log(this.$refs[ref].scrollTop)
-        }, 300)
+// 生成滚动事件的 handler
+function handleMaker (wait) {
+  return throttle(e => this.$emit('scroll', e), wait)
+}
+
+export default {
+  props: {
+    // 滚动事件节流间隔
+    scrollDelay: {
+      type: Number,
+      required: false,
+      default: 100
+    }
+  },
+  data () {
+    return {
+      handleScroll: null
+    }
+  },
+  watch: {
+    scrollDelay (val) {
+      // 移除旧的监听
+      this.removeScrollListener()
+      // 生成新的 handle 方法
+      this.handleScroll = handleMaker.call(this, val)
+      // 添加新的监听
+      this.addScrollListener()
+    }
+  },
+  methods: {
+    // 增加滚动事件监听
+    addScrollListener () {
+      if (typeof this.handleScroll !== 'function') {
+        // mounted 生命周期内调用这个方法的时候会进入这里的判断
+        this.handleScroll = handleMaker.call(this, this.scrollDelay)
       }
+      // 添加监听
+      this.$refs.body.addEventListener('scroll', this.handleScroll)
     },
-    mounted () {
-      this.$refs[ref].addEventListener('scroll', this.throttledHandleScroll)
-    },
-    beforeDestroy () {
-      this.$refs[ref].removeEventListener('scroll', this.throttledHandleScroll)
+    // 移除滚动事件监听
+    removeScrollListener () {
+      this.$refs.body.removeEventListener('scroll', this.handleScroll)
     }
   }
 }
diff --git a/src/components/d2-container/index.vue b/src/components/d2-container/index.vue
index 17dbbebc..d975ce03 100644
--- a/src/components/d2-container/index.vue
+++ b/src/components/d2-container/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="container-component" ref="container">
     <!-- [card] 卡片容器 -->
-    <d2-container-card v-if="type === 'card' && !betterScroll">
+    <d2-container-card v-bind="$attrs" v-if="type === 'card' && !betterScroll" @scroll="e => this.$emit('scroll', e)">
       <slot v-if="$slots.header" name="header" slot="header"/>
       <slot/>
       <slot v-if="$slots.footer" name="footer" slot="footer"/>
@@ -13,7 +13,7 @@
       <slot v-if="$slots.footer" name="footer" slot="footer"/>
     </d2-container-card-bs>
     <!-- [ghost] 隐形容器 -->
-    <d2-container-ghost v-if="type === 'ghost' && !betterScroll">
+    <d2-container-ghost v-bind="$attrs" v-if="type === 'ghost' && !betterScroll" @scroll="e => this.$emit('scroll', e)">
       <slot v-if="$slots.header" name="header" slot="header"/>
       <slot/>
       <slot v-if="$slots.footer" name="footer" slot="footer"/>
@@ -25,7 +25,7 @@
       <slot v-if="$slots.footer" name="footer" slot="footer"/>
     </d2-container-ghost-bs>
     <!-- [container-full] 填充 -->
-    <d2-container-full v-if="type === 'full' && !betterScroll">
+    <d2-container-full v-bind="$attrs" v-if="type === 'full' && !betterScroll" @scroll="e => this.$emit('scroll', e)">
       <slot v-if="$slots.header" name="header" slot="header"/>
       <slot/>
       <slot v-if="$slots.footer" name="footer" slot="footer"/>
diff --git a/src/menu/modules/demo-components.js b/src/menu/modules/demo-components.js
index 92947599..8a5892af 100644
--- a/src/menu/modules/demo-components.js
+++ b/src/menu/modules/demo-components.js
@@ -17,7 +17,8 @@ export default {
         { path: `${pre}container/ghost-bs`, title: '隐形 滚动优化' },
         { path: `${pre}container/card`, title: '卡片' },
         { path: `${pre}container/card-slot`, title: '卡片 插槽' },
-        { path: `${pre}container/card-bs`, title: '卡片 滚动优化' }
+        { path: `${pre}container/card-bs`, title: '卡片 滚动优化' },
+        { path: `${pre}container/api`, title: 'API' }
       ]
     },
     {
diff --git a/src/pages/demo/components/container/api.vue b/src/pages/demo/components/container/api.vue
new file mode 100644
index 00000000..5e59ec01
--- /dev/null
+++ b/src/pages/demo/components/container/api.vue
@@ -0,0 +1,96 @@
+<template>
+  <d2-container
+    ref="container"
+    :scroll-delay="scrollDelay"
+    @scroll="handleScroll">
+    <template slot="header">
+      <el-form
+        :inline="true"
+        size="mini">
+        <el-form-item
+          label="scrollTop"
+          class="d2-mb-0">
+          <el-input
+            :value="scrollTop"
+            style="width: 110px;">
+            <template slot="append">px</template>
+          </el-input>
+        </el-form-item>
+        <el-form-item
+          label="scrollDelay"
+          class="d2-mb-0">
+          <el-input-number
+            v-model="scrollDelay"
+            :min="100"
+            :max="2000"
+            :step="100"
+            style="width: 110px;"/>
+        </el-form-item>
+        <el-form-item class="d2-mb-0">
+          <el-button
+            v-if="scrollTop >= 55"
+            type="primary"
+            @click="handleTop">
+            回到顶部
+          </el-button>
+        </el-form-item>
+      </el-form>
+    </template>
+    <el-alert type="success" title="请向下滚动" center class="d2-mb-10"/>
+    <d2-demo-article
+      long
+      :style="articleStyle"/>
+    <template slot="footer">
+      <el-form
+        :inline="true"
+        size="mini">
+        <el-form-item class="d2-mb-0">
+          <el-button @click="handleScrollBy">相对滚动 (0, 30) 像素</el-button>
+        </el-form-item>
+        <el-form-item class="d2-mb-0">
+          <el-button @click="handleScrollTo">滚动到 (0, 100) 像素位置</el-button>
+        </el-form-item>
+        <el-form-item class="d2-mb-0">
+          <el-button @click="handleScrollTop">滚动到垂直位置 100</el-button>
+        </el-form-item>
+      </el-form>
+    </template>
+  </d2-container>
+</template>
+
+<script>
+import d2DemoArticle from './components/d2-demo-article'
+export default {
+  components: {
+    'd2-demo-article': d2DemoArticle
+  },
+  data () {
+    return {
+      scrollDelay: 100,
+      scrollTop: 0
+    }
+  },
+  computed: {
+    articleStyle () {
+      return {
+        opacity: this.scrollTop > 55 ? '1' : '.1'
+      }
+    }
+  },
+  methods: {
+    handleScroll (e) {
+      this.scrollTop = e.target.scrollTop
+    },
+    handleTop () {},
+    handleScrollBy () {
+      this.$refs.container.$children[0].$refs.body.scrollBy(0, 30)
+    },
+    handleScrollTo () {
+      this.$refs.container.$children[0].$refs.body.scrollTo(0, 100)
+    },
+    handleScrollTop () {
+      this.$refs.container.$children[0].$refs.body.scrollTop = 100
+    }
+  }
+}
+</script>
diff --git a/src/pages/demo/components/container/components/d2-demo-article.vue b/src/pages/demo/components/container/components/d2-demo-article.vue
index 45a0ed6e..00dc1b43 100644
--- a/src/pages/demo/components/container/components/d2-demo-article.vue
+++ b/src/pages/demo/components/container/components/d2-demo-article.vue
@@ -1,37 +1,50 @@
 <template>
-  <div>
-    <div class="d2-demo-article-control">
+  <div class="d2-demo-article">
+    <div v-if="!long" class="d2-demo-article__control">
       <el-switch
         v-model="isLong"
         active-text="长内容"
-        inactive-text="短内容">
-      </el-switch>
+        inactive-text="短内容"/>
     </div>
-    <d2-markdown v-show="isLong" :source="long"/>
-    <d2-markdown v-show="!isLong" :source="short"/>
+    <d2-markdown v-show="isLong" :source="sourceLong"/>
+    <d2-markdown v-show="!isLong" :source="sourceShort"/>
   </div>
 </template>
 
 <script>
-import long from '../md/long.md'
-import short from '../md/short.md'
+import sourceLong from '../md/long.md'
+import sourceShort from '../md/short.md'
 export default {
+  props: {
+    // 指定为长文本
+    long: {
+      type: Boolean,
+      required: false,
+      default: false
+    }
+  },
   data () {
     return {
-      long,
-      short,
+      sourceLong,
+      sourceShort,
       isLong: false
     }
+  },
+  created () {
+    this.isLong = this.long
   }
 }
 </script>
 
 <style lang="scss" scoped>
-.d2-demo-article-control {
-  padding: 8px 16px;
-  margin-bottom: 10px;
-  box-sizing: border-box;
-  border-radius: 4px;
-  background-color: #f4f4f5;
+.d2-demo-article {
+  transition: opacity .3s;
+  .d2-demo-article__control {
+    padding: 8px 16px;
+    margin-bottom: 10px;
+    box-sizing: border-box;
+    border-radius: 4px;
+    background-color: #f4f4f5;
+  }
 }
 </style>
diff --git a/src/router/modules/components.js b/src/router/modules/components.js
index 249364d0..3944410f 100644
--- a/src/router/modules/components.js
+++ b/src/router/modules/components.js
@@ -18,6 +18,7 @@ export default {
     { path: 'container/card', name: `${pre}container-card`, component: () => import('@/pages/demo/components/container/card.vue'), meta: { ...meta, title: '布局组件 卡片' } },
     { path: 'container/card-slot', name: `${pre}container-card-slot`, component: () => import('@/pages/demo/components/container/card-slot.vue'), meta: { ...meta, title: '布局组件 卡片 插槽' } },
     { path: 'container/card-bs', name: `${pre}container-card-bs`, component: () => import('@/pages/demo/components/container/card-bs.vue'), meta: { ...meta, title: '布局组件 卡片 滚动优化' } },
+    { path: 'container/api', name: `${pre}container-api`, component: () => import('@/pages/demo/components/container/api.vue'), meta: { ...meta, title: '布局组件 API' } },
     { path: 'contextmenu/simple', name: `${pre}contextmenu-simple`, component: () => import('@/pages/demo/components/contextmenu/simple.vue'), meta: { ...meta, title: '右键菜单 基础' } },
     { path: 'contextmenu/divier', name: `${pre}contextmenu-divier`, component: () => import('@/pages/demo/components/contextmenu/divier.vue'), meta: { ...meta, title: '右键菜单 分割线' } },
     { path: 'contextmenu/group', name: `${pre}contextmenu-group`, component: () => import('@/pages/demo/components/contextmenu/group.vue'), meta: { ...meta, title: '右键菜单 分组' } },

From 140473185802410c235f3aa2da68582334972b2f Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sat, 10 Nov 2018 22:04:24 +0800
Subject: [PATCH 05/23] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: b0a0b359d1f968ebfc9054a1ef2840dac3b57603 [formerly b0a0b359d1f968ebfc9054a1ef2840dac3b57603 [formerly b0a0b359d1f968ebfc9054a1ef2840dac3b57603 [formerly b0a0b359d1f968ebfc9054a1ef2840dac3b57603 [formerly 9787d4ef6d134402a5819b1429436474c525b82c [formerly a63eebb01b2486f313b3895987348f5ce688fc09]]]]]
Former-commit-id: 76fb079f581233dfff79b2ed37db34b04caa1138
Former-commit-id: 90cd89cb0fa8175e46704cce8299f0f8746cd6d1
Former-commit-id: 9f339e27dbfe17bd13fcb7310036131968fae9a0 [formerly 91df636552140ac0c455910f6569e029f6098f0b]
Former-commit-id: 27a4a6fb95246132725da85ea08d1bb836284cb7
Former-commit-id: f820298ec8857f3e2f4f059c8115ff6052010cb9
Former-commit-id: 0051c32707f5a0afb59a245c3717f1c5aea4eb80
Former-commit-id: 823b368e67235104765f36f5ca420f6b2b8faade
Former-commit-id: 9126a95cc0f0d0c07faffe773d1335a74ba62e6b
---
 src/menu/modules/demo-components.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/menu/modules/demo-components.js b/src/menu/modules/demo-components.js
index 8a5892af..a1835dc6 100644
--- a/src/menu/modules/demo-components.js
+++ b/src/menu/modules/demo-components.js
@@ -9,6 +9,7 @@ export default {
       title: '布局容器',
       icon: 'window-restore',
       children: [
+        { path: `${pre}container/api`, title: 'API' },
         { path: `${pre}container/full`, title: '填充' },
         { path: `${pre}container/full-slot`, title: '填充 插槽' },
         { path: `${pre}container/full-bs`, title: '填充 滚动优化' },
@@ -17,8 +18,7 @@ export default {
         { path: `${pre}container/ghost-bs`, title: '隐形 滚动优化' },
         { path: `${pre}container/card`, title: '卡片' },
         { path: `${pre}container/card-slot`, title: '卡片 插槽' },
-        { path: `${pre}container/card-bs`, title: '卡片 滚动优化' },
-        { path: `${pre}container/api`, title: 'API' }
+        { path: `${pre}container/card-bs`, title: '卡片 滚动优化' }
       ]
     },
     {

From a7a2deac69fa17ef4da9a19f25bf6bb4ef0ae6ea Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sat, 10 Nov 2018 23:11:01 +0800
Subject: [PATCH 06/23] =?UTF-8?q?=E5=B0=86=E6=BB=9A=E5=8A=A8=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E7=9B=B8=E5=85=B3=E7=9A=84=E5=8F=82=E6=95=B0=E5=86=99?=
 =?UTF-8?q?=E5=9C=A8=E4=B8=80=E5=A4=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 8a4af547cc41c73627b1d1afb0c3fb5d03abcf79 [formerly 8a4af547cc41c73627b1d1afb0c3fb5d03abcf79 [formerly 8a4af547cc41c73627b1d1afb0c3fb5d03abcf79 [formerly 8a4af547cc41c73627b1d1afb0c3fb5d03abcf79 [formerly a61bfaa5a9d0c07e348620940c7ca7ec18c60236 [formerly cdbeee7f3d70d6c62310c4167750764870ee2c8e]]]]]
Former-commit-id: fa5b732c526004e736253476f361bb45a3484eec
Former-commit-id: 183e72233dc07dc53004091455d1b049cc340962
Former-commit-id: f79bca19dcc5e76885de61f3dab85b2108218790 [formerly 17c9d406a4706c06f892048f65c32ed63da34358]
Former-commit-id: f77a5479339bf8e692c514c44a28866eee5fde58
Former-commit-id: 47c2829c424bdb7acd855894a069e9984509a9a3
Former-commit-id: 7aef56955b4adb405513cf259ed88b261daa3959
Former-commit-id: 057b1bf2c31cf54b706d3d8a459cf834de44e46e
Former-commit-id: 59f17831e802f6a85a4aaf56ade151334e2ba0aa
---
 src/components/d2-container/components/mixins/bs.js | 7 +++++++
 src/components/d2-container/index.vue               | 6 ------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/components/d2-container/components/mixins/bs.js b/src/components/d2-container/components/mixins/bs.js
index 707c21ac..7d57c33e 100644
--- a/src/components/d2-container/components/mixins/bs.js
+++ b/src/components/d2-container/components/mixins/bs.js
@@ -1,6 +1,13 @@
 import BScroll from 'better-scroll'
 export default {
   props: {
+    // 滚动优化
+    betterScroll: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
+    // 滚动优化的选项
     betterScrollOptions: {
       type: Object,
       required: false,
diff --git a/src/components/d2-container/index.vue b/src/components/d2-container/index.vue
index d975ce03..425b5275 100644
--- a/src/components/d2-container/index.vue
+++ b/src/components/d2-container/index.vue
@@ -63,12 +63,6 @@ export default {
       type: String,
       required: false,
       default: 'full'
-    },
-    // 滚动优化
-    betterScroll: {
-      type: Boolean,
-      required: false,
-      default: false
     }
   }
 }

From c5b6f90681f35032a4e7e4083b959646ca0d42d9 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 11 Nov 2018 21:20:27 +0800
Subject: [PATCH 07/23] no message

Former-commit-id: 040614c2dda93964fc6d010f370fd9e397095fe3 [formerly 040614c2dda93964fc6d010f370fd9e397095fe3 [formerly 040614c2dda93964fc6d010f370fd9e397095fe3 [formerly 040614c2dda93964fc6d010f370fd9e397095fe3 [formerly 3b4891771d005aa23f093264fc027b1895a48989 [formerly 620d59dababe75abb8633f5af97cc374e79ad3b7]]]]]
Former-commit-id: 1313562edf3e3222c8ad31ee07bdcb5055bbcd17
Former-commit-id: e07df33f25e9f45462c5dc7063af91679861a186
Former-commit-id: 63e04aabda4d395c3d1494b4f8a0c970d68cd52d [formerly 95b22ff8bbedb278371141b158f394d9bc815897]
Former-commit-id: af89333a769f5237c523abf8dd4f7ad1062378e8
Former-commit-id: c2b89694631004ce86ef14e4e16ac09ae185b15d
Former-commit-id: e754a4651647b8f7e9fc498b0051f4c021f56a00
Former-commit-id: 8ad130f247cd96c0a65683736764586a550cefe6
Former-commit-id: 541a8b4649a9adfe5b68f84f7b38d39eee0c29e5
---
 README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/README.md b/README.md
index 00f31447..b3a7cd8f 100644
--- a/README.md
+++ b/README.md
@@ -130,8 +130,6 @@
 
 D2Admin 是完全开源免费的项目，旨在帮助开发者更方便地进行管理系统开发，同时也提供 2000 人的 QQ 交流群和微信群，前后端的朋友可以相互答疑，项目组成员全部在内，所有 D2 相关项目使用问题欢迎在群内提问。
 
-> 隐性福利：重要通知会发群红包
-
 ![join](https://raw.githubusercontent.com/FairyEver/d2-admin/master/doc/image/join@2x.png)
 
 ## License

From 1f95a509b4b63bbf77ae442fc4d7595d72698736 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Wed, 14 Nov 2018 10:25:38 +0800
Subject: [PATCH 08/23] =?UTF-8?q?=E6=94=B9render=E5=87=BD=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 8cfcd3419c9b44e3edeb067671e3a0749d0f12ac [formerly 8cfcd3419c9b44e3edeb067671e3a0749d0f12ac [formerly 8cfcd3419c9b44e3edeb067671e3a0749d0f12ac [formerly 8cfcd3419c9b44e3edeb067671e3a0749d0f12ac [formerly 356bf94f5b44639d7234152de4ef3bcc661c8c1e [formerly 77a8e78b328f3bf242836af112ee9a44ee6da70a]]]]]
Former-commit-id: bb21dd6f8094541e6327de7d0b2a4f7aa8e9bd86
Former-commit-id: 64e39323bb4dff4094351421bf4276a7c6ef2dff
Former-commit-id: 8a99e9722e048ae344ea945e9370d92b4fa79f67 [formerly ef6332b0ef63c44e6497abb5a543c793e4f32671]
Former-commit-id: f1bf22bb6937aa327c1669fb085e33d58724ec76
Former-commit-id: 1d17a9877444121a766c4a18e15478c8763971d9
Former-commit-id: f65356f950b93b6322964aa69bdc4201368041e9
Former-commit-id: 52ee7737fbae59a6d259f8230c1f0a735981633f
Former-commit-id: 1acd5a9f5a29173099da32ae47f5357bb7313e5e
---
 src/components/d2-container/index.vue | 89 ++++++++++++---------------
 1 file changed, 40 insertions(+), 49 deletions(-)

diff --git a/src/components/d2-container/index.vue b/src/components/d2-container/index.vue
index 425b5275..b72e29cc 100644
--- a/src/components/d2-container/index.vue
+++ b/src/components/d2-container/index.vue
@@ -1,44 +1,3 @@
-<template>
-  <div class="container-component" ref="container">
-    <!-- [card] 卡片容器 -->
-    <d2-container-card v-bind="$attrs" v-if="type === 'card' && !betterScroll" @scroll="e => this.$emit('scroll', e)">
-      <slot v-if="$slots.header" name="header" slot="header"/>
-      <slot/>
-      <slot v-if="$slots.footer" name="footer" slot="footer"/>
-    </d2-container-card>
-    <!-- [card] 卡片容器 滚动优化 -->
-    <d2-container-card-bs v-bind="$attrs" v-if="type === 'card' && betterScroll">
-      <slot v-if="$slots.header" name="header" slot="header"/>
-      <slot/>
-      <slot v-if="$slots.footer" name="footer" slot="footer"/>
-    </d2-container-card-bs>
-    <!-- [ghost] 隐形容器 -->
-    <d2-container-ghost v-bind="$attrs" v-if="type === 'ghost' && !betterScroll" @scroll="e => this.$emit('scroll', e)">
-      <slot v-if="$slots.header" name="header" slot="header"/>
-      <slot/>
-      <slot v-if="$slots.footer" name="footer" slot="footer"/>
-    </d2-container-ghost>
-    <!-- [ghost] 隐形容器 滚动优化 -->
-    <d2-container-ghost-bs v-bind="$attrs" v-if="type === 'ghost' && betterScroll">
-      <slot v-if="$slots.header" name="header" slot="header"/>
-      <slot/>
-      <slot v-if="$slots.footer" name="footer" slot="footer"/>
-    </d2-container-ghost-bs>
-    <!-- [container-full] 填充 -->
-    <d2-container-full v-bind="$attrs" v-if="type === 'full' && !betterScroll" @scroll="e => this.$emit('scroll', e)">
-      <slot v-if="$slots.header" name="header" slot="header"/>
-      <slot/>
-      <slot v-if="$slots.footer" name="footer" slot="footer"/>
-    </d2-container-full>
-    <!-- [container-full-bs] 填充 滚动优化 -->
-    <d2-container-full-bs v-bind="$attrs" v-if="type === 'full' && betterScroll">
-      <slot v-if="$slots.header" name="header" slot="header"/>
-      <slot/>
-      <slot v-if="$slots.footer" name="footer" slot="footer"/>
-    </d2-container-full-bs>
-  </div>
-</template>
-
 <script>
 // 组件
 import d2ContainerFull from './components/d2-container-full.vue'
@@ -49,21 +8,53 @@ import d2ContainerCard from './components/d2-container-card.vue'
 import d2ContainerCardBs from './components/d2-container-card-bs.vue'
 export default {
   name: 'd2-container',
-  components: {
-    'd2-container-full': d2ContainerFull,
-    'd2-container-full-bs': d2ContainerFullBs,
-    'd2-container-ghost': d2ContainerGhost,
-    'd2-container-ghost-bs': d2ContainerGhostBs,
-    'd2-container-card': d2ContainerCard,
-    'd2-container-card-bs': d2ContainerCardBs
-  },
   props: {
     // 容器样式
     type: {
       type: String,
       required: false,
       default: 'full'
+    },
+    // 滚动优化
+    betterScroll: {
+      type: Boolean,
+      required: false,
+      default: false
     }
+  },
+  computed: {
+    // 始终返回渲染组件
+    component () {
+      if (this.type === 'card' && !this.betterScroll) return d2ContainerCard
+      if (this.type === 'card' && this.betterScroll) return d2ContainerCardBs
+      if (this.type === 'ghost' && !this.betterScroll) return d2ContainerGhost
+      if (this.type === 'ghost' && this.betterScroll) return d2ContainerGhostBs
+      if (this.type === 'full' && !this.betterScroll) return d2ContainerFull
+      if (this.type === 'full' && this.betterScroll) return d2ContainerFullBs
+      else {
+        return 'div'
+      }
+    }
+  },
+  render (h) {
+    const slots = [
+      h('div', this.$slots.default)
+    ]
+    if (this.$slots.header) slots.push(h('div', { slot: 'header' }, [ this.$slots.header ]))
+    if (this.$slots.footer) slots.push(h('div', { slot: 'footer' }, [ this.$slots.footer ]))
+    return h('div', {
+      ref: 'container',
+      attrs: {
+        'class': 'container-component'
+      }
+    }, [
+      h(this.component, {
+        props: this.$attrs,
+        on: {
+          scroll: e => this.$emit('scroll', e)
+        }
+      }, slots)
+    ])
   }
 }
 </script>

From 39775995f69bc87e2c309e04aa3369a83c354815 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Wed, 14 Nov 2018 10:25:53 +0800
Subject: [PATCH 09/23] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B9=8B=E5=89=8D?=
 =?UTF-8?q?=E7=9A=84=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 52fb5dd9270c56057e01af7039611c3e531a46d1 [formerly 52fb5dd9270c56057e01af7039611c3e531a46d1 [formerly 52fb5dd9270c56057e01af7039611c3e531a46d1 [formerly 52fb5dd9270c56057e01af7039611c3e531a46d1 [formerly bc11c055b5adb3c296fcb946a4c675b7248d183a [formerly e630429365fad326b224b4a679128df4a13a6641]]]]]
Former-commit-id: 8cffc11ec227e94a224e54ab977ec68fe51bee6f
Former-commit-id: 3b972dc1923f4b129375e64ccf753ebd61484ce7
Former-commit-id: b53419e3b3fc986bbab8cd5b38bae96c2bbb4f6c [formerly 79dd8b556d1fc1c6874f8f2cdd74aa413dde110b]
Former-commit-id: 569ac2e16f266d5845d6cdae21bf59c5e9280987
Former-commit-id: d38818b1ba3f78c081a0fdccebc241355576b90e
Former-commit-id: 11cd3ead28f4ec0886beb251f8b7e0e5d2f68a54
Former-commit-id: 2c544f29e02bd075bf4a2a60a3f5de965f204927
Former-commit-id: 5f45c568e2d5ee943d039a92667cb8b2196461a9
---
 src/components/d2-container/components/mixins/bs.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/components/d2-container/components/mixins/bs.js b/src/components/d2-container/components/mixins/bs.js
index 7d57c33e..a457a69a 100644
--- a/src/components/d2-container/components/mixins/bs.js
+++ b/src/components/d2-container/components/mixins/bs.js
@@ -1,12 +1,6 @@
 import BScroll from 'better-scroll'
 export default {
   props: {
-    // 滚动优化
-    betterScroll: {
-      type: Boolean,
-      required: false,
-      default: false
-    },
     // 滚动优化的选项
     betterScrollOptions: {
       type: Object,

From e100fa132165c831c460157962b7ab5b6cc5c279 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Wed, 14 Nov 2018 11:32:07 +0800
Subject: [PATCH 10/23] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=96=E9=83=A8?=
 =?UTF-8?q?=E6=8C=87=E5=AE=9A=20class=20=E6=97=B6=E5=8F=91=E7=94=9F?=
 =?UTF-8?q?=E7=9A=84=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 0ad6f5bb845504daf63ce2f5adb5e8b1571c286a [formerly 0ad6f5bb845504daf63ce2f5adb5e8b1571c286a [formerly 0ad6f5bb845504daf63ce2f5adb5e8b1571c286a [formerly 0ad6f5bb845504daf63ce2f5adb5e8b1571c286a [formerly ef20fb943c97b3c99f9e1feba8a209a7641832c6 [formerly 24c967e9e74fe69e32f495cace07a59304d05694]]]]]
Former-commit-id: c5f8236960f88c664953456431007da144d61777
Former-commit-id: 53248f297565b5bcbc82dc4c5a8456f5ebe20d08
Former-commit-id: 4bf9d6c1e25515aab11bd1b7b5654babe0bf9386 [formerly a2db5c831a8befa77838003b226177961467debf]
Former-commit-id: 02a1af311a8d3af9b14d17511334fcbe28044be1
Former-commit-id: ad7217a65c33f36b4f494c9e0310a4bbe999b60f
Former-commit-id: 53720b92060c73f6968cc9ea7e91040e6bf9f81a
Former-commit-id: 5abd1948c2df497bed765d73c5512ac697835578
Former-commit-id: cbde2b333113aa29f99059c0fb09844c09b76a43
---
 src/components/d2-container/index.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/components/d2-container/index.vue b/src/components/d2-container/index.vue
index b72e29cc..0f5abf54 100644
--- a/src/components/d2-container/index.vue
+++ b/src/components/d2-container/index.vue
@@ -44,9 +44,7 @@ export default {
     if (this.$slots.footer) slots.push(h('div', { slot: 'footer' }, [ this.$slots.footer ]))
     return h('div', {
       ref: 'container',
-      attrs: {
-        'class': 'container-component'
-      }
+      class: 'container-component'
     }, [
       h(this.component, {
         props: this.$attrs,

From f66d0091741d2499de434bd1b238c0f4f33057f2 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Thu, 15 Nov 2018 06:43:27 +0800
Subject: [PATCH 11/23] __dirname & __filename

Former-commit-id: 2f0b958342a3cc0d7eeee0d5fa885fe7fe16bfbc [formerly 2f0b958342a3cc0d7eeee0d5fa885fe7fe16bfbc [formerly 2f0b958342a3cc0d7eeee0d5fa885fe7fe16bfbc [formerly 2f0b958342a3cc0d7eeee0d5fa885fe7fe16bfbc [formerly ce8ce0ec780c81b15b029259ac73ca772ad46337 [formerly b9736b01c6c28ca3e1092c309307c2bb1a775fb3]]]]]
Former-commit-id: b2577fb47852397eb2b05dfe5f52b5db3b955955
Former-commit-id: 2b63e1e15b179591612b2b615140ebe7459b5be3
Former-commit-id: ccb49427695e81c857ef2a0d774d4ddc63572c83 [formerly 1444e4fe9819a552353d0e6445bc37da6de121b7]
Former-commit-id: 4c184d32fda0e5b0e8c590745e2ebfff12effd8a
Former-commit-id: 80c43de00cb8ac3e919f77eeba90727da04dc10d
Former-commit-id: 7241602f59b66a2125765528f545c6d1eb1eb74b
Former-commit-id: 16502a9208a7f7b64189fbac775e074c75ea258f
Former-commit-id: c8f542b42ff2d6baac1b7f0e074a9b8d8c7223e5
---
 vue.config.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/vue.config.js b/vue.config.js
index a092bb50..e08f8071 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -52,6 +52,10 @@ module.exports = {
     // 重新设置 alias
     config.resolve.alias
       .set('@', resolve('src'))
+    // node
+    config.node
+      .set('__dirname', true)
+      .set('__filename', true)
     // babel-polyfill 加入 entry
     const entry = config.entry('app')
     entry

From d4f7a1f6f5a9ace4d0df24f79a5bb45efc960463 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Thu, 15 Nov 2018 09:53:33 +0800
Subject: [PATCH 12/23] source code button

Former-commit-id: 3632fad2449424c7ac0d9289b0d1cadcc13a95cb [formerly 3632fad2449424c7ac0d9289b0d1cadcc13a95cb [formerly 3632fad2449424c7ac0d9289b0d1cadcc13a95cb [formerly 3632fad2449424c7ac0d9289b0d1cadcc13a95cb [formerly 74cced6cdd9dbf4349a620c4b556d61805cc1c87 [formerly d8c5ac8a9e620b61c6a630a5159eb848cf5b9422]]]]]
Former-commit-id: e774159b8321013bec2a12e0e8d69fa664b4e339
Former-commit-id: a60c4307ea5fc8811ed888f3f22124c7aff86948
Former-commit-id: dbdd213f423addf6216abe2be2440811826671e6 [formerly ec78ca6922bd98d9ff7a1e746576a78fb4600359]
Former-commit-id: 887313222435ad271cfdb155783e0b6120aa26bf
Former-commit-id: a271915674fb1bddaa1abad0e77fbf426b5f626d
Former-commit-id: 6f581faa19c84f2def4464c23054ffab5c3c5f2c
Former-commit-id: 90753e9c4a80f160dfd174ce954630d16e55b2de
Former-commit-id: 509fb7ba39e3a254190525fabe98c96b407e9413
---
 .../d2-container/components/d2-source.vue     | 32 +++++++++++++++++++
 .../d2-container/{index.vue => index.js}      |  7 ++--
 2 files changed, 36 insertions(+), 3 deletions(-)
 create mode 100644 src/components/d2-container/components/d2-source.vue
 rename src/components/d2-container/{index.vue => index.js} (95%)

diff --git a/src/components/d2-container/components/d2-source.vue b/src/components/d2-container/components/d2-source.vue
new file mode 100644
index 00000000..d0025483
--- /dev/null
+++ b/src/components/d2-container/components/d2-source.vue
@@ -0,0 +1,32 @@
+<template>
+  <div class="d2-source">
+    <d2-icon name="code"/> SourceCode
+  </div>
+</template>
+
+<style lang="scss" scoped>
+@import '~@/assets/style/public.scss';
+.d2-source {
+  $borderRadius: 4px;
+  $paddingLR: 15px;
+  $paddingTB: 7px;
+  $fontSize: 12px;
+  position: absolute;
+  right: - $borderRadius;
+  bottom: 20px;
+  font-size: $fontSize;
+  line-height: $fontSize;
+  font-weight: bold;
+  border-radius: $borderRadius;
+  padding: $paddingTB $paddingLR;
+  padding-right: $borderRadius + $paddingLR;
+  background-color: rgba(#000, .7);
+  border: 1px solid #000;
+  color: #FFF;
+  transition: all .3s;
+  @extend %unable-select;
+  &:hover {
+    background-color: rgba(#000, .9);
+  }
+}
+</style>
diff --git a/src/components/d2-container/index.vue b/src/components/d2-container/index.js
similarity index 95%
rename from src/components/d2-container/index.vue
rename to src/components/d2-container/index.js
index 0f5abf54..1b72d7d5 100644
--- a/src/components/d2-container/index.vue
+++ b/src/components/d2-container/index.js
@@ -1,4 +1,3 @@
-<script>
 // 组件
 import d2ContainerFull from './components/d2-container-full.vue'
 import d2ContainerFullBs from './components/d2-container-full-bs.vue'
@@ -6,6 +5,8 @@ import d2ContainerGhost from './components/d2-container-ghost.vue'
 import d2ContainerGhostBs from './components/d2-container-ghost-bs.vue'
 import d2ContainerCard from './components/d2-container-card.vue'
 import d2ContainerCardBs from './components/d2-container-card-bs.vue'
+import d2Source from './components/d2-source.vue'
+
 export default {
   name: 'd2-container',
   props: {
@@ -51,8 +52,8 @@ export default {
         on: {
           scroll: e => this.$emit('scroll', e)
         }
-      }, slots)
+      }, slots),
+      h(d2Source)
     ])
   }
 }
-</script>

From 2d8109f31874ded12e823b4de5910df2cb129e87 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Thu, 15 Nov 2018 17:00:12 +0800
Subject: [PATCH 13/23] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: d07a6ceca4d8ca53a02249b33dc9c81560b3a6b3 [formerly d07a6ceca4d8ca53a02249b33dc9c81560b3a6b3 [formerly d07a6ceca4d8ca53a02249b33dc9c81560b3a6b3 [formerly d07a6ceca4d8ca53a02249b33dc9c81560b3a6b3 [formerly e6cf7524cfdce2cc21d7cb99deab0b7e9c69621f [formerly 778a9799c4b87a86560d8f86aea9c154fd486c9d]]]]]
Former-commit-id: 5fc5040946c89e09cdbb24154bd00ba058b5693e
Former-commit-id: 629ee0bd8614a73f7c3903655fb1b880c23819d8
Former-commit-id: e92410850ac5eaf622e3c35f3f0ea0413ec8324f [formerly 78885143dc0d7d1a82a87e5562df469e92c0d371]
Former-commit-id: 3507e8cff7c7e5545200c21092aad7c09992990e
Former-commit-id: 2009e1f0912b28a773556d78af3f7acc1660b719
Former-commit-id: 7896efe94fe6a29e2c4f10d6dd2dce92041ee0a5
Former-commit-id: a87deb9c1e65a738a1bcb3df2797ecb130f9623b
Former-commit-id: 92f3912e935737d55cad349596bd5e6ff42fa83f
---
 src/menu/modules/demo-components.js | 40 +++++++++++++++++++++--------
 1 file changed, 30 insertions(+), 10 deletions(-)

diff --git a/src/menu/modules/demo-components.js b/src/menu/modules/demo-components.js
index a1835dc6..079184a1 100644
--- a/src/menu/modules/demo-components.js
+++ b/src/menu/modules/demo-components.js
@@ -9,16 +9,36 @@ export default {
       title: '布局容器',
       icon: 'window-restore',
       children: [
-        { path: `${pre}container/api`, title: 'API' },
-        { path: `${pre}container/full`, title: '填充' },
-        { path: `${pre}container/full-slot`, title: '填充 插槽' },
-        { path: `${pre}container/full-bs`, title: '填充 滚动优化' },
-        { path: `${pre}container/ghost`, title: '隐形' },
-        { path: `${pre}container/ghost-slot`, title: '隐形 插槽' },
-        { path: `${pre}container/ghost-bs`, title: '隐形 滚动优化' },
-        { path: `${pre}container/card`, title: '卡片' },
-        { path: `${pre}container/card-slot`, title: '卡片 插槽' },
-        { path: `${pre}container/card-bs`, title: '卡片 滚动优化' }
+        {
+          title: '填充型',
+          children: [
+            { path: `${pre}container/full`, title: '基础' },
+            { path: `${pre}container/full-slot`, title: '插槽' },
+            { path: `${pre}container/full-bs`, title: '滚动优化' }
+          ]
+        },
+        {
+          title: '隐形模式',
+          children: [
+            { path: `${pre}container/ghost`, title: '基础' },
+            { path: `${pre}container/ghost-slot`, title: '插槽' },
+            { path: `${pre}container/ghost-bs`, title: '滚动优化' }
+          ]
+        },
+        {
+          title: '卡片型',
+          children: [
+            { path: `${pre}container/card`, title: '基础' },
+            { path: `${pre}container/card-slot`, title: '插槽' },
+            { path: `${pre}container/card-bs`, title: '滚动优化' }
+          ]
+        },
+        {
+          title: '方法',
+          children: [
+            { path: `${pre}container/api`, title: 'API' }
+          ]
+        }
       ]
     },
     {

From d1733db874cb70719c4d612cc39bca63bdbbe9d4 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Thu, 15 Nov 2018 20:42:36 +0800
Subject: [PATCH 14/23] =?UTF-8?q?=E6=BA=90=E7=A0=81=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 4d1b3a8887b907db7555bfe53648ed762dba9892 [formerly 4d1b3a8887b907db7555bfe53648ed762dba9892 [formerly 4d1b3a8887b907db7555bfe53648ed762dba9892 [formerly 4d1b3a8887b907db7555bfe53648ed762dba9892 [formerly 2ef0e6fdbf2fc0116fb75086242315f3dbec48ea [formerly 58a909b244521701be296255b19109ede6f6e026]]]]]
Former-commit-id: ee181b29e947f0b153e512b4c52abfe9d76be811
Former-commit-id: da0acd29407fc35750d0c35a3d081de33323a5db
Former-commit-id: e2767964b4b6a721a459b8a86850c7b2d4629436 [formerly 3b3395ce0f85d801a459e6d4ab85c5ddf074e1ea]
Former-commit-id: db2f2c5ee8fc19e139213b6b0defd8a7668c8e58
Former-commit-id: 6ec66b8e7d1463e2538d6adb6df716220859e307
Former-commit-id: 3f4f38e1932f4e974246e2247562c18c8bc4777d
Former-commit-id: 52522c2f656af093164cee9c3cbce4310bced354
Former-commit-id: 2b80d11df99ae511dfc7155e33837fae2f0ded2e
---
 .../d2-container/components/d2-source.vue     | 46 ++++++++++++++++++-
 src/components/d2-container/index.js          |  4 +-
 src/pages/index/page.vue                      |  9 +++-
 3 files changed, 55 insertions(+), 4 deletions(-)

diff --git a/src/components/d2-container/components/d2-source.vue b/src/components/d2-container/components/d2-source.vue
index d0025483..96c78aa7 100644
--- a/src/components/d2-container/components/d2-source.vue
+++ b/src/components/d2-container/components/d2-source.vue
@@ -1,9 +1,45 @@
 <template>
-  <div class="d2-source">
+  <div
+    class="d2-source"
+    :class="{ 'd2-source--active': isActive }"
+    @click="handleClick">
     <d2-icon name="code"/> SourceCode
   </div>
 </template>
 
+<script>
+export default {
+  props: {
+    // 文件路径
+    filename: {
+      type: String,
+      default: ''
+    }
+  },
+  data () {
+    return {
+      isActive: false
+    }
+  },
+  mounted () {
+    // 一秒后显示按钮
+    setTimeout(() => {
+      this.isActive = true
+    }, 1000)
+  },
+  methods: {
+    // 点击按钮的时候跳转到源代码
+    handleClick () {
+      const file = this.filename.split('?')[0]
+      const url = file
+        ? `https://github.com/d2-projects/d2-admin/blob/master/${file}`
+        : 'https://github.com/d2-projects/d2-admin'
+      this.$open(url)
+    }
+  }
+}
+</script>
+
 <style lang="scss" scoped>
 @import '~@/assets/style/public.scss';
 .d2-source {
@@ -11,8 +47,10 @@
   $paddingLR: 15px;
   $paddingTB: 7px;
   $fontSize: 12px;
+  $rightOuter: $paddingLR / 2;
+  opacity: 0;
   position: absolute;
-  right: - $borderRadius;
+  right: - $borderRadius - $rightOuter;
   bottom: 20px;
   font-size: $fontSize;
   line-height: $fontSize;
@@ -25,7 +63,11 @@
   color: #FFF;
   transition: all .3s;
   @extend %unable-select;
+  &.d2-source--active {
+    opacity: 1;
+  }
   &:hover {
+    right: - $borderRadius;
     background-color: rgba(#000, .9);
   }
 }
diff --git a/src/components/d2-container/index.js b/src/components/d2-container/index.js
index 1b72d7d5..9acee8e9 100644
--- a/src/components/d2-container/index.js
+++ b/src/components/d2-container/index.js
@@ -53,7 +53,9 @@ export default {
           scroll: e => this.$emit('scroll', e)
         }
       }, slots),
-      h(d2Source)
+      h(d2Source, {
+        props: this.$attrs
+      })
     ])
   }
 }
diff --git a/src/pages/index/page.vue b/src/pages/index/page.vue
index 2dd33209..c244c6f3 100644
--- a/src/pages/index/page.vue
+++ b/src/pages/index/page.vue
@@ -1,5 +1,7 @@
 <template>
-  <d2-container class="page">
+  <d2-container
+    class="page"
+    :filename="filename">
     <d2-page-cover
       :title="`D2 Admin ${version}`"
       sub-title="优雅的中后台集成方案">
@@ -43,6 +45,11 @@ export default {
     D2HelpBtn,
     D2Badge
   },
+  data () {
+    return {
+      filename: __filename
+    }
+  },
   computed: {
     ...mapState('d2admin/releases', [
       'version'

From 0b5eed393cfe0dbe9abc7f20b96ab7cde6c656ae Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Thu, 15 Nov 2018 22:22:29 +0800
Subject: [PATCH 15/23] =?UTF-8?q?=E6=8C=87=E5=AE=9A=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: d743720e22fa2d6ec8578dfe079fe2fbfbefb883 [formerly d743720e22fa2d6ec8578dfe079fe2fbfbefb883 [formerly d743720e22fa2d6ec8578dfe079fe2fbfbefb883 [formerly d743720e22fa2d6ec8578dfe079fe2fbfbefb883 [formerly b355ddb4468cad60e2d07d454eb39e692fd4f8ed [formerly 19430a212774908b8f5cb4a735aa33b00969c57a]]]]]
Former-commit-id: 5666f0229a7be366aa98ffbdee287566a7ead992
Former-commit-id: ec56290ff1906ec1d9c8253066174501627e1221
Former-commit-id: 58031691af565e514ae966123e9c2cd3b1dc2f62 [formerly 06e5cd3b1138934d063cd8e31972bfa7346ae4da]
Former-commit-id: d7f7b04bb6f826921f36c9f9dbda2fa37761437a
Former-commit-id: fc5e355ffede3a4ae468c19a32b5ccd796c9041e
Former-commit-id: c15d5b86dff42bfa23fe55e1adf901cd0407f631
Former-commit-id: d4f0e11b1c0a2beefe7190666108289c76d4e195
Former-commit-id: d8f502be77b16eac9be3ac435402840b22b01864
---
 src/components/d2-container/index.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/d2-container/index.js b/src/components/d2-container/index.js
index 9acee8e9..cfc14871 100644
--- a/src/components/d2-container/index.js
+++ b/src/components/d2-container/index.js
@@ -53,9 +53,10 @@ export default {
           scroll: e => this.$emit('scroll', e)
         }
       }, slots),
-      h(d2Source, {
+      // 只在预览和开发模式下显示源码按钮
+      process.env.VUE_APP_BUILD_MODE === 'TRAVIS' || process.env.NODE_ENV === 'development' ? h(d2Source, {
         props: this.$attrs
-      })
+      }) : undefined
     ])
   }
 }

From b45ef7a442f59ac44fab1836f7ed0416d0b609a0 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Thu, 15 Nov 2018 22:22:45 +0800
Subject: [PATCH 16/23] =?UTF-8?q?=E4=BC=98=E5=8C=96=20env=20demo=20?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 43ce0e3535f937a1828f08fbab4e2b09d7cb9449 [formerly 43ce0e3535f937a1828f08fbab4e2b09d7cb9449 [formerly 43ce0e3535f937a1828f08fbab4e2b09d7cb9449 [formerly 43ce0e3535f937a1828f08fbab4e2b09d7cb9449 [formerly 749455fe4faf11e12be6189c68827b2edca3a122 [formerly 5c96912b2a3df416762ff6117ba7e63157eb399f]]]]]
Former-commit-id: 1d91147af355421a7904e7e643763877f5ea8bf6
Former-commit-id: ffb6ca7445bbfdfba031b2f2be5fb5ba39481b04
Former-commit-id: 16696b34d2d34849da33afeff9229004daecf73e [formerly ae6c555fecf13f9c4db8a0010dbba4a0762957af]
Former-commit-id: 657882f02e61eddccd6656dab6de77a9fd39ff88
Former-commit-id: cc74aece1acf464fc84bfdeffd7459d2aff695f2
Former-commit-id: e799ad3d03183f25517a6575969a34fd15325635
Former-commit-id: f12996ec7476fd50397885e05dccdcba711f8fa7
Former-commit-id: d2d00357e096f7b506d2d2dbed7a266517b4e59c
---
 src/pages/demo/playground/env/index.vue | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/pages/demo/playground/env/index.vue b/src/pages/demo/playground/env/index.vue
index 1da4ba51..66bb400a 100644
--- a/src/pages/demo/playground/env/index.vue
+++ b/src/pages/demo/playground/env/index.vue
@@ -1,9 +1,7 @@
 <template>
   <d2-container type="card">
     <template slot="header">process.env</template>
-    <p class="d2-mt-0">NODE_ENV = {{env}}</p>
-    <p>BASE_URL = {{baseUrl}}</p>
-    <p class="d2-mb-0">VUE_APP_TITLE = {{title}}</p>
+    <d2-highlight :code="env"/>
   </d2-container>
 </template>
 
@@ -11,9 +9,7 @@
 export default {
   data () {
     return {
-      env: process.env.NODE_ENV,
-      baseUrl: process.env.BASE_URL,
-      title: process.env.VUE_APP_TITLE
+      env: JSON.stringify(process.env, null, 2)
     }
   }
 }

From 93b718bd123240fe05db084534ca0d0cdb77dc57 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Fri, 16 Nov 2018 10:25:08 +0800
Subject: [PATCH 17/23] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E9=A1=B6=E9=83=A8?=
 =?UTF-8?q?=E7=9A=84=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 3c95b5a5df8c09efda44212256f5063a37f9fbc8 [formerly 3c95b5a5df8c09efda44212256f5063a37f9fbc8 [formerly 3c95b5a5df8c09efda44212256f5063a37f9fbc8 [formerly 3c95b5a5df8c09efda44212256f5063a37f9fbc8 [formerly 7765bde19a0f24f058d187abf04a543de1a701e3 [formerly 6da35f0374891df1c2cf2e27562a1890f68b4045]]]]]
Former-commit-id: d76ca39daa8f2e97e23eada1bbe5f6ee6deb8459
Former-commit-id: 8a0e5b235398aa2bcd4bc313b194ecda4b3ca70c
Former-commit-id: debdb63291e7831e910962793e92a5982eda5262 [formerly ac58f2e8ad837ca633adff21751b90404d948b67]
Former-commit-id: 74b92416979407e855119f8f20e54dc635f186e3
Former-commit-id: 4f943668a9e8989426d1de2bed7c27a875ef7752
Former-commit-id: 06ee2b7121ca1bfea625f2e95dc43f19a7b4987f
Former-commit-id: 8125182559664ee6704d72ac9073eae009eb2e75
Former-commit-id: 39b9b54e3d6e39fafc85f397b8c50d51113173e0
---
 .../components/mixins/scroll.normal.js         | 11 +++++++++++
 src/components/d2-container/index.js           |  7 +++++++
 src/pages/demo/components/container/api.vue    | 18 +++++++++++-------
 3 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/src/components/d2-container/components/mixins/scroll.normal.js b/src/components/d2-container/components/mixins/scroll.normal.js
index f057628b..8b118f44 100644
--- a/src/components/d2-container/components/mixins/scroll.normal.js
+++ b/src/components/d2-container/components/mixins/scroll.normal.js
@@ -45,6 +45,17 @@ export default {
     // 移除滚动事件监听
     removeScrollListener () {
       this.$refs.body.removeEventListener('scroll', this.handleScroll)
+    },
+    // 外部调用的方法 返回顶部
+    scrollToTop () {
+      const smoothscroll = () => {
+        var currentScroll = this.$refs.body.scrollTop
+        if (currentScroll > 0) {
+          window.requestAnimationFrame(smoothscroll)
+          this.$refs.body.scrollTo(0, currentScroll - (currentScroll / 5))
+        }
+      }
+      smoothscroll()
     }
   }
 }
diff --git a/src/components/d2-container/index.js b/src/components/d2-container/index.js
index cfc14871..dcf493d4 100644
--- a/src/components/d2-container/index.js
+++ b/src/components/d2-container/index.js
@@ -48,6 +48,7 @@ export default {
       class: 'container-component'
     }, [
       h(this.component, {
+        ref: 'component',
         props: this.$attrs,
         on: {
           scroll: e => this.$emit('scroll', e)
@@ -58,5 +59,11 @@ export default {
         props: this.$attrs
       }) : undefined
     ])
+  },
+  methods: {
+    // 返回顶部
+    scrollToTop () {
+      this.$refs.component.scrollToTop()
+    }
   }
 }
diff --git a/src/pages/demo/components/container/api.vue b/src/pages/demo/components/container/api.vue
index 5e59ec01..bd4a4d86 100644
--- a/src/pages/demo/components/container/api.vue
+++ b/src/pages/demo/components/container/api.vue
@@ -8,16 +8,16 @@
         :inline="true"
         size="mini">
         <el-form-item
-          label="scrollTop"
+          label="滚动距离"
           class="d2-mb-0">
           <el-input
             :value="scrollTop"
-            style="width: 110px;">
+            style="width: 120px;">
             <template slot="append">px</template>
           </el-input>
         </el-form-item>
         <el-form-item
-          label="scrollDelay"
+          label="事件延迟(ms)"
           class="d2-mb-0">
           <el-input-number
             v-model="scrollDelay"
@@ -30,7 +30,7 @@
           <el-button
             v-if="scrollTop >= 55"
             type="primary"
-            @click="handleTop">
+            @click="handleScrollToTop">
             回到顶部
           </el-button>
         </el-form-item>
@@ -38,8 +38,10 @@
     </template>
     <el-alert type="success" title="请向下滚动" center class="d2-mb-10"/>
     <d2-demo-article
-      long
-      :style="articleStyle"/>
+      v-for="i in 10"
+      :key="i"
+      :style="articleStyle"
+      long/>
     <template slot="footer">
       <el-form
         :inline="true"
@@ -81,7 +83,9 @@ export default {
     handleScroll (e) {
       this.scrollTop = e.target.scrollTop
     },
-    handleTop () {},
+    handleScrollToTop () {
+      this.$refs.container.scrollToTop()
+    },
     handleScrollBy () {
       this.$refs.container.$children[0].$refs.body.scrollBy(0, 30)
     },

From b6c2ed77a4650b911f1f343b9dc9fc3d99325a2b Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Fri, 16 Nov 2018 10:52:53 +0800
Subject: [PATCH 18/23] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=B0=E4=B8=89?=
 =?UTF-8?q?=E7=A7=8D=E7=B1=BB=E5=9E=8B=E7=9A=84=E7=BB=84=E4=BB=B6=E4=B8=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: d4b6d9fe642f5e299251b0edc1715a94334aeac7 [formerly d4b6d9fe642f5e299251b0edc1715a94334aeac7 [formerly d4b6d9fe642f5e299251b0edc1715a94334aeac7 [formerly d4b6d9fe642f5e299251b0edc1715a94334aeac7 [formerly a9078cd702fc26aea4790714afe151ec37012a56 [formerly ef67c393100d7c969ae2b5724b1320df73b87d3a]]]]]
Former-commit-id: e198314fdd7311aca3be5ad7fbaf76e238e1cba0
Former-commit-id: f7cbb90136f1f26a8a63f09289cc690fa6f3b542
Former-commit-id: 7826bd1a8e815d8ae77e5bdf6b35b2d5ea6de4ba [formerly 5f6c26021ffd1a0491b7b1f656ef6c7d67547eaa]
Former-commit-id: 80dd044d5dbef9d01816b97485276e7ca58fbba8
Former-commit-id: c0ee83666c68615ed4f5803a9f2d46c26c9105a6
Former-commit-id: bb0e8c35b2095ce60d82127fa44ed9a2035b4d12
Former-commit-id: cf982060447f3887ac2a63b29925364c3139d213
Former-commit-id: ef4a29d1348fc52ef062a80fb640ddfe86c481bc
---
 .../d2-container/components/d2-container-card.vue    |  8 ++++++--
 .../d2-container/components/d2-container-full.vue    |  2 +-
 .../d2-container/components/d2-container-ghost.vue   | 12 +++++++++++-
 .../mixins/{scroll.normal.js => normal.js}           |  5 +++--
 4 files changed, 21 insertions(+), 6 deletions(-)
 rename src/components/d2-container/components/mixins/{scroll.normal.js => normal.js} (90%)

diff --git a/src/components/d2-container/components/d2-container-card.vue b/src/components/d2-container/components/d2-container-card.vue
index 8e7e5631..a8450e98 100644
--- a/src/components/d2-container/components/d2-container-card.vue
+++ b/src/components/d2-container/components/d2-container-card.vue
@@ -4,7 +4,7 @@
       <slot name="header"/>
     </div>
     <div class="d2-container-card__body">
-      <div class="d2-container-card__body-card">
+      <div class="d2-container-card__body-card" ref="body">
         <slot/>
       </div>
     </div>
@@ -15,7 +15,11 @@
 </template>
 
 <script>
+import scroll from './mixins/normal'
 export default {
-  name: 'd2-container-card'
+  name: 'd2-container-card',
+  mixins: [
+    scroll
+  ]
 }
 </script>
diff --git a/src/components/d2-container/components/d2-container-full.vue b/src/components/d2-container/components/d2-container-full.vue
index 0c8a719a..2a36d3ae 100644
--- a/src/components/d2-container/components/d2-container-full.vue
+++ b/src/components/d2-container/components/d2-container-full.vue
@@ -13,7 +13,7 @@
 </template>
 
 <script>
-import scroll from './mixins/scroll.normal'
+import scroll from './mixins/normal'
 export default {
   name: 'd2-container-full',
   mixins: [
diff --git a/src/components/d2-container/components/d2-container-ghost.vue b/src/components/d2-container/components/d2-container-ghost.vue
index 64b37bf6..4527643f 100644
--- a/src/components/d2-container/components/d2-container-ghost.vue
+++ b/src/components/d2-container/components/d2-container-ghost.vue
@@ -3,7 +3,7 @@
     <div v-if="$slots.header" class="d2-container-ghost__header" ref="header">
       <slot name="header"/>
     </div>
-    <div class="d2-container-ghost__body">
+    <div class="d2-container-ghost__body" ref="body">
       <slot/>
     </div>
     <div v-if="$slots.footer" class="d2-container-ghost__footer" ref="footer">
@@ -11,3 +11,13 @@
     </div>
   </div>
 </template>
+
+<script>
+import scroll from './mixins/normal'
+export default {
+  name: 'd2-container-ghost',
+  mixins: [
+    scroll
+  ]
+}
+</script>
diff --git a/src/components/d2-container/components/mixins/scroll.normal.js b/src/components/d2-container/components/mixins/normal.js
similarity index 90%
rename from src/components/d2-container/components/mixins/scroll.normal.js
rename to src/components/d2-container/components/mixins/normal.js
index 8b118f44..317132c0 100644
--- a/src/components/d2-container/components/mixins/scroll.normal.js
+++ b/src/components/d2-container/components/mixins/normal.js
@@ -49,10 +49,11 @@ export default {
     // 外部调用的方法 返回顶部
     scrollToTop () {
       const smoothscroll = () => {
-        var currentScroll = this.$refs.body.scrollTop
+        const body = this.$refs.body
+        const currentScroll = body.scrollTop
         if (currentScroll > 0) {
           window.requestAnimationFrame(smoothscroll)
-          this.$refs.body.scrollTo(0, currentScroll - (currentScroll / 5))
+          body.scrollTo(0, currentScroll - (currentScroll / 5))
         }
       }
       smoothscroll()

From d3b945e89a21e25aad82575f6b6a65a25f1e1e44 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Fri, 16 Nov 2018 11:09:04 +0800
Subject: [PATCH 19/23] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dghost=20card=20?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: c77cb48f0b40ce45be40edaf8319880e7eb3ec54 [formerly c77cb48f0b40ce45be40edaf8319880e7eb3ec54 [formerly c77cb48f0b40ce45be40edaf8319880e7eb3ec54 [formerly c77cb48f0b40ce45be40edaf8319880e7eb3ec54 [formerly f7d282d6c37c26e75dd9c9c3ceae6c4168f346ce [formerly 78dd6f78e40607c2c1dbea8d292268416df4ed4a]]]]]
Former-commit-id: 934abb79b910ad61e43f886b7f15087051fb829a
Former-commit-id: 61d65f9bed2fd579ca9606fa7a564474b8eec9de
Former-commit-id: 249e4111239064d7c5db13b621b94b6e12f6df02 [formerly c66b4111b574341e1b67c2dfacadbe7808fe4a55]
Former-commit-id: 042584a7af94300a07454010274be0f60bc30979
Former-commit-id: f3a80e0e2c55e8e9dddffa5934dfbf1e327c68fe
Former-commit-id: 54f669dcfb3f736449e1bcb530e9d6699b7f0755
Former-commit-id: f7f2e43621453125036ddf0b6a4ad341d532e787
Former-commit-id: fb6ca50b1484be06b4c2e6f7de5c19e0c41b6093
---
 .../d2-container/components/d2-container-card.vue  | 14 +++++++++++---
 .../d2-container/components/d2-container-ghost.vue | 10 +++++++++-
 src/pages/demo/components/container/api.vue        |  1 +
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/components/d2-container/components/d2-container-card.vue b/src/components/d2-container/components/d2-container-card.vue
index a8450e98..9b2a2cd2 100644
--- a/src/components/d2-container/components/d2-container-card.vue
+++ b/src/components/d2-container/components/d2-container-card.vue
@@ -3,8 +3,8 @@
     <div v-if="$slots.header" class="d2-container-card__header" ref="header">
       <slot name="header"/>
     </div>
-    <div class="d2-container-card__body">
-      <div class="d2-container-card__body-card" ref="body">
+    <div class="d2-container-card__body" ref="body">
+      <div class="d2-container-card__body-card">
         <slot/>
       </div>
     </div>
@@ -20,6 +20,14 @@ export default {
   name: 'd2-container-card',
   mixins: [
     scroll
-  ]
+  ],
+  mounted () {
+    // 增加滚动事件监听
+    this.addScrollListener()
+  },
+  beforeDestroy () {
+    // 移除滚动事件监听
+    this.removeScrollListener()
+  }
 }
 </script>
diff --git a/src/components/d2-container/components/d2-container-ghost.vue b/src/components/d2-container/components/d2-container-ghost.vue
index 4527643f..2e6f47b9 100644
--- a/src/components/d2-container/components/d2-container-ghost.vue
+++ b/src/components/d2-container/components/d2-container-ghost.vue
@@ -18,6 +18,14 @@ export default {
   name: 'd2-container-ghost',
   mixins: [
     scroll
-  ]
+  ],
+  mounted () {
+    // 增加滚动事件监听
+    this.addScrollListener()
+  },
+  beforeDestroy () {
+    // 移除滚动事件监听
+    this.removeScrollListener()
+  }
 }
 </script>
diff --git a/src/pages/demo/components/container/api.vue b/src/pages/demo/components/container/api.vue
index bd4a4d86..0f373d9d 100644
--- a/src/pages/demo/components/container/api.vue
+++ b/src/pages/demo/components/container/api.vue
@@ -1,6 +1,7 @@
 <template>
   <d2-container
     ref="container"
+    type="card"
     :scroll-delay="scrollDelay"
     @scroll="handleScroll">
     <template slot="header">

From 517f0e5f8aad57455fd617ad0675b651b638cded Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Fri, 16 Nov 2018 14:54:22 +0800
Subject: [PATCH 20/23] =?UTF-8?q?=E7=AE=80=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: bd356fb67ff4b7138cb245203c01aaec7374b8b8 [formerly bd356fb67ff4b7138cb245203c01aaec7374b8b8 [formerly bd356fb67ff4b7138cb245203c01aaec7374b8b8 [formerly bd356fb67ff4b7138cb245203c01aaec7374b8b8 [formerly 53a7f073009a8066a7c5673a6c27eb70dcd201e0 [formerly b5943262046e85618f24f20ff5a18c22c9660d57]]]]]
Former-commit-id: 14b0b52a698ed902aa8ca6008c7c9cc9f4a922c1
Former-commit-id: 1547cce2ef1de0acc5078b033f499ab8b74ac7f5
Former-commit-id: 64145c3fb940834f88877fa9ab4d44b0c2bf53ad [formerly e985341b7fcb491ee0f9a8e61f878f261fb7a712]
Former-commit-id: 5cedd4c754eba078ab88d27280183774c56bd053
Former-commit-id: 72ff1602a26b2ba61f997fe2177f0c885f02a5a8
Former-commit-id: e5a0d1b18b63e498d98dec392459bb05acb7035a
Former-commit-id: f024b9a51a480258ae18114b092bf22d8e1708ec
Former-commit-id: 33152b0004e8abe0036cf459d47e1155cfc67324
---
 src/components/d2-container/index.js        | 12 +++++
 src/pages/demo/components/container/api.vue | 53 ++++++++++++---------
 2 files changed, 42 insertions(+), 23 deletions(-)

diff --git a/src/components/d2-container/index.js b/src/components/d2-container/index.js
index dcf493d4..18b5e271 100644
--- a/src/components/d2-container/index.js
+++ b/src/components/d2-container/index.js
@@ -64,6 +64,18 @@ export default {
     // 返回顶部
     scrollToTop () {
       this.$refs.component.scrollToTop()
+    },
+    // 用法同原生方法 scrollBy
+    scrollBy (x = 0, y = 0) {
+      this.$refs.component.$refs.body.scrollBy(x, y)
+    },
+    // 用法同原生方法 scrollTo
+    scrollTo (x = 0, y = 0) {
+      this.$refs.component.$refs.body.scrollTo(x, y)
+    },
+    // 用法同原生方法 scrollTop
+    scrollTop (top = 0) {
+      this.$refs.component.$refs.body.scrollTop = top
     }
   }
 }
diff --git a/src/pages/demo/components/container/api.vue b/src/pages/demo/components/container/api.vue
index 0f373d9d..30fb6f5e 100644
--- a/src/pages/demo/components/container/api.vue
+++ b/src/pages/demo/components/container/api.vue
@@ -1,19 +1,28 @@
 <template>
   <d2-container
     ref="container"
-    type="card"
+    :type="containerType"
     :scroll-delay="scrollDelay"
-    @scroll="handleScroll">
+    @scroll="e => { scrollTop = e.target.scrollTop }">
     <template slot="header">
       <el-form
         :inline="true"
         size="mini">
+        <el-form-item
+          label="布局类型"
+          class="d2-mb-0">
+          <el-radio-group v-model="containerType">
+            <el-radio-button label="full"></el-radio-button>
+            <el-radio-button label="card"></el-radio-button>
+            <el-radio-button label="ghost"></el-radio-button>
+          </el-radio-group>
+        </el-form-item>
         <el-form-item
           label="滚动距离"
           class="d2-mb-0">
           <el-input
             :value="scrollTop"
-            style="width: 120px;">
+            style="width: 130px;">
             <template slot="append">px</template>
           </el-input>
         </el-form-item>
@@ -31,13 +40,17 @@
           <el-button
             v-if="scrollTop >= 55"
             type="primary"
-            @click="handleScrollToTop">
+            @click="$refs.container.scrollToTop">
             回到顶部
           </el-button>
         </el-form-item>
       </el-form>
     </template>
-    <el-alert type="success" title="请向下滚动" center class="d2-mb-10"/>
+    <el-alert
+      type="success"
+      title="请向下滚动"
+      class="d2-mb-10"
+      center/>
     <d2-demo-article
       v-for="i in 10"
       :key="i"
@@ -48,13 +61,13 @@
         :inline="true"
         size="mini">
         <el-form-item class="d2-mb-0">
-          <el-button @click="handleScrollBy">相对滚动 (0, 30) 像素</el-button>
+          <el-button @click="$refs.container.scrollBy(0, 30)">相对滚动 (0, 30) 像素</el-button>
         </el-form-item>
         <el-form-item class="d2-mb-0">
-          <el-button @click="handleScrollTo">滚动到 (0, 100) 像素位置</el-button>
+          <el-button @click="$refs.container.scrollTo(0, 100)">滚动到 (0, 100) 像素位置</el-button>
         </el-form-item>
         <el-form-item class="d2-mb-0">
-          <el-button @click="handleScrollTop">滚动到垂直位置 100</el-button>
+          <el-button @click="$refs.container.scrollTop(100)">滚动到垂直位置 100</el-button>
         </el-form-item>
       </el-form>
     </template>
@@ -69,6 +82,7 @@ export default {
   },
   data () {
     return {
+      containerType: 'full',
       scrollDelay: 100,
       scrollTop: 0
     }
@@ -80,21 +94,14 @@ export default {
       }
     }
   },
-  methods: {
-    handleScroll (e) {
-      this.scrollTop = e.target.scrollTop
-    },
-    handleScrollToTop () {
-      this.$refs.container.scrollToTop()
-    },
-    handleScrollBy () {
-      this.$refs.container.$children[0].$refs.body.scrollBy(0, 30)
-    },
-    handleScrollTo () {
-      this.$refs.container.$children[0].$refs.body.scrollTo(0, 100)
-    },
-    handleScrollTop () {
-      this.$refs.container.$children[0].$refs.body.scrollTop = 100
+  watch: {
+    containerType (val, oldVal) {
+      let top = this.scrollTop
+      // 因为 ghost 模式下的容器没有 20px 的 padding
+      // 为了保持垂直位置 需要重新计算定位高度
+      if (oldVal === 'ghost') top += 20
+      if (val === 'ghost') top -= 20
+      this.$nextTick(() => this.$refs.container.scrollTo(0, top))
     }
   }
 }

From a73a33b06a89867fb7049569a7c29682513194a0 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Fri, 16 Nov 2018 15:53:07 +0800
Subject: [PATCH 21/23] =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: f40914e76c91b828299b7aeb5b56337d641d0d74 [formerly f40914e76c91b828299b7aeb5b56337d641d0d74 [formerly f40914e76c91b828299b7aeb5b56337d641d0d74 [formerly f40914e76c91b828299b7aeb5b56337d641d0d74 [formerly f59ab0339a7fad79340308948667b1254e7de250 [formerly d7e13b40b46a808a25524433cae68e95db6a98b1]]]]]
Former-commit-id: 9a2c521f0be4ffbbc715f337880168b40a352488
Former-commit-id: f0526a5e139ac2523e5cf1a9eccb83b121065d05
Former-commit-id: e80ccfb84a5cd9dd64d844999afa7ee1e0e1985b [formerly f77fec8cc261483da122e06c4d6454007eb3877a]
Former-commit-id: 98cf5fd060753ccd960d7fdb9ac8246393da3890
Former-commit-id: 57ef44f6a5bb191f3f2584849f6c4fac835e409a
Former-commit-id: 52173964469c5e6c308ac7d9a91990dab580b2c7
Former-commit-id: 9211b978a4bf1493974cbe59befd946f7c516b66
Former-commit-id: 30ac26684644764d096e4664e15d67c15c184ac5
---
 .../d2-container/components/mixins/bs.js      | 19 +++++++++
 .../d2-container/components/mixins/normal.js  |  9 +++-
 src/components/d2-container/index.js          | 42 ++++++++++++++++---
 src/menu/modules/demo-components.js           |  3 +-
 src/pages/demo/components/container/api.vue   | 25 +++++------
 5 files changed, 75 insertions(+), 23 deletions(-)

diff --git a/src/components/d2-container/components/mixins/bs.js b/src/components/d2-container/components/mixins/bs.js
index a457a69a..50a74723 100644
--- a/src/components/d2-container/components/mixins/bs.js
+++ b/src/components/d2-container/components/mixins/bs.js
@@ -21,6 +21,7 @@ export default {
   },
   methods: {
     scrollInit () {
+      // 初始化 bs
       this.BS = new BScroll(this.$refs.wrapper, Object.assign({
         mouseWheel: true,
         scrollbar: {
@@ -28,6 +29,11 @@ export default {
           interactive: false
         }
       }, this.betterScrollOptions))
+      // 滚动时发出事件 并且统一返回的数据格式
+      this.BS.on('scroll', ({x, y}) => this.$emit('scroll', {
+        x: -x,
+        y: -y
+      }))
     },
     scrollDestroy () {
       // https://github.com/d2-projects/d2-admin/issues/75
@@ -37,6 +43,19 @@ export default {
         delete this.BS
         this.BS = null
       }
+    },
+    // 外部调用的方法 返回顶部
+    scrollToTop () {
+      if (this.BS) this.BS.scrollTo(0, 0, 300)
+    },
+    // 手动发出滚动事件
+    scroll () {
+      if (this.BS) {
+        this.$emit('scroll', {
+          x: -this.BS.x,
+          y: -this.BS.y
+        })
+      }
     }
   }
 }
diff --git a/src/components/d2-container/components/mixins/normal.js b/src/components/d2-container/components/mixins/normal.js
index 317132c0..d71ff0b8 100644
--- a/src/components/d2-container/components/mixins/normal.js
+++ b/src/components/d2-container/components/mixins/normal.js
@@ -5,7 +5,12 @@ import { throttle } from 'lodash'
 
 // 生成滚动事件的 handler
 function handleMaker (wait) {
-  return throttle(e => this.$emit('scroll', e), wait)
+  return throttle(e => {
+    this.$emit('scroll', {
+      x: e.target.scrollLeft,
+      y: e.target.scrollTop
+    })
+  }, wait)
 }
 
 export default {
@@ -14,7 +19,7 @@ export default {
     scrollDelay: {
       type: Number,
       required: false,
-      default: 100
+      default: 10
     }
   },
   data () {
diff --git a/src/components/d2-container/index.js b/src/components/d2-container/index.js
index 18b5e271..e03b6c59 100644
--- a/src/components/d2-container/index.js
+++ b/src/components/d2-container/index.js
@@ -64,18 +64,48 @@ export default {
     // 返回顶部
     scrollToTop () {
       this.$refs.component.scrollToTop()
+      // 如果开启了 better scroll 还需要手动触发一遍 scroll 事件
+      const bs = this.$refs.component.BS
+      if (bs) this.$refs.component.scroll()
     },
     // 用法同原生方法 scrollBy
-    scrollBy (x = 0, y = 0) {
-      this.$refs.component.$refs.body.scrollBy(x, y)
+    scrollBy (x = 0, y = 0, time = 300) {
+      if (this.betterScroll) {
+        const bs = this.$refs.component.BS
+        if (bs) {
+          bs.scrollBy(-x, -y, time)
+          // 手动触发一遍 scroll 事件
+          this.$refs.component.scroll()
+        }
+      } else {
+        this.$refs.component.$refs.body.scrollBy(x, y)
+      }
     },
     // 用法同原生方法 scrollTo
-    scrollTo (x = 0, y = 0) {
-      this.$refs.component.$refs.body.scrollTo(x, y)
+    scrollTo (x = 0, y = 0, time = 300) {
+      if (this.betterScroll) {
+        const bs = this.$refs.component.BS
+        if (bs) {
+          bs.scrollTo(-x, -y, time)
+          // 手动触发一遍 scroll 事件
+          this.$refs.component.scroll()
+        }
+      } else {
+        this.$refs.component.$refs.body.scrollTo(x, y)
+      }
     },
     // 用法同原生方法 scrollTop
-    scrollTop (top = 0) {
-      this.$refs.component.$refs.body.scrollTop = top
+    scrollTop (top = 0, time = 300) {
+      if (this.betterScroll) {
+        const bs = this.$refs.component.BS
+        if (bs) {
+          bs.scrollTo(bs.x, -top, time)
+          // 手动触发一遍 scroll 事件
+          this.$refs.component.scroll()
+        }
+      } else {
+        this.$refs.component.$refs.body.scrollTop = top
+      }
     }
   }
 }
diff --git a/src/menu/modules/demo-components.js b/src/menu/modules/demo-components.js
index 079184a1..0773964a 100644
--- a/src/menu/modules/demo-components.js
+++ b/src/menu/modules/demo-components.js
@@ -36,7 +36,8 @@ export default {
         {
           title: '方法',
           children: [
-            { path: `${pre}container/api`, title: 'API' }
+            { path: `${pre}container/api?bs=false`, title: '滚动控制' },
+            { path: `${pre}container/api?bs=true`, title: '滚动控制 BS' }
           ]
         }
       ]
diff --git a/src/pages/demo/components/container/api.vue b/src/pages/demo/components/container/api.vue
index 30fb6f5e..71b38345 100644
--- a/src/pages/demo/components/container/api.vue
+++ b/src/pages/demo/components/container/api.vue
@@ -2,8 +2,9 @@
   <d2-container
     ref="container"
     :type="containerType"
+    :better-scroll="betterScroll"
     :scroll-delay="scrollDelay"
-    @scroll="e => { scrollTop = e.target.scrollTop }">
+    @scroll="({x, y}) => { scrollTop = y }">
     <template slot="header">
       <el-form
         :inline="true"
@@ -27,11 +28,12 @@
           </el-input>
         </el-form-item>
         <el-form-item
+          v-if="!betterScroll"
           label="事件延迟(ms)"
           class="d2-mb-0">
           <el-input-number
             v-model="scrollDelay"
-            :min="100"
+            :min="10"
             :max="2000"
             :step="100"
             style="width: 110px;"/>
@@ -48,7 +50,7 @@
     </template>
     <el-alert
       type="success"
-      title="请向下滚动"
+      :title="`${betterScroll ? '此示例开启了 BetterScroll ' : ''}请向下滚动`"
       class="d2-mb-10"
       center/>
     <d2-demo-article
@@ -83,26 +85,21 @@ export default {
   data () {
     return {
       containerType: 'full',
-      scrollDelay: 100,
+      scrollDelay: 10,
       scrollTop: 0
     }
   },
   computed: {
+    // 是否开启 better scroll
+    betterScroll () {
+      return this.$route.query.bs === 'true'
+    },
+    // 根据滚动位置返回文章的样式
     articleStyle () {
       return {
         opacity: this.scrollTop > 55 ? '1' : '.1'
       }
     }
-  },
-  watch: {
-    containerType (val, oldVal) {
-      let top = this.scrollTop
-      // 因为 ghost 模式下的容器没有 20px 的 padding
-      // 为了保持垂直位置 需要重新计算定位高度
-      if (oldVal === 'ghost') top += 20
-      if (val === 'ghost') top -= 20
-      this.$nextTick(() => this.$refs.container.scrollTo(0, top))
-    }
   }
 }
 </script>

From af5dc868062e1076f41740319d4280e790fc1760 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Fri, 16 Nov 2018 16:08:29 +0800
Subject: [PATCH 22/23] =?UTF-8?q?feat:=20=E8=AE=BE=E7=BD=AE=20icon:=20''?=
 =?UTF-8?q?=20=E5=8F=AF=E4=BB=A5=E5=8F=96=E6=B6=88=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E7=9A=84=E8=8F=9C=E5=8D=95=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: d120f41c803d47690de8893477c756e6ffb83db2 [formerly d120f41c803d47690de8893477c756e6ffb83db2 [formerly d120f41c803d47690de8893477c756e6ffb83db2 [formerly d120f41c803d47690de8893477c756e6ffb83db2 [formerly 2f749745ee9ff29e12160add58eec22290864fb8 [formerly 4e13189cb5c790327bfb4e2077f5c56f15435e5b]]]]]
Former-commit-id: 44d5e2001b4fb2600683ae59cb344d11d2ce14ae
Former-commit-id: b2cce82b9b00f5e03464736de4d49d0244afdecb
Former-commit-id: ff18a6bc3834a98e2e40d1c7b5d36ef2bc445cac [formerly 3b1706d464f22a040836545bd1c3b9d3615791b6]
Former-commit-id: e4ed2abcdedf4064d8a610e529e2deb9304f869c
Former-commit-id: 2268aacbbc45cd16be1db1eeecc59c0b86206afd
Former-commit-id: 92d4ed88a305128f919d14c1af2f3a164657bcc4
Former-commit-id: ac16e300526c7dcf20d84bc95347be9f8e11216d
Former-commit-id: 3a9646f02accd23e664068d42efa5b7d057889bc
---
 .../components/components/menu-item/index.vue |  4 ++--
 .../components/components/menu-sub/index.vue  |  4 ++--
 src/menu/modules/demo-components.js           | 22 +++++++++----------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/layout/header-aside/components/components/menu-item/index.vue b/src/layout/header-aside/components/components/menu-item/index.vue
index 78c5ec4b..1e523b43 100644
--- a/src/layout/header-aside/components/components/menu-item/index.vue
+++ b/src/layout/header-aside/components/components/menu-item/index.vue
@@ -1,8 +1,8 @@
 <template>
   <el-menu-item :index="menu.path || uniqueId">
     <i v-if="menu.icon" :class="`fa fa-${menu.icon}`"></i>
-    <d2-icon-svg v-else-if="menu.iconSvg" :name="menu.iconSvg"/>
-    <i v-else class="fa fa-file-o"></i>
+    <i v-if="menu.icon === undefined" class="fa fa-file-o"></i>
+    <d2-icon-svg v-if="menu.iconSvg" :name="menu.iconSvg"/>
     <span slot="title">{{menu.title || '未命名菜单'}}</span>
   </el-menu-item>
 </template>
diff --git a/src/layout/header-aside/components/components/menu-sub/index.vue b/src/layout/header-aside/components/components/menu-sub/index.vue
index 04153222..946577b4 100644
--- a/src/layout/header-aside/components/components/menu-sub/index.vue
+++ b/src/layout/header-aside/components/components/menu-sub/index.vue
@@ -2,8 +2,8 @@
   <el-submenu :index="menu.path || uniqueId">
     <template slot="title">
       <i v-if="menu.icon" :class="`fa fa-${menu.icon}`"></i>
-      <d2-icon-svg v-else-if="menu.iconSvg" :name="menu.iconSvg"/>
-      <i v-else class="fa fa-folder-o"></i>
+      <i v-if="menu.icon === undefined" class="fa fa-folder-o"></i>
+      <d2-icon-svg v-if="menu.iconSvg" :name="menu.iconSvg"/>
       <span slot="title">{{menu.title}}</span>
     </template>
     <template v-for="(child, childIndex) in menu.children">
diff --git a/src/menu/modules/demo-components.js b/src/menu/modules/demo-components.js
index 0773964a..fc2235e2 100644
--- a/src/menu/modules/demo-components.js
+++ b/src/menu/modules/demo-components.js
@@ -12,32 +12,32 @@ export default {
         {
           title: '填充型',
           children: [
-            { path: `${pre}container/full`, title: '基础' },
-            { path: `${pre}container/full-slot`, title: '插槽' },
-            { path: `${pre}container/full-bs`, title: '滚动优化' }
+            { path: `${pre}container/full`, title: '基础', icon: '' },
+            { path: `${pre}container/full-slot`, title: '插槽', icon: '' },
+            { path: `${pre}container/full-bs`, title: '滚动优化', icon: '' }
           ]
         },
         {
           title: '隐形模式',
           children: [
-            { path: `${pre}container/ghost`, title: '基础' },
-            { path: `${pre}container/ghost-slot`, title: '插槽' },
-            { path: `${pre}container/ghost-bs`, title: '滚动优化' }
+            { path: `${pre}container/ghost`, title: '基础', icon: '' },
+            { path: `${pre}container/ghost-slot`, title: '插槽', icon: '' },
+            { path: `${pre}container/ghost-bs`, title: '滚动优化', icon: '' }
           ]
         },
         {
           title: '卡片型',
           children: [
-            { path: `${pre}container/card`, title: '基础' },
-            { path: `${pre}container/card-slot`, title: '插槽' },
-            { path: `${pre}container/card-bs`, title: '滚动优化' }
+            { path: `${pre}container/card`, title: '基础', icon: '' },
+            { path: `${pre}container/card-slot`, title: '插槽', icon: '' },
+            { path: `${pre}container/card-bs`, title: '滚动优化', icon: '' }
           ]
         },
         {
           title: '方法',
           children: [
-            { path: `${pre}container/api?bs=false`, title: '滚动控制' },
-            { path: `${pre}container/api?bs=true`, title: '滚动控制 BS' }
+            { path: `${pre}container/api?bs=false`, title: '滚动控制', icon: '' },
+            { path: `${pre}container/api?bs=true`, title: '滚动控制 BS', icon: '' }
           ]
         }
       ]

From 199e49799bc84ec2557405120d0cf490eb3c5b45 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Fri, 16 Nov 2018 16:09:39 +0800
Subject: [PATCH 23/23] update version

Former-commit-id: 6e20cf8ccac578d4f3b1d8342139a0ed1db1f0bb [formerly 6e20cf8ccac578d4f3b1d8342139a0ed1db1f0bb [formerly 6e20cf8ccac578d4f3b1d8342139a0ed1db1f0bb [formerly 6e20cf8ccac578d4f3b1d8342139a0ed1db1f0bb [formerly 71c53ac54c217b2dde7f3790dd4945c814b3cb8f [formerly 20f52ebdc2d67f6861484760ed73e9afd60984c4]]]]]
Former-commit-id: 9ede3d650e5af52c49c8a4c9b4eb4e56a2755faa
Former-commit-id: 4d02ecdd5cb5aa74f94ca7cd6338773dbd53d90e
Former-commit-id: 3514f1605d2b6952bfae086d67025fe6c561bc3c [formerly a33c35f426593b6319027d8ec39e5c9cc18dbf01]
Former-commit-id: 9f6b5c188b87badcbacf831062d8a0856d3c561d
Former-commit-id: 64b46bd0db333f802b07940b91cbdece91a7107f
Former-commit-id: 94aab0eb8bd1ea16c23992ac5def7af25fac2a41
Former-commit-id: ed06c3b480758aad41e8938d38819ad45719a33b
Former-commit-id: 5e046f9cebef565d4d8c39a009d3c884b9014840
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ce588dd2..2de7b438 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "d2-admin",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve --open",