open-source/qinglong
1
0
Fork 0
mirror of https://github.com/whyour/qinglong.git synced 2025-05-23 23:06:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复主题逻辑判断

Browse Source
This commit is contained in:
whyour 2021-03-21 14:22:38 +08:00
parent 3a1de79322
commit 386eff8a0b
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/layouts/index.tsx
View File

@ -3,6 +3,7 @@ import ProLayout from '@ant-design/pro-layout';
import { import {
enable as enableDarkMode, enable as enableDarkMode,
disable as disableDarkMode, disable as disableDarkMode,
auto as followSystemColorScheme,
setFetchMethod, setFetchMethod,
} from 'darkreader'; } from 'darkreader';
import defaultProps from './defaultProps'; import defaultProps from './defaultProps';
@ -26,18 +27,14 @@ export default function (props: any) {
}, [props.location.pathname]); }, [props.location.pathname]);
useEffect(() => { useEffect(() => {
const colorScheme = const theme = localStorage.getItem('qinglong_dark_theme') || 'auto';
window.matchMedia('(prefers-color-scheme: dark)').matches && 'dark';
let localTheme = localStorage.getItem('qinglong_dark_theme');
if (localTheme === 'auto') {
localTheme = null;
}
const theme = localTheme || colorScheme || 'light';
setFetchMethod(window.fetch); setFetchMethod(window.fetch);
if (theme === 'dark') { if (theme === 'dark') {
enableDarkMode({ darkSchemeTextColor: '#fff' }); enableDarkMode({ darkSchemeTextColor: '#fff' });
} else if (theme === 'light') { } else if (theme === 'light') {
disableDarkMode(); disableDarkMode();
} else {
followSystemColorScheme({ darkSchemeTextColor: '#fff' });
} }
}, []); }, []);

8
src/pages/setting/index.tsx
View File

@ -6,6 +6,7 @@ import { request } from '@/utils/http';
import { import {
enable as enableDarkMode, enable as enableDarkMode,
disable as disableDarkMode, disable as disableDarkMode,
auto as followSystemColorScheme,
setFetchMethod, setFetchMethod,
} from 'darkreader'; } from 'darkreader';
@ -21,10 +22,7 @@ const Password = () => {
const [marginTop, setMarginTop] = useState(-72); const [marginTop, setMarginTop] = useState(-72);
const [value, setValue] = useState(''); const [value, setValue] = useState('');
const [loading, setLoading] = useState(true); const [loading, setLoading] = useState(true);
const colorScheme = const defaultDarken = localStorage.getItem('qinglong_dark_theme') || 'auto';
window.matchMedia('(prefers-color-scheme: dark)').matches && 'dark';
const defaultDarken =
localStorage.getItem('qinglong_dark_theme') || colorScheme;
const [theme, setTheme] = useState(defaultDarken); const [theme, setTheme] = useState(defaultDarken);
const handleOk = (values: any) => { const handleOk = (values: any) => {
@ -69,7 +67,7 @@ const Password = () => {
} else if (theme === 'light') { } else if (theme === 'light') {
disableDarkMode(); disableDarkMode();
} else { } else {
enableDarkMode({ darkSchemeTextColor: '#fff' }); followSystemColorScheme({ darkSchemeTextColor: '#fff' });
} }
}, [theme]); }, [theme]);