From bb3d5b8ae8e8ae0e91acb3022f51572daf3210c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=97=E5=A4=A7?= <454690789@qq.com>
Date: Thu, 2 Nov 2023 09:05:58 +0800
Subject: [PATCH] =?UTF-8?q?perf(ConfigProvider):=20=E9=85=8D=E7=BD=AEantdv?=
 =?UTF-8?q?=E4=B8=BB=E9=A2=98=E8=89=B2,=20=E4=BD=BF=E5=85=B6=E4=B8=8Emodif?=
 =?UTF-8?q?yVars=E9=85=8D=E7=BD=AE=E4=B8=80=E8=87=B4=20(#3219)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* perf(ConfigProvider): 配置antdv主题, 使其与modifyVars配置一致

* fix(dark): 修正颜色写法

* fix(dark): 修正app-content-background-color深色颜色

* style(BasicTable): row striped style add important

---------

Co-authored-by: 苗大 <caoshengmiao@hypergryph.com>
---
 src/App.vue                             | 21 ++++++++++++++++++---
 src/components/Table/src/BasicTable.vue |  2 +-
 src/logics/theme/dark.ts                |  4 ++--
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 303d31a3821..18bcdbd5039 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,5 +1,5 @@
 <template>
-  <ConfigProvider :locale="getAntdLocale" :theme="isDark ? darkTheme : {}">
+  <ConfigProvider :locale="getAntdLocale" :theme="themeConfig">
     <AppProvider>
       <RouterView />
     </AppProvider>
@@ -7,19 +7,34 @@
 </template>
 
 <script lang="ts" setup>
-  import { ConfigProvider } from 'ant-design-vue';
   import { AppProvider } from '@/components/Application';
   import { useTitle } from '@/hooks/web/useTitle';
   import { useLocale } from '@/locales/useLocale';
+  import { ConfigProvider } from 'ant-design-vue';
 
-  import 'dayjs/locale/zh-cn';
   import { useDarkModeTheme } from '@/hooks/setting/useDarkModeTheme';
+  import 'dayjs/locale/zh-cn';
+  import { computed } from 'vue';
 
   // support Multi-language
   const { getAntdLocale } = useLocale();
 
   const { isDark, darkTheme } = useDarkModeTheme();
 
+  const themeConfig = computed(() =>
+    Object.assign(
+      {
+        token: {
+          colorPrimary: '#0960bd',
+          colorSuccess: '#55D187',
+          colorWarning: '#EFBD47',
+          colorError: '#ED6F6F',
+          colorInfo: '#0960bd',
+        },
+      },
+      isDark.value ? darkTheme : {},
+    ),
+  );
   // Listening to page changes and dynamically changing site titles
   useTitle();
 </script>
diff --git a/src/components/Table/src/BasicTable.vue b/src/components/Table/src/BasicTable.vue
index b8d3e17b11c..41136007aa4 100644
--- a/src/components/Table/src/BasicTable.vue
+++ b/src/components/Table/src/BasicTable.vue
@@ -379,7 +379,7 @@
 
     &-row__striped {
       td {
-        background-color: @app-content-background;
+        background-color: @app-content-background !important;
       }
     }
 
diff --git a/src/logics/theme/dark.ts b/src/logics/theme/dark.ts
index 75a16718d2c..9983fbbd002 100644
--- a/src/logics/theme/dark.ts
+++ b/src/logics/theme/dark.ts
@@ -14,7 +14,7 @@ export type CustomColorType = {
 export const customColorList: CustomColorType[] = [
   {
     name: '--text-color',
-    light: 'rgb(0,0,0,85%)',
+    light: 'rgba(0 0 0 85%)',
     dark: '#c9d1d9',
   },
   {
@@ -30,7 +30,7 @@ export const customColorList: CustomColorType[] = [
   {
     name: '--app-content-background-color',
     light: '#fafafa',
-    dark: '#151515',
+    dark: '#1e1e1e',
   },
   // custom example
   {