topdog/supersonic
1
0
Fork 0
mirror of https://github.com/tencentmusic/supersonic.git synced 2025-12-10 11:07:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'
Some checks failed
supersonic CentOS CI / build (21) (push) Has been cancelled
Details
supersonic mac CI / build (21) (push) Has been cancelled
Details
supersonic ubuntu CI / build (21) (push) Has been cancelled
Details
supersonic windows CI / build (21) (push) Has been cancelled
Details

Browse Source
This commit is contained in:
jerryjzhang
2025-03-14 23:11:51 +08:00
parent c3483ae340 a5051c7225
commit 1c85bcecc5
2 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/SqlDetail.tsx
View File

@@ -18,7 +18,7 @@ import { isFunction } from 'lodash';
import FullScreen from '@/components/FullScreen'; import FullScreen from '@/components/FullScreen';
import SqlEditor from '@/components/SqlEditor'; import SqlEditor from '@/components/SqlEditor';
import type { TaskResultItem, TaskResultColumn } from '../data'; import type { TaskResultItem, TaskResultColumn } from '../data';
import { executeSql, listColumnsBySql } from '@/pages/SemanticModel/service'; import { executeSql } from '@/pages/SemanticModel/service';
import SqlParams from './SqlParams'; import SqlParams from './SqlParams';
import styles from '../style.less'; import styles from '../style.less';
@@ -248,19 +248,12 @@ const SqlDetail: React.FC<IProps> = ({
id: currentDatabaseItem.key, id: currentDatabaseItem.key,
sqlVariables: sqlParams, sqlVariables: sqlParams,
}); });
const { code: getColumnCode, data: getColumnData } = await listColumnsBySql({
sql: value,
databaseId: currentDatabaseItem.key,
});
setResultTableLoading(false); setResultTableLoading(false);
if (code === 200 && getColumnCode === 200) { if (code === 200) {
const columnData = getColumnData.map((item) => { const columnData = (data.columns || []).map((item: any) => {
return { return {
...item, ...item,
nameEn: item.columnName, columnName: item.nameEn,
type: item.dataType,
}; };
}); });
fetchTaskResult(data, columnData); fetchTaskResult(data, columnData);

13
webapp/packages/supersonic-fe/src/pages/SemanticModel/service.ts
View File

@@ -373,12 +373,6 @@ export async function executeSql(params: ExcuteSqlParams) {
return request.post(`${process.env.API_BASE_URL}database/executeSql`, { data }); return request.post(`${process.env.API_BASE_URL}database/executeSql`, { data });
} }
export async function listColumnsBySql(data: { databaseId: number; sql: string }) {
return request.post(`${process.env.API_BASE_URL}database/listColumnsBySql`, {
data,
});
}
export function getCatalogs(dbId: number): Promise<any> { export function getCatalogs(dbId: number): Promise<any> {
return request(`${process.env.API_BASE_URL}database/getCatalogs`, { return request(`${process.env.API_BASE_URL}database/getCatalogs`, {
method: 'GET', method: 'GET',
@@ -409,7 +403,12 @@ export function getTables(databaseId: number, catalog: string, dbName: string):
}); });
} }
export function getColumns(databaseId: number, catalog: string, dbName: string, tableName: string): Promise<any> { export function getColumns(
databaseId: number,
catalog: string,
dbName: string,
tableName: string,
): Promise<any> {
return request(`${process.env.API_BASE_URL}database/getColumnsByName`, { return request(`${process.env.API_BASE_URL}database/getColumnsByName`, {
method: 'GET', method: 'GET',
params: { params: {