mirror of
https://github.com/tencentmusic/supersonic.git
synced 2026-04-21 22:34:28 +08:00
[improvement][semantic-fe] Optimizing the logic for setting dimension values and editing data sources, and adding system settings functionality (#383)
* [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
This commit is contained in:
tristanliu
@@ -1,221 +0,0 @@
|
||||
import React, { useEffect, useState, useRef } from 'react';
|
||||
import { Modal, message, Tabs, Button } from 'antd';
|
||||
|
||||
import { addDomainExtend, editDomainExtend } from '../../service';
|
||||
import DimensionMetricVisibleTransfer from './DimensionMetricVisibleTransfer';
|
||||
import { IChatConfig } from '../../data';
|
||||
import DimensionValueSettingForm from './DimensionValueSettingForm';
|
||||
import { TransType } from '../../enum';
|
||||
import { wrapperTransTypeAndId, formatRichEntityDataListToIds } from './utils';
|
||||
|
||||
type Props = {
|
||||
domainId: number;
|
||||
entityData: any;
|
||||
chatConfigKey: string;
|
||||
settingSourceList: any[];
|
||||
onCancel: () => void;
|
||||
visible: boolean;
|
||||
onSubmit: (params?: { isSilenceSubmit?: boolean }) => void;
|
||||
};
|
||||
|
||||
const dimensionConfig = {
|
||||
blackIdListKey: 'blackDimIdList',
|
||||
visibleIdListKey: 'whiteDimIdList',
|
||||
modalTitle: '问答可见信息',
|
||||
titles: ['不可见维度/指标', '可见维度/指标'],
|
||||
};
|
||||
|
||||
const DimensionAndMetricVisibleModal: React.FC<Props> = ({
|
||||
domainId,
|
||||
visible,
|
||||
entityData = {},
|
||||
chatConfigKey,
|
||||
settingSourceList,
|
||||
onCancel,
|
||||
onSubmit,
|
||||
}) => {
|
||||
const [selectedKeyList, setSelectedKeyList] = useState<string[]>([]);
|
||||
const settingTypeConfig = dimensionConfig;
|
||||
const formatEntityData = formatRichEntityDataListToIds(entityData);
|
||||
const [knowledgeInfosMap, setKnowledgeInfosMap] = useState<IChatConfig.IKnowledgeInfosItemMap>(
|
||||
{},
|
||||
);
|
||||
|
||||
const [activeKey, setActiveKey] = useState<string>('visibleSetting');
|
||||
const formRef = useRef<any>();
|
||||
|
||||
const [globalKnowledgeConfigInitialValues, setGlobalKnowledgeConfigInitialValues] =
|
||||
useState<IChatConfig.IKnowledgeConfig>();
|
||||
|
||||
useEffect(() => {
|
||||
if (entityData?.visibility && Array.isArray(settingSourceList)) {
|
||||
const { whiteDimIdList, whiteMetricIdList } = entityData.visibility;
|
||||
const dimensionIdString = whiteDimIdList.map((dimensionId: number) => {
|
||||
return wrapperTransTypeAndId(TransType.DIMENSION, dimensionId);
|
||||
});
|
||||
const metricIdString = whiteMetricIdList.map((metricId: number) => {
|
||||
return wrapperTransTypeAndId(TransType.METRIC, metricId);
|
||||
});
|
||||
setSelectedKeyList([...dimensionIdString, ...metricIdString]);
|
||||
}
|
||||
if (entityData?.globalKnowledgeConfig) {
|
||||
setGlobalKnowledgeConfigInitialValues(entityData.globalKnowledgeConfig);
|
||||
}
|
||||
if (Array.isArray(entityData?.knowledgeInfos)) {
|
||||
const infoMap = entityData.knowledgeInfos.reduce(
|
||||
(maps: IChatConfig.IKnowledgeInfosItemMap, item: IChatConfig.IKnowledgeInfosItem) => {
|
||||
const { bizName } = item;
|
||||
maps[bizName] = item;
|
||||
return maps;
|
||||
},
|
||||
{},
|
||||
);
|
||||
setKnowledgeInfosMap(infoMap);
|
||||
}
|
||||
}, [entityData, settingSourceList]);
|
||||
|
||||
const saveEntity = async (submitData: any, isSilenceSubmit = false) => {
|
||||
const { selectedKeyList, knowledgeInfosMap } = submitData;
|
||||
const globalKnowledgeConfigFormFields = await formRef?.current?.getFormValidateFields?.();
|
||||
let globalKnowledgeConfig = entityData.globalKnowledgeConfig;
|
||||
if (globalKnowledgeConfigFormFields) {
|
||||
globalKnowledgeConfig = globalKnowledgeConfigFormFields;
|
||||
}
|
||||
const { id, modelId } = entityData;
|
||||
let saveDomainExtendQuery = addDomainExtend;
|
||||
if (id) {
|
||||
saveDomainExtendQuery = editDomainExtend;
|
||||
}
|
||||
|
||||
const blackIdListMap = settingSourceList.reduce(
|
||||
(ids, item) => {
|
||||
const { id, transType } = item;
|
||||
if (!selectedKeyList.includes(wrapperTransTypeAndId(transType, id))) {
|
||||
if (transType === TransType.DIMENSION) {
|
||||
ids.blackDimIdList.push(id);
|
||||
}
|
||||
if (transType === TransType.METRIC) {
|
||||
ids.blackMetricIdList.push(id);
|
||||
}
|
||||
}
|
||||
return ids;
|
||||
},
|
||||
{
|
||||
blackDimIdList: [],
|
||||
blackMetricIdList: [],
|
||||
},
|
||||
);
|
||||
|
||||
const knowledgeInfos = Object.keys(knowledgeInfosMap).reduce(
|
||||
(infoList: IChatConfig.IKnowledgeInfosItem[], key: string) => {
|
||||
const target = knowledgeInfosMap[key];
|
||||
if (target.searchEnable) {
|
||||
infoList.push(target);
|
||||
}
|
||||
return infoList;
|
||||
},
|
||||
[],
|
||||
);
|
||||
|
||||
const params = {
|
||||
...formatEntityData,
|
||||
visibility: blackIdListMap,
|
||||
knowledgeInfos,
|
||||
...(globalKnowledgeConfig ? { globalKnowledgeConfig } : {}),
|
||||
};
|
||||
|
||||
const { code, msg } = await saveDomainExtendQuery({
|
||||
[chatConfigKey]: params,
|
||||
id,
|
||||
modelId,
|
||||
});
|
||||
if (code === 200) {
|
||||
if (!isSilenceSubmit) {
|
||||
message.success('保存成功');
|
||||
}
|
||||
onSubmit?.({ isSilenceSubmit });
|
||||
return;
|
||||
}
|
||||
message.error(msg);
|
||||
};
|
||||
|
||||
const handleTransferChange = (newTargetKeys: string[]) => {
|
||||
setSelectedKeyList(newTargetKeys);
|
||||
};
|
||||
|
||||
const renderFooter = () => {
|
||||
return (
|
||||
<>
|
||||
<Button onClick={onCancel}>取消</Button>
|
||||
<Button
|
||||
type="primary"
|
||||
onClick={() => {
|
||||
saveEntity({ selectedKeyList, knowledgeInfosMap });
|
||||
}}
|
||||
>
|
||||
完成
|
||||
</Button>
|
||||
</>
|
||||
);
|
||||
};
|
||||
|
||||
const tabItem = [
|
||||
{
|
||||
label: '可见设置',
|
||||
key: 'visibleSetting',
|
||||
children: (
|
||||
<DimensionMetricVisibleTransfer
|
||||
onKnowledgeInfosMapChange={(knowledgeInfos) => {
|
||||
setKnowledgeInfosMap(knowledgeInfos);
|
||||
saveEntity({ selectedKeyList, knowledgeInfosMap: knowledgeInfos }, true);
|
||||
}}
|
||||
knowledgeInfosMap={knowledgeInfosMap}
|
||||
titles={settingTypeConfig.titles}
|
||||
sourceList={settingSourceList}
|
||||
targetList={selectedKeyList}
|
||||
onChange={(newTargetKeys) => {
|
||||
handleTransferChange(newTargetKeys);
|
||||
saveEntity({ selectedKeyList: newTargetKeys, knowledgeInfosMap }, true);
|
||||
}}
|
||||
/>
|
||||
),
|
||||
},
|
||||
{
|
||||
label: '全局维度值过滤',
|
||||
key: 'dimensionValueFilter',
|
||||
children: (
|
||||
<div style={{ margin: '0 auto', width: '975px' }}>
|
||||
<DimensionValueSettingForm
|
||||
initialValues={globalKnowledgeConfigInitialValues}
|
||||
ref={formRef}
|
||||
/>
|
||||
</div>
|
||||
),
|
||||
},
|
||||
];
|
||||
|
||||
return (
|
||||
<>
|
||||
<Modal
|
||||
width={1500}
|
||||
destroyOnClose
|
||||
title={settingTypeConfig.modalTitle}
|
||||
maskClosable={false}
|
||||
open={visible}
|
||||
footer={activeKey === 'visibleSetting' ? false : renderFooter()}
|
||||
// footer={false}
|
||||
onCancel={onCancel}
|
||||
>
|
||||
<Tabs
|
||||
items={tabItem}
|
||||
defaultActiveKey="visibleSetting"
|
||||
onChange={(key) => {
|
||||
setActiveKey(key);
|
||||
}}
|
||||
/>
|
||||
</Modal>
|
||||
</>
|
||||
);
|
||||
};
|
||||
|
||||
export default DimensionAndMetricVisibleModal;
|
||||
@@ -1,89 +0,0 @@
|
||||
import { useState, forwardRef } from 'react';
|
||||
import type { ForwardRefRenderFunction } from 'react';
|
||||
import { Form, Button } from 'antd';
|
||||
import FormItemTitle from '@/components/FormHelper/FormItemTitle';
|
||||
import { formLayout } from '@/components/FormHelper/utils';
|
||||
import DimensionAndMetricVisibleModal from './DimensionAndMetricVisibleModal';
|
||||
import { TransType } from '../../enum';
|
||||
import { wrapperTransTypeAndId } from './utils';
|
||||
|
||||
type Props = {
|
||||
entityData: any;
|
||||
chatConfigKey: string;
|
||||
metricList: any[];
|
||||
dimensionList: any[];
|
||||
domainId: number;
|
||||
onSubmit: (params?: any) => void;
|
||||
};
|
||||
|
||||
const FormItem = Form.Item;
|
||||
|
||||
const DimensionMetricVisibleForm: ForwardRefRenderFunction<any, Props> = ({
|
||||
domainId,
|
||||
metricList,
|
||||
dimensionList,
|
||||
entityData,
|
||||
chatConfigKey,
|
||||
onSubmit,
|
||||
}) => {
|
||||
const [dimensionModalVisible, setDimensionModalVisible] = useState(false);
|
||||
return (
|
||||
<>
|
||||
<Form {...formLayout}>
|
||||
<FormItem
|
||||
label={
|
||||
<FormItemTitle title={'可见维度/指标'} subTitle={'设置可见后，将允许在问答中被使用'} />
|
||||
}
|
||||
>
|
||||
<Button
|
||||
type="primary"
|
||||
onClick={() => {
|
||||
setDimensionModalVisible(true);
|
||||
}}
|
||||
>
|
||||
设 置
|
||||
</Button>
|
||||
</FormItem>
|
||||
</Form>
|
||||
{dimensionModalVisible && (
|
||||
<DimensionAndMetricVisibleModal
|
||||
domainId={domainId}
|
||||
entityData={entityData}
|
||||
chatConfigKey={chatConfigKey}
|
||||
settingSourceList={[
|
||||
...dimensionList.map((item) => {
|
||||
const transType = TransType.DIMENSION;
|
||||
const { id } = item;
|
||||
return {
|
||||
...item,
|
||||
transType,
|
||||
key: wrapperTransTypeAndId(transType, id),
|
||||
};
|
||||
}),
|
||||
...metricList.map((item) => {
|
||||
const transType = TransType.METRIC;
|
||||
const { id } = item;
|
||||
return {
|
||||
...item,
|
||||
transType,
|
||||
key: wrapperTransTypeAndId(transType, id),
|
||||
};
|
||||
}),
|
||||
]}
|
||||
visible={dimensionModalVisible}
|
||||
onCancel={() => {
|
||||
setDimensionModalVisible(false);
|
||||
}}
|
||||
onSubmit={(params) => {
|
||||
onSubmit?.();
|
||||
if (!params?.isSilenceSubmit) {
|
||||
setDimensionModalVisible(false);
|
||||
}
|
||||
}}
|
||||
/>
|
||||
)}
|
||||
</>
|
||||
);
|
||||
};
|
||||
|
||||
export default forwardRef(DimensionMetricVisibleForm);
|
||||
@@ -37,96 +37,96 @@ const DimensionMetricVisibleTableTransfer: React.FC<Props> = ({
|
||||
onKnowledgeInfosMapChange,
|
||||
...restProps
|
||||
}) => {
|
||||
const { selectModelId: modelId } = domainManger;
|
||||
const [dimensionValueSettingModalVisible, setDimensionValueSettingModalVisible] =
|
||||
useState<boolean>(false);
|
||||
const [currentRecord, setCurrentRecord] = useState<RecordType>({} as RecordType);
|
||||
const [currentDimensionSettingFormData, setCurrentDimensionSettingFormData] =
|
||||
useState<IChatConfig.IKnowledgeConfig>();
|
||||
// const { selectModelId: modelId } = domainManger;
|
||||
// const [dimensionValueSettingModalVisible, setDimensionValueSettingModalVisible] =
|
||||
// useState<boolean>(false);
|
||||
// const [currentRecord, setCurrentRecord] = useState<RecordType>({} as RecordType);
|
||||
// const [currentDimensionSettingFormData, setCurrentDimensionSettingFormData] =
|
||||
// useState<IChatConfig.IKnowledgeConfig>();
|
||||
|
||||
const [recordLoadingMap, setRecordLoadingMap] = useState<Record<string, boolean>>({});
|
||||
// const [recordLoadingMap, setRecordLoadingMap] = useState<Record<string, boolean>>({});
|
||||
|
||||
const [taskStateMap, setTaskStateMap] = useState<TaskStateMap>({});
|
||||
// const [taskStateMap, setTaskStateMap] = useState<TaskStateMap>({});
|
||||
|
||||
useEffect(() => {
|
||||
queryDictLatestTaskList();
|
||||
}, []);
|
||||
// useEffect(() => {
|
||||
// queryDictLatestTaskList();
|
||||
// }, []);
|
||||
|
||||
const updateKnowledgeInfosMap = (record: RecordType, updateData: Record<string, any>) => {
|
||||
const { bizName, id } = record;
|
||||
const knowledgeMap = {
|
||||
...knowledgeInfosMap,
|
||||
};
|
||||
const target = knowledgeMap[bizName];
|
||||
if (target) {
|
||||
knowledgeMap[bizName] = {
|
||||
...target,
|
||||
...updateData,
|
||||
};
|
||||
} else {
|
||||
knowledgeMap[bizName] = {
|
||||
itemId: id,
|
||||
bizName,
|
||||
...updateData,
|
||||
};
|
||||
}
|
||||
onKnowledgeInfosMapChange?.(knowledgeMap);
|
||||
};
|
||||
// const updateKnowledgeInfosMap = (record: RecordType, updateData: Record<string, any>) => {
|
||||
// const { bizName, id } = record;
|
||||
// const knowledgeMap = {
|
||||
// ...knowledgeInfosMap,
|
||||
// };
|
||||
// const target = knowledgeMap[bizName];
|
||||
// if (target) {
|
||||
// knowledgeMap[bizName] = {
|
||||
// ...target,
|
||||
// ...updateData,
|
||||
// };
|
||||
// } else {
|
||||
// knowledgeMap[bizName] = {
|
||||
// itemId: id,
|
||||
// bizName,
|
||||
// ...updateData,
|
||||
// };
|
||||
// }
|
||||
// onKnowledgeInfosMapChange?.(knowledgeMap);
|
||||
// };
|
||||
|
||||
const queryDictLatestTaskList = async () => {
|
||||
const { code, data } = await searchDictLatestTaskList({
|
||||
modelId,
|
||||
});
|
||||
if (code !== 200) {
|
||||
message.error('获取字典导入任务失败!');
|
||||
return;
|
||||
}
|
||||
const tastMap = data.reduce(
|
||||
(stateMap: TaskStateMap, item: { dimId: number; status: DictTaskState }) => {
|
||||
const { dimId, status } = item;
|
||||
stateMap[dimId] = status;
|
||||
return stateMap;
|
||||
},
|
||||
{},
|
||||
);
|
||||
setTaskStateMap(tastMap);
|
||||
};
|
||||
// const queryDictLatestTaskList = async () => {
|
||||
// const { code, data } = await searchDictLatestTaskList({
|
||||
// modelId,
|
||||
// });
|
||||
// if (code !== 200) {
|
||||
// message.error('获取字典导入任务失败!');
|
||||
// return;
|
||||
// }
|
||||
// const tastMap = data.reduce(
|
||||
// (stateMap: TaskStateMap, item: { dimId: number; status: DictTaskState }) => {
|
||||
// const { dimId, status } = item;
|
||||
// stateMap[dimId] = status;
|
||||
// return stateMap;
|
||||
// },
|
||||
// {},
|
||||
// );
|
||||
// setTaskStateMap(tastMap);
|
||||
// };
|
||||
|
||||
const createDictTaskQuery = async (recordData: RecordType) => {
|
||||
setRecordLoadingMap({
|
||||
...recordLoadingMap,
|
||||
[recordData.id]: true,
|
||||
});
|
||||
const { code } = await createDictTask({
|
||||
updateMode: 'REALTIME_ADD',
|
||||
modelAndDimPair: {
|
||||
[modelId]: [recordData.id],
|
||||
},
|
||||
});
|
||||
setRecordLoadingMap({
|
||||
...recordLoadingMap,
|
||||
[recordData.id]: false,
|
||||
});
|
||||
if (code !== 200) {
|
||||
message.error('字典导入任务创建失败!');
|
||||
return;
|
||||
}
|
||||
setTimeout(() => {
|
||||
queryDictLatestTaskList();
|
||||
}, 2000);
|
||||
};
|
||||
// const createDictTaskQuery = async (recordData: RecordType) => {
|
||||
// setRecordLoadingMap({
|
||||
// ...recordLoadingMap,
|
||||
// [recordData.id]: true,
|
||||
// });
|
||||
// const { code } = await createDictTask({
|
||||
// updateMode: 'REALTIME_ADD',
|
||||
// modelAndDimPair: {
|
||||
// [modelId]: [recordData.id],
|
||||
// },
|
||||
// });
|
||||
// setRecordLoadingMap({
|
||||
// ...recordLoadingMap,
|
||||
// [recordData.id]: false,
|
||||
// });
|
||||
// if (code !== 200) {
|
||||
// message.error('字典导入任务创建失败!');
|
||||
// return;
|
||||
// }
|
||||
// setTimeout(() => {
|
||||
// queryDictLatestTaskList();
|
||||
// }, 2000);
|
||||
// };
|
||||
|
||||
const deleteDictTask = async (recordData: RecordType) => {
|
||||
const { code } = await createDictTask({
|
||||
updateMode: 'REALTIME_DELETE',
|
||||
modelAndDimPair: {
|
||||
[modelId]: [recordData.id],
|
||||
},
|
||||
});
|
||||
if (code !== 200) {
|
||||
message.error('删除字典导入任务创建失败!');
|
||||
}
|
||||
};
|
||||
// const deleteDictTask = async (recordData: RecordType) => {
|
||||
// const { code } = await createDictTask({
|
||||
// updateMode: 'REALTIME_DELETE',
|
||||
// modelAndDimPair: {
|
||||
// [modelId]: [recordData.id],
|
||||
// },
|
||||
// });
|
||||
// if (code !== 200) {
|
||||
// message.error('删除字典导入任务创建失败!');
|
||||
// }
|
||||
// };
|
||||
|
||||
let rightColumns: ColumnsType<RecordType> = [
|
||||
{
|
||||
@@ -141,104 +141,104 @@ const DimensionMetricVisibleTableTransfer: React.FC<Props> = ({
|
||||
return <TransTypeTag type={type} />;
|
||||
},
|
||||
},
|
||||
{
|
||||
dataIndex: 'y',
|
||||
title: (
|
||||
<TableTitleTooltips
|
||||
title="维度值可见"
|
||||
tooltips="勾选可见后，维度值将在搜索时可以被联想出来"
|
||||
/>
|
||||
),
|
||||
width: 120,
|
||||
render: (_: any, record: RecordType) => {
|
||||
const { type, bizName } = record;
|
||||
return type === TransType.DIMENSION ? (
|
||||
<Checkbox
|
||||
checked={knowledgeInfosMap?.[bizName]?.searchEnable}
|
||||
onChange={(e: CheckboxChangeEvent) => {
|
||||
updateKnowledgeInfosMap(record, { searchEnable: e.target.checked });
|
||||
if (!e.target.checked) {
|
||||
deleteDictTask(record);
|
||||
}
|
||||
}}
|
||||
onClick={(event) => {
|
||||
event.stopPropagation();
|
||||
}}
|
||||
/>
|
||||
) : (
|
||||
<></>
|
||||
);
|
||||
},
|
||||
},
|
||||
{
|
||||
dataIndex: 'taskState',
|
||||
width: 130,
|
||||
title: (
|
||||
<Space>
|
||||
导入字典状态
|
||||
<span
|
||||
className={styles.taskStateRefreshIcon}
|
||||
onClick={() => {
|
||||
queryDictLatestTaskList();
|
||||
}}
|
||||
>
|
||||
<Tooltip title="刷新字典任务状态">
|
||||
<RedoOutlined />
|
||||
</Tooltip>
|
||||
</span>
|
||||
</Space>
|
||||
),
|
||||
render: (_, record) => {
|
||||
const { id, type } = record;
|
||||
const target = taskStateMap[id];
|
||||
if (type === TransType.DIMENSION && target) {
|
||||
return DictTaskState[target] || '未知状态';
|
||||
}
|
||||
return '--';
|
||||
},
|
||||
},
|
||||
{
|
||||
title: '操作',
|
||||
dataIndex: 'x',
|
||||
render: (_: any, record: RecordType) => {
|
||||
const { type, bizName, id } = record;
|
||||
return type === TransType.DIMENSION ? (
|
||||
<Space>
|
||||
<Button
|
||||
style={{ padding: 0 }}
|
||||
key="importDictBtn"
|
||||
type="link"
|
||||
disabled={!knowledgeInfosMap?.[bizName]?.searchEnable}
|
||||
loading={!!recordLoadingMap[id]}
|
||||
onClick={(event) => {
|
||||
createDictTaskQuery(record);
|
||||
event.stopPropagation();
|
||||
}}
|
||||
>
|
||||
导入字典
|
||||
</Button>
|
||||
<Button
|
||||
style={{ padding: 0 }}
|
||||
key="editable"
|
||||
type="link"
|
||||
disabled={!knowledgeInfosMap?.[bizName]?.searchEnable}
|
||||
onClick={(event) => {
|
||||
setCurrentRecord(record);
|
||||
setCurrentDimensionSettingFormData(
|
||||
knowledgeInfosMap?.[bizName]?.knowledgeAdvancedConfig,
|
||||
);
|
||||
setDimensionValueSettingModalVisible(true);
|
||||
event.stopPropagation();
|
||||
}}
|
||||
>
|
||||
可见维度值设置
|
||||
</Button>
|
||||
</Space>
|
||||
) : (
|
||||
<></>
|
||||
);
|
||||
},
|
||||
},
|
||||
// {
|
||||
// dataIndex: 'y',
|
||||
// title: (
|
||||
// <TableTitleTooltips
|
||||
// title="维度值可见"
|
||||
// tooltips="勾选可见后，维度值将在搜索时可以被联想出来"
|
||||
// />
|
||||
// ),
|
||||
// width: 120,
|
||||
// render: (_: any, record: RecordType) => {
|
||||
// const { type, bizName } = record;
|
||||
// return type === TransType.DIMENSION ? (
|
||||
// <Checkbox
|
||||
// checked={knowledgeInfosMap?.[bizName]?.searchEnable}
|
||||
// onChange={(e: CheckboxChangeEvent) => {
|
||||
// updateKnowledgeInfosMap(record, { searchEnable: e.target.checked });
|
||||
// if (!e.target.checked) {
|
||||
// deleteDictTask(record);
|
||||
// }
|
||||
// }}
|
||||
// onClick={(event) => {
|
||||
// event.stopPropagation();
|
||||
// }}
|
||||
// />
|
||||
// ) : (
|
||||
// <></>
|
||||
// );
|
||||
// },
|
||||
// },
|
||||
// {
|
||||
// dataIndex: 'taskState',
|
||||
// width: 130,
|
||||
// title: (
|
||||
// <Space>
|
||||
// 导入字典状态
|
||||
// <span
|
||||
// className={styles.taskStateRefreshIcon}
|
||||
// onClick={() => {
|
||||
// queryDictLatestTaskList();
|
||||
// }}
|
||||
// >
|
||||
// <Tooltip title="刷新字典任务状态">
|
||||
// <RedoOutlined />
|
||||
// </Tooltip>
|
||||
// </span>
|
||||
// </Space>
|
||||
// ),
|
||||
// render: (_, record) => {
|
||||
// const { id, type } = record;
|
||||
// const target = taskStateMap[id];
|
||||
// if (type === TransType.DIMENSION && target) {
|
||||
// return DictTaskState[target] || '未知状态';
|
||||
// }
|
||||
// return '--';
|
||||
// },
|
||||
// },
|
||||
// {
|
||||
// title: '操作',
|
||||
// dataIndex: 'x',
|
||||
// render: (_: any, record: RecordType) => {
|
||||
// const { type, bizName, id } = record;
|
||||
// return type === TransType.DIMENSION ? (
|
||||
// <Space>
|
||||
// <Button
|
||||
// style={{ padding: 0 }}
|
||||
// key="importDictBtn"
|
||||
// type="link"
|
||||
// disabled={!knowledgeInfosMap?.[bizName]?.searchEnable}
|
||||
// loading={!!recordLoadingMap[id]}
|
||||
// onClick={(event) => {
|
||||
// createDictTaskQuery(record);
|
||||
// event.stopPropagation();
|
||||
// }}
|
||||
// >
|
||||
// 导入字典
|
||||
// </Button>
|
||||
// <Button
|
||||
// style={{ padding: 0 }}
|
||||
// key="editable"
|
||||
// type="link"
|
||||
// disabled={!knowledgeInfosMap?.[bizName]?.searchEnable}
|
||||
// onClick={(event) => {
|
||||
// setCurrentRecord(record);
|
||||
// setCurrentDimensionSettingFormData(
|
||||
// knowledgeInfosMap?.[bizName]?.knowledgeAdvancedConfig,
|
||||
// );
|
||||
// setDimensionValueSettingModalVisible(true);
|
||||
// event.stopPropagation();
|
||||
// }}
|
||||
// >
|
||||
// 可见维度值设置
|
||||
// </Button>
|
||||
// </Space>
|
||||
// ) : (
|
||||
// <></>
|
||||
// );
|
||||
// },
|
||||
// },
|
||||
];
|
||||
|
||||
const leftColumns: ColumnsType<RecordType> = [
|
||||
@@ -299,7 +299,7 @@ const DimensionMetricVisibleTableTransfer: React.FC<Props> = ({
|
||||
);
|
||||
}}
|
||||
</Transfer>
|
||||
<DimensionValueSettingModal
|
||||
{/* <DimensionValueSettingModal
|
||||
visible={dimensionValueSettingModalVisible}
|
||||
initialValues={currentDimensionSettingFormData}
|
||||
onSubmit={(formValues) => {
|
||||
@@ -309,12 +309,11 @@ const DimensionMetricVisibleTableTransfer: React.FC<Props> = ({
|
||||
onCancel={() => {
|
||||
setDimensionValueSettingModalVisible(false);
|
||||
}}
|
||||
/>
|
||||
/> */}
|
||||
</>
|
||||
);
|
||||
};
|
||||
|
||||
// export default DimensionMetricVisibleTableTransfer;
|
||||
export default connect(({ domainManger }: { domainManger: StateType }) => ({
|
||||
domainManger,
|
||||
}))(DimensionMetricVisibleTableTransfer);
|
||||
|
||||
@@ -1,29 +1,117 @@
|
||||
import { useEffect, forwardRef, useImperativeHandle } from 'react';
|
||||
import { useState, useEffect, forwardRef, useImperativeHandle } from 'react';
|
||||
import type { ForwardRefRenderFunction } from 'react';
|
||||
import { Form, Input } from 'antd';
|
||||
|
||||
import { Form, Input, Switch, Space, Button, Divider, Tooltip, message } from 'antd';
|
||||
import FormItemTitle from '@/components/FormHelper/FormItemTitle';
|
||||
import { RedoOutlined, InfoCircleOutlined } from '@ant-design/icons';
|
||||
import { formLayout } from '@/components/FormHelper/utils';
|
||||
import { DictTaskState, TransType } from '../../enum';
|
||||
import {
|
||||
getDomainExtendDetailConfig,
|
||||
addDomainExtend,
|
||||
editDomainExtend,
|
||||
searchDictLatestTaskList,
|
||||
createDictTask,
|
||||
} from '../../service';
|
||||
import type { IChatConfig, ISemantic } from '../../data';
|
||||
import { isString } from 'lodash';
|
||||
import styles from '../style.less';
|
||||
import CommonEditList from '../../components/CommonEditList';
|
||||
|
||||
type Props = {
|
||||
initialValues: any;
|
||||
modelId: number;
|
||||
dimensionItem: ISemantic.IDimensionItem;
|
||||
onSubmit?: () => void;
|
||||
};
|
||||
|
||||
type TaskStateMap = Record<string, DictTaskState>;
|
||||
|
||||
const FormItem = Form.Item;
|
||||
|
||||
const EntityCreateForm: ForwardRefRenderFunction<any, Props> = ({ initialValues }, ref) => {
|
||||
const DimensionValueSettingForm: ForwardRefRenderFunction<any, Props> = (
|
||||
{ modelId, dimensionItem },
|
||||
ref,
|
||||
) => {
|
||||
const [form] = Form.useForm();
|
||||
|
||||
const exchangeFields = ['blackList', 'whiteList'];
|
||||
const [modelRichConfigData, setModelRichConfigData] = useState<IChatConfig.IConfig>();
|
||||
const [dimensionVisible, setDimensionVisible] = useState<boolean>(false);
|
||||
const [taskStateMap, setTaskStateMap] = useState<TaskStateMap>({});
|
||||
const [saveLoading, setSaveLoading] = useState<boolean>(false);
|
||||
const [refreshLoading, setRefreshLoading] = useState<boolean>(false);
|
||||
|
||||
const queryThemeListData: any = async () => {
|
||||
const { code, data } = await getDomainExtendDetailConfig({
|
||||
modelId,
|
||||
});
|
||||
|
||||
if (code === 200) {
|
||||
setModelRichConfigData(data);
|
||||
const targetKnowledgeInfos = data?.chatAggRichConfig?.knowledgeInfos || [];
|
||||
const targetConfig = targetKnowledgeInfos.find(
|
||||
(item: IChatConfig.IKnowledgeInfosItem) => item.itemId === dimensionItem.id,
|
||||
);
|
||||
if (targetConfig) {
|
||||
const { knowledgeAdvancedConfig, searchEnable } = targetConfig;
|
||||
setDimensionVisible(searchEnable);
|
||||
const { blackList, whiteList, ruleList } = knowledgeAdvancedConfig;
|
||||
form.setFieldsValue({
|
||||
blackList: blackList.join(','),
|
||||
whiteList: whiteList.join(','),
|
||||
ruleList: ruleList || [],
|
||||
});
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
message.error('获取问答设置信息失败');
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
queryThemeListData();
|
||||
queryDictLatestTaskList();
|
||||
}, []);
|
||||
|
||||
const taskRender = (dimension: ISemantic.IDimensionItem) => {
|
||||
const { id, type } = dimension;
|
||||
const target = taskStateMap[id];
|
||||
if (type === TransType.DIMENSION && target) {
|
||||
return DictTaskState[target] || '未知状态';
|
||||
}
|
||||
return '--';
|
||||
};
|
||||
|
||||
const queryDictLatestTaskList = async () => {
|
||||
setRefreshLoading(true);
|
||||
const { code, data } = await searchDictLatestTaskList({
|
||||
modelId,
|
||||
});
|
||||
setRefreshLoading(false);
|
||||
if (code !== 200) {
|
||||
message.error('获取字典导入任务失败!');
|
||||
return;
|
||||
}
|
||||
const tastMap = data.reduce(
|
||||
(stateMap: TaskStateMap, item: { dimId: number; status: DictTaskState }) => {
|
||||
const { dimId, status } = item;
|
||||
stateMap[dimId] = status;
|
||||
return stateMap;
|
||||
},
|
||||
{},
|
||||
);
|
||||
setTaskStateMap(tastMap);
|
||||
};
|
||||
|
||||
const getFormValidateFields = async () => {
|
||||
const fields = await form.validateFields();
|
||||
const fieldValue = Object.keys(fields).reduce((formField, key: string) => {
|
||||
const targetValue = fields[key];
|
||||
if (isString(targetValue) && exchangeFields.includes(key)) {
|
||||
formField[key] = targetValue.split(',');
|
||||
if (exchangeFields.includes(key)) {
|
||||
if (isString(targetValue)) {
|
||||
formField[key] = targetValue.split(',');
|
||||
} else {
|
||||
formField[key] = [];
|
||||
}
|
||||
} else {
|
||||
formField[key] = targetValue;
|
||||
}
|
||||
@@ -34,47 +122,201 @@ const EntityCreateForm: ForwardRefRenderFunction<any, Props> = ({ initialValues
|
||||
};
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
form.resetFields();
|
||||
if (!initialValues) {
|
||||
return;
|
||||
}
|
||||
const fieldValue = Object.keys(initialValues).reduce((formField, key: string) => {
|
||||
const targetValue = initialValues[key];
|
||||
if (Array.isArray(targetValue) && exchangeFields.includes(key)) {
|
||||
formField[key] = targetValue.join(',');
|
||||
} else {
|
||||
formField[key] = targetValue;
|
||||
}
|
||||
return formField;
|
||||
}, {});
|
||||
form.setFieldsValue({
|
||||
...fieldValue,
|
||||
});
|
||||
}, [initialValues]);
|
||||
|
||||
useImperativeHandle(ref, () => ({
|
||||
getFormValidateFields,
|
||||
}));
|
||||
|
||||
const createDictTaskQuery = async (dimension: ISemantic.IDimensionItem) => {
|
||||
const { code } = await createDictTask({
|
||||
updateMode: 'REALTIME_ADD',
|
||||
modelAndDimPair: {
|
||||
[modelId]: [dimension.id],
|
||||
},
|
||||
});
|
||||
|
||||
if (code !== 200) {
|
||||
message.error('字典导入任务创建失败!');
|
||||
return;
|
||||
}
|
||||
setTimeout(() => {
|
||||
queryDictLatestTaskList();
|
||||
}, 2000);
|
||||
};
|
||||
|
||||
const saveEntity = async (searchEnable = dimensionVisible) => {
|
||||
setSaveLoading(true);
|
||||
const globalKnowledgeConfigFormFields: any = await getFormValidateFields();
|
||||
const tempData = { ...modelRichConfigData };
|
||||
const targetKnowledgeInfos = modelRichConfigData?.chatAggRichConfig?.knowledgeInfos;
|
||||
let knowledgeInfos: IChatConfig.IKnowledgeInfosItem[] = [];
|
||||
if (Array.isArray(targetKnowledgeInfos)) {
|
||||
knowledgeInfos = targetKnowledgeInfos.reduce(
|
||||
(
|
||||
knowledgeInfosList: IChatConfig.IKnowledgeInfosItem[],
|
||||
item: IChatConfig.IKnowledgeInfosItem,
|
||||
) => {
|
||||
if (item.itemId === dimensionItem.id) {
|
||||
knowledgeInfosList.push({
|
||||
...item,
|
||||
knowledgeAdvancedConfig: {
|
||||
...item.knowledgeAdvancedConfig,
|
||||
...globalKnowledgeConfigFormFields,
|
||||
},
|
||||
searchEnable,
|
||||
});
|
||||
} else {
|
||||
knowledgeInfosList.push({
|
||||
...item,
|
||||
});
|
||||
}
|
||||
return knowledgeInfosList;
|
||||
},
|
||||
[],
|
||||
);
|
||||
}
|
||||
|
||||
const { id, modelId, chatAggRichConfig } = tempData;
|
||||
const saveParams = {
|
||||
id,
|
||||
modelId,
|
||||
chatAggConfig: {
|
||||
...chatAggRichConfig,
|
||||
knowledgeInfos,
|
||||
},
|
||||
};
|
||||
let saveDomainExtendQuery = addDomainExtend;
|
||||
if (id) {
|
||||
saveDomainExtendQuery = editDomainExtend;
|
||||
}
|
||||
|
||||
const { code, msg } = await saveDomainExtendQuery({
|
||||
...saveParams,
|
||||
});
|
||||
setSaveLoading(false);
|
||||
if (code === 200) {
|
||||
return;
|
||||
}
|
||||
message.error(msg);
|
||||
};
|
||||
|
||||
return (
|
||||
<>
|
||||
<Form {...formLayout} form={form} layout="vertical" className={styles.form}>
|
||||
<FormItem name="blackList" label="黑名单">
|
||||
<Input placeholder="多个维度值用英文逗号隔开" />
|
||||
</FormItem>
|
||||
<Form
|
||||
{...formLayout}
|
||||
form={form}
|
||||
style={{ margin: '0 30px 30px 30px' }}
|
||||
layout="vertical"
|
||||
className={styles.form}
|
||||
>
|
||||
<FormItem
|
||||
style={{ marginTop: 15, marginBottom: -30 }}
|
||||
label={
|
||||
<FormItemTitle
|
||||
title={
|
||||
<>
|
||||
<Space>
|
||||
<span style={{ fontSize: 16 }}>维度值可见</span>
|
||||
<Switch
|
||||
defaultChecked
|
||||
size="small"
|
||||
checked={dimensionVisible}
|
||||
onChange={(value) => {
|
||||
saveEntity(value);
|
||||
setDimensionVisible(value);
|
||||
}}
|
||||
/>
|
||||
</Space>
|
||||
</>
|
||||
}
|
||||
subTitle={'设置可见后，维度值将在搜索时可以被联想出来'}
|
||||
/>
|
||||
}
|
||||
>
|
||||
{dimensionVisible && (
|
||||
<Space size={20} style={{ marginBottom: 20 }}>
|
||||
<Button
|
||||
type="link"
|
||||
size="small"
|
||||
style={{ padding: 0 }}
|
||||
onClick={(event) => {
|
||||
createDictTaskQuery(dimensionItem);
|
||||
event.stopPropagation();
|
||||
}}
|
||||
>
|
||||
<Tooltip title="立即将维度值导入字典">
|
||||
<Space>
|
||||
立即导入字典 <InfoCircleOutlined />
|
||||
</Space>
|
||||
</Tooltip>
|
||||
</Button>
|
||||
|
||||
<FormItem name="whiteList" label="白名单">
|
||||
<Input placeholder="多个维度值用英文逗号隔开" />
|
||||
</FormItem>
|
||||
<Tooltip title="刷新字典任务状态">
|
||||
<Space>
|
||||
<Button
|
||||
style={{ cursor: 'pointer' }}
|
||||
type="text"
|
||||
loading={refreshLoading}
|
||||
onClick={() => {
|
||||
queryDictLatestTaskList();
|
||||
}}
|
||||
>
|
||||
导入状态
|
||||
<RedoOutlined />:
|
||||
</Button>
|
||||
</Space>
|
||||
</Tooltip>
|
||||
|
||||
<FormItem name="ruleList">
|
||||
{/* <SqlEditor height={'150px'} /> */}
|
||||
<CommonEditList title="过滤规则" />
|
||||
<span>{taskRender(dimensionItem)}</span>
|
||||
</Space>
|
||||
)}
|
||||
</FormItem>
|
||||
{dimensionVisible && (
|
||||
<>
|
||||
<Divider
|
||||
style={{
|
||||
marginBottom: 35,
|
||||
}}
|
||||
/>
|
||||
<div style={{ padding: 20, border: '1px solid #eee', borderRadius: 10 }}>
|
||||
<div
|
||||
style={{
|
||||
color: '#2f374c',
|
||||
fontSize: 16,
|
||||
display: 'flex',
|
||||
marginBottom: 20,
|
||||
}}
|
||||
>
|
||||
<span style={{ flex: 'auto' }}>维度值过滤</span>
|
||||
<span style={{ marginLeft: 'auto' }}>
|
||||
<Button
|
||||
type="primary"
|
||||
onClick={() => {
|
||||
saveEntity();
|
||||
}}
|
||||
loading={saveLoading}
|
||||
>
|
||||
保 存
|
||||
</Button>
|
||||
</span>
|
||||
</div>
|
||||
|
||||
<FormItem name="blackList" label="黑名单">
|
||||
<Input placeholder="多个维度值用英文逗号隔开" />
|
||||
</FormItem>
|
||||
|
||||
<FormItem name="whiteList" label="白名单">
|
||||
<Input placeholder="多个维度值用英文逗号隔开" />
|
||||
</FormItem>
|
||||
|
||||
<FormItem name="ruleList">
|
||||
<CommonEditList title="过滤规则" />
|
||||
</FormItem>
|
||||
</div>
|
||||
</>
|
||||
)}
|
||||
</Form>
|
||||
</>
|
||||
);
|
||||
};
|
||||
|
||||
export default forwardRef(EntityCreateForm);
|
||||
export default forwardRef(DimensionValueSettingForm);
|
||||
|
||||
@@ -1,56 +0,0 @@
|
||||
import React, { useRef } from 'react';
|
||||
import { Button, Modal } from 'antd';
|
||||
import DimensionValueSettingForm from './DimensionValueSettingForm';
|
||||
|
||||
type Props = {
|
||||
initialValues: any;
|
||||
onCancel?: () => void;
|
||||
visible: boolean;
|
||||
onSubmit?: (params?: any) => void;
|
||||
};
|
||||
const DimensionValueSettingModal: React.FC<Props> = ({
|
||||
initialValues,
|
||||
visible,
|
||||
onCancel,
|
||||
onSubmit,
|
||||
}) => {
|
||||
const formRef = useRef<any>();
|
||||
|
||||
const handleSubmit = async () => {
|
||||
const formValues = await formRef.current.getFormValidateFields();
|
||||
onSubmit?.(formValues);
|
||||
};
|
||||
|
||||
const renderFooter = () => {
|
||||
return (
|
||||
<>
|
||||
<Button onClick={onCancel}>取消</Button>
|
||||
<Button
|
||||
type="primary"
|
||||
onClick={() => {
|
||||
handleSubmit();
|
||||
}}
|
||||
>
|
||||
完成
|
||||
</Button>
|
||||
</>
|
||||
);
|
||||
};
|
||||
return (
|
||||
<>
|
||||
<Modal
|
||||
width={600}
|
||||
destroyOnClose
|
||||
title={'维度值设置'}
|
||||
maskClosable={false}
|
||||
open={visible}
|
||||
footer={renderFooter()}
|
||||
onCancel={onCancel}
|
||||
>
|
||||
<DimensionValueSettingForm initialValues={initialValues} ref={formRef} />
|
||||
</Modal>
|
||||
</>
|
||||
);
|
||||
};
|
||||
|
||||
export default DimensionValueSettingModal;
|
||||
@@ -8,7 +8,6 @@ import ProCard from '@ant-design/pro-card';
|
||||
|
||||
import DefaultSettingForm from './DefaultSettingForm';
|
||||
import type { IChatConfig } from '../../data';
|
||||
import DimensionMetricVisibleForm from './DimensionMetricVisibleForm';
|
||||
import { ChatConfigType } from '../../enum';
|
||||
|
||||
type Props = {
|
||||
@@ -19,7 +18,6 @@ type Props = {
|
||||
|
||||
const EntitySection: React.FC<Props> = ({
|
||||
domainManger,
|
||||
dispatch,
|
||||
chatConfigType = ChatConfigType.DETAIL,
|
||||
}) => {
|
||||
const { selectDomainId, selectModelId: modelId, dimensionList, metricList } = domainManger;
|
||||
@@ -59,28 +57,6 @@ const EntitySection: React.FC<Props> = ({
|
||||
return (
|
||||
<div style={{ width: 800, margin: '0 auto' }}>
|
||||
<Space direction="vertical" style={{ width: '100%' }} size={20}>
|
||||
<ProCard bordered title="问答可见">
|
||||
<DimensionMetricVisibleForm
|
||||
chatConfigKey={
|
||||
chatConfigType === ChatConfigType.DETAIL ? 'chatDetailConfig' : 'chatAggConfig'
|
||||
}
|
||||
entityData={entityData || {}}
|
||||
domainId={Number(selectDomainId)}
|
||||
metricList={metricList}
|
||||
dimensionList={dimensionList}
|
||||
onSubmit={(params: any = {}) => {
|
||||
if (params.from === 'dimensionSearchVisible') {
|
||||
dispatch({
|
||||
type: 'domainManger/queryDimensionList',
|
||||
payload: {
|
||||
domainId: selectDomainId,
|
||||
},
|
||||
});
|
||||
}
|
||||
queryThemeListData();
|
||||
}}
|
||||
/>
|
||||
</ProCard>
|
||||
<ProCard bordered title="默认设置">
|
||||
<DefaultSettingForm
|
||||
domainId={Number(selectDomainId)}
|
||||
|
||||
Reference in New Issue
Block a user