fixes oceanbase/odc#2312

oceanbase · May 29, 2024 · 111c2b5 · 111c2b5
1 parent 21d507e
commit 111c2b5
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 7 deletions.
diff --git a/src/component/Input/Keymap/index.tsx b/src/component/Input/Keymap/index.tsx
@@ -54,13 +54,11 @@ const KeymapInput: React.FC<IProps> = (props) => {
     ctrlKey && mod.push(KeyCode.Ctrl);
     shiftKey && mod.push(KeyCode.Shift);
     altKey && mod.push(KeyCode.Alt);
-    let isSpecialKey = [
-      KeyCode.Ctrl,
-      KeyCode.Shift,
-      KeyCode.Alt,
-      KeyCode.Meta,
-      KeyCode.Meta,
-    ].includes(monacoKeyCode);
+    let isSpecialKey = [KeyCode.Ctrl, KeyCode.Shift, KeyCode.Alt, KeyCode.Meta].includes(
+      monacoKeyCode,
+    );
+
+    console.log(mod, keyCode, monacoKeyCode);
     const value = isSpecialKey ? [...mod] : [...mod, monacoKeyCode];
     setValue(value.join(','));
   }

diff --git a/src/component/ODCSetting/config.tsx b/src/component/ODCSetting/config.tsx
@@ -19,6 +19,7 @@ import editorSettings from './config/editor';
 import perferenceSettings from './config/preference';
 import performanceSettings from './config/performance';
 import accountSettings from './config/account';
+import type { FormRule } from 'antd';
 
 export interface ODCSettingGroup {
   label: string;
@@ -35,6 +36,7 @@ export interface IODCSetting<T = any> {
    * 渲染宽度
    */
   span?: number;
+  rules?: FormRule[];
   storeType: 'server' | 'local';
   disabledInClient?: boolean;
   hidden?: boolean;

diff --git a/src/component/ODCSetting/config/editor.tsx b/src/component/ODCSetting/config/editor.tsx
@@ -20,6 +20,7 @@ import { IODCSetting, ODCSettingGroup } from '../config';
 import InputItem from '../Item/InputItem';
 import KeymapInput from '@/component/Input/Keymap';
 import SelectItem from '../Item/SelectItem';
+import { validForEditorKeymap } from '@/component/Input/Keymap/helper';
 
 const editorGroup: ODCSettingGroup = {
   label: formatMessage({ id: 'src.component.ODCSetting.config.239D3F16' }), //'编辑器'
@@ -107,6 +108,13 @@ const editorSettings: IODCSetting[] = [
     group: editorGroup,
     secondGroup: editorKeymapGroup,
     storeType: 'server',
+    rules: [
+      {
+        validator(rule, value, callback) {
+          return validForEditorKeymap(value);
+        },
+      },
+    ],
     render: (value, onChange) => {
       return <KeymapInput value={value} onChange={onChange} />;
     },
@@ -116,6 +124,13 @@ const editorSettings: IODCSetting[] = [
     key: 'odc.editor.shortcut.executeCurrentStatement',
     group: editorGroup,
     secondGroup: editorKeymapGroup,
+    rules: [
+      {
+        validator(rule, value, callback) {
+          return validForEditorKeymap(value);
+        },
+      },
+    ],
     storeType: 'server',
     render: (value, onChange) => {
       return <KeymapInput value={value} onChange={onChange} />;

diff --git a/src/component/ODCSetting/index.tsx b/src/component/ODCSetting/index.tsx
@@ -275,6 +275,7 @@ const ODCSetting: React.FC<IProps> = ({ modalStore }) => {
                                     }
                                     name={set.key}
                                     key={set.key}
+                                    rules={set.rules}
                                   >
                                     {set.render(null, async () => {})}
                                   </Form.Item>