diff --git a/webapp/packages/chat-sdk/src/Chat/service.ts b/webapp/packages/chat-sdk/src/Chat/service.ts index f8cb402d3..a22309080 100644 --- a/webapp/packages/chat-sdk/src/Chat/service.ts +++ b/webapp/packages/chat-sdk/src/Chat/service.ts @@ -5,14 +5,12 @@ import { AgentType, ModelType } from './type'; const prefix = isMobile ? '/openapi' : '/api'; export function saveConversation(chatName: string, agentId: number) { - return axios.post( - `${prefix}/chat/manage/save?chatName=${chatName}&agentId=${agentId}` - ); + return axios.post(`${prefix}/chat/manage/save?chatName=${chatName}&agentId=${agentId}`); } export function updateConversationName(chatName: string, chatId: number = 0) { return axios.post( - `${prefix}/chat/manage/updateChatName?chatName=${chatName}&chatId=${chatId}`, + `${prefix}/chat/manage/updateChatName?chatName=${chatName}&chatId=${chatId}` ); } @@ -25,12 +23,12 @@ export function getAllConversations(agentId?: number) { } export function getModelList() { - return axios.get(`${prefix}/chat/conf/modelList/view`); + return axios.get(`${prefix}/chat/conf/modelList/dataSet`); } export function updateQAFeedback(questionId: number, score: number) { return axios.post( - `${prefix}/chat/manage/updateQAFeedback?id=${questionId}&score=${score}&feedback=`, + `${prefix}/chat/manage/updateQAFeedback?id=${questionId}&score=${score}&feedback=` ); } diff --git a/webapp/packages/chat-sdk/src/common/type.ts b/webapp/packages/chat-sdk/src/common/type.ts index 9f043d253..e7101d8f2 100644 --- a/webapp/packages/chat-sdk/src/common/type.ts +++ b/webapp/packages/chat-sdk/src/common/type.ts @@ -28,7 +28,7 @@ export type ModelInfoType = { }; export type EntityInfoType = { - viewInfo: ModelInfoType; + dataSetInfo: ModelInfoType; dimensions: FieldType[]; metrics: FieldType[]; entityId: number; @@ -51,6 +51,7 @@ export type FilterItemType = { operator?: string; type?: string; value: any; + entityName?: string; }; export type ModelType = { @@ -83,7 +84,7 @@ export type ChatContextType = { aggType: string; modelId: number; modelName: string; - view: ModelType; + dataSet: ModelType; dateInfo: DateInfoType; dimensions: FieldType[]; metrics: FieldType[]; @@ -92,7 +93,7 @@ export type ChatContextType = { elementMatches: any[]; nativeQuery: boolean; queryMode: string; - queryType: 'METRIC' | 'METRIC_TAG' | 'TAG' | 'OTHER'; + queryType: 'METRIC' | 'METRIC_TAG' | 'ID' | 'TAG' | 'OTHER'; dimensionFilters: FilterItemType[]; properties: any; sqlInfo: SqlInfoType; diff --git a/webapp/packages/chat-sdk/src/components/ChatItem/ParseTip.tsx b/webapp/packages/chat-sdk/src/components/ChatItem/ParseTip.tsx index 6e3ef83c6..b90a27338 100644 --- a/webapp/packages/chat-sdk/src/components/ChatItem/ParseTip.tsx +++ b/webapp/packages/chat-sdk/src/components/ChatItem/ParseTip.tsx @@ -1,7 +1,7 @@ import React, { ReactNode } from 'react'; import { AGG_TYPE_MAP, PREFIX_CLS } from '../../common/constants'; import { ChatContextType, DateInfoType, EntityInfoType, FilterItemType } from '../../common/type'; -import { Button, DatePicker, Tag } from 'antd'; +import { Button, DatePicker } from 'antd'; import { CheckCircleFilled, ReloadOutlined } from '@ant-design/icons'; import Loading from './Loading'; import FilterItem from './FilterItem'; @@ -89,7 +89,7 @@ const ParseTip: React.FC = ({ const { modelId, - view, + dataSet, dimensions, metrics, aggType, @@ -148,8 +148,8 @@ const ParseTip: React.FC = ({ ) : (
-
数据视图:
-
{view?.name}
+
数据集:
+
{dataSet?.name}
)} {(queryType === 'METRIC' || queryType === 'METRIC_TAG' || queryType === 'TAG') && ( @@ -167,7 +167,7 @@ const ParseTip: React.FC = ({
指标:
- {queryType === 'METRIC' || queryType === 'METRIC_TAG' + {queryType === 'METRIC' || queryType === 'ID' ? metrics[0].name : metrics.map(metric => metric.name).join('、')}
diff --git a/webapp/packages/chat-sdk/src/components/ChatMsg/Bar/index.tsx b/webapp/packages/chat-sdk/src/components/ChatMsg/Bar/index.tsx index 8f0a5b00b..287b6b8b8 100644 --- a/webapp/packages/chat-sdk/src/components/ChatMsg/Bar/index.tsx +++ b/webapp/packages/chat-sdk/src/components/ChatMsg/Bar/index.tsx @@ -163,7 +163,7 @@ const BarChart: React.FC = ({ data, triggerResize, loading, metricField, if (metricColumn && !metricColumn?.authorized) { return ( diff --git a/webapp/packages/chat-sdk/src/components/ChatMsg/MetricCard/index.tsx b/webapp/packages/chat-sdk/src/components/ChatMsg/MetricCard/index.tsx index 4f5134e5e..bf1fbab87 100644 --- a/webapp/packages/chat-sdk/src/components/ChatMsg/MetricCard/index.tsx +++ b/webapp/packages/chat-sdk/src/components/ChatMsg/MetricCard/index.tsx @@ -48,7 +48,7 @@ const MetricCard: React.FC = ({ data, loading, onApplyAuth }) => {
{indicatorColumn && !indicatorColumn?.authorized ? ( - + ) : (
diff --git a/webapp/packages/chat-sdk/src/components/ChatMsg/MetricTrend/index.tsx b/webapp/packages/chat-sdk/src/components/ChatMsg/MetricTrend/index.tsx index 30800508a..a10499d58 100644 --- a/webapp/packages/chat-sdk/src/components/ChatMsg/MetricTrend/index.tsx +++ b/webapp/packages/chat-sdk/src/components/ChatMsg/MetricTrend/index.tsx @@ -109,7 +109,7 @@ const MetricTrend: React.FC = ({ /> ) : ( = ({ data, size, loading, onApplyAuth }) => { title: name || nameEn, render: (value: string | number) => { if (!authorized) { - return ; + return ( + + ); } if (dataFormatType === 'percent') { return ( diff --git a/webapp/packages/chat-sdk/src/components/IconFont/index.tsx b/webapp/packages/chat-sdk/src/components/IconFont/index.tsx index 849665cb0..3407a5415 100644 --- a/webapp/packages/chat-sdk/src/components/IconFont/index.tsx +++ b/webapp/packages/chat-sdk/src/components/IconFont/index.tsx @@ -1,7 +1,7 @@ import { createFromIconfontCN } from '@ant-design/icons'; const IconFont = createFromIconfontCN({ - scriptUrl: '//at.alicdn.com/t/c/font_4120566_8i352njvpoi.js', + scriptUrl: '//at.alicdn.com/t/c/font_4120566_7rwv3aw6wep.js', }); export default IconFont; diff --git a/webapp/packages/chat-sdk/src/service/index.ts b/webapp/packages/chat-sdk/src/service/index.ts index 76ac082fa..60cf22cba 100644 --- a/webapp/packages/chat-sdk/src/service/index.ts +++ b/webapp/packages/chat-sdk/src/service/index.ts @@ -51,7 +51,7 @@ export function chatParse( return axios.post(`${prefix}/chat/query/parse`, { queryText, chatId: chatId || DEFAULT_CHAT_ID, - modelId, + dataSetId: modelId, agentId, queryFilters: filters ? { diff --git a/webapp/packages/supersonic-fe/src/pages/Agent/ToolModal.tsx b/webapp/packages/supersonic-fe/src/pages/Agent/ToolModal.tsx index 93d5f22bb..9024b6398 100644 --- a/webapp/packages/supersonic-fe/src/pages/Agent/ToolModal.tsx +++ b/webapp/packages/supersonic-fe/src/pages/Agent/ToolModal.tsx @@ -37,9 +37,9 @@ const ToolModal: React.FC = ({ editTool, onSaveTool, onCancel }) => { node.title = node.name; node.value = node.type === 'DOMAIN' ? `DOMAIN_${node.id}` : node.id; node.checkable = - node.type === 'VIEW' || (node.type === 'DOMAIN' && node.children?.length > 0); + node.type === 'DATASET' || (node.type === 'DOMAIN' && node.children?.length > 0); }); - setModelList([{ title: '默认', value: -1, type: 'VIEW' }, ...treeData]); + setModelList([{ title: '默认', value: -1, type: 'DATASET' }, ...treeData]); }; const initPluginList = async () => { @@ -105,10 +105,10 @@ const ToolModal: React.FC = ({ editTool, onSaveTool, onCancel }) => { {(toolType === AgentToolTypeEnum.NL2SQL_RULE || toolType === AgentToolTypeEnum.NL2SQL_LLM) && ( - + >('/api/chat/conf/getDomainViewTree', { + return request>('/api/chat/conf/getDomainDataSetTree', { method: 'GET', }); } diff --git a/webapp/packages/supersonic-fe/src/pages/Agent/type.ts b/webapp/packages/supersonic-fe/src/pages/Agent/type.ts index b11d9e219..8b4a9396e 100644 --- a/webapp/packages/supersonic-fe/src/pages/Agent/type.ts +++ b/webapp/packages/supersonic-fe/src/pages/Agent/type.ts @@ -75,7 +75,7 @@ export type ModelType = { parentId: number; name: string; bizName: string; - type: 'DOMAIN' | 'VIEW'; + type: 'DOMAIN' | 'DATASET'; }; export type MetricType = { diff --git a/webapp/packages/supersonic-fe/src/pages/ChatPlugin/DetailModal.tsx b/webapp/packages/supersonic-fe/src/pages/ChatPlugin/DetailModal.tsx index e07011eca..4394514b7 100644 --- a/webapp/packages/supersonic-fe/src/pages/ChatPlugin/DetailModal.tsx +++ b/webapp/packages/supersonic-fe/src/pages/ChatPlugin/DetailModal.tsx @@ -42,9 +42,9 @@ const DetailModal: React.FC = ({ detail, onSubmit, onCancel }) => { node.title = node.name; node.value = node.type === 'DOMAIN' ? `DOMAIN_${node.id}` : node.id; node.checkable = - node.type === 'VIEW' || (node.type === 'DOMAIN' && node.children?.length > 0); + node.type === 'DATASET' || (node.type === 'DOMAIN' && node.children?.length > 0); }); - setModelList([{ title: '默认', value: -1, type: 'VIEW' }, ...treeData]); + setModelList([{ title: '默认', value: -1, type: 'DATASET' }, ...treeData]); }; useEffect(() => { @@ -187,10 +187,10 @@ const DetailModal: React.FC = ({ detail, onSubmit, onCancel }) => { onCancel={onCancel} >
- + = ({ detail, onSubmit, onCancel }) => {