[elsa] 知识检索节点去除userId入参，在option中增加knowledgeConfigId参数 (#119)

RonnyChan96 · web-flow · commit 9db5b06dc4ba · 2025-05-13T10:34:51.000+08:00
diff --git a/framework/elsa/fit-elsa-react/src/common/Consts.js b/framework/elsa/fit-elsa-react/src/common/Consts.js
@@ -208,14 +208,10 @@ export const DEFAULT_LOOP_NODE_CONTEXT = {
   }],
 };
 
-export const DEFAULT_KNOWLEDGE_RETRIEVAL_NODE_USER_ID = {
-  id: `userId_${uuidv4()}`,
-  name: 'userId',
-  type: 'String',
-  from: 'Reference',
-  referenceNode: VIRTUAL_CONTEXT_NODE.id,
-  referenceId: VIRTUAL_CONTEXT_NODE_VARIABLES.USER_ID,
-  referenceKey: VIRTUAL_CONTEXT_NODE_VARIABLES.USER_ID,
-  editable: false,
-  value: [VIRTUAL_CONTEXT_NODE_VARIABLES.USER_ID],
+export const DEFAULT_KNOWLEDGE_RETRIEVAL_NODE_KNOWLEDGE_CONFIG_ID = {
+  id: `knowledgeConfigId_${uuidv4()}`,
+  name: 'knowledgeConfigId',
+  type: DATA_TYPES.STRING,
+  from: FROM_TYPE.INPUT,
+  value: null,
 };
diff --git a/framework/elsa/fit-elsa-react/src/components/knowledgeRetrieval/KnowledgeRetrievalWrapper.jsx b/framework/elsa/fit-elsa-react/src/components/knowledgeRetrieval/KnowledgeRetrievalWrapper.jsx
@@ -26,6 +26,7 @@ export const KnowledgeRetrievalWrapper = ({data, shapeStatus}) => {
   const outputParams = data && data.outputParams;
   const option = data.inputParams.find(item => item.name === 'option');
   const groupId = getConfigValue(option, ['groupId'], 'value');
+  const knowledgeConfigId = getConfigValue(option, ['knowledgeConfigId'], 'value');
   const {t} = useTranslation();
   const dispatch = useDispatch();
 
@@ -43,7 +44,7 @@ export const KnowledgeRetrievalWrapper = ({data, shapeStatus}) => {
       content={tips}
       maxInputLength={1000}
       editable={false}/>
-    <KnowledgeForm knowledge={knowledge} groupId={groupId} disabled={shapeStatus.disabled}/>
+    <KnowledgeForm knowledge={knowledge} groupId={groupId} knowledgeConfigId={knowledgeConfigId} disabled={shapeStatus.disabled}/>
     <SearchForm option={option} groupId={groupId} shapeStatus={shapeStatus}/>
     <OutputForm outputParams={outputParams} outputPopover={'knowledgeBaseOutputPopover'}/>
   </>);
diff --git a/framework/elsa/fit-elsa-react/src/components/knowledgeRetrieval/knowledgeRetrievalComponent.jsx b/framework/elsa/fit-elsa-react/src/components/knowledgeRetrieval/knowledgeRetrievalComponent.jsx
@@ -7,9 +7,9 @@
 import {v4 as uuidv4} from 'uuid';
 import {KnowledgeRetrievalWrapper} from '@/components/knowledgeRetrieval/KnowledgeRetrievalWrapper.jsx';
 import {retrievalComponent} from '@/components/retrieval/retrievalComponent.jsx';
-import {DATA_TYPES, DEFAULT_KNOWLEDGE_REPO_GROUP, DEFAULT_KNOWLEDGE_RETRIEVAL_NODE_USER_ID, FROM_TYPE, VIRTUAL_CONTEXT_NODE} from '@/common/Consts.js';
+import {DATA_TYPES, DEFAULT_KNOWLEDGE_REPO_GROUP, DEFAULT_KNOWLEDGE_RETRIEVAL_NODE_KNOWLEDGE_CONFIG_ID, FROM_TYPE} from '@/common/Consts.js';
 import {
-  UpdateGroupIdReducer,
+  UpdateGroupIdAndConfigIdReducer,
   UpdateInputParamReducer,
   UpdateKnowledgeReducer,
   UpdateOptionReducer,
@@ -28,7 +28,7 @@ export const knowledgeRetrievalComponent = (jadeConfig, shape) => {
   addReducer(builtInReducers, UpdateInputParamReducer());
   addReducer(builtInReducers, UpdateOptionReducer());
   addReducer(builtInReducers, UpdateKnowledgeReducer());
-  addReducer(builtInReducers, UpdateGroupIdReducer());
+  addReducer(builtInReducers, UpdateGroupIdAndConfigIdReducer());
 
   /**
    * 必填
@@ -137,9 +137,10 @@ export const knowledgeRetrievalComponent = (jadeConfig, shape) => {
             type: DATA_TYPES.STRING,
             from: FROM_TYPE.INPUT,
             value: DEFAULT_KNOWLEDGE_REPO_GROUP,
-          }],
-      },
-        DEFAULT_KNOWLEDGE_RETRIEVAL_NODE_USER_ID],
+          },
+          DEFAULT_KNOWLEDGE_RETRIEVAL_NODE_KNOWLEDGE_CONFIG_ID
+        ],
+      }],
       outputParams: [{
         id: `output_${uuidv4()}`,
         name: 'output',
diff --git a/framework/elsa/fit-elsa-react/src/components/knowledgeRetrieval/knowledgeRetrievalNodeState.jsx b/framework/elsa/fit-elsa-react/src/components/knowledgeRetrieval/knowledgeRetrievalNodeState.jsx
@@ -39,9 +39,6 @@ export const knowledgeRetrievalNodeState = (id, x, y, width, height, parent, dra
           {
             name: 'option',
           },
-          {
-            name: 'userId',
-          },
         ],
         return: {
           type: 'object',
diff --git a/framework/elsa/fit-elsa-react/src/components/knowledgeRetrieval/reducers.js b/framework/elsa/fit-elsa-react/src/components/knowledgeRetrieval/reducers.js
@@ -6,7 +6,7 @@
 
 import {structToConfig, toConfigType, updateConfigValueByObject, updateInput} from '@/components/util/JadeConfigUtils.js';
 import {v4 as uuidv4} from 'uuid';
-import {DATA_TYPES, DEFAULT_KNOWLEDGE_REPO_GROUP_STRUCT, FROM_TYPE} from '@/common/Consts.js';
+import {DATA_TYPES, DEFAULT_KNOWLEDGE_REPO_GROUP_STRUCT, DEFAULT_KNOWLEDGE_RETRIEVAL_NODE_KNOWLEDGE_CONFIG_ID, FROM_TYPE} from '@/common/Consts.js';
 
 /**
  * updateInputParams 事件处理器.
@@ -127,14 +127,14 @@ export const UpdateKnowledgeReducer = () => {
 };
 
 /**
- * updateGroupId 事件处理器.
+ * updateGroupIdAndConfigId 事件处理器.
  *
  * @return {{}} 处理器对象.
  * @constructor
  */
-export const UpdateGroupIdReducer = () => {
+export const UpdateGroupIdAndConfigIdReducer = () => {
   const self = {};
-  self.type = 'updateGroupId';
+  self.type = 'updateGroupIdAndConfigId';
 
   /**
    * 处理方法.
@@ -157,6 +157,14 @@ export const UpdateGroupIdReducer = () => {
     }
 
     groupId.value = action.value;
+
+    let knowledgeConfigId = option.value.find(v => v.name === 'knowledgeConfigId');
+    if (!knowledgeConfigId) {
+      knowledgeConfigId = {...DEFAULT_KNOWLEDGE_RETRIEVAL_NODE_KNOWLEDGE_CONFIG_ID};
+      option.value.push(knowledgeConfigId);
+    }
+    knowledgeConfigId.value = action.knowledgeConfigId;
+
     return newConfig;
   };
 
diff --git a/framework/elsa/fit-elsa-react/src/components/retrieval/KnowledgeForm.jsx b/framework/elsa/fit-elsa-react/src/components/retrieval/KnowledgeForm.jsx
@@ -22,12 +22,13 @@ const {Panel} = Collapse;
  *
  * @param knowledge 知识库利列表.
  * @param groupId 知识库group.
+ * @param knowledgeConfigId 知识库配置的唯一标识.
  * @param disabled 禁用状态.
  * @param maximum 最大值.
  * @param enableGroup 是否启动groupId.
  * @returns {JSX.Element}
  */
-const _KnowledgeForm = ({knowledge, groupId, disabled, maximum = null, enableGroup = true}) => {
+const _KnowledgeForm = ({knowledge, groupId, knowledgeConfigId, disabled, maximum = null, enableGroup = true}) => {
   const dispatch = useDispatch();
   const shape = useShapeContext();
   const {t} = useTranslation();
@@ -90,10 +91,12 @@ const _KnowledgeForm = ({knowledge, groupId, disabled, maximum = null, enableGro
       type: 'SELECT_KNOWLEDGE_BASE_GROUP',
       value: {
         selectedGroupId: groupId ?? DEFAULT_KNOWLEDGE_REPO_GROUP,
-        onSelect: (repoGroupId) => {
+        selectedKnowledgeConfigId: knowledgeConfigId,
+        onSelect: (repoGroupId, knowledgeConfigId) => {
           dispatch({
-            type: 'updateGroupId',
+            type: 'updateGroupIdAndConfigId',
             value: repoGroupId,
+            knowledgeConfigId: knowledgeConfigId,
           });
         },
       },
@@ -196,6 +199,7 @@ const _KnowledgeForm = ({knowledge, groupId, disabled, maximum = null, enableGro
 _KnowledgeForm.propTypes = {
   knowledge: PropTypes.array.isRequired,
   groupId: PropTypes.string.isRequired,
+  knowledgeConfigId: PropTypes.string,
   maximum: PropTypes.number,
   disabled: PropTypes.bool,
   enableGroup: PropTypes.bool,
@@ -204,6 +208,7 @@ _KnowledgeForm.propTypes = {
 const areEqual = (prevProps, nextProps) => {
   return prevProps.knowledge === nextProps.knowledge &&
     prevProps.groupId === nextProps.groupId &&
+    prevProps.knowledgeConfigId === nextProps.knowledgeConfigId &&
     prevProps.maximum === nextProps.maximum &&
     prevProps.enableGroup === nextProps.enableGroup &&
     prevProps.disabled === nextProps.disabled;
diff --git a/framework/elsa/fit-elsa-react/src/flow/compatibility/compatibilityProcessors.js b/framework/elsa/fit-elsa-react/src/flow/compatibility/compatibilityProcessors.js
@@ -9,7 +9,7 @@ import {getDefaultReference} from '@/components/util/ReferenceUtil.js';
 import {
   DATA_TYPES,
   DEFAULT_KNOWLEDGE_REPO_GROUP_STRUCT,
-  DEFAULT_KNOWLEDGE_RETRIEVAL_NODE_USER_ID,
+  DEFAULT_KNOWLEDGE_RETRIEVAL_NODE_KNOWLEDGE_CONFIG_ID,
   DEFAULT_LLM_KNOWLEDGE_BASES,
   DEFAULT_LLM_REFERENCE_OUTPUT,
   DEFAULT_LOOP_NODE_CONTEXT,
@@ -400,19 +400,22 @@ export const knowledgeRetrievalCompatibilityProcessor = (shapeData, graph, pageH
       if (Array.isArray(optionValue) && !optionValue.some(v => v.name === 'groupId')) {
         optionValue.push(DEFAULT_KNOWLEDGE_REPO_GROUP_STRUCT);
       }
+
+      if (Array.isArray(optionValue) && !optionValue.some(v => v.name === 'knowledgeConfigId')) {
+        optionValue.push(DEFAULT_KNOWLEDGE_RETRIEVAL_NODE_KNOWLEDGE_CONFIG_ID);
+      }
     };
 
     const userIdParamProcess = () => {
       const inputParams = self.shapeData.flowMeta.jober.converter.entity.inputParams;
-      const userIdParam = inputParams.find(inputParam => inputParam.name === 'userId');
-      if (!userIdParam) {
-        inputParams.push(DEFAULT_KNOWLEDGE_RETRIEVAL_NODE_USER_ID);
+      const userIdInputParamIndex = inputParams.findIndex(inputParam => inputParam.name === 'userId');
+      if (userIdInputParamIndex !== -1) {
+        inputParams.splice(userIdInputParamIndex, 1);
       }
       const entityParams = self.shapeData.flowMeta.jober.entity.params;
-      if (!entityParams.find(param => param.name === 'userId')) {
-        const optionIndex = entityParams.findIndex(param => param.name === 'option');
-        const insertIndex = optionIndex !== -1 ? optionIndex + 1 : entityParams.length;
-        entityParams.splice(insertIndex, 0, {name: 'userId'});
+      const userIdIndex = entityParams.findIndex(param => param.name === 'userId');
+      if (userIdIndex !== -1) {
+        entityParams.splice(userIdIndex, 1);
       }
     };
 
