mirror of
https://github.com/tencentmusic/supersonic.git
synced 2025-12-10 11:07:06 +00:00
[improvement][headless-fe] Model management: Integrated into the main theme domain. (#1273)
* [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 * [improvement][headless-fe] Migrating scaffold version to @umi/max * [improvement][headless-fe] remove modle column * [improvement][headless-fe] 1.Added configuration for the large language model in the agent; 2.upgraded React version from 17 to 18; 3.modified some UI effects. * [improvement][headless-fe] Added a simplified mode to the question-answering system. * [improvement][headless-fe] remove pnpm-lock * [improvement][headless-fe] add pnpm-lock * [improvement][headless-fe] Fixed the issue with passing the modelId during initialization. * [improvement][headless-fe] Fixed the issue with abnormal comments during model creation. * [improvement][headless-fe] fix build bugs * [improvement][headless-fe] change build config * [improvement][headless-fe] route config change * [improvement][headless-fe] Optimized data updating when switching domains. * [improvement][headless-fe] css change * [improvement][semantic-fe] logo css change * [improvement][semantic-fe] system config add defaultValue support * [improvement][semantic-fe] tag mode wording change * [improvement][semantic-fe] fix metric edit page init error * [improvement][supersonic-fe] Updated the way chat projects are imported in supersonic-fe. * [improvement][chat-engine] Added a background silent mode for watching chat projects. * [improvement][supersonic-fe] fix proxy url * [improvement][headless-fe] agent setting update * [improvement][headless-fe] Agent configuration: Added connectivity testing for large models. * [improvement][headless-fe] Chat: Enabled integration with agent configuration. * [improvement][headless-fe] SQL formatter: Updated the import method. * [improvement][headless-fe] login fixed * [improvement][headless-fe] Agent: Optimized the logic for saving. * [improvement][headless-fe] Model management: Integrated into the main theme domain.
This commit is contained in:
tristanliu
@@ -248,7 +248,7 @@ const AgentForm: React.FC<Props> = ({ editAgent, onSaveAgent, onCreateToolBtnCli
|
||||
};
|
||||
}}
|
||||
>
|
||||
<Input placeholder="请输入API Key" />
|
||||
<Input.Password placeholder="请输入API Key" visibilityToggle />
|
||||
</FormItem>
|
||||
|
||||
<FormItem name={['llmConfig', 'temperature']} label="Temperature">
|
||||
|
||||
@@ -345,7 +345,11 @@ const SqlDetail: React.FC<IProps> = ({
|
||||
<div
|
||||
className={styles.sqlResultLog}
|
||||
dangerouslySetInnerHTML={{
|
||||
__html: taskLog.replace(/\r\n/g, '<br/>').replace(/\t/g, ' '),
|
||||
__html: taskLog ? (
|
||||
taskLog.replace(/\r\n/g, '<br/>').replace(/\t/g, ' ')
|
||||
) : (
|
||||
<></>
|
||||
),
|
||||
}}
|
||||
/>
|
||||
</>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { DownOutlined, PlusOutlined, EditOutlined, DeleteOutlined } from '@ant-design/icons';
|
||||
import { Input, message, Tree, Popconfirm, Tooltip, Row, Col, Button } from 'antd';
|
||||
import { Input, message, Tree, Popconfirm, Tooltip, Row, Col, Button, Menu } from 'antd';
|
||||
import type { DataNode } from 'antd/lib/tree';
|
||||
import { useEffect, useState } from 'react';
|
||||
import type { FC, Key } from 'react';
|
||||
@@ -8,7 +8,7 @@ import { createDomain, updateDomain, deleteDomain } from '../service';
|
||||
import { treeParentKeyLists } from '../utils';
|
||||
import DomainInfoForm from './DomainInfoForm';
|
||||
import { constructorClassTreeFromList, addPathInTreeData } from '../utils';
|
||||
|
||||
import { AppstoreOutlined } from '@ant-design/icons';
|
||||
import styles from './style.less';
|
||||
import { ISemantic } from '../data';
|
||||
|
||||
@@ -84,26 +84,26 @@ const DomainListTree: FC<DomainListProps> = ({
|
||||
}
|
||||
};
|
||||
|
||||
const createDefaultModelSet = async (domainId: number) => {
|
||||
const { code, msg } = await createDomain({
|
||||
modelType: 'add',
|
||||
type: 'normal',
|
||||
parentId: domainId,
|
||||
name: '默认模型集',
|
||||
bizName: `defaultModelSet_${(Math.random() * 1000000).toFixed(0)}`,
|
||||
isUnique: 1,
|
||||
});
|
||||
if (code !== 200) {
|
||||
message.error(msg);
|
||||
}
|
||||
};
|
||||
// const createDefaultModelSet = async (domainId: number) => {
|
||||
// const { code, msg } = await createDomain({
|
||||
// modelType: 'add',
|
||||
// type: 'normal',
|
||||
// parentId: domainId,
|
||||
// name: '默认模型集',
|
||||
// bizName: `defaultModelSet_${(Math.random() * 1000000).toFixed(0)}`,
|
||||
// isUnique: 1,
|
||||
// });
|
||||
// if (code !== 200) {
|
||||
// message.error(msg);
|
||||
// }
|
||||
// };
|
||||
|
||||
const domainSubmit = async (values: any) => {
|
||||
if (values.modelType === 'add') {
|
||||
const { code, data } = await createDomain(values);
|
||||
if (code === 200 && values.type === 'top') {
|
||||
await createDefaultModelSet(data.id);
|
||||
}
|
||||
// if (code === 200 && values.type === 'top') {
|
||||
// await createDefaultModelSet(data.id);
|
||||
// }
|
||||
} else if (values.modelType === 'edit') {
|
||||
await editProject(values);
|
||||
}
|
||||
@@ -136,7 +136,7 @@ const DomainListTree: FC<DomainListProps> = ({
|
||||
{name}
|
||||
</span>
|
||||
{createDomainBtnVisible && hasEditPermission && (
|
||||
<span className={`${styles.operation} ${parentId ? styles.rowHover : ''}`}>
|
||||
<span className={`${styles.operation} ${styles.rowHover} `}>
|
||||
{Array.isArray(path) && path.length < 2 && !hasModel && (
|
||||
<PlusOutlined
|
||||
className={styles.icon}
|
||||
@@ -186,6 +186,55 @@ const DomainListTree: FC<DomainListProps> = ({
|
||||
setExpandedKeys(_expandedKeys as string[]);
|
||||
};
|
||||
|
||||
const items = domainList
|
||||
.filter((domain) => domain.parentId === 0)
|
||||
.map((domain: ISemantic.IDomainItem) => {
|
||||
return {
|
||||
key: domain.id,
|
||||
label: titleRender(domain),
|
||||
// icon: <AppstoreOutlined />,
|
||||
};
|
||||
});
|
||||
|
||||
const getLevelKeys = (items1: LevelKeysProps[]) => {
|
||||
const key: Record<string, number> = {};
|
||||
const func = (items2: LevelKeysProps[], level = 1) => {
|
||||
items2.forEach((item) => {
|
||||
if (item.key) {
|
||||
key[item.key] = level;
|
||||
}
|
||||
if (item.children) {
|
||||
func(item.children, level + 1);
|
||||
}
|
||||
});
|
||||
};
|
||||
func(items1);
|
||||
return key;
|
||||
};
|
||||
const levelKeys = getLevelKeys(items as LevelKeysProps[]);
|
||||
const [stateOpenKeys, setStateOpenKeys] = useState(['2', '23']);
|
||||
|
||||
const onOpenChange: MenuProps['onOpenChange'] = (openKeys) => {
|
||||
const currentOpenKey = openKeys.find((key) => stateOpenKeys.indexOf(key) === -1);
|
||||
// open
|
||||
if (currentOpenKey !== undefined) {
|
||||
const repeatIndex = openKeys
|
||||
.filter((key) => key !== currentOpenKey)
|
||||
.findIndex((key) => levelKeys[key] === levelKeys[currentOpenKey]);
|
||||
|
||||
setStateOpenKeys(
|
||||
openKeys
|
||||
// remove repeat key
|
||||
.filter((_, index) => index !== repeatIndex)
|
||||
// remove current level all child
|
||||
.filter((key) => levelKeys[key] <= levelKeys[currentOpenKey]),
|
||||
);
|
||||
} else {
|
||||
// close
|
||||
setStateOpenKeys(openKeys);
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<div className={styles.domainList}>
|
||||
<div className={styles.searchContainer}>
|
||||
@@ -216,7 +265,15 @@ const DomainListTree: FC<DomainListProps> = ({
|
||||
)}
|
||||
</Row>
|
||||
</div>
|
||||
<Tree
|
||||
<Menu
|
||||
mode="inline"
|
||||
defaultSelectedKeys={['231']}
|
||||
openKeys={stateOpenKeys}
|
||||
onOpenChange={onOpenChange}
|
||||
style={{ width: 256 }}
|
||||
items={items}
|
||||
/>
|
||||
{/* <Tree
|
||||
expandedKeys={expandedKeys}
|
||||
onExpand={handleExpand}
|
||||
className={styles.tree}
|
||||
@@ -226,7 +283,7 @@ const DomainListTree: FC<DomainListProps> = ({
|
||||
defaultExpandAll={true}
|
||||
treeData={projectRenderTree}
|
||||
titleRender={titleRender}
|
||||
/>
|
||||
/> */}
|
||||
{projectInfoModalVisible && (
|
||||
<DomainInfoForm
|
||||
basicInfo={domainInfoParams}
|
||||
|
||||
@@ -53,7 +53,7 @@ const DomainManagerTab: React.FC<Props> = ({
|
||||
{
|
||||
label: '模型管理',
|
||||
key: 'overview',
|
||||
hidden: domainData && domainListParentIdList.includes(domainData.id),
|
||||
// hidden: domainData && domainListParentIdList.includes(domainData.id),
|
||||
children:
|
||||
showModelType === 'list' ? (
|
||||
<OverView
|
||||
@@ -211,8 +211,8 @@ const DomainManagerTab: React.FC<Props> = ({
|
||||
right:
|
||||
getActiveKey() === 'overview' ? (
|
||||
<Radio.Group
|
||||
defaultValue="list"
|
||||
buttonStyle="solid"
|
||||
value={showModelType}
|
||||
size="small"
|
||||
style={{ marginRight: 25 }}
|
||||
onChange={(e) => {
|
||||
@@ -220,6 +220,7 @@ const DomainManagerTab: React.FC<Props> = ({
|
||||
setShowModelType(showType);
|
||||
}}
|
||||
>
|
||||
{showModelType}
|
||||
<Radio.Button value="list">列表</Radio.Button>
|
||||
<Radio.Button value="canvas">画布</Radio.Button>
|
||||
</Radio.Group>
|
||||
|
||||
@@ -4,7 +4,7 @@ import { message, Button, Space, Popconfirm, Input } from 'antd';
|
||||
import React, { useRef, useState, useEffect } from 'react';
|
||||
import { StatusEnum } from '../enum';
|
||||
import { useModel } from '@umijs/max';
|
||||
import { deleteModel, updateModel, batchUpdateModelStatus } from '../service';
|
||||
import { deleteModel, batchUpdateModelStatus } from '../service';
|
||||
import ClassModelTypeModal from './ClassModelTypeModal';
|
||||
import { ColumnsConfig } from './TableColumnRender';
|
||||
import TableHeaderFilter from './TableHeaderFilter';
|
||||
@@ -25,7 +25,6 @@ const ModelTable: React.FC<Props> = ({ modelList, disabledEdit = false, onModelC
|
||||
const { modelTableHistoryParams, setModelTableHistoryParams } = modelModel;
|
||||
|
||||
const [modelItem, setModelItem] = useState<ISemantic.IModelItem>();
|
||||
const [saveLoading, setSaveLoading] = useState<boolean>(false);
|
||||
const [filterParams, setFilterParams] = useState<Record<string, any>>({});
|
||||
const [createDataSourceModalOpen, setCreateDataSourceModalOpen] = useState(false);
|
||||
const [currentPageNumber, setCurrentPageNumber] = useState<number>(1);
|
||||
|
||||
@@ -84,37 +84,32 @@
|
||||
width: 175px;
|
||||
margin: 10px 0 10px 16px;
|
||||
}
|
||||
|
||||
.tree {
|
||||
flex: 1;
|
||||
padding: 10px;
|
||||
padding-right: 18px;
|
||||
.projectItem {
|
||||
display: flex;
|
||||
width: 100%;
|
||||
cursor: auto;
|
||||
line-height: 25px;
|
||||
height: 25px;
|
||||
color: rgb(95, 116, 141);
|
||||
font-weight: 500;
|
||||
.projectItemTitle {
|
||||
font-size: 15px;
|
||||
flex: 1;
|
||||
.projectItem {
|
||||
display: flex;
|
||||
width: 100%;
|
||||
cursor: auto;
|
||||
line-height: 25px;
|
||||
height: 25px;
|
||||
color: rgb(95, 116, 141);
|
||||
font-weight: 500;
|
||||
.projectItemTitle {
|
||||
font-size: 15px;
|
||||
flex: 1;
|
||||
cursor: pointer;
|
||||
}
|
||||
.operation {
|
||||
.icon {
|
||||
margin-left: 6px;
|
||||
cursor: pointer;
|
||||
}
|
||||
.operation {
|
||||
.icon {
|
||||
margin-left: 6px;
|
||||
cursor: pointer;
|
||||
}
|
||||
}
|
||||
}
|
||||
.rowHover {
|
||||
display: none;
|
||||
}
|
||||
&:hover {
|
||||
.rowHover {
|
||||
display: none;
|
||||
}
|
||||
&:hover {
|
||||
.rowHover {
|
||||
display: block;
|
||||
}
|
||||
display: block;
|
||||
color: var(--tme-primary-color);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user