From 76437df5a286adca3dfd6c93f7166702e17239e0 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 15 Jul 2018 10:08:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 2633b0171ec3b6e6d96949cf593dea3c461abf11 [formerly 2633b0171ec3b6e6d96949cf593dea3c461abf11 [formerly 2633b0171ec3b6e6d96949cf593dea3c461abf11 [formerly 2633b0171ec3b6e6d96949cf593dea3c461abf11 [formerly 2d44dc9f335eb0079ddc5b3f5f619c36989748ad [formerly a583e1e6fba053d60a995188b644efa464d9bf1e]]]]]
Former-commit-id: a240818780d5876f318a89c1a09e3e682772e9ed
Former-commit-id: 28a7f169d87181f709d32ec8707a7ebe5ac9df51
Former-commit-id: 96be7e6c54ddfb42d711bb4a8f13c629b597d47e [formerly 77bd5abfee56adf12ae864fbbc7f4c5221e1518b]
Former-commit-id: 06ac51608fe59c768fec2500c3a2b172cc5d7868
Former-commit-id: 63f9816eaa1580fb3984be356af09ea60378a4d0
Former-commit-id: 7ba4c0097008bc9ce444f88cb2403a00d745a9fc
Former-commit-id: bc04fb37f399a32fee891282f12b2ed4cb2b6fc1
Former-commit-id: 0f7ea2d17f4845bdc3436e76e848bf0705bf2a25
---
 docs/zh/components/container.md                        |  2 ++
 src/components/core/d2-multiple-page-control/index.vue | 10 +++-------
 src/pages/demo/components/container/md/doc-full-bs.md  |  2 ++
 src/store/modules/d2admin.js.REMOVED.git-id            |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docs/zh/components/container.md b/docs/zh/components/container.md
index ca365897..741eb7f9 100644
--- a/docs/zh/components/container.md
+++ b/docs/zh/components/container.md
@@ -83,6 +83,8 @@ export default {
 
 你可以通过设置 `scroll` 来启用自定义滚动条，看起来更美观一些
 
+> 有些情况下使用滚动优化模式会有意外影响，例如页面内含有可拖拽的元素，这时候最好不要使用此模式
+
 示例：
 
 ``` vue
diff --git a/src/components/core/d2-multiple-page-control/index.vue b/src/components/core/d2-multiple-page-control/index.vue
index cf050854..69307db7 100644
--- a/src/components/core/d2-multiple-page-control/index.vue
+++ b/src/components/core/d2-multiple-page-control/index.vue
@@ -50,11 +50,6 @@
 <script>
 import { mapState, mapMutations } from 'vuex'
 export default {
-  data () {
-    return {
-      activeName: 'first'
-    }
-  },
   computed: {
     ...mapState({
       pageOpenedList: state => state.d2admin.pageOpenedList,
@@ -91,7 +86,7 @@ export default {
       }
     },
     /**
-     * @description 接收点击关闭控制上按钮的事件 暂时这个按钮还只有关闭全部标签的功能
+     * @description 接收点击关闭控制上按钮的事件
      */
     handleControlBtnClick () {
       this.d2adminTagCloseAll(this)
@@ -100,6 +95,7 @@ export default {
      * @description 接收点击 tab 标签的事件
      */
     handleClick (tab, event) {
+      // 找到点击的页面在 tag 列表里是哪个
       const page = this.pageOpenedList.find(page => page.name === tab.name)
       if (page) {
         this.$router.push({
@@ -110,7 +106,7 @@ export default {
       }
     },
     /**
-     * @description 点击 tab 上的删除按钮后首先触发这里 首页的删除按钮已经隐藏 因此这里不用判断是 index
+     * @description 点击 tab 上的删除按钮触发这里 首页的删除按钮已经隐藏 因此这里不用判断是 index
      */
     handleTabsEdit (tagName, action) {
       if (action === 'remove') {
diff --git a/src/pages/demo/components/container/md/doc-full-bs.md b/src/pages/demo/components/container/md/doc-full-bs.md
index e292a4eb..ca2ec2f6 100644
--- a/src/pages/demo/components/container/md/doc-full-bs.md
+++ b/src/pages/demo/components/container/md/doc-full-bs.md
@@ -2,6 +2,8 @@
 
 无论内容高度多少，都会自动撑满页面，并有可选的 `header` 和 `footer` 插槽，**并且使用自定义滚动条代替原生滚动条**，是否启用此功能请自行取舍
 
+> 有些情况下使用滚动优化模式会有意外影响，例如页面内含有可拖拽的元素，这时候最好不要使用此模式
+
 示例：
 
 ```
diff --git a/src/store/modules/d2admin.js.REMOVED.git-id b/src/store/modules/d2admin.js.REMOVED.git-id
index 5105e385..e446952e 100644
--- a/src/store/modules/d2admin.js.REMOVED.git-id
+++ b/src/store/modules/d2admin.js.REMOVED.git-id
@@ -1 +1 @@
-7b00c68fab8dc619a65443ffe19bba7dee9daaed
\ No newline at end of file
+dbbf4b265c5bc57b7defe585c27f8491ca9e7a85
\ No newline at end of file