Skip to content

Commit 8288f0a

Browse files
committed
修复:项目配置 空白,多标签背景色 bug
1 parent c0ff898 commit 8288f0a

File tree

6 files changed

+759
-772
lines changed

6 files changed

+759
-772
lines changed

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# CHANGELOG
22

3+
## 1.6.1 (2022-01-06)
4+
5+
### 🐛 Bug Fixes
6+
- 修复 `项目配置` 打开空白
7+
- 修复 `多标签` 背景和字体色变量丢失
8+
9+
- ### ✨ Features
10+
- 依赖升级
11+
312
## 1.6.0 (2021-12-24)
413

514
### 🐛 Bug Fixes

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
## 留步
2-
少侠留步,早知如此绊人心,何如当初莫相识,右上角免费的 `Star` 点一点,帮我们突破一下 `1.5k`,谢谢!O(∩_∩)O
2+
少侠留步,早知如此绊人心,何如当初莫相识,右上角免费的 `Star` 点一点,帮我们突破一下 `2k`,谢谢!O(∩_∩)O
33

44
## 简介
55

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "naive-ui-admin",
3-
"version": "1.6.0",
3+
"version": "1.6.1",
44
"author": {
55
"name": "Ahjung",
66
"email": "735878602@qq.com",

src/layout/components/Header/ProjectSetting.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
2-
<n-drawer v-model:show="isDrawer" :width="width" :placement="placement" :native-scrollbar="false">
3-
<n-drawer-content :title="title">
2+
<n-drawer v-model:show="isDrawer" :width="width" :placement="placement">
3+
<n-drawer-content :title="title" :native-scrollbar="false">
44
<div class="drawer">
55
<n-divider title-placement="center">主题</n-divider>
66

@@ -358,7 +358,7 @@
358358
border-radius: 2px;
359359
margin: 0 5px 5px 0;
360360
text-align: center;
361-
361+
line-height: 14px;
362362
.n-icon {
363363
color: #fff;
364364
}

src/layout/components/TagsView/index.vue

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@
115115
import elementResizeDetectorMaker from 'element-resize-detector';
116116
import { useDesignSetting } from '@/hooks/setting/useDesignSetting';
117117
import { useProjectSettingStore } from '@/store/modules/projectSetting';
118+
import { useThemeVars } from 'naive-ui';
118119
119120
export default defineComponent({
120121
name: 'TabsView',
@@ -145,6 +146,16 @@
145146
const navWrap: any = ref(null);
146147
const isCurrent = ref(false);
147148
149+
const themeVars = useThemeVars();
150+
151+
const getCardColor = computed(() => {
152+
return themeVars.value.cardColor;
153+
});
154+
155+
const getBaseColor = computed(() => {
156+
return themeVars.value.textColor1;
157+
});
158+
148159
const state = reactive({
149160
activeKey: route.fullPath,
150161
scrollable: false,
@@ -505,6 +516,8 @@
505516
onClickOutside,
506517
getDarkTheme,
507518
getAppTheme,
519+
getCardColor,
520+
getBaseColor,
508521
};
509522
},
510523
});
@@ -565,8 +578,8 @@
565578
overflow: hidden;
566579
567580
&-item {
568-
background: var(--color);
569-
color: var(--text-color);
581+
background: v-bind(getCardColor);
582+
color: v-bind(getBaseColor);
570583
height: 32px;
571584
padding: 6px 16px 4px;
572585
border-radius: 3px;

0 commit comments

Comments
 (0)