修复：项目配置 空白，多标签背景色 bug

CHANGELOG.md

@@ -1,5 +1,14 @@
 # CHANGELOG
 
+## 1.6.1 (2022-01-06)
+
+### 🐛 Bug Fixes
+- 修复 `项目配置` 打开空白
+- 修复 `多标签` 背景和字体色变量丢失
+
+- ### ✨ Features
+- 依赖升级
+
 ## 1.6.0 (2021-12-24)
 
 ### 🐛 Bug Fixes

README.md

@@ -1,5 +1,5 @@
 ## 留步
-少侠留步，早知如此绊人心，何如当初莫相识，右上角免费的 `Star` 点一点，帮我们突破一下 `1.5k`，谢谢！O(∩_∩)O
+少侠留步，早知如此绊人心，何如当初莫相识，右上角免费的 `Star` 点一点，帮我们突破一下 `2k`，谢谢！O(∩_∩)O
 
 ## 简介
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "naive-ui-admin",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "author": {
     "name": "Ahjung",
     "email": "735878602@qq.com",
@@ -39,7 +39,7 @@
     "makeit-captcha": "^1.2.5",
     "mitt": "^2.1.0",
     "mockjs": "^1.1.0",
-    "naive-ui": "^2.23.1",
+    "naive-ui": "^2.23.2",
     "pinia": "^2.0.0-rc.4",
     "qs": "^6.10.1",
     "vfonts": "^0.1.0",

src/components/Table/src/hooks/useDataSource.ts

@@ -47,6 +47,7 @@ export function useDataSource(
     try {
       setLoading(true);
       const { request, pagination }: any = unref(propsRef);
+      if (!request) return;
       //组装分页信息
       const pageField = APISETTING.pageField;
       const sizeField = APISETTING.sizeField;

src/components/Table/src/props.ts

@@ -16,7 +16,7 @@ export const basicProps = {
     type: String,
     default: 'medium',
   },
-  tableData: {
+  dataSource: {
     type: [Object],
     default: () => [],
   },
@@ -28,7 +28,6 @@ export const basicProps = {
   request: {
     type: Function as PropType<(...arg: any[]) => Promise<any>>,
     default: null,
-    required: true,
   },
   rowKey: {
     type: [String, Function] as PropType<string | ((record) => string)>,

src/layout/components/Header/ProjectSetting.vue

@@ -1,10 +1,10 @@
 <template>
-  <n-drawer v-model:show="isDrawer" :width="width" :placement="placement" :native-scrollbar="false">
+  <n-drawer v-model:show="isDrawer" :width="width" :placement="placement">
-    <n-drawer-content :title="title">
+    <n-drawer-content :title="title" :native-scrollbar="false">
       <div class="drawer">
         <n-divider title-placement="center">主题</n-divider>
 
-        <div class="drawer-setting-item justify-center dark-switch">
+        <div class="justify-center drawer-setting-item dark-switch">
           <n-tooltip placement="bottom">
             <template #trigger>
               <n-switch v-model:value="designStore.darkTheme" class="dark-theme-switch">
@@ -116,9 +116,7 @@
             </n-tooltip>
             <n-badge dot color="#19be6b" v-if="settingStore.navTheme === 'light'" />
           </div>
-        </div>
 
-        <div class="drawer-setting-item align-items-top">
           <div class="drawer-setting-item-style">
             <n-tooltip placement="top">
               <template #trigger>
@@ -133,7 +131,6 @@
             <n-badge dot color="#19be6b" v-if="settingStore.navTheme === 'header-dark'" />
           </div>
         </div>
-
         <n-divider title-placement="center">界面功能</n-divider>
 
         <div class="drawer-setting-item">
@@ -361,7 +358,7 @@
         border-radius: 2px;
         margin: 0 5px 5px 0;
         text-align: center;
-
+        line-height: 14px;
         .n-icon {
           color: #fff;
         }

src/layout/components/TagsView/index.vue

@@ -115,6 +115,7 @@
   import elementResizeDetectorMaker from 'element-resize-detector';
   import { useDesignSetting } from '@/hooks/setting/useDesignSetting';
   import { useProjectSettingStore } from '@/store/modules/projectSetting';
+  import { useThemeVars } from 'naive-ui';
 
   export default defineComponent({
     name: 'TabsView',
@@ -145,6 +146,16 @@
       const navWrap: any = ref(null);
       const isCurrent = ref(false);
 
+      const themeVars = useThemeVars();
+
+      const getCardColor = computed(() => {
+        return themeVars.value.cardColor;
+      });
+
+      const getBaseColor = computed(() => {
+        return themeVars.value.textColor1;
+      });
+
       const state = reactive({
         activeKey: route.fullPath,
         scrollable: false,
@@ -505,6 +516,8 @@
         onClickOutside,
         getDarkTheme,
         getAppTheme,
+        getCardColor,
+        getBaseColor,
       };
     },
   });
@@ -565,8 +578,8 @@
           overflow: hidden;
 
           &-item {
-            background: var(--color);
+            background: v-bind(getCardColor);
-            color: var(--text-color);
+            color: v-bind(getBaseColor);
             height: 32px;
             padding: 6px 16px 4px;
             border-radius: 3px;