diff --git a/mayfly_go_web/package.json b/mayfly_go_web/package.json index 7dde4419..355b92b6 100644 --- a/mayfly_go_web/package.json +++ b/mayfly_go_web/package.json @@ -29,7 +29,7 @@ "sql-formatter": "^12.1.2", "vue": "^3.3.4", "vue-clipboard3": "^1.0.1", - "vue-router": "^4.2.1", + "vue-router": "^4.2.2", "xterm": "^5.1.0", "xterm-addon-fit": "^0.7.0" }, @@ -49,7 +49,7 @@ "sass": "^1.62.0", "sass-loader": "^13.2.0", "typescript": "^5.0.2", - "vite": "^4.3.8", + "vite": "^4.3.9", "vue-eslint-parser": "^9.1.1" }, "browserslist": [ diff --git a/mayfly_go_web/src/views/layout/component/columnsAside.vue b/mayfly_go_web/src/views/layout/component/columnsAside.vue index 9ed734e7..0e799aa4 100644 --- a/mayfly_go_web/src/views/layout/component/columnsAside.vue +++ b/mayfly_go_web/src/views/layout/component/columnsAside.vue @@ -7,7 +7,7 @@ if (el) columnsAsideOffsetTopRefs[k] = el; } " :class="{ 'layout-columns-active': state.liIndex === k }" :title="v.meta.title"> -
+
{{ v.meta.title && v.meta.title.length >= 4 ? v.meta.title.substr(0, 4) : v.meta.title }} diff --git a/mayfly_go_web/src/views/layout/component/main.vue b/mayfly_go_web/src/views/layout/component/main.vue index 89cf539c..3f788649 100644 --- a/mayfly_go_web/src/views/layout/component/main.vue +++ b/mayfly_go_web/src/views/layout/component/main.vue @@ -1,15 +1,15 @@ diff --git a/mayfly_go_web/src/views/layout/footer/index.vue b/mayfly_go_web/src/views/layout/footer/index.vue index 130814f3..184401c0 100644 --- a/mayfly_go_web/src/views/layout/footer/index.vue +++ b/mayfly_go_web/src/views/layout/footer/index.vue @@ -1,8 +1,8 @@ diff --git a/mayfly_go_web/src/views/layout/navBars/breadcrumb/search.vue b/mayfly_go_web/src/views/layout/navBars/breadcrumb/search.vue index 2bb8f5db..f5ac4a33 100644 --- a/mayfly_go_web/src/views/layout/navBars/breadcrumb/search.vue +++ b/mayfly_go_web/src/views/layout/navBars/breadcrumb/search.vue @@ -87,7 +87,7 @@ const getRoutes = (routes: any) => { // 当前菜单选中时 const onHandleSelect = (item: any) => { let { path, redirect } = item; - if (item.meta.link && !item.meta.isIframe) window.open(item.meta.link); + if (item.meta.link && item.meta.linkType == 2) window.open(item.meta.link); else if (redirect) router.push(redirect); else router.push(path); closeSearch(); diff --git a/mayfly_go_web/src/views/layout/navBars/tagsView/tagsView.vue b/mayfly_go_web/src/views/layout/navBars/tagsView/tagsView.vue index 0a34f379..af48c8ab 100644 --- a/mayfly_go_web/src/views/layout/navBars/tagsView/tagsView.vue +++ b/mayfly_go_web/src/views/layout/navBars/tagsView/tagsView.vue @@ -38,7 +38,7 @@ import { useRoute, useRouter, onBeforeRouteUpdate } from 'vue-router'; import screenfull from 'screenfull'; import { storeToRefs } from 'pinia'; import { useThemeConfig } from '@/store/themeConfig'; -import { getSession, setSession, removeSession } from '@/common/utils/storage.ts'; +import { getSession, setSession, removeSession } from '@/common/utils/storage'; import mittBus from '@/common/utils/mitt'; import Sortable from 'sortablejs'; import Contextmenu from '@/views/layout/navBars/tagsView/contextmenu.vue'; @@ -99,13 +99,14 @@ const addTagsView = (path: string, to: any = null) => { if (!to) { to = route; } + path = decodeURI(path); for (let tv of state.tagsViewList) { if (tv.fullPath === path) { return false; } } - + const tagView = { ...to } // 防止Converting circular structure to JSON错误 tagView.matched = null; diff --git a/mayfly_go_web/src/views/layout/navMenu/horizontal.vue b/mayfly_go_web/src/views/layout/navMenu/horizontal.vue index 7e40d00c..9d5d0c43 100644 --- a/mayfly_go_web/src/views/layout/navMenu/horizontal.vue +++ b/mayfly_go_web/src/views/layout/navMenu/horizontal.vue @@ -12,7 +12,7 @@ -