fix editor theme

This commit is contained in:
pompurin404 2024-09-03 19:34:10 +08:00
parent eeb3f7b30a
commit 1515788458
No known key found for this signature in database
5 changed files with 18 additions and 16 deletions

View File

@ -39,8 +39,8 @@ const monacoInitialization = (): void => {
} }
export const BaseEditor: React.FC<Props> = (props) => { export const BaseEditor: React.FC<Props> = (props) => {
const { theme } = useTheme() const { theme, systemTheme } = useTheme()
const trueTheme = theme === 'system' ? systemTheme : theme
const { value, readOnly = false, language, onChange } = props const { value, readOnly = false, language, onChange } = props
const editorRef = useRef<monaco.editor.IStandaloneCodeEditor>() const editorRef = useRef<monaco.editor.IStandaloneCodeEditor>()
@ -73,7 +73,7 @@ export const BaseEditor: React.FC<Props> = (props) => {
language={language} language={language}
value={value} value={value}
height="100%" height="100%"
theme={theme?.includes('light') ? 'vs' : 'vs-dark'} theme={trueTheme?.includes('light') ? 'vs' : 'vs-dark'}
options={{ options={{
tabSize: ['yaml', 'javascript', 'json'].includes(language) ? 2 : 4, // 根据语言类型设置缩进大小 tabSize: ['yaml', 'javascript', 'json'].includes(language) ? 2 : 4, // 根据语言类型设置缩进大小
minimap: { minimap: {

View File

@ -30,7 +30,7 @@ const EditFileModal: React.FC<Props> = (props) => {
scrollBehavior="inside" scrollBehavior="inside"
> >
<ModalContent className="h-full w-[calc(100%-100px)]"> <ModalContent className="h-full w-[calc(100%-100px)]">
<ModalHeader className="flex"> <ModalHeader className="flex pb-0">
{language === 'javascript' ? '脚本' : '配置'} {language === 'javascript' ? '脚本' : '配置'}
</ModalHeader> </ModalHeader>
<ModalBody className="h-full"> <ModalBody className="h-full">
@ -40,11 +40,12 @@ const EditFileModal: React.FC<Props> = (props) => {
onChange={(value) => setCurrData(value)} onChange={(value) => setCurrData(value)}
/> />
</ModalBody> </ModalBody>
<ModalFooter> <ModalFooter className="pt-0">
<Button variant="light" onPress={onClose}> <Button size="sm" variant="light" onPress={onClose}>
</Button> </Button>
<Button <Button
size="sm"
color="primary" color="primary"
onPress={async () => { onPress={async () => {
try { try {

View File

@ -31,7 +31,7 @@ const EditFileModal: React.FC<Props> = (props) => {
scrollBehavior="inside" scrollBehavior="inside"
> >
<ModalContent className="h-full w-[calc(100%-100px)]"> <ModalContent className="h-full w-[calc(100%-100px)]">
<ModalHeader className="flex"> <ModalHeader className="flex pb-0">
<div className="flex justify-start"> <div className="flex justify-start">
<div className="flex items-center"></div> <div className="flex items-center"></div>
<small className="ml-2 text-default-500"> <small className="ml-2 text-default-500">
@ -53,11 +53,12 @@ const EditFileModal: React.FC<Props> = (props) => {
<ModalBody className="h-full"> <ModalBody className="h-full">
<BaseEditor language="yaml" value={currData} onChange={(value) => setCurrData(value)} /> <BaseEditor language="yaml" value={currData} onChange={(value) => setCurrData(value)} />
</ModalBody> </ModalBody>
<ModalFooter> <ModalFooter className="pt-0">
<Button variant="light" onPress={onClose}> <Button size="sm" variant="light" onPress={onClose}>
</Button> </Button>
<Button <Button
size="sm"
color="primary" color="primary"
onPress={async () => { onPress={async () => {
await setProfileStr(id, currData) await setProfileStr(id, currData)

View File

@ -28,12 +28,12 @@ const ConfigViewer: React.FC<Props> = (props) => {
scrollBehavior="inside" scrollBehavior="inside"
> >
<ModalContent className="h-full w-[calc(100%-100px)]"> <ModalContent className="h-full w-[calc(100%-100px)]">
<ModalHeader className="flex"></ModalHeader> <ModalHeader className="flex pb-0"></ModalHeader>
<ModalBody className="h-full"> <ModalBody className="h-full">
<BaseEditor language="yaml" value={currData} readOnly={true} /> <BaseEditor language="yaml" value={currData} readOnly={true} />
</ModalBody> </ModalBody>
<ModalFooter> <ModalFooter className="pt-0">
<Button variant="light" onPress={onClose}> <Button size="sm" variant="light" onPress={onClose}>
</Button> </Button>
</ModalFooter> </ModalFooter>

View File

@ -21,7 +21,7 @@ const PacEditorViewer: React.FC<Props> = (props) => {
scrollBehavior="inside" scrollBehavior="inside"
> >
<ModalContent className="h-full w-[calc(100%-100px)]"> <ModalContent className="h-full w-[calc(100%-100px)]">
<ModalHeader className="flex">PAC脚本</ModalHeader> <ModalHeader className="flex pb-0">PAC脚本</ModalHeader>
<ModalBody className="h-full"> <ModalBody className="h-full">
<BaseEditor <BaseEditor
language="javascript" language="javascript"
@ -29,11 +29,11 @@ const PacEditorViewer: React.FC<Props> = (props) => {
onChange={(value) => setCurrData(value || '')} onChange={(value) => setCurrData(value || '')}
/> />
</ModalBody> </ModalBody>
<ModalFooter> <ModalFooter className="pt-0">
<Button variant="light" onPress={onCancel}> <Button size="sm" variant="light" onPress={onCancel}>
</Button> </Button>
<Button color="primary" onPress={() => onConfirm(currData)}> <Button size="sm" color="primary" onPress={() => onConfirm(currData)}>
</Button> </Button>
</ModalFooter> </ModalFooter>