From 6da82b6b949ef44ff03f65378ca8303341eb1e65 Mon Sep 17 00:00:00 2001 From: tristanliu <37809633+sevenliu1896@users.noreply.github.com> Date: Fri, 19 Apr 2024 18:57:57 +0800 Subject: [PATCH] [improvement][headless-fe] Lock the version of the @ant-design/pro-table component and replace it with @ant-design/pro-components. (#925) 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. --- webapp/packages/supersonic-fe/package.json | 3 +-- .../supersonic-fe/src/pages/SemanticModel/Insights/Market.tsx | 4 ++-- .../pages/SemanticModel/Insights/components/ClassTagTable.tsx | 4 ++-- .../SemanticModel/Insights/components/TagObjectTable.tsx | 4 ++-- .../supersonic-fe/src/pages/SemanticModel/Metric/Market.tsx | 4 ++-- .../src/pages/SemanticModel/View/components/ViewTable.tsx | 4 ++-- .../pages/SemanticModel/components/ClassDimensionTable.tsx | 4 ++-- .../src/pages/SemanticModel/components/ClassMetricTable.tsx | 4 ++-- .../src/pages/SemanticModel/components/CommonEditTable.tsx | 4 ++-- .../pages/SemanticModel/components/Database/DatabaseTable.tsx | 4 ++-- .../pages/SemanticModel/components/MetricFieldFormTable.tsx | 2 +- .../SemanticModel/components/MetricMeasuresFormTable.tsx | 2 +- .../pages/SemanticModel/components/MetricMetricFormTable.tsx | 2 +- .../src/pages/SemanticModel/components/ModelTable.tsx | 4 ++-- .../SemanticModel/components/Permission/PermissionTable.tsx | 4 ++-- .../pages/SemanticModel/components/TagDimensionFormTable.tsx | 2 +- webapp/packages/supersonic-fe/src/utils/curd.ts | 2 +- 17 files changed, 28 insertions(+), 29 deletions(-) diff --git a/webapp/packages/supersonic-fe/package.json b/webapp/packages/supersonic-fe/package.json index 2eb34d4d8..30a486685 100644 --- a/webapp/packages/supersonic-fe/package.json +++ b/webapp/packages/supersonic-fe/package.json @@ -57,9 +57,8 @@ "dependencies": { "@ant-design/icons": "^5.2.6", "@ant-design/pro-card": "^2.5.26", - "@ant-design/pro-components": "^2.6.41", + "@ant-design/pro-components": "2.7.0", "@ant-design/pro-layout": "^7.17.15", - "@ant-design/pro-table": "^3.13.9", "@antv/dom-util": "^2.0.4", "@antv/g6": "^4.8.23", "@antv/g6-core": "^0.8.23", diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Insights/Market.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Insights/Market.tsx index f52b38bc6..053ccf57f 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Insights/Market.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Insights/Market.tsx @@ -1,5 +1,5 @@ -import type { ActionType, ProColumns } from '@ant-design/pro-table'; -import ProTable from '@ant-design/pro-table'; +import type { ActionType, ProColumns } from '@ant-design/pro-components'; +import { ProTable } from '@ant-design/pro-components'; import { message, Space, Popconfirm } from 'antd'; import React, { useRef, useState, useEffect } from 'react'; import type { Dispatch } from 'umi'; diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Insights/components/ClassTagTable.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Insights/components/ClassTagTable.tsx index c59afe0ec..3184483fb 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Insights/components/ClassTagTable.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Insights/components/ClassTagTable.tsx @@ -1,5 +1,5 @@ -import type { ActionType, ProColumns } from '@ant-design/pro-table'; -import ProTable from '@ant-design/pro-table'; +import type { ActionType, ProColumns } from '@ant-design/pro-components'; +import { ProTable } from '@ant-design/pro-components'; import { message, Button, Space, Popconfirm, Input, Select } from 'antd'; import React, { useRef, useState, useEffect } from 'react'; import type { Dispatch } from 'umi'; diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Insights/components/TagObjectTable.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Insights/components/TagObjectTable.tsx index 74b611ef7..5a80f6e05 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Insights/components/TagObjectTable.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Insights/components/TagObjectTable.tsx @@ -1,5 +1,5 @@ -import type { ActionType, ProColumns } from '@ant-design/pro-table'; -import ProTable from '@ant-design/pro-table'; +import type { ActionType, ProColumns } from '@ant-design/pro-components'; +import { ProTable } from '@ant-design/pro-components'; import { message, Button, Space, Popconfirm, Input, Select } from 'antd'; import React, { useRef, useState, useEffect } from 'react'; import type { Dispatch } from 'umi'; diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/Market.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/Market.tsx index 322cb920b..71d58f636 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/Market.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/Market.tsx @@ -1,5 +1,5 @@ -import type { ActionType, ProColumns } from '@ant-design/pro-table'; -import ProTable from '@ant-design/pro-table'; +import type { ActionType, ProColumns } from '@ant-design/pro-components'; +import { ProTable } from '@ant-design/pro-components'; import { message, Space, Popconfirm, Tag, Spin, Tooltip } from 'antd'; import React, { useRef, useState, useEffect } from 'react'; import type { Dispatch } from 'umi'; diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/View/components/ViewTable.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/View/components/ViewTable.tsx index 7d930a661..cd254c903 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/View/components/ViewTable.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/View/components/ViewTable.tsx @@ -1,5 +1,5 @@ -import type { ActionType, ProColumns } from '@ant-design/pro-table'; -import ProTable from '@ant-design/pro-table'; +import type { ActionType, ProColumns } from '@ant-design/pro-components'; +import { ProTable } from '@ant-design/pro-components'; import { message, Button, Space, Popconfirm, Input, Tag } from 'antd'; import React, { useRef, useState, useEffect } from 'react'; import { StatusEnum } from '../../enum'; diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassDimensionTable.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassDimensionTable.tsx index 8b2b0c964..32ce3279b 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassDimensionTable.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassDimensionTable.tsx @@ -1,5 +1,5 @@ -import type { ActionType, ProColumns } from '@ant-design/pro-table'; -import ProTable from '@ant-design/pro-table'; +import type { ActionType, ProColumns } from '@ant-design/pro-components'; +import { ProTable } from '@ant-design/pro-components'; import { message, Button, Space, Popconfirm, Input, Tag, Select } from 'antd'; import React, { useRef, useState, useEffect } from 'react'; import type { Dispatch } from 'umi'; diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassMetricTable.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassMetricTable.tsx index 44519d6d5..41a285967 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassMetricTable.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassMetricTable.tsx @@ -1,5 +1,5 @@ -import type { ActionType, ProColumns } from '@ant-design/pro-table'; -import ProTable from '@ant-design/pro-table'; +import type { ActionType, ProColumns } from '@ant-design/pro-components'; +import { ProTable } from '@ant-design/pro-components'; import { message, Button, Space, Popconfirm, Input, Select, Tag } from 'antd'; import React, { useRef, useState, useEffect } from 'react'; import type { Dispatch } from 'umi'; diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/CommonEditTable.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/CommonEditTable.tsx index 5139a9752..b320e4f0c 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/CommonEditTable.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/CommonEditTable.tsx @@ -1,9 +1,9 @@ -import type { ActionType } from '@ant-design/pro-table'; +import type { ActionType } from '@ant-design/pro-components'; import type { Ref, ReactNode } from 'react'; import { Space, message } from 'antd'; import React, { useRef, forwardRef, useImperativeHandle, useState, useEffect } from 'react'; -import { EditableProTable } from '@ant-design/pro-table'; +import { EditableProTable } from '@ant-design/pro-components'; type Props = { title?: string; diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Database/DatabaseTable.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Database/DatabaseTable.tsx index 312268231..ab2f48f37 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Database/DatabaseTable.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Database/DatabaseTable.tsx @@ -1,5 +1,5 @@ -import type { ActionType, ProColumns } from '@ant-design/pro-table'; -import ProTable from '@ant-design/pro-table'; +import type { ActionType, ProColumns } from '@ant-design/pro-components'; +import { ProTable } from '@ant-design/pro-components'; import { message, Button, Space, Popconfirm } from 'antd'; import React, { useRef, useState, useEffect } from 'react'; import DatabaseSettingModal from './DatabaseSettingModal'; diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/MetricFieldFormTable.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/MetricFieldFormTable.tsx index 602a775fc..3d988ff7c 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/MetricFieldFormTable.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/MetricFieldFormTable.tsx @@ -1,6 +1,6 @@ import React, { useState, useRef, useEffect } from 'react'; import { Button, Tag, Space } from 'antd'; -import ProTable from '@ant-design/pro-table'; +import { ProTable } from '@ant-design/pro-components'; import ProCard from '@ant-design/pro-card'; import SqlEditor from '@/components/SqlEditor'; import styles from './style.less'; diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/MetricMeasuresFormTable.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/MetricMeasuresFormTable.tsx index 97f28fb65..2b0f88ad4 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/MetricMeasuresFormTable.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/MetricMeasuresFormTable.tsx @@ -1,6 +1,6 @@ import React, { useState, useRef, useEffect } from 'react'; import { Input, Space, Tag } from 'antd'; -import ProTable from '@ant-design/pro-table'; +import { ProTable } from '@ant-design/pro-components'; import ProCard from '@ant-design/pro-card'; import SqlEditor from '@/components/SqlEditor'; diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/MetricMetricFormTable.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/MetricMetricFormTable.tsx index 66e79d561..2ade6f363 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/MetricMetricFormTable.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/MetricMetricFormTable.tsx @@ -1,6 +1,6 @@ import React, { useState, useRef, useEffect } from 'react'; import { Tag, Space } from 'antd'; -import ProTable from '@ant-design/pro-table'; +import { ProTable } from '@ant-design/pro-components'; import ProCard from '@ant-design/pro-card'; import SqlEditor from '@/components/SqlEditor'; import FormLabelRequire from './FormLabelRequire'; diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ModelTable.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ModelTable.tsx index f1813443a..5d2cfdfaa 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ModelTable.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ModelTable.tsx @@ -1,5 +1,5 @@ -import type { ActionType, ProColumns } from '@ant-design/pro-table'; -import ProTable from '@ant-design/pro-table'; +import type { ActionType, ProColumns } from '@ant-design/pro-components'; +import { ProTable } from '@ant-design/pro-components'; import { message, Button, Space, Popconfirm, Input } from 'antd'; import React, { useRef, useState, useEffect } from 'react'; import { StatusEnum } from '../enum'; diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Permission/PermissionTable.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Permission/PermissionTable.tsx index a80886efe..f5d624935 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Permission/PermissionTable.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Permission/PermissionTable.tsx @@ -1,5 +1,5 @@ -import type { ActionType, ProColumns } from '@ant-design/pro-table'; -import ProTable from '@ant-design/pro-table'; +import type { ActionType, ProColumns } from '@ant-design/pro-components'; +import { ProTable } from '@ant-design/pro-components'; import { message, Button, Space, Popconfirm, Tooltip } from 'antd'; import React, { useRef, useState, useEffect } from 'react'; import type { Dispatch } from 'umi'; diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/TagDimensionFormTable.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/TagDimensionFormTable.tsx index 9fdbcfed3..ac2e4f6e2 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/TagDimensionFormTable.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/TagDimensionFormTable.tsx @@ -1,6 +1,6 @@ import React, { useState, useRef, useEffect } from 'react'; import { Tag, Space } from 'antd'; -import ProTable from '@ant-design/pro-table'; +import { ProTable } from '@ant-design/pro-components'; import ProCard from '@ant-design/pro-card'; import SqlEditor from '@/components/SqlEditor'; import FormLabelRequire from './FormLabelRequire'; diff --git a/webapp/packages/supersonic-fe/src/utils/curd.ts b/webapp/packages/supersonic-fe/src/utils/curd.ts index d0ee8a079..fd1ef19c3 100644 --- a/webapp/packages/supersonic-fe/src/utils/curd.ts +++ b/webapp/packages/supersonic-fe/src/utils/curd.ts @@ -1,4 +1,4 @@ -import type { ColumnsState } from '@ant-design/pro-table'; +import type { ColumnsState } from '@ant-design/pro-components'; import { useCallback, useEffect, useState } from 'react'; import type { DependencyList } from 'react';