From 49f0a4dc1dc60062f81caec20fa3f1ff8e56e7d1 Mon Sep 17 00:00:00 2001 From: tristanliu <37809633+sevenliu1896@users.noreply.github.com> Date: Tue, 2 Jan 2024 10:14:58 +0800 Subject: [PATCH] [improvement][semantic-fe] Updating the logic for the fieldName. (#587) * [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. --- .../components/DataSourceCreateForm.tsx | 20 ++++++++++--------- .../components/DataSourceFieldForm.tsx | 2 +- 2 files changed, 12 insertions(+), 10 deletions(-) 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 67f7c8cb4..3669195ac 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 @@ -88,6 +88,7 @@ const ModelCreateForm: React.FC = ({ const { type, bizName, + fieldName, timeGranularity, agg, isCreateDimension: createDimension, @@ -102,7 +103,7 @@ const ModelCreateForm: React.FC = ({ switch (type) { case EnumDataSourceType.CATEGORICAL: fieldsClassify.dimensions.push({ - bizName, + bizName: fieldName, type, isCreateDimension, name, @@ -111,7 +112,7 @@ const ModelCreateForm: React.FC = ({ break; case EnumDataSourceType.TIME: fieldsClassify.dimensions.push({ - bizName, + bizName: fieldName, type, isCreateDimension, name, @@ -125,7 +126,7 @@ const ModelCreateForm: React.FC = ({ case EnumDataSourceType.FOREIGN: case EnumDataSourceType.PRIMARY: fieldsClassify.identifiers.push({ - bizName, + bizName: fieldName, name, type, entityNames, @@ -133,7 +134,7 @@ const ModelCreateForm: React.FC = ({ break; case EnumDataSourceType.MEASURES: fieldsClassify.measures.push({ - bizName, + bizName: fieldName, type, agg, name, @@ -206,14 +207,15 @@ const ModelCreateForm: React.FC = ({ const { type, nameEn } = item; const oldItem = fieldsClassifyList.find((oItem) => { - if (oItem.type === EnumDataSourceType.MEASURES) { - return oItem.expr === item.nameEn; - } - return oItem.bizName === item.nameEn; + // if (oItem.type === EnumDataSourceType.MEASURES) { + // return oItem.expr === item.nameEn; + // } + return oItem.fieldName === item.nameEn; }) || {}; return { ...oldItem, bizName: nameEn, + fieldName: nameEn, sqlType: type, }; }); @@ -394,7 +396,7 @@ const ModelCreateForm: React.FC = ({ onDataSourceBtnClick?.(); }} > - 数据源编辑 + SQL编辑 )} diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/DataSourceFieldForm.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/DataSourceFieldForm.tsx index 7b7b551e1..a90e16e53 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/DataSourceFieldForm.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/DataSourceFieldForm.tsx @@ -58,7 +58,7 @@ const FieldForm: React.FC = ({ fields, sql, onFieldChange, onSqlChange }) const columns = [ { title: '字段名称', - dataIndex: 'bizName', + dataIndex: 'fieldName', width: 100, }, // {