From 7669dc66edcaca669d420995f3b93ebbc0353777 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=9D=E5=85=88=E7=91=9E?= <1490493387@qq.com>
Date: Wed, 25 May 2022 23:32:51 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=85=B3=E9=97=AD=E5=85=B6=E4=BB=96?=
 =?UTF-8?q?=E8=B7=AF=E7=94=B1=E6=97=A0=E6=B3=95=E5=88=87=E6=8D=A2=E5=88=B0?=
 =?UTF-8?q?=E5=BD=93=E5=89=8D=E9=80=89=E4=B8=AD=E7=9A=84tag?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: c03db1d1d2216cf9acf4477919cec01f0934f71b
---
 src/layout/components/TagsView/ScrollPane.vue | 26 ++++++++++---------
 src/layout/components/TagsView/index.vue      | 15 +++++------
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/src/layout/components/TagsView/ScrollPane.vue b/src/layout/components/TagsView/ScrollPane.vue
index b13605d9..60cb9bb8 100644
--- a/src/layout/components/TagsView/ScrollPane.vue
+++ b/src/layout/components/TagsView/ScrollPane.vue
@@ -1,6 +1,6 @@
 <template>
   <el-scrollbar
-    ref="scrollContainerRef"
+    ref="scrollContainer"
     :vertical="false"
     class="scroll-container"
     @wheel.prevent="handleScroll"
@@ -21,24 +21,26 @@ import { TagView } from '@/types';
 import useStore from '@/store';
 
 const tagAndTagSpacing = ref(4);
-const scrollContainerRef = ref(null);
+const { proxy } = getCurrentInstance() as any;
+
+const emits = defineEmits(['scroll']);
+const emitScroll = () => {
+  emits('scroll')
+}
 
 const { tagsView } = useStore();
 
 const visitedViews = computed(() => tagsView.visitedViews);
 
-const { ctx } = getCurrentInstance() as any;
-const scrollWrapper = computed(() => {
-  return (scrollContainerRef.value as any).$refs.wrap as HTMLElement;
-});
+const scrollWrapper = computed(() => proxy?.$refs.scrollContainer.$refs.wrap$);
 
 onMounted(() => {
-  //scrollWrapper.value.addEventListener('scroll', emitScroll, true);
-});
-
+  scrollWrapper.value.addEventListener('scroll', emitScroll, true)
+})
 onBeforeUnmount(() => {
-  // scrollWrapper.value.removeEventListener('scroll', emitScroll);
-});
+  scrollWrapper.value.removeEventListener('scroll', emitScroll)
+})
+
 
 function handleScroll(e: WheelEvent) {
   const eventDelta = (e as any).wheelDelta || -e.deltaY * 40;
@@ -47,7 +49,7 @@ function handleScroll(e: WheelEvent) {
 }
 
 function moveToTarget(currentTag: TagView) {
-  const $container = ctx.$refs.scrollContainer.$el;
+  const $container = proxy.$refs.scrollContainer.$el;
   const $containerWidth = $container.offsetWidth;
   const $scrollWrapper = scrollWrapper.value;
 
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 786b07d0..2a0d0ad1 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -156,21 +156,17 @@ function addTags() {
 }
 
 function moveToCurrentTag() {
-  const tags = getCurrentInstance()?.refs.tag as any[];
   nextTick(() => {
-    if (tags === null || tags === undefined || !Array.isArray(tags)) {
-      return;
-    }
-    for (const tag of tags) {
-      if ((tag.to as TagView).path === route.path) {
-        (scrollPaneRef.value as any).value.moveToTarget(tag);
+    for (const r of visitedViews.value) {
+      if (r.path === route.path) {
+        scrollPaneRef.value.moveToTarget(r);
         // when query is different then update
-        if ((tag.to as TagView).fullPath !== route.fullPath) {
+        if (r.fullPath !== route.fullPath) {
           tagsView.updateVisitedView(route);
         }
       }
     }
-  });
+  })
 }
 
 function isActive(tag: TagView) {
@@ -258,6 +254,7 @@ function closeRightTags() {
 }
 
 function closeOtherTags() {
+  router.push(selectedTag.value)
   tagsView.delOtherViews(selectedTag.value).then(() => {
     moveToCurrentTag();
   });