mirror of
https://github.com/tencentmusic/supersonic.git
synced 2025-12-10 11:07:06 +00:00
[improvement][headless-fe] Fixed the issue where the conditions for metric measurement creation were not being saved correctly. (#940)
* [improvement][semantic-fe] Add model alias setting & Add view permission restrictions to the model permission management tab. [improvement][semantic-fe] Add permission control to the action buttons for the main domain; apply high sensitivity filtering to the authorization of metrics/dimensions. [improvement][semantic-fe] Optimize the editing mode in the dimension/metric/datasource components to use the modelId stored in the database for data, instead of relying on the data from the state manager. * [improvement][semantic-fe] Add time granularity setting in the data source configuration. * [improvement][semantic-fe] Dictionary import for dimension values supported in Q&A visibility * [improvement][semantic-fe] Modification of data source creation prompt wording" * [improvement][semantic-fe] metric market experience optimization * [improvement][semantic-fe] enhance the analysis of metric trends * [improvement][semantic-fe] optimize the presentation of metric trend permissions * [improvement][semantic-fe] add metric trend download functionality * [improvement][semantic-fe] fix the dimension initialization issue in metric correlation * [improvement][semantic-fe] Fix the issue of database changes not taking effect when creating based on an SQL data source. * [improvement][semantic-fe] Optimizing pagination logic and some CSS styles * [improvement][semantic-fe] Fixing the API for the indicator list by changing "current" to "pageNum" * [improvement][semantic-fe] Fixing the default value setting for the indicator list * [improvement][semantic-fe] Adding batch operations for indicators/dimensions/models * [improvement][semantic-fe] Replacing the single status update API for indicators/dimensions with a batch update API * [improvement][semantic-fe] Redesigning the indicator homepage to incorporate trend charts and table functionality for indicators * [improvement][semantic-fe] Optimizing the logic for setting dimension values and editing data sources, and adding system settings functionality * [improvement][semantic-fe] Upgrading antd version to 5.x, extracting the batch operation button component, optimizing the interaction for system settings, and expanding the configuration generation types for list-to-select component. * [improvement][semantic-fe] Adding the ability to filter dimensions based on whether they are tags or not. * [improvement][semantic-fe] Adding the ability to edit relationships between models in the canvas. * [improvement][semantic-fe] Updating the datePicker component to use dayjs instead. * [improvement][semantic-fe] Fixing the issue with passing the model ID for dimensions in the indicator market. * [improvement][semantic-fe] Fixing the abnormal state of the popup when creating a model. * [improvement][semantic-fe] Adding permission logic for bulk operations in the indicator market. * [improvement][semantic-fe] Adding the ability to download and transpose data. * [improvement][semantic-fe] Fixing the initialization issue with the date selection component in the indicator details page when switching time granularity. * [improvement][semantic-fe] Fixing the logic error in the dimension value setting. * [improvement][semantic-fe] Fixing the synchronization issue with the question and answer settings information. * [improvement][semantic-fe] Optimizing the canvas functionality for better performance and user experience. * [improvement][semantic-fe] Optimizing the update process for drawing model relationship edges in the canvas. * [improvement][semantic-fe] Changing the line type for canvas connections. * [improvement][semantic-fe] Replacing the initialization variable from "semantic" to "headless". * [improvement][semantic-fe] Fixing the missing migration issue for default drill-down dimension configuration in model editing. Additionally, optimizing the data retrieval method for initializing fields in the model. * [improvement][semantic-fe] Updating the logic for the fieldName. * [improvement][semantic-fe] Adjusting the position of the metrics tab. * [improvement][semantic-fe] Changing the 字段名称 to 英文名称. * [improvement][semantic-fe] Fix metric measurement deletion. * [improvement][semantic-fe] UI optimization for metric details page. * [improvement][semantic-fe] UI optimization for metric details page. * [improvement][semantic-fe] UI adjustment for metric details page. * [improvement][semantic-fe] The granularity field in the time type of model editing now supports setting it as empty. * [improvement][semantic-fe] Added field type and metric type to the metric creation options. * [improvement][semantic-fe] The organization structure selection feature has been added to the permission management. * [improvement][semantic-fe] Improved user experience for the metric list. * [improvement][semantic-fe] fix update the metric list. * [improvement][headless-fe] Added view management functionality. * [improvement][headless-fe] The view management functionality has been added. This feature allows users to create, edit, and manage different views within the system. * [improvement][headless-fe] Added model editing side effect detection. * [improvement][headless-fe] Fixed the logic error in view editing. * [improvement][headless-fe] Fixed the issue with initializing dimension associations in metric settings. * [improvement][headless-fe] Added the ability to hide the Q&A settings entry point. * [improvement][headless-fe] Fixed the issue with selecting search results in metric field creation. * [improvement][headless-fe] Added search functionality to the field list in model editing. * [improvement][headless-fe] fix the field list in model editing * [improvement][headless-fe] Restructured the data for the dimension value settings interface. * [improvement][headless-fe] Added dynamic variable functionality to model creation based on SQL scripts. * [improvement][headless-fe] Added support for passing dynamic variables as parameters in the executeSql function. * [improvement][headless-fe] Resolved the issue where users were unable to select all options for dimensions, metrics, and fields in the metric generation process. * [improvement][headless-fe] Replaced the term "view" with "dataset" * [improvement][headless-fe] Added the ability to export metrics and dimensions to a specific target. * [improvement][headless-fe] Enhanced dataset creation to support the tag mode. * [improvement][headless-fe] Added tag value setting. * [improvement][headless-fe] Optimized the tag setting system. * [improvement][headless-fe] Optimized the tag setting system. * [improvement][headless-fe] Updated the data initialization for model editing to use API requests instead. * [improvement][headless-fe] Added search functionality to model management. * [improvement][headless-fe] Removed field null validation during model editing. * [improvement][headless-fe] Updated the batch operation button component. * [improvement][headless-fe] Optimized the logic for initializing indicators in dimension value settings. * [improvement][headless-fe] Adjusted the length of the input field for model editing names. * [improvement][headless-fe] Lock the version of the @ant-design/pro-table component and replace it with @ant-design/pro-components. * [improvement][headless-fe] Optimized the style of the metrics market and tags market. * [improvement][headless-fe] The quick creation of model fields now defaults to using the "comment" field for filling. * [improvement][headless-fe] The quick creation of model fields now defaults to using the "comment" field for filling * [improvement][headless-fe] The quick creation of model fields now defaults to using the "comment" field for filling. * [improvement][headless-fe] Fixed the issue where the conditions for metric measurement creation were not being saved correctly.
This commit is contained in:
tristanliu
@@ -514,6 +514,7 @@ const MetricInfoCreateForm: React.FC<CreateFormProps> = ({
|
||||
typeParams={exprTypeParamsState[METRIC_DEFINE_TYPE.MEASURE]}
|
||||
measuresList={classMeasureList}
|
||||
onFieldChange={(measures: ISemantic.IMeasure[]) => {
|
||||
// setClassMeasureList(measures);
|
||||
setExprTypeParamsState((prevState) => {
|
||||
return {
|
||||
...prevState,
|
||||
|
||||
@@ -43,19 +43,41 @@ const MetricMeasuresFormTable: React.FC<Props> = ({
|
||||
});
|
||||
|
||||
const [selectedKeysMap, setSelectedKeysMap] = useState<Record<string, boolean>>(() => {
|
||||
if (!Array.isArray(measuresParams?.measures)) {
|
||||
return {};
|
||||
}
|
||||
return measuresParams.measures.reduce((keyMap: any, item: ISemantic.IMeasure) => {
|
||||
keyMap[item.bizName] = true;
|
||||
return keyMap;
|
||||
}, {});
|
||||
});
|
||||
|
||||
useEffect(() => {
|
||||
const getTableData = () => {
|
||||
const datasource =
|
||||
datasourceId && Array.isArray(measuresList)
|
||||
? measuresList.filter((item) => item.datasourceId === datasourceId)
|
||||
: measuresList;
|
||||
setTableData(datasource);
|
||||
}, [measuresList]);
|
||||
const { measures } = measuresParams;
|
||||
if (!Array.isArray(measures)) {
|
||||
return datasource;
|
||||
}
|
||||
const tableData = datasource.map((item) => {
|
||||
const { bizName } = item;
|
||||
const target = measures.find((measureItem) => measureItem.bizName === bizName);
|
||||
if (target) {
|
||||
return {
|
||||
...item,
|
||||
constraint: target.constraint,
|
||||
};
|
||||
}
|
||||
return item;
|
||||
});
|
||||
return tableData;
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
setTableData(getTableData());
|
||||
}, [measuresList, measuresParams]);
|
||||
|
||||
useEffect(() => {
|
||||
setMeasuresParams({ ...typeParams });
|
||||
@@ -76,24 +98,29 @@ const MetricMeasuresFormTable: React.FC<Props> = ({
|
||||
tooltip:
|
||||
'该限定条件用于在计算指标时限定口径，作用于度量，所用于过滤的维度必须在创建模型的时候被标记为日期或者维度，不需要加where关键字。比如：维度A="值1" and 维度B="值2"',
|
||||
render: (_: any, record: any) => {
|
||||
const { constraint, name } = record;
|
||||
const { measures } = measuresParams;
|
||||
const { constraint, bizName } = record;
|
||||
return (
|
||||
<TextArea
|
||||
placeholder="请输入限定条件"
|
||||
value={constraint}
|
||||
disabled={!selectedKeysMap[bizName]}
|
||||
onChange={(event) => {
|
||||
const { value } = event.target;
|
||||
const list = measures.map((item: any) => {
|
||||
if (item.name === name) {
|
||||
return {
|
||||
|
||||
const measures = tableData.reduce((list: any[], item) => {
|
||||
if (selectedKeysMap[item.bizName] === true) {
|
||||
if (item.bizName === bizName) {
|
||||
list.push({
|
||||
...item,
|
||||
constraint: value,
|
||||
};
|
||||
}
|
||||
return item;
|
||||
});
|
||||
onFieldChange?.(list);
|
||||
} else {
|
||||
list.push(item);
|
||||
}
|
||||
}
|
||||
return list;
|
||||
}, []);
|
||||
onFieldChange?.(measures);
|
||||
}}
|
||||
/>
|
||||
);
|
||||
@@ -107,28 +134,16 @@ const MetricMeasuresFormTable: React.FC<Props> = ({
|
||||
];
|
||||
|
||||
const handleUpdateKeys = (updateKeys: Record<string, boolean>) => {
|
||||
const datasource =
|
||||
datasourceId && Array.isArray(measuresList)
|
||||
? measuresList.filter((item) => item.datasourceId === datasourceId)
|
||||
: measuresList;
|
||||
const datasource = getTableData();
|
||||
setSelectedKeysMap(updateKeys);
|
||||
const selectedKeys: string[] = [];
|
||||
const measures = datasource.reduce(
|
||||
(list: any[], { bizName, name, expr, datasourceId, agg }) => {
|
||||
if (updateKeys[bizName] === true) {
|
||||
selectedKeys.push(bizName);
|
||||
list.push({
|
||||
bizName,
|
||||
name,
|
||||
expr,
|
||||
agg,
|
||||
datasourceId,
|
||||
});
|
||||
const measures = datasource.reduce((list: any[], item) => {
|
||||
if (updateKeys[item.bizName] === true) {
|
||||
selectedKeys.push(item.bizName);
|
||||
list.push(item);
|
||||
}
|
||||
return list;
|
||||
},
|
||||
[],
|
||||
);
|
||||
}, []);
|
||||
setSelectedKeys(selectedKeys);
|
||||
onFieldChange(measures);
|
||||
};
|
||||
@@ -169,16 +184,13 @@ const MetricMeasuresFormTable: React.FC<Props> = ({
|
||||
search: {
|
||||
placeholder: '请输入度量名称',
|
||||
onSearch: (value: string) => {
|
||||
const datasource =
|
||||
datasourceId && Array.isArray(measuresList)
|
||||
? measuresList.filter((item) => item.datasourceId === datasourceId)
|
||||
: measuresList;
|
||||
const tableData = getTableData();
|
||||
if (!value) {
|
||||
setTableData(datasource);
|
||||
setTableData(tableData);
|
||||
return;
|
||||
}
|
||||
setTableData(
|
||||
[...datasource].reduce((data: ISemantic.IMeasure[], item: ISemantic.IMeasure) => {
|
||||
[...tableData].reduce((data: ISemantic.IMeasure[], item: ISemantic.IMeasure) => {
|
||||
if (item.bizName.includes(value)) {
|
||||
data.push(item);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user