From afbc95c46c6d881af9d4fd87c947d44ad78ebfc9 Mon Sep 17 00:00:00 2001 From: Jerry Fan Date: Sun, 15 Oct 2023 17:15:37 +0800 Subject: [PATCH 1/3] fix: test --- .../workspace/components/TableList/index.tsx | 2 +- .../components/WorkspaceRight/index.tsx | 3 +++ chat2db-client/src/service/sql.ts | 17 +++++++++++++---- chat2db-client/src/utils/IntelliSense/table.ts | 4 ++-- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/chat2db-client/src/pages/main/workspace/components/TableList/index.tsx b/chat2db-client/src/pages/main/workspace/components/TableList/index.tsx index c81286cd..d4b7106c 100644 --- a/chat2db-client/src/pages/main/workspace/components/TableList/index.tsx +++ b/chat2db-client/src/pages/main/workspace/components/TableList/index.tsx @@ -99,7 +99,7 @@ const TableList = dvaModel((props: any) => { const reader = new FileReader(); reader.onload = function (event) { - const sqlContent = event.target?.result ?? ''; + const sqlContent = (event.target?.result ?? '') as string; addConsole(sqlContent); }; diff --git a/chat2db-client/src/pages/main/workspace/components/WorkspaceRight/index.tsx b/chat2db-client/src/pages/main/workspace/components/WorkspaceRight/index.tsx index 0e07a4ab..ef02e993 100644 --- a/chat2db-client/src/pages/main/workspace/components/WorkspaceRight/index.tsx +++ b/chat2db-client/src/pages/main/workspace/components/WorkspaceRight/index.tsx @@ -326,6 +326,8 @@ const WorkspaceRight = memo((props: IProps) => { const { dataSourceId, databaseName, schemaName, databaseType } = curWorkspaceParams; if (databaseName || schemaName) { + console.log('getAllTable Before:', window._BaseURL); + debugger; sqlService .getAllTableList({ dataSourceId, @@ -337,6 +339,7 @@ const WorkspaceRight = memo((props: IProps) => { registerIntelliSenseTable(data, databaseType, dataSourceId, databaseName, schemaName); registerIntelliSenseField(tableList.current, dataSourceId, databaseName, schemaName); }); + console.log('getAllTable Before:', window._BaseURL); } }, [curWorkspaceParams.databaseType, curWorkspaceParams.databaseName, curWorkspaceParams.schemaName]); diff --git a/chat2db-client/src/service/sql.ts b/chat2db-client/src/service/sql.ts index f7f4e158..662b18c5 100644 --- a/chat2db-client/src/service/sql.ts +++ b/chat2db-client/src/service/sql.ts @@ -111,10 +111,19 @@ const updateTableExample = createRequest<{ dbType: DatabaseTypeCode }, string>(' const exportCreateTableSql = createRequest('/api/rdb/ddl/export', { method: 'get' }); const executeTable = createRequest('/api/rdb/ddl/execute', { method: 'post' }); -const getColumnList = createRequest('/api/rdb/ddl/column_list', { method: 'get', delayTime: 200 }); -const getIndexList = createRequest('/api/rdb/ddl/index_list', { method: 'get', delayTime: 200 }); +const getColumnList = createRequest('/api/rdb/ddl/column_list', { + method: 'get', + delayTime: 200, +}); +const getIndexList = createRequest('/api/rdb/ddl/index_list', { + method: 'get', + delayTime: 200, +}); const getKeyList = createRequest('/api/rdb/ddl/key_list', { method: 'get', delayTime: 200 }); -const getSchemaList = createRequest('/api/rdb/ddl/schema_list', { method: 'get', delayTime: 200 }); +const getSchemaList = createRequest('/api/rdb/ddl/schema_list', { + method: 'get', + delayTime: 200, +}); const getDatabaseSchemaList = createRequest<{ dataSourceId: number }, MetaSchemaVO>( '/api/rdb/ddl/database_schema_list', @@ -239,7 +248,7 @@ const getTableDetails = createRequest< /** 获取库的所有表 */ const getAllTableList = createRequest< - { dataSourceId: number; databaseName: string; schemaName?: string | null }, + { dataSourceId: number; databaseName?: string | null; schemaName?: string | null }, Array<{ name: string; comment: string }> >('/api/rdb/table/table_list', { method: 'get' }); diff --git a/chat2db-client/src/utils/IntelliSense/table.ts b/chat2db-client/src/utils/IntelliSense/table.ts index 6889284f..451c61b7 100644 --- a/chat2db-client/src/utils/IntelliSense/table.ts +++ b/chat2db-client/src/utils/IntelliSense/table.ts @@ -45,7 +45,7 @@ const registerIntelliSenseTable = ( tableList: Array<{ name: string; comment: string }>, databaseCode?: DatabaseTypeCode, dataSourceId?: number, - databaseName?: string, + databaseName?: string | null, schemaName?: string | null, ) => { monaco.editor.registerCommand('addFieldList', (_: any, ...args: any[]) => { @@ -55,7 +55,7 @@ const registerIntelliSenseTable = ( intelliSenseTable.dispose(); intelliSenseTable = monaco.languages.registerCompletionItemProvider('sql', { - triggerCharacters: [' ', ], + triggerCharacters: [' '], provideCompletionItems: (model, position) => { const lineContentUntilPosition = model.getValueInRange({ startLineNumber: position.lineNumber, From 65fe1406a9366de4634f72bc854d6dc72739b0fa Mon Sep 17 00:00:00 2001 From: Jerry Fan Date: Sun, 15 Oct 2023 18:01:18 +0800 Subject: [PATCH 2/3] fix: fix bug --- .../components/WorkspaceRight/index.tsx | 2 -- chat2db-client/src/service/base.ts | 25 +++++++++++++------ 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/chat2db-client/src/pages/main/workspace/components/WorkspaceRight/index.tsx b/chat2db-client/src/pages/main/workspace/components/WorkspaceRight/index.tsx index ef02e993..e0457880 100644 --- a/chat2db-client/src/pages/main/workspace/components/WorkspaceRight/index.tsx +++ b/chat2db-client/src/pages/main/workspace/components/WorkspaceRight/index.tsx @@ -326,8 +326,6 @@ const WorkspaceRight = memo((props: IProps) => { const { dataSourceId, databaseName, schemaName, databaseType } = curWorkspaceParams; if (databaseName || schemaName) { - console.log('getAllTable Before:', window._BaseURL); - debugger; sqlService .getAllTableList({ dataSourceId, diff --git a/chat2db-client/src/service/base.ts b/chat2db-client/src/service/base.ts index cbf21b81..54627171 100644 --- a/chat2db-client/src/service/base.ts +++ b/chat2db-client/src/service/base.ts @@ -1,6 +1,6 @@ import { extend, ResponseError, type RequestOptionsInit } from 'umi-request'; import { message } from 'antd'; -import { navigate } from '@/utils' +import { navigate } from '@/utils'; export type IErrorLevel = 'toast' | 'prompt' | 'critical' | false; export interface IOptions { @@ -10,7 +10,7 @@ export interface IOptions { delayTime?: number | true; outside?: boolean; isFullPath?: boolean; - dynamicUrl?: boolean; + dynamicUrl?: boolean; } // TODO: @@ -127,11 +127,22 @@ request.interceptors.response.use(async (response) => { export default function createRequest

(url: string, options?: IOptions) { // 路由跳转 - const { method = 'get', mock = false, errorLevel = 'toast', delayTime, outside, isFullPath, dynamicUrl } = options || {}; + const { + method = 'get', + mock = false, + errorLevel = 'toast', + delayTime, + outside, + isFullPath, + dynamicUrl, + } = options || {}; - // 是否需要mock - const _baseURL = (mock ? mockUrl : baseURL) || ''; - return function (params: P, restParams?: RequestOptionsInit) { + return function (params: P, restParams?: RequestOptionsInit) { + // 是否需要mock + const _baseURL = (mock ? mockUrl : baseURL) || ''; + if (url === '/api/rdb/ddl/list') { + debugger; + } // 在url上按照定义规则拼接params const paramsInUrl: string[] = []; @@ -171,7 +182,7 @@ export default function createRequest

(url: string, options?: I eventualUrl = isFullPath ? url : eventualUrl; // 动态的url - if(dynamicUrl){ + if (dynamicUrl) { eventualUrl = params as string; } From 117e968bed727c95982a2874856ff2272a5db304 Mon Sep 17 00:00:00 2001 From: Jerry Fan Date: Sun, 15 Oct 2023 18:02:25 +0800 Subject: [PATCH 3/3] fix: fix bug --- chat2db-client/src/service/base.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/chat2db-client/src/service/base.ts b/chat2db-client/src/service/base.ts index 54627171..3c54272c 100644 --- a/chat2db-client/src/service/base.ts +++ b/chat2db-client/src/service/base.ts @@ -140,9 +140,9 @@ export default function createRequest

(url: string, options?: I return function (params: P, restParams?: RequestOptionsInit) { // 是否需要mock const _baseURL = (mock ? mockUrl : baseURL) || ''; - if (url === '/api/rdb/ddl/list') { - debugger; - } + // if (url === '/api/rdb/ddl/list') { + // debugger; + // } // 在url上按照定义规则拼接params const paramsInUrl: string[] = [];