mirror of
https://github.com/tencentmusic/supersonic.git
synced 2025-12-13 21:17:08 +00:00
[improvement][headless-fe] Adjusted the logic for displaying the tab in the theme domain. (#975)
* [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.
This commit is contained in:
@@ -34,7 +34,6 @@ const OverviewContainer: React.FC<Props> = ({ mode, domainManger, dispatch }) =>
|
|||||||
const targetNode = domainList.filter((item: any) => {
|
const targetNode = domainList.filter((item: any) => {
|
||||||
return `${item.id}` === domainId;
|
return `${item.id}` === domainId;
|
||||||
})[0];
|
})[0];
|
||||||
|
|
||||||
if (!targetNode) {
|
if (!targetNode) {
|
||||||
const firstRootNode = domainList.filter((item: any) => {
|
const firstRootNode = domainList.filter((item: any) => {
|
||||||
return item.parentId === 0;
|
return item.parentId === 0;
|
||||||
|
|||||||
@@ -114,7 +114,7 @@ const DomainListTree: FC<DomainListProps> = ({
|
|||||||
};
|
};
|
||||||
|
|
||||||
const titleRender = (node: any) => {
|
const titleRender = (node: any) => {
|
||||||
const { id, name, path, hasEditPermission, parentId } = node as any;
|
const { id, name, path, hasEditPermission, parentId, hasModel } = node as any;
|
||||||
return (
|
return (
|
||||||
<div className={styles.projectItem}>
|
<div className={styles.projectItem}>
|
||||||
<span
|
<span
|
||||||
@@ -127,7 +127,7 @@ const DomainListTree: FC<DomainListProps> = ({
|
|||||||
</span>
|
</span>
|
||||||
{createDomainBtnVisible && hasEditPermission && (
|
{createDomainBtnVisible && hasEditPermission && (
|
||||||
<span className={`${styles.operation} ${parentId ? styles.rowHover : ''}`}>
|
<span className={`${styles.operation} ${parentId ? styles.rowHover : ''}`}>
|
||||||
{Array.isArray(path) && path.length < 2 && (
|
{Array.isArray(path) && path.length < 2 && !hasModel && (
|
||||||
<PlusOutlined
|
<PlusOutlined
|
||||||
className={styles.icon}
|
className={styles.icon}
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
|
|||||||
@@ -43,17 +43,27 @@ const DomainManagerTab: React.FC<Props> = ({
|
|||||||
}) => {
|
}) => {
|
||||||
const initState = useRef<boolean>(false);
|
const initState = useRef<boolean>(false);
|
||||||
const defaultTabKey = 'metric';
|
const defaultTabKey = 'metric';
|
||||||
const { selectDomainId, selectModelId, selectModelName, selectDomainName, domainData } =
|
const {
|
||||||
domainManger;
|
selectDomainId,
|
||||||
|
selectModelId,
|
||||||
|
selectModelName,
|
||||||
|
selectDomainName,
|
||||||
|
domainData,
|
||||||
|
domainList,
|
||||||
|
} = domainManger;
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
initState.current = false;
|
initState.current = false;
|
||||||
}, [selectModelId]);
|
}, [selectModelId]);
|
||||||
|
|
||||||
|
const domainListParentIdList: number[] = Array.isArray(domainList)
|
||||||
|
? Array.from(new Set(domainList.map((item) => item.parentId)))
|
||||||
|
: [];
|
||||||
|
|
||||||
const tabItem = [
|
const tabItem = [
|
||||||
{
|
{
|
||||||
label: '模型管理',
|
label: '模型管理',
|
||||||
key: 'overview',
|
key: 'overview',
|
||||||
|
hidden: domainData && domainListParentIdList.includes(domainData.id),
|
||||||
children: (
|
children: (
|
||||||
<OverView
|
<OverView
|
||||||
key={selectDomainId}
|
key={selectDomainId}
|
||||||
@@ -67,6 +77,7 @@ const DomainManagerTab: React.FC<Props> = ({
|
|||||||
{
|
{
|
||||||
label: '数据集管理',
|
label: '数据集管理',
|
||||||
key: 'dataSetManange',
|
key: 'dataSetManange',
|
||||||
|
hidden: !!domainData?.parentId,
|
||||||
children: (
|
children: (
|
||||||
<View
|
<View
|
||||||
modelList={modelList}
|
modelList={modelList}
|
||||||
@@ -85,6 +96,7 @@ const DomainManagerTab: React.FC<Props> = ({
|
|||||||
{
|
{
|
||||||
label: '画布',
|
label: '画布',
|
||||||
key: 'xflow',
|
key: 'xflow',
|
||||||
|
hidden: domainData && domainListParentIdList.includes(domainData.id),
|
||||||
children: (
|
children: (
|
||||||
<div style={{ width: '100%' }}>
|
<div style={{ width: '100%' }}>
|
||||||
<SemanticGraphCanvas />
|
<SemanticGraphCanvas />
|
||||||
@@ -137,12 +149,17 @@ const DomainManagerTab: React.FC<Props> = ({
|
|||||||
key: 'recommendedQuestions',
|
key: 'recommendedQuestions',
|
||||||
children: <RecommendedQuestionsSection />,
|
children: <RecommendedQuestionsSection />,
|
||||||
},
|
},
|
||||||
].filter((item) => {
|
];
|
||||||
if (window.RUNNING_ENV === 'headless') {
|
|
||||||
return !['chatSetting', 'recommendedQuestions'].includes(item.key);
|
const getActiveKey = () => {
|
||||||
|
const key = activeKey || defaultTabKey;
|
||||||
|
const tabItems = !isModel ? tabItem : isModelItem;
|
||||||
|
const tabItemsKeys = tabItems.map((item) => item.key);
|
||||||
|
if (!tabItemsKeys.includes(key)) {
|
||||||
|
return tabItemsKeys[0];
|
||||||
}
|
}
|
||||||
return item;
|
return key;
|
||||||
});
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
@@ -187,7 +204,7 @@ const DomainManagerTab: React.FC<Props> = ({
|
|||||||
<Tabs
|
<Tabs
|
||||||
className={styles.tab}
|
className={styles.tab}
|
||||||
items={!isModel ? tabItem : isModelItem}
|
items={!isModel ? tabItem : isModelItem}
|
||||||
activeKey={activeKey || defaultTabKey}
|
activeKey={getActiveKey()}
|
||||||
destroyInactiveTabPane
|
destroyInactiveTabPane
|
||||||
size="large"
|
size="large"
|
||||||
onChange={(menuKey: string) => {
|
onChange={(menuKey: string) => {
|
||||||
|
|||||||
@@ -2,11 +2,9 @@ import { message, TreeSelect } from 'antd';
|
|||||||
import type { DataNode } from 'antd/lib/tree';
|
import type { DataNode } from 'antd/lib/tree';
|
||||||
import { useEffect, useState, useRef } from 'react';
|
import { useEffect, useState, useRef } from 'react';
|
||||||
import type { FC } from 'react';
|
import type { FC } from 'react';
|
||||||
import type { Dispatch } from 'umi';
|
|
||||||
import { getDomainList } from '../../SemanticModel/service';
|
import { getDomainList } from '../../SemanticModel/service';
|
||||||
import { constructorClassTreeFromList, addPathInTreeData } from '../utils';
|
import { constructorClassTreeFromList, addPathInTreeData } from '../utils';
|
||||||
import styles from './style.less';
|
import styles from './style.less';
|
||||||
import { ISemantic } from '../data';
|
|
||||||
|
|
||||||
type Props = {
|
type Props = {
|
||||||
value?: any;
|
value?: any;
|
||||||
|
|||||||
@@ -110,11 +110,13 @@ export declare namespace ISemantic {
|
|||||||
name: string;
|
name: string;
|
||||||
bizName: string;
|
bizName: string;
|
||||||
description: any;
|
description: any;
|
||||||
|
children: IDomainItem[];
|
||||||
hasEditPermission: boolean;
|
hasEditPermission: boolean;
|
||||||
status?: number;
|
status?: number;
|
||||||
typeEnum?: any;
|
typeEnum?: any;
|
||||||
sensitiveLevel?: number;
|
sensitiveLevel?: number;
|
||||||
parentId: number;
|
parentId: number;
|
||||||
|
hasModel: boolean;
|
||||||
fullPath?: string;
|
fullPath?: string;
|
||||||
viewers?: any[];
|
viewers?: any[];
|
||||||
viewOrgs?: any[];
|
viewOrgs?: any[];
|
||||||
|
|||||||
@@ -8,9 +8,6 @@ const getRunningEnv = () => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
export function getDomainList(): Promise<any> {
|
export function getDomainList(): Promise<any> {
|
||||||
if (getRunningEnv() === 'chat') {
|
|
||||||
return request.get(`${process.env.CHAT_API_BASE_URL}conf/domainList`);
|
|
||||||
}
|
|
||||||
return request.get(`${process.env.API_BASE_URL}domain/getDomainList`);
|
return request.get(`${process.env.API_BASE_URL}domain/getDomainList`);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user