var context (#6617)

Author: c121914yu

packages/service/core/workflow/dispatch/index.ts

@@ -1386,8 +1386,6 @@ export class WorkflowQueue {
   }
 }
 export const runWorkflow = async (data: RunWorkflowProps): Promise<DispatchFlowResponse> => {
-  let { runtimeNodes = [], runtimeEdges = [], variables = {}, externalProvider } = data;
-
   // Over max depth
   data.workflowDispatchDeep++;
   const isRootRuntime = data.workflowDispatchDeep === 1;
@@ -1406,20 +1404,19 @@ export const runWorkflow = async (data: RunWorkflowProps): Promise<DispatchFlowR
       [DispatchNodeResponseKeyEnum.assistantResponses]: [],
       [DispatchNodeResponseKeyEnum.toolResponses]: null,
       [DispatchNodeResponseKeyEnum.newVariables]: runtimeSystemVar2StoreType({
-        variables,
-        removeObj: externalProvider.externalWorkflowVariables,
+        variables: data.variables,
+        removeObj: data.externalProvider.externalWorkflowVariables,
         userVariablesConfigs: data.chatConfig?.variables
       }),
       durationSeconds: 0
     };
   }
 
-  runtimeEdges = filterOrphanEdges({
-    edges: runtimeEdges,
-    nodes: runtimeNodes,
+  data.runtimeEdges = filterOrphanEdges({
+    edges: data.runtimeEdges,
+    nodes: data.runtimeNodes,
     workflowId: data.runningAppInfo.id
   });
-  data.runtimeEdges = runtimeEdges;
 
   return withActiveSpan(
     {
@@ -1434,23 +1431,27 @@ export const runWorkflow = async (data: RunWorkflowProps): Promise<DispatchFlowR
         'fastgpt.workflow.chat_id': data.chatId,
         'fastgpt.workflow.app_version': data.apiVersion,
         'fastgpt.workflow.is_tool_call': !!data.isToolCall,
-        'fastgpt.workflow.node_count': runtimeNodes.length,
-        'fastgpt.workflow.edge_count': runtimeEdges.length
+        'fastgpt.workflow.node_count': data.runtimeNodes.length,
+        'fastgpt.workflow.edge_count': data.runtimeEdges.length
       }
     },
     async (workflowSpan) => {
       const startTime = Date.now();
 
-      await rewriteRuntimeWorkFlow({ nodes: runtimeNodes, edges: runtimeEdges, lang: data.lang });
+      await rewriteRuntimeWorkFlow({
+        nodes: data.runtimeNodes,
+        edges: data.runtimeEdges,
+        lang: data.lang
+      });
       // Init default value
       data.retainDatasetCite = data.retainDatasetCite ?? true;
       data.responseDetail = data.responseDetail ?? true;
       data.responseAllData = data.responseAllData ?? true;
 
       // Start process width initInput
-      const entryNodes = runtimeNodes.filter((item) => item.isEntry);
+      const entryNodes = data.runtimeNodes.filter((item) => item.isEntry);
       // Reset entry
-      runtimeNodes.forEach((item) => {
+      data.runtimeNodes.forEach((item) => {
         // Interactively nodes will use the "isEntry", which does not need to be updated
         if (
           item.flowNodeType !== FlowNodeTypeEnum.userSelect &&
@@ -1519,8 +1520,8 @@ export const runWorkflow = async (data: RunWorkflowProps): Promise<DispatchFlowR
         ),
         [DispatchNodeResponseKeyEnum.toolResponses]: workflowQueue.toolRunResponse,
         [DispatchNodeResponseKeyEnum.newVariables]: runtimeSystemVar2StoreType({
-          variables,
-          removeObj: externalProvider.externalWorkflowVariables,
+          variables: data.variables,
+          removeObj: data.externalProvider.externalWorkflowVariables,
           userVariablesConfigs: data.chatConfig?.variables
         }),
         [DispatchNodeResponseKeyEnum.memories]:

packages/service/support/outLink/runtime/utils.ts

@@ -175,12 +175,7 @@ export async function outlinkInvokeChat<T extends OutlinkAppType>({
     await appendRedisCache(streamResKey, '', 120);
 
     // Merge global variables from database
-    let variables = {};
-    if (chatDetail?.variables) {
-      variables = {
-        ...chatDetail.variables
-      };
-    }
+    const variables = chatDetail?.variables ?? {};
 
     const {
       assistantResponses,

packages/web/components/common/DateTimePicker/index.tsx

@@ -1,9 +1,8 @@
 import React, { useState, useMemo, useRef, useEffect } from 'react';
 import type { BoxProps } from '@chakra-ui/react';
-import { Box, Card, Flex, Portal, useOutsideClick } from '@chakra-ui/react';
+import { Box, Card, Flex, Portal } from '@chakra-ui/react';
 import { format } from 'date-fns';
-import type { Matcher } from 'react-day-picker';
-import { DayPicker } from 'react-day-picker';
+import { DayPicker, type Matcher } from 'react-day-picker';
 import 'react-day-picker/dist/style.css';
 import { zhCN } from 'date-fns/locale/zh-CN';
 import MyIcon from '../Icon';

packages/web/package.json

@@ -39,7 +39,7 @@
     "papaparse": "^5.4.1",
     "react": "catalog:",
     "react-beautiful-dnd": "^13.1.1",
-    "react-day-picker": "^8.7.1",
+    "react-day-picker": "^9.14.0",
     "react-dom": "catalog:",
     "react-hook-form": "7.43.1",
     "react-i18next": "catalog:",

pnpm-lock.yaml

@@ -28,7 +28,7 @@ catalog:
   '@types/react-dom': ^18
   '@types/node': ^20
   axios: 1.13.6
-  date-fns: ^4
+  date-fns: ^3.6.0
   dayjs: 1.11.19
   eslint: ^8
   eslint-config-next: 15.5.12

pnpm-workspace.yaml

@@ -61,7 +61,6 @@
     "p-limit": "^7.2.0",
     "qrcode": "^1.5.4",
     "react": "catalog:",
-    "react-day-picker": "^8.7.1",
     "react-dom": "catalog:",
     "react-hook-form": "7.43.1",
     "react-i18next": "catalog:",