diff --git a/src/atoms/settings.ts b/src/atoms/settings.ts index e130c7b7..b360de49 100644 --- a/src/atoms/settings.ts +++ b/src/atoms/settings.ts @@ -1,4 +1,4 @@ -import { colorPrimary } from '@/config/theme'; +import { COLOR_PRIMARY } from '@/config/theme'; import { atom } from 'jotai'; import { atomWithStorage } from 'jotai/utils'; @@ -14,7 +14,7 @@ const defaultSettings: UserSettings = { theme: 'light', mode: 'auto', isDarkTheme: false, - colorPrimary: colorPrimary, + colorPrimary: COLOR_PRIMARY, collapsed: false }; @@ -47,7 +47,7 @@ export const userSettingsHelperAtom = atom( }; set(userSettingsAtom, { ...newSettings, - colorPrimary: newSettings.colorPrimary || colorPrimary, + colorPrimary: newSettings.colorPrimary || COLOR_PRIMARY, isDarkTheme: newSettings.theme === 'realDark' }); } diff --git a/src/atoms/utils/index.ts b/src/atoms/utils/index.ts index eca8f713..8a50e1df 100644 --- a/src/atoms/utils/index.ts +++ b/src/atoms/utils/index.ts @@ -1,5 +1,18 @@ import { getDefaultStore } from 'jotai'; +export const clearStorageUserSettings = () => { + const savedSettings = JSON.parse( + localStorage.getItem('userSettings') || '{}' + ); + localStorage.setItem( + 'userSettings', + JSON.stringify({ + ...savedSettings, + colorPrimary: undefined + }) + ); +}; + export const clearAtomStorage = (atom: any) => { if (!atom) { return; diff --git a/src/components/echarts/chart.tsx b/src/components/echarts/chart.tsx index d7572b5a..e0cba0d6 100644 --- a/src/components/echarts/chart.tsx +++ b/src/components/echarts/chart.tsx @@ -33,7 +33,7 @@ const Chart: React.FC<{ }; const setOption = (options: ECOption) => { - console.log('setOption', options); + if (!chart.current) return; chart.current?.clear(); chart.current?.setOption(options, { notMerge: true, @@ -107,8 +107,8 @@ const Chart: React.FC<{ } return () => { - chart.current?.dispose(); chart.current?.off('finished', handleOnFinished); + chart.current?.dispose(); }; }, []); @@ -128,13 +128,11 @@ const Chart: React.FC<{ if (container.current) { resizeObserver.current = new ResizeObserver(handleResize); - resizeObserver.current.observe(container.current); } return () => { - if (container.current) { - resizeObserver.current?.unobserve(container.current); - } + resizeObserver.current?.disconnect(); + resizeObserver.current = undefined; }; }, []); diff --git a/src/components/echarts/config.ts b/src/components/echarts/config.ts index b5207520..77b7209c 100644 --- a/src/components/echarts/config.ts +++ b/src/components/echarts/config.ts @@ -16,8 +16,6 @@ export default function useChartConfig() { const { useToken } = theme; const { token } = useToken(); - console.log('token:', token); - const chartColorMap = useMemo(() => { return { titleColor: token.colorText, diff --git a/src/config/theme/dark.ts b/src/config/theme/dark.ts index 91c774c1..d7ca0472 100644 --- a/src/config/theme/dark.ts +++ b/src/config/theme/dark.ts @@ -1,3 +1,5 @@ +import { COLOR_PRIMARY } from './index'; + export default { 'root-entry-name': 'variable', cssVar: true, @@ -36,7 +38,7 @@ export default { iconMarginInlineEnd: 12, itemBorderRadius: 4, itemHeight: 32, - itemSelectedColor: '#007BFF', + itemSelectedColor: COLOR_PRIMARY, darkItemSelectedBg: '#141414', darkItemHoverBg: 'rgba(255, 255, 255, 0.03)', groupTitleColor: 'rgba(0,0,0,1)', @@ -78,7 +80,7 @@ export default { fontFamily: "Helvetica Neue, -apple-system, BlinkMacSystemFont, Arial, 'Noto Sans', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji'", colorText: '#ccc', - colorPrimary: '#007BFF', + colorPrimary: COLOR_PRIMARY, colorSuccess: '#48A77E', borderRadius: 4, borderRadiusSM: 2, diff --git a/src/config/theme/index.ts b/src/config/theme/index.ts index 1748ebab..116f53b9 100644 --- a/src/config/theme/index.ts +++ b/src/config/theme/index.ts @@ -1,10 +1,10 @@ import dark from './dark'; import light from './light'; -export const colorPrimary = '#007BFF'; +export const COLOR_PRIMARY = '#007BFF'; export default { light, dark, - colorPrimary: colorPrimary + colorPrimary: COLOR_PRIMARY }; diff --git a/src/config/theme/light.ts b/src/config/theme/light.ts index 0f61c8e4..f9f94bdf 100644 --- a/src/config/theme/light.ts +++ b/src/config/theme/light.ts @@ -1,3 +1,5 @@ +import { COLOR_PRIMARY } from './index'; + export default { 'root-entry-name': 'variable', cssVar: true, @@ -35,7 +37,7 @@ export default { iconSize: 16, iconMarginInlineEnd: 12, itemBorderRadius: 4, - itemSelectedColor: '#007BFF', + itemSelectedColor: COLOR_PRIMARY, itemHeight: 32, groupTitleColor: 'rgba(0,0,0,1)', itemHoverColor: 'rgba(0,0,0,1)', @@ -76,7 +78,7 @@ export default { fontFamily: "Helvetica Neue, -apple-system, BlinkMacSystemFont, Arial, 'Noto Sans', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji'", colorText: 'rgba(0,0,0,1)', - colorPrimary: '#007BFF', + colorPrimary: COLOR_PRIMARY, colorSuccess: '#54cc98', colorBorder: '#d3d0d9', borderRadius: 4, diff --git a/src/hooks/use-body-scroll.ts b/src/hooks/use-body-scroll.ts index 41b77941..cd8b5479 100644 --- a/src/hooks/use-body-scroll.ts +++ b/src/hooks/use-body-scroll.ts @@ -14,7 +14,6 @@ export default function useBodyScroll() { window.__GPUSTACK_BODY_SCROLLER__?.elements()?.scrollEventElement; instanceRef.current = window.__GPUSTACK_BODY_SCROLLER__; - console.log('bodyScroller', bodyScroller.current, instanceRef.current); }; const saveScrollHeight = React.useCallback(() => { diff --git a/src/pages/llmodels/config/backend-parameters/mindie.ts b/src/pages/llmodels/config/backend-parameters/mindie.ts index 9f90ea02..3e9d20f8 100644 --- a/src/pages/llmodels/config/backend-parameters/mindie.ts +++ b/src/pages/llmodels/config/backend-parameters/mindie.ts @@ -193,6 +193,22 @@ const options: BackendParameter[] = [ { label: '--multi-token-prediction-tokens', value: '--multi-token-prediction-tokens' + }, + { + label: '--context-parallel-size', + value: '--context-parallel-size' + }, + { + label: '--models', + value: '--models' + }, + { + label: '--max-prefill-tokens', + value: '--max-prefill-tokens' + }, + { + label: '--max-iter-times', + value: '--max-iter-times' } ]; diff --git a/src/pages/login/apis/index.ts b/src/pages/login/apis/index.ts index 5ed5bd6b..13ab7789 100644 --- a/src/pages/login/apis/index.ts +++ b/src/pages/login/apis/index.ts @@ -1,5 +1,5 @@ import { userAtom } from '@/atoms/user'; -import { clearAtomStorage } from '@/atoms/utils'; +import { clearAtomStorage, clearStorageUserSettings } from '@/atoms/utils'; import { request } from '@umijs/max'; import qs from 'query-string'; @@ -27,6 +27,7 @@ export const logout = async (userInfo?: any) => { await request(`${AUTH_API}/logout`, { method: 'POST' }); + clearStorageUserSettings(); clearAtomStorage(userAtom); return; }; diff --git a/src/pages/profile/components/appearance.tsx b/src/pages/profile/components/appearance.tsx index 4ed07e73..00a25ce0 100644 --- a/src/pages/profile/components/appearance.tsx +++ b/src/pages/profile/components/appearance.tsx @@ -30,8 +30,6 @@ const SettingsItem = styled.div` const Appearance: React.FC = () => { const { setTheme, userSettings } = useUserSettings(); - console.log('userSettings', userSettings); - const intl = useIntl(); const allLocals = getAllLocales(); @@ -57,8 +55,6 @@ const Appearance: React.FC = () => { setTheme(value); }; - console.log('allLocals', allLocals); - const languageOptions = allLocals.map((locale) => ({ value: locale, label: _.get(langConfigMap, [locale, 'label']) @@ -71,6 +67,7 @@ const Appearance: React.FC = () => { {intl.formatMessage({ id: 'common.appearance.theme' })}