mirror of
https://github.com/tencentmusic/supersonic.git
synced 2025-12-10 19:51:00 +00:00
Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -18,7 +18,7 @@ import { isFunction } from 'lodash';
|
||||
import FullScreen from '@/components/FullScreen';
|
||||
import SqlEditor from '@/components/SqlEditor';
|
||||
import type { TaskResultItem, TaskResultColumn } from '../data';
|
||||
import { executeSql, listColumnsBySql } from '@/pages/SemanticModel/service';
|
||||
import { executeSql } from '@/pages/SemanticModel/service';
|
||||
|
||||
import SqlParams from './SqlParams';
|
||||
import styles from '../style.less';
|
||||
@@ -248,19 +248,12 @@ const SqlDetail: React.FC<IProps> = ({
|
||||
id: currentDatabaseItem.key,
|
||||
sqlVariables: sqlParams,
|
||||
});
|
||||
|
||||
const { code: getColumnCode, data: getColumnData } = await listColumnsBySql({
|
||||
sql: value,
|
||||
databaseId: currentDatabaseItem.key,
|
||||
});
|
||||
|
||||
setResultTableLoading(false);
|
||||
if (code === 200 && getColumnCode === 200) {
|
||||
const columnData = getColumnData.map((item) => {
|
||||
if (code === 200) {
|
||||
const columnData = (data.columns || []).map((item: any) => {
|
||||
return {
|
||||
...item,
|
||||
nameEn: item.columnName,
|
||||
type: item.dataType,
|
||||
columnName: item.nameEn,
|
||||
};
|
||||
});
|
||||
fetchTaskResult(data, columnData);
|
||||
|
||||
@@ -373,12 +373,6 @@ export async function executeSql(params: ExcuteSqlParams) {
|
||||
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> {
|
||||
return request(`${process.env.API_BASE_URL}database/getCatalogs`, {
|
||||
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`, {
|
||||
method: 'GET',
|
||||
params: {
|
||||
|
||||
Reference in New Issue
Block a user