mirror of
https://github.com/tencentmusic/supersonic.git
synced 2025-12-12 04:27:39 +00:00
[improvement][headless-fe] Added tag value setting. (#821)
* [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.
This commit is contained in:
@@ -15,6 +15,7 @@ import moment from 'moment';
|
|||||||
import styles from '../style.less';
|
import styles from '../style.less';
|
||||||
import { ISemantic } from '../../data';
|
import { ISemantic } from '../../data';
|
||||||
import { ColumnsConfig } from '../../components/TableColumnRender';
|
import { ColumnsConfig } from '../../components/TableColumnRender';
|
||||||
|
import TagValueSettingModal from './TagValueSettingModal';
|
||||||
|
|
||||||
type Props = {
|
type Props = {
|
||||||
dispatch: Dispatch;
|
dispatch: Dispatch;
|
||||||
@@ -37,6 +38,8 @@ const ClassTagTable: React.FC<Props> = ({ domainManger, dispatch }) => {
|
|||||||
|
|
||||||
const [filterParams, setFilterParams] = useState<Record<string, any>>({});
|
const [filterParams, setFilterParams] = useState<Record<string, any>>({});
|
||||||
|
|
||||||
|
const [tagValueSettingModalVisible, setTagValueSettingModalVisible] = useState<boolean>(false);
|
||||||
|
|
||||||
const actionRef = useRef<ActionType>();
|
const actionRef = useRef<ActionType>();
|
||||||
|
|
||||||
const queryBatchUpdateStatus = async (ids: React.Key[], status: StatusEnum) => {
|
const queryBatchUpdateStatus = async (ids: React.Key[], status: StatusEnum) => {
|
||||||
@@ -160,6 +163,16 @@ const ClassTagTable: React.FC<Props> = ({ domainManger, dispatch }) => {
|
|||||||
>
|
>
|
||||||
编辑
|
编辑
|
||||||
</Button>
|
</Button>
|
||||||
|
<Button
|
||||||
|
key="tagValueEditBtn"
|
||||||
|
type="link"
|
||||||
|
onClick={() => {
|
||||||
|
setTagItem(record);
|
||||||
|
setTagValueSettingModalVisible(true);
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
标签值设置
|
||||||
|
</Button>
|
||||||
{record.status === StatusEnum.ONLINE ? (
|
{record.status === StatusEnum.ONLINE ? (
|
||||||
<Button
|
<Button
|
||||||
type="link"
|
type="link"
|
||||||
@@ -341,6 +354,18 @@ const ClassTagTable: React.FC<Props> = ({ domainManger, dispatch }) => {
|
|||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
{tagValueSettingModalVisible && (
|
||||||
|
<TagValueSettingModal
|
||||||
|
open={tagValueSettingModalVisible}
|
||||||
|
tagItem={tagItem}
|
||||||
|
onCancel={() => {
|
||||||
|
setTagValueSettingModalVisible(false);
|
||||||
|
}}
|
||||||
|
onSubmit={() => {
|
||||||
|
setTagValueSettingModalVisible(false);
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -29,6 +29,9 @@ const TagTrendSection: React.FC<Props> = ({ tagData }) => {
|
|||||||
setTagTrendLoading(true);
|
setTagTrendLoading(true);
|
||||||
const { data, code } = await getTagValueDistribution({
|
const { data, code } = await getTagValueDistribution({
|
||||||
itemId: params.id,
|
itemId: params.id,
|
||||||
|
dateConf: {
|
||||||
|
unit: 5,
|
||||||
|
},
|
||||||
});
|
});
|
||||||
setTagTrendLoading(false);
|
setTagTrendLoading(false);
|
||||||
if (code === 200 && Array.isArray(data?.valueDistributionList)) {
|
if (code === 200 && Array.isArray(data?.valueDistributionList)) {
|
||||||
|
|||||||
@@ -0,0 +1,86 @@
|
|||||||
|
import React, { useEffect, useState } from 'react';
|
||||||
|
import { Button, Modal, Space } from 'antd';
|
||||||
|
import { KnowledgeConfigTypeEnum } from '../../enum';
|
||||||
|
import { ISemantic } from '../../data';
|
||||||
|
import DimensionValueSettingForm from '../../components/Entity/DimensionValueSettingForm';
|
||||||
|
import { connect } from 'umi';
|
||||||
|
import type { StateType } from '../../model';
|
||||||
|
|
||||||
|
export type CreateFormProps = {
|
||||||
|
onCancel: () => void;
|
||||||
|
tagItem: ISemantic.ITagItem;
|
||||||
|
open: boolean;
|
||||||
|
onSubmit: (values?: any) => void;
|
||||||
|
domainManger: StateType;
|
||||||
|
};
|
||||||
|
|
||||||
|
type TableDataSource = { techName: string; bizName: string; alias?: string[] };
|
||||||
|
|
||||||
|
const TagValueSettingModal: React.FC<CreateFormProps> = ({
|
||||||
|
onCancel,
|
||||||
|
open,
|
||||||
|
tagItem,
|
||||||
|
domainManger,
|
||||||
|
onSubmit,
|
||||||
|
}) => {
|
||||||
|
const [tableDataSource, setTableDataSource] = useState<TableDataSource[]>([]);
|
||||||
|
|
||||||
|
// const handleSubmit = async () => {
|
||||||
|
// await saveDimension({ dimValueMaps });
|
||||||
|
// onSubmit?.(dimValueMaps);
|
||||||
|
// };
|
||||||
|
|
||||||
|
// const saveDimension = async (fieldsValue: any) => {
|
||||||
|
// if (!dimensionItem?.id) {
|
||||||
|
// return;
|
||||||
|
// }
|
||||||
|
// const queryParams = {
|
||||||
|
// ...dimensionItem,
|
||||||
|
// domainId: selectDomainId,
|
||||||
|
// ...fieldsValue,
|
||||||
|
// };
|
||||||
|
// const { code, msg } = await updateDimension(queryParams);
|
||||||
|
// if (code === 200) {
|
||||||
|
// return;
|
||||||
|
// }
|
||||||
|
// message.error(msg);
|
||||||
|
// };
|
||||||
|
|
||||||
|
const renderFooter = () => {
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<Space>
|
||||||
|
<Button onClick={onCancel}>取消</Button>
|
||||||
|
|
||||||
|
<Button
|
||||||
|
type="primary"
|
||||||
|
onClick={() => {
|
||||||
|
// handleSubmit();
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
完成
|
||||||
|
</Button>
|
||||||
|
</Space>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Modal
|
||||||
|
width={800}
|
||||||
|
destroyOnClose
|
||||||
|
title="标签值设置"
|
||||||
|
style={{ top: 48 }}
|
||||||
|
maskClosable={false}
|
||||||
|
open={open}
|
||||||
|
footer={renderFooter()}
|
||||||
|
onCancel={onCancel}
|
||||||
|
>
|
||||||
|
<DimensionValueSettingForm dataItem={tagItem} type={KnowledgeConfigTypeEnum.TAG} />
|
||||||
|
</Modal>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default connect(({ domainManger }: { domainManger: StateType }) => ({
|
||||||
|
domainManger,
|
||||||
|
}))(TagValueSettingModal);
|
||||||
@@ -7,18 +7,15 @@ import { Form, Input, Select, InputNumber } from 'antd';
|
|||||||
import { wrapperTransTypeAndId } from '../../utils';
|
import { wrapperTransTypeAndId } from '../../utils';
|
||||||
|
|
||||||
import { ISemantic } from '../../data';
|
import { ISemantic } from '../../data';
|
||||||
import { ChatConfigType, TransType, SemanticNodeType } from '../../enum';
|
import { TransType, SemanticNodeType } from '../../enum';
|
||||||
import TransTypeTag from '../../components/TransTypeTag';
|
import TransTypeTag from '../../components/TransTypeTag';
|
||||||
|
|
||||||
type Props = {
|
type Props = {
|
||||||
// entityData: any;
|
chatConfigType: TransType;
|
||||||
// chatConfigKey: string;
|
|
||||||
chatConfigType: ChatConfigType.TAG | ChatConfigType.METRIC;
|
|
||||||
metricList?: ISemantic.IMetricItem[];
|
metricList?: ISemantic.IMetricItem[];
|
||||||
dimensionList?: ISemantic.IDimensionItem[];
|
dimensionList?: ISemantic.IDimensionItem[];
|
||||||
|
tagList?: ISemantic.ITagItem[];
|
||||||
form: any;
|
form: any;
|
||||||
// domainId: number;
|
|
||||||
// onSubmit: (params?: any) => void;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const FormItem = Form.Item;
|
const FormItem = Form.Item;
|
||||||
@@ -31,7 +28,7 @@ const formDefaultValue = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const DefaultSettingForm: ForwardRefRenderFunction<any, Props> = (
|
const DefaultSettingForm: ForwardRefRenderFunction<any, Props> = (
|
||||||
{ metricList, dimensionList, chatConfigType, form },
|
{ metricList, dimensionList, tagList, chatConfigType, form },
|
||||||
ref,
|
ref,
|
||||||
) => {
|
) => {
|
||||||
const [dataItemListOptions, setDataItemListOptions] = useState<any>([]);
|
const [dataItemListOptions, setDataItemListOptions] = useState<any>([]);
|
||||||
@@ -54,84 +51,57 @@ const DefaultSettingForm: ForwardRefRenderFunction<any, Props> = (
|
|||||||
}
|
}
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
const defaultConfigKeyMap = {
|
const defaultConfigKeyMap: any = {
|
||||||
[ChatConfigType.TAG]: 'tagTypeDefaultConfig',
|
[TransType.TAG]: 'tagTypeDefaultConfig',
|
||||||
[ChatConfigType.METRIC]: 'metricTypeDefaultConfig',
|
[TransType.METRIC]: 'metricTypeDefaultConfig',
|
||||||
};
|
};
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (Array.isArray(dimensionList) && Array.isArray(metricList)) {
|
if (Array.isArray(tagList)) {
|
||||||
const dimensionEnum = dimensionList.map((item: ISemantic.IDimensionItem) => {
|
const tagEnum = tagList.map((item: ISemantic.ITagItem) => {
|
||||||
const { name, id, bizName } = item;
|
const { name, id, bizName } = item;
|
||||||
return {
|
return {
|
||||||
name,
|
name,
|
||||||
label: (
|
label: (
|
||||||
<>
|
<>
|
||||||
<TransTypeTag type={SemanticNodeType.DIMENSION} />
|
<TransTypeTag type={SemanticNodeType.TAG} />
|
||||||
{name}
|
{name}
|
||||||
</>
|
</>
|
||||||
),
|
),
|
||||||
value: wrapperTransTypeAndId(TransType.DIMENSION, id),
|
value: wrapperTransTypeAndId(TransType.TAG, id),
|
||||||
bizName,
|
bizName,
|
||||||
id,
|
id,
|
||||||
transType: TransType.DIMENSION,
|
transType: TransType.TAG,
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
const metricEnum = metricList.map((item: ISemantic.IMetricItem) => {
|
setDataItemListOptions([...tagEnum]);
|
||||||
const { name, id, bizName } = item;
|
|
||||||
return {
|
|
||||||
name,
|
|
||||||
label: (
|
|
||||||
<>
|
|
||||||
<TransTypeTag type={SemanticNodeType.METRIC} />
|
|
||||||
{name}
|
|
||||||
</>
|
|
||||||
),
|
|
||||||
value: wrapperTransTypeAndId(TransType.METRIC, id),
|
|
||||||
bizName,
|
|
||||||
id,
|
|
||||||
transType: TransType.METRIC,
|
|
||||||
};
|
|
||||||
});
|
|
||||||
setDataItemListOptions([...dimensionEnum, ...metricEnum]);
|
|
||||||
}
|
}
|
||||||
}, [dimensionList, metricList]);
|
}, [tagList]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
{chatConfigType === ChatConfigType.TAG && (
|
{chatConfigType === TransType.TAG && (
|
||||||
<FormItem
|
<FormItem
|
||||||
name={['queryConfig', defaultConfigKeyMap[ChatConfigType.TAG], 'defaultDisplayInfo']}
|
name={['queryConfig', defaultConfigKeyMap[TransType.TAG], 'defaultDisplayInfo']}
|
||||||
label="圈选结果展示字段"
|
label="圈选结果展示字段"
|
||||||
getValueFromEvent={(value, items) => {
|
getValueFromEvent={(value, items) => {
|
||||||
const result: { dimensionIds: number[]; metricIds: number[] } = {
|
const result: { tagIds: number[] } = {
|
||||||
dimensionIds: [],
|
tagIds: [],
|
||||||
metricIds: [],
|
|
||||||
};
|
};
|
||||||
items.forEach((item: any) => {
|
items.forEach((item: any) => {
|
||||||
if (item.transType === TransType.DIMENSION) {
|
result.tagIds.push(item.id);
|
||||||
result.dimensionIds.push(item.id);
|
|
||||||
}
|
|
||||||
if (item.transType === TransType.METRIC) {
|
|
||||||
result.metricIds.push(item.id);
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
return result;
|
return result;
|
||||||
}}
|
}}
|
||||||
getValueProps={(value) => {
|
getValueProps={(value) => {
|
||||||
const { dimensionIds, metricIds } = value || {};
|
const { tagIds } = value || {};
|
||||||
const dimensionValues = Array.isArray(dimensionIds)
|
const tagValues = Array.isArray(tagIds)
|
||||||
? dimensionIds.map((id: number) => {
|
? tagIds.map((id: number) => {
|
||||||
return wrapperTransTypeAndId(TransType.DIMENSION, id);
|
return wrapperTransTypeAndId(TransType.TAG, id);
|
||||||
})
|
|
||||||
: [];
|
|
||||||
const metricValues = Array.isArray(metricIds)
|
|
||||||
? metricIds.map((id: number) => {
|
|
||||||
return wrapperTransTypeAndId(TransType.METRIC, id);
|
|
||||||
})
|
})
|
||||||
: [];
|
: [];
|
||||||
return {
|
return {
|
||||||
value: [...dimensionValues, ...metricValues],
|
value: [...tagValues],
|
||||||
};
|
};
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
@@ -161,7 +131,7 @@ const DefaultSettingForm: ForwardRefRenderFunction<any, Props> = (
|
|||||||
}
|
}
|
||||||
>
|
>
|
||||||
<Input.Group compact>
|
<Input.Group compact>
|
||||||
{chatConfigType === ChatConfigType.TAG ? (
|
{chatConfigType === TransType.TAG ? (
|
||||||
<span
|
<span
|
||||||
style={{
|
style={{
|
||||||
display: 'inline-block',
|
display: 'inline-block',
|
||||||
|
|||||||
@@ -84,6 +84,7 @@ const ViewCreateFormModal: React.FC<ModelCreateFormModalProps> = ({
|
|||||||
const queryTagList = async (modelId: number) => {
|
const queryTagList = async (modelId: number) => {
|
||||||
const { code, data, msg } = await getTagList({
|
const { code, data, msg } = await getTagList({
|
||||||
modelIds: [modelId],
|
modelIds: [modelId],
|
||||||
|
pageSize: 9999,
|
||||||
});
|
});
|
||||||
|
|
||||||
const { list } = data || {};
|
const { list } = data || {};
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ type Props = {
|
|||||||
const ViewModelConfigTransfer: React.FC<Props> = forwardRef(
|
const ViewModelConfigTransfer: React.FC<Props> = forwardRef(
|
||||||
(
|
(
|
||||||
{
|
{
|
||||||
queryType = 'METRIC',
|
queryType = TransType.METRIC,
|
||||||
viewItem,
|
viewItem,
|
||||||
modelItem,
|
modelItem,
|
||||||
dimensionList,
|
dimensionList,
|
||||||
@@ -138,7 +138,7 @@ const ViewModelConfigTransfer: React.FC<Props> = forwardRef(
|
|||||||
idList.push(id);
|
idList.push(id);
|
||||||
viewConfigMap[id] = { ...item };
|
viewConfigMap[id] = { ...item };
|
||||||
|
|
||||||
if (queryType === 'METRIC') {
|
if (queryType === TransType.METRIC) {
|
||||||
if (Array.isArray(metrics)) {
|
if (Array.isArray(metrics)) {
|
||||||
metrics.forEach((metricId: number) => {
|
metrics.forEach((metricId: number) => {
|
||||||
transferKeys.push(wrapperTransTypeAndId(TransType.METRIC, metricId));
|
transferKeys.push(wrapperTransTypeAndId(TransType.METRIC, metricId));
|
||||||
@@ -150,7 +150,7 @@ const ViewModelConfigTransfer: React.FC<Props> = forwardRef(
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (queryType === 'TAG') {
|
if (queryType === TransType.TAG) {
|
||||||
if (Array.isArray(tagIds)) {
|
if (Array.isArray(tagIds)) {
|
||||||
tagIds.forEach((tagId: number) => {
|
tagIds.forEach((tagId: number) => {
|
||||||
transferKeys.push(wrapperTransTypeAndId(TransType.TAG, tagId));
|
transferKeys.push(wrapperTransTypeAndId(TransType.TAG, tagId));
|
||||||
@@ -164,7 +164,7 @@ const ViewModelConfigTransfer: React.FC<Props> = forwardRef(
|
|||||||
}, [queryType]);
|
}, [queryType]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (queryType !== 'METRIC') {
|
if (queryType !== TransType.METRIC) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (!dimensionList || !metricList) {
|
if (!dimensionList || !metricList) {
|
||||||
@@ -190,7 +190,7 @@ const ViewModelConfigTransfer: React.FC<Props> = forwardRef(
|
|||||||
}, [queryType, modelItem, dimensionList, metricList]);
|
}, [queryType, modelItem, dimensionList, metricList]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (queryType !== 'TAG') {
|
if (queryType !== TransType.TAG) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (!tagList) {
|
if (!tagList) {
|
||||||
@@ -213,7 +213,7 @@ const ViewModelConfigTransfer: React.FC<Props> = forwardRef(
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<div style={{ display: queryType === 'TAG' ? 'none' : 'block' }}>
|
<div style={{ display: queryType === TransType.TAG ? 'none' : 'block' }}>
|
||||||
<DimensionMetricTransferModal
|
<DimensionMetricTransferModal
|
||||||
toolbarSolt={toolbarSolt}
|
toolbarSolt={toolbarSolt}
|
||||||
modelId={modelItem?.id}
|
modelId={modelItem?.id}
|
||||||
@@ -245,7 +245,7 @@ const ViewModelConfigTransfer: React.FC<Props> = forwardRef(
|
|||||||
onCancel={() => {}}
|
onCancel={() => {}}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div style={{ display: queryType !== 'TAG' ? 'none' : 'block' }}>
|
<div style={{ display: queryType !== TransType.TAG ? 'none' : 'block' }}>
|
||||||
<TagTransferModal
|
<TagTransferModal
|
||||||
toolbarSolt={toolbarSolt}
|
toolbarSolt={toolbarSolt}
|
||||||
modelId={modelItem?.id}
|
modelId={modelItem?.id}
|
||||||
|
|||||||
@@ -3,12 +3,13 @@ import { Form, Button, Modal, Input } from 'antd';
|
|||||||
import styles from '../style.less';
|
import styles from '../style.less';
|
||||||
import { message } from 'antd';
|
import { message } from 'antd';
|
||||||
import { formLayout } from '@/components/FormHelper/utils';
|
import { formLayout } from '@/components/FormHelper/utils';
|
||||||
import { createView, updateView, getDimensionList, queryMetric } from '../../service';
|
import { createView, updateView, getDimensionList, queryMetric, getTagList } from '../../service';
|
||||||
import { ISemantic } from '../../data';
|
import { ISemantic } from '../../data';
|
||||||
import DefaultSettingForm from './DefaultSettingForm';
|
import DefaultSettingForm from './DefaultSettingForm';
|
||||||
import { isArrayOfValues } from '@/utils/utils';
|
import { isArrayOfValues } from '@/utils/utils';
|
||||||
import ProCard from '@ant-design/pro-card';
|
import ProCard from '@ant-design/pro-card';
|
||||||
import { ChatConfigType } from '../../enum';
|
import { TransType } from '../../enum';
|
||||||
|
import { number } from 'echarts';
|
||||||
|
|
||||||
export type ModelCreateFormModalProps = {
|
export type ModelCreateFormModalProps = {
|
||||||
domainId: number;
|
domainId: number;
|
||||||
@@ -31,22 +32,40 @@ const ViewSearchFormModal: React.FC<ModelCreateFormModalProps> = ({
|
|||||||
|
|
||||||
const [dimensionList, setDimensionList] = useState<ISemantic.IDimensionItem[]>();
|
const [dimensionList, setDimensionList] = useState<ISemantic.IDimensionItem[]>();
|
||||||
const [metricList, setMetricList] = useState<ISemantic.IMetricItem[]>();
|
const [metricList, setMetricList] = useState<ISemantic.IMetricItem[]>();
|
||||||
|
const [tagList, setTagList] = useState<ISemantic.ITagItem[]>();
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const dataSetModelConfigs = viewItem?.dataSetDetail?.dataSetModelConfigs;
|
const dataSetModelConfigs = viewItem?.dataSetDetail?.dataSetModelConfigs;
|
||||||
if (Array.isArray(dataSetModelConfigs)) {
|
if (Array.isArray(dataSetModelConfigs)) {
|
||||||
const allMetrics: number[] = [];
|
const allMetrics: number[] = [];
|
||||||
const allDimensions: number[] = [];
|
const allDimensions: number[] = [];
|
||||||
|
const allTags: number[] = [];
|
||||||
dataSetModelConfigs.forEach((item: ISemantic.IViewModelConfigItem) => {
|
dataSetModelConfigs.forEach((item: ISemantic.IViewModelConfigItem) => {
|
||||||
const { metrics, dimensions } = item;
|
const { metrics, dimensions, tagIds } = item;
|
||||||
allMetrics.push(...metrics);
|
allMetrics.push(...metrics);
|
||||||
allDimensions.push(...dimensions);
|
allDimensions.push(...dimensions);
|
||||||
|
allTags.push(...tagIds);
|
||||||
});
|
});
|
||||||
queryDimensionListByIds(allDimensions);
|
queryDimensionListByIds(allDimensions);
|
||||||
queryMetricListByIds(allMetrics);
|
queryMetricListByIds(allMetrics);
|
||||||
|
queryTagListByIds(allTags);
|
||||||
}
|
}
|
||||||
}, [viewItem]);
|
}, [viewItem]);
|
||||||
|
|
||||||
|
const queryTagListByIds = async (ids: number[]) => {
|
||||||
|
const { code, data, msg } = await getTagList({
|
||||||
|
ids,
|
||||||
|
});
|
||||||
|
|
||||||
|
const { list } = data || {};
|
||||||
|
if (code === 200) {
|
||||||
|
setTagList(list);
|
||||||
|
} else {
|
||||||
|
message.error(msg);
|
||||||
|
setTagList([]);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
const queryDimensionListByIds = async (ids: number[]) => {
|
const queryDimensionListByIds = async (ids: number[]) => {
|
||||||
if (!isArrayOfValues(ids)) {
|
if (!isArrayOfValues(ids)) {
|
||||||
setDimensionList([]);
|
setDimensionList([]);
|
||||||
@@ -110,23 +129,22 @@ const ViewSearchFormModal: React.FC<ModelCreateFormModalProps> = ({
|
|||||||
const renderContent = () => {
|
const renderContent = () => {
|
||||||
return (
|
return (
|
||||||
<div className={styles.viewSearchFormContainer}>
|
<div className={styles.viewSearchFormContainer}>
|
||||||
|
{viewItem?.queryType === TransType.METRIC && (
|
||||||
<ProCard title="指标模式" style={{ marginBottom: 10, borderBottom: '1px solid #eee' }}>
|
<ProCard title="指标模式" style={{ marginBottom: 10, borderBottom: '1px solid #eee' }}>
|
||||||
<DefaultSettingForm
|
<DefaultSettingForm
|
||||||
form={form}
|
form={form}
|
||||||
dimensionList={dimensionList}
|
dimensionList={dimensionList}
|
||||||
metricList={metricList}
|
metricList={metricList}
|
||||||
chatConfigType={ChatConfigType.METRIC}
|
chatConfigType={TransType.METRIC}
|
||||||
/>
|
/>
|
||||||
</ProCard>
|
</ProCard>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{viewItem?.queryType === TransType.TAG && (
|
||||||
<ProCard title="标签模式">
|
<ProCard title="标签模式">
|
||||||
<DefaultSettingForm
|
<DefaultSettingForm form={form} tagList={tagList} chatConfigType={TransType.TAG} />
|
||||||
form={form}
|
|
||||||
dimensionList={dimensionList}
|
|
||||||
metricList={metricList}
|
|
||||||
chatConfigType={ChatConfigType.TAG}
|
|
||||||
/>
|
|
||||||
</ProCard>
|
</ProCard>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -184,7 +184,7 @@ const DimensionValueSettingModal: React.FC<CreateFormProps> = ({
|
|||||||
{
|
{
|
||||||
label: '维度值设置',
|
label: '维度值设置',
|
||||||
key: 'setting',
|
key: 'setting',
|
||||||
children: <DimensionValueSettingForm dimensionItem={dimensionItem} />,
|
children: <DimensionValueSettingForm dataItem={dimensionItem} />,
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,12 @@ import { Form, Switch, Space, Button, Tooltip, message, Select } from 'antd';
|
|||||||
import FormItemTitle from '@/components/FormHelper/FormItemTitle';
|
import FormItemTitle from '@/components/FormHelper/FormItemTitle';
|
||||||
import { RedoOutlined, InfoCircleOutlined } from '@ant-design/icons';
|
import { RedoOutlined, InfoCircleOutlined } from '@ant-design/icons';
|
||||||
import { formLayout } from '@/components/FormHelper/utils';
|
import { formLayout } from '@/components/FormHelper/utils';
|
||||||
import { DictTaskState, KnowledgeConfigTypeEnum, KnowledgeConfigStatusEnum } from '../../enum';
|
import {
|
||||||
|
DictTaskState,
|
||||||
|
KnowledgeConfigTypeEnum,
|
||||||
|
KnowledgeConfigStatusEnum,
|
||||||
|
KnowledgeConfigTypeWordingMap,
|
||||||
|
} from '../../enum';
|
||||||
import {
|
import {
|
||||||
searchKnowledgeConfigQuery,
|
searchKnowledgeConfigQuery,
|
||||||
searchDictLatestTaskList,
|
searchDictLatestTaskList,
|
||||||
@@ -19,14 +24,15 @@ import styles from '../style.less';
|
|||||||
import CommonEditList from '../../components/CommonEditList';
|
import CommonEditList from '../../components/CommonEditList';
|
||||||
|
|
||||||
type Props = {
|
type Props = {
|
||||||
dimensionItem: ISemantic.IDimensionItem;
|
dataItem: ISemantic.IDimensionItem | ISemantic.ITagItem;
|
||||||
|
type?: KnowledgeConfigTypeEnum;
|
||||||
onSubmit?: () => void;
|
onSubmit?: () => void;
|
||||||
};
|
};
|
||||||
|
|
||||||
const FormItem = Form.Item;
|
const FormItem = Form.Item;
|
||||||
|
|
||||||
const DimensionValueSettingForm: ForwardRefRenderFunction<any, Props> = (
|
const DimensionValueSettingForm: ForwardRefRenderFunction<any, Props> = (
|
||||||
{ dimensionItem },
|
{ dataItem, type = KnowledgeConfigTypeEnum.DIMENSION },
|
||||||
ref,
|
ref,
|
||||||
) => {
|
) => {
|
||||||
const [form] = Form.useForm();
|
const [form] = Form.useForm();
|
||||||
@@ -56,7 +62,7 @@ const DimensionValueSettingForm: ForwardRefRenderFunction<any, Props> = (
|
|||||||
if (taskItemState?.taskStatus) {
|
if (taskItemState?.taskStatus) {
|
||||||
return (
|
return (
|
||||||
<span style={{ color: '#5493ff', fontWeight: 'bold' }}>
|
<span style={{ color: '#5493ff', fontWeight: 'bold' }}>
|
||||||
{DictTaskState[taskItemState.taskStatus] || '未知状态'}
|
{DictTaskState[taskItemState?.taskStatus || 'unknown']}
|
||||||
</span>
|
</span>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -66,8 +72,8 @@ const DimensionValueSettingForm: ForwardRefRenderFunction<any, Props> = (
|
|||||||
const searchKnowledgeConfig = async () => {
|
const searchKnowledgeConfig = async () => {
|
||||||
setRefreshLoading(true);
|
setRefreshLoading(true);
|
||||||
const { code, data } = await searchKnowledgeConfigQuery({
|
const { code, data } = await searchKnowledgeConfigQuery({
|
||||||
type: KnowledgeConfigTypeEnum.DIMENSION,
|
type,
|
||||||
itemId: dimensionItem.id,
|
itemId: dataItem.id,
|
||||||
});
|
});
|
||||||
|
|
||||||
setRefreshLoading(false);
|
setRefreshLoading(false);
|
||||||
@@ -91,15 +97,15 @@ const DimensionValueSettingForm: ForwardRefRenderFunction<any, Props> = (
|
|||||||
form.setFieldsValue({
|
form.setFieldsValue({
|
||||||
...defaultKnowledgeConfig,
|
...defaultKnowledgeConfig,
|
||||||
});
|
});
|
||||||
createDictConfigQuery(dimensionItem, defaultKnowledgeConfig);
|
createDictConfigQuery(dataItem, defaultKnowledgeConfig);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const queryDictLatestTaskList = async () => {
|
const queryDictLatestTaskList = async () => {
|
||||||
setRefreshLoading(true);
|
setRefreshLoading(true);
|
||||||
const { code, data } = await searchDictLatestTaskList({
|
const { code, data } = await searchDictLatestTaskList({
|
||||||
type: KnowledgeConfigTypeEnum.DIMENSION,
|
type,
|
||||||
itemId: dimensionItem.id,
|
itemId: dataItem.id,
|
||||||
});
|
});
|
||||||
setRefreshLoading(false);
|
setRefreshLoading(false);
|
||||||
if (code !== 200) {
|
if (code !== 200) {
|
||||||
@@ -117,7 +123,7 @@ const DimensionValueSettingForm: ForwardRefRenderFunction<any, Props> = (
|
|||||||
|
|
||||||
const getFormValidateFields = async () => {
|
const getFormValidateFields = async () => {
|
||||||
const fields = await form.validateFields();
|
const fields = await form.validateFields();
|
||||||
const fieldValue = Object.keys(fields).reduce((formField, key: string) => {
|
const fieldValue = Object.keys(fields).reduce((formField: any, key: string) => {
|
||||||
const targetValue = fields[key];
|
const targetValue = fields[key];
|
||||||
if (exchangeFields.includes(key)) {
|
if (exchangeFields.includes(key)) {
|
||||||
if (isString(targetValue)) {
|
if (isString(targetValue)) {
|
||||||
@@ -144,7 +150,7 @@ const DimensionValueSettingForm: ForwardRefRenderFunction<any, Props> = (
|
|||||||
config: ISemantic.IDictKnowledgeConfigItemConfig,
|
config: ISemantic.IDictKnowledgeConfigItemConfig,
|
||||||
) => {
|
) => {
|
||||||
const { code, data } = await createDictConfig({
|
const { code, data } = await createDictConfig({
|
||||||
type: KnowledgeConfigTypeEnum.DIMENSION,
|
type,
|
||||||
itemId: dimension.id,
|
itemId: dimension.id,
|
||||||
config,
|
config,
|
||||||
status: 1,
|
status: 1,
|
||||||
@@ -160,7 +166,7 @@ const DimensionValueSettingForm: ForwardRefRenderFunction<any, Props> = (
|
|||||||
const createDictTaskQuery = async (dimension: ISemantic.IDimensionItem) => {
|
const createDictTaskQuery = async (dimension: ISemantic.IDimensionItem) => {
|
||||||
setImportDictState(true);
|
setImportDictState(true);
|
||||||
const { code } = await createDictTask({
|
const { code } = await createDictTask({
|
||||||
type: KnowledgeConfigTypeEnum.DIMENSION,
|
type,
|
||||||
itemId: dimension.id,
|
itemId: dimension.id,
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -199,7 +205,7 @@ const DimensionValueSettingForm: ForwardRefRenderFunction<any, Props> = (
|
|||||||
const deleteDictTaskQuery = async (dimension: ISemantic.IDimensionItem) => {
|
const deleteDictTaskQuery = async (dimension: ISemantic.IDimensionItem) => {
|
||||||
setDeleteLoading(true);
|
setDeleteLoading(true);
|
||||||
const { code } = await deleteDictTask({
|
const { code } = await deleteDictTask({
|
||||||
type: KnowledgeConfigTypeEnum.DIMENSION,
|
type,
|
||||||
itemId: dimension.id,
|
itemId: dimension.id,
|
||||||
});
|
});
|
||||||
setDeleteLoading(false);
|
setDeleteLoading(false);
|
||||||
@@ -225,7 +231,9 @@ const DimensionValueSettingForm: ForwardRefRenderFunction<any, Props> = (
|
|||||||
title={
|
title={
|
||||||
<>
|
<>
|
||||||
<Space>
|
<Space>
|
||||||
<span style={{ fontSize: 16 }}>维度值可见</span>
|
<span style={{ fontSize: 16 }}>
|
||||||
|
{KnowledgeConfigTypeWordingMap[type]}值可见
|
||||||
|
</span>
|
||||||
<Switch
|
<Switch
|
||||||
defaultChecked
|
defaultChecked
|
||||||
size="small"
|
size="small"
|
||||||
@@ -242,20 +250,20 @@ const DimensionValueSettingForm: ForwardRefRenderFunction<any, Props> = (
|
|||||||
</Space>
|
</Space>
|
||||||
</>
|
</>
|
||||||
}
|
}
|
||||||
subTitle={'设置可见后,维度值将在搜索时可以被联想出来'}
|
subTitle={`设置可见后,${KnowledgeConfigTypeWordingMap[type]}值将在搜索时可以被联想出来`}
|
||||||
/>
|
/>
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
{dimensionVisible && (
|
{dimensionVisible && (
|
||||||
<Space size={20} style={{ marginBottom: 20 }}>
|
<Space size={20} style={{ marginBottom: 20 }}>
|
||||||
<Tooltip title="立即将维度值导入字典">
|
<Tooltip title={`立即将${KnowledgeConfigTypeWordingMap[type]}值导入字典`}>
|
||||||
<Button
|
<Button
|
||||||
type="link"
|
type="link"
|
||||||
size="small"
|
size="small"
|
||||||
style={{ padding: 0 }}
|
style={{ padding: 0 }}
|
||||||
disabled={importDictState}
|
disabled={importDictState}
|
||||||
onClick={(event) => {
|
onClick={(event) => {
|
||||||
createDictTaskQuery(dimensionItem);
|
createDictTaskQuery(dataItem);
|
||||||
setTaskItemState({
|
setTaskItemState({
|
||||||
...(taskItemState || ({} as ISemantic.IDictKnowledgeTaskItem)),
|
...(taskItemState || ({} as ISemantic.IDictKnowledgeTaskItem)),
|
||||||
taskStatus: 'running',
|
taskStatus: 'running',
|
||||||
@@ -282,7 +290,7 @@ const DimensionValueSettingForm: ForwardRefRenderFunction<any, Props> = (
|
|||||||
>
|
>
|
||||||
导入状态
|
导入状态
|
||||||
<Space>
|
<Space>
|
||||||
<RedoOutlined />: <span>{taskRender(dimensionItem)}</span>
|
<RedoOutlined />: <span>{taskRender(dataItem)}</span>
|
||||||
</Space>
|
</Space>
|
||||||
</Button>
|
</Button>
|
||||||
</Space>
|
</Space>
|
||||||
@@ -295,7 +303,7 @@ const DimensionValueSettingForm: ForwardRefRenderFunction<any, Props> = (
|
|||||||
disabled={taskItemState?.taskStatus === 'running'}
|
disabled={taskItemState?.taskStatus === 'running'}
|
||||||
loading={deleteLoading}
|
loading={deleteLoading}
|
||||||
onClick={(event) => {
|
onClick={(event) => {
|
||||||
deleteDictTaskQuery(dimensionItem);
|
deleteDictTaskQuery(dataItem);
|
||||||
setTaskItemState({
|
setTaskItemState({
|
||||||
...(taskItemState || ({} as ISemantic.IDictKnowledgeTaskItem)),
|
...(taskItemState || ({} as ISemantic.IDictKnowledgeTaskItem)),
|
||||||
taskStatus: '',
|
taskStatus: '',
|
||||||
@@ -328,7 +336,7 @@ const DimensionValueSettingForm: ForwardRefRenderFunction<any, Props> = (
|
|||||||
marginBottom: 20,
|
marginBottom: 20,
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<span style={{ flex: 'auto' }}>维度值过滤</span>
|
<span style={{ flex: 'auto' }}>{KnowledgeConfigTypeWordingMap[type]}值过滤</span>
|
||||||
<span style={{ marginLeft: 'auto' }}>
|
<span style={{ marginLeft: 'auto' }}>
|
||||||
<Button
|
<Button
|
||||||
type="primary"
|
type="primary"
|
||||||
@@ -345,7 +353,7 @@ const DimensionValueSettingForm: ForwardRefRenderFunction<any, Props> = (
|
|||||||
<FormItem name="blackList" label="黑名单">
|
<FormItem name="blackList" label="黑名单">
|
||||||
<Select
|
<Select
|
||||||
mode="tags"
|
mode="tags"
|
||||||
placeholder="输入维度值后回车确认,多别名输入、复制粘贴支持英文逗号自动分隔"
|
placeholder={`输入${KnowledgeConfigTypeWordingMap[type]}值后回车确认,多别名输入、复制粘贴支持英文逗号自动分隔`}
|
||||||
tokenSeparators={[',']}
|
tokenSeparators={[',']}
|
||||||
maxTagCount={9}
|
maxTagCount={9}
|
||||||
/>
|
/>
|
||||||
@@ -354,7 +362,7 @@ const DimensionValueSettingForm: ForwardRefRenderFunction<any, Props> = (
|
|||||||
<FormItem name="whiteList" label="白名单">
|
<FormItem name="whiteList" label="白名单">
|
||||||
<Select
|
<Select
|
||||||
mode="tags"
|
mode="tags"
|
||||||
placeholder="输入维度值后回车确认,多别名输入、复制粘贴支持英文逗号自动分隔"
|
placeholder={`输入${KnowledgeConfigTypeWordingMap[type]}值后回车确认,多别名输入、复制粘贴支持英文逗号自动分隔`}
|
||||||
tokenSeparators={[',']}
|
tokenSeparators={[',']}
|
||||||
maxTagCount={9}
|
maxTagCount={9}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -47,6 +47,7 @@ export enum OperatorEnum {
|
|||||||
|
|
||||||
export enum KnowledgeConfigTypeEnum {
|
export enum KnowledgeConfigTypeEnum {
|
||||||
DIMENSION = 'DIMENSION',
|
DIMENSION = 'DIMENSION',
|
||||||
|
TAG = 'TAG',
|
||||||
METRIC = 'METRIC',
|
METRIC = 'METRIC',
|
||||||
DOMAIN = 'DOMAIN',
|
DOMAIN = 'DOMAIN',
|
||||||
ENTITY = 'ENTITY',
|
ENTITY = 'ENTITY',
|
||||||
@@ -55,6 +56,17 @@ export enum KnowledgeConfigTypeEnum {
|
|||||||
UNKNOWN = 'UNKNOWN',
|
UNKNOWN = 'UNKNOWN',
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export const KnowledgeConfigTypeWordingMap = {
|
||||||
|
[KnowledgeConfigTypeEnum.DIMENSION]: '维度',
|
||||||
|
[KnowledgeConfigTypeEnum.TAG]: '标签',
|
||||||
|
[KnowledgeConfigTypeEnum.METRIC]: '指标',
|
||||||
|
[KnowledgeConfigTypeEnum.DOMAIN]: '域',
|
||||||
|
[KnowledgeConfigTypeEnum.ENTITY]: '实体',
|
||||||
|
[KnowledgeConfigTypeEnum.VIEW]: '视图',
|
||||||
|
[KnowledgeConfigTypeEnum.MODEL]: '模型',
|
||||||
|
[KnowledgeConfigTypeEnum.UNKNOWN]: '未知',
|
||||||
|
};
|
||||||
|
|
||||||
export enum KnowledgeConfigStatusEnum {
|
export enum KnowledgeConfigStatusEnum {
|
||||||
ONLINE = 'ONLINE',
|
ONLINE = 'ONLINE',
|
||||||
OFFLINE = 'OFFLINE',
|
OFFLINE = 'OFFLINE',
|
||||||
|
|||||||
@@ -615,7 +615,7 @@ export function deleteView(viewId: number): Promise<any> {
|
|||||||
export function getTagList(data: any): Promise<any> {
|
export function getTagList(data: any): Promise<any> {
|
||||||
return request(`${process.env.API_BASE_URL}tag/queryTag`, {
|
return request(`${process.env.API_BASE_URL}tag/queryTag`, {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
data,
|
data: { pageSize: 9999, ...data },
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user