Skip to content

Commit 40a31f0

Browse files
shanhexishanhexi
committed
merge: handel conflict
2 parents 1758e0f + 8351f2b commit 40a31f0

18 files changed

Lines changed: 396468 additions & 10916 deletions

File tree

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
*.iws
1212
*.iml
1313
*.ipr
14+
.out
1415

1516
### Visual Studio Code ###
1617
package-lock.json
@@ -27,3 +28,4 @@ package-lock.json
2728
/chat2db-server/ali-dbhub-server-domain/ali-dbhub-server-domain-support/src/main/resources/lib/*
2829
/chat2db-server/ali-dbhub-server-domain/ali-dbhub-server-domain-support/lib/*
2930
/lib
31+
/out/*

‎chat2db-client/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@
130130
}
131131
],
132132
"publisherName": "Chat2DB",
133-
"icon": "src/assets/logo/logo.png"
133+
"icon": "src/assets/logo/logo.ico"
134134
},
135135
"linux": {
136136
"maintainer": "Chat2DB, huanyueyaoqin@qq.com",

‎chat2db-client/src/components/Console/index.tsx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -491,12 +491,12 @@ function Console(props: IProps, ref: ForwardedRef<IConsoleRef>) {
491491
}}
492492
selectedTables={selectedTables}
493493
onSelectTables={(tables: string[]) => {
494-
if (tables.length > 8) {
495-
message.warning({
496-
content: i18n('chat.input.tableSelect.error.TooManyTable'),
497-
});
498-
return;
499-
}
494+
// if (tables.length > 8) {
495+
// message.warning({
496+
// content: i18n('chat.input.tableSelect.error.TooManyTable'),
497+
// });
498+
// return;
499+
// }
500500
setSelectedTables(tables);
501501
}}
502502
onClickRemainBtn={handleClickRemainBtn}

‎chat2db-client/src/layouts/index.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import { clearOlderLocalStorage } from '@/utils';
1616
import registerMessage from './init/registerMessage';
1717
import registerNotification from './init/registerNotification';
1818
import MyNotification from '@/components/MyNotification';
19-
import Iconfont from '@/components/Iconfont';
20-
import Setting from '@/blocks/Setting';
19+
// import Iconfont from '@/components/Iconfont';
20+
// import Setting from '@/blocks/Setting';
2121
import indexedDB from '@/indexedDB';
2222

2323
declare global {

‎chat2db-client/src/pages/main/workspace/components/TableList/index.tsx‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import { debounce } from 'lodash';
2020
import { dataSourceFormConfigs } from '@/components/ConnectionEdit/config/dataSource';
2121
import styles from './index.less';
2222
import ImportBlock from '@/components/ImportBlock';
23-
import { useRequest } from 'ahooks';
2423

2524
interface IOption {
2625
value: TreeNodeType;
@@ -71,8 +70,6 @@ const TableList = dvaModel((props: any) => {
7170
const treeBoxRef = useRef<any>(null);
7271
const controllerRef = useRef<AbortController>();
7372

74-
const useRequestRes = useRequest();
75-
7673
// 导出表结构
7774
const handleExport = (exportType: ExportTypeEnum) => {
7875
props.onExport && props.onExport(exportType);

0 commit comments

Comments
 (0)