diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/ModelCreateForm.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/ModelCreateForm.tsx index 01bd94572..a0f33848c 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/ModelCreateForm.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/ModelCreateForm.tsx @@ -3,7 +3,7 @@ import { Form, Button, Modal, Steps, message } from 'antd'; import ModelBasicForm from './ModelBasicForm'; import ModelFieldForm from './ModelFieldForm'; import { formLayout } from '@/components/FormHelper/utils'; -import { EnumDataSourceType } from '../constants'; +import { EnumDataSourceType, EnumModelDataType } from '../constants'; import styles from '../style.less'; import { updateModel, @@ -203,6 +203,19 @@ const ModelCreateForm: React.FC = ({ }, }); break; + case EnumDataSourceType.PARTITION_TIME: + fieldsClassify.dimensions.push({ + bizName: fieldName, + type, + isCreateDimension, + name, + dateFormat, + typeParams: { + isPrimary: true, + timeGranularity: timeGranularity || '', + }, + }); + break; case EnumDataSourceType.FOREIGN: case EnumDataSourceType.PRIMARY: fieldsClassify.identifiers.push({ @@ -303,11 +316,21 @@ const ModelCreateForm: React.FC = ({ setFields(columnFields || []); }; + const formatterIdentifiers = (identifiersList: any[] = []) => { + return identifiersList.map((identifiers: any) => { + return { + ...identifiers, + classType: EnumModelDataType.IDENTIFIERS, + }; + }); + }; + const formatterMeasures = (measuresList: any[] = []) => { return measuresList.map((measures: any) => { return { ...measures, type: EnumDataSourceType.MEASURES, + classType: EnumModelDataType.MEASURES, }; }); }; @@ -317,6 +340,7 @@ const ModelCreateForm: React.FC = ({ return { ...dimension, timeGranularity: typeParams?.timeGranularity || '', + classType: EnumModelDataType.DIMENSION, }; }); }; @@ -358,7 +382,7 @@ const ModelCreateForm: React.FC = ({ form.setFieldsValue(initValue); const formatFields = [ ...formatterDimensions(dimensions || []), - ...(identifiers || []), + ...formatterIdentifiers(identifiers || []), ...formatterMeasures(measures || []), ]; initFields(formatFields, columns); @@ -517,7 +541,7 @@ const ModelCreateForm: React.FC = ({ return ( { - const isCreateName = [EnumDataSourceType.CATEGORICAL, EnumDataSourceType.TIME].includes( - type as EnumDataSourceType, - ) + const isCreateName = [ + EnumDataSourceType.CATEGORICAL, + EnumDataSourceType.TIME, + EnumDataSourceType.PARTITION_TIME, + ].includes(type as EnumDataSourceType) ? 'isCreateDimension' : 'isCreateMetric'; return isCreateName; @@ -72,68 +78,134 @@ const ModelFieldForm: React.FC = ({ { title: '英文名称', dataIndex: 'fieldName', - width: 100, + width: 250, }, { title: '字段类型', dataIndex: 'dataType', - width: 80, + width: 150, }, { title: '语义类型', dataIndex: 'type', - width: 100, + width: 250, render: (_: any, record: FieldItem) => { const type = fields.find((field) => field.bizName === record.bizName)?.type; + const classType = fields.find((field) => field.bizName === record.bizName)?.classType; + const selectTypeValue = [EnumModelDataType.DIMENSION].includes(classType) + ? classType + : type; return ( - { + let defaultParams = {}; + if (value === EnumDataSourceType.MEASURES) { + defaultParams = { + agg: AGG_OPTIONS[0].value, + classType: EnumDataSourceType.MEASURES, + type: EnumDataSourceType.MEASURES, + }; + } + // else if (value === EnumDataSourceType.TIME) { + // defaultParams = { + // dateFormat: DATE_FORMATTER[0], + // timeGranularity: 'day', + // }; + // } + else if (value === EnumModelDataType.DIMENSION) { + defaultParams = { + type: DIM_OPTIONS[0].value, + classType: EnumModelDataType.DIMENSION, + }; + } else if (value === EnumDataSourceType.PRIMARY) { + defaultParams = { + type: EnumDataSourceType.PRIMARY, + classType: EnumModelDataType.IDENTIFIERS, + }; + } else { + defaultParams = { + agg: undefined, + dateFormat: undefined, + timeGranularity: undefined, + }; + } + const isCreateName = getCreateFieldName(value); + const editState = !isUndefined(record[isCreateName]) + ? !!record[isCreateName] + : true; + const { name, comment } = record; + const params = { + ...record, + type: value, + classType: value, + name: name || comment, + [isCreateName]: editState, + ...defaultParams, }; - } else if (value === EnumDataSourceType.TIME) { - defaultParams = { - dateFormat: DATE_FORMATTER[0], - timeGranularity: 'day', - }; - } else { - defaultParams = { - agg: undefined, - dateFormat: undefined, - timeGranularity: undefined, - }; - } - const isCreateName = getCreateFieldName(value); - const editState = !isUndefined(record[isCreateName]) ? !!record[isCreateName] : true; - const { name, comment } = record; - onFieldChange(record.bizName, { - ...record, - type: value, - name: name || comment, - [isCreateName]: editState, - ...defaultParams, - }); - }} - style={{ width: '100%' }} - > - {TYPE_OPTIONS.map((item) => ( - - ))} - + onFieldChange(record.bizName, params); + }} + style={{ width: '100%' }} + > + {TYPE_OPTIONS.map((item) => ( + + ))} + + {classType === EnumModelDataType.DIMENSION && ( + + )} + ); }, }, { title: '扩展配置', dataIndex: 'extender', - width: 200, + // width: 200, render: (_: any, record: FieldItem) => { const { type } = record; if (type === EnumDataSourceType.PRIMARY) { @@ -181,63 +253,73 @@ const ModelFieldForm: React.FC = ({ const isTag = fields.find((field) => field.bizName === record.bizName)?.isTag; return ( - 设为标签 - { - handleFieldChange(record, 'isTag', value); - }} - /> - - - + + 设为标签: + { + handleFieldChange(record, 'isTag', value); + }} + /> + + + + ); } - if (type === EnumDataSourceType.TIME) { + if ([EnumDataSourceType.TIME, EnumDataSourceType.PARTITION_TIME].includes(type)) { const dateFormat = fields.find((field) => field.bizName === record.bizName)?.dateFormat; const timeGranularity = fields.find( (field) => field.bizName === record.bizName, )?.timeGranularity; + const dateFormatterOptions = + type === EnumDataSourceType.PARTITION_TIME ? PARTITION_TIME_FORMATTER : DATE_FORMATTER; + return ( - - - - - - 时间粒度: - + + + 时间格式: + + + + + + + 时间粒度: + + ); } @@ -262,55 +344,51 @@ const ModelFieldForm: React.FC = ({ EnumDataSourceType.FOREIGN, EnumDataSourceType.CATEGORICAL, EnumDataSourceType.TIME, + EnumDataSourceType.PARTITION_TIME, EnumDataSourceType.MEASURES, ].includes(type as EnumDataSourceType) ) { const isCreateName = getCreateFieldName(type); const editState = !isUndefined(record[isCreateName]) ? !!record[isCreateName] : true; return ( - - - { - const value = e.target.checked ? 1 : 0; - if (!value) { - onFieldChange(record.bizName, { - ...record, - name: '', - checked: value, - [isCreateName]: value, - }); - } else { - onFieldChange(record.bizName, { - ...record, - checked: value, - [isCreateName]: value, - }); - } - }} - /> - - - { - const value = e.target.value; + + { + const value = e.target.checked ? 1 : 0; + if (!value) { onFieldChange(record.bizName, { ...record, - name: value, - [isCreateName]: 1, + name: '', + checked: value, + [isCreateName]: value, }); - }} - placeholder="请填写名称" - /> - - + } else { + onFieldChange(record.bizName, { + ...record, + checked: value, + [isCreateName]: value, + }); + } + }} + /> + { + const value = e.target.value; + onFieldChange(record.bizName, { + ...record, + name: value, + [isCreateName]: 1, + }); + }} + placeholder="请填写名称" + /> + ); } return <>; diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/constants.ts b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/constants.ts index a6a940c04..5727b1c67 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/constants.ts +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/constants.ts @@ -7,20 +7,52 @@ export const EDITOR_HEIGHT_MAP = new Map([ export enum EnumDataSourceType { CATEGORICAL = 'categorical', TIME = 'time', + PARTITION_TIME = 'partition_time', MEASURES = 'measures', PRIMARY = 'primary', FOREIGN = 'foreign', } -export const TYPE_OPTIONS = [ +export enum EnumModelDataType { + DIMENSION = 'dimension', + IDENTIFIERS = 'identifiers', + MEASURES = 'measures', +} + +export const modelDataClass = { + [EnumModelDataType.DIMENSION]: [ + EnumDataSourceType.CATEGORICAL, + EnumDataSourceType.TIME, + EnumDataSourceType.PARTITION_TIME, + ], + [EnumModelDataType.IDENTIFIERS]: [EnumDataSourceType.PRIMARY, EnumDataSourceType.FOREIGN], + [EnumModelDataType.MEASURES]: [EnumDataSourceType.MEASURES], +}; + +export const DIM_OPTIONS = [ { - label: '维度', + label: '枚举', value: EnumDataSourceType.CATEGORICAL, }, { - label: '日期', + label: '普通时间', value: EnumDataSourceType.TIME, }, + { + label: '分区时间', + value: EnumDataSourceType.PARTITION_TIME, + }, +]; + +export const TYPE_OPTIONS = [ + { + label: '维度', + value: EnumModelDataType.DIMENSION, + }, + // { + // label: '日期', + // value: EnumDataSourceType.TIME, + // }, { label: '度量', value: EnumDataSourceType.MEASURES, @@ -64,4 +96,20 @@ export const AGG_OPTIONS = [ export const DATE_OPTIONS = ['day', 'week', 'month']; -export const DATE_FORMATTER = ['yyyy-MM-dd', 'yyyyMMdd', 'yyyy-MM', 'yyyyMM']; +export const DATE_FORMATTER = [ + 'yyyy-MM-dd', + 'yyyy-MM-dd HH:mm:ss', + 'yyyy-MM-dd HH:mm', + 'yyyy-MM-dd HH', + 'yyyyMMdd', + 'yyyy-MM', + 'yyyyMM', +]; + +export const PARTITION_TIME_FORMATTER = [ + 'yyyy-MM-dd', + 'yyyy-MM-dd HH', + 'yyyyMMdd', + 'yyyy-MM', + 'yyyyMM', +]; diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/components/MetricTrendSection.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/components/MetricTrendSection.tsx index 1d20bc34b..62874e2f2 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/components/MetricTrendSection.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/components/MetricTrendSection.tsx @@ -152,142 +152,148 @@ const MetricTrendSection: React.FC = ({ return (
-
- - -
{ - if (value.key) { - return; - } - }} - > - - - { - const [startDate, endDate] = value; - const { dateSettingType, dynamicParams, staticParams } = config; - let dateField = DateFieldMap[DateRangeType.DAY]; - let period = DateRangeType.DAY; - if (DateSettingType.DYNAMIC === dateSettingType) { - dateField = DateFieldMap[dynamicParams.dateRangeType]; - period = dynamicParams.dateRangeType; - } - if (DateSettingType.STATIC === dateSettingType) { - dateField = DateFieldMap[staticParams.dateRangeType]; - period = staticParams.dateRangeType; - } - setPeriodDate({ startDate, endDate, dateField, period }); - }} - disabledAdvanceSetting={true} - /> - - - - - + ((option?.label ?? '') as string) + .toLowerCase() + .includes(input.toLowerCase()) + } + mode="multiple" + placeholder="请选择下钻维度" + onChange={(value) => { + const params = { ...queryParams, dimensionGroup: value || [] }; + setQueryParams(params); + }} + /> + + + + + { + const dimensionFilters = filterList.map((item) => { + const { dimensionBizName, dimensionValue, operator } = item; + return { + bizName: dimensionBizName, + value: dimensionValue, + operator, + }; + }); + const params = { + ...queryParams, + dimensionFilters, + }; + setQueryParams(params); + }} + afterSolt={ + + } + /> + + +
+ + + + {/* */} -
- -
- - 数据趋势 - {authMessage &&
{authMessage}
} - - } - > - - -
+
+
+ + 数据趋势 + {authMessage &&
{authMessage}
} + + } + > + + +
+ + )}
= ( { domainId, databaseId, onSubmit, hideSubmitBtn = false }, ref, ) => { + const encryptKey = CryptoJS.enc.Utf8.parse('supersonic@2024'); const [form] = Form.useForm(); const [selectedDbType, setSelectedDbType] = useState(''); const [databaseOptions, setDatabaseOptions] = useState<{ value: string; label: string }[]>([]); @@ -57,7 +59,7 @@ const DatabaseCreateForm: ForwardRefRenderFunction = ( const queryDatabaseDetail = async (id: number) => { const { code, msg, data } = await getDatabaseDetail(id); if (code === 200) { - setDataBaseDetail(data); + setDataBaseDetail({ ...data, password: data.password ? decryptPassword(data.password) : '' }); return; } message.error(msg); @@ -91,10 +93,12 @@ const DatabaseCreateForm: ForwardRefRenderFunction = ( const saveDatabaseConfig = async () => { const values = await form.validateFields(); + const { password } = values; const { code, msg } = await saveDatabase({ ...(dataBaseDetail || {}), ...values, domainId, + password: encryptPassword(password), }); if (code === 200) { @@ -106,10 +110,12 @@ const DatabaseCreateForm: ForwardRefRenderFunction = ( }; const testDatabaseConnection = async () => { const values = await form.validateFields(); + const { password } = values; setTestLoading(true); const { code, data } = await testDatabaseConnect({ ...values, domainId, + password: encryptPassword(password), }); setTestLoading(false); if (code === 200 && data) { diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/service.ts b/webapp/packages/supersonic-fe/src/pages/SemanticModel/service.ts index 0352a0b95..e633654c8 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/service.ts +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/service.ts @@ -552,18 +552,18 @@ export async function queryStruct({ isTransform, metricIds, dimensionIds, - orders: [{ column: dateField, direction: 'desc' }], + // orders: [{ column: dateField, direction: 'desc' }], params: [], - dateInfo: { - dateMode: 'BETWEEN', - startDate, - endDate, - dateList: [], - unit: 7, - groupByDate: true, - period, - text: 'null', - }, + // dateInfo: { + // dateMode: 'BETWEEN', + // startDate, + // endDate, + // dateList: [], + // unit: 7, + // groupByDate: true, + // period, + // text: 'null', + // }, limit: 2000, nativeQuery: false, }, diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/utils.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/utils.tsx index 34e2faf54..c70d10b3c 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/utils.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/utils.tsx @@ -136,7 +136,7 @@ export const findLeafNodesFromDomainList = ( return leafNodes; }; -export const genneratorFormItemList = (itemList: ConfigParametersItem[], form) => { +export const genneratorFormItemList = (itemList: ConfigParametersItem[]) => { const list = itemList.reduce((itemList: ReactNode[], item) => { const { dataType, name, comment, placeholder, description, require, visible, sliderConfig } = item;