Browse Source

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

* fix: default theme colors cannot be overridden

* chore: update default config
pull/4647/head
Vben 1 year ago
committed by GitHub
parent
commit
d5a210f53f
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 2
      packages/@core/preferences/__tests__/__snapshots__/config.test.ts.snap
  2. 3
      packages/@core/preferences/src/config.ts
  3. 4
      packages/@core/preferences/src/update-css-variables.ts

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

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

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

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

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

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

Loading…
Cancel
Save