4.8.11 test fix (#2746)

* fix: refresh tool param

* perf: load image message

* fix: cannot remoce externalReadUrl

* perf: variables update dom

* perf: empty response tip

* fix: conflict

docSite/content/zh-cn/docs/course/fileInput.md

@@ -114,7 +114,7 @@ ${content}
 它接收一个`string`类型的输入，除了可以引用文档解析结果外，还可以实现自定义内容引用，最终会进行提示词拼接，放置在 role=system 的消息中。提示词模板如下：
 
 ```
-将 <Quote></Quote> 中的内容作为本次对话的参考内容:
+将 <Quote></Quote> 中的内容作为本次对话的参考:
 <Quote>
 {{quote}}
 </Quote>

docSite/content/zh-cn/docs/development/openapi/share.md

@@ -227,7 +227,7 @@ curl --location --request POST '{{host}}/shareAuth/finish' \
             "historyPreview": [
                 {
                     "obj": "Human",
-                    "value": "使用 <Data></Data> 标记中的内容作为本次对话的参考内容:\n\n<Data>\n导演是谁？\n电影《铃芽之旅》的导演是新海诚。\n------\n电影《铃芽之旅》的编剧是谁？22\n新海诚是本片的编剧。\n------\n电影《铃芽之旅》的女主角是谁？\n电影的女主角是铃芽。\n------\n电影《铃芽之旅》的制作团队中有哪位著名人士？2\n川村元气是本片的制作团队成员之一。\n------\n你是谁？\n我是电影《铃芽之旅》助手\n------\n电影《铃芽之旅》男主角是谁？\n电影《铃芽之旅》男主角是宗像草太，由松村北斗配音。\n------\n电影《铃芽之旅》的作者新海诚写了一本小说，叫什么名字？\n小说名字叫《铃芽之旅》。\n------\n电影《铃芽之旅》的女主角是谁？\n电影《铃芽之旅》的女主角是岩户铃芽，由原菜乃华配音。\n------\n电影《铃芽之旅》的故事背景是什么？\n日本\n------\n谁担任电影《铃芽之旅》中岩户环的配音？\n深津绘里担任电影《铃芽之旅》中岩户环的配音。\n</Data>\n\n回答要求：\n- 如果你不清楚答案，你需要澄清。\n- 避免提及你是从 <Data></Data> 获取的知识。\n- 保持答案与 <Data></Data> 中描述的一致。\n- 使用 Markdown 语法优化回答格式。\n- 使用与问题相同的语言回答。\n\n问题:\"\"\"导演是谁\"\"\""
+                    "value": "使用 <Data></Data> 标记中的内容作为本次对话的参考:\n\n<Data>\n导演是谁？\n电影《铃芽之旅》的导演是新海诚。\n------\n电影《铃芽之旅》的编剧是谁？22\n新海诚是本片的编剧。\n------\n电影《铃芽之旅》的女主角是谁？\n电影的女主角是铃芽。\n------\n电影《铃芽之旅》的制作团队中有哪位著名人士？2\n川村元气是本片的制作团队成员之一。\n------\n你是谁？\n我是电影《铃芽之旅》助手\n------\n电影《铃芽之旅》男主角是谁？\n电影《铃芽之旅》男主角是宗像草太，由松村北斗配音。\n------\n电影《铃芽之旅》的作者新海诚写了一本小说，叫什么名字？\n小说名字叫《铃芽之旅》。\n------\n电影《铃芽之旅》的女主角是谁？\n电影《铃芽之旅》的女主角是岩户铃芽，由原菜乃华配音。\n------\n电影《铃芽之旅》的故事背景是什么？\n日本\n------\n谁担任电影《铃芽之旅》中岩户环的配音？\n深津绘里担任电影《铃芽之旅》中岩户环的配音。\n</Data>\n\n回答要求：\n- 如果你不清楚答案，你需要澄清。\n- 避免提及你是从 <Data></Data> 获取的知识。\n- 保持答案与 <Data></Data> 中描述的一致。\n- 使用 Markdown 语法优化回答格式。\n- 使用与问题相同的语言回答。\n\n问题:\"\"\"导演是谁\"\"\""
                 },
                 {
                     "obj": "AI",

docSite/content/zh-cn/docs/workflow/examples/google_search.md

@@ -965,7 +965,7 @@ export default async function (ctx: FunctionContext) {
           "required": true,
           "description": "",
           "canEdit": false,
-          "value": "请使用下面<data> </data>中的数据作为本次对话的参考内容。请直接输出答案，不要提及你是从<data> </data>中获取的知识。\n\n当前时间:{{cTime}}\n\n<data>\n{{response}}\n</data>\n\n我的问题:\"{{q}}\"",
+          "value": "请使用下面<data> </data>中的数据作为本次对话的参考。请直接输出答案，不要提及你是从<data> </data>中获取的知识。\n\n当前时间:{{cTime}}\n\n<data>\n{{response}}\n</data>\n\n我的问题:\"{{q}}\"",
           "editField": {
             "key": true
           },

packages/global/core/ai/prompt/AIChat.ts

@@ -48,7 +48,7 @@ export const Prompt_userQuotePromptList: PromptTemplateItem[] = [
   {
     title: i18nT('app:template.standard_template'),
     desc: '',
-    value: `使用 <Reference></Reference> 标记中的内容作为本次对话的参考内容:
+    value: `使用 <Reference></Reference> 标记中的内容作为本次对话的参考:
 
 <Reference>
 {{quote}}
@@ -83,7 +83,7 @@ export const Prompt_userQuotePromptList: PromptTemplateItem[] = [
   {
     title: i18nT('app:template.standard_strict'),
     desc: '',
-    value: `忘记你已有的知识，仅使用 <Reference></Reference> 标记中的内容作为本次对话的参考内容:
+    value: `忘记你已有的知识，仅使用 <Reference></Reference> 标记中的内容作为本次对话的参考:
 
 <Reference>
 {{quote}}
@@ -133,7 +133,7 @@ export const Prompt_systemQuotePromptList: PromptTemplateItem[] = [
   {
     title: i18nT('app:template.standard_template'),
     desc: '',
-    value: `使用 <Reference></Reference> 标记中的内容作为本次对话的参考内容:
+    value: `使用 <Reference></Reference> 标记中的内容作为本次对话的参考:
 
 <Reference>
 {{quote}}
@@ -164,7 +164,7 @@ export const Prompt_systemQuotePromptList: PromptTemplateItem[] = [
   {
     title: i18nT('app:template.standard_strict'),
     desc: '',
-    value: `忘记你已有的知识，仅使用 <Reference></Reference> 标记中的内容作为本次对话的参考内容:
+    value: `忘记你已有的知识，仅使用 <Reference></Reference> 标记中的内容作为本次对话的参考:
 
 <Reference>
 {{quote}}
@@ -207,7 +207,7 @@ export const Prompt_systemQuotePromptList: PromptTemplateItem[] = [
 ];
 
 // Document quote prompt
-export const Prompt_DocumentQuote = `将 <Reference></Reference> 中的内容作为本次对话的参考内容:
+export const Prompt_DocumentQuote = `将 <Reference></Reference> 中的内容作为本次对话的参考:
 <Reference>
 {{quote}}
 </Reference>

packages/service/core/chat/utils.ts

@@ -8,6 +8,8 @@ import axios from 'axios';
 import { ChatCompletionRequestMessageRoleEnum } from '@fastgpt/global/core/ai/constants';
 import { getFileContentTypeFromHeader, guessBase64ImageType } from '../../common/file/utils';
 import { serverRequestBaseUrl } from '../../common/api/serverRequest';
+import { i18nT } from '../../../web/i18n/utils';
+import { addLog } from '../../common/system/log';
 
 /* slice chat context by tokens */
 const filterEmptyMessages = (messages: ChatCompletionMessageParam[]) => {
@@ -111,46 +113,11 @@ export const loadRequestMessages = async ({
   useVision?: boolean;
   origin?: string;
 }) => {
-  // Split question text and image
+  // Load image to base64
-  function parseStringWithImages(input: string): ChatCompletionContentPart[] {
+  const loadImageToBase64 = async (messages: ChatCompletionContentPart[]) => {
-    if (!useVision) {
+    return Promise.all(
-      return [{ type: 'text', text: input || '' }];
+      messages.map(async (item) => {
-    }
+        if (item.type === 'image_url') {
-
-    // 正则表达式匹配图片URL
-    const imageRegex =
-      /(https?:\/\/[^\s/$.?#].[^\s]*\.(?:png|jpe?g|gif|webp|bmp|tiff?|svg|ico|heic|avif))/i;
-
-    const result: ChatCompletionContentPart[] = [];
-
-    // 提取所有HTTPS图片URL并添加到result开头
-    const httpsImages = input.match(imageRegex) || [];
-    httpsImages.forEach((url) => {
-      result.push({
-        type: 'image_url',
-        image_url: {
-          url: url
-        }
-      });
-    });
-
-    // 添加原始input作为文本
-    result.push({ type: 'text', text: input });
-    return result;
-  }
-  // Load image
-  const parseUserContent = async (content: string | ChatCompletionContentPart[]) => {
-    if (typeof content === 'string') {
-      return parseStringWithImages(content);
-    }
-
-    const result = await Promise.all(
-      content.map(async (item) => {
-        if (item.type === 'text') return parseStringWithImages(item.text);
-        if (item.type === 'file_url') return;
-
-        if (!item.image_url.url) return item;
-
           // Remove url origin
           const imgUrl = (() => {
             if (origin && item.image_url.url.startsWith(origin)) {
@@ -159,11 +126,16 @@ export const loadRequestMessages = async ({
             return item.image_url.url;
           })();
 
-        /* Load local image */
+          // If imgUrl is a local path, load image from local, and set url to base64
-        if (imgUrl.startsWith('/')) {
+          if (imgUrl.startsWith('/') || process.env.VISION_FOCUS_BASE64 === 'true') {
+            addLog.debug('Load image from local server', {
+              baseUrl: serverRequestBaseUrl,
+              requestUrl: imgUrl
+            });
             const response = await axios.get(imgUrl, {
               baseURL: serverRequestBaseUrl,
-            responseType: 'arraybuffer'
+              responseType: 'arraybuffer',
+              proxy: false
             });
             const base64 = Buffer.from(response.data, 'binary').toString('base64');
             const imageType =
@@ -178,13 +150,58 @@ export const loadRequestMessages = async ({
               }
             };
           }
+        }
+        return item;
+      })
+    );
+  };
+  // Split question text and image
+  const parseStringWithImages = (input: string): ChatCompletionContentPart[] => {
+    if (!useVision) {
+      return [{ type: 'text', text: input || '' }];
+    }
+
+    // 正则表达式匹配图片URL
+    const imageRegex =
+      /(https?:\/\/[^\s/$.?#].[^\s]*\.(?:png|jpe?g|gif|webp|bmp|tiff?|svg|ico|heic|avif))/gi;
+
+    const result: ChatCompletionContentPart[] = [];
+
+    // 提取所有HTTPS图片URL并添加到result开头
+    const httpsImages = [...new Set(Array.from(input.matchAll(imageRegex), (m) => m[0]))];
+    httpsImages.forEach((url) => {
+      result.push({
+        type: 'image_url',
+        image_url: {
+          url: url
+        }
+      });
+    });
+
+    // 添加原始input作为文本
+    result.push({ type: 'text', text: input });
+    return result;
+  };
+  // Parse user content(text and img)
+  const parseUserContent = async (content: string | ChatCompletionContentPart[]) => {
+    if (typeof content === 'string') {
+      return loadImageToBase64(parseStringWithImages(content));
+    }
+
+    const result = await Promise.all(
+      content.map(async (item) => {
+        if (item.type === 'text') return parseStringWithImages(item.text);
+        if (item.type === 'file_url') return; // LLM not support file_url
+
+        if (!item.image_url.url) return item;
 
         return item;
       })
     );
 
-    return result.flat().filter(Boolean);
+    return loadImageToBase64(result.flat().filter(Boolean) as ChatCompletionContentPart[]);
   };
+
   // format GPT messages, concat text messages
   const clearInvalidMessages = (messages: ChatCompletionMessageParam[]) => {
     return messages
@@ -247,7 +264,7 @@ export const loadRequestMessages = async ({
   };
 
   if (messages.length === 0) {
-    return Promise.reject('core.chat.error.Messages empty');
+    return Promise.reject(i18nT('common:core.chat.error.Messages empty'));
   }
 
   // filter messages file
@@ -275,6 +292,7 @@ export const loadRequestMessages = async ({
           content: await parseUserContent(item.content)
         };
       } else if (item.role === ChatCompletionRequestMessageRoleEnum.Assistant) {
+        // remove invalid field
         return {
           role: item.role,
           content: item.content,

packages/web/i18n/en/chat.json

@@ -19,6 +19,7 @@
   "input_guide": "Input Guide",
   "input_guide_lexicon": "Lexicon",
   "input_guide_tip": "You can set up some preset questions. When the user inputs a question, related questions from these presets will be suggested.",
+  "input_placeholder_phone": "Please enter your question",
   "insert_input_guide,_some_data_already_exists": "Duplicate data detected, automatically filtered, {{len}} items inserted",
   "is_chatting": "Chatting in progress... please wait until it finishes",
   "items": "Items",

packages/web/i18n/zh/chat.json

@@ -19,6 +19,7 @@
   "input_guide": "输入引导",
   "input_guide_lexicon": "词库",
   "input_guide_tip": "可以配置一些预设的问题。在用户输入问题时，会从这些预设问题中获取相关问题进行提示。",
+  "input_placeholder_phone": "输入问题",
   "insert_input_guide,_some_data_already_exists": "有重复数据，已自动过滤，共插入 {{len}} 条数据",
   "is_chatting": "正在聊天中...请等待结束",
   "items": "条",

projects/app/src/components/core/chat/ChatContainer/ChatBox/Input/ChatInput.tsx

@@ -449,7 +449,11 @@ const ChatInput = ({
             border: 'none'
           }}
           placeholder={
-            isSpeaking ? t('common:core.chat.Speaking') : t('common:core.chat.Type a message')
+            isSpeaking
+              ? t('common:core.chat.Speaking')
+              : isPc
+                ? t('common:core.chat.Type a message')
+                : t('chat:input_placeholder_phone')
           }
           resize={'none'}
           rows={1}

projects/app/src/components/core/chat/ChatContainer/ChatBox/components/ChatItem.tsx

@@ -174,7 +174,7 @@ const ChatItem = (props: Props) => {
 
     // Check last group is interactive, Auto add a empty text node(animation)
     const lastGroup = groupedValues[groupedValues.length - 1];
-    if (isChatting) {
+    if (isChatting || groupedValues.length === 0) {
       if (
         (lastGroup &&
           lastGroup[lastGroup.length - 1] &&

projects/app/src/pages/api/core/dataset/update.ts

@@ -72,7 +72,7 @@ async function handler(
         ...(websiteConfig && { websiteConfig }),
         ...(status && { status }),
         ...(intro !== undefined && { intro }),
-        ...(externalReadUrl && { externalReadUrl }),
+        ...(externalReadUrl !== undefined && { externalReadUrl }),
         // move
         ...(updatedDefaultPermission !== undefined && {
           defaultPermission: updatedDefaultPermission

projects/app/src/pages/api/v1/chat/completions.ts

@@ -266,7 +266,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
           workflowStreamResponse: workflowResponseWrite
         });
       }
-      return Promise.reject('请升级工作流');
+      return Promise.reject('您的工作流版本过低，请重新发布一次');
     })();
 
     // save chat

projects/app/src/pages/app/detail/components/Plugin/Header.tsx

@@ -67,7 +67,7 @@ const Header = () => {
     future,
     setPast
   } = useContextSelector(WorkflowContext, (v) => v);
-  const { appType } = useSystemStore();
+  const { lastAppListRouteType } = useSystemStore();
 
   const [isPublished, setIsPublished] = useState(false);
   useDebounceEffect(
@@ -138,11 +138,11 @@ const Header = () => {
         pathname: '/app/list',
         query: {
           parentId: appDetail.parentId,
-          type: appType
+          type: lastAppListRouteType
         }
       });
     } catch (error) {}
-  }, [appDetail._id, appDetail.parentId, router]);
+  }, [appDetail._id, appDetail.parentId, lastAppListRouteType, router]);
 
   const Render = useMemo(() => {
     return (

projects/app/src/pages/app/detail/components/SimpleApp/Header.tsx

@@ -37,7 +37,7 @@ const Header = ({
   const router = useRouter();
   const { toast } = useToast();
   const { appId, appDetail, onSaveApp, currentTab } = useContextSelector(AppContext, (v) => v);
-  const { appType } = useSystemStore();
+  const { lastAppListRouteType } = useSystemStore();
 
   const { data: paths = [] } = useRequest2(() => getAppFolderPath(appId), {
     manual: false,
@@ -49,11 +49,11 @@ const Header = ({
         pathname: '/app/list',
         query: {
           parentId,
-          type: appType
+          type: lastAppListRouteType
         }
       });
     },
-    [router, appType]
+    [router, lastAppListRouteType]
   );
 
   const isPublished = useMemo(() => {

projects/app/src/pages/app/detail/components/Workflow/Header.tsx

@@ -67,7 +67,8 @@ const Header = () => {
     future,
     setPast
   } = useContextSelector(WorkflowContext, (v) => v);
-  const { appType } = useSystemStore();
+
+  const { lastAppListRouteType } = useSystemStore();
 
   // Check if the workflow is published
   const [isPublished, setIsPublished] = useState(false);
@@ -139,11 +140,11 @@ const Header = () => {
         pathname: '/app/list',
         query: {
           parentId: appDetail.parentId,
-          type: appType
+          type: lastAppListRouteType
         }
       });
     } catch (error) {}
-  }, [appDetail._id, appDetail.parentId, router]);
+  }, [appDetail._id, appDetail.parentId, lastAppListRouteType, router]);
 
   const Render = useMemo(() => {
     return (

projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/NodeVariableUpdate.tsx

@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import NodeCard from './render/NodeCard';
 import { NodeProps } from 'reactflow';
 import { FlowNodeItemType } from '@fastgpt/global/core/workflow/type/node';
@@ -12,7 +12,8 @@ import {
   NumberInput,
   NumberInputField,
   NumberInputStepper,
-  Switch
+  Switch,
+  Textarea
 } from '@chakra-ui/react';
 import { TUpdateListItem } from '@fastgpt/global/core/workflow/template/system/variableUpdate/type';
 import { NodeInputKeyEnum, WorkflowIOValueTypeEnum } from '@fastgpt/global/core/workflow/constants';
@@ -33,7 +34,7 @@ import { getRefData } from '@/web/core/workflow/utils';
 import { isReferenceValue } from '@fastgpt/global/core/workflow/utils';
 import { AppContext } from '@/pages/app/detail/components/context';
 import PromptEditor from '@fastgpt/web/components/common/Textarea/PromptEditor';
-import { useCreation } from 'ahooks';
+import { useCreation, useMemoizedFn } from 'ahooks';
 import { getEditorVariables } from '../../utils';
 
 const NodeVariableUpdate = ({ data, selected }: NodeProps<FlowNodeItemType>) => {
@@ -45,6 +46,19 @@ const NodeVariableUpdate = ({ data, selected }: NodeProps<FlowNodeItemType>) =>
   const appDetail = useContextSelector(AppContext, (v) => v.appDetail);
   const edges = useContextSelector(WorkflowContext, (v) => v.edges);
 
+  const menuList = useRef([
+    {
+      renderType: FlowNodeInputTypeEnum.input,
+      icon: FlowNodeInputMap[FlowNodeInputTypeEnum.input].icon,
+      label: t('common:core.workflow.inputType.Manual input')
+    },
+    {
+      renderType: FlowNodeInputTypeEnum.reference,
+      icon: FlowNodeInputMap[FlowNodeInputTypeEnum.reference].icon,
+      label: t('common:core.workflow.inputType.Reference')
+    }
+  ]);
+
   const variables = useCreation(() => {
     return getEditorVariables({
       nodeId,
@@ -80,29 +94,17 @@ const NodeVariableUpdate = ({ data, selected }: NodeProps<FlowNodeItemType>) =>
     [inputs, nodeId, onChangeNode]
   );
 
-  const Render = useMemo(() => {
+  const ValueRender = useMemoizedFn(
-    const menuList = [
+    ({ updateItem, index }: { updateItem: TUpdateListItem; index: number }) => {
-      {
-        renderType: FlowNodeInputTypeEnum.input,
-        icon: FlowNodeInputMap[FlowNodeInputTypeEnum.input].icon,
-        label: t('common:core.workflow.inputType.Manual input')
-      },
-      {
-        renderType: FlowNodeInputTypeEnum.reference,
-        icon: FlowNodeInputMap[FlowNodeInputTypeEnum.reference].icon,
-        label: t('common:core.workflow.inputType.Reference')
-      }
-    ];
-
-    return (
-      <>
-        {updateList.map((updateItem, index) => {
       const { valueType } = getRefData({
         variable: updateItem.variable,
         nodeList,
         chatConfig: appDetail.chatConfig
       });
-          const renderTypeData = menuList.find((item) => item.renderType === updateItem.renderType);
+      const renderTypeData = menuList.current.find(
+        (item) => item.renderType === updateItem.renderType
+      );
+
       const handleUpdate = (newValue: ReferenceValueProps | string) => {
         if (isReferenceValue(newValue)) {
           onUpdateList(
@@ -165,7 +167,7 @@ const NodeVariableUpdate = ({ data, selected }: NodeProps<FlowNodeItemType>) =>
               <Box>{t('common:core.workflow.value')}</Box>
               <MyTooltip
                 label={
-                      menuList.find((item) => item.renderType === updateItem.renderType)?.label
+                  menuList.current.find((item) => item.renderType === updateItem.renderType)?.label
                 }
               >
                 <Button
@@ -225,10 +227,7 @@ const NodeVariableUpdate = ({ data, selected }: NodeProps<FlowNodeItemType>) =>
               if (valueType === WorkflowIOValueTypeEnum.number) {
                 return (
                   <NumberInput value={Number(updateItem.value?.[1]) || 0}>
-                        <NumberInputField
+                    <NumberInputField bg="white" onChange={(e) => handleUpdate(e.target.value)} />
-                          bg="white"
-                          onChange={(e) => handleUpdate(e.target.value)}
-                        />
                     <NumberInputStepper>
                       <NumberIncrementStepper />
                       <NumberDecrementStepper />
@@ -246,29 +245,31 @@ const NodeVariableUpdate = ({ data, selected }: NodeProps<FlowNodeItemType>) =>
               }
 
               return (
-                    <JsonEditor
+                <Box w={'300px'}>
-                      bg="white"
+                  <PromptEditor
-                      resize
+                    value={updateItem.value?.[1] || ''}
-                      w="300px"
+                    onChange={handleUpdate}
-                      value={String(updateItem.value?.[1] || '')}
+                    showOpenModal={false}
-                      onChange={(e) => {
+                    variableLabels={variables}
-                        handleUpdate(e);
+                    h={100}
-                      }}
                   />
+                </Box>
               );
             })()}
           </Flex>
         </Container>
       );
-        })}
+    }
-      </>
   );
-  }, [appDetail.chatConfig, nodeId, nodeList, onUpdateList, t, updateList, variables]);
 
   return (
     <NodeCard selected={selected} maxW={'1000px'} {...data}>
       <Box px={4} pb={4}>
-        {Render}
+        <>
+          {updateList.map((updateItem, index) => (
+            <ValueRender key={index} updateItem={updateItem} index={index} />
+          ))}
+        </>
         <Flex className="nodrag" cursor={'default'} alignItems={'center'} position={'relative'}>
           <Button
             variant={'whiteBase'}

projects/app/src/pages/app/detail/components/WorkflowComponents/context.tsx

@@ -549,7 +549,8 @@ const WorkflowContextProvider = ({
   );
 
   /* If the module is connected by a tool, the tool input and the normal input are separated */
-  const splitToolInputs = useMemoizedFn((inputs: FlowNodeInputItemType[], nodeId: string) => {
+  const splitToolInputs = useCallback(
+    (inputs: FlowNodeInputItemType[], nodeId: string) => {
       const isTool = !!edges.find(
         (edge) => edge.targetHandle === NodeOutputKeyEnum.selectedTools && edge.target === nodeId
       );
@@ -562,7 +563,9 @@ const WorkflowContextProvider = ({
           return !item.toolDescription;
         })
       };
-  });
+    },
+    [edges]
+  );
 
   /* ui flow to store data */
   const flowData2StoreDataAndCheck = useMemoizedFn((hideTip = false) => {

projects/app/src/pages/app/list/components/context.tsx

@@ -1,4 +1,4 @@
-import React, { ReactNode, useCallback, useState } from 'react';
+import React, { ReactNode, useCallback, useEffect, useState } from 'react';
 import { createContext } from 'use-context-selector';
 import { useRouter } from 'next/router';
 import { useRequest2 } from '@fastgpt/web/hooks/useRequest';
@@ -14,6 +14,7 @@ import { AppUpdateParams } from '@/global/core/app/api';
 import dynamic from 'next/dynamic';
 import { useI18n } from '@/web/context/I18n';
 import { AppTypeEnum } from '@fastgpt/global/core/app/constants';
+import { useSystemStore } from '@/web/common/system/useSystemStore';
 const MoveModal = dynamic(() => import('@/components/common/folder/MoveModal'));
 
 type AppListContextType = {
@@ -135,6 +136,11 @@ const AppListContextProvider = ({ children }: { children: ReactNode }) => {
     );
   }, []);
 
+  const { setLastAppListRouteType } = useSystemStore();
+  useEffect(() => {
+    setLastAppListRouteType(type);
+  }, [setLastAppListRouteType, type]);
+
   const contextValue: AppListContextType = {
     parentId,
     appType: type,

projects/app/src/pages/app/list/index.tsx

@@ -1,4 +1,4 @@
-import React, { useMemo, useState } from 'react';
+import React, { useEffect, useMemo, useState } from 'react';
 import {
   Box,
   Flex,

projects/app/src/web/common/system/useSystemStore.ts

@@ -19,8 +19,12 @@ type LoginStoreType = { provider: `${OAuthEnum}`; lastRoute: string; state: stri
 type State = {
   initd: boolean;
   setInitd: () => void;
+
   lastRoute: string;
   setLastRoute: (e: string) => void;
+  lastAppListRouteType?: string;
+  setLastAppListRouteType: (e?: string) => void;
+
   loginStore?: LoginStoreType;
   setLoginStore: (e: LoginStoreType) => void;
   loading: boolean;
@@ -67,6 +71,12 @@ export const useSystemStore = create<State>()(
             state.lastRoute = e;
           });
         },
+        lastAppListRouteType: undefined,
+        setLastAppListRouteType(e) {
+          set((state) => {
+            state.lastAppListRouteType = e;
+          });
+        },
         loginStore: undefined,
         setLoginStore(e) {
           set((state) => {