Merge branch 'dev' of github.com:chat2db/Chat2DB into dev

JerryFan626 · JerryFan626 · commit 6e971e3682cd · 2023-10-15T12:36:37.000+08:00
diff --git a/chat2db-client/src/components/Console/MonacoEditor/index.tsx b/chat2db-client/src/components/Console/MonacoEditor/index.tsx
@@ -279,7 +279,7 @@ export const appendMonacoValue = (editor: any, text: any, range: IRangeType = 'e
     // 在末尾添加内容
     case 'end':
       newRange = new monaco.Range(lastLine, lastLineLength, lastLine, lastLineLength);
-      newText = `\n${text}`;
+      newText = `${text}`;
       break;
     default:
       break;
@@ -296,7 +296,7 @@ export const appendMonacoValue = (editor: any, text: any, range: IRangeType = 'e
   if (range === 'end') {
     setTimeout(() => {
       editor.revealLine(lastLine + 1);
-      editor.setPosition({ lineNumber: lastLine + 1, column: 1 });
+      editor.setPosition({ lineNumber: lastLine, column: 1 });
     }, 0);
   }
 };
diff --git a/chat2db-client/src/main/menu.js b/chat2db-client/src/main/menu.js
@@ -83,7 +83,7 @@ const registerAppMenu = (mainWindow) => {
       submenu: [
         {
           label: '打开日志',
-          accelerator: process.platform === 'darwin' ? 'Cmd+Shift+L' : 'Ctrl+Shift+L',
+          accelerator: process.platform === 'darwin' ? 'Cmd+Shift+T' : 'Ctrl+Shift+T',
           click() {
             const fileName = '.chat2db/logs/application.log';
             const url = path.join(os.homedir(), fileName);
diff --git a/chat2db-client/src/pages/main/workspace/components/WorkspaceRight/index.tsx b/chat2db-client/src/pages/main/workspace/components/WorkspaceRight/index.tsx
@@ -62,7 +62,6 @@ const WorkspaceRight = memo<IProps>((props: IProps) => {
   // 注册快捷键command+shift+L新建console
   useEffect(() => {
     const handleKeyDown = (e: KeyboardEvent) => {
-      console.log(e.metaKey, e.shiftKey, e.code === 'KeyL', e);
       if (e.metaKey && e.shiftKey && e.code === 'KeyL') {
         addConsole();
       }

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ const registerAppMenu = (mainWindow) => {`
`83`	`83`	`submenu: [`
`84`	`84`	`{`
`85`	`85`	`label: '打开日志',`
`86`		`- accelerator: process.platform === 'darwin' ? 'Cmd+Shift+L' : 'Ctrl+Shift+L',`
	`86`	`+ accelerator: process.platform === 'darwin' ? 'Cmd+Shift+T' : 'Ctrl+Shift+T',`
`87`	`87`	`click() {`
`88`	`88`	`const fileName = '.chat2db/logs/application.log';`
`89`	`89`	`const url = path.join(os.homedir(), fileName);`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,6 @@ const WorkspaceRight = memo<IProps>((props: IProps) => {`
`62`	`62`	`// 注册快捷键command+shift+L新建console`
`63`	`63`	`useEffect(() => {`
`64`	`64`	`const handleKeyDown = (e: KeyboardEvent) => {`
`65`		`- console.log(e.metaKey, e.shiftKey, e.code === 'KeyL', e);`
`66`	`65`	`if (e.metaKey && e.shiftKey && e.code === 'KeyL') {`
`67`	`66`	`addConsole();`
`68`	`67`	`}`