mirror of
https://github.com/tencentmusic/supersonic.git
synced 2026-04-21 06:04:19 +08:00
[improvement][headless-fe] Added a connectivity test for large models in the system settings (#1723)
* [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. * [improvement][headless-fe] Sensitivity: Added bulk modification functionality. * [improvement][headless-fe] wording change * [improvement][headless-fe] Prompt configuration: Added the ability to configure prompts. * [improvement][headless-fe] Added the ability to configure embedding models. * [improvement][headless-fe] hidden configure embedding models. * [improvement][headless-fe] Connection test prompt update for large language model settings. * [improvement][headless-fe] add memory review config * [improvement][headless-fe] Rollback of data structure for large language model configuration. * [improvement][headless-fe] Added dependency relationships between various items in system configuration. * [improvement][headless-fe] Added password parsing to the generation rules of system settings. * [improvement][headless-fe] Added slider parsing to the generation rules of system settings. * [improvement][headless-fe] Optimized the logic for initializing values in system settings. * [improvement][headless-fe] Optimized the time format * [improvement][headless-fe] Unified the SQL generation method for data sets to ensure consistency and improve efficiency. * [improvement][headless-fe] Added support for data sets with non-partitioned time fields * [improvement][headless-fe] Added support for editing time formats in dimension settings * [improvement][headless-fe] Rolled back the time parameter in the metric details page to its previous state * [improvement][headless-fe] Fixed the issue with hidden field validation when editing dimensions * [improvement][headless-fe] Added a connectivity test for large models in the system settings --------- Co-authored-by: tristanliu <tristanliu@tencent.com>
This commit is contained in:
tristanliu
@@ -4,7 +4,7 @@ import { message, Button, Space, Popconfirm } from 'antd';
|
||||
import React, { useRef, useState, useEffect } from 'react';
|
||||
import { StatusEnum } from '../../enum';
|
||||
import { useModel } from '@umijs/max';
|
||||
import { deleteView, updateView, getViewList, getAllModelByDomainId } from '../../service';
|
||||
import { deleteView, updateView, getDataSetList, getAllModelByDomainId } from '../../service';
|
||||
import ViewCreateFormModal from './ViewCreateFormModal';
|
||||
import moment from 'moment';
|
||||
import styles from '../../components/style.less';
|
||||
@@ -13,15 +13,15 @@ import { ColumnsConfig } from '../../components/TableColumnRender';
|
||||
import ViewSearchFormModal from './ViewSearchFormModal';
|
||||
|
||||
type Props = {
|
||||
dataSetList: ISemantic.IDatasetItem[];
|
||||
disabledEdit?: boolean;
|
||||
modelList: ISemantic.IModelItem[];
|
||||
};
|
||||
|
||||
const DataSetTable: React.FC<Props> = ({ disabledEdit = false }) => {
|
||||
const DataSetTable: React.FC<Props> = ({ dataSetList, disabledEdit = false }) => {
|
||||
const domainModel = useModel('SemanticModel.domainData');
|
||||
const { selectDomainId } = domainModel;
|
||||
|
||||
const [viewItem, setViewItem] = useState<ISemantic.IViewItem>();
|
||||
const [viewItem, setViewItem] = useState<ISemantic.IDatasetItem>();
|
||||
const [saveLoading, setSaveLoading] = useState<boolean>(false);
|
||||
const [loading, setLoading] = useState<boolean>(false);
|
||||
const [createDataSourceModalOpen, setCreateDataSourceModalOpen] = useState(false);
|
||||
@@ -29,29 +29,33 @@ const DataSetTable: React.FC<Props> = ({ disabledEdit = false }) => {
|
||||
const [modelList, setModelList] = useState<ISemantic.IModelItem[]>([]);
|
||||
const actionRef = useRef<ActionType>();
|
||||
|
||||
const updateViewStatus = async (modelData: ISemantic.IViewItem) => {
|
||||
const updateViewStatus = async (modelData: ISemantic.IDatasetItem) => {
|
||||
setSaveLoading(true);
|
||||
const { code, msg } = await updateView({
|
||||
...modelData,
|
||||
});
|
||||
setSaveLoading(false);
|
||||
if (code === 200) {
|
||||
queryViewList();
|
||||
queryDataSetList();
|
||||
} else {
|
||||
message.error(msg);
|
||||
}
|
||||
};
|
||||
|
||||
const [viewList, setViewList] = useState([]);
|
||||
const [viewList, setViewList] = useState<ISemantic.IDatasetItem[]>(dataSetList);
|
||||
|
||||
useEffect(() => {
|
||||
queryViewList();
|
||||
setViewList(dataSetList);
|
||||
}, [dataSetList]);
|
||||
|
||||
useEffect(() => {
|
||||
// queryDataSetList();
|
||||
queryDomainAllModel();
|
||||
}, [selectDomainId]);
|
||||
|
||||
const queryViewList = async () => {
|
||||
const queryDataSetList = async () => {
|
||||
setLoading(true);
|
||||
const { code, data, msg } = await getViewList(selectDomainId);
|
||||
const { code, data, msg } = await getDataSetList(selectDomainId);
|
||||
setLoading(false);
|
||||
if (code === 200) {
|
||||
setViewList(data);
|
||||
@@ -175,7 +179,7 @@ const DataSetTable: React.FC<Props> = ({ disabledEdit = false }) => {
|
||||
onConfirm={async () => {
|
||||
const { code, msg } = await deleteView(record.id);
|
||||
if (code === 200) {
|
||||
queryViewList();
|
||||
queryDataSetList();
|
||||
} else {
|
||||
message.error(msg);
|
||||
}
|
||||
@@ -227,7 +231,7 @@ const DataSetTable: React.FC<Props> = ({ disabledEdit = false }) => {
|
||||
viewItem={viewItem}
|
||||
modelList={modelList}
|
||||
onSubmit={() => {
|
||||
queryViewList();
|
||||
queryDataSetList();
|
||||
setCreateDataSourceModalOpen(false);
|
||||
}}
|
||||
onCancel={() => {
|
||||
@@ -241,7 +245,7 @@ const DataSetTable: React.FC<Props> = ({ disabledEdit = false }) => {
|
||||
domainId={selectDomainId}
|
||||
viewItem={viewItem}
|
||||
onSubmit={() => {
|
||||
queryViewList();
|
||||
queryDataSetList();
|
||||
setSearchModalOpen(false);
|
||||
}}
|
||||
onCancel={() => {
|
||||
|
||||
@@ -1,24 +1,17 @@
|
||||
import { useEffect, useState, forwardRef, useImperativeHandle } from 'react';
|
||||
import { useEffect, forwardRef } from 'react';
|
||||
import type { ForwardRefRenderFunction } from 'react';
|
||||
import FormItemTitle from '@/components/FormHelper/FormItemTitle';
|
||||
|
||||
import { Form, Input, Select, InputNumber } from 'antd';
|
||||
|
||||
import { wrapperTransTypeAndId } from '../../utils';
|
||||
|
||||
import { ISemantic } from '../../data';
|
||||
import { ChatConfigType, TransType, SemanticNodeType } from '../../enum';
|
||||
import TransTypeTag from '../../components/TransTypeTag';
|
||||
import { ChatConfigType, DetailTypeDefaultConfig, TimeModeEnum, DatePeriod } from '../../enum';
|
||||
// import TransTypeTag from '../../components/TransTypeTag';
|
||||
|
||||
type Props = {
|
||||
// entityData: any;
|
||||
// chatConfigKey: string;
|
||||
chatConfigType: ChatConfigType.TAG | ChatConfigType.METRIC;
|
||||
metricList?: ISemantic.IMetricItem[];
|
||||
dimensionList?: ISemantic.IDimensionItem[];
|
||||
form: any;
|
||||
// domainId: number;
|
||||
// onSubmit: (params?: any) => void;
|
||||
formData: Record<string, any>;
|
||||
};
|
||||
|
||||
const FormItem = Form.Item;
|
||||
@@ -31,15 +24,15 @@ const formDefaultValue = {
|
||||
};
|
||||
|
||||
const DefaultSettingForm: ForwardRefRenderFunction<any, Props> = (
|
||||
{ metricList, dimensionList, chatConfigType, form },
|
||||
{ metricList, dimensionList, formData, chatConfigType, form },
|
||||
ref,
|
||||
) => {
|
||||
const [dataItemListOptions, setDataItemListOptions] = useState<any>([]);
|
||||
// const [dataItemListOptions, setDataItemListOptions] = useState<any>([]);
|
||||
|
||||
const initData = () => {
|
||||
form.setFieldsValue({
|
||||
queryConfig: {
|
||||
[defaultConfigKeyMap[chatConfigType]]: {
|
||||
[DetailTypeDefaultConfig[chatConfigType]]: {
|
||||
timeDefaultConfig: {
|
||||
...formDefaultValue,
|
||||
},
|
||||
@@ -54,54 +47,49 @@ const DefaultSettingForm: ForwardRefRenderFunction<any, Props> = (
|
||||
}
|
||||
}, []);
|
||||
|
||||
const defaultConfigKeyMap = {
|
||||
[ChatConfigType.TAG]: 'tagTypeDefaultConfig',
|
||||
[ChatConfigType.METRIC]: 'metricTypeDefaultConfig',
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
if (Array.isArray(dimensionList) && Array.isArray(metricList)) {
|
||||
const dimensionEnum = dimensionList.map((item: ISemantic.IDimensionItem) => {
|
||||
const { name, id, bizName } = item;
|
||||
return {
|
||||
name,
|
||||
label: (
|
||||
<>
|
||||
<TransTypeTag type={SemanticNodeType.DIMENSION} />
|
||||
{name}
|
||||
</>
|
||||
),
|
||||
value: wrapperTransTypeAndId(TransType.DIMENSION, id),
|
||||
bizName,
|
||||
id,
|
||||
transType: TransType.DIMENSION,
|
||||
};
|
||||
});
|
||||
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]);
|
||||
}
|
||||
}, [dimensionList, metricList]);
|
||||
// useEffect(() => {
|
||||
// if (Array.isArray(dimensionList) && Array.isArray(metricList)) {
|
||||
// const dimensionEnum = dimensionList.map((item: ISemantic.IDimensionItem) => {
|
||||
// const { name, id, bizName } = item;
|
||||
// return {
|
||||
// name,
|
||||
// label: (
|
||||
// <>
|
||||
// <TransTypeTag type={SemanticNodeType.DIMENSION} />
|
||||
// {name}
|
||||
// </>
|
||||
// ),
|
||||
// value: wrapperTransTypeAndId(TransType.DIMENSION, id),
|
||||
// bizName,
|
||||
// id,
|
||||
// transType: TransType.DIMENSION,
|
||||
// };
|
||||
// });
|
||||
// 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]);
|
||||
// }
|
||||
// }, [dimensionList, metricList]);
|
||||
|
||||
return (
|
||||
<>
|
||||
{chatConfigType === ChatConfigType.TAG && (
|
||||
{/* {chatConfigType === ChatConfigType.TAG && (
|
||||
<FormItem
|
||||
name={['queryConfig', defaultConfigKeyMap[ChatConfigType.TAG], 'defaultDisplayInfo']}
|
||||
name={['queryConfig', DetailTypeDefaultConfig[ChatConfigType.TAG], 'defaultDisplayInfo']}
|
||||
label="明细查询结果展示字段"
|
||||
getValueFromEvent={(value, items) => {
|
||||
const result: { dimensionIds: number[]; metricIds: number[] } = {
|
||||
@@ -151,7 +139,7 @@ const DefaultSettingForm: ForwardRefRenderFunction<any, Props> = (
|
||||
options={dataItemListOptions}
|
||||
/>
|
||||
</FormItem>
|
||||
)}
|
||||
)} */}
|
||||
<FormItem
|
||||
label={
|
||||
<FormItemTitle
|
||||
@@ -176,43 +164,64 @@ const DefaultSettingForm: ForwardRefRenderFunction<any, Props> = (
|
||||
<FormItem
|
||||
name={[
|
||||
'queryConfig',
|
||||
defaultConfigKeyMap[chatConfigType],
|
||||
DetailTypeDefaultConfig[chatConfigType],
|
||||
'timeDefaultConfig',
|
||||
'timeMode',
|
||||
]}
|
||||
noStyle
|
||||
>
|
||||
<Select style={{ width: '90px' }}>
|
||||
<Option value="LAST">前</Option>
|
||||
<Option value="RECENT">最近</Option>
|
||||
<Option value={TimeModeEnum.LAST}>前</Option>
|
||||
<Option value={TimeModeEnum.RECENT}>最近</Option>
|
||||
<Option value={TimeModeEnum.CURRENT}>本</Option>
|
||||
</Select>
|
||||
</FormItem>
|
||||
</>
|
||||
)}
|
||||
<FormItem
|
||||
name={['queryConfig', defaultConfigKeyMap[chatConfigType], 'timeDefaultConfig', 'unit']}
|
||||
noStyle
|
||||
>
|
||||
<InputNumber style={{ width: '120px' }} />
|
||||
</FormItem>
|
||||
{formData?.queryConfig?.[DetailTypeDefaultConfig[chatConfigType]]?.timeDefaultConfig
|
||||
?.timeMode !== 'CURRENT' && (
|
||||
<FormItem
|
||||
name={[
|
||||
'queryConfig',
|
||||
DetailTypeDefaultConfig[chatConfigType],
|
||||
'timeDefaultConfig',
|
||||
'unit',
|
||||
]}
|
||||
noStyle
|
||||
>
|
||||
<InputNumber style={{ width: '120px' }} />
|
||||
</FormItem>
|
||||
)}
|
||||
|
||||
<FormItem
|
||||
name={[
|
||||
'queryConfig',
|
||||
defaultConfigKeyMap[chatConfigType],
|
||||
DetailTypeDefaultConfig[chatConfigType],
|
||||
'timeDefaultConfig',
|
||||
'period',
|
||||
]}
|
||||
noStyle
|
||||
>
|
||||
<Select style={{ width: '90px' }}>
|
||||
<Option value="DAY">天</Option>
|
||||
<Option value="WEEK">周</Option>
|
||||
<Option value="MONTH">月</Option>
|
||||
<Option value="YEAR">年</Option>
|
||||
{formData?.queryConfig?.[DetailTypeDefaultConfig[chatConfigType]]?.timeDefaultConfig
|
||||
?.timeMode !== 'CURRENT' && (
|
||||
<>
|
||||
<Option value={DatePeriod.DAY}>日</Option>
|
||||
<Option value={DatePeriod.WEEK}>周</Option>
|
||||
</>
|
||||
)}
|
||||
<Option value={DatePeriod.MONTH}>月</Option>
|
||||
<Option value={DatePeriod.YEAR}>年</Option>
|
||||
</Select>
|
||||
</FormItem>
|
||||
</Input.Group>
|
||||
</FormItem>
|
||||
<FormItem
|
||||
name={['queryConfig', DetailTypeDefaultConfig[chatConfigType], 'limit']}
|
||||
label={<FormItemTitle title={'查询Limit'} subTitle={'设置默认查询结果的限制行数'} />}
|
||||
>
|
||||
<InputNumber style={{ width: '120px' }} />
|
||||
</FormItem>
|
||||
</>
|
||||
);
|
||||
};
|
||||
|
||||
@@ -1,190 +0,0 @@
|
||||
import { useEffect, useState, forwardRef, useImperativeHandle } from 'react';
|
||||
import type { ForwardRefRenderFunction } from 'react';
|
||||
import FormItemTitle from '@/components/FormHelper/FormItemTitle';
|
||||
|
||||
import { Form, Input, Select, InputNumber } from 'antd';
|
||||
|
||||
import { wrapperTransTypeAndId } from '../../utils';
|
||||
|
||||
import { ISemantic } from '../../data';
|
||||
import { TransType, SemanticNodeType } from '../../enum';
|
||||
import TransTypeTag from '../../components/TransTypeTag';
|
||||
|
||||
type Props = {
|
||||
chatConfigType: TransType;
|
||||
metricList?: ISemantic.IMetricItem[];
|
||||
dimensionList?: ISemantic.IDimensionItem[];
|
||||
tagList?: ISemantic.ITagItem[];
|
||||
form: any;
|
||||
};
|
||||
|
||||
const FormItem = Form.Item;
|
||||
const Option = Select.Option;
|
||||
|
||||
const formDefaultValue = {
|
||||
unit: 7,
|
||||
period: 'DAY',
|
||||
timeMode: 'LAST',
|
||||
};
|
||||
|
||||
const DefaultSettingForm: ForwardRefRenderFunction<any, Props> = (
|
||||
{ metricList, dimensionList, tagList, chatConfigType, form },
|
||||
ref,
|
||||
) => {
|
||||
const [dataItemListOptions, setDataItemListOptions] = useState<any>([]);
|
||||
|
||||
const initData = () => {
|
||||
form.setFieldsValue({
|
||||
queryConfig: {
|
||||
[defaultConfigKeyMap[chatConfigType]]: {
|
||||
timeDefaultConfig: {
|
||||
...formDefaultValue,
|
||||
},
|
||||
},
|
||||
},
|
||||
});
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
if (form && !form.getFieldValue('id')) {
|
||||
initData();
|
||||
}
|
||||
}, []);
|
||||
|
||||
const defaultConfigKeyMap: any = {
|
||||
[TransType.TAG]: 'tagTypeDefaultConfig',
|
||||
[TransType.METRIC]: 'metricTypeDefaultConfig',
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
if (Array.isArray(tagList)) {
|
||||
const tagEnum = tagList.map((item: ISemantic.ITagItem) => {
|
||||
const { name, id, bizName } = item;
|
||||
return {
|
||||
name,
|
||||
label: (
|
||||
<>
|
||||
<TransTypeTag type={SemanticNodeType.TAG} />
|
||||
{name}
|
||||
</>
|
||||
),
|
||||
value: wrapperTransTypeAndId(TransType.TAG, id),
|
||||
bizName,
|
||||
id,
|
||||
transType: TransType.TAG,
|
||||
};
|
||||
});
|
||||
setDataItemListOptions([...tagEnum]);
|
||||
}
|
||||
}, [tagList]);
|
||||
|
||||
return (
|
||||
<>
|
||||
{chatConfigType === TransType.TAG && (
|
||||
<FormItem
|
||||
name={['queryConfig', defaultConfigKeyMap[TransType.TAG], 'defaultDisplayInfo']}
|
||||
label="明细查询结果展示字段"
|
||||
getValueFromEvent={(value, items) => {
|
||||
const result: { tagIds: number[] } = {
|
||||
tagIds: [],
|
||||
};
|
||||
items.forEach((item: any) => {
|
||||
result.tagIds.push(item.id);
|
||||
});
|
||||
return result;
|
||||
}}
|
||||
getValueProps={(value) => {
|
||||
const { tagIds } = value || {};
|
||||
const tagValues = Array.isArray(tagIds)
|
||||
? tagIds.map((id: number) => {
|
||||
return wrapperTransTypeAndId(TransType.TAG, id);
|
||||
})
|
||||
: [];
|
||||
return {
|
||||
value: [...tagValues],
|
||||
};
|
||||
}}
|
||||
>
|
||||
<Select
|
||||
mode="multiple"
|
||||
allowClear
|
||||
style={{ width: '100%' }}
|
||||
optionLabelProp="name"
|
||||
filterOption={(inputValue: string, item: any) => {
|
||||
const { name } = item;
|
||||
if (name.includes(inputValue)) {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}}
|
||||
placeholder="请选择明细查询结果展示字段"
|
||||
options={dataItemListOptions}
|
||||
/>
|
||||
</FormItem>
|
||||
)}
|
||||
<FormItem
|
||||
label={
|
||||
<FormItemTitle
|
||||
title={'时间范围'}
|
||||
subTitle={'问答搜索结果选择中，如果没有指定时间范围，将会采用默认时间范围'}
|
||||
/>
|
||||
}
|
||||
>
|
||||
<Input.Group compact>
|
||||
{chatConfigType === TransType.TAG ? (
|
||||
<span
|
||||
style={{
|
||||
display: 'inline-block',
|
||||
lineHeight: '32px',
|
||||
marginRight: '8px',
|
||||
}}
|
||||
>
|
||||
前
|
||||
</span>
|
||||
) : (
|
||||
<>
|
||||
<FormItem
|
||||
name={[
|
||||
'queryConfig',
|
||||
defaultConfigKeyMap[chatConfigType],
|
||||
'timeDefaultConfig',
|
||||
'timeMode',
|
||||
]}
|
||||
noStyle
|
||||
>
|
||||
<Select style={{ width: '90px' }}>
|
||||
<Option value="LAST">前</Option>
|
||||
<Option value="RECENT">最近</Option>
|
||||
</Select>
|
||||
</FormItem>
|
||||
</>
|
||||
)}
|
||||
<FormItem
|
||||
name={['queryConfig', defaultConfigKeyMap[chatConfigType], 'timeDefaultConfig', 'unit']}
|
||||
noStyle
|
||||
>
|
||||
<InputNumber style={{ width: '120px' }} />
|
||||
</FormItem>
|
||||
<FormItem
|
||||
name={[
|
||||
'queryConfig',
|
||||
defaultConfigKeyMap[chatConfigType],
|
||||
'timeDefaultConfig',
|
||||
'period',
|
||||
]}
|
||||
noStyle
|
||||
>
|
||||
<Select style={{ width: '90px' }}>
|
||||
<Option value="DAY">天</Option>
|
||||
<Option value="WEEK">周</Option>
|
||||
<Option value="MONTH">月</Option>
|
||||
<Option value="YEAR">年</Option>
|
||||
</Select>
|
||||
</FormItem>
|
||||
</Input.Group>
|
||||
</FormItem>
|
||||
</>
|
||||
);
|
||||
};
|
||||
|
||||
export default forwardRef(DefaultSettingForm);
|
||||
@@ -11,7 +11,7 @@ import { isArrayOfValues } from '@/utils/utils';
|
||||
|
||||
type Props = {
|
||||
queryType?: string;
|
||||
viewItem: ISemantic.IViewItem;
|
||||
viewItem: ISemantic.IDatasetItem;
|
||||
modelItem?: ISemantic.IModelItem;
|
||||
dimensionList?: ISemantic.IDimensionItem[];
|
||||
metricList?: ISemantic.IMetricItem[];
|
||||
@@ -133,7 +133,7 @@ const ViewModelConfigTransfer: React.FC<Props> = forwardRef(
|
||||
const idList: number[] = [];
|
||||
const transferKeys: React.Key[] = [];
|
||||
const viewConfigMap: any = {};
|
||||
dataSetModelConfigs.forEach((item: ISemantic.IViewModelConfigItem) => {
|
||||
dataSetModelConfigs.forEach((item: ISemantic.IDatasetModelConfigItem) => {
|
||||
const { id, metrics, dimensions, tagIds } = item;
|
||||
idList.push(id);
|
||||
viewConfigMap[id] = { ...item };
|
||||
@@ -171,15 +171,15 @@ const ViewModelConfigTransfer: React.FC<Props> = forwardRef(
|
||||
return;
|
||||
}
|
||||
// const dataSetModelConfigs = isArrayOfValues(Object.values(viewModelConfigsMap))
|
||||
// ? (Object.values(viewModelConfigsMap) as ISemantic.IViewModelConfigItem[])
|
||||
// ? (Object.values(viewModelConfigsMap) as ISemantic.IDatasetModelConfigItem[])
|
||||
// : viewItem?.dataSetDetail?.dataSetModelConfigs;
|
||||
const dataSetModelConfigs = Object.values(
|
||||
viewModelConfigsMap,
|
||||
) as ISemantic.IViewModelConfigItem[];
|
||||
) as ISemantic.IDatasetModelConfigItem[];
|
||||
if (isArrayOfValues(dataSetModelConfigs)) {
|
||||
const allMetrics: number[] = [];
|
||||
const allDimensions: number[] = [];
|
||||
dataSetModelConfigs.forEach((item: ISemantic.IViewModelConfigItem) => {
|
||||
dataSetModelConfigs.forEach((item: ISemantic.IDatasetModelConfigItem) => {
|
||||
const { metrics, dimensions } = item;
|
||||
allMetrics.push(...metrics);
|
||||
allDimensions.push(...dimensions);
|
||||
@@ -200,11 +200,11 @@ const ViewModelConfigTransfer: React.FC<Props> = forwardRef(
|
||||
return;
|
||||
}
|
||||
const dataSetModelConfigs = isArrayOfValues(Object.values(viewModelConfigsMap))
|
||||
? (Object.values(viewModelConfigsMap) as ISemantic.IViewModelConfigItem[])
|
||||
? (Object.values(viewModelConfigsMap) as ISemantic.IDatasetModelConfigItem[])
|
||||
: viewItem?.dataSetDetail?.dataSetModelConfigs;
|
||||
if (isArrayOfValues(dataSetModelConfigs)) {
|
||||
const allTags: number[] = [];
|
||||
dataSetModelConfigs.forEach((item: ISemantic.IViewModelConfigItem) => {
|
||||
dataSetModelConfigs.forEach((item: ISemantic.IDatasetModelConfigItem) => {
|
||||
const { tagIds } = item;
|
||||
allTags.push(...tagIds);
|
||||
});
|
||||
@@ -224,17 +224,17 @@ const ViewModelConfigTransfer: React.FC<Props> = forwardRef(
|
||||
metricList={mergeMetricList}
|
||||
selectedTransferKeys={selectedTransferKeys}
|
||||
onSubmit={(
|
||||
submitData: Record<string, ISemantic.IViewModelConfigItem>,
|
||||
submitData: Record<string, ISemantic.IDatasetModelConfigItem>,
|
||||
selectedKeys: React.Key[],
|
||||
) => {
|
||||
const dataSetModelConfigs = Object.values(
|
||||
submitData,
|
||||
) as ISemantic.IViewModelConfigItem[];
|
||||
) as ISemantic.IDatasetModelConfigItem[];
|
||||
|
||||
if (isArrayOfValues(dataSetModelConfigs)) {
|
||||
const allMetrics: number[] = [];
|
||||
const allDimensions: number[] = [];
|
||||
dataSetModelConfigs.forEach((item: ISemantic.IViewModelConfigItem) => {
|
||||
dataSetModelConfigs.forEach((item: ISemantic.IDatasetModelConfigItem) => {
|
||||
const { metrics, dimensions } = item;
|
||||
allMetrics.push(...metrics);
|
||||
allDimensions.push(...dimensions);
|
||||
@@ -255,16 +255,16 @@ const ViewModelConfigTransfer: React.FC<Props> = forwardRef(
|
||||
tagList={mergeTagList}
|
||||
selectedTransferKeys={selectedTransferKeys}
|
||||
onSubmit={(
|
||||
submitData: Record<string, ISemantic.IViewModelConfigItem>,
|
||||
submitData: Record<string, ISemantic.IDatasetModelConfigItem>,
|
||||
selectedKeys: React.Key[],
|
||||
) => {
|
||||
const dataSetModelConfigs = Object.values(
|
||||
submitData,
|
||||
) as ISemantic.IViewModelConfigItem[];
|
||||
) as ISemantic.IDatasetModelConfigItem[];
|
||||
|
||||
if (isArrayOfValues(dataSetModelConfigs)) {
|
||||
const allTags: number[] = [];
|
||||
dataSetModelConfigs.forEach((item: ISemantic.IViewModelConfigItem) => {
|
||||
dataSetModelConfigs.forEach((item: ISemantic.IDatasetModelConfigItem) => {
|
||||
const { tagIds } = item;
|
||||
allTags.push(...tagIds);
|
||||
});
|
||||
|
||||
@@ -8,7 +8,7 @@ import { ISemantic } from '../../data';
|
||||
import DefaultSettingForm from './DefaultSettingForm';
|
||||
import { isArrayOfValues } from '@/utils/utils';
|
||||
import { ProCard } from '@ant-design/pro-components';
|
||||
import { ChatConfigType } from '../../enum';
|
||||
import { ChatConfigType, DetailTypeDefaultConfig, TimeModeEnum, DatePeriod } from '../../enum';
|
||||
|
||||
export type ModelCreateFormModalProps = {
|
||||
domainId: number;
|
||||
@@ -31,12 +31,14 @@ const ViewSearchFormModal: React.FC<ModelCreateFormModalProps> = ({
|
||||
const [dimensionList, setDimensionList] = useState<ISemantic.IDimensionItem[]>();
|
||||
const [metricList, setMetricList] = useState<ISemantic.IMetricItem[]>();
|
||||
|
||||
const [formData, setFormData] = useState(viewItem);
|
||||
|
||||
useEffect(() => {
|
||||
const dataSetModelConfigs = viewItem?.dataSetDetail?.dataSetModelConfigs;
|
||||
if (Array.isArray(dataSetModelConfigs)) {
|
||||
const allMetrics: number[] = [];
|
||||
const allDimensions: number[] = [];
|
||||
dataSetModelConfigs.forEach((item: ISemantic.IViewModelConfigItem) => {
|
||||
dataSetModelConfigs.forEach((item: ISemantic.IDatasetModelConfigItem) => {
|
||||
const { metrics, dimensions } = item;
|
||||
allMetrics.push(...metrics);
|
||||
allDimensions.push(...dimensions);
|
||||
@@ -96,6 +98,7 @@ const ViewSearchFormModal: React.FC<ModelCreateFormModalProps> = ({
|
||||
<Button onClick={onCancel}>取消</Button>
|
||||
<Button
|
||||
type="primary"
|
||||
loading={saveLoading}
|
||||
onClick={() => {
|
||||
handleConfirm();
|
||||
}}
|
||||
@@ -109,9 +112,10 @@ const ViewSearchFormModal: React.FC<ModelCreateFormModalProps> = ({
|
||||
const renderContent = () => {
|
||||
return (
|
||||
<div className={styles.viewSearchFormContainer}>
|
||||
<ProCard title="指标模式" style={{ marginBottom: 10, borderBottom: '1px solid #eee' }}>
|
||||
<ProCard title="聚合模式" style={{ marginBottom: 10, borderBottom: '1px solid #eee' }}>
|
||||
<DefaultSettingForm
|
||||
form={form}
|
||||
formData={formData}
|
||||
dimensionList={dimensionList}
|
||||
metricList={metricList}
|
||||
chatConfigType={ChatConfigType.METRIC}
|
||||
@@ -121,6 +125,7 @@ const ViewSearchFormModal: React.FC<ModelCreateFormModalProps> = ({
|
||||
<ProCard title="明细模式">
|
||||
<DefaultSettingForm
|
||||
form={form}
|
||||
formData={formData}
|
||||
dimensionList={dimensionList}
|
||||
metricList={metricList}
|
||||
chatConfigType={ChatConfigType.TAG}
|
||||
@@ -146,7 +151,26 @@ const ViewSearchFormModal: React.FC<ModelCreateFormModalProps> = ({
|
||||
initialValues={{
|
||||
...viewItem,
|
||||
}}
|
||||
onValuesChange={(value, values) => {}}
|
||||
onValuesChange={(value, values) => {
|
||||
const target =
|
||||
values?.queryConfig?.[DetailTypeDefaultConfig[ChatConfigType.METRIC]]
|
||||
?.timeDefaultConfig;
|
||||
if (target?.timeMode) {
|
||||
if (target?.timeMode === TimeModeEnum.CURRENT) {
|
||||
values.queryConfig[
|
||||
DetailTypeDefaultConfig[ChatConfigType.METRIC]
|
||||
].timeDefaultConfig.period = DatePeriod.MONTH;
|
||||
form.setFieldsValue({ ...values });
|
||||
} else {
|
||||
values.queryConfig[
|
||||
DetailTypeDefaultConfig[ChatConfigType.METRIC]
|
||||
].timeDefaultConfig.period = DatePeriod.DAY;
|
||||
form.setFieldsValue({ ...values });
|
||||
}
|
||||
}
|
||||
|
||||
setFormData({ ...values });
|
||||
}}
|
||||
>
|
||||
<FormItem hidden={true} name="id" label="ID">
|
||||
<Input placeholder="id" />
|
||||
|
||||
@@ -1,179 +0,0 @@
|
||||
import React, { useState, useEffect, useRef } from 'react';
|
||||
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, getTagList } from '../../service';
|
||||
import { ISemantic } from '../../data';
|
||||
import DefaultSettingForm from './DefaultSettingForm';
|
||||
import { isArrayOfValues } from '@/utils/utils';
|
||||
import { ProCard } from '@ant-design/pro-components';
|
||||
import { TransType, ChatConfigType } from '../../enum';
|
||||
import { number } from 'echarts';
|
||||
|
||||
export type ModelCreateFormModalProps = {
|
||||
domainId: number;
|
||||
viewItem: any;
|
||||
modelList: ISemantic.IModelItem[];
|
||||
onCancel: () => void;
|
||||
onSubmit: (values: any) => void;
|
||||
};
|
||||
|
||||
const ViewSearchFormModal: React.FC<ModelCreateFormModalProps> = ({
|
||||
viewItem,
|
||||
domainId,
|
||||
onCancel,
|
||||
onSubmit,
|
||||
}) => {
|
||||
const FormItem = Form.Item;
|
||||
const [saveLoading, setSaveLoading] = useState<boolean>(false);
|
||||
|
||||
const [form] = Form.useForm();
|
||||
|
||||
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, 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([]);
|
||||
return;
|
||||
}
|
||||
const { code, data, msg } = await getDimensionList({ ids });
|
||||
if (code === 200 && Array.isArray(data?.list)) {
|
||||
setDimensionList(data.list);
|
||||
} else {
|
||||
message.error(msg);
|
||||
}
|
||||
};
|
||||
|
||||
const queryMetricListByIds = async (ids: number[]) => {
|
||||
if (!isArrayOfValues(ids)) {
|
||||
setMetricList([]);
|
||||
return;
|
||||
}
|
||||
const { code, data, msg } = await queryMetric({ ids });
|
||||
if (code === 200 && Array.isArray(data?.list)) {
|
||||
setMetricList(data.list);
|
||||
} else {
|
||||
message.error(msg);
|
||||
}
|
||||
};
|
||||
|
||||
const handleConfirm = async () => {
|
||||
const fieldsValue = await form.validateFields();
|
||||
|
||||
const queryData: ISemantic.IModelItem = {
|
||||
...viewItem,
|
||||
...fieldsValue,
|
||||
domainId,
|
||||
};
|
||||
setSaveLoading(true);
|
||||
const { code, msg } = await (!queryData.id ? createView : updateView)(queryData);
|
||||
setSaveLoading(false);
|
||||
if (code === 200) {
|
||||
onSubmit?.(queryData);
|
||||
} else {
|
||||
message.error(msg);
|
||||
}
|
||||
};
|
||||
|
||||
const renderFooter = () => {
|
||||
return (
|
||||
<>
|
||||
<Button onClick={onCancel}>取消</Button>
|
||||
<Button
|
||||
type="primary"
|
||||
onClick={() => {
|
||||
handleConfirm();
|
||||
}}
|
||||
>
|
||||
保 存
|
||||
</Button>
|
||||
</>
|
||||
);
|
||||
};
|
||||
|
||||
const renderContent = () => {
|
||||
return (
|
||||
<div className={styles.viewSearchFormContainer}>
|
||||
{viewItem?.queryType === TransType.METRIC && (
|
||||
<ProCard title="指标模式" style={{ marginBottom: 10, borderBottom: '1px solid #eee' }}>
|
||||
<DefaultSettingForm
|
||||
form={form}
|
||||
dimensionList={dimensionList}
|
||||
metricList={metricList}
|
||||
chatConfigType={ChatConfigType.METRIC}
|
||||
/>
|
||||
</ProCard>
|
||||
)}
|
||||
|
||||
{viewItem?.queryType === TransType.TAG && (
|
||||
<ProCard title="明细模式">
|
||||
<DefaultSettingForm form={form} tagList={tagList} chatConfigType={ChatConfigType.TAG} />
|
||||
</ProCard>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
return (
|
||||
<Modal
|
||||
width={800}
|
||||
destroyOnClose
|
||||
title={'查询设置'}
|
||||
open={true}
|
||||
maskClosable={false}
|
||||
footer={renderFooter()}
|
||||
onCancel={onCancel}
|
||||
>
|
||||
<Form
|
||||
{...formLayout}
|
||||
form={form}
|
||||
initialValues={{
|
||||
...viewItem,
|
||||
}}
|
||||
onValuesChange={(value, values) => {}}
|
||||
>
|
||||
<FormItem hidden={true} name="id" label="ID">
|
||||
<Input placeholder="id" />
|
||||
</FormItem>
|
||||
{renderContent()}
|
||||
</Form>
|
||||
</Modal>
|
||||
);
|
||||
};
|
||||
|
||||
export default ViewSearchFormModal;
|
||||
@@ -4,20 +4,15 @@ import DataSetTable from './components/DataSetTable';
|
||||
|
||||
type Props = {
|
||||
disabledEdit?: boolean;
|
||||
modelList: ISemantic.IModelItem[];
|
||||
onModelChange?: (model?: ISemantic.IModelItem) => void;
|
||||
dataSetList: ISemantic.IDatasetItem[];
|
||||
};
|
||||
|
||||
const View: React.FC<Props> = ({ modelList, disabledEdit = false, onModelChange }) => {
|
||||
const View: React.FC<Props> = ({ dataSetList, disabledEdit = false }) => {
|
||||
return (
|
||||
<div style={{ padding: '15px 20px' }}>
|
||||
<DataSetTable
|
||||
modelList={modelList}
|
||||
disabledEdit={disabledEdit}
|
||||
onModelChange={onModelChange}
|
||||
/>
|
||||
<DataSetTable disabledEdit={disabledEdit} dataSetList={dataSetList} />
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
export default View
|
||||
export default View;
|
||||
|
||||
Reference in New Issue
Block a user