From 0deacc2d4dea2087bf065dc2946fde1670a7fd03 Mon Sep 17 00:00:00 2001 From: HFO4 <912394456@qq.com> Date: Sun, 24 Apr 2022 15:15:00 +0800 Subject: [PATCH] fix: cannot clear color value when creating themes --- src/component/Admin/Dialogs/CreateTheme.js | 6 +++++- src/redux/explorer/action.ts | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/component/Admin/Dialogs/CreateTheme.js b/src/component/Admin/Dialogs/CreateTheme.js index 7e93ecf..c493f08 100644 --- a/src/component/Admin/Dialogs/CreateTheme.js +++ b/src/component/Admin/Dialogs/CreateTheme.js @@ -52,7 +52,11 @@ export default function CreateTheme({ open, onClose, onSubmit }) { }); const subTheme = useCallback(() => { - return createMuiTheme(theme); + try { + return createMuiTheme(theme); + } catch (e) { + return createMuiTheme({}); + } }, [theme]); return ( diff --git a/src/redux/explorer/action.ts b/src/redux/explorer/action.ts index 912acdf..5ea8236 100644 --- a/src/redux/explorer/action.ts +++ b/src/redux/explorer/action.ts @@ -483,7 +483,10 @@ export const selectFile = (file: any, event: any, fileIndex: any) => { const { ctrlKey, metaKey, shiftKey } = event; return (dispatch: any, getState: any) => { // 多种组合操作忽略 - if ([ctrlKey, shiftKey].filter(Boolean).length > 1 || [metaKey, shiftKey].filter(Boolean).length > 1) { + if ( + [ctrlKey, shiftKey].filter(Boolean).length > 1 || + [metaKey, shiftKey].filter(Boolean).length > 1 + ) { return; } const isMacbook = isMac();