From 03fc4e211ca080f20c7ec8acbe8ee359ee3e0076 Mon Sep 17 00:00:00 2001 From: chenhaoli Date: Wed, 29 Jan 2025 01:51:32 +0800 Subject: [PATCH] refactor(renderer): setting layout and scroll behavior --- src/renderer/src/pages/settings/index.tsx | 457 ++++++++++++---------- 1 file changed, 250 insertions(+), 207 deletions(-) diff --git a/src/renderer/src/pages/settings/index.tsx b/src/renderer/src/pages/settings/index.tsx index 7130a3c..a53ff34 100644 --- a/src/renderer/src/pages/settings/index.tsx +++ b/src/renderer/src/pages/settings/index.tsx @@ -34,7 +34,7 @@ import { isWindows } from '@renderer/utils/os'; import { PresetImport } from './PresetImport'; -const Settings = () => { +export default function Settings() { const { settings, thinking } = useStore(); console.log('settings', settings); @@ -101,234 +101,277 @@ const Settings = () => { }; return ( - - {!isWindows && ( + + - )} - - - General - - {settings?.presetSource?.type === 'remote' && ( - - )} - } - aria-label="Import Preset" - variant="ghost" - onClick={() => setPresetModalOpen(true)} - /> - - - - - - + zIndex={1} + px={2} + flexShrink={0} + > + + General + {settings?.presetSource?.type === 'remote' && ( - - - Settings managed by remote preset from{' '} - {settings.presetSource.url} - {settings.presetSource.lastUpdated && - ` (Last updated: ${new Date(settings.presetSource.lastUpdated).toLocaleString()})`} - - - + )} + } + aria-label="Import Preset" + variant="ghost" + onClick={() => setPresetModalOpen(true)} + /> + + + - {settings ? ( - - {({ values = {}, setFieldValue }) => ( -
- - - Language - - - - - + + + + + {settings?.presetSource?.type === 'remote' && ( + + + Settings managed by remote preset from{' '} + {settings.presetSource.url} + {settings.presetSource.lastUpdated && + ` (Last updated: ${new Date(settings.presetSource.lastUpdated).toLocaleString()})`} + + + + )} - - VLM Provider - { - const newValue = e.target.value; - setFieldValue('vlmProvider', newValue); + {settings ? ( + + {({ values = {}, setFieldValue }) => ( + + + + Language + + + + + - if (!settings.vlmBaseUrl) { + + VLM Provider + { + const newValue = e.target.value; setFieldValue('vlmProvider', newValue); - if (newValue === VlmProvider.vLLM) { - setFieldValue( - 'vlmBaseUrl', - 'http://localhost:8000/v1', - ); - setFieldValue('vlmModelName', 'ui-tars'); - } else if ( - newValue === VlmProvider.Huggingface - ) { - setFieldValue( - 'vlmBaseUrl', - 'https://.us-east-1.aws.endpoints.huggingface.cloud/v1', - ); - setFieldValue('vlmApiKey', 'your_api_key'); - setFieldValue( - 'vlmModelName', - 'your_model_name', - ); - } - } - }} - > - {Object.values(VlmProvider).map((item) => ( - - ))} - - - - VLM Base URL - - + if (!settings.vlmBaseUrl) { + setFieldValue('vlmProvider', newValue); + if (newValue === VlmProvider.vLLM) { + setFieldValue( + 'vlmBaseUrl', + 'http://localhost:8000/v1', + ); + setFieldValue('vlmModelName', 'ui-tars'); + } else if ( + newValue === VlmProvider.Huggingface + ) { + setFieldValue( + 'vlmBaseUrl', + 'https://.us-east-1.aws.endpoints.huggingface.cloud/v1', + ); + setFieldValue('vlmApiKey', 'your_api_key'); + setFieldValue( + 'vlmModelName', + 'your_model_name', + ); + } + } + }} + > + {Object.values(VlmProvider).map((item) => ( + + ))} + + - - VLM API Key - - + + VLM Base URL + + - - VLM Model Name - - + + VLM API Key + + - - - Report Storage Base URL - - - + + + VLM Model Name + + + - - UTIO Base URL - - + + + Report Storage Base URL + + + - - - - - - - )} -
- ) : ( -
- -
- )} - + + + UTIO Base URL + + + + + + )} + + ) : ( +
+ +
+ )} + +
+ + + + + + + + setPresetModalOpen(false)} />
); -}; - -export default Settings; +} export { Settings as Component };