mirror of
https://github.com/tencentmusic/supersonic.git
synced 2025-12-15 06:27:21 +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:
tristanliu
@@ -7,18 +7,15 @@ import { Form, Input, Select, InputNumber } from 'antd';
|
||||
import { wrapperTransTypeAndId } from '../../utils';
|
||||
|
||||
import { ISemantic } from '../../data';
|
||||
import { ChatConfigType, TransType, SemanticNodeType } from '../../enum';
|
||||
import { TransType, SemanticNodeType } from '../../enum';
|
||||
import TransTypeTag from '../../components/TransTypeTag';
|
||||
|
||||
type Props = {
|
||||
// entityData: any;
|
||||
// chatConfigKey: string;
|
||||
chatConfigType: ChatConfigType.TAG | ChatConfigType.METRIC;
|
||||
chatConfigType: TransType;
|
||||
metricList?: ISemantic.IMetricItem[];
|
||||
dimensionList?: ISemantic.IDimensionItem[];
|
||||
tagList?: ISemantic.ITagItem[];
|
||||
form: any;
|
||||
// domainId: number;
|
||||
// onSubmit: (params?: any) => void;
|
||||
};
|
||||
|
||||
const FormItem = Form.Item;
|
||||
@@ -31,7 +28,7 @@ const formDefaultValue = {
|
||||
};
|
||||
|
||||
const DefaultSettingForm: ForwardRefRenderFunction<any, Props> = (
|
||||
{ metricList, dimensionList, chatConfigType, form },
|
||||
{ metricList, dimensionList, tagList, chatConfigType, form },
|
||||
ref,
|
||||
) => {
|
||||
const [dataItemListOptions, setDataItemListOptions] = useState<any>([]);
|
||||
@@ -54,84 +51,57 @@ const DefaultSettingForm: ForwardRefRenderFunction<any, Props> = (
|
||||
}
|
||||
}, []);
|
||||
|
||||
const defaultConfigKeyMap = {
|
||||
[ChatConfigType.TAG]: 'tagTypeDefaultConfig',
|
||||
[ChatConfigType.METRIC]: 'metricTypeDefaultConfig',
|
||||
const defaultConfigKeyMap: any = {
|
||||
[TransType.TAG]: 'tagTypeDefaultConfig',
|
||||
[TransType.METRIC]: 'metricTypeDefaultConfig',
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
if (Array.isArray(dimensionList) && Array.isArray(metricList)) {
|
||||
const dimensionEnum = dimensionList.map((item: ISemantic.IDimensionItem) => {
|
||||
if (Array.isArray(tagList)) {
|
||||
const tagEnum = tagList.map((item: ISemantic.ITagItem) => {
|
||||
const { name, id, bizName } = item;
|
||||
return {
|
||||
name,
|
||||
label: (
|
||||
<>
|
||||
<TransTypeTag type={SemanticNodeType.DIMENSION} />
|
||||
<TransTypeTag type={SemanticNodeType.TAG} />
|
||||
{name}
|
||||
</>
|
||||
),
|
||||
value: wrapperTransTypeAndId(TransType.DIMENSION, id),
|
||||
value: wrapperTransTypeAndId(TransType.TAG, id),
|
||||
bizName,
|
||||
id,
|
||||
transType: TransType.DIMENSION,
|
||||
transType: TransType.TAG,
|
||||
};
|
||||
});
|
||||
const metricEnum = metricList.map((item: ISemantic.IMetricItem) => {
|
||||
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]);
|
||||
setDataItemListOptions([...tagEnum]);
|
||||
}
|
||||
}, [dimensionList, metricList]);
|
||||
}, [tagList]);
|
||||
|
||||
return (
|
||||
<>
|
||||
{chatConfigType === ChatConfigType.TAG && (
|
||||
{chatConfigType === TransType.TAG && (
|
||||
<FormItem
|
||||
name={['queryConfig', defaultConfigKeyMap[ChatConfigType.TAG], 'defaultDisplayInfo']}
|
||||
name={['queryConfig', defaultConfigKeyMap[TransType.TAG], 'defaultDisplayInfo']}
|
||||
label="圈选结果展示字段"
|
||||
getValueFromEvent={(value, items) => {
|
||||
const result: { dimensionIds: number[]; metricIds: number[] } = {
|
||||
dimensionIds: [],
|
||||
metricIds: [],
|
||||
const result: { tagIds: number[] } = {
|
||||
tagIds: [],
|
||||
};
|
||||
items.forEach((item: any) => {
|
||||
if (item.transType === TransType.DIMENSION) {
|
||||
result.dimensionIds.push(item.id);
|
||||
}
|
||||
if (item.transType === TransType.METRIC) {
|
||||
result.metricIds.push(item.id);
|
||||
}
|
||||
result.tagIds.push(item.id);
|
||||
});
|
||||
return result;
|
||||
}}
|
||||
getValueProps={(value) => {
|
||||
const { dimensionIds, metricIds } = value || {};
|
||||
const dimensionValues = Array.isArray(dimensionIds)
|
||||
? dimensionIds.map((id: number) => {
|
||||
return wrapperTransTypeAndId(TransType.DIMENSION, id);
|
||||
})
|
||||
: [];
|
||||
const metricValues = Array.isArray(metricIds)
|
||||
? metricIds.map((id: number) => {
|
||||
return wrapperTransTypeAndId(TransType.METRIC, id);
|
||||
const { tagIds } = value || {};
|
||||
const tagValues = Array.isArray(tagIds)
|
||||
? tagIds.map((id: number) => {
|
||||
return wrapperTransTypeAndId(TransType.TAG, id);
|
||||
})
|
||||
: [];
|
||||
return {
|
||||
value: [...dimensionValues, ...metricValues],
|
||||
value: [...tagValues],
|
||||
};
|
||||
}}
|
||||
>
|
||||
@@ -161,7 +131,7 @@ const DefaultSettingForm: ForwardRefRenderFunction<any, Props> = (
|
||||
}
|
||||
>
|
||||
<Input.Group compact>
|
||||
{chatConfigType === ChatConfigType.TAG ? (
|
||||
{chatConfigType === TransType.TAG ? (
|
||||
<span
|
||||
style={{
|
||||
display: 'inline-block',
|
||||
|
||||
@@ -84,6 +84,7 @@ const ViewCreateFormModal: React.FC<ModelCreateFormModalProps> = ({
|
||||
const queryTagList = async (modelId: number) => {
|
||||
const { code, data, msg } = await getTagList({
|
||||
modelIds: [modelId],
|
||||
pageSize: 9999,
|
||||
});
|
||||
|
||||
const { list } = data || {};
|
||||
|
||||
@@ -21,7 +21,7 @@ type Props = {
|
||||
const ViewModelConfigTransfer: React.FC<Props> = forwardRef(
|
||||
(
|
||||
{
|
||||
queryType = 'METRIC',
|
||||
queryType = TransType.METRIC,
|
||||
viewItem,
|
||||
modelItem,
|
||||
dimensionList,
|
||||
@@ -138,7 +138,7 @@ const ViewModelConfigTransfer: React.FC<Props> = forwardRef(
|
||||
idList.push(id);
|
||||
viewConfigMap[id] = { ...item };
|
||||
|
||||
if (queryType === 'METRIC') {
|
||||
if (queryType === TransType.METRIC) {
|
||||
if (Array.isArray(metrics)) {
|
||||
metrics.forEach((metricId: number) => {
|
||||
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)) {
|
||||
tagIds.forEach((tagId: number) => {
|
||||
transferKeys.push(wrapperTransTypeAndId(TransType.TAG, tagId));
|
||||
@@ -164,7 +164,7 @@ const ViewModelConfigTransfer: React.FC<Props> = forwardRef(
|
||||
}, [queryType]);
|
||||
|
||||
useEffect(() => {
|
||||
if (queryType !== 'METRIC') {
|
||||
if (queryType !== TransType.METRIC) {
|
||||
return;
|
||||
}
|
||||
if (!dimensionList || !metricList) {
|
||||
@@ -190,7 +190,7 @@ const ViewModelConfigTransfer: React.FC<Props> = forwardRef(
|
||||
}, [queryType, modelItem, dimensionList, metricList]);
|
||||
|
||||
useEffect(() => {
|
||||
if (queryType !== 'TAG') {
|
||||
if (queryType !== TransType.TAG) {
|
||||
return;
|
||||
}
|
||||
if (!tagList) {
|
||||
@@ -213,7 +213,7 @@ const ViewModelConfigTransfer: React.FC<Props> = forwardRef(
|
||||
|
||||
return (
|
||||
<>
|
||||
<div style={{ display: queryType === 'TAG' ? 'none' : 'block' }}>
|
||||
<div style={{ display: queryType === TransType.TAG ? 'none' : 'block' }}>
|
||||
<DimensionMetricTransferModal
|
||||
toolbarSolt={toolbarSolt}
|
||||
modelId={modelItem?.id}
|
||||
@@ -245,7 +245,7 @@ const ViewModelConfigTransfer: React.FC<Props> = forwardRef(
|
||||
onCancel={() => {}}
|
||||
/>
|
||||
</div>
|
||||
<div style={{ display: queryType !== 'TAG' ? 'none' : 'block' }}>
|
||||
<div style={{ display: queryType !== TransType.TAG ? 'none' : 'block' }}>
|
||||
<TagTransferModal
|
||||
toolbarSolt={toolbarSolt}
|
||||
modelId={modelItem?.id}
|
||||
|
||||
@@ -3,12 +3,13 @@ import { Form, Button, Modal, Input } from 'antd';
|
||||
import styles from '../style.less';
|
||||
import { message } from 'antd';
|
||||
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 DefaultSettingForm from './DefaultSettingForm';
|
||||
import { isArrayOfValues } from '@/utils/utils';
|
||||
import ProCard from '@ant-design/pro-card';
|
||||
import { ChatConfigType } from '../../enum';
|
||||
import { TransType } from '../../enum';
|
||||
import { number } from 'echarts';
|
||||
|
||||
export type ModelCreateFormModalProps = {
|
||||
domainId: number;
|
||||
@@ -31,22 +32,40 @@ const ViewSearchFormModal: React.FC<ModelCreateFormModalProps> = ({
|
||||
|
||||
const [dimensionList, setDimensionList] = useState<ISemantic.IDimensionItem[]>();
|
||||
const [metricList, setMetricList] = useState<ISemantic.IMetricItem[]>();
|
||||
const [tagList, setTagList] = useState<ISemantic.ITagItem[]>();
|
||||
|
||||
useEffect(() => {
|
||||
const dataSetModelConfigs = viewItem?.dataSetDetail?.dataSetModelConfigs;
|
||||
if (Array.isArray(dataSetModelConfigs)) {
|
||||
const allMetrics: number[] = [];
|
||||
const allDimensions: number[] = [];
|
||||
const allTags: number[] = [];
|
||||
dataSetModelConfigs.forEach((item: ISemantic.IViewModelConfigItem) => {
|
||||
const { metrics, dimensions } = item;
|
||||
const { metrics, dimensions, tagIds } = item;
|
||||
allMetrics.push(...metrics);
|
||||
allDimensions.push(...dimensions);
|
||||
allTags.push(...tagIds);
|
||||
});
|
||||
queryDimensionListByIds(allDimensions);
|
||||
queryMetricListByIds(allMetrics);
|
||||
queryTagListByIds(allTags);
|
||||
}
|
||||
}, [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[]) => {
|
||||
if (!isArrayOfValues(ids)) {
|
||||
setDimensionList([]);
|
||||
@@ -110,23 +129,22 @@ const ViewSearchFormModal: React.FC<ModelCreateFormModalProps> = ({
|
||||
const renderContent = () => {
|
||||
return (
|
||||
<div className={styles.viewSearchFormContainer}>
|
||||
<ProCard title="指标模式" style={{ marginBottom: 10, borderBottom: '1px solid #eee' }}>
|
||||
<DefaultSettingForm
|
||||
form={form}
|
||||
dimensionList={dimensionList}
|
||||
metricList={metricList}
|
||||
chatConfigType={ChatConfigType.METRIC}
|
||||
/>
|
||||
</ProCard>
|
||||
{viewItem?.queryType === TransType.METRIC && (
|
||||
<ProCard title="指标模式" style={{ marginBottom: 10, borderBottom: '1px solid #eee' }}>
|
||||
<DefaultSettingForm
|
||||
form={form}
|
||||
dimensionList={dimensionList}
|
||||
metricList={metricList}
|
||||
chatConfigType={TransType.METRIC}
|
||||
/>
|
||||
</ProCard>
|
||||
)}
|
||||
|
||||
<ProCard title="标签模式">
|
||||
<DefaultSettingForm
|
||||
form={form}
|
||||
dimensionList={dimensionList}
|
||||
metricList={metricList}
|
||||
chatConfigType={ChatConfigType.TAG}
|
||||
/>
|
||||
</ProCard>
|
||||
{viewItem?.queryType === TransType.TAG && (
|
||||
<ProCard title="标签模式">
|
||||
<DefaultSettingForm form={form} tagList={tagList} chatConfigType={TransType.TAG} />
|
||||
</ProCard>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user