From 2b1f5f2c7033eebee97de472b5f6195d95516b80 Mon Sep 17 00:00:00 2001
From: LiuHao <liuhaoai545@gmail.com>
Date: 星期五, 27 十二月 2024 11:45:33 +0800
Subject: [PATCH] 优化 主题色在深色模式下显示亮度
---
src/layout/components/TagsView/index.vue | 235 ++++++++++++++++++++++++++++++----------------------------
1 files changed, 121 insertions(+), 114 deletions(-)
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 9f4db62..9bcf285 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -1,77 +1,113 @@
+<template>
+ <div id="tags-view-container" class="tags-view-container">
+ <scroll-pane ref="scrollPaneRef" class="tags-view-wrapper" @scroll="handleScroll">
+ <router-link
+ v-for="tag in visitedViews"
+ :key="tag.path"
+ :data-path="tag.path"
+ :class="isActive(tag) ? 'active' : ''"
+ :to="{ path: tag.path ? tag.path : '', query: tag.query, fullPath: tag.fullPath ? tag.fullPath : '' }"
+ class="tags-view-item"
+ :style="activeStyle(tag)"
+ @click.middle="!isAffix(tag) ? closeSelectedTag(tag) : ''"
+ @contextmenu.prevent="openMenu(tag, $event)"
+ >
+ {{ tag.title }}
+ <span v-if="!isAffix(tag)" @click.prevent.stop="closeSelectedTag(tag)">
+ <close class="el-icon-close" style="width: 1em; height: 1em; vertical-align: middle" />
+ </span>
+ </router-link>
+ </scroll-pane>
+ <ul v-show="visible" :style="{ left: left + 'px', top: top + 'px' }" class="contextmenu">
+ <li @click="refreshSelectedTag(selectedTag)"><refresh-right style="width: 1em; height: 1em" /> 鍒锋柊椤甸潰</li>
+ <li v-if="!isAffix(selectedTag)" @click="closeSelectedTag(selectedTag)"><close style="width: 1em; height: 1em" /> 鍏抽棴褰撳墠</li>
+ <li @click="closeOthersTags"><circle-close style="width: 1em; height: 1em" /> 鍏抽棴鍏朵粬</li>
+ <li v-if="!isFirstView()" @click="closeLeftTags"><back style="width: 1em; height: 1em" /> 鍏抽棴宸︿晶</li>
+ <li v-if="!isLastView()" @click="closeRightTags"><right style="width: 1em; height: 1em" /> 鍏抽棴鍙充晶</li>
+ <li @click="closeAllTags(selectedTag)"><circle-close style="width: 1em; height: 1em" /> 鍏ㄩ儴鍏抽棴</li>
+ </ul>
+ </div>
+</template>
+
<script setup lang="ts">
-import ScrollPane from './ScrollPane.vue'
-import { getNormalPath } from '@/utils/ruoyi'
-import useTagsViewStore from "@/store/modules/tagsView";
-import useSettingsStore from '@/store/modules/settings'
-import usePermissionStore from '@/store/modules/permission'
-import { ComponentInternalInstance } from "vue";
-import { RouteOption, TagView, RouteLocationRaw } from "vue-router";
+import ScrollPane from './ScrollPane.vue';
+import { getNormalPath } from '@/utils/ruoyi';
+import useSettingsStore from '@/store/modules/settings';
+import usePermissionStore from '@/store/modules/permission';
+import useTagsViewStore from '@/store/modules/tagsView';
+import { RouteRecordRaw, RouteLocationNormalized } from 'vue-router';
const visible = ref(false);
const top = ref(0);
const left = ref(0);
-const selectedTag = ref<TagView>({});
-const affixTags = ref<TagView[]>([]);
-const scrollPaneRef = ref(ScrollPane);
+const selectedTag = ref<RouteLocationNormalized>();
+const affixTags = ref<RouteLocationNormalized[]>([]);
+const scrollPaneRef = ref<InstanceType<typeof ScrollPane>>();
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const route = useRoute();
const router = useRouter();
-const visitedViews = computed(() => useTagsViewStore().visitedViews);
-const routes = computed(() => usePermissionStore().routes);
+const visitedViews = computed(() => useTagsViewStore().getVisitedViews());
+const routes = computed(() => usePermissionStore().getRoutes());
const theme = computed(() => useSettingsStore().theme);
watch(route, () => {
addTags();
moveToCurrentTag();
-})
+});
watch(visible, (value) => {
if (value) {
document.body.addEventListener('click', closeMenu);
} else {
document.body.removeEventListener('click', closeMenu);
}
-})
+});
-const isActive = (r: TagView): boolean => {
+const isActive = (r: RouteLocationNormalized): boolean => {
return r.path === route.path;
-}
-const activeStyle = (tag: TagView) => {
+};
+const activeStyle = (tag: RouteLocationNormalized) => {
if (!isActive(tag)) return {};
return {
- "background-color": theme.value,
- "border-color": theme.value
+ 'background-color': 'var(--tags-view-active-bg)',
+ 'border-color': 'var(--tags-view-active-border-color)'
};
-}
-const isAffix = (tag: TagView) => {
- return tag.meta && tag.meta.affix;
-}
+};
+const isAffix = (tag: RouteLocationNormalized) => {
+ return tag?.meta && tag?.meta?.affix;
+};
const isFirstView = () => {
try {
return selectedTag.value.fullPath === '/index' || selectedTag.value.fullPath === visitedViews.value[1].fullPath;
} catch (err) {
return false;
}
-}
+};
const isLastView = () => {
try {
return selectedTag.value.fullPath === visitedViews.value[visitedViews.value.length - 1].fullPath;
} catch (err) {
return false;
}
-}
-const filterAffixTags = (routes:RouteOption [], basePath = '') => {
- let tags:TagView[] = []
- routes.forEach(route => {
+};
+const filterAffixTags = (routes: RouteRecordRaw[], basePath = '') => {
+ let tags: RouteLocationNormalized[] = [];
+
+ routes.forEach((route) => {
if (route.meta && route.meta.affix) {
const tagPath = getNormalPath(basePath + '/' + route.path);
tags.push({
+ hash: '',
+ matched: [],
+ params: undefined,
+ query: undefined,
+ redirectedFrom: undefined,
fullPath: tagPath,
path: tagPath,
- name: route.name,
+ name: route.name as string,
meta: { ...route.meta }
- })
+ });
}
if (route.children) {
const tempTags = filterAffixTags(route.children, route.path);
@@ -79,9 +115,9 @@
tags = [...tags, ...tempTags];
}
}
- })
- return tags
-}
+ });
+ return tags;
+};
const initTags = () => {
const res = filterAffixTags(routes.value);
affixTags.value = res;
@@ -91,72 +127,71 @@
useTagsViewStore().addVisitedView(tag);
}
}
-}
+};
const addTags = () => {
const { name } = route;
- if (name) {
- useTagsViewStore().addView(route);
- if (route.meta.link) {
- useTagsViewStore().addIframeView(route);
- }
+ if (route.query.title) {
+ route.meta.title = route.query.title as string;
}
- return false
-}
+ if (name) {
+ useTagsViewStore().addView(route as any);
+ }
+};
const moveToCurrentTag = () => {
nextTick(() => {
for (const r of visitedViews.value) {
if (r.path === route.path) {
- scrollPaneRef.value.moveToTarget(r);
+ scrollPaneRef.value?.moveToTarget(r);
// when query is different then update
if (r.fullPath !== route.fullPath) {
useTagsViewStore().updateVisitedView(route);
}
}
}
- })
-}
-const refreshSelectedTag = (view: TagView) => {
+ });
+};
+const refreshSelectedTag = (view: RouteLocationNormalized) => {
proxy?.$tab.refreshPage(view);
if (route.meta.link) {
useTagsViewStore().delIframeView(route);
}
-}
-const closeSelectedTag = (view: TagView) => {
+};
+const closeSelectedTag = (view: RouteLocationNormalized) => {
proxy?.$tab.closePage(view).then(({ visitedViews }: any) => {
if (isActive(view)) {
toLastView(visitedViews, view);
}
- })
-}
+ });
+};
const closeRightTags = () => {
- proxy?.$tab.closeRightPage(selectedTag.value).then(visitedViews => {
- if (!visitedViews.find(i => i.fullPath === route.fullPath)) {
+ proxy?.$tab.closeRightPage(selectedTag.value).then((visitedViews: RouteLocationNormalized[]) => {
+ if (!visitedViews.find((i: RouteLocationNormalized) => i.fullPath === route.fullPath)) {
toLastView(visitedViews);
}
- })
-}
+ });
+};
const closeLeftTags = () => {
- proxy?.$tab.closeLeftPage(selectedTag.value).then(visitedViews => {
- if (!visitedViews.find(i => i.fullPath === route.fullPath)) {
+ proxy?.$tab.closeLeftPage(selectedTag.value).then((visitedViews: RouteLocationNormalized[]) => {
+ if (!visitedViews.find((i: RouteLocationNormalized) => i.fullPath === route.fullPath)) {
toLastView(visitedViews);
}
- })
-}
+ });
+};
const closeOthersTags = () => {
- router.push(selectedTag.value as RouteLocationRaw).catch(() => { });
+ router.push(selectedTag.value).catch(() => {});
proxy?.$tab.closeOtherPage(selectedTag.value).then(() => {
moveToCurrentTag();
- })
-}
-const closeAllTags = (view: TagView) => {
+ });
+};
+const closeAllTags = (view: RouteLocationNormalized) => {
proxy?.$tab.closeAllPage().then(({ visitedViews }) => {
- if (affixTags.value.some(tag => tag.path === route.path)) {
+ if (affixTags.value.some((tag) => tag.path === route.path)) {
return;
}
toLastView(visitedViews, view);
- })
-}
-const toLastView = (visitedViews:TagView[], view?: TagView) => {
+ });
+};
+const toLastView = (visitedViews: RouteLocationNormalized[], view?: RouteLocationNormalized) => {
const latestView = visitedViews.slice(-1)[0];
if (latestView) {
router.push(latestView.fullPath as string);
@@ -170,8 +205,8 @@
router.push('/');
}
}
-}
-const openMenu = (tag: TagView, e: MouseEvent) => {
+};
+const openMenu = (tag: RouteLocationNormalized, e: MouseEvent) => {
const menuMinWidth = 105;
const offsetLeft = proxy?.$el.getBoundingClientRect().left; // container margin left
const offsetWidth = proxy?.$el.offsetWidth; // container width
@@ -184,76 +219,49 @@
left.value = l;
}
- top.value = e.clientY
+ top.value = e.clientY;
visible.value = true;
selectedTag.value = tag;
-}
+};
const closeMenu = () => {
visible.value = false;
-}
+};
const handleScroll = () => {
closeMenu();
-}
-
+};
onMounted(() => {
initTags();
addTags();
-})
+});
</script>
-
-<template>
- <div id="tags-view-container" class="tags-view-container">
- <scroll-pane ref="scrollPaneRef" class="tags-view-wrapper" @scroll="handleScroll">
- <router-link
- v-for="tag in visitedViews"
- :key="tag.path"
- :data-path="tag.path"
- :class="isActive(tag) ? 'active' : ''"
- :to="{ path: tag.path ? tag.path : '', query: tag.query, fullPath: tag.fullPath ? tag.fullPath : '' }"
- class="tags-view-item"
- :style="activeStyle(tag)"
- @click.middle="!isAffix(tag) ? closeSelectedTag(tag) : ''"
- @contextmenu.prevent="openMenu(tag, $event)"
- >
- {{ tag.title }}
- <span v-if="!isAffix(tag)" @click.prevent.stop="closeSelectedTag(tag)">
- <close class="el-icon-close" style="width: 1em; height: 1em;vertical-align: middle;" />
- </span>
- </router-link>
- </scroll-pane>
- <ul v-show="visible" :style="{ left: left + 'px', top: top + 'px' }" class="contextmenu">
- <li @click="refreshSelectedTag(selectedTag)"><refresh-right style="width: 1em; height: 1em;" /> 鍒锋柊椤甸潰</li>
- <li v-if="!isAffix(selectedTag)" @click="closeSelectedTag(selectedTag)"><close style="width: 1em; height: 1em;" /> 鍏抽棴褰撳墠</li>
- <li @click="closeOthersTags"><circle-close style="width: 1em; height: 1em;" /> 鍏抽棴鍏朵粬</li>
- <li v-if="!isFirstView()" @click="closeLeftTags"><back style="width: 1em; height: 1em;" /> 鍏抽棴宸︿晶</li>
- <li v-if="!isLastView()" @click="closeRightTags"><right style="width: 1em; height: 1em;" /> 鍏抽棴鍙充晶</li>
- <li @click="closeAllTags(selectedTag)"><circle-close style="width: 1em; height: 1em;" /> 鍏ㄩ儴鍏抽棴</li>
- </ul>
- </div>
-</template>
<style lang="scss" scoped>
.tags-view-container {
height: 34px;
width: 100%;
- background: #fff;
- border-bottom: 1px solid #d8dce5;
- box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.12), 0 0 3px 0 rgba(0, 0, 0, 0.04);
+ background-color: var(--el-bg-color);
+ border: 1px solid var(--el-border-color-light);
+ box-shadow:
+ 0 1px 3px 0 rgba(0, 0, 0, 0.12),
+ 0 0 3px 0 rgba(0, 0, 0, 0.04);
.tags-view-wrapper {
.tags-view-item {
display: inline-block;
position: relative;
cursor: pointer;
height: 26px;
- line-height: 26px;
- border: 1px solid #d8dce5;
+ line-height: 23px;
+ background-color: var(--el-bg-color);
+ border: 1px solid var(--el-border-color-light);
color: #495060;
- background: #fff;
padding: 0 8px;
font-size: 12px;
margin-left: 5px;
margin-top: 4px;
+ &:hover {
+ color: var(--el-color-primary);
+ }
&:first-of-type {
margin-left: 15px;
}
@@ -265,21 +273,21 @@
color: #fff;
border-color: #42b983;
&::before {
- content: "";
+ content: '';
background: #fff;
display: inline-block;
width: 8px;
height: 8px;
border-radius: 50%;
position: relative;
- margin-right: 2px;
+ margin-right: 5px;
}
}
}
}
.contextmenu {
margin: 0;
- background: #fff;
+ background: var(--el-bg-color);
z-index: 3000;
position: absolute;
list-style-type: none;
@@ -287,7 +295,6 @@
border-radius: 4px;
font-size: 12px;
font-weight: 400;
- color: #333;
box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, 0.3);
li {
margin: 0;
--
Gitblit v1.9.3