feat：support custom component theme

kirklin · Jul 19, 2023 · 7e96552 · 7e96552 · vercel · Jul 19, 2023
1 parent cdebe37
commit 7e96552
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/apps/admin/src/layouts/index.vue b/apps/admin/src/layouts/index.vue
@@ -19,7 +19,7 @@ defineOptions({
         <Header />
       </header>
       <div class="block flex-1  overflow-x-hidden rounded-2xl pl-0 pr-5 pt-0 pb-6">
-        <div class="min-h-full w-full rounded-2xl bg-gray-100 p-4 dark:bg-gray-900">
+        <div class="min-h-full w-full rounded-2xl bg-gray-100 p-4 dark:bg-gray-9">
           <Content />
         </div>
       </div>

diff --git a/apps/admin/src/store/modules/design/themeUtils.ts b/apps/admin/src/store/modules/design/themeUtils.ts
@@ -1,5 +1,5 @@
 import type { ButtonColorScene, ColorAction, ColorType, ColorTypeCase, ThemeColor, ThemeConfig } from "@celeris/types";
-import { generateColorPalettes } from "@celeris/utils";
+import { deepMerge, generateColorPalettes } from "@celeris/utils";
 import { type GlobalThemeOverrides, commonDark, commonLight } from "naive-ui";
 
 /**
@@ -116,7 +116,16 @@ export function getThemeColors(
 function getTextColor(darkMode: boolean): string {
   return darkMode ? commonDark.textColor2 : commonLight.baseColor;
 }
-
+function getOtherTheme(darkMode: boolean): GlobalThemeOverrides {
+  return {
+    common: {
+      borderRadius: "0.5rem",
+    },
+    Card: {
+      borderRadius: "1rem",
+    },
+  };
+}
 /**
  * 获取Naive UI自定义主题配置
  *
@@ -129,10 +138,10 @@ export function getNaiveUICustomTheme(
   darkMode: boolean,
 ): GlobalThemeOverrides {
   const themeColors = getThemeColors(config, darkMode);
-  return {
+  return deepMerge({
     common: {
       ...themeColors,
     },
     ...getOtherColor(config, darkMode),
-  };
+  }, getOtherTheme(darkMode));
 }