Merge branch '3.5.x'

CodeCasterX · CodeCasterX · commit 2c2626a02ff6 · 2025-04-02T11:49:32.000+08:00
diff --git a/framework/elsa/fit-elsa-react/src/components/flowRunComponent/SectionFactory.jsx b/framework/elsa/fit-elsa-react/src/components/flowRunComponent/SectionFactory.jsx
@@ -4,12 +4,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import SectionHeader from "@/components/flowRunComponent/SectionHeader.jsx";
-import SectionContent from "@/components/flowRunComponent/SectionContent.jsx";
-import {v4 as uuidv4} from "uuid";
-import {Card} from "antd";
+import SectionHeader from '@/components/flowRunComponent/SectionHeader.jsx';
+import SectionContent from '@/components/flowRunComponent/SectionContent.jsx';
+import {v4 as uuidv4} from 'uuid';
+import {Card} from 'antd';
 import {DATA_TYPES, SECTION_TYPE, UNARY_OPERATOR, VIRTUAL_CONTEXT_NODE} from '@/common/Consts.js';
-import {useTranslation} from "react-i18next";
+import {useTranslation} from 'react-i18next';
 
 /**
  * 构造运行报告的章节
@@ -87,7 +87,7 @@ export default function SectionFactory({shape}) {
                             const rightValue = _convertRightValue(condition);
                             const separatorIndex = key.indexOf(".");
                             const referenceNodeId = key.substring(0, separatorIndex);
-                            const text = referenceNodeId === VIRTUAL_CONTEXT_NODE.id ? t('systemEnv') : shape.page.getShapeById(referenceNodeId).text;
+                            const text = referenceNodeId === VIRTUAL_CONTEXT_NODE.id ? t('systemEnv') : shape.page.getShapeById(referenceNodeId)?.text ?? '';
                             const newKey = text + key.substring(separatorIndex);
                             let isShowLogic = section.data.conditions.length > 1 && index < section.data.conditions.length - 1;
                             return (<div key={`condition-container-${section.no}-${uuidv4()}`}
diff --git a/framework/elsa/fit-elsa-react/src/components/llm/LlmFormWrapper.jsx b/framework/elsa/fit-elsa-react/src/components/llm/LlmFormWrapper.jsx
@@ -103,16 +103,42 @@ export default function LlmFormWrapper({data, shapeStatus}) {
       return;
     }
     const urlSuffix = uniqueNameList.map(uniqueName => `uniqueNames=${uniqueName}`).join('&');
-    httpUtil.get(`${config.urls.toolListEndpoint}?${urlSuffix}`, new Map(), (jsonData) =>
-      setToolOptions(jsonData.data.map(item => {
-        return {
-          id: uuidv4(),
-          name: item.name,
-          tags: item.tags,
-          version: item.version,
-          value: item.uniqueName,
-        };
-      })));
+    httpUtil.get(`${config.urls.toolListEndpoint}?${urlSuffix}`, new Map(), (jsonData) => {
+        processToolData(jsonData.data);
+      },
+      () => {
+        processToolData([]);
+      },
+    );
+
+    const processToolData = (responseData) => {
+      const responseMap = new Map(responseData.map(item => [item.uniqueName, item]));
+
+      const toolOptions = uniqueNameList.map(uniqueName => {
+        if (responseMap.has(uniqueName)) {
+          const item = responseMap.get(uniqueName);
+          return {
+            id: uuidv4(),
+            name: item.name,
+            tags: item.tags,
+            version: item.version,
+            value: item.uniqueName,
+          };
+        } else {
+          // 若请求返回体中没有该 uniqueName 或请求失败，则从 toolItem 中获取信息
+          const fallbackItem = tool.value.find(toolItem => toolItem.value === uniqueName);
+          return fallbackItem ? {
+            id: fallbackItem.id,
+            name: fallbackItem.name || 'Unknown',
+            tags: fallbackItem.tags || [],
+            version: fallbackItem.version || 'Unknown',
+            value: fallbackItem.value,
+          } : null;
+        }
+      }).filter(Boolean); // 过滤掉 null 值
+
+      setToolOptions(toolOptions);
+    };
   };
 
   useEffect(() => {
diff --git a/framework/elsa/fit-elsa-react/src/flow/jadeFlowPage.js b/framework/elsa/fit-elsa-react/src/flow/jadeFlowPage.js
@@ -399,28 +399,67 @@ export const jadeFlowPage = (div, graph, name, id) => {
     self.removeEventListener('shape_rendered', listener);
   };
 
+  /**
+   * 按照指定的有序节点列表对节点数组进行重排。
+   *
+   * 该函数会根据 `orderedNodes` 的顺序对 `nodes` 中的节点进行排序。
+   * 如果 `nodes` 中的某些节点不在 `orderedNodes` 中，这些节点会被附加到排序后的数组末尾。
+   *
+   * @param {Array} nodes - 需要重排的节点数组，可能包含游离节点。
+   * @param {Array} orderedNodes - 有序节点列表，表示期望的节点顺序。
+   * @returns {Array} - 返回按照 `orderedNodes` 顺序重排后的节点数组，游离节点会附加到末尾。
+   *
+   * @example
+   * const nodes = ['F', 'E', 'D', 'C', 'B', 'A'];
+   * const orderedNodes = ['B', 'D', 'A', 'C'];
+   * const sortedNodes = reorderNodes(nodes, orderedNodes);
+   * console.log(sortedNodes); // 输出: ['B', 'D', 'A', 'C', 'F', 'E']
+   *
+   * @example
+   * const nodes = ['X', 'Y', 'Z', 'A', 'B'];
+   * const orderedNodes = ['A', 'B', 'C'];
+   * const sortedNodes = reorderNodes(nodes, orderedNodes);
+   * console.log(sortedNodes); // 输出: ['A', 'B', 'X', 'Y', 'Z']
+   */
+  const reorderNodes = (nodes, orderedNodes) => {
+    // 创建一个 Map，用于快速查找节点在 reachableNodes 中的索引
+    const nodeOrder = new Map();
+    orderedNodes.forEach((node, index) => {
+      nodeOrder.set(node, index);
+    });
+
+    // 将 nodes 中的节点按照 orderedNodes 的顺序进行排序
+    // 不在 orderedNodes 中的节点会被放在最后
+    return nodes.slice().sort((a, b) => {
+      const indexA = nodeOrder.has(a) ? nodeOrder.get(a) : orderedNodes.length;
+      const indexB = nodeOrder.has(b) ? nodeOrder.get(b) : orderedNodes.length;
+      return indexA - indexB;
+    });
+  };
+
   /**
    * 启动调试.
    *
    * @return {*} 调试的节点列表.
    */
   self.testRun = () => {
-    self.getNodes().forEach(node => {
+    const allNodes = self.getNodes();
+    allNodes.forEach(node => {
       node.isActiveInFlow = false;
     });
     const startNode = self.getStartNode();
-    self.getReachableNodes(startNode).forEach(node => {
+    const reachableNodes = self.getReachableNodes(startNode);
+    reachableNodes.forEach(node => {
       node.isActiveInFlow = true;
     });
     self.isRunning = true;
-    const nodes = self.sm.getShapes().filter(s => s.isTypeof('jadeNode')).filter(s => s.runnable !== false);
-    nodes.map(n => {
-      const h = self.createRunner(n);
-      n.ignoreChange(() => {
-        h.testRun();
-      });
+    const nodes = allNodes.filter(s => s.runnable !== false);
+    const orderedNodes = reorderNodes(nodes, reachableNodes);
+    orderedNodes.map(n => {
+      const runner = self.createRunner(n);
+      n.ignoreChange(() => runner.testRun());
     });
-    return nodes;
+    return orderedNodes;
   };
 
   /**
