yudao
/
admin-vben
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vben.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: default theme colors cannot be overridden (#4636) 

* fix: default theme colors cannot be overridden

* chore: update default config
pull/48/MERGE
Vben 2024-10-14 23:24:21 +08:00 committed by GitHub
parent 6c4a742627
commit d5a210f53f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/@core/preferences/__tests__/__snapshots__/config.test.ts.snap
View File

@ -93,7 +93,7 @@ exports[`defaultPreferences immutability test > should not modify the config obj
"mode": "dark", "mode": "dark",
"radius": "0.5", "radius": "0.5",
"semiDarkHeader": false, "semiDarkHeader": false,
"semiDarkSidebar": true, "semiDarkSidebar": false,
}, },
"transition": { "transition": {
"enable": true, "enable": true,

3
packages/@core/preferences/src/config.ts
View File

@ -82,7 +82,6 @@ const defaultPreferences: Preferences = {
showIcon: true, showIcon: true,
showMaximize: true, showMaximize: true,
showMore: true, showMore: true,
styleType: 'chrome', styleType: 'chrome',
}, },
theme: { theme: {
@ -94,7 +93,7 @@ const defaultPreferences: Preferences = {
mode: 'dark', mode: 'dark',
radius: '0.5', radius: '0.5',
semiDarkHeader: false, semiDarkHeader: false,
semiDarkSidebar: true, semiDarkSidebar: false,
}, },
transition: { transition: {
enable: true, enable: true,

4
packages/@core/preferences/src/update-css-variables.ts
View File

@ -18,7 +18,7 @@ function updateCSSVariables(preferences: Preferences) {
const theme = preferences?.theme ?? {}; const theme = preferences?.theme ?? {};
const { builtinType, colorPrimary, mode, radius } = theme; const { builtinType, mode, radius } = theme;
// html 设置 dark 类 // html 设置 dark 类
if (Reflect.has(theme, 'mode')) { if (Reflect.has(theme, 'mode')) {
@ -58,7 +58,7 @@ function updateCSSVariables(preferences: Preferences) {
Reflect.has(theme, 'colorSuccess') || Reflect.has(theme, 'colorSuccess') ||
Reflect.has(theme, 'colorWarning') Reflect.has(theme, 'colorWarning')
) { ) {
preferences.theme.colorPrimary = builtinTypeColorPrimary || colorPrimary; // preferences.theme.colorPrimary = builtinTypeColorPrimary || colorPrimary;
updateMainColorVariables(preferences); updateMainColorVariables(preferences);
} }