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

JerryFan626 · JerryFan626 · commit 474f371943d3 · 2023-11-01T21:09:38.000+08:00
diff --git a/chat2db-client/src/blocks/DatabaseTableEditor/ColumnList/index.less b/chat2db-client/src/blocks/DatabaseTableEditor/ColumnList/index.less
@@ -130,5 +130,9 @@
         display: none;
       }
     }
+    // antd无法设置最小宽度，所以在这里设置最小列宽为100px
+    colgroup col:nth-last-child(2) {
+      min-width: 100px;
+    }
   }
 }
diff --git a/chat2db-client/src/blocks/DatabaseTableEditor/IndexList/index.less b/chat2db-client/src/blocks/DatabaseTableEditor/IndexList/index.less
@@ -122,5 +122,12 @@
         display: none;
       }
     }
+    // antd无法设置最小宽度，所以在这里设置最小列宽为100px
+    colgroup col:nth-last-child(2) {
+      min-width: 100px;
+    }
+    // colgroup col:nth-last-child(3) {
+    //   min-width: 100px;
+    // }
   }
 }
diff --git a/chat2db-client/src/blocks/DatabaseTableEditor/IndexList/index.tsx b/chat2db-client/src/blocks/DatabaseTableEditor/IndexList/index.tsx
@@ -396,6 +396,7 @@ const IndexList = forwardRef((props: IProps, ref: ForwardedRef<IIndexListRef>) =
                 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/index.less b/chat2db-client/src/blocks/DatabaseTableEditor/index.less
@@ -13,6 +13,7 @@
   justify-content: space-between;
   margin: 10px 10px 0px 10px;
   box-sizing: border-box;
+  overflow: hidden;
 }
 
 .saveButton {
diff --git a/chat2db-client/src/pages/main/workspace/components/WorkspaceExtend/index.tsx b/chat2db-client/src/pages/main/workspace/components/WorkspaceExtend/index.tsx
@@ -5,6 +5,7 @@ import { Popover } from 'antd';
 import Iconfont from '@/components/Iconfont';
 import Output from '@/components/Output';
 import { useWorkspaceStore } from '@/store/workspace';
+import i18n from '@/i18n';
 
 interface IProps {
   className?: string;
@@ -32,7 +33,7 @@ export default memo<IProps>((props) => {
     // },
     {
       code: 'executiveLog',
-      title: '执行记录',
+      title: i18n('common.title.executiveLogging'),
       icon: '\ue8ad',
       components: <Output curWorkspaceParams={props.curWorkspaceParams} />,
     },

Original file line number	Diff line number	Diff line change
`@@ -130,5 +130,9 @@`
`130`	`130`	`display: none;`
`131`	`131`	`}`
`132`	`132`	`}`
	`133`	`+ // antd无法设置最小宽度，所以在这里设置最小列宽为100px`
	`134`	`+ colgroup col:nth-last-child(2) {`
	`135`	`+ min-width: 100px;`
	`136`	`+ }`
`133`	`137`	`}`
`134`	`138`	`}`
Original file line number	Diff line number	Diff line change
`@@ -122,5 +122,12 @@`
`122`	`122`	`display: none;`
`123`	`123`	`}`
`124`	`124`	`}`
	`125`	`+ // antd无法设置最小宽度，所以在这里设置最小列宽为100px`
	`126`	`+ colgroup col:nth-last-child(2) {`
	`127`	`+ min-width: 100px;`
	`128`	`+ }`
	`129`	`+ // colgroup col:nth-last-child(3) {`
	`130`	`+ // min-width: 100px;`
	`131`	`+ // }`
`125`	`132`	`}`
`126`	`133`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`	`justify-content: space-between;`
`14`	`14`	`margin: 10px 10px 0px 10px;`
`15`	`15`	`box-sizing: border-box;`
	`16`	`+ overflow: hidden;`
`16`	`17`	`}`
`17`	`18`
`18`	`19`	`.saveButton {`