diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/components/MetricTrendDimensionFilter.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/components/MetricTrendDimensionFilter.tsx index 93b598a17..f3a9d5f0a 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/components/MetricTrendDimensionFilter.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/components/MetricTrendDimensionFilter.tsx @@ -59,10 +59,11 @@ const MetricTrendDimensionFilter: React.FC = ({ return; } const { dimensionBizName } = queryParams.current; + const targetOptions = dimensionOptions.find((item) => item.value === dimensionBizName) || {}; const { code, data } = await queryDimValue({ ...queryParams.current, value: searchValue, - modelId, + modelId: targetOptions.modelId, // dateInfo: {}, limit: 50, ...(periodDate?.startDate 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 096cf42ea..9c3a21b16 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 @@ -47,7 +47,7 @@ const MetricTrendSection: React.FC = ({ metircData }) => { const [authMessage, setAuthMessage] = useState(''); const [downloadLoding, setDownloadLoding] = useState(false); const [relationDimensionOptions, setRelationDimensionOptions] = useState< - { value: string; label: string }[] + { value: string; label: string; modelId: number }[] >([]); const [dimensionList, setDimensionList] = useState([]); const [queryParams, setQueryParams] = useState({}); @@ -147,7 +147,7 @@ const MetricTrendSection: React.FC = ({ metircData }) => { setDimensionList(data.list); setRelationDimensionOptions( data.list.map((item: ISemantic.IMetricItem) => { - return { label: item.name, value: item.bizName }; + return { label: item.name, value: item.bizName, modelId: item.modelId }; }), ); return data.list; diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/BindMeasuresTable.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/BindMeasuresTable.tsx index e24aa9aec..418b2117c 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/BindMeasuresTable.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/BindMeasuresTable.tsx @@ -18,7 +18,7 @@ export type CreateFormProps = { }; const BindMeasuresTable: React.FC = ({ - measuresList, + measuresList = [], selectedMeasuresList = [], onSubmit, onCancel, @@ -105,7 +105,7 @@ const BindMeasuresTable: React.FC = ({ columns={columns} params={{ ...searchParams }} pagination={false} - dataSource={measuresList} + dataSource={measuresList || []} size="small" search={false} options={false} diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/MetricInfoCreateForm.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/MetricInfoCreateForm.tsx index e2e80af41..31c5c9621 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/MetricInfoCreateForm.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/MetricInfoCreateForm.tsx @@ -92,7 +92,7 @@ const MetricInfoCreateForm: React.FC = ({ const { code, data } = await getModelDetail({ modelId }); if (code === 200) { if (Array.isArray(data?.modelDetail?.measures)) { - setClassMeasureList(data); + setClassMeasureList(data.modelDetail.measures); if (datasourceId) { const hasMeasures = data.some( (item: ISemantic.IMeasure) => item.datasourceId === datasourceId,