From 8fc9a4eca680956ba1805c285e6450a471e652c5 Mon Sep 17 00:00:00 2001 From: xiaoxian521 <1923740402@qq.com> Date: Fri, 17 Feb 2023 18:04:01 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D`getHistoryMode`?= =?UTF-8?q?=E5=87=BD=E6=95=B0=E4=B8=AD=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F?= =?UTF-8?q?=E6=9C=AA=E5=88=9D=E5=A7=8B=E5=8C=96=E5=B8=A6=E6=9D=A5=E7=9A=84?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=83=AD=E6=9B=B4=E6=96=B0=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.ts | 2 +- src/router/utils.ts | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/router/index.ts b/src/router/index.ts index 25d7bf3b3..1650832a5 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -61,7 +61,7 @@ export const remainingPaths = Object.keys(remainingRouter).map(v => { /** 创建路由实例 */ export const router: Router = createRouter({ - history: getHistoryMode(), + history: getHistoryMode(import.meta.env.VITE_ROUTER_HISTORY), routes: constantRoutes.concat(...(remainingRouter as any)), strict: true, scrollBehavior(to, from, savedPosition) { diff --git a/src/router/utils.ts b/src/router/utils.ts index 68656e73f..d2a789803 100644 --- a/src/router/utils.ts +++ b/src/router/utils.ts @@ -322,8 +322,7 @@ function addAsyncRoutes(arrRoutes: Array) { } /** 获取路由历史模式 https://next.router.vuejs.org/zh/guide/essentials/history-mode.html */ -function getHistoryMode(): RouterHistory { - const routerHistory = import.meta.env.VITE_ROUTER_HISTORY; +function getHistoryMode(routerHistory): RouterHistory { // len为1 代表只有历史模式 为2 代表历史模式中存在base参数 https://next.router.vuejs.org/zh/api/#%E5%8F%82%E6%95%B0-1 const historyMode = routerHistory.split(","); const leftMode = historyMode[0]; From b4456dc71ad42029716ad1045a86593bb3a223e2 Mon Sep 17 00:00:00 2001 From: luojz <74349832+coderluojz@users.noreply.github.com> Date: Tue, 28 Feb 2023 17:33:28 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AF=BC=E8=88=AA?= =?UTF-8?q?tab=E8=BF=87=E5=A4=9A=E5=AF=BC=E8=87=B4=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E6=A0=87=E7=AD=BE=E9=A1=B5=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E6=AD=A3=E5=B8=B8=E6=98=BE=E7=A4=BA=20(#454)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/components/tag/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layout/components/tag/index.vue b/src/layout/components/tag/index.vue index dd95e4ffa..423ab901c 100644 --- a/src/layout/components/tag/index.vue +++ b/src/layout/components/tag/index.vue @@ -193,13 +193,13 @@ function deleteDynamicTag(obj: any, current: any, tag?: string) { ): void => { if (other) { useMultiTagsStoreHook().handleTags("equal", [routerArrays[0], obj]); - dynamicTagView(); } else { delAliveRouteList = useMultiTagsStoreHook().handleTags("splice", "", { startIndex, length }) as any; } + dynamicTagView(); }; if (tag === "other") { From f47fe9f19d3c71f389fa713744093aad14fb1592 Mon Sep 17 00:00:00 2001 From: xiaoxian521 <1923740402@qq.com> Date: Tue, 28 Feb 2023 17:55:58 +0800 Subject: [PATCH 3/3] =?UTF-8?q?chore:=20=E8=B7=AF=E7=94=B1=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=20`showLink`=20=E8=AE=BE=E7=BD=AE=E6=88=90=20`false`?= =?UTF-8?q?=20=E5=90=8E=EF=BC=8C=E5=BD=93=E5=89=8D=E8=B7=AF=E7=94=B1?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=B8=8D=E6=B7=BB=E5=8A=A0=E5=88=B0=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/hooks/useTag.ts | 9 +++++++-- src/store/modules/multiTags.ts | 6 ++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/layout/hooks/useTag.ts b/src/layout/hooks/useTag.ts index aed9f5848..40fb1922b 100644 --- a/src/layout/hooks/useTag.ts +++ b/src/layout/hooks/useTag.ts @@ -12,10 +12,15 @@ import { tagsViewsType } from "../types"; import { useEventListener } from "@vueuse/core"; import { useRoute, useRouter } from "vue-router"; import { transformI18n, $t } from "@/plugins/i18n"; -import { isEqual, isBoolean } from "@pureadmin/utils"; import { useSettingStoreHook } from "@/store/modules/settings"; import { useMultiTagsStoreHook } from "@/store/modules/multiTags"; -import { storageLocal, toggleClass, hasClass } from "@pureadmin/utils"; +import { + isEqual, + isBoolean, + storageLocal, + toggleClass, + hasClass +} from "@pureadmin/utils"; import Fullscreen from "@iconify-icons/ri/fullscreen-fill"; import CloseAllTags from "@iconify-icons/ri/subtract-line"; diff --git a/src/store/modules/multiTags.ts b/src/store/modules/multiTags.ts index 5099e25a5..70f9f1f95 100644 --- a/src/store/modules/multiTags.ts +++ b/src/store/modules/multiTags.ts @@ -1,9 +1,8 @@ import { defineStore } from "pinia"; import { store } from "@/store"; -import { isEqual } from "@pureadmin/utils"; import { routerArrays } from "@/layout/types"; import { multiType, positionType } from "./types"; -import { isUrl, storageLocal } from "@pureadmin/utils"; +import { isEqual, isBoolean, isUrl, storageLocal } from "@pureadmin/utils"; export const useMultiTagsStore = defineStore({ id: "pure-multiTags", @@ -54,6 +53,9 @@ export const useMultiTagsStore = defineStore({ if (isUrl(tagVal?.name)) return; // 如果title为空拒绝添加空信息到标签页 if (tagVal?.meta?.title.length === 0) return; + // showLink:false 不添加到标签页 + if (isBoolean(tagVal?.meta?.showLink) && !tagVal?.meta?.showLink) + return; const tagPath = tagVal.path; // 判断tag是否已存在 const tagHasExits = this.multiTags.some(tag => {