Browse Source

Update setting.ts

pull/4373/head
拷钉 7 years ago
committed by GitHub
parent
commit
d8b6227baa
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      src/models/setting.ts

6
src/models/setting.ts

@ -104,7 +104,7 @@ const SettingModel: SettingModelType = {
}); });
const { primaryColor, colorWeak } = setting; const { primaryColor, colorWeak } = setting;
if (state.primaryColor !== primaryColor) { if (primaryColor && state.primaryColor !== primaryColor) {
updateTheme(primaryColor); updateTheme(primaryColor);
} }
updateColorWeak(!!colorWeak); updateColorWeak(!!colorWeak);
@ -133,13 +133,13 @@ const SettingModel: SettingModelType = {
} }
}); });
const { primaryColor, colorWeak, contentWidth } = payload; const { primaryColor, colorWeak, contentWidth } = payload;
if (state.primaryColor !== primaryColor) { if (primaryColor && state.primaryColor !== primaryColor) {
updateTheme(primaryColor); updateTheme(primaryColor);
} }
if (state.contentWidth !== contentWidth && window.dispatchEvent) { if (state.contentWidth !== contentWidth && window.dispatchEvent) {
window.dispatchEvent(new Event('resize')); window.dispatchEvent(new Event('resize'));
} }
updateColorWeak(colorWeak); updateColorWeak(!!colorWeak);
window.history.replaceState(null, 'setting', urlParams.href); window.history.replaceState(null, 'setting', urlParams.href);
return { return {
...state, ...state,

Loading…
Cancel
Save