From 8d984846afd40ed8de6fa51a293cf540efcf75f1 Mon Sep 17 00:00:00 2001
From: JEECG <445654970@qq.com>
Date: Mon, 25 Mar 2024 15:47:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8C=85=E5=90=8E=E9=BB=91=E8=89=B2?=
 =?UTF-8?q?=E4=B8=BB=E9=A2=98=E4=B8=8B=E8=8F=9C=E5=8D=95tab=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E4=B8=8D=E8=B7=9F=E9=9A=8F=E7=B3=BB=E7=BB=9F=E4=B8=BB?=
 =?UTF-8?q?=E9=A2=98=E9=A2=9C=E8=89=B2=E5=8F=98=E5=8C=96=EF=BC=8C=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91=E6=A8=A1=E5=BC=8F=E4=B8=8B=E6=B2=A1=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=20#1115?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue               |  5 +++++
 src/logics/theme/index.ts | 46 +++++++++++++++++++++++++++++----------
 2 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index a0148d3..91d1f13 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -35,6 +35,11 @@
       if (newValue === ThemeEnum.DARK) {
         appTheme.value.algorithm = theme.darkAlgorithm;
       }
+      // update-begin--author:liaozhiyang---date:20240322---for：【QQYUN-8570】生产环境暗黑模式下主题色不生效
+      if (import.meta.env.PROD) {
+        changeTheme(appStore.getProjectConfig.themeColor);
+      }
+      // update-end--author:liaozhiyang---date:20240322---for：【QQYUN-8570】生产环境暗黑模式下主题色不生效
       appTheme.value = {
         ...appTheme.value,
       };
diff --git a/src/logics/theme/index.ts b/src/logics/theme/index.ts
index 3efd961..d105ce8 100644
--- a/src/logics/theme/index.ts
+++ b/src/logics/theme/index.ts
@@ -1,10 +1,19 @@
 import { getThemeColors, generateColors } from '../../../build/config/themeConfig';
-
-import { replaceStyleVariables } from '@rys-fe/vite-plugin-theme/es/client';
+import {
+  replaceStyleVariables,
+  loadDarkThemeCss,
+  replaceCssColors,
+  darkCssIsReady,
+  linkID,
+  styleTagId,
+  appendCssToDom,
+  getStyleDom,
+} from '@rys-fe/vite-plugin-theme/es/client';
 import { mixLighten, mixDarken, tinycolor } from '@rys-fe/vite-plugin-theme/es/colorUtils';
 import { useAppStore } from '/@/store/modules/app';
+import { defHttp } from '/@/utils/http/axios';
 
-
+let cssText = '';
 export async function changeTheme(color: string) {
   // update-begin--author:liaozhiyang---date:20231218---for：【QQYUN-6366】升级到antd4.x
   const appStore = useAppStore();
@@ -16,17 +25,32 @@ export async function changeTheme(color: string) {
     tinycolor,
     color,
   });
-
-  let res = await replaceStyleVariables({
-    colorVariables: [...getThemeColors(color), ...colors],
-  });
-  fixDark();
-  return res;
+  // update-begin--author:liaozhiyang---date:20240322---for：【QQYUN-8570】生产环境暗黑模式下主题色不生效
+  if (import.meta.env.PROD && appStore.getDarkMode === 'dark') {
+    if (!darkCssIsReady && !cssText) {
+      await loadDarkThemeCss();
+    }
+    const el: HTMLLinkElement = document.getElementById(linkID) as HTMLLinkElement;
+    if (el?.href) {
+      // cssText = await fetchCss(el.href) as string;
+      !cssText && (cssText = await defHttp.get({ url: el.href }, { isTransformResponse: false }));
+      const colorVariables = [...getThemeColors(color), ...colors];
+      const processCss = await replaceCssColors(cssText, colorVariables);
+      appendCssToDom(getStyleDom(styleTagId) as HTMLStyleElement, processCss);
+    }
+  } else {
+    await replaceStyleVariables({
+      colorVariables: [...getThemeColors(color), ...colors],
+    });
+    fixDark();
+  }
+  // update-end--author:liaozhiyang---date:20240322---for：【QQYUN-8570】生产环境暗黑模式下主题色不生效
 }
-
 // 【LOWCOD-2262】修复黑暗模式下切换皮肤无效的问题
 async function fixDark() {
-  let el = document.getElementById('__VITE_PLUGIN_THEME__');
+  // update-begin--author:liaozhiyang---date:20240322---for：【QQYUN-8570】生产环境暗黑模式下主题色不生效
+  const el = document.getElementById(styleTagId);
+  // update-end--author:liaozhiyang---date:20240322---for：【QQYUN-8570】生产环境暗黑模式下主题色不生效
   if (el) {
     el.innerHTML = el.innerHTML.replace(/\\["']dark\\["']/g, `'dark'`);
   }