diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/DataSourceCreateForm.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/DataSourceCreateForm.tsx index 8f26d54d5..410276dd2 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/DataSourceCreateForm.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/DataSourceCreateForm.tsx @@ -18,6 +18,7 @@ export type CreateFormProps = { dispatch: Dispatch; createModalVisible: boolean; sql?: string; + sqlParams?: IDataSource.ISqlParamsItem[]; databaseId?: number; modelItem: ISemantic.IModelItem; onCancel?: () => void; @@ -42,6 +43,7 @@ const DataSourceCreateForm: React.FC = ({ createModalVisible, scriptColumns, sql = '', + sqlParams, onSubmit, modelItem, databaseId, @@ -249,6 +251,7 @@ const DataSourceCreateForm: React.FC = ({ queryType: basicInfoFormMode === 'fast' ? 'table_query' : 'sql_query', tableQuery: dbName && tableName ? `${dbName}.${tableName}` : '', sqlQuery: sql, + sqlVariables: sqlParams, }, }; setQueryParamsState(queryParams); diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/SqlDetail.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/SqlDetail.tsx index 665a31a78..89b947729 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/SqlDetail.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/SqlDetail.tsx @@ -33,6 +33,7 @@ export type DataSourceSubmitData = { sql: string; databaseId: number; columns: any[]; + sqlParams: any[]; }; type IProps = { @@ -428,9 +429,9 @@ const SqlDetail: React.FC = ({ - {/* + - */} + @@ -481,7 +482,12 @@ const SqlDetail: React.FC = ({ className={variableCollapsed ? styles.hideSqlParams : styles.sqlParams} // style={{ height: sqlEditorHeight }} > - + { + setSqlParams(params); + }} + /> @@ -496,6 +502,7 @@ const SqlDetail: React.FC = ({ columns: scriptColumns, databaseId: currentDatabaseItem?.key || 0, sql, + sqlParams, }); }} disabled={!runState} diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/SqlParams.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/SqlParams.tsx index bde912c90..a42b2db0a 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/SqlParams.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/SqlParams.tsx @@ -1,30 +1,28 @@ import { useState } from 'react'; import type { FC } from 'react'; -import type { SqlParamsItem, OprType } from '../data'; - +import type { OprType } from '../data'; +import { IDataSource } from '../../data'; import styles from '../style.less'; import { AppstoreAddOutlined, DeleteTwoTone, EditTwoTone } from '@ant-design/icons'; import SqlParamsDetailModal from './SqlParamsDetailModal'; import { List } from 'antd'; type Props = { - value?: SqlParamsItem[]; - onChange?: (e: SqlParamsItem[]) => void; + value?: IDataSource.ISqlParamsItem[]; + onChange?: (e: IDataSource.ISqlParamsItem[]) => void; }; -const defalutItem: SqlParamsItem = { +const defalutItem: IDataSource.ISqlParamsItem = { name: '', - type: 'query', defaultValues: [], - valueType: 'string', - udf: false, + valueType: 'STRING', }; const SqlParams: FC = ({ value, onChange }) => { const [oprType, setOprType] = useState('add'); const [visible, setVisible] = useState(false); - const [initValue, setInitValue] = useState(); - const paramsChange = (params: SqlParamsItem[]) => { + const [initValue, setInitValue] = useState(); + const paramsChange = (params: IDataSource.ISqlParamsItem[]) => { if (onChange) { onChange(params); } @@ -34,7 +32,7 @@ const SqlParams: FC = ({ value, onChange }) => { setVisible(true); setInitValue(defalutItem); }; - const handleSave = async (values: SqlParamsItem) => { + const handleSave = async (values: IDataSource.ISqlParamsItem) => { const newValue = value ? [...value] : []; const { index, ...rest } = values; if (index || index === 0) { diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/SqlParamsDetailModal.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/SqlParamsDetailModal.tsx index 264a8f3c5..a181d7ec0 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/SqlParamsDetailModal.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/SqlParamsDetailModal.tsx @@ -8,17 +8,15 @@ import { IDataSource } from '../../data'; import TextArea from 'antd/lib/input/TextArea'; import ParamsSqlEditor from './SqlParamsSqlEditor'; -const EnumSqlParamsType = { - auth: '权限变量', - query: '查询变量', -}; +// const EnumSqlParamsType = { +// auth: '权限变量', +// query: '查询变量', +// }; const EnumSqlValueType = { - string: '字符串', - sql: 'SQL表达式', - date: '日期', - boolean: '布尔', - number: '数字', + STRING: '字符串', + NUMBER: '数字', + EXPR: 'SQL表达式', }; const { Option } = Select; @@ -56,7 +54,6 @@ const SqlParamsDetailModal: FC = ({ nameList, }) => { const [valueType, setValueType] = useState(); - const [udf, setUdf] = useState(); const [oldName, setOldName] = useState(); const formLayout = { @@ -68,12 +65,11 @@ const SqlParamsDetailModal: FC = ({ const submitSave = async () => { const fieldsValue = await form.validateFields(); - onSave({ ...fieldsValue, index: initValue.index, udf }); + onSave({ ...fieldsValue, index: initValue.index }); }; const handleCancel = async () => { if (onCancel && isFunction(onCancel)) { - setUdf(false); onCancel(oprType); } }; @@ -83,7 +79,6 @@ const SqlParamsDetailModal: FC = ({ ...initValue, }); setValueType(initValue.valueType); - setUdf(initValue.udf); setOldName(initValue.name); }, [initValue]); @@ -124,7 +119,7 @@ const SqlParamsDetailModal: FC = ({ > - = ({ ))} - + */} = ({ placeholder="请选择值类型" onChange={(e) => { setValueType(e as IDataSource.ISqlParamsValueType); - if (e === 'sql') { + if (e === 'EXPR') { form.setFieldsValue({ defaultValues: undefined, }); @@ -160,10 +155,10 @@ const SqlParamsDetailModal: FC = ({ ))} - + {/* - - {valueType !== 'sql' && ( + */} + {/* {valueType !== 'sql' && ( = ({ }} /> - )} - {valueType === 'sql' || udf ? ( + )} */} + {valueType === 'EXPR' ? ( diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/View/components/ViewCreateFormModal.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/View/components/ViewCreateFormModal.tsx index 682658051..ac06080a5 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/View/components/ViewCreateFormModal.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/View/components/ViewCreateFormModal.tsx @@ -7,13 +7,8 @@ import { createView, updateView, getDimensionList, queryMetric } from '../../ser import { ISemantic } from '../../data'; import { isString } from 'lodash'; import FormItemTitle from '@/components/FormHelper/FormItemTitle'; -import SelectPartner from '@/components/SelectPartner'; import SelectTMEPerson from '@/components/SelectTMEPerson'; import ViewModelConfigTransfer from './ViewModelConfigTransfer'; -import DefaultSettingForm from './DefaultSettingForm'; -import SqlEditor from '@/components/SqlEditor'; -import ProCard from '@ant-design/pro-card'; -import { ChatConfigType } from '../../enum'; const FormItem = Form.Item; diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassDataSourceTypeModal.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassDataSourceTypeModal.tsx index dbc247f55..a02a343ae 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassDataSourceTypeModal.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassDataSourceTypeModal.tsx @@ -41,6 +41,7 @@ const ClassDataSourceTypeModal: React.FC = ({ const [dataSourceEditOpen, setDataSourceEditOpen] = useState(false); const [currentDatabaseId, setCurrentDatabaseId] = useState(); const [scriptColumns, setScriptColumns] = useState([]); + const [sqlParams, setSqlParams] = useState([]); useEffect(() => { if (!dataSourceItem?.id || !open) { @@ -88,23 +89,6 @@ const ClassDataSourceTypeModal: React.FC = ({ } }, [dataSourceItem]); - // const fetchTaskResult = (params) => { - // setScriptColumns(params.columns); - // }; - - // const queryTableColumnListByScript = async (dataSource: IDataSource.IDataSourceItem) => { - // if (!dataSource?.modelDetail?.sqlQuery) { - // return; - // } - // const { code, data } = await excuteSql({ - // sql: dataSource.modelDetail?.sqlQuery, - // id: dataSource.databaseId, - // }); - // if (code === 200) { - // fetchTaskResult(data); - // } - // }; - return ( <> = ({ basicInfoFormMode="normal" modelItem={dataSourceItem} scriptColumns={scriptColumns} + sqlParams={sqlParams} onCancel={() => { setCreateModalVisible(false); handleCancel(); @@ -215,9 +200,11 @@ const ClassDataSourceTypeModal: React.FC = ({ { - const { columns, sql, databaseId } = dataSourceInfo; + console.log('onSubmitSuccess', dataSourceInfo); + const { columns, sql, databaseId, sqlParams } = dataSourceInfo; setSql(sql); setScriptColumns(columns); + setSqlParams(sqlParams); setCurrentDatabaseId(databaseId); setDataSourceEditOpen(false); }} diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/data.d.ts b/webapp/packages/supersonic-fe/src/pages/SemanticModel/data.d.ts index 9ee483690..5aa893810 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/data.d.ts +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/data.d.ts @@ -13,7 +13,6 @@ export type SensitiveLevel = 0 | 1 | 2 | null; export type ToolBarSearchCallBack = (text: string) => void; - export declare namespace IDataSource { interface IExecuteSqlColumn { name?: string; @@ -59,15 +58,15 @@ export declare namespace IDataSource { fieldName: string; } - type ISqlParamsValueType = 'string' | 'sql' | 'date' | 'boolean' | 'number'; - interface ISqlParamsItem { + type ISqlParamsValueType = 'STRING' | 'EXPR' | 'NUMBER'; + interface ISqlParamsItem { index?: number; defaultValues: (boolean | string | number)[]; name: string; - type: string; + // type: string; valueType: ISqlParamsValueType; udf?: boolean; - }; + } interface IDataSourceDetail { queryType: string; @@ -77,7 +76,7 @@ export declare namespace IDataSource { fields: IDataSourceDetailFieldsItem[]; dimensions: IDimensionsItem[]; measures: IMeasuresItem[]; - sqlVariables: + sqlVariables: ISqlParamsItem[]; } interface IDataSourceItem { @@ -344,7 +343,6 @@ export declare namespace ISemantic { } type IDatabaseItemList = IDatabaseItem[]; - interface IDictKnowledgeConfigItemConfig { metricId?: number; blackList: string[]; @@ -394,7 +392,6 @@ export declare namespace IChatConfig { }; } - interface IKnowledgeInfosItem { itemId: number; bizName: string; diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/enum.ts b/webapp/packages/supersonic-fe/src/pages/SemanticModel/enum.ts index 5ea69323b..84392824a 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/enum.ts +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/enum.ts @@ -20,6 +20,7 @@ export enum MetricTypeWording { } export enum DictTaskState { + initial = '--', error = '错误', pending = '等待', running = '正在执行',