Skip to content

fix: Compatibility default value is colored or light before v1.5.1 #1349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shuashuai merged 1 commit into from
May 28, 2025
Merged

fix: Compatibility default value is colored or light before v1.5.1 #1349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ui/src/components/Header/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ const Header: FC = () => {
let themeMode = 'light';
const { theme, theme_config } = themeSettingStore((_) => _);
if (theme_config?.[theme]?.navbar_style) {
// const color = theme_config[theme].navbar_style.startsWith('#')
themeMode = isLight(theme_config[theme].navbar_style) ? 'light' : 'dark';
console.log('isLightTheme', themeMode);
navbarStyle = `theme-${themeMode}`;
Expand Down
4 changes: 3 additions & 1 deletion ui/src/pages/Admin/Themes/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,9 @@ const Index: FC = () => {
const themeConfig = setting.theme_config[themeName];
const formMeta = { ...formData };
formMeta.themes.value = themeName;
formMeta.navbar_style.value = themeConfig?.navbar_style;
formMeta.navbar_style.value = themeConfig?.navbar_style.startsWith('#')
? themeConfig?.navbar_style
: DEFAULT_THEME_COLOR;
formMeta.primary_color.value = themeConfig?.primary_color;
formData.color_scheme.value = setting?.color_scheme || 'system';
setFormData({ ...formMeta });
Expand Down
4 changes: 4 additions & 0 deletions ui/src/stores/themeSetting.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ const store = create<IType>((set) => ({
},
update: (params) =>
set((state) => {
// Compatibility default value is colored or light before v1.5.1
if (!params.theme_config.default.navbar_style.startsWith('#')) {
params.theme_config.default.navbar_style = DEFAULT_THEME_COLOR;
}
return {
...state,
...params,
Expand Down