From daa982498069126fdc40fed03e8e4bb75b9be63a Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Mon, 6 Feb 2023 11:35:54 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2tab=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/components/navTabs.vue   | 56 ++++++++++++++++++++++++--------
 web/src/components/sliderNav.vue |  5 +--
 web/src/utils/store.js           | 13 ++++++--
 3 files changed, 55 insertions(+), 19 deletions(-)

diff --git a/web/src/components/navTabs.vue b/web/src/components/navTabs.vue
index a5291f3..189f51c 100644
--- a/web/src/components/navTabs.vue
+++ b/web/src/components/navTabs.vue
@@ -1,18 +1,29 @@
 <template>
   <section class="navTabs flex pad-h8 pad-v8">
-    <div class="item pad-h8" v-text="`首页`" :class="{current:$route.name=='工作台'}" @click="$router.push({name:'工作台'})"/>
-    <div class="item pad-h8 flex center" v-for="(item,i) in tabs" :key="item.id"
-         :class="{current:item.name==$route.name}" @click="handleJump(item)">
-      <div class="mar-r8" v-text="item.label"/>
-      <el-icon @click.stop="handleClosePage(i)">
-        <Close/>
-      </el-icon>
+    <div class="fill flex">
+      <div class="item pad-h8" v-text="`首页`" :class="{current:$route.name=='工作台'}" @click="$router.push({name:'工作台'})"/>
+      <div class="item pad-h8 flex center" v-for="(item,i) in tabs" :key="item.id"
+           :class="{current:item.name==$route.name}" @click="handleJump(item)">
+        <div class="mar-r8" v-text="item.label"/>
+        <el-icon @click.stop="handleClosePage(item.id)">
+          <Close/>
+        </el-icon>
+      </div>
     </div>
+    <el-dropdown class="mar-l8" @command="handleOpt">
+      <el-button>更多</el-button>
+      <template #dropdown>
+        <el-dropdown-menu>
+          <el-dropdown-item command="clearAllPages">关闭全部</el-dropdown-item>
+          <el-dropdown-item command="clearOtherPages">关闭其他</el-dropdown-item>
+        </el-dropdown-menu>
+      </template>
+    </el-dropdown>
   </section>
 </template>
 
 <script>
-import {mapState} from "pinia/dist/pinia";
+import {mapActions, mapState} from "pinia/dist/pinia";
 import {mainStore} from "../utils/store";
 import {Close} from "@element-plus/icons-vue";
 
@@ -24,12 +35,29 @@ export default {
     tabs: v => v.pages
   },
   methods: {
-    handleClosePage(index) {
-      mainStore().deletePage(index)
-      this.handleJump(this.tabs?.[index - 1] || {name: '工作台'})
+    ...mapActions(mainStore, ['deletePage', 'clearOtherPages']),
+    handleClosePage(id) {
+      const {pages} = this
+      if (id == this.currentTab) {
+        const index = pages.findIndex(e => e.id == id)
+        const next = pages?.[index + 1] || pages?.[index - 1] || {id: this.fixed.id || "/"}
+        this.handleJump({name: next.id})
+      }
+      this.deletePage(id)
     },
     handleJump(page) {
-      this.$router.push({name: page.name})
+      const {name} = page
+      name != this.$route.fullPath && this.$router.push(name)
+    },
+    handleOpt(v) {
+      const opts = {
+        clearAllPages: () => {
+          mainStore().clearAllPages()
+          this.handleJump({name: "/"})
+        },
+        clearOtherPages: this.clearOtherPages
+      }
+      opts[v]();
     }
   },
   watch: {
@@ -53,11 +81,13 @@ export default {
   .item {
     border-radius: 4px;
     border: 1px solid #ccc;
-    line-height: 32px;
+    line-height: 30px;
     font-size: 14px;
     cursor: pointer;
     user-select: none;
     color: #999;
+    justify-self: flex-start;
+    flex-shrink: 0;
 
     &.current {
       color: #fff;
diff --git a/web/src/components/sliderNav.vue b/web/src/components/sliderNav.vue
index 7231100..00e5902 100644
--- a/web/src/components/sliderNav.vue
+++ b/web/src/components/sliderNav.vue
@@ -96,9 +96,6 @@ export default {
       margin-left: 12px;
     }
 
-    &:hover {
-      color: #ffffff;
-    }
   }
 
   .app {
@@ -106,7 +103,7 @@ export default {
     cursor: pointer;
 
     &:hover {
-      color: rgba(#fff, .8);
+      color: #fff;
     }
 
     &.active {
diff --git a/web/src/utils/store.js b/web/src/utils/store.js
index 146e769..d9969b9 100644
--- a/web/src/utils/store.js
+++ b/web/src/utils/store.js
@@ -27,8 +27,17 @@ export const mainStore = defineStore('main', {
     addPage(page) {
       if (!this.pages.find(e => e.id == location.href)) this.pages.push({...page, id: location.href})
     },
-    deletePage(i) {
-      this.pages.splice(i, 1)
+    deletePage(id) {
+      id = id || location.href?.replace(location.origin, "")
+      const i = this.pages.findIndex(e => e.id == id)
+      i > -1 && this.pages.splice(i, 1)
+    },
+    clearAllPages() {
+      this.pages = []
+    },
+    clearOtherPages() {
+      const id = location.href?.replace(location.origin, "")
+      this.pages = this.pages.filter(e => e.id == id) || []
     },
     logout() {
       this.user = {}