[improvement][headless-be] Optimized the logic for intent confirmation and streamlined mode in the question-answering dialogue of the assistant module. (#1860)

* [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

* [improvement][headless-fe] Changed the METRIC type in ChatContextType queryType to AGGREGATE

* [improvement][headless-fe] Added query and batch delete operations to the terminology management feature

* [improvement][headless-fe] Enhanced the memory management feature by adding sorting functionality and other optimization features.

* [improvement][headless-fe] Resolved the compatibility issue with the backend service where the updatedAt and other time fields were not being properly converted to the updated_at format for sorting purposes.

* [improvement][headless-fe] Added a configuration interface for large language models

* [improvement][headless-fe] Introduced a new configuration option in the assistant module specifically for large model applications.

* [improvement][headless-fe] Replaced the agentConfig with toolConfig

* [improvement][headless-fe] Resolved the issue with the test connection parameters for the large model configuration.

* [improvement][headless-fe] Implemented a new feature where the tool configuration types can be fetched from the backend API

* [improvement][headless-fe] Updated the dimension value settings to retrieve and display values from a dictionary.

* [improvement][headless-fe] Adjusted the pageSize of the dimension value settings list to 20.

* [improvement][headless-fe] Introduced a revamped configuration for the large model in the assistant module.

* [improvement][headless-fe] Added new functionality to the assistant's memory management system

* [improvement][headless-fe] Optimized the management of CSS styles in the assistant module.

* [improvement][headless] fixed build config

* [improvement][headless-fe] Revamped the dimension value settings in the assistant module.

* [improvement][headless-fe] Optimized the initialization process of dimension value settings in the assistant module.

* [improvement][headless-fe] Added support for user confirmation mode in the question-answering dialogue of the assistant module.

* [improvement][headless-be] As part of the ongoing improvements to the question-answering dialogue, the datasetId will now be included as a parameter in the API endpoint /api/chat/query/search for querying the question-answering dataset.

* [improvement][headless-be] Optimized the logic for intent confirmation and streamlined mode in the question-answering dialogue of the assistant module.

---------

Co-authored-by: tristanliu <tristanliu@tencent.com>
This commit is contained in:
tristanliu
2024-10-30 17:22:37 +08:00
committed by GitHub
parent 621fefb4d4
commit 840de515a6
18 changed files with 399 additions and 620 deletions

View File

@@ -45,7 +45,6 @@ const MessageContainer: React.FC<Props> = ({
onSendMsg, onSendMsg,
}) => { }) => {
const [triggerResize, setTriggerResize] = useState(false); const [triggerResize, setTriggerResize] = useState(false);
const onResize = useCallback(() => { const onResize = useCallback(() => {
setTriggerResize(true); setTriggerResize(true);
setTimeout(() => { setTimeout(() => {
@@ -71,6 +70,7 @@ const MessageContainer: React.FC<Props> = ({
{messageList.map((msgItem: MessageItem, index: number) => { {messageList.map((msgItem: MessageItem, index: number) => {
const { const {
id: msgId, id: msgId,
questionId,
modelId, modelId,
agentId, agentId,
type, type,
@@ -95,6 +95,7 @@ const MessageContainer: React.FC<Props> = ({
<Text position="right" data={msg} /> <Text position="right" data={msg} />
{identityMsg && <Text position="left" data={identityMsg} />} {identityMsg && <Text position="left" data={identityMsg} />}
<ChatItem <ChatItem
questionId={questionId}
currentAgent={currentAgent} currentAgent={currentAgent}
isSimpleMode={isSimpleMode} isSimpleMode={isSimpleMode}
isDebugMode={isDebugMode} isDebugMode={isDebugMode}

View File

@@ -200,6 +200,7 @@ const Chat: ForwardRefRenderFunction<any, Props> = (
const convertHistoryMsg = (list: HistoryMsgItemType[]) => { const convertHistoryMsg = (list: HistoryMsgItemType[]) => {
return list.map((item: HistoryMsgItemType) => ({ return list.map((item: HistoryMsgItemType) => ({
id: item.questionId, id: item.questionId,
questionId: item.questionId,
type: MessageTypeEnum.QUESTION, type: MessageTypeEnum.QUESTION,
msg: item.queryText, msg: item.queryText,
parseInfos: item.parseInfos, parseInfos: item.parseInfos,

View File

@@ -17,6 +17,7 @@ export type MessageItem = {
id: string | number; id: string | number;
type?: MessageTypeEnum; type?: MessageTypeEnum;
msg?: string; msg?: string;
questionId?: number;
msgValue?: string; msgValue?: string;
identityMsg?: string; identityMsg?: string;
modelId?: number; modelId?: number;

View File

@@ -1,7 +1,7 @@
import React, { ReactNode } from 'react'; import React, { ReactNode } from 'react';
import { ChatContextType, DateInfoType, EntityInfoType, FilterItemType } from '../../common/type'; import { ChatContextType, DateInfoType, EntityInfoType, FilterItemType } from '../../common/type';
import { Button, DatePicker, Row, Col, Tag } from 'antd'; import { Button, DatePicker, Row, Col } from 'antd';
import { CheckCircleFilled, CloseCircleFilled, ReloadOutlined } from '@ant-design/icons'; import { CheckCircleFilled, CloseCircleFilled } from '@ant-design/icons';
import Loading from './Loading'; import Loading from './Loading';
import FilterItem from './FilterItem'; import FilterItem from './FilterItem';
import classNames from 'classnames'; import classNames from 'classnames';
@@ -9,6 +9,7 @@ import { isMobile } from '../../utils/utils';
import dayjs, { Dayjs } from 'dayjs'; import dayjs, { Dayjs } from 'dayjs';
import quarterOfYear from 'dayjs/plugin/quarterOfYear'; import quarterOfYear from 'dayjs/plugin/quarterOfYear';
import { prefixCls, getTipNode } from './ParseTipUtils'; import { prefixCls, getTipNode } from './ParseTipUtils';
import MarkDown from '../ChatMsg/MarkDown';
import 'dayjs/locale/zh-cn'; import 'dayjs/locale/zh-cn';
@@ -18,14 +19,10 @@ dayjs.locale('zh-cn');
const { RangePicker } = DatePicker; const { RangePicker } = DatePicker;
type Props = { type Props = {
parseLoading: boolean; isSimpleMode?: boolean;
parseInfoOptions: ChatContextType[]; parseInfoOptions: ChatContextType[];
parseTip: string;
currentParseInfo?: ChatContextType; currentParseInfo?: ChatContextType;
agentId?: number; agentId?: number;
dimensionFilters: FilterItemType[];
dateInfo: DateInfoType;
entityInfo: EntityInfoType;
integrateSystem?: string; integrateSystem?: string;
parseTimeCost?: number; parseTimeCost?: number;
isDeveloper?: boolean; isDeveloper?: boolean;
@@ -41,14 +38,10 @@ type RangeValue = [Dayjs, Dayjs];
type RangeKeys = '近7日' | '近14日' | '近30日' | '本周' | '本月' | '上月' | '本季度' | '本年'; type RangeKeys = '近7日' | '近14日' | '近30日' | '本周' | '本月' | '上月' | '本季度' | '本年';
const ExpandParseTip: React.FC<Props> = ({ const ExpandParseTip: React.FC<Props> = ({
parseLoading, isSimpleMode = false,
parseInfoOptions, parseInfoOptions,
parseTip,
currentParseInfo, currentParseInfo,
agentId, agentId,
dimensionFilters,
dateInfo,
entityInfo,
integrateSystem, integrateSystem,
parseTimeCost, parseTimeCost,
isDeveloper, isDeveloper,
@@ -76,21 +69,26 @@ const ExpandParseTip: React.FC<Props> = ({
const getNode = (tipTitle: ReactNode, tipNode?: ReactNode, failed?: boolean) => { const getNode = (tipTitle: ReactNode, tipNode?: ReactNode, failed?: boolean) => {
return ( return (
<div className={`${prefixCls}-parse-tip`}> <div className={`${prefixCls}-parse-tip`}>
<div className={`${prefixCls}-title-bar`}> {isSimpleMode ? (
{!failed ? ( <></>
<CheckCircleFilled className={`${prefixCls}-step-icon`} /> ) : (
) : ( <div className={`${prefixCls}-title-bar`}>
<CloseCircleFilled className={`${prefixCls}-step-error-icon`} /> {!failed ? (
)} <CheckCircleFilled className={`${prefixCls}-step-icon`} />
<div className={`${prefixCls}-step-title`}> ) : (
{tipTitle} <CloseCircleFilled className={`${prefixCls}-step-error-icon`} />
{tipNode === undefined && <Loading />} )}
<div className={`${prefixCls}-step-title`}>
{tipTitle}
{tipNode === undefined && <Loading />}
</div>
</div> </div>
</div> )}
{(tipNode || tipNode === null) && ( {(tipNode || tipNode === null) && (
<div <div
className={classNames( className={classNames(
`${prefixCls}-content-container`, !isSimpleMode && `${prefixCls}-content-container`,
tipNode === null && `${prefixCls}-empty-content-container`, tipNode === null && `${prefixCls}-empty-content-container`,
failed && `${prefixCls}-content-container-failed` failed && `${prefixCls}-content-container-failed`
)} )}
@@ -102,37 +100,17 @@ const ExpandParseTip: React.FC<Props> = ({
); );
}; };
if (parseLoading) {
return getNode('意图解析中');
}
if (parseTip) {
return getNode(
<>
{!!parseTimeCost && isDeveloper && (
<span className={`${prefixCls}-title-tip`}>(: {parseTimeCost}ms)</span>
)}
</>,
parseTip,
true
);
}
if (parseInfoOptions.length === 0) {
return null;
}
const { modelId, queryMode, entity, nativeQuery } = currentParseInfo || {}; const { modelId, queryMode, entity, nativeQuery } = currentParseInfo || {};
const entityAlias = entity?.alias?.[0]?.split('.')?.[0]; const entityAlias = entity?.alias?.[0]?.split('.')?.[0];
const getFilterContent = (filters: any) => { const getFilterContent = (filters: any, dateInfo: DateInfoType) => {
const itemValueClass = `${prefixCls}-tip-item-value`; const itemValueClass = `${prefixCls}-tip-item-value`;
const { startDate, endDate } = dateInfo || {}; const { startDate, endDate } = dateInfo || {};
const tipItemOptionClass = classNames(`${prefixCls}-tip-item-option`, { const tipItemOptionClass = classNames(`${prefixCls}-tip-item-option`, {
[`${prefixCls}-mobile-tip-item-option`]: isMobile, [`${prefixCls}-mobile-tip-item-option`]: isMobile,
}); });
const disabled = true;
return ( return (
<div className={`${prefixCls}-tip-item-filter-content`}> <div className={`${prefixCls}-tip-item-filter-content`}>
{!!dateInfo && ( {!!dateInfo && (
@@ -147,6 +125,7 @@ const ExpandParseTip: React.FC<Props> = ({
value={[dayjs(startDate), dayjs(endDate)]} value={[dayjs(startDate), dayjs(endDate)]}
onChange={onDateInfoChange} onChange={onDateInfoChange}
format="YYYY-MM-DD" format="YYYY-MM-DD"
disabled={disabled}
renderExtraFooter={() => ( renderExtraFooter={() => (
<Row gutter={[28, 28]}> <Row gutter={[28, 28]}>
{Object.keys(ranges).map(key => ( {Object.keys(ranges).map(key => (
@@ -167,6 +146,7 @@ const ExpandParseTip: React.FC<Props> = ({
)} )}
{filters?.map((filter: any, index: number) => ( {filters?.map((filter: any, index: number) => (
<FilterItem <FilterItem
disabled={disabled}
modelId={modelId!} modelId={modelId!}
filters={filters} filters={filters}
filter={filter} filter={filter}
@@ -185,13 +165,14 @@ const ExpandParseTip: React.FC<Props> = ({
}; };
const getFiltersNode = parseInfo => { const getFiltersNode = parseInfo => {
const { dateInfo, dimensionFilters } = parseInfo;
return ( return (
<> <>
{(!!dateInfo || !!dimensionFilters?.length) && ( {(!!dateInfo || !!dimensionFilters?.length) && (
<div className={`${prefixCls}-tip-item`}> <div className={`${prefixCls}-tip-item`}>
<div className={`${prefixCls}-tip-item-name`}></div> <div className={`${prefixCls}-tip-item-name`}></div>
<div className={`${prefixCls}-tip-item-content`}> <div className={`${prefixCls}-tip-item-content`}>
{getFilterContent(dimensionFilters)} {getFilterContent(dimensionFilters, dateInfo)}
</div> </div>
</div> </div>
)} )}
@@ -202,59 +183,109 @@ const ExpandParseTip: React.FC<Props> = ({
return getNode( return getNode(
<div className={`${prefixCls}-title-bar`}> <div className={`${prefixCls}-title-bar`}>
<div> <div>
{!!parseTimeCost && isDeveloper && ( {!!parseTimeCost && isDeveloper && (
<span className={`${prefixCls}-title-tip`}>(: {parseTimeCost}ms)</span> <span className={`${prefixCls}-title-tip`}>(: {parseTimeCost}ms)</span>
)} )}
</div> </div>
</div>, </div>,
queryMode === 'PLAIN_TEXT' ? null : (
<> <>
<div> <div>
{parseInfoOptions.map((parseInfo, index) => { {parseInfoOptions.map((parseInfo, index) => {
const { queryMode, properties } = parseInfo || {}; const { queryMode, properties, textInfo, id, dimensionFilters, entityInfo } =
const { type: agentType } = properties || {}; parseInfo || {};
return ( const { type: agentType } = properties || {};
<div style={{ marginBottom: 10, paddingBottom: 10, borderBottom: '1px solid #eee' }}> return isSimpleMode ? (
<div style={{ marginBottom: 10, height: '30px', lineHeight: '30px' }}> <>
<span className={`${prefixCls}-content-parser-options-title`}> <div style={{ marginBottom: 10 }}>
{index + 1}: <span
</span> className={`${prefixCls}-content-parser-options-title`}
</div> style={{ display: 'flex' }}
<div className={`${prefixCls}-tip`}> >
<span style={{ paddingTop: 3, marginRight: 10 }}>{index + 1}: </span>{' '}
<MarkDown markdown={textInfo} />
</span>
</div>
</>
) : (
<div
style={{ marginBottom: 10, paddingBottom: 10, borderBottom: '1px solid #eee' }}
key={`${id}-${textInfo}`}
>
<div style={{ marginBottom: 10, height: '30px', lineHeight: '30px' }}>
<span className={`${prefixCls}-content-parser-options-title`}>
{index + 1}:
</span>
</div>
<div className={`${prefixCls}-tip`}>
<>
{getTipNode({ parseInfo, dimensionFilters, entityInfo })} {getTipNode({ parseInfo, dimensionFilters, entityInfo })}
{!(!!agentType && queryMode !== 'LLM_S2SQL') && getFiltersNode(parseInfo)} {!(!!agentType && queryMode !== 'LLM_S2SQL') && getFiltersNode(parseInfo)}
</div> </>
</div> </div>
); </div>
})} );
{parseInfoOptions?.length > 1 && ( })}
<div className={`${prefixCls}-content-parser-container`}> {/* {parseInfoOptions.map((parseInfo, index) => {
<div className={`${prefixCls}-content-options`}> const { queryMode, properties, textInfo, id, dimensionFilters, entityInfo } =
parseInfo || {};
const { type: agentType } = properties || {};
return (
<div
style={{ marginBottom: 10, paddingBottom: 10, borderBottom: '1px solid #eee' }}
key={`${id}-${textInfo}`}
>
<div style={{ marginBottom: 10, height: '30px', lineHeight: '30px' }}>
<span className={`${prefixCls}-content-parser-options-title`}>
解析{index + 1}:
</span>
</div>
<div className={`${prefixCls}-tip`}>
{isSimpleMode ? (
<MarkDown markdown={textInfo} />
) : (
<>
{getTipNode({ parseInfo, dimensionFilters, entityInfo })}
{!(!!agentType && queryMode !== 'LLM_S2SQL') && getFiltersNode(parseInfo)}
</>
)}
</div>
</div>
);
})} */}
{parseInfoOptions?.length > 1 && (
<div className={`${prefixCls}-content-parser-container`}>
<div className={`${prefixCls}-content-options`}>
{!currentParseInfo && (
<span className={`${prefixCls}-breathing-text`}> <span className={`${prefixCls}-breathing-text`}>
: :
</span> </span>
{parseInfoOptions.map((parseInfo, index) => ( )}
<div
className={`${prefixCls}-content-option ${ {parseInfoOptions.map((parseInfo, index) => (
parseInfo.id === currentParseInfo?.id <div
? `${prefixCls}-content-option-active` className={`${prefixCls}-content-option ${
: '' parseInfo.id === currentParseInfo?.id
}`} ? `${prefixCls}-content-option-active`
onClick={() => { : ''
onSelectParseInfo(parseInfo); } ${currentParseInfo ? `${prefixCls}-content-option-disabled` : ''}`}
}} onClick={() => {
key={parseInfo.id} if (currentParseInfo) {
> return;
{index + 1} }
</div> onSelectParseInfo(parseInfo);
))} }}
</div> key={parseInfo.id}
>
{index + 1}
</div>
))}
</div> </div>
)} </div>
</div> )}
</> </div>
) </>
); );
}; };

View File

@@ -14,6 +14,7 @@ type Props = {
index: number; index: number;
chatContext: ChatContextType; chatContext: ChatContextType;
agentId?: number; agentId?: number;
disabled?: boolean;
entityAlias?: string; entityAlias?: string;
integrateSystem?: string; integrateSystem?: string;
onFiltersChange: (filters: FilterItemType[]) => void; onFiltersChange: (filters: FilterItemType[]) => void;
@@ -21,6 +22,7 @@ type Props = {
}; };
const FilterItem: React.FC<Props> = ({ const FilterItem: React.FC<Props> = ({
disabled = false,
modelId, modelId,
filters, filters,
filter, filter,
@@ -151,6 +153,7 @@ const FilterItem: React.FC<Props> = ({
{ label: '小于等于', value: '<=' }, { label: '小于等于', value: '<=' },
{ label: '小于', value: '<' }, { label: '小于', value: '<' },
]} ]}
disabled={disabled}
className={`${prefixCls}-operator-control`} className={`${prefixCls}-operator-control`}
value={filter.operator} value={filter.operator}
onChange={onOperatorChange} onChange={onOperatorChange}
@@ -159,6 +162,7 @@ const FilterItem: React.FC<Props> = ({
{(typeof filter.value === 'number' || filter.value === null) && {(typeof filter.value === 'number' || filter.value === null) &&
!filter.bizName?.includes('_id') ? ( !filter.bizName?.includes('_id') ? (
<InputNumber <InputNumber
disabled={disabled}
className={`${prefixCls}-input-number-control`} className={`${prefixCls}-input-number-control`}
value={filter.value} value={filter.value}
onChange={onChange} onChange={onChange}
@@ -168,6 +172,7 @@ const FilterItem: React.FC<Props> = ({
) : (typeof filter.value === 'string' || isArray(filter.value)) && ) : (typeof filter.value === 'string' || isArray(filter.value)) &&
!filter.bizName?.includes('_id') ? ( !filter.bizName?.includes('_id') ? (
<Select <Select
disabled={disabled}
value={filter.value} value={filter.value}
options={options.filter(option => option.value !== '' && option.value !== null)} options={options.filter(option => option.value !== '' && option.value !== null)}
className={`${prefixCls}-select-control`} className={`${prefixCls}-select-control`}

View File

@@ -43,6 +43,7 @@ type RangeValue = [Dayjs, Dayjs];
type RangeKeys = '近7日' | '近14日' | '近30日' | '本周' | '本月' | '上月' | '本季度' | '本年'; type RangeKeys = '近7日' | '近14日' | '近30日' | '本周' | '本月' | '上月' | '本季度' | '本年';
const ParseTip: React.FC<Props> = ({ const ParseTip: React.FC<Props> = ({
isSimpleMode = false,
parseLoading, parseLoading,
parseInfoOptions, parseInfoOptions,
parseTip, parseTip,
@@ -54,7 +55,6 @@ const ParseTip: React.FC<Props> = ({
integrateSystem, integrateSystem,
parseTimeCost, parseTimeCost,
isDeveloper, isDeveloper,
isSimpleMode,
onSelectParseInfo, onSelectParseInfo,
onSwitchEntity, onSwitchEntity,
onFiltersChange, onFiltersChange,
@@ -122,7 +122,7 @@ const ParseTip: React.FC<Props> = ({
); );
} }
if (parseInfoOptions.length === 0) { if (isSimpleMode || parseInfoOptions.length === 0) {
return null; return null;
} }
@@ -231,7 +231,8 @@ const ParseTip: React.FC<Props> = ({
)} )}
</div> </div>
</div>, </div>,
isSimpleMode ? <MarkDown markdown={textInfo} /> : queryMode === 'PLAIN_TEXT' ? null : tipNode // isSimpleMode ? <MarkDown markdown={textInfo} /> : queryMode === 'PLAIN_TEXT' ? null : tipNode
queryMode === 'PLAIN_TEXT' ? null : tipNode
); );
}; };

View File

@@ -29,6 +29,7 @@ import { exportCsvFile } from '../../utils/utils';
type Props = { type Props = {
msg: string; msg: string;
conversationId?: number; conversationId?: number;
questionId?: number;
modelId?: number; modelId?: number;
agentId?: number; agentId?: number;
score?: number; score?: number;
@@ -53,6 +54,7 @@ type Props = {
const ChatItem: React.FC<Props> = ({ const ChatItem: React.FC<Props> = ({
msg, msg,
conversationId, conversationId,
questionId,
modelId, modelId,
agentId, agentId,
score, score,
@@ -77,8 +79,11 @@ const ChatItem: React.FC<Props> = ({
const [parseTimeCost, setParseTimeCost] = useState<ParseTimeCostType>(); const [parseTimeCost, setParseTimeCost] = useState<ParseTimeCostType>();
const [parseInfo, setParseInfo] = useState<ChatContextType>(); const [parseInfo, setParseInfo] = useState<ChatContextType>();
const [parseInfoOptions, setParseInfoOptions] = useState<ChatContextType[]>([]); const [parseInfoOptions, setParseInfoOptions] = useState<ChatContextType[]>([]);
const [preParseInfoOptions, setPreParseInfoOptions] = useState<ChatContextType[]>([]);
const [parseTip, setParseTip] = useState(''); const [parseTip, setParseTip] = useState('');
const [executeMode, setExecuteMode] = useState(false); const [executeMode, setExecuteMode] = useState(false);
const [preParseMode, setPreParseMode] = useState(false);
const [showExpandParseTip, setShowExpandParseTip] = useState(false);
const [executeLoading, setExecuteLoading] = useState(false); const [executeLoading, setExecuteLoading] = useState(false);
const [executeTip, setExecuteTip] = useState(''); const [executeTip, setExecuteTip] = useState('');
const [executeErrorMsg, setExecuteErrorMsg] = useState(''); const [executeErrorMsg, setExecuteErrorMsg] = useState('');
@@ -97,6 +102,9 @@ const ChatItem: React.FC<Props> = ({
setParseTimeCost(undefined); setParseTimeCost(undefined);
setParseInfo(undefined); setParseInfo(undefined);
setParseInfoOptions([]); setParseInfoOptions([]);
setPreParseMode(false);
setShowExpandParseTip(false);
setPreParseInfoOptions([]);
setParseTip(''); setParseTip('');
setExecuteMode(false); setExecuteMode(false);
setDimensionFilters([]); setDimensionFilters([]);
@@ -222,7 +230,11 @@ const ChatItem: React.FC<Props> = ({
...item, ...item,
queryId, queryId,
})); }));
if (parseInfos.length > 1) {
setPreParseInfoOptions(parseInfos);
setShowExpandParseTip(true);
setPreParseMode(true);
}
setParseInfoOptions(parseInfos || []); setParseInfoOptions(parseInfos || []);
const parseInfoValue = parseInfos[0]; const parseInfoValue = parseInfos[0];
if (!(currentAgent?.enableFeedback === 1 && parseInfos.length > 1)) { if (!(currentAgent?.enableFeedback === 1 && parseInfos.length > 1)) {
@@ -368,48 +380,32 @@ const ChatItem: React.FC<Props> = ({
const onExpandSelectParseInfo = async (parseInfoValue: ChatContextType) => { const onExpandSelectParseInfo = async (parseInfoValue: ChatContextType) => {
setParseInfo(parseInfoValue); setParseInfo(parseInfoValue);
if (dataCache[parseInfoValue.id!]) { setPreParseMode(false);
const { tip, data } = dataCache[parseInfoValue.id!]; const { id: parseId, queryId } = parseInfoValue;
setExecuteTip(tip); setParseLoading(true);
setData(data); const { code, data }: any = await chatParse({
onMsgDataLoaded?.( queryText: msg,
{ chatId: conversationId,
...(data as any), modelId,
parseInfos, agentId,
queryId: parseInfoValue.queryId, filters: filter,
}, parseId,
true, queryId,
true parseInfo: parseInfoValue,
); });
} else { setParseLoading(false);
const { id: parseId, queryId } = parseInfoValue; if (code === 200) {
setExecuteMode(true); setParseTimeCost(data.parseTimeCost);
setEntitySwitchLoading(true); const parseInfo = data.selectedParses[0];
const { code, data }: any = await chatParse({ parseInfo.queryId = data.queryId;
queryText: msg, setParseInfoOptions([parseInfo]);
chatId: conversationId, setParseInfo(parseInfo);
modelId, updateDimensionFitlers(parseInfo.dimensionFilters || []);
agentId, setDateInfo(parseInfo.dateInfo);
filters: filter, if (parseInfo.entityInfo) {
parseId, setEntityInfo(parseInfo.entityInfo);
queryId,
parseInfo: parseInfoValue,
});
setEntitySwitchLoading(false);
if (code === 200) {
setParseTimeCost(data.parseTimeCost);
const parseInfo = data.selectedParses[0];
parseInfo.queryId = data.queryId;
setParseInfoOptions([parseInfo]);
setParseInfo(parseInfo);
updateDimensionFitlers(parseInfo.dimensionFilters || []);
setDateInfo(parseInfo.dateInfo);
if (parseInfo.entityInfo) {
setEntityInfo(parseInfo.entityInfo);
}
onExecute(parseInfo, [parseInfo], true, true);
} }
onExecute(parseInfo, [parseInfo], true, true);
} }
}; };
@@ -447,18 +443,15 @@ const ChatItem: React.FC<Props> = ({
: ''} : ''}
</div> </div>
<div className={contentClass}> <div className={contentClass}>
{!isSimpleMode && ( {/* {!isSimpleMode && ( */}
<> <>
{currentAgent?.enableFeedback === 1 && parseInfoOptions.length > 1 ? ( {currentAgent?.enableFeedback === 1 && !questionId && showExpandParseTip && (
<div style={{ marginBottom: 10 }}>
<ExpandParseTip <ExpandParseTip
parseLoading={parseLoading} isSimpleMode={isSimpleMode}
parseInfoOptions={parseInfoOptions} parseInfoOptions={preParseInfoOptions}
parseTip={parseTip}
currentParseInfo={parseInfo} currentParseInfo={parseInfo}
agentId={agentId} agentId={agentId}
dimensionFilters={dimensionFilters}
dateInfo={dateInfo}
entityInfo={entityInfo}
integrateSystem={integrateSystem} integrateSystem={integrateSystem}
parseTimeCost={parseTimeCost?.parseTime} parseTimeCost={parseTimeCost?.parseTime}
isDeveloper={isDeveloper} isDeveloper={isDeveloper}
@@ -469,63 +462,68 @@ const ChatItem: React.FC<Props> = ({
onRefresh={onRefresh} onRefresh={onRefresh}
handlePresetClick={handlePresetClick} handlePresetClick={handlePresetClick}
/> />
) : ( </div>
<ParseTip )}
parseLoading={parseLoading}
parseInfoOptions={parseInfoOptions} {!preParseMode && (
parseTip={parseTip} <ParseTip
currentParseInfo={parseInfo} isSimpleMode={isSimpleMode}
agentId={agentId} parseLoading={parseLoading}
dimensionFilters={dimensionFilters} parseInfoOptions={parseInfoOptions}
dateInfo={dateInfo} parseTip={parseTip}
entityInfo={entityInfo} currentParseInfo={parseInfo}
integrateSystem={integrateSystem} agentId={agentId}
parseTimeCost={parseTimeCost?.parseTime} dimensionFilters={dimensionFilters}
isDeveloper={isDeveloper} dateInfo={dateInfo}
onSelectParseInfo={onSelectParseInfo} entityInfo={entityInfo}
onSwitchEntity={onSwitchEntity} integrateSystem={integrateSystem}
onFiltersChange={onFiltersChange} parseTimeCost={parseTimeCost?.parseTime}
onDateInfoChange={onDateInfoChange} isDeveloper={isDeveloper}
onRefresh={() => { onSelectParseInfo={onSelectParseInfo}
onRefresh(); onSwitchEntity={onSwitchEntity}
}} onFiltersChange={onFiltersChange}
handlePresetClick={handlePresetClick} onDateInfoChange={onDateInfoChange}
/> onRefresh={() => {
)} onRefresh();
</> }}
)} handlePresetClick={handlePresetClick}
/>
)}
</>
{/* )} */}
{executeMode && ( {executeMode && (
<Spin spinning={entitySwitchLoading}> <Spin spinning={entitySwitchLoading}>
{!isMobile && parseInfo?.sqlInfo && isDeveloper && isDebugMode && !isSimpleMode && ( <div style={{ minHeight: 50 }}>
<SqlItem {!isMobile && parseInfo?.sqlInfo && isDeveloper && isDebugMode && !isSimpleMode && (
agentId={agentId} <SqlItem
queryId={parseInfo.queryId} agentId={agentId}
queryId={parseInfo.queryId}
question={msg}
llmReq={llmReq}
llmResp={llmResp}
integrateSystem={integrateSystem}
queryMode={parseInfo.queryMode}
sqlInfo={parseInfo.sqlInfo}
sqlTimeCost={parseTimeCost?.sqlTime}
executeErrorMsg={executeErrorMsg}
/>
)}
<ExecuteItem
isSimpleMode={isSimpleMode}
queryId={parseInfo?.queryId}
question={msg} question={msg}
llmReq={llmReq} queryMode={parseInfo?.queryMode}
llmResp={llmResp} executeLoading={executeLoading}
integrateSystem={integrateSystem} executeTip={executeTip}
queryMode={parseInfo.queryMode} chartIndex={0}
sqlInfo={parseInfo.sqlInfo} data={data}
sqlTimeCost={parseTimeCost?.sqlTime} triggerResize={triggerResize}
executeErrorMsg={executeErrorMsg} executeItemNode={executeItemNode}
isDeveloper={isDeveloper}
renderCustomExecuteNode={renderCustomExecuteNode}
/> />
)} </div>
<ExecuteItem
isSimpleMode={isSimpleMode}
queryId={parseInfo?.queryId}
question={msg}
queryMode={parseInfo?.queryMode}
executeLoading={executeLoading}
// entitySwitchLoading={entitySwitchLoading}
executeTip={executeTip}
chartIndex={0}
data={data}
triggerResize={triggerResize}
executeItemNode={executeItemNode}
isDeveloper={isDeveloper}
renderCustomExecuteNode={renderCustomExecuteNode}
/>
</Spin> </Spin>
)} )}
{executeMode && {executeMode &&

View File

@@ -125,7 +125,16 @@
&-content-option-active { &-content-option-active {
color: #fff !important; color: #fff !important;
background-color: var(--chat-blue); background-color: var(--chat-blue)!important;
}
&-content-option-disabled {
cursor: unset;
background-color: #eee;
&:hover {
color: #626a6a;
}
} }
&-avatar { &-avatar {

View File

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

View File

@@ -1,7 +1,9 @@
export default { export default {
dev: { dev: {
'/api/': { '/api/': {
target: 'http://127.0.0.1:9080', // target: 'http://127.0.0.1:9080',
// target: 'http://10.91.206.64:9080',
target: 'https://supersonic-pre.tmeoa.com/',
changeOrigin: true, changeOrigin: true,
}, },
}, },

View File

@@ -169,11 +169,7 @@ const ROUTES = [
}, },
{ {
path: '/', path: '/',
redirect: APP_TARGET === 'inner' ? '/model' : '/chat', redirect: '/model',
envRedirect: {
[ENV_KEY.CHAT]: '/chat',
[ENV_KEY.SEMANTIC]: '/model',
},
}, },
{ {
path: '/401', path: '/401',

View File

@@ -11,6 +11,9 @@ export enum EnumDataSourceType {
MEASURES = 'measures', MEASURES = 'measures',
PRIMARY = 'primary', PRIMARY = 'primary',
FOREIGN = 'foreign', FOREIGN = 'foreign',
PRIMARY_KEY = 'primary_key',
FOREIGN_KEY = 'foreign_key',
IDENTIFY = 'identify',
} }
export enum EnumModelDataType { export enum EnumModelDataType {
@@ -30,6 +33,14 @@ export const modelDataClass = {
}; };
export const DIM_OPTIONS = [ export const DIM_OPTIONS = [
{
label: '主键',
value: EnumDataSourceType.PRIMARY_KEY,
},
{
label: '外键',
value: EnumDataSourceType.FOREIGN_KEY,
},
{ {
label: '枚举', label: '枚举',
value: EnumDataSourceType.CATEGORICAL, value: EnumDataSourceType.CATEGORICAL,
@@ -44,6 +55,13 @@ export const DIM_OPTIONS = [
}, },
]; ];
export const TYPE_OPTIONS_LABEL: Record<string, string> = {
[EnumModelDataType.DIMENSION]: '枚举',
[EnumModelDataType.MEASURES]: '度量',
[EnumDataSourceType.PRIMARY]: '主键',
[EnumDataSourceType.FOREIGN]: '外键',
};
export const TYPE_OPTIONS = [ export const TYPE_OPTIONS = [
{ {
label: '维度', label: '维度',

View File

@@ -1,6 +1,7 @@
import React, { useEffect, useState } from 'react'; import React, { useEffect, useState } from 'react';
import { Form, Button, Drawer, Space, Input, Select, message, Popconfirm } from 'antd'; import { Form, Button, Drawer, Space, Input, Select, message, Popconfirm } from 'antd';
import { formLayout } from '@/components/FormHelper/utils'; import { formLayout } from '@/components/FormHelper/utils';
import { TYPE_OPTIONS_LABEL } from '@/pages/SemanticModel/Datasource/constants';
import { createOrUpdateModelRela, deleteModelRela, getModelDetail } from '../../service'; import { createOrUpdateModelRela, deleteModelRela, getModelDetail } from '../../service';
export type ModelRelationFormDrawerProps = { export type ModelRelationFormDrawerProps = {
@@ -52,8 +53,11 @@ const ModelRelationFormDrawer: React.FC<ModelRelationFormDrawerProps> = ({
if (Array.isArray(data?.modelDetail?.identifiers)) { if (Array.isArray(data?.modelDetail?.identifiers)) {
const dataSourceIdentifiers = data.modelDetail.identifiers; const dataSourceIdentifiers = data.modelDetail.identifiers;
const options = dataSourceIdentifiers.map((item: any) => { const options = dataSourceIdentifiers.map((item: any) => {
const typeLabel = TYPE_OPTIONS_LABEL[item.type];
return { return {
label: `${item.bizName}${item.name ? `(${item.name})` : ''}`, label: `${item.bizName}${item.name ? `(${item.name})` : ''}${
typeLabel ? `-${typeLabel}` : ''
}`,
value: item.bizName, value: item.bizName,
}; };
}); });

View File

@@ -322,68 +322,70 @@ const ClassDimensionTable: React.FC<Props> = ({}) => {
columns={columns} columns={columns}
loading={loading} loading={loading}
headerTitle={ headerTitle={
<TableHeaderFilter <div style={{ marginLeft: 15 }}>
components={[ <TableHeaderFilter
{ components={[
label: '维度搜索', {
component: ( label: '维度搜索',
<Input.Search component: (
style={{ width: 280 }} <Input.Search
placeholder="请输入ID/维度名称/英文名称" style={{ width: 280 }}
onSearch={(value) => { placeholder="请输入ID/维度名称/英文名称"
setFilterParams((preState) => { onSearch={(value) => {
return { setFilterParams((preState) => {
...preState, return {
key: value, ...preState,
}; key: value,
}); };
}} });
/> }}
), />
}, ),
{ },
label: '敏感度', {
component: ( label: '敏感度',
<Select component: (
style={{ width: 140 }} <Select
options={SENSITIVE_LEVEL_OPTIONS} style={{ width: 140 }}
placeholder="请选择敏感度" options={SENSITIVE_LEVEL_OPTIONS}
allowClear placeholder="请选择敏感度"
onChange={(value) => { allowClear
setFilterParams((preState) => { onChange={(value) => {
return { setFilterParams((preState) => {
...preState, return {
sensitiveLevel: value, ...preState,
}; sensitiveLevel: value,
}); };
}} });
/> }}
), />
}, ),
{ },
label: '是否为标签', {
component: ( label: '是否为标签',
<Select component: (
style={{ width: 145 }} <Select
placeholder="请选择标签状态" style={{ width: 145 }}
allowClear placeholder="请选择标签状态"
onChange={(value) => { allowClear
setFilterParams((preState) => { onChange={(value) => {
return { setFilterParams((preState) => {
...preState, return {
isTag: value, ...preState,
}; isTag: value,
}); };
}} });
options={[ }}
{ value: 1, label: '是' }, options={[
{ value: 0, label: '' }, { value: 1, label: '' },
]} { value: 0, label: '否' },
/> ]}
), />
}, ),
]} },
/> ]}
/>
</div>
} }
search={false} search={false}
// search={{ // search={{

View File

@@ -351,68 +351,70 @@ const ClassMetricTable: React.FC<Props> = ({ onEmptyMetricData }) => {
className={`${styles.classTable} ${styles.classTableSelectColumnAlignLeft} ${styles.disabledSearchTable} `} className={`${styles.classTable} ${styles.classTableSelectColumnAlignLeft} ${styles.disabledSearchTable} `}
actionRef={actionRef} actionRef={actionRef}
headerTitle={ headerTitle={
<TableHeaderFilter <div style={{ marginLeft: 15 }}>
components={[ <TableHeaderFilter
{ components={[
label: '指标搜索', {
component: ( label: '指标搜索',
<Input.Search component: (
style={{ width: 280 }} <Input.Search
placeholder="请输入ID/指标名称/英文名称/标签" style={{ width: 280 }}
onSearch={(value) => { placeholder="请输入ID/指标名称/英文名称/标签"
setFilterParams((preState) => { onSearch={(value) => {
return { setFilterParams((preState) => {
...preState, return {
key: value, ...preState,
}; key: value,
}); };
}} });
/> }}
), />
}, ),
{ },
label: '敏感度', {
component: ( label: '敏感度',
<Select component: (
style={{ width: 140 }} <Select
options={SENSITIVE_LEVEL_OPTIONS} style={{ width: 140 }}
placeholder="请选择敏感度" options={SENSITIVE_LEVEL_OPTIONS}
allowClear placeholder="请选择敏感度"
onChange={(value) => { allowClear
setFilterParams((preState) => { onChange={(value) => {
return { setFilterParams((preState) => {
...preState, return {
sensitiveLevel: value, ...preState,
}; sensitiveLevel: value,
}); };
}} });
/> }}
), />
}, ),
{ },
label: '是否为标签', {
component: ( label: '是否为标签',
<Select component: (
style={{ width: 145 }} <Select
placeholder="请选择标签状态" style={{ width: 145 }}
allowClear placeholder="请选择标签状态"
onChange={(value) => { allowClear
setFilterParams((preState) => { onChange={(value) => {
return { setFilterParams((preState) => {
...preState, return {
isTag: value, ...preState,
}; isTag: value,
}); };
}} });
options={[ }}
{ value: 1, label: '是' }, options={[
{ value: 0, label: '' }, { value: 1, label: '' },
]} { value: 0, label: '否' },
/> ]}
), />
}, ),
]} },
/> ]}
/>
</div>
} }
rowKey="id" rowKey="id"
loading={loading} loading={loading}

View File

@@ -163,20 +163,6 @@ const DimensionValueSettingModal: React.FC<CreateFormProps> = ({
<Button onClick={onCancel}></Button> <Button onClick={onCancel}></Button>
{menuKey === 'default' && ( {menuKey === 'default' && (
<> <>
{/* <Button
type="primary"
loading={llmLoading}
onClick={() => {
generatorDimensionValue();
}}
>
<Space>
智能填充
<Tooltip title="智能填充将根据维度相关信息,使用大语言模型获取可能被使用的维度值">
<InfoCircleOutlined />
</Tooltip>
</Space>
</Button> */}
<Button <Button
type="primary" type="primary"
onClick={() => { onClick={() => {

View File

@@ -1,268 +0,0 @@
import React, { useEffect, useState } from 'react';
import { Button, Modal, message, Space, Tooltip, Tabs, Input } from 'antd';
import TableHeaderFilter from '@/components/TableHeaderFilter';
import { ISemantic } from '../data';
import CommonEditTable from './CommonEditTable';
import { updateDimension, getDictData } from '../service';
import DimensionValueSettingForm from './Entity/DimensionValueSettingForm';
export type CreateFormProps = {
dimensionValueSettingList: ISemantic.IDimensionValueSettingItem[];
onCancel: () => void;
dimensionItem: ISemantic.IDimensionItem;
open: boolean;
onSubmit: (values?: any) => void;
};
type TableDataSource = { techName: string; bizName: string; alias?: string[] };
const DimensionValueSettingModal: React.FC<CreateFormProps> = ({
onCancel,
open,
dimensionItem,
dimensionValueSettingList,
onSubmit,
}) => {
const [tableDataSource, setTableDataSource] = useState<TableDataSource[]>([]);
const [dimValueMaps, setDimValueMaps] = useState<ISemantic.IDimensionValueSettingItem[]>([]);
const [llmLoading, setLlmLoading] = useState<boolean>(false);
const [filterParams, setFilterParams] = useState<Record<string, any>>({});
const [menuKey, setMenuKey] = useState<string>('default');
const defaultPagination = {
current: 1,
pageSize: 20,
total: 0,
};
const [pagination, setPagination] = useState(defaultPagination);
useEffect(() => {
queryDictData();
setDimValueMaps(dimensionValueSettingList);
}, [dimensionValueSettingList]);
const handleSubmit = async () => {
await saveDimension({ dimValueMaps });
onSubmit?.(dimValueMaps);
};
const saveDimension = async (fieldsValue: any) => {
if (!dimensionItem?.id) {
return;
}
const queryParams = {
...dimensionItem,
...fieldsValue,
};
const { code, msg } = await updateDimension(queryParams);
if (code === 200) {
return;
}
message.error(msg);
};
const queryDictData = async (params = {}) => {
setLlmLoading(true);
const { code, data } = await getDictData({
modelId: dimensionItem.modelId,
itemId: dimensionItem.id,
...filterParams,
...defaultPagination,
...params,
});
setLlmLoading(false);
if (code === 200) {
const { list, total, pageSize, current } = data;
setPagination({
current,
pageSize,
total,
});
if (Array.isArray(list)) {
setTableDataSource(list);
}
} else {
message.error('大语言模型解析异常');
}
};
const renderFooter = () => {
return (
<>
<Button onClick={onCancel}></Button>
{menuKey === 'default' && (
<>
{/* <Button
type="primary"
loading={llmLoading}
onClick={() => {
generatorDimensionValue();
}}
>
<Space>
智能填充
<Tooltip title="智能填充将根据维度相关信息,使用大语言模型获取可能被使用的维度值">
<InfoCircleOutlined />
</Tooltip>
</Space>
</Button> */}
<Button
type="primary"
onClick={() => {
handleSubmit();
}}
>
</Button>
</>
)}
</>
);
};
const columns = [
{
title: '维度值',
dataIndex: 'value',
width: 200,
editable: false,
tooltip: '数据库中存储的维度值数据。 比如数据库中维度平台的维度值有kw、qy等',
formItemProps: {
fieldProps: {
placeholder: '请填写维度值',
},
rules: [
{
required: true,
whitespace: true,
message: '此项是必填项',
},
],
},
},
// {
// title: '业务名称',
// dataIndex: 'bizName',
// width: 200,
// tooltip:
// '查询完成后,最终返回给用户的维度值信息。比如将技术名称kw转换成酷我平台,最终返回给用户是酷我平台',
// fieldProps: {
// placeholder: '请填写业务名称',
// },
// formItemProps: {
// rules: [
// {
// required: true,
// whitespace: true,
// message: '此项是必填项',
// },
// ],
// },
// },
{
title: '别名',
dataIndex: 'alias',
valueType: 'select',
width: 500,
tooltip:
'解析用户查询意图时,支持别名到技术名称的转换。比如用户输入kw、kuwo、酷我,完成设置后,都可以将其转换成技术名称kw',
fieldProps: {
placeholder: '输入别名后回车确认,多别名输入、复制粘贴支持英文逗号自动分隔',
mode: 'tags',
maxTagCount: 5,
tokenSeparators: [','],
},
},
];
const tabItem = [
{
label: '维度值管理',
key: 'default',
children: (
<CommonEditTable
tableDataSource={tableDataSource}
columnList={columns}
onDataSourceChange={(tableData) => {
const dimValueMaps = tableData.map((item: TableDataSource) => {
return {
...item,
};
});
setDimValueMaps(dimValueMaps);
}}
hideCtrlBtn={['deleteBtn']}
editableProTableProps={{
recordCreatorProps: false,
pagination: pagination,
headerTitle: (
<TableHeaderFilter
components={[
{
label: '维度值搜索',
component: (
<Input.Search
style={{ width: 280 }}
placeholder="请输入维度值名称"
onSearch={(value) => {
setFilterParams((preState) => {
return {
...preState,
keyValue: value,
};
});
queryDictData({ keyValue: value });
}}
/>
),
},
]}
/>
),
onTableChange: (data: any) => {
const { current, pageSize, total } = data;
setPagination({
current,
pageSize,
total,
});
queryDictData({ current, pageSize });
},
}}
/>
),
},
{
label: '维度值设置',
key: 'setting',
children: <DimensionValueSettingForm dataItem={dimensionItem} />,
},
];
const handleMenuChange = (key: string) => {
setMenuKey(key);
};
return (
<Modal
width={1200}
destroyOnClose
title="维度值设置"
style={{ top: 48 }}
maskClosable={false}
open={open}
footer={renderFooter()}
onCancel={onCancel}
>
<Tabs
items={tabItem}
size="large"
activeKey={menuKey}
onChange={(menuKey: string) => {
handleMenuChange(menuKey);
}}
/>
</Modal>
);
};
export default DimensionValueSettingModal;

View File

@@ -37,7 +37,7 @@ const DomainManagerTab: React.FC<Props> = ({
const domainModel = useModel('SemanticModel.domainData'); const domainModel = useModel('SemanticModel.domainData');
const modelModel = useModel('SemanticModel.modelData'); const modelModel = useModel('SemanticModel.modelData');
const { selectDomainId, selectDomainName, selectDomain: domainData, domainList } = domainModel; const { selectDomainId, selectDomainName, selectDomain: domainData } = domainModel;
const { selectModelId, selectModelName } = modelModel; const { selectModelId, selectModelName } = modelModel;
useEffect(() => { useEffect(() => {
@@ -82,17 +82,6 @@ const DomainManagerTab: React.FC<Props> = ({
hidden: !!domainData?.parentId, hidden: !!domainData?.parentId,
children: <TermTable />, children: <TermTable />,
}, },
// {
// label: '画布',
// key: 'xflow',
// hidden: domainData && domainListParentIdList.includes(domainData.id),
// children: (
// <div style={{ width: '100%' }}>
// <SemanticGraphCanvas />
// {/* <HeadlessFlows /> */}
// </div>
// ),
// },
{ {
label: '权限管理', label: '权限管理',
key: 'permissonSetting', key: 'permissonSetting',