[improvement][headless-fe] Optimized data updating when switching domains. (#1063)

* [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.
This commit is contained in:
tristanliu
2024-05-31 16:14:19 +08:00
committed by GitHub
parent 0eb518cfd2
commit c98ba71b17
21 changed files with 104 additions and 208 deletions

View File

@@ -300,7 +300,7 @@ const ParseTip: React.FC<Props> = ({
)}
{parseInfoOptions?.length > 1 ? '' : ''}
</div>
{parseInfoOptions?.length > 1 && (
{!isSimpleMode && parseInfoOptions?.length > 1 && (
<div className={`${prefixCls}-content-options`}>
{parseInfoOptions.map((parseInfo, index) => (
<div

View File

@@ -1,6 +1,4 @@
import { MsgDataType } from '../../../common/type';
import { CLS_PREFIX } from '../../../common/constants';
import { SizeType } from 'antd/es/config-provider/SizeContext';
import rehypeHighlight from 'rehype-highlight';
import remarkGfm from 'remark-gfm';
import Markdown from 'react-markdown';
@@ -8,15 +6,12 @@ import 'github-markdown-css/github-markdown.css';
import 'highlight.js/styles/github.css';
type Props = {
// data: MsgDataType;
// size?: SizeType;
markdown: string;
loading?: boolean;
onApplyAuth?: (model: string) => void;
};
const MarkDown: React.FC<Props> = ({ markdown, loading, onApplyAuth }) => {
// const { textResult } = data;
const prefixCls = `${CLS_PREFIX}-markdown`;
return (

View File

@@ -187,7 +187,11 @@ const ChatMsg: React.FC<Props> = ({
/>
);
case MsgContentTypeEnum.MARKDOWN:
return <MarkDown markdown={data.textResult} loading={loading} />;
return (
<div style={{ maxHeight: 800, overflow: 'scroll' }}>
<MarkDown markdown={data.textResult} loading={loading} />
</div>
);
default:
return (
<Table

View File

@@ -1,7 +1,7 @@
// https://umijs.org/config/
import { defineConfig } from '@umijs/max';
// import { join } from 'path';
import defaultSettings, { publicPath } from './defaultSettings';
import defaultSettings, { publicPath, basePath } from './defaultSettings';
import proxy from './proxy';
import routes from './routes';
import dayjs from 'dayjs';
@@ -76,10 +76,7 @@ export default defineConfig({
* @doc 代理配置 https://umijs.org/docs/api/config#proxy
*/
proxy: proxy[REACT_APP_ENV as keyof typeof proxy],
manifest: {
basePath: '/',
},
base: '/',
base: basePath,
publicPath,
outputPath: RUN_TYPE === 'local' ? 'supersonic-webapp' : 'dist',
/**

View File

@@ -21,5 +21,6 @@ const Settings: ProLayoutProps & {
// },
};
export const publicPath = '/webapp/';
export const basePath = '/';
export default Settings;

View File

@@ -31,12 +31,22 @@ type Props = {
const AgentModal: React.FC<Props> = ({ editAgent, onSaveAgent, onCancel }) => {
const [saveLoading, setSaveLoading] = useState(false);
const [examples, setExamples] = useState<{ id: string; question?: string }[]>([]);
const [formData, setFormData] = useState<any>({});
const [formData, setFormData] = useState<any>({
enableSearch: true,
llmConfig: {
timeOut: 60,
provider: 'OPEN_AI',
},
});
const [form] = Form.useForm();
useEffect(() => {
if (editAgent) {
form.setFieldsValue({ ...editAgent, enableSearch: editAgent.enableSearch !== 0 });
const sourceData = { ...editAgent };
if (!sourceData.llmConfig) {
delete sourceData.llmConfig;
}
form.setFieldsValue({ ...sourceData, enableSearch: editAgent.enableSearch !== 0 });
if (editAgent.examples) {
setExamples(editAgent.examples.map((question) => ({ id: uuid(), question })));
}
@@ -173,7 +183,7 @@ const AgentModal: React.FC<Props> = ({ editAgent, onSaveAgent, onCancel }) => {
<Input placeholder="请输入API KEY" />
</FormItem>
<FormItem name={['llmConfig', 'temperature']} label="回复随机性">
<FormItem name={['llmConfig', 'temperature']} label="Temperature">
<Slider
min={0}
max={1}
@@ -205,13 +215,7 @@ const AgentModal: React.FC<Props> = ({ editAgent, onSaveAgent, onCancel }) => {
<Form
{...layout}
form={form}
initialValues={{
enableSearch: true,
llmConfig: {
timeOut: 60,
provider: 'OPEN_AI',
},
}}
initialValues={formData}
onValuesChange={(value, values) => {
setFormData(values);
}}

View File

@@ -1,4 +1,4 @@
import { Form, Modal, Input, Select, Button, TreeSelect } from 'antd';
import { Form, Modal, Input, Select, Button, TreeSelect, message } from 'antd';
import {
AgentToolType,
AgentToolTypeEnum,
@@ -32,14 +32,12 @@ const ToolModal: React.FC<Props> = ({ editTool, onSaveTool, onCancel }) => {
const [form] = Form.useForm();
const initModelList = async () => {
const res = await getModelList();
const treeData = traverseTree(res.data, (node: any) => {
node.title = node.name;
node.value = node.type === 'DOMAIN' ? `DOMAIN_${node.id}` : node.id;
node.checkable =
node.type === 'DATASET' || (node.type === 'DOMAIN' && node.children?.length > 0);
});
setModelList([{ title: '默认', value: -1, type: 'DATASET' }, ...treeData]);
const { code, data } = await getModelList();
if (code === 200) {
setModelList([{ name: '默认', id: -1 }, ...data]);
} else {
message.error('获取模型列表失败!');
}
};
const initPluginList = async () => {
@@ -106,11 +104,10 @@ const ToolModal: React.FC<Props> = ({ editTool, onSaveTool, onCancel }) => {
{(toolType === AgentToolTypeEnum.NL2SQL_RULE ||
toolType === AgentToolTypeEnum.NL2SQL_LLM) && (
<FormItem name="dataSetIds" label="数据集">
<TreeSelect
treeData={modelList}
<Select
options={modelList.map((item) => ({ label: item.name, value: item.id }))}
placeholder="请选择数据集"
multiple
treeCheckable
mode="multiple"
allowClear
/>
</FormItem>

View File

@@ -111,34 +111,38 @@ const ToolsSection: React.FC<Props> = ({ currentAgent, onSaveAgent, onEditAgent,
</div>
</div>
</div>
<div className={styles.basicInfo}>
<div className={styles.basicInfoTitle}></div>
<div className={styles.infoContent}>
<div className={styles.infoItem}>
<span className={styles.label}> </span>
{currentAgent?.llmConfig?.provider}
</div>
<div className={styles.infoItem}>
<span className={styles.label}>:</span>
{currentAgent?.llmConfig?.modelName}
</div>
<div className={styles.infoItem}>
<span className={styles.label}>Base URL: </span>
{currentAgent?.llmConfig?.baseUrl}
</div>
<div className={styles.infoItem}>
<span className={styles.label}>API KEY:</span>
{currentAgent?.llmConfig?.apiKey}
</div>
<div className={styles.infoItem}>
<span className={styles.label}>: </span>
{currentAgent?.llmConfig?.temperature}
</div>
<div className={styles.infoItem}>
<span className={styles.label}>(): </span> {currentAgent?.llmConfig?.timeOut}
{currentAgent?.llmConfig && (
<div className={styles.basicInfo}>
<div className={styles.basicInfoTitle}></div>
<div className={styles.infoContent}>
<div className={styles.infoItem}>
<span className={styles.label}> </span>
{currentAgent?.llmConfig?.provider}
</div>
<div className={styles.infoItem}>
<span className={styles.label}>:</span>
{currentAgent?.llmConfig?.modelName}
</div>
<div className={styles.infoItem}>
<span className={styles.label}>Base URL: </span>
{currentAgent?.llmConfig?.baseUrl}
</div>
<div className={styles.infoItem}>
<span className={styles.label}>API KEY:</span>
{currentAgent?.llmConfig?.apiKey}
</div>
<div className={styles.infoItem}>
<span className={styles.label}>Temperature: </span>
{currentAgent?.llmConfig?.temperature}
</div>
<div className={styles.infoItem}>
<span className={styles.label}>(): </span>{' '}
{currentAgent?.llmConfig?.timeOut}
</div>
</div>
</div>
</div>
)}
<div className={styles.toolSection}>
<div className={styles.toolSectionTitleBar}>
<div className={styles.toolSectionTitle}></div>

View File

@@ -141,7 +141,7 @@ const ModelFieldForm: React.FC<Props> = ({
<Space>
<Select
style={{ minWidth: 150 }}
value={tagObjectId}
value={tagObjectId ? tagObjectId : undefined}
placeholder="请选择所属对象"
onChange={(value) => {
onTagObjectChange?.(value);

View File

@@ -1,7 +1,7 @@
import { Tag, Space, Tooltip } from 'antd';
import React, { ReactNode } from 'react';
import type { StateType } from '../../model';
import dayjs from 'dayjs';
import { basePath } from '../../../../../config/defaultSettings';
import {
ExportOutlined,
SolutionOutlined,
@@ -90,10 +90,10 @@ const TagInfoSider: React.FC<Props> = ({ tagData, dimensionMap, metricMap }) =>
<span
className={styles.gotoMetricListIcon}
onClick={() => {
window.open(`/model/${tagData.domainId}/${tagData.modelId}/`);
window.open(`${basePath}model/${tagData.domainId}/${tagData.modelId}/`);
}}
>
<Tooltip title="前往所属模型指标列表">
<Tooltip title="前往所属模3型指标列表">
<ExportOutlined />
</Tooltip>
</span>
@@ -139,7 +139,7 @@ const TagInfoSider: React.FC<Props> = ({ tagData, dimensionMap, metricMap }) =>
<span
className={styles.gotoMetricListIcon}
onClick={() => {
window.open(`/model/${tagData.domainId}/0/overview`);
window.open(`${basePath}model/${tagData.domainId}/0/overview`);
}}
>
<Tooltip title="前往模型设置页">

View File

@@ -4,8 +4,8 @@ import { message, Button, Space, Popconfirm } from 'antd';
import React, { useRef, useState, useEffect } from 'react';
import { StatusEnum } from '../../enum';
import { useModel } from '@umijs/max';
import { getTagObjectList, deleteTagObject, batchUpdateTagStatus } from '../../service';
import { getTagObjectList, deleteTagObject } from '../../service';
import dayjs from 'dayjs';
import TagObjectCreateForm from './TagObjectCreateForm';
import styles from '../style.less';
import { ISemantic } from '../../data';
@@ -21,45 +21,21 @@ const TagObjectTable: React.FC<Props> = ({}) => {
const { selectModelId: modelId } = modelModel;
const [createModalVisible, setCreateModalVisible] = useState<boolean>(false);
const [tagItem, setTagItem] = useState<ISemantic.ITagItem>();
const [selectedRowKeys, setSelectedRowKeys] = useState<React.Key[]>([]);
const [tableData, setTableData] = useState<ISemantic.ITagItem[]>([]);
const [loading, setLoading] = useState<boolean>(false);
const defaultPagination = {
current: 1,
pageSize: 20,
total: 0,
};
const [pagination, setPagination] = useState(defaultPagination);
const [filterParams, setFilterParams] = useState<Record<string, any>>({});
const [tagValueSettingModalVisible, setTagValueSettingModalVisible] = useState<boolean>(false);
const actionRef = useRef<ActionType>();
const queryBatchUpdateStatus = async (ids: React.Key[], status: StatusEnum) => {
if (Array.isArray(ids) && ids.length === 0) {
return;
}
const { code, msg } = await batchUpdateTagStatus({
ids,
status,
});
if (code === 200) {
queryTagList({ ...filterParams, ...defaultPagination });
return;
}
message.error(msg);
};
useEffect(() => {
queryTagList({ ...filterParams, ...defaultPagination });
}, [filterParams]);
queryTagList();
}, [selectDomainId]);
const queryTagList = async (params: any) => {
const queryTagList = async () => {
setLoading(true);
const { code, data, msg } = await getTagObjectList({
...params,
domainId: selectDomainId,
status: StatusEnum.ONLINE,
});
@@ -84,8 +60,6 @@ const TagObjectTable: React.FC<Props> = ({}) => {
{
dataIndex: 'name',
title: '标签对象',
// width: 280,
// width: '30%',
search: false,
},
@@ -107,15 +81,15 @@ const TagObjectTable: React.FC<Props> = ({}) => {
search: false,
},
// {
// dataIndex: 'updatedAt',
// title: '更新时间',
{
dataIndex: 'updatedAt',
title: '更新时间',
// search: false,
// render: (value: any) => {
// return value && value !== '-' ? moment(value).format('YYYY-MM-DD HH:mm:ss') : '-';
// },
// },
search: false,
render: (value: any) => {
return value && value !== '-' ? dayjs(value).format('YYYY-MM-DD HH:mm:ss') : '-';
},
},
{
title: '操作',
dataIndex: 'x',
@@ -142,7 +116,7 @@ const TagObjectTable: React.FC<Props> = ({}) => {
const { code, msg } = await deleteTagObject(record.id);
if (code === 200) {
setTagItem(undefined);
queryTagList({ ...filterParams, ...defaultPagination });
queryTagList();
} else {
message.error(msg);
}
@@ -164,66 +138,22 @@ const TagObjectTable: React.FC<Props> = ({}) => {
},
];
const rowSelection = {
onChange: (selectedRowKeys: React.Key[]) => {
setSelectedRowKeys(selectedRowKeys);
},
};
return (
<>
<ProTable
className={`${styles.classTable} ${styles.classTableSelectColumnAlignLeft} ${styles.disabledSearchTable} `}
actionRef={actionRef}
// headerTitle={
// <TableHeaderFilter
// components={[
// {
// label: '标签搜索',
// component: (
// <Input.Search
// style={{ width: 280 }}
// placeholder="请输入ID/标签名称/英文名称"
// onSearch={(value) => {
// setFilterParams((preState) => {
// return {
// ...preState,
// key: value,
// };
// });
// }}
// />
// ),
// },
// ]}
// />
// }
rowKey="id"
size="small"
loading={loading}
search={false}
rowSelection={{
type: 'checkbox',
...rowSelection,
}}
columns={columns}
params={{ modelId }}
dataSource={tableData}
// pagination={pagination}
tableAlertRender={() => {
return false;
}}
onChange={(data: any) => {
const { current, pageSize, total } = data;
const currentPagin = {
current,
pageSize,
total,
};
setPagination(currentPagin);
queryTagList({ ...filterParams, ...currentPagin });
}}
sticky={{ offsetHeader: 0 }}
size="large"
options={{ reload: false, density: false, fullScreen: false }}
toolBarRender={() => [
<Button
@@ -245,7 +175,7 @@ const TagObjectTable: React.FC<Props> = ({}) => {
tagItem={tagItem}
onSubmit={() => {
setCreateModalVisible(false);
queryTagList({ ...filterParams, ...defaultPagination });
queryTagList();
}}
onCancel={() => {
setCreateModalVisible(false);

View File

@@ -2,6 +2,7 @@ import { Tag, Space, Tooltip } from 'antd';
import React, { useState } from 'react';
import dayjs from 'dayjs';
import { MetricSettingKey, MetricSettingWording } from './constants';
import { basePath } from '../../../../config/defaultSettings';
import {
ExportOutlined,
SolutionOutlined,
@@ -53,7 +54,7 @@ const MetricInfoEditSider: React.FC<Props> = ({ metircData, onSettingKeyChange }
<span
className={styles.gotoMetricListIcon}
onClick={() => {
window.open(`/model/${metircData.domainId}/${metircData.modelId}/`);
window.open(`${basePath}model/${metircData.domainId}/${metircData.modelId}/`);
}}
>
<Tooltip title="前往所属模型指标列表">
@@ -118,7 +119,7 @@ const MetricInfoEditSider: React.FC<Props> = ({ metircData, onSettingKeyChange }
<span
className={styles.gotoMetricListIcon}
onClick={() => {
window.open(`/model/${metircData.domainId}/0/overview`);
window.open(`${basePath}model/${metircData.domainId}/0/overview`);
}}
>
<Tooltip title="前往模型设置页">

View File

@@ -2,10 +2,10 @@ import { Tag, Space, Tooltip, Typography } from 'antd';
import React from 'react';
import { isArrayOfValues } from '@/utils/utils';
import dayjs from 'dayjs';
import { basePath } from '../../../../config/defaultSettings';
import {
ExportOutlined,
SolutionOutlined,
ContainerOutlined,
PartitionOutlined,
PlusOutlined,
AreaChartOutlined,
@@ -43,7 +43,7 @@ const MetricInfoSider: React.FC<Props> = ({
<span
className={styles.gotoMetricListIcon}
onClick={() => {
window.open(`/model/${metircData.domainId}/${metircData.modelId}/`);
window.open(`${basePath}model/${metircData.domainId}/${metircData.modelId}/`);
}}
>
<Tooltip title="前往所属模型指标列表">
@@ -92,7 +92,7 @@ const MetricInfoSider: React.FC<Props> = ({
<span
className={styles.gotoMetricListIcon}
onClick={() => {
window.open(`/model/${metircData.domainId}/0/overview`);
window.open(`${basePath}model/${metircData.domainId}/0/overview`);
}}
>
<Tooltip title="前往模型设置页">

View File

@@ -47,7 +47,7 @@ const DataSetTable: React.FC<Props> = ({ disabledEdit = false }) => {
useEffect(() => {
queryViewList();
queryDomainAllModel();
}, []);
}, [selectDomainId]);
const queryViewList = async () => {
setLoading(true);

View File

@@ -90,7 +90,7 @@ const DomainListTree: FC<DomainListProps> = ({
type: 'normal',
parentId: domainId,
name: '默认模型集',
bizName: 'defaultModelSet',
bizName: `defaultModelSet_${(Math.random() * 1000000).toFixed(0)}`,
isUnique: 1,
});
if (code !== 200) {
@@ -124,6 +124,7 @@ const DomainListTree: FC<DomainListProps> = ({
const titleRender = (node: any) => {
const { id, name, path, hasEditPermission, parentId, hasModel } = node as any;
const type = parentId === 0 ? 'top' : 'normal';
return (
<div className={styles.projectItem}>
<span
@@ -156,7 +157,7 @@ const DomainListTree: FC<DomainListProps> = ({
onClick={() => {
setDomainInfoParams({
modelType: 'edit',
type: 'normal',
type,
...node,
});
setProjectInfoModalVisible(true);

View File

@@ -164,7 +164,7 @@ const DomainManagerTab: React.FC<Props> = ({
};
return (
<>
<div>
<Breadcrumb
className={styles.breadcrumb}
separator=""
@@ -207,7 +207,6 @@ const DomainManagerTab: React.FC<Props> = ({
className={styles.tab}
items={!isModel ? tabItem : selectModelId ? isModelItem : []}
activeKey={getActiveKey()}
// destroyInactiveTabPane
tabBarExtraContent={{
right:
getActiveKey() === 'overview' ? (
@@ -226,13 +225,12 @@ const DomainManagerTab: React.FC<Props> = ({
</Radio.Group>
) : undefined,
}}
// destroyInactiveTabPane
size="large"
onChange={(menuKey: string) => {
onMenuChange?.(menuKey);
}}
/>
</>
</div>
);
};

View File

@@ -63,14 +63,6 @@ const DimensionValueSettingForm: React.FC<Props> = ({
queryDictLatestTaskList();
}, []);
// useEffect(() => {
// const modelId = dataItem?.modelId;
// if (modelId) {
// queryMetricList(modelId);
// form.setFieldValue('modelId', modelId);
// }
// }, [dataItem]);
useEffect(() => {
if (!selectDomainId) {
return;

View File

@@ -48,7 +48,7 @@ const PermissionAdminForm: React.FC<Props> = ({ permissionTarget, onValuesChange
useEffect(() => {
queryClassDetail();
}, [modelId]);
}, [modelId, selectDomainId]);
const saveAuth = async () => {
const values = await form.validateFields();

View File

@@ -5,7 +5,6 @@ import React, { useRef, useState, useEffect } from 'react';
import { useModel } from '@umijs/max';
import { getGroupAuthInfo, removeGroupAuth } from '../../service';
import { getOrganizationTree } from '@/components/SelectPartner/service';
import { getAllUser } from '@/components/SelectTMEPerson/service';
import PermissionCreateDrawer from './PermissionCreateDrawer';
import { findDepartmentTree } from '@/pages/SemanticModel/utils';

View File

@@ -7,7 +7,6 @@ import { getTermList, saveOrUpdate, deleteTerm } from '../../service';
import dayjs from 'dayjs';
import styles from '../style.less';
import { ISemantic } from '../../data';
import { ColumnsConfig } from '../../components/TableColumnRender';
import TermCreateForm from './TermCreateForm';
const { Paragraph } = Typography;
@@ -26,10 +25,10 @@ const TermTable: React.FC<Props> = ({}) => {
const actionRef = useRef<ActionType>();
useEffect(() => {
queryTagList();
}, []);
queryTermList();
}, [selectDomainId]);
const queryTagList = async () => {
const queryTermList = async () => {
setLoading(true);
const { code, data, msg } = await getTermList(selectDomainId);
setLoading(false);
@@ -48,42 +47,21 @@ const TermTable: React.FC<Props> = ({}) => {
});
setLoading(false);
if (code === 200) {
queryTagList();
queryTermList();
} else {
message.error(msg);
}
};
const saveTermConfig = (termItem: ISemantic.ITermItem) => {
const hasTerm = tableData.find((item) => item.name === termItem.name);
let terms = [];
if (hasTerm) {
terms = tableData.map((item) => {
if (item.name === termItem.name) {
return {
...item,
...termItem,
};
}
return item;
});
} else {
terms = [...tableData, termItem];
}
queryTermConfig(terms);
};
const deleteTermConfig = async (termItem: ISemantic.ITermItem) => {
const { code, msg } = await deleteTerm(termItem.id);
if (code === 200) {
queryTagList();
queryTermList();
} else {
message.error(msg);
}
};
const columnsConfig = ColumnsConfig();
const columns: ProColumns[] = [
{
dataIndex: 'name',
@@ -166,6 +144,7 @@ const TermTable: React.FC<Props> = ({}) => {
className={`${styles.classTable} ${styles.disabledSearchTable} `}
actionRef={actionRef}
rowKey="id"
size="small"
loading={loading}
search={false}
columns={columns}
@@ -174,7 +153,6 @@ const TermTable: React.FC<Props> = ({}) => {
return false;
}}
sticky={{ offsetHeader: 0 }}
size="large"
options={false}
toolBarRender={() => [
<Button

View File

@@ -383,11 +383,6 @@ export function getColumns(dbId: number, dbName: string, tableName: string): Pro
}
export function getModelList(domainId: number): Promise<any> {
if (getRunningEnv() === 'chat') {
return request(`${process.env.CHAT_API_BASE_URL}conf/modelList/${domainId}`, {
method: 'GET',
});
}
return request(`${process.env.API_BASE_URL}model/getModelList/${domainId}`, {
method: 'GET',
});