From 2d8c5c379c2b16740d6c2b603741fa32419db133 Mon Sep 17 00:00:00 2001 From: tristanliu <37809633+sevenliu1896@users.noreply.github.com> Date: Mon, 20 May 2024 12:03:30 +0800 Subject: [PATCH] [improvement][headless-fe] Term management interface transformation & Unified model management and canvas functionality entry (#1009) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [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. * [improvement][headless-fe] Default value setting for hiding dimensions. * [improvement][headless-fe] Updated the file imports in the project. * [improvement][headless-fe] Adjusted the logic for displaying the tab in the theme domain. * [improvement][headless-fe] Added term management functionality. * [improvement][headless-fe] When creating a model, the current metric operator now allows for clearance. * [improvement][headless-fe] Term management interface transformation --- .../Metric/components/MetricAddClass.tsx | 8 ++- .../Metric/components/MetricBasicInfo.tsx | 6 ++ .../Metric/components/MetricTrend.tsx | 4 +- .../Metric/components/MetricTrendSection.tsx | 20 +++++- .../Database/DatabaseSettingModal.tsx | 1 - ...ProjectInfoForm.tsx => DomainInfoForm.tsx} | 39 ++++------- .../SemanticModel/components/DomainList.tsx | 47 ++++++++----- .../components/DomainManagerTab.tsx | 70 +++++++++++++------ .../components/Term/TermCreateForm.tsx | 14 ++-- .../components/Term/TermTable.tsx | 33 ++++----- .../src/pages/SemanticModel/data.d.ts | 1 + .../src/pages/SemanticModel/service.ts | 6 ++ 12 files changed, 156 insertions(+), 93 deletions(-) rename webapp/packages/supersonic-fe/src/pages/SemanticModel/components/{ProjectInfoForm.tsx => DomainInfoForm.tsx} (66%) diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/components/MetricAddClass.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/components/MetricAddClass.tsx index 83c505c11..30fd4bb9c 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/components/MetricAddClass.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/components/MetricAddClass.tsx @@ -67,7 +67,13 @@ const MetricAddClass: React.FC = ({ ids = [], createModalVisible, onCance > 删 除 - diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/components/MetricBasicInfo.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/components/MetricBasicInfo.tsx index cb7fe05b2..c163446bc 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/components/MetricBasicInfo.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/components/MetricBasicInfo.tsx @@ -64,6 +64,12 @@ const MetricBasicInformation: React.FC = ({ metircData }) => { dataIndex: 'agg', title: '聚合函数', width: 80, + render: (_: string) => { + if (!_) { + return '--'; + } + return _; + }, }, ]; diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/components/MetricTrend.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/components/MetricTrend.tsx index 92e17be6a..d2f983027 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/components/MetricTrend.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/components/MetricTrend.tsx @@ -189,9 +189,9 @@ const TrendChart: React.FC = ({ (item: any) => `
${ item.marker - } ${ + } ${ item.seriesName - }${ + }${ item.value === '' ? '-' : isPer 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 992af900c..1d20bc34b 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 @@ -13,7 +13,7 @@ import { ColumnConfig } from '../data'; import dayjs from 'dayjs'; import { ISemantic } from '../../data'; import { DateFieldMap } from '@/pages/SemanticModel/constant'; -import { ProCard } from '@ant-design/pro-components'; +import { ProCard } from '@ant-design/pro-components'; import styles from '../style.less'; @@ -100,7 +100,7 @@ const MetricTrendSection: React.FC = ({ setMetricTrendLoading(false); if (code === 200) { const { resultList, columns, queryAuthorization } = data; - setMetricTrendData(resultList); + setTableColumnConfig(columns); const message = queryAuthorization?.message; if (message) { @@ -112,6 +112,22 @@ const MetricTrendSection: React.FC = ({ if (targetConfig) { setMetricColumnConfig(targetConfig); } + + const dateConfig = columns.find((item: ISemantic.IMetricTrendColumn) => { + return item.type === 'DATE'; + }); + + if (dateConfig) { + const sortDateField = dateConfig.nameEn; + setMetricTrendData( + [...resultList].sort((a, b) => { + return a[sortDateField].localeCompare(b[sortDateField]); + }), + ); + } else { + setMetricTrendData(resultList); + } + setDownloadBtnDisabledState(false); if (dimensionGroup[dimensionGroup.length - 1]) { setGroupByDimensionFieldName(dimensionGroup[dimensionGroup.length - 1]); diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Database/DatabaseSettingModal.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Database/DatabaseSettingModal.tsx index 301cafa7c..8013de6b7 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Database/DatabaseSettingModal.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Database/DatabaseSettingModal.tsx @@ -67,7 +67,6 @@ const DatabaseSettingModal: React.FC = ({ { onSubmit?.(); diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ProjectInfoForm.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/DomainInfoForm.tsx similarity index 66% rename from webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ProjectInfoForm.tsx rename to webapp/packages/supersonic-fe/src/pages/SemanticModel/components/DomainInfoForm.tsx index d20f06a98..c2b78d3dc 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ProjectInfoForm.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/DomainInfoForm.tsx @@ -4,17 +4,16 @@ import styles from './style.less'; import { useMounted } from '@/hooks/useMounted'; import { message } from 'antd'; import { formLayout } from '@/components/FormHelper/utils'; -import { EnumTransModelType } from '@/enum'; const FormItem = Form.Item; -export type ProjectInfoFormProps = { +export type Props = { basicInfo: any; onCancel: () => void; onSubmit: (values: any) => Promise; }; -const ProjectInfoForm: React.FC = (props) => { +const DomaintInfoForm: React.FC = (props) => { const { basicInfo, onSubmit: handleUpdate, onCancel } = props; const { type, modelType } = basicInfo; @@ -48,23 +47,13 @@ const ProjectInfoForm: React.FC = (props) => { ); - const titleRender = () => { - let str = EnumTransModelType[modelType]; - if (type === 'top') { - str += '顶级'; - } else if (modelType === 'add') { - str += '子'; - } - str += '主题域'; - return str; - }; + const infoName = type === 'top' ? '主题域' : '模型集'; return ( = (props) => { className={styles.form} > {type !== 'top' && modelType === 'add' && ( - - + + )} - + -