From 267cb6506dd29233b01b47ee349e3660fc0cf4a8 Mon Sep 17 00:00:00 2001 From: tristanliu <37809633+sevenliu1896@users.noreply.github.com> Date: Thu, 10 Oct 2024 16:49:44 +0800 Subject: [PATCH] [improvement][headless-fe] Updated the dimension value settings to retrieve and display values from a dictionary. (#1772) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [improvement][semantic-fe] Updating the datePicker component to use dayjs instead. * [improvement][semantic-fe] Fixing the issue with passing the model ID for dimensions in the indicator market. * [improvement][semantic-fe] Fixing the abnormal state of the popup when creating a model. * [improvement][semantic-fe] Adding permission logic for bulk operations in the indicator market. * [improvement][semantic-fe] Adding the ability to download and transpose data. * [improvement][semantic-fe] Fixing the initialization issue with the date selection component in the indicator details page when switching time granularity. * [improvement][semantic-fe] Fixing the logic error in the dimension value setting. * [improvement][semantic-fe] Fixing the synchronization issue with the question and answer settings information. * [improvement][semantic-fe] Optimizing the canvas functionality for better performance and user experience. * [improvement][semantic-fe] Optimizing the update process for drawing model relationship edges in the canvas. * [improvement][semantic-fe] Changing the line type for canvas connections. * [improvement][semantic-fe] Replacing the initialization variable from "semantic" to "headless". * [improvement][semantic-fe] Fixing the missing migration issue for default drill-down dimension configuration in model editing. Additionally, optimizing the data retrieval method for initializing fields in the model. * [improvement][semantic-fe] Updating the logic for the fieldName. * [improvement][semantic-fe] Adjusting the position of the metrics tab. * [improvement][semantic-fe] Changing the 字段名称 to 英文名称. * [improvement][semantic-fe] Fix metric measurement deletion. * [improvement][semantic-fe] UI optimization for metric details page. * [improvement][semantic-fe] UI optimization for metric details page. * [improvement][semantic-fe] UI adjustment for metric details page. * [improvement][semantic-fe] The granularity field in the time type of model editing now supports setting it as empty. * [improvement][semantic-fe] Added field type and metric type to the metric creation options. * [improvement][semantic-fe] The organization structure selection feature has been added to the permission management. * [improvement][semantic-fe] Improved user experience for the metric list. * [improvement][semantic-fe] fix update the metric list. * [improvement][headless-fe] Added view management functionality. * [improvement][headless-fe] The view management functionality has been added. This feature allows users to create, edit, and manage different views within the system. * [improvement][headless-fe] Added model editing side effect detection. * [improvement][headless-fe] Fixed the logic error in view editing. * [improvement][headless-fe] Fixed the issue with initializing dimension associations in metric settings. * [improvement][headless-fe] Added the ability to hide the Q&A settings entry point. * [improvement][headless-fe] Fixed the issue with selecting search results in metric field creation. * [improvement][headless-fe] Added search functionality to the field list in model editing. * [improvement][headless-fe] fix the field list in model editing * [improvement][headless-fe] Restructured the data for the dimension value settings interface. * [improvement][headless-fe] Added dynamic variable functionality to model creation based on SQL scripts. * [improvement][headless-fe] Added support for passing dynamic variables as parameters in the executeSql function. * [improvement][headless-fe] Resolved the issue where users were unable to select all options for dimensions, metrics, and fields in the metric generation process. * [improvement][headless-fe] Replaced the term "view" with "dataset" * [improvement][headless-fe] Added the ability to export metrics and dimensions to a specific target. * [improvement][headless-fe] Enhanced dataset creation to support the tag mode. * [improvement][headless-fe] Added tag value setting. * [improvement][headless-fe] Optimized the tag setting system. * [improvement][headless-fe] Optimized the tag setting system. * [improvement][headless-fe] Updated the data initialization for model editing to use API requests instead. * [improvement][headless-fe] Added search functionality to model management. * [improvement][headless-fe] Removed field null validation during model editing. * [improvement][headless-fe] Updated the batch operation button component. * [improvement][headless-fe] Optimized the logic for initializing indicators in dimension value settings. * [improvement][headless-fe] Adjusted the length of the input field for model editing names. * [improvement][headless-fe] Lock the version of the @ant-design/pro-table component and replace it with @ant-design/pro-components. * [improvement][headless-fe] Optimized the style of the metrics market and tags market. * [improvement][headless-fe] The quick creation of model fields now defaults to using the "comment" field for filling. * [improvement][headless-fe] The quick creation of model fields now defaults to using the "comment" field for filling * [improvement][headless-fe] The quick creation of model fields now defaults to using the "comment" field for filling. * [improvement][headless-fe] Fixed the issue where the conditions for metric measurement creation were not being saved correctly. * [improvement][headless-fe] Default value setting for hiding dimensions. * [improvement][headless-fe] Updated the file imports in the project. * [improvement][headless-fe] Adjusted the logic for displaying the tab in the theme domain. * [improvement][headless-fe] Added term management functionality. * [improvement][headless-fe] When creating a model, the current metric operator now allows for clearance. * [improvement][headless-fe] Term management interface transformation * [improvement][headless-fe] Migrating scaffold version to @umi/max * [improvement][headless-fe] remove modle column * [improvement][headless-fe] 1.Added configuration for the large language model in the agent; 2.upgraded React version from 17 to 18; 3.modified some UI effects. * [improvement][headless-fe] Added a simplified mode to the question-answering system. * [improvement][headless-fe] remove pnpm-lock * [improvement][headless-fe] add pnpm-lock * [improvement][headless-fe] Fixed the issue with passing the modelId during initialization. * [improvement][headless-fe] Fixed the issue with abnormal comments during model creation. * [improvement][headless-fe] fix build bugs * [improvement][headless-fe] change build config * [improvement][headless-fe] route config change * [improvement][headless-fe] Optimized data updating when switching domains. * [improvement][headless-fe] css change * [improvement][semantic-fe] logo css change * [improvement][semantic-fe] system config add defaultValue support * [improvement][semantic-fe] tag mode wording change * [improvement][semantic-fe] fix metric edit page init error * [improvement][supersonic-fe] Updated the way chat projects are imported in supersonic-fe. * [improvement][chat-engine] Added a background silent mode for watching chat projects. * [improvement][supersonic-fe] fix proxy url * [improvement][headless-fe] agent setting update * [improvement][headless-fe] Agent configuration: Added connectivity testing for large models. * [improvement][headless-fe] Chat: Enabled integration with agent configuration. * [improvement][headless-fe] SQL formatter: Updated the import method. * [improvement][headless-fe] login fixed * [improvement][headless-fe] Agent: Optimized the logic for saving. * [improvement][headless-fe] Model management: Integrated into the main theme domain. * [improvement][headless-fe] Sensitivity: Added bulk modification functionality. * [improvement][headless-fe] wording change * [improvement][headless-fe] Prompt configuration: Added the ability to configure prompts. * [improvement][headless-fe] Added the ability to configure embedding models. * [improvement][headless-fe] hidden configure embedding models. * [improvement][headless-fe] Connection test prompt update for large language model settings. * [improvement][headless-fe] add memory review config * [improvement][headless-fe] Rollback of data structure for large language model configuration. * [improvement][headless-fe] Added dependency relationships between various items in system configuration. * [improvement][headless-fe] Added password parsing to the generation rules of system settings. * [improvement][headless-fe] Added slider parsing to the generation rules of system settings. * [improvement][headless-fe] Optimized the logic for initializing values in system settings. * [improvement][headless-fe] Optimized the time format * [improvement][headless-fe] Unified the SQL generation method for data sets to ensure consistency and improve efficiency. * [improvement][headless-fe] Added support for data sets with non-partitioned time fields * [improvement][headless-fe] Added support for editing time formats in dimension settings * [improvement][headless-fe] Rolled back the time parameter in the metric details page to its previous state * [improvement][headless-fe] Fixed the issue with hidden field validation when editing dimensions * [improvement][headless-fe] Added a connectivity test for large models in the system settings * [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. --------- Co-authored-by: tristanliu --- webapp/packages/supersonic-fe/config/proxy.ts | 3 +- .../components/TableHeaderFilter/index.less | 2 +- .../src/pages/Agent/ToolModal.tsx | 28 ++-- .../components/CommonEditTable.tsx | 47 ++++--- .../components/DimensionValueSettingModal.tsx | 127 +++++++++++++----- .../pages/SemanticModel/components/style.less | 2 +- .../src/pages/SemanticModel/service.ts | 6 + 7 files changed, 143 insertions(+), 72 deletions(-) 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' && ( <> - + */}