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

JerryFan626 · JerryFan626 · commit 54b2ffa138c1 · 2023-10-17T17:44:47.000+08:00
diff --git a/chat2db-client/src/blocks/DatabaseTableEditor/ColumnList/index.tsx b/chat2db-client/src/blocks/DatabaseTableEditor/ColumnList/index.tsx
@@ -138,6 +138,7 @@ const ColumnList = forwardRef((props: IProps, ref: ForwardedRef<IColumnListRef>)
       key: 'sort',
       width: '40px',
       align: 'center',
+      fixed: 'left',
     },
     // {
     //   title: 'O T',
@@ -481,6 +482,7 @@ const ColumnList = forwardRef((props: IProps, ref: ForwardedRef<IColumnListRef>)
                 pagination={false}
                 rowKey="key"
                 columns={columns as any}
+                scroll={{ x: '100%' }}
                 dataSource={dataSource.filter((i) => i.editStatus !== EditColumnOperationType.Delete)}
               />
             </SortableContext>
diff --git a/chat2db-client/src/blocks/DatabaseTableEditor/IndexList/index.tsx b/chat2db-client/src/blocks/DatabaseTableEditor/IndexList/index.tsx
@@ -180,6 +180,7 @@ const IndexList = forwardRef((props: IProps, ref: ForwardedRef<IIndexListRef>) =
         key: 'sort',
         width: '40px',
         align: 'center',
+        fixed: 'left',
       },
       // {
       //   title: i18n('editTable.label.index'),
@@ -193,6 +194,7 @@ const IndexList = forwardRef((props: IProps, ref: ForwardedRef<IIndexListRef>) =
         title: i18n('editTable.label.indexName'),
         dataIndex: 'name',
         width: '180px',
+        fixed: 'left',
         render: (text: string, record: IIndexItem) => {
           const editable = isEditing(record);
           return editable ? (
@@ -207,7 +209,7 @@ const IndexList = forwardRef((props: IProps, ref: ForwardedRef<IIndexListRef>) =
       {
         title: i18n('editTable.label.indexType'),
         dataIndex: 'type',
-        width: '180px',
+        width: '100px',
         render: (text: string, record: IIndexItem) => {
           const editable = isEditing(record);
           return editable ? (
@@ -289,7 +291,7 @@ const IndexList = forwardRef((props: IProps, ref: ForwardedRef<IIndexListRef>) =
       _columns.splice(3, 0, {
         title: i18n('editTable.label.indexMethod'),
         dataIndex: 'method',
-        width: '180px',
+        width: '120px',
         render: (text: string, record: IIndexItem) => {
           const editable = isEditing(record);
           return editable ? (
diff --git a/chat2db-client/src/components/Console/MonacoEditor/index.tsx b/chat2db-client/src/components/Console/MonacoEditor/index.tsx
@@ -324,16 +324,16 @@ export const appendMonacoValue = (editor: any, text: any, range: IRangeType = 'e
   // decorations?: IModelDeltaDecoration[]: 一个数组类型的参数，用于指定插入的文本的装饰。可以用来设置文本的样式、颜色、背景色等。如果不需要设置装饰，可以忽略此参数。
   const decorations = [{}]; // 解决新增的文本默认背景色为灰色
   editor.executeEdits('setValue', [op], decorations);
-  // const addedLastLine = editor.getModel().getLineCount();
+  const addedLastLine = editor.getModel().getLineCount();
   // const addedLastLineLength = editor.getModel().getLineMaxColumn(lastLine);
 
-  // if (range === 'end') {
-  //   setTimeout(() => {
-  //     editor.revealLine(addedLastLine + 1);
-  //     editor.setPosition({ lineNumber: addedLastLine, column: addedLastLineLength });
-  //     editor.focus();
-  //   }, 0);
-  // }
+  if (range === 'end') {
+    setTimeout(() => {
+      editor.revealLine(addedLastLine + 1);
+      // editor.setPosition({ lineNumber: addedLastLine, column: addedLastLineLength });
+      // editor.focus();
+    }, 0);
+  }
 };
 
 export default forwardRef(MonacoEditor);
diff --git a/chat2db-client/src/components/ShortcutKey/index.tsx b/chat2db-client/src/components/ShortcutKey/index.tsx
@@ -36,12 +36,12 @@ const shortcutsList = [
     keys: [keyboardKey.command, 'Enter'],
   },
   {
-    title: i18n('common.text.saveConsole'),
-    keys: [keyboardKey.command, 'S'],
+    title: i18n('common.text.executeSelectedSQL'),
+    keys: [keyboardKey.command, 'R'],
   },
   {
-    title: i18n('common.text.refreshPage'),
-    keys: [keyboardKey.command, 'R'],
+    title: i18n('common.text.saveConsole'),
+    keys: [keyboardKey.command, 'S'],
   },
   {
     title: i18n('common.button.createConsole'),

Original file line number	Diff line number	Diff line change
`@@ -36,12 +36,12 @@ const shortcutsList = [`
`36`	`36`	`keys: [keyboardKey.command, 'Enter'],`
`37`	`37`	`},`
`38`	`38`	`{`
`39`		`- title: i18n('common.text.saveConsole'),`
`40`		`- keys: [keyboardKey.command, 'S'],`
	`39`	`+ title: i18n('common.text.executeSelectedSQL'),`
	`40`	`+ keys: [keyboardKey.command, 'R'],`
`41`	`41`	`},`
`42`	`42`	`{`
`43`		`- title: i18n('common.text.refreshPage'),`
`44`		`- keys: [keyboardKey.command, 'R'],`
	`43`	`+ title: i18n('common.text.saveConsole'),`
	`44`	`+ keys: [keyboardKey.command, 'S'],`
`45`	`45`	`},`
`46`	`46`	`{`
`47`	`47`	`title: i18n('common.button.createConsole'),`