From 3d9b18c77a63e03741737fdf3e5fb80e6bbb8241 Mon Sep 17 00:00:00 2001
From: toesbieya <1647775459@qq.com>
Date: Mon, 24 Feb 2020 14:54:02 +0800
Subject: [PATCH] =?UTF-8?q?tagsView=E7=A7=BB=E9=99=A4=E6=8B=96=E6=8B=BD?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue/package-lock.json                        | 13 ------
 vue/package.json                             |  1 -
 vue/src/layout/components/TagsView/index.vue | 47 ++++++++------------
 vue/src/mixins/guide/data/navbar.js          |  2 +-
 4 files changed, 20 insertions(+), 43 deletions(-)

diff --git a/vue/package-lock.json b/vue/package-lock.json
index b47c936..c4e826b 100644
--- a/vue/package-lock.json
+++ b/vue/package-lock.json
@@ -10817,11 +10817,6 @@
         "is-plain-obj": "^1.0.0"
       }
     },
-    "sortablejs": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.10.2.tgz",
-      "integrity": "sha512-YkPGufevysvfwn5rfdlGyrGjt7/CRHwvRPogD/lC+TnvcN29jDpCifKP+rBqf+LRldfXSTh+0CGLcSg0VIxq3A=="
-    },
     "source-list-map": {
       "version": "2.0.1",
       "resolved": "https://registry.npm.taobao.org/source-list-map/download/source-list-map-2.0.1.tgz",
@@ -12295,14 +12290,6 @@
       "integrity": "sha1-HuO8mhbsv1EYvjNLsV+cRvgvWCU=",
       "dev": true
     },
-    "vuedraggable": {
-      "version": "2.23.2",
-      "resolved": "https://registry.npmjs.org/vuedraggable/-/vuedraggable-2.23.2.tgz",
-      "integrity": "sha512-PgHCjUpxEAEZJq36ys49HfQmXglattf/7ofOzUrW2/rRdG7tu6fK84ir14t1jYv4kdXewTEa2ieKEAhhEMdwkQ==",
-      "requires": {
-        "sortablejs": "^1.10.1"
-      }
-    },
     "vuex": {
       "version": "3.1.2",
       "resolved": "https://registry.npm.taobao.org/vuex/download/vuex-3.1.2.tgz",
diff --git a/vue/package.json b/vue/package.json
index 56c9f9e..3082d20 100644
--- a/vue/package.json
+++ b/vue/package.json
@@ -22,7 +22,6 @@
     "vue-count-to": "^1.0.13",
     "vue-cropper": "^0.5.0",
     "vue-router": "^3.1.3",
-    "vuedraggable": "^2.23.2",
     "vuex": "^3.0.1"
   },
   "devDependencies": {
diff --git a/vue/src/layout/components/TagsView/index.vue b/vue/src/layout/components/TagsView/index.vue
index 3f60105..b323e91 100644
--- a/vue/src/layout/components/TagsView/index.vue
+++ b/vue/src/layout/components/TagsView/index.vue
@@ -1,27 +1,24 @@
 <template>
     <nav class="tags-view-container">
         <scroll-pane class="tags-view-wrapper" ref="scrollPane">
-            <draggable :draggable="'.draggable'" v-model="visitedViews">
-                <transition-group name="flip-list" type="transition">
-                    <router-link :class="{active:isActive(tag),draggable:!isAffix(tag)}"
-                                 :key="tag.path"
-                                 :to="{ path: tag.path, query: tag.query, fullPath: tag.fullPath }"
-                                 @contextmenu.prevent.native="openMenu(tag,$event)"
-                                 @dblclick.prevent.native="closeSelectedTag(tag)"
-                                 class="tags-view-item"
-                                 ref="tag"
-                                 tag="div"
-                                 v-for="tag in visitedViews">
-                        {{ tag.title }}
-                        <i @click.prevent.stop="closeSelectedTag(tag)" class="el-icon-close"
-                           v-if="!isAffix(tag)"/>
-                    </router-link>
-                </transition-group>
-            </draggable>
+            <router-link
+                    v-for="tag in visitedViews"
+                    ref="tag"
+                    :class="{active:isActive(tag)}"
+                    :key="tag.path"
+                    :to="{ path: tag.path, query: tag.query, fullPath: tag.fullPath }"
+                    class="tags-view-item"
+                    tag="div"
+                    @contextmenu.prevent.native="openMenu(tag,$event)"
+                    @dblclick.prevent.native="closeSelectedTag(tag)"
+            >
+                {{ tag.title }}
+                <i v-if="!isAffix(tag)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)"/>
+            </router-link>
         </scroll-pane>
-        <context-menu :left="contextmenu.left" :top="contextmenu.top" v-model="contextmenu.show">
+        <context-menu v-model="contextmenu.show" :left="contextmenu.left" :top="contextmenu.top">
             <context-menu-item @click="refreshSelectedTag(selectedTag)">刷新</context-menu-item>
-            <context-menu-item @click="closeSelectedTag(selectedTag)" v-show="!isAffix(selectedTag)">
+            <context-menu-item v-show="!isAffix(selectedTag)" @click="closeSelectedTag(selectedTag)">
                 关闭
             </context-menu-item>
             <context-menu-item @click="closeOthersTags">关闭其他</context-menu-item>
@@ -31,7 +28,6 @@
 </template>
 
 <script>
-    import Draggable from 'vuedraggable'
     import ScrollPane from './ScrollPane'
     import ContextMenu from "@/components/ContextMenu"
     import ContextMenuItem from "@/components/ContextMenu/ContextMenuItem"
@@ -40,7 +36,7 @@
 
     export default {
         mixins: [shortcutsMixin, decideRouterTransitionMixin],
-        components: {ContextMenu, ContextMenuItem, ScrollPane, Draggable},
+        components: {ContextMenu, ContextMenuItem, ScrollPane},
         data() {
             return {
                 contextmenu: {
@@ -54,13 +50,8 @@
             }
         },
         computed: {
-            visitedViews: {
-                get() {
-                    return this.$store.state.tagsView.visitedViews
-                },
-                set(v) {
-                    this.$store.commit('tagsView/SET_VISITED_VIEWS', v)
-                }
+            visitedViews() {
+                return this.$store.state.tagsView.visitedViews
             },
             routes() {
                 return this.$store.state.resource.routes
diff --git a/vue/src/mixins/guide/data/navbar.js b/vue/src/mixins/guide/data/navbar.js
index 9d8cb56..0a2ea68 100644
--- a/vue/src/mixins/guide/data/navbar.js
+++ b/vue/src/mixins/guide/data/navbar.js
@@ -24,7 +24,7 @@ const steps = [
         content: `<p>这是tab栏，可以右键tab页进行相关操作</p>
                   <p>ctrl + ← → 可以进行tab页的左右切换</p>
                   <p>当tab过多时通过鼠标滚轮来滚动</p>
-                  <p>非固定的tab可以拖动排序</p>`,
+                  <p>双击可以关闭</p>`,
         /*forceShowNextBtn: true,
         nextBtnText: '下一阶段',
         onNext() {