diff --git a/webapp/packages/supersonic-fe/config/proxy.ts b/webapp/packages/supersonic-fe/config/proxy.ts index 084e25876..166919713 100644 --- a/webapp/packages/supersonic-fe/config/proxy.ts +++ b/webapp/packages/supersonic-fe/config/proxy.ts @@ -1,8 +1,7 @@ export default { dev: { '/api/': { - target: 'http://10.91.217.39:9080', - // target: 'http://s2.tmeoa.com', + target: 'http://localhost:9080', changeOrigin: true, }, }, diff --git a/webapp/packages/supersonic-fe/src/components/TableHeaderFilter/index.less b/webapp/packages/supersonic-fe/src/components/TableHeaderFilter/index.less index 57c672723..6d1c23529 100644 --- a/webapp/packages/supersonic-fe/src/components/TableHeaderFilter/index.less +++ b/webapp/packages/supersonic-fe/src/components/TableHeaderFilter/index.less @@ -1,5 +1,5 @@ .tableHeaderTitle { - margin-left: 20px; + margin-left: 10px; .headerTitleLabel { color: #667085; font-size: 14px; diff --git a/webapp/packages/supersonic-fe/src/pages/Agent/ToolModal.tsx b/webapp/packages/supersonic-fe/src/pages/Agent/ToolModal.tsx index f124c46c7..27dde5964 100644 --- a/webapp/packages/supersonic-fe/src/pages/Agent/ToolModal.tsx +++ b/webapp/packages/supersonic-fe/src/pages/Agent/ToolModal.tsx @@ -112,18 +112,22 @@ const ToolModal: React.FC = ({ editTool, onSaveTool, onCancel }) => { - {(toolType === AgentToolTypeEnum.NL2SQL_RULE || - toolType === AgentToolTypeEnum.NL2SQL_LLM) && ( - - - - )} + {toolType && + [ + AgentToolTypeEnum.NL2SQL_RULE, + AgentToolTypeEnum.NL2SQL_LLM, + AgentToolTypeEnum.DATASET, + ].includes(toolType) && ( + + + + )} {toolType === AgentToolTypeEnum.NL2SQL_LLM && (
diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/CommonEditTable.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/CommonEditTable.tsx index b320e4f0c..c82f52897 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/CommonEditTable.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/CommonEditTable.tsx @@ -10,6 +10,7 @@ type Props = { tableDataSource: any[]; columnList: any[]; rowKey?: string; + hideCtrlBtn?: string[]; editableProTableProps?: any; onDataSourceChange?: (dataSource: any) => void; extenderCtrlColumn?: (text, record, _, action) => ReactNode[]; @@ -29,6 +30,7 @@ const CommonEditTable: React.FC = forwardRef( rowKey, tableDataSource, editableProTableProps = {}, + hideCtrlBtn, onDataSourceChange, extenderCtrlColumn, editableActionRender, @@ -72,26 +74,31 @@ const CommonEditTable: React.FC = forwardRef( render: (text, record, _, action) => { return ( - { - action?.startEditable?.(record.editRowId); - }} - > - 编辑 - - { - const data = [...dataSource].filter( - (item) => item[defaultRowKey] !== record[defaultRowKey], - ); - setDataSource(data); - handleDataSourceChange(data); - }} - > - 删除 - + {!hideCtrlBtn?.includes('editable') && ( + { + action?.startEditable?.(record.editRowId); + }} + > + 编辑 + + )} + {!hideCtrlBtn?.includes('deleteBtn') && ( + { + const data = [...dataSource].filter( + (item) => item[defaultRowKey] !== record[defaultRowKey], + ); + setDataSource(data); + handleDataSourceChange(data); + }} + > + 删除 + + )} + {extenderCtrlColumn?.(text, record, _, action)} ); diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/DimensionValueSettingModal.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/DimensionValueSettingModal.tsx index 86c6c5792..ef034022a 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/DimensionValueSettingModal.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/DimensionValueSettingModal.tsx @@ -1,9 +1,9 @@ import React, { useEffect, useState } from 'react'; -import { Button, Modal, message, Space, Tooltip, Tabs, Drawer } from 'antd'; -import { InfoCircleOutlined } from '@ant-design/icons'; +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, mockDimensionValuesAlias } from '../service'; +import { updateDimension, getDictData } from '../service'; import DimensionValueSettingForm from './Entity/DimensionValueSettingForm'; export type CreateFormProps = { @@ -26,10 +26,16 @@ const DimensionValueSettingModal: React.FC = ({ const [tableDataSource, setTableDataSource] = useState([]); const [dimValueMaps, setDimValueMaps] = useState([]); const [llmLoading, setLlmLoading] = useState(false); + const [filterParams, setFilterParams] = useState>({}); const [menuKey, setMenuKey] = useState('default'); - + const defaultPagination = { + current: 1, + pageSize: 2, + total: 0, + }; + const [pagination, setPagination] = useState(defaultPagination); useEffect(() => { - setTableDataSource(dimensionValueSettingList); + queryDictData(); setDimValueMaps(dimensionValueSettingList); }, [dimensionValueSettingList]); @@ -53,14 +59,26 @@ const DimensionValueSettingModal: React.FC = ({ message.error(msg); }; - const generatorDimensionValue = async () => { + const queryDictData = async (params = {}) => { setLlmLoading(true); - const { code, data } = await mockDimensionValuesAlias({ ...dimensionItem }); + const { code, data } = await getDictData({ + modelId: dimensionItem.modelId, + itemId: dimensionItem.id, + ...filterParams, + ...defaultPagination, + ...params, + }); + setLlmLoading(false); if (code === 200) { - if (Array.isArray(data)) { - setDimValueMaps([...dimValueMaps, ...data]); - setTableDataSource([...tableDataSource, ...data]); + const { list, total, pageSize, current } = data; + setPagination({ + current, + pageSize, + total, + }); + if (Array.isArray(list)) { + setTableDataSource(list); } } else { message.error('大语言模型解析异常'); @@ -73,7 +91,7 @@ const DimensionValueSettingModal: React.FC = ({ {menuKey === 'default' && ( <> - + */}