Merge branch 'hotfix-1.0.0' into develop

Author: CodeCasterX

app-builder/jane/plugins/aipp-plugin/src/main/resources/sql/data/appbuilder_insert.sql

@@ -10,7 +10,7 @@ import { useTranslation } from 'react-i18next';
 import { useHistory } from 'react-router-dom';
 import { useAppDispatch } from '@/store/hook';
 import { setIsAutoOpen } from '@/store/common/common';
-import { getConnectKnowledgeList } from '@/shared/http/appBuilder';
+import { getConnectKnowledgeList, getKnowledgeConfigId } from '@/shared/http/knowledge';
 import BookIcon from '@/assets/images/ai/connect-knowledge.png';
 import NotConnectIcon from '@/assets/images/ai/not-connect.png';
 import ConnectedIcon from '@/assets/images/ai/connected.svg';
@@ -21,18 +21,19 @@ import '../styles/connect-knowledge.scss'
  *
  * @param modelRef 当前组件ref.
  * @param groupId 父组件组件groupId.
- * @param updateGroupId 更新父组件groupId的方法.
+ * @param updateKnowledgeOption 更新父组件groupId的方法.
  * @return {JSX.Element}
  * @constructor
  */
 
-const ConnectKnowledge = ({ modelRef, groupId, updateGroupId }) => {
+const ConnectKnowledge = ({ modelRef, groupId, updateKnowledgeOption }) => {
   const { t } = useTranslation();
   const dispatch = useAppDispatch();
   const navigate = useHistory().push;
   const [open, setOpen] = useState(false);
   const [connectList, setConnectList] = useState([]);
-  const [choseId, setChoseId] = useState(groupId);
+  const [chosenId, setChosenId] = useState(groupId);
+  const [knowledgeConfigId, setKnowledgeConfigId] = useState('');
 
   useImperativeHandle(modelRef, () => {
     return { openModal: () => setOpen(true) };
@@ -41,7 +42,7 @@ const ConnectKnowledge = ({ modelRef, groupId, updateGroupId }) => {
   // 确定
   const confirm = () => {
     setOpen(false);
-    updateGroupId(choseId);
+    updateKnowledgeOption(chosenId, knowledgeConfigId);
   };
 
   // 获取知识库列表
@@ -60,10 +61,19 @@ const ConnectKnowledge = ({ modelRef, groupId, updateGroupId }) => {
     navigate(`/plugin`);
   };
 
+  // 选择知识库集回调
+  const onClickKnowledgeSet = async (groupId: String) => {
+    setChosenId(groupId);
+    const res = await getKnowledgeConfigId(groupId);
+    if (res.code === 0) {
+      setKnowledgeConfigId(res.data);
+    }
+  }
+
   useEffect(() => {
     if (open) {
       getConnectList();
-      setChoseId(groupId);
+      setChosenId(groupId);
     }
   }, [open]);
 
@@ -87,14 +97,17 @@ const ConnectKnowledge = ({ modelRef, groupId, updateGroupId }) => {
       <div className='connect-list'>
         {
           connectList.map(item =>
-            <div className={`knowledge-item ${choseId === item.groupId ? 'chose' : ''}`} key={item.groupId} onClick={() => setChoseId(item.groupId)}>
+            <div className={`knowledge-item ${chosenId === item.groupId ? 'chose' : ''}`}
+                 key={item.groupId}
+                 onClick={() => onClickKnowledgeSet(item.groupId)}
+            >
               <div className='knowledge-title'>
                 <img src={BookIcon} alt="" style={{ marginRight: 8 }} />
                 {item.name}
               </div>
               <div className='knowledge-desc' title={item.description}>{item.description}</div>
               <div className='connect-circle'>
-                <img src={choseId === item.groupId ? ConnectedIcon : NotConnectIcon} alt="" />
+                <img src={chosenId === item.groupId ? ConnectedIcon : NotConnectIcon} alt="" />
               </div>
             </div>
           )

app-engine/frontend/src/pages/addFlow/components/connect-knowledge.tsx

@@ -65,7 +65,8 @@ const Stage = (props) => {
   const [skillList, setSkillList] = useState([]);
   const [promptValue, setPromptValue] = useState('');
   const [currentModelInfo, setCurrentModelInfo] = useState({});
-  const [groupId, setGroupId] = useState("");
+  const [groupId, setGroupId] = useState('');
+  const [knowledgeConfigId, setKnowledgeConfigId] = useState('');
   const { CONFIGS } = configMap[process.env.NODE_ENV];
   const { type, appInfo, setFlowInfo } = useContext(FlowContext);
   const testStatus = useAppSelector((state) => state.flowTestStore.testStatus);
@@ -151,10 +152,11 @@ const Stage = (props) => {
       });
       // 知识库模态框
       agent.onKnowledgeBaseSelect((args) => {
-        let { selectedKnowledgeBases, onSelect, groupId } = args;
+        let { selectedKnowledgeBases, onSelect, groupId, selectedKnowledgeConfigId } = args;
         setGroupId(groupId);
+        setKnowledgeConfigId(selectedKnowledgeConfigId);
         knowledgeCallback.current = onSelect;
-        modalRef.current.showModal(selectedKnowledgeBases, groupId);
+        modalRef.current.showModal(selectedKnowledgeBases, groupId, selectedKnowledgeConfigId);
       });
       // 插件模态框
       agent.onPluginSelect((args) => {
@@ -209,8 +211,9 @@ const Stage = (props) => {
       agent.listen('SELECT_KNOWLEDGE_BASE_GROUP', (event) => {
         connectKnowledgeEvent.current = event;
         connectKnowledgeRef.current.openModal();
-        event.onSelect(groupId);
+        event.onSelect(groupId, knowledgeConfigId);
         setGroupId(event.selectedGroupId);
+        setKnowledgeConfigId(event.selectedKnowledgeConfigId);
       });
       // 循环节点
       agent.onLoopSelect(({ onSelect }) => {
@@ -252,18 +255,22 @@ const Stage = (props) => {
       dispatch(setTestTime(0));
     }
   }
+
   // hugging-face模型选中
   const onModelSelectCallBack = (model) => {
     modelCallback.current(model);
   }
+
   // 知识库选中
   const handleKnowledgeChange = (value) => {
     knowledgeCallback.current(value);
   }
+
   // 搜索参数配置选中
   const handleSearchChange = (value) => {
     searchCallback.current(value);
   };
+
   // 插件工具流选中
   const toolsConfirm = (item) => {
     let obj = {};
@@ -286,18 +293,21 @@ const Stage = (props) => {
       pluginCallback.current(obj);
     }
   }
+
   // 自定义表单选中
   const formConfirm = (item) => {
     formCallback.current(item);
     setShowDrawer(false);
   }
+
   // 数据实时保存
   const handleChange = useCallback(debounce((id) => elsaChange(id), 2000), []);
   function elsaChange(id: any) {
     let graphChangeData = window.agent.serialize();
     currentApp.current.flowGraph.appearance = graphChangeData;
     updateAppRunningFlow(id);
   }
+
   // 编辑更新应用
   async function updateAppRunningFlow(id = undefined) {
     currentChange.current = false;
@@ -310,6 +320,7 @@ const Stage = (props) => {
       setSaveTime(getCurrentTime());
     }
   }
+
   // 拖拽完成回调
   function handleDragEnter(e) {
     const nodeTab = e.dataTransfer.getData('itemTab');
@@ -379,12 +390,13 @@ const Stage = (props) => {
     }
   }, []);
 
-
   // 更新groupId
-  const updateGroupId = (val) => {
-    connectKnowledgeEvent.current.onSelect(val);
-    setGroupId(val);
+  const updateKnowledgeOption = (groupId: String, knowledgeConfigId:String) => {
+    connectKnowledgeEvent.current.onSelect(groupId, knowledgeConfigId);
+    setGroupId(groupId);
+    setKnowledgeConfigId(knowledgeConfigId);
   };
+
   return <>
     <div
       className='content-right'
@@ -468,7 +480,7 @@ const Stage = (props) => {
     <ConnectKnowledge
       modelRef={connectKnowledgeRef}
       groupId={groupId}
-      updateGroupId={updateGroupId}
+      updateKnowledgeOption={updateKnowledgeOption}
     ></ConnectKnowledge>
   </>
 };

app-engine/frontend/src/pages/addFlow/components/elsa-stage.tsx

@@ -9,7 +9,7 @@ import { useHistory } from 'react-router-dom';
 import { Button, Input, Dropdown, Modal, Checkbox, Tooltip } from 'antd';
 import { SearchOutlined, DownOutlined } from '@ant-design/icons';
 import { setSpaClassName } from '@/shared/utils/common';
-import { getKnowledgesCard } from '@/shared/http/appBuilder';
+import { getKnowledgesCard } from '@/shared/http/knowledge';
 import { Message } from '@/shared/utils/message';
 import { deepClone } from '@/pages/chatPreview/utils/chat-process';
 import { useTranslation } from 'react-i18next';
@@ -37,7 +37,6 @@ const AddKnowledge = (props) => {
   const [cachedKnowledgeList, setCachedKnowledgeList] = useState<any>([]);
   const searchName = useRef('');
   const checkData = useRef<any>([]);
-  const navigate = useHistory().push;
   const typeMap: any = {
     VECTOR: t('unstructuredData'),
     RDB: t('structuredData'),
@@ -47,18 +46,18 @@ const AddKnowledge = (props) => {
   const cancel = () => {
     setOpen(false);
   };
-  const showModal = (list = [], groupId: String) => {
+  const showModal = (list = [], groupId: String, knowledgeConfigId: String) => {
     setTotal(0);
     checkData.current = deepClone(list);
     setOpen(true);
-    setCheck(groupId);
+    setCheck(groupId, knowledgeConfigId);
   };
   // 设置选中列表
-  const setCheck = (groupId: String) => {
+  const setCheck = (groupId: String, knowledgeConfigId: String) => {
     setListPage(1);
     setPageSize(12);
     setKnowledgeList(checkData.current);
-    handleGetKnowledgeOptions(groupId);
+    handleGetKnowledgeOptions(knowledgeConfigId, groupId);
   };
 
   // 过滤Id
@@ -67,13 +66,14 @@ const AddKnowledge = (props) => {
   };
 
   // 获取知识库列表
-  const handleGetKnowledgeOptions = async (grpahGroupId?:String) => {
+  const handleGetKnowledgeOptions = async (knowledgeConfigId: String, graphGroupId?:String) => {
     const params = {
       tenantId,
       pageIndex: listPage,
       pageSize: pageSize,
       repoName: encodeURIComponent(searchName.current.trim()),
-      groupId: grpahGroupId || groupId,
+      groupId: graphGroupId || groupId,
+      knowledgeConfigId
     };
     try {
       const res: any = await getKnowledgesCard(params);

app-engine/frontend/src/pages/configForm/configUi/components/add-knowledge.tsx

@@ -7,7 +7,7 @@
 import React, { useImperativeHandle, useState, useRef } from 'react';
 import { Modal, Tabs, Radio, Switch, Tooltip, Spin } from 'antd';
 import { QuestionCircleOutlined } from '@ant-design/icons';
-import { getSearchParams } from '@/shared/http/appBuilder';
+import { getSearchParams } from '@/shared/http/knowledge';
 import { useTranslation } from 'react-i18next';
 import { Message } from '@/shared/utils/message';
 import type { RadioChangeEvent } from 'antd';

app-engine/frontend/src/pages/configForm/configUi/components/add-search.tsx

@@ -23,7 +23,8 @@ const KnowledgeContainer = (props) => {
   const { graphOperator, config, updateData, validateList } = props;
   const [knowledge, setKnowledge] = useState([]);
   const [groupConfig, setGroupConfig] = useState({});
-  const [groupId, setGroupId] = useState('default');
+  const [groupId, setGroupId] = useState('');
+  const [knowledgeConfigId, setKnowledgeConfigId] = useState('');
   const [activePanelKey, setActivePanelKey] = useState(['']);
   const knowledgeRef: any = useRef(null);
   const curKnowledge = useRef(null);
@@ -55,8 +56,9 @@ const KnowledgeContainer = (props) => {
     const groupConfig = [config[0], 'option'];
     const groupValue = graphOperator.getConfig(groupConfig);
     if (groupValue) {
-      const { groupId } = groupValue;
+      const { groupId, knowledgeConfigId } = groupValue;
       groupId && setGroupId(groupId);
+      setKnowledgeConfigId(knowledgeConfigId);
       setGroupConfig(groupConfig);
       curGroupValue.current = groupValue;
     }
@@ -69,13 +71,13 @@ const KnowledgeContainer = (props) => {
   }
 
   // 更新groupId
-  const updateGroupId = (val) => {
-    setGroupId(val);
-    if (curGroupValue.current.groupId !== val) {
-      curGroupValue.current.groupId = val;
-      graphOperator.update(groupConfig, curGroupValue.current);
-      updateData();
-    }
+  const updateKnowledgeOption = (groupId: String, knowledgeConfigId:String) => {
+    setGroupId(groupId);
+    setKnowledgeConfigId(knowledgeConfigId);
+    curGroupValue.current.groupId = groupId;
+    curGroupValue.current.knowledgeConfigId = knowledgeConfigId;
+    graphOperator.update(groupConfig, curGroupValue.current);
+    updateData();
   }
 
   // 更新每一条是否存在
@@ -138,6 +140,7 @@ const KnowledgeContainer = (props) => {
           knowledgeRef={knowledgeRef} 
           knowledge={knowledge}
           groupId={groupId}
+          knowledgeConfigId={knowledgeConfigId}
           updateData={updateKnowledge} 
         />
       </Panel>
@@ -146,9 +149,9 @@ const KnowledgeContainer = (props) => {
     <ConnectKnowledge
       modelRef={connectKnowledgeRef}
       groupId={groupId}
-      updateGroupId={updateGroupId}
+      updateKnowledgeOption={updateKnowledgeOption}
     />
   </>
 };
 
-export default KnowledgeContainer;
+export default KnowledgeContainer;

app-engine/frontend/src/pages/configForm/configUi/components/knowledge-container.tsx

@@ -15,7 +15,7 @@ import closeImg from '@/assets/images/close_btn.svg';
 
 const Knowledge = (props) => {
   const { t } = useTranslation();
-  const { knowledge, groupId, updateData, knowledgeRef } = props;
+  const { knowledge, groupId, updateData, knowledgeRef, knowledgeConfigId } = props;
   const [knows, setKnows] = useState([]);
   const [showOperateIndex, setShowOperateIndex] = useState(-1);
   const { tenantId } = useParams();
@@ -43,7 +43,7 @@ const Knowledge = (props) => {
   };
 
   const addKnowledge = () => {
-    modalRef.current.showModal(knows)
+    modalRef.current.showModal(knows, groupId, knowledgeConfigId);
   };
 
   // hover显示操作按钮