4.6.8-alpha (#804)

* perf: redirect request and err log replace perf: dataset openapi feat: session fix: retry input error feat: 468 doc sub page feat: standard sub perf: rerank tip perf: rerank tip perf: api sdk perf: openapi sub plan perf: sub ui fix: ts * perf: init log * fix: variable select * sub page * icon * perf: llm model config * perf: menu ux * perf: system store * perf: publish app name * fix: init data * perf: flow edit ux * fix: value type format and ux * fix prompt editor default value (#13) * fix prompt editor default value * fix prompt editor update when not focus * add key with variable --------- Co-authored-by: Archer <545436317@qq.com> * fix: value type * doc * i18n * import path * home page * perf: mongo session running * fix: ts * perf: use toast * perf: flow edit * perf: sse response * slider ui * fetch error * fix prompt editor rerender when not focus by key defaultvalue (#14) * perf: prompt editor * feat: dataset search concat * perf: doc * fix:ts * perf: doc * fix json editor onblur value (#15) * faq * vector model default config * ipv6 --------- Co-authored-by: heheer <71265218+newfish-cmyk@users.noreply.github.com>
2025-08-02 20:58:12 +00:00 · 2024-02-01 21:57:41 +08:00
parent fc19c4cf09
commit 34602b25df
285 changed files with 10345 additions and 11223 deletions
--- a/projects/app/src/components/core/dataset/RawSourceBox.tsx
+++ b/projects/app/src/components/core/dataset/RawSourceBox.tsx
@@ -1,6 +1,6 @@
 import React, { useMemo } from 'react';
 import { Box, BoxProps, Image } from '@chakra-ui/react';
-import { useToast } from '@/web/common/hooks/useToast';
+import { useToast } from '@fastgpt/web/hooks/useToast';
 import { getErrText } from '@fastgpt/global/common/error/utils';
 import MyTooltip from '@/components/MyTooltip';
 import { useTranslation } from 'next-i18next';
--- a/projects/app/src/components/core/module/AIChatSettingsModal.tsx
+++ b/projects/app/src/components/core/module/AIChatSettingsModal.tsx
@@ -7,17 +7,15 @@ import {
  BoxProps,
  Button,
  Flex,
-  Image,
  Link,
  ModalBody,
  ModalFooter,
-  Switch,
-  Textarea
+  Switch
 } from '@chakra-ui/react';
 import MyTooltip from '@/components/MyTooltip';
 import { QuestionOutlineIcon } from '@chakra-ui/icons';
 import { Prompt_QuotePromptList, Prompt_QuoteTemplateList } from '@/global/core/prompt/AIChat';
-import { chatModelList, feConfigs } from '@/web/common/system/staticData';
+import { useSystemStore } from '@/web/common/system/useSystemStore';
 import MySlider from '@/components/Slider';
 import { ModuleInputKeyEnum } from '@fastgpt/global/core/module/constants';
 import dynamic from 'next/dynamic';
@@ -27,7 +25,7 @@ import type { AppSimpleEditConfigTemplateType } from '@fastgpt/global/core/app/t
 import { SimpleModeTemplate_FastGPT_Universal } from '@/global/core/app/constants';
 import { getDocPath } from '@/web/common/system/doc';
 import PromptEditor from '@fastgpt/web/components/common/Textarea/PromptEditor';
-import { PickerMenuItemType } from '@fastgpt/web/components/common/Textarea/PromptEditor/type';
+import { EditorVariablePickerType } from '@fastgpt/web/components/common/Textarea/PromptEditor/type';

 const PromptTemplate = dynamic(() => import('@/components/PromptTemplate'));

@@ -44,14 +42,17 @@ const AIChatSettingsModal = ({
  onSuccess: (e: AIChatModuleProps) => void;
  defaultData: AIChatModuleProps;
  simpleModeTemplate?: AppSimpleEditConfigTemplateType;
-  pickerMenu?: PickerMenuItemType[];
+  pickerMenu?: EditorVariablePickerType[];
 }) => {
  const { t } = useTranslation();
  const [refresh, setRefresh] = useState(false);
+  const { feConfigs, llmModelList } = useSystemStore();

-  const { register, handleSubmit, getValues, setValue } = useForm({
+  const { handleSubmit, getValues, setValue, watch } = useForm({
    defaultValues: defaultData
  });
+  const aiChatQuoteTemplate = watch(ModuleInputKeyEnum.aiChatQuoteTemplate);
+  const aiChatQuotePrompt = watch(ModuleInputKeyEnum.aiChatQuotePrompt);

  const [selectTemplateData, setSelectTemplateData] = useState<{
    title: string;
@@ -60,10 +61,10 @@ const AIChatSettingsModal = ({

  const tokenLimit = useMemo(() => {
    return (
-      chatModelList.find((item) => item.model === getValues(ModuleInputKeyEnum.aiModel))
+      llmModelList.find((item) => item.model === getValues(ModuleInputKeyEnum.aiModel))
        ?.maxResponse || 4000
    );
-  }, [getValues]);
+  }, [getValues, llmModelList]);

  const quoteTemplateVariables = (() => [
    {
@@ -160,7 +161,7 @@ const AIChatSettingsModal = ({
          </Flex>
        )}
        {simpleModeTemplate?.systemForm?.aiSettings?.temperature && (
-          <Flex alignItems={'center'} mb={10} mt={isAdEdit ? 8 : 5}>
+          <Flex mb={10} mt={isAdEdit ? 8 : 6}>
            <Box {...LabelStyles} mr={2} w={'80px'}>
              {t('core.app.Temperature')}
            </Box>
@@ -183,7 +184,7 @@ const AIChatSettingsModal = ({
          </Flex>
        )}
        {simpleModeTemplate?.systemForm?.aiSettings?.maxToken && (
-          <Flex alignItems={'center'} mt={12} mb={10}>
+          <Flex mt={5} mb={5}>
            <Box {...LabelStyles} mr={2} w={'80px'}>
              {t('core.app.Max tokens')}
            </Box>
@@ -239,10 +240,10 @@ const AIChatSettingsModal = ({
              placeholder={t('template.Quote Content Tip', {
                default: Prompt_QuoteTemplateList[0].value
              })}
-              defaultValue={getValues(ModuleInputKeyEnum.aiChatQuoteTemplate)}
+              value={aiChatQuoteTemplate}
              onChange={(e) => {
                setValue(ModuleInputKeyEnum.aiChatQuoteTemplate, e);
-                setRefresh(!refresh);
+                // setRefresh(!refresh);
              }}
            />
          </Box>
@@ -265,7 +266,7 @@ const AIChatSettingsModal = ({
              placeholder={t('template.Quote Prompt Tip', {
                default: Prompt_QuotePromptList[0].value
              })}
-              defaultValue={getValues(ModuleInputKeyEnum.aiChatQuotePrompt)}
+              value={aiChatQuotePrompt}
              onChange={(e) => {
                setValue(ModuleInputKeyEnum.aiChatQuotePrompt, e);
              }}
--- a/projects/app/src/components/core/module/DatasetParamsModal.tsx
+++ b/projects/app/src/components/core/module/DatasetParamsModal.tsx
@@ -17,7 +17,7 @@ import MyTooltip from '@/components/MyTooltip';
 import MyModal from '@/components/MyModal';
 import { DatasetSearchModeEnum } from '@fastgpt/global/core/dataset/constants';
 import { useTranslation } from 'next-i18next';
-import { reRankModelList } from '@/web/common/system/staticData';
+import { useSystemStore } from '@/web/common/system/useSystemStore';

 import { ModuleInputKeyEnum } from '@fastgpt/global/core/module/constants';
 import { DatasetSearchModeMap } from '@fastgpt/global/core/dataset/constants';
@@ -45,6 +45,7 @@ const DatasetParamsModal = ({
 }: DatasetParamsProps & { onClose: () => void; onSuccess: (e: DatasetParamsProps) => void }) => {
  const { t } = useTranslation();
  const theme = useTheme();
+  const { reRankModelList } = useSystemStore();
  const [refresh, setRefresh] = useState(false);
  const { register, setValue, getValues, handleSubmit } = useForm<DatasetParamsProps>({
    defaultValues: {
@@ -72,7 +73,7 @@ const DatasetParamsModal = ({
      return false;

    return true;
-  }, [getValues, similarity, refresh]);
+  }, [getValues, similarity]);

  return (
    <MyModal
@@ -135,7 +136,7 @@ const DatasetParamsModal = ({
        )}

        {limit !== undefined && (
-          <Box display={['block', 'flex']} py={8} mt={3}>
+          <Box display={['block', 'flex']} mt={5}>
            <Box flex={'0 0 120px'} mb={[8, 0]}>
              {t('core.dataset.search.Max Tokens')}
              <MyTooltip label={t('core.dataset.search.Max Tokens Tips')} forceShow>
@@ -151,9 +152,9 @@ const DatasetParamsModal = ({
                min={100}
                max={maxTokens}
                step={50}
-                value={getValues(ModuleInputKeyEnum.datasetLimit) ?? 1000}
+                value={getValues(ModuleInputKeyEnum.datasetMaxTokens) ?? 1000}
                onChange={(val) => {
-                  setValue(ModuleInputKeyEnum.datasetLimit, val);
+                  setValue(ModuleInputKeyEnum.datasetMaxTokens, val);
                  setRefresh(!refresh);
                }}
              />
@@ -161,7 +162,7 @@ const DatasetParamsModal = ({
          </Box>
        )}
        {showSimilarity && (
-          <Box display={['block', 'flex']} py={8}>
+          <Box display={['block', 'flex']} mt={5}>
            <Box flex={'0 0 120px'} mb={[8, 0]}>
              {t('core.dataset.search.Min Similarity')}
              <MyTooltip label={t('core.dataset.search.Min Similarity Tips')} forceShow>
--- a/projects/app/src/components/core/module/DatasetSelectModal.tsx
+++ b/projects/app/src/components/core/module/DatasetSelectModal.tsx
@@ -12,7 +12,7 @@ import {
 } from '@chakra-ui/react';
 import Avatar from '@/components/Avatar';
 import type { SelectedDatasetType } from '@fastgpt/global/core/module/api.d';
-import { useToast } from '@/web/common/hooks/useToast';
+import { useToast } from '@fastgpt/web/hooks/useToast';
 import MyTooltip from '@/components/MyTooltip';
 import MyIcon from '@fastgpt/web/components/common/Icon';
 import { DatasetTypeEnum } from '@fastgpt/global/core/dataset/constants';
--- a/projects/app/src/components/core/module/Flow/ChatTest.tsx
+++ b/projects/app/src/components/core/module/Flow/ChatTest.tsx
@@ -66,7 +66,7 @@ const ChatTest = (
          appName: `调试-${app.name}`
        },
        onMessage: generatingMessage,
-        abortSignal: controller
+        abortCtrl: controller
      });

      return { responseText, responseData };
--- a/projects/app/src/components/core/module/Flow/FlowProvider.tsx
+++ b/projects/app/src/components/core/module/Flow/FlowProvider.tsx
@@ -24,7 +24,7 @@ import React, {
 } from 'react';
 import { customAlphabet } from 'nanoid';
 import { appModule2FlowEdge, appModule2FlowNode } from '@/utils/adapt';
-import { useToast } from '@/web/common/hooks/useToast';
+import { useToast } from '@fastgpt/web/hooks/useToast';
 import { EDGE_TYPE, FlowNodeTypeEnum } from '@fastgpt/global/core/module/node/constant';
 import { ModuleIOValueTypeEnum } from '@fastgpt/global/core/module/constants';
 import { useTranslation } from 'next-i18next';
--- a/projects/app/src/components/core/module/Flow/ImportSettings.tsx
+++ b/projects/app/src/components/core/module/Flow/ImportSettings.tsx
@@ -2,7 +2,7 @@ import React, { useState } from 'react';
 import { Textarea, Button, ModalBody, ModalFooter } from '@chakra-ui/react';
 import MyModal from '@/components/MyModal';
 import { useTranslation } from 'next-i18next';
-import { useToast } from '@/web/common/hooks/useToast';
+import { useToast } from '@fastgpt/web/hooks/useToast';
 import { useFlowProviderStore } from './FlowProvider';

 type Props = {
--- a/projects/app/src/components/core/module/Flow/ModuleTemplateList.tsx
+++ b/projects/app/src/components/core/module/Flow/ModuleTemplateList.tsx
@@ -15,7 +15,7 @@ const nanoid = customAlphabet('abcdefghijklmnopqrstuvwxyz1234567890', 6);
 import EmptyTip from '@/components/EmptyTip';
 import { FlowNodeTypeEnum } from '@fastgpt/global/core/module/node/constant';
 import { getPreviewPluginModule } from '@/web/core/plugin/api';
-import { useToast } from '@/web/common/hooks/useToast';
+import { useToast } from '@fastgpt/web/hooks/useToast';
 import { getErrText } from '@fastgpt/global/common/error/utils';
 import { moduleTemplatesList } from '@/web/core/modules/template/system';

@@ -100,6 +100,7 @@ const RenderList = React.memo(function RenderList({ templates, onClose }: Render
          if (template.flowType === FlowNodeTypeEnum.pluginModule) {
            setLoading(true);
            const res = await getPreviewPluginModule(template.id);
+
            setLoading(false);
            return res;
          }
@@ -107,7 +108,7 @@ const RenderList = React.memo(function RenderList({ templates, onClose }: Render
        } catch (e) {
          toast({
            status: 'error',
-            title: getErrText(e, t('plugin.Get Plugin Module Detail Failed'))
+            title: getErrText(e, t('core.plugin.Get Plugin Module Detail Failed'))
          });
          setLoading(false);
          return Promise.reject(e);
--- a/projects/app/src/components/core/module/Flow/components/modules/ButtonEdge.tsx
+++ b/projects/app/src/components/core/module/Flow/components/modules/ButtonEdge.tsx
@@ -1,10 +1,11 @@
 import React, { useMemo } from 'react';
 import { BezierEdge, getBezierPath, EdgeLabelRenderer, EdgeProps } from 'reactflow';
-import { onDelConnect } from '../../FlowProvider';
+import { onDelConnect, useFlowProviderStore } from '../../FlowProvider';
 import { Flex } from '@chakra-ui/react';
 import MyIcon from '@fastgpt/web/components/common/Icon';

 const ButtonEdge = (props: EdgeProps) => {
+  const { nodes } = useFlowProviderStore();
  const {
    id,
    sourceX,
@@ -17,6 +18,13 @@ const ButtonEdge = (props: EdgeProps) => {
    style = {}
  } = props;

+  const active = (() => {
+    const connectNode = nodes.find((node) => {
+      return (node.id === props.source || node.id === props.target) && node.selected;
+    });
+    return !!(connectNode || selected);
+  })();
+
  const [, labelX, labelY] = getBezierPath({
    sourceX,
    sourceY,
@@ -41,8 +49,9 @@ const ButtonEdge = (props: EdgeProps) => {
          borderRadius={'20px'}
          color={'black'}
          cursor={'pointer'}
-          border={'1px solid #fff'}
-          zIndex={selected ? 1000 : 0}
+          borderWidth={'1px'}
+          borderColor={'borderColor.low'}
+          zIndex={active ? 1000 : 0}
          _hover={{
            boxShadow: '0 0 6px 2px rgba(0, 0, 0, 0.08)'
          }}
@@ -51,26 +60,43 @@ const ButtonEdge = (props: EdgeProps) => {
          <MyIcon
            name="closeSolid"
            w={'100%'}
-            color={selected ? 'primary.700' : 'myGray.500'}
+            color={active ? 'primary.800' : 'myGray.400'}
+          ></MyIcon>
+        </Flex>
+        <Flex
+          alignItems={'center'}
+          justifyContent={'center'}
+          position={'absolute'}
+          transform={`translate(-78%, -50%) translate(${targetX}px,${targetY}px)`}
+          pointerEvents={'all'}
+          w={'16px'}
+          h={'16px'}
+          bg={'white'}
+          zIndex={active ? 1000 : 0}
+        >
+          <MyIcon
+            name={'common/rightArrowLight'}
+            w={'100%'}
+            color={active ? 'primary.800' : 'myGray.400'}
          ></MyIcon>
        </Flex>
      </EdgeLabelRenderer>
    );
-  }, [id, labelX, labelY, selected]);
+  }, [id, labelX, labelY, active, targetX, targetY]);

  const memoBezierEdge = useMemo(() => {
    const edgeStyle: React.CSSProperties = {
      ...style,
-      ...(selected
+      ...(active
        ? {
-            strokeWidth: 4,
+            strokeWidth: 5,
            stroke: '#3370ff'
          }
-        : { strokeWidth: 2, stroke: '#BDC1C5' })
+        : { strokeWidth: 2, zIndex: 2, stroke: 'myGray.300' })
    };

    return <BezierEdge {...props} style={edgeStyle} />;
-  }, [props, selected, style]);
+  }, [props, active, style]);

  return (
    <>
--- a/projects/app/src/components/core/module/Flow/components/modules/Divider.tsx
+++ b/projects/app/src/components/core/module/Flow/components/modules/Divider.tsx
@@ -2,19 +2,22 @@ import React from 'react';
 import { Box, useTheme } from '@chakra-ui/react';
 import { useTranslation } from 'next-i18next';

-const Divider = ({ text }: { text: 'Input' | 'Output' | string }) => {
+const Divider = ({ text }: { text?: 'Input' | 'Output' | string }) => {
  const theme = useTheme();
  const { t } = useTranslation();
+
+  const isDivider = !text;
+
  return (
    <Box
      textAlign={'center'}
      bg={'#f8f8f8'}
-      py={2}
+      py={isDivider ? '0' : 2}
      borderTop={theme.borders.base}
      borderBottom={theme.borders.base}
      fontSize={'lg'}
    >
-      {t(`common.${text}`)}
+      {text ? t(`common.${text}`) : ''}
    </Box>
  );
 };
--- a/projects/app/src/components/core/module/Flow/components/modules/TTSSelect.tsx
+++ b/projects/app/src/components/core/module/Flow/components/modules/TTSSelect.tsx
@@ -8,7 +8,7 @@ import MySelect from '@/components/Select';
 import { TTSTypeEnum } from '@/constants/app';
 import type { AppTTSConfigType } from '@fastgpt/global/core/module/type.d';
 import { useAudioPlay } from '@/web/common/utils/voice';
-import { audioSpeechModelList } from '@/web/common/system/staticData';
+import { useSystemStore } from '@/web/common/system/useSystemStore';
 import MyModal from '@/components/MyModal';
 import MySlider from '@/components/Slider';

@@ -20,6 +20,7 @@ const TTSSelect = ({
  onChange: (e: AppTTSConfigType) => void;
 }) => {
  const { t } = useTranslation();
+  const { audioSpeechModelList } = useSystemStore();
  const { isOpen, onOpen, onClose } = useDisclosure();

  const list = useMemo(
@@ -28,7 +29,7 @@ const TTSSelect = ({
      { label: t('core.app.tts.Web'), value: TTSTypeEnum.web },
      ...audioSpeechModelList.map((item) => item?.voices || []).flat()
    ],
-    [t]
+    [audioSpeechModelList, t]
  );

  const formatValue = useMemo(() => {
@@ -106,7 +107,7 @@ const TTSSelect = ({
            {t('core.app.tts.Speech model')}
            <MySelect w={'220px'} value={formatValue} list={list} onchange={onclickChange} />
          </Flex>
-          <Flex mt={8} justifyContent={'space-between'} alignItems={'center'}>
+          <Flex mt={8} justifyContent={'space-between'}>
            {t('core.app.tts.Speech speed')}
            <MySlider
              markList={[
--- a/projects/app/src/components/core/module/Flow/components/modules/VariableEdit.tsx
+++ b/projects/app/src/components/core/module/Flow/components/modules/VariableEdit.tsx
@@ -36,9 +36,9 @@ import MyModal from '@/components/MyModal';
 import MyTooltip from '@/components/MyTooltip';
 import { variableTip } from '@fastgpt/global/core/module/template/tip';
 import { useTranslation } from 'next-i18next';
-import { useToast } from '@/web/common/hooks/useToast';
+import { useToast } from '@fastgpt/web/hooks/useToast';
 import MyRadio from '@/components/common/MyRadio';
-import { formatVariablesIcon } from '@fastgpt/global/core/module/utils';
+import { formatEditorVariablePickerIcon } from '@fastgpt/global/core/module/utils';

 const VariableEdit = ({
  variables,
@@ -102,7 +102,14 @@ const VariableEdit = ({
  };

  const formatVariables = useMemo(() => {
-    return formatVariablesIcon(variables);
+    const results = formatEditorVariablePickerIcon(variables);
+    return results.map((item) => {
+      const variable = variables.find((variable) => variable.key === item.key);
+      return {
+        ...variable,
+        icon: item.icon
+      };
+    });
  }, [variables]);

  return (
@@ -111,7 +118,7 @@ const VariableEdit = ({
        <MyIcon name={'core/app/simpleMode/variable'} w={'20px'} />
        <Box ml={2} flex={1}>
          {t('core.module.Variable')}
-          <MyTooltip label={variableTip} forceShow>
+          <MyTooltip label={t(variableTip)} forceShow>
            <QuestionOutlineIcon display={['none', 'inline']} ml={1} />
          </MyTooltip>
        </Box>
--- a/projects/app/src/components/core/module/Flow/components/nodes/NodeAnswer.tsx
+++ b/projects/app/src/components/core/module/Flow/components/nodes/NodeAnswer.tsx
@@ -6,17 +6,16 @@ import Container from '../modules/Container';
 import RenderInput from '../render/RenderInput';
 import RenderOutput from '../render/RenderOutput';

-const NodeAnswer = React.memo(function NodeAnswer({ data }: { data: FlowModuleItemType }) {
+const NodeAnswer = ({ data, selected }: NodeProps<FlowModuleItemType>) => {
  const { moduleId, inputs, outputs } = data;
+
  return (
-    <NodeCard minW={'400px'} {...data}>
+    <NodeCard minW={'400px'} selected={selected} {...data}>
      <Container borderTop={'2px solid'} borderTopColor={'myGray.200'}>
        <RenderInput moduleId={moduleId} flowInputList={inputs} />
        <RenderOutput moduleId={moduleId} flowOutputList={outputs} />
      </Container>
    </NodeCard>
  );
-});
-export default function Node({ data }: NodeProps<FlowModuleItemType>) {
-  return <NodeAnswer data={data} />;
-}
+};
+export default React.memo(NodeAnswer);
--- a/projects/app/src/components/core/module/Flow/components/nodes/NodeCQNode.tsx
+++ b/projects/app/src/components/core/module/Flow/components/nodes/NodeCQNode.tsx
@@ -17,12 +17,12 @@ import SourceHandle from '../render/SourceHandle';
 import MyTooltip from '@/components/MyTooltip';
 import { onChangeNode } from '../../FlowProvider';

-const NodeCQNode = React.memo(function NodeCQNode({ data }: { data: FlowModuleItemType }) {
+const NodeCQNode = ({ data, selected }: NodeProps<FlowModuleItemType>) => {
  const { t } = useTranslation();
  const { moduleId, inputs } = data;

  return (
-    <NodeCard minW={'400px'} {...data}>
+    <NodeCard minW={'400px'} selected={selected} {...data}>
      <Divider text="Input" />
      <Container>
        <RenderInput
@@ -136,7 +136,5 @@ const NodeCQNode = React.memo(function NodeCQNode({ data }: { data: FlowModuleIt
      </Container>
    </NodeCard>
  );
-});
-export default function Node({ data }: NodeProps<FlowModuleItemType>) {
-  return <NodeCQNode data={data} />;
-}
+};
+export default React.memo(NodeCQNode);
--- a/projects/app/src/components/core/module/Flow/components/nodes/NodeDatasetConcat.tsx
+++ b/projects/app/src/components/core/module/Flow/components/nodes/NodeDatasetConcat.tsx
@@ -0,0 +1,145 @@
+import React, { useMemo } from 'react';
+import { NodeProps } from 'reactflow';
+import NodeCard from '../render/NodeCard';
+import { FlowModuleItemType } from '@fastgpt/global/core/module/type.d';
+import Container from '../modules/Container';
+import RenderInput from '../render/RenderInput';
+import { Box, Button, Flex } from '@chakra-ui/react';
+import { useTranslation } from 'next-i18next';
+import { AddIcon } from '@chakra-ui/icons';
+import {
+  ModuleIOValueTypeEnum,
+  ModuleInputKeyEnum,
+  ModuleOutputKeyEnum
+} from '@fastgpt/global/core/module/constants';
+import { getOneQuoteInputTemplate } from '@fastgpt/global/core/module/template/system/datasetConcat';
+import { onChangeNode, useFlowProviderStore } from '../../FlowProvider';
+import TargetHandle from '../render/TargetHandle';
+import MyIcon from '@fastgpt/web/components/common/Icon';
+import SourceHandle from '../render/SourceHandle';
+import { FlowNodeTypeEnum } from '@fastgpt/global/core/module/node/constant';
+import { useSystemStore } from '@/web/common/system/useSystemStore';
+import MySlider from '@/components/Slider';
+
+const NodeDatasetConcat = ({ data, selected }: NodeProps<FlowModuleItemType>) => {
+  const { t } = useTranslation();
+  const { llmModelList } = useSystemStore();
+  const { nodes } = useFlowProviderStore();
+  const { moduleId, inputs, outputs } = data;
+
+  const quotes = inputs.filter((item) => item.valueType === ModuleIOValueTypeEnum.datasetQuote);
+
+  const tokenLimit = useMemo(() => {
+    let maxTokens = 3000;
+
+    nodes.forEach((item) => {
+      if (item.type === FlowNodeTypeEnum.chatNode) {
+        const model =
+          item.data.inputs.find((item) => item.key === ModuleInputKeyEnum.aiModel)?.value || '';
+        const quoteMaxToken =
+          llmModelList.find((item) => item.model === model)?.quoteMaxToken || 3000;
+
+        maxTokens = Math.max(maxTokens, quoteMaxToken);
+      }
+    });
+
+    return maxTokens;
+  }, [llmModelList, nodes]);
+
+  const RenderQuoteList = useMemo(
+    () => (
+      <Box>
+        <Box>
+          {quotes.map((quote, i) => (
+            <Flex key={quote.key} position={'relative'} mb={4} alignItems={'center'}>
+              <TargetHandle handleKey={quote.key} valueType={quote.valueType} />
+              <Box>
+                {t('core.chat.Quote')}
+                {i + 1}
+              </Box>
+              <MyIcon
+                ml={2}
+                w={'14px'}
+                name={'delete'}
+                cursor={'pointer'}
+                _hover={{ color: 'red.600' }}
+                onClick={() => {
+                  onChangeNode({
+                    moduleId,
+                    type: 'delInput',
+                    key: quote.key
+                  });
+                }}
+              />
+            </Flex>
+          ))}
+        </Box>
+        <Button
+          leftIcon={<AddIcon />}
+          variant={'whiteBase'}
+          onClick={() => {
+            onChangeNode({
+              moduleId,
+              type: 'addInput',
+              value: getOneQuoteInputTemplate()
+            });
+          }}
+        >
+          {t('core.module.Dataset quote.Add quote')}
+        </Button>
+      </Box>
+    ),
+    [moduleId, quotes, t]
+  );
+
+  return (
+    <NodeCard minW={'400px'} selected={selected} {...data}>
+      <Container borderTop={'2px solid'} borderTopColor={'myGray.200'} position={'relative'}>
+        <RenderInput
+          moduleId={moduleId}
+          flowInputList={inputs}
+          CustomComponent={{
+            [ModuleInputKeyEnum.datasetMaxTokens]: (item) => (
+              <Box px={2}>
+                <MySlider
+                  markList={[
+                    { label: '100', value: 100 },
+                    { label: tokenLimit, value: tokenLimit }
+                  ]}
+                  width={'100%'}
+                  min={100}
+                  max={tokenLimit}
+                  step={50}
+                  value={item.value}
+                  onChange={(e) => {
+                    onChangeNode({
+                      moduleId,
+                      type: 'updateInput',
+                      key: item.key,
+                      value: {
+                        ...item,
+                        value: e
+                      }
+                    });
+                  }}
+                />
+              </Box>
+            )
+          }}
+        />
+        {/* render dataset select */}
+        {RenderQuoteList}
+        <Flex position={'absolute'} right={4} top={'50%'} transform={'translate(0,-50%)'}>
+          <Box>{t('core.module.Dataset quote.Concat result')}</Box>
+          <SourceHandle
+            handleKey={ModuleOutputKeyEnum.datasetQuoteQA}
+            valueType={ModuleIOValueTypeEnum.datasetQuote}
+            // transform={'translate(-14px, -50%)'}
+          />
+        </Flex>
+        {/* <RenderOutput moduleId={moduleId} flowOutputList={outputs} /> */}
+      </Container>
+    </NodeCard>
+  );
+};
+export default React.memo(NodeDatasetConcat);
--- a/projects/app/src/components/core/module/Flow/components/nodes/NodeEmpty.tsx
+++ b/projects/app/src/components/core/module/Flow/components/nodes/NodeEmpty.tsx
@@ -3,10 +3,8 @@ import { NodeProps } from 'reactflow';
 import NodeCard from '../render/NodeCard';
 import { FlowModuleItemType } from '@fastgpt/global/core/module/type.d';

-const NodeAnswer = React.memo(function NodeAnswer({ data }: { data: FlowModuleItemType }) {
-  return <NodeCard {...data}></NodeCard>;
-});
+const NodeEmpty = ({ data, selected }: NodeProps<FlowModuleItemType>) => {
+  return <NodeCard selected={selected} {...data}></NodeCard>;
+};

-export default function Node({ data }: NodeProps<FlowModuleItemType>) {
-  return <NodeAnswer data={data} />;
-}
+export default React.memo(NodeEmpty);
--- a/projects/app/src/components/core/module/Flow/components/nodes/NodeExtract/index.tsx
+++ b/projects/app/src/components/core/module/Flow/components/nodes/NodeExtract/index.tsx
@@ -17,7 +17,7 @@ import { FlowNodeOutputTypeEnum } from '@fastgpt/global/core/module/node/constan
 import { ModuleIOValueTypeEnum } from '@fastgpt/global/core/module/constants';
 import { onChangeNode } from '../../../FlowProvider';

-const NodeExtract = React.memo(function NodeExtract({ data }: { data: FlowModuleItemType }) {
+const NodeExtract = ({ data }: NodeProps<FlowModuleItemType>) => {
  const { inputs, outputs, moduleId } = data;
  const { t } = useTranslation();
  const [editExtractFiled, setEditExtractField] = useState<ContextExtractAgentItemType>();
@@ -183,8 +183,6 @@ const NodeExtract = React.memo(function NodeExtract({ data }: { data: FlowModule
      )}
    </NodeCard>
  );
-});
+};

-export default function Node({ data }: NodeProps<FlowModuleItemType>) {
-  return <NodeExtract data={data} />;
-}
+export default React.memo(NodeExtract);
--- a/projects/app/src/components/core/module/Flow/components/nodes/NodeHttp.tsx
+++ b/projects/app/src/components/core/module/Flow/components/nodes/NodeHttp.tsx
@@ -1,37 +0,0 @@
-import React from 'react';
-import { NodeProps } from 'reactflow';
-import NodeCard from '../render/NodeCard';
-import { FlowModuleItemType } from '@fastgpt/global/core/module/type.d';
-import Divider from '../modules/Divider';
-import Container from '../modules/Container';
-import RenderInput from '../render/RenderInput';
-import { Box, Button } from '@chakra-ui/react';
-import { SmallAddIcon } from '@chakra-ui/icons';
-import RenderOutput from '../render/RenderOutput';
-
-import {
-  FlowNodeInputTypeEnum,
-  FlowNodeOutputTypeEnum
-} from '@fastgpt/global/core/module/node/constant';
-import { ModuleIOValueTypeEnum } from '@fastgpt/global/core/module/constants';
-import { customAlphabet } from 'nanoid';
-const nanoid = customAlphabet('abcdefghijklmnopqrstuvwxyz1234567890', 6);
-
-const NodeHttp = React.memo(function NodeHttp({ data }: { data: FlowModuleItemType }) {
-  const { moduleId, inputs, outputs } = data;
-
-  return (
-    <NodeCard minW={'350px'} {...data}>
-      <Container borderTop={'2px solid'} borderTopColor={'myGray.200'}>
-        <RenderInput moduleId={moduleId} flowInputList={inputs} />
-      </Container>
-      <Divider text="Output" />
-      <Container>
-        <RenderOutput moduleId={moduleId} flowOutputList={outputs} />
-      </Container>
-    </NodeCard>
-  );
-});
-export default function Node({ data }: NodeProps<FlowModuleItemType>) {
-  return <NodeHttp data={data} />;
-}
--- a/projects/app/src/components/core/module/Flow/components/nodes/NodePluginInput.tsx
+++ b/projects/app/src/components/core/module/Flow/components/nodes/NodePluginInput.tsx
@@ -41,18 +41,14 @@ const createEditField = {
  inputType: true
 };

-const NodePluginInput = React.memo(function NodePluginInput({
-  data
-}: {
-  data: FlowModuleItemType;
-}) {
+const NodePluginInput = ({ data, selected }: NodeProps<FlowModuleItemType>) => {
  const { t } = useTranslation();
  const { moduleId, inputs, outputs } = data;
  const [createField, setCreateField] = useState<EditNodeFieldType>();
  const [editField, setEditField] = useState<EditNodeFieldType>();

  return (
-    <NodeCard minW={'300px'} {...data}>
+    <NodeCard minW={'300px'} selected={selected} forbidMenu {...data}>
      <Container mt={1} borderTop={'2px solid'} borderTopColor={'myGray.300'}>
        {inputs.map((item) => (
          <Flex
@@ -257,7 +253,5 @@ const NodePluginInput = React.memo(function NodePluginInput({
      )}
    </NodeCard>
  );
-});
-export default function Node({ data }: NodeProps<FlowModuleItemType>) {
-  return <NodePluginInput data={data} />;
-}
+};
+export default React.memo(NodePluginInput);
--- a/projects/app/src/components/core/module/Flow/components/nodes/NodePluginOutput.tsx
+++ b/projects/app/src/components/core/module/Flow/components/nodes/NodePluginOutput.tsx
@@ -14,7 +14,7 @@ import Container from '../modules/Container';
 import MyIcon from '@fastgpt/web/components/common/Icon';
 import MyTooltip from '@/components/MyTooltip';
 import TargetHandle from '../render/TargetHandle';
-import { useToast } from '@/web/common/hooks/useToast';
+import { useToast } from '@fastgpt/web/hooks/useToast';
 import {
  EditNodeFieldType,
  FlowNodeInputItemType,
@@ -42,18 +42,14 @@ const createEditField = {
  inputType: false
 };

-const NodePluginOutput = React.memo(function NodePluginOutput({
-  data
-}: {
-  data: FlowModuleItemType;
-}) {
+const NodePluginOutput = ({ data, selected }: NodeProps<FlowModuleItemType>) => {
  const { t } = useTranslation();
  const { moduleId, inputs, outputs } = data;
  const [createField, setCreateField] = useState<EditNodeFieldType>();
  const [editField, setEditField] = useState<EditNodeFieldType>();

  return (
-    <NodeCard minW={'300px'} {...data}>
+    <NodeCard minW={'300px'} selected={selected} forbidMenu {...data}>
      <Container mt={1} borderTop={'2px solid'} borderTopColor={'myGray.300'}>
        {inputs.map((item) => (
          <Flex
@@ -237,8 +233,6 @@ const NodePluginOutput = React.memo(function NodePluginOutput({
      )}
    </NodeCard>
  );
-});
+};

-export default function Node({ data }: NodeProps<FlowModuleItemType>) {
-  return <NodePluginOutput data={data} />;
-}
+export default React.memo(NodePluginOutput);
--- a/projects/app/src/components/core/module/Flow/components/nodes/NodeQuestionInput.tsx
+++ b/projects/app/src/components/core/module/Flow/components/nodes/NodeQuestionInput.tsx
@@ -6,22 +6,16 @@ import Container from '../modules/Container';

 import RenderOutput from '../render/RenderOutput';

-const QuestionInputNode = React.memo(function QuestionInputNode({
-  data
-}: {
-  data: FlowModuleItemType;
-}) {
+const QuestionInputNode = ({ data, selected }: NodeProps<FlowModuleItemType>) => {
  const { moduleId, outputs } = data;

  return (
-    <NodeCard minW={'240px'} {...data}>
+    <NodeCard minW={'240px'} selected={selected} {...data}>
      <Container borderTop={'2px solid'} borderTopColor={'myGray.200'} textAlign={'end'}>
        <RenderOutput moduleId={moduleId} flowOutputList={outputs} />
      </Container>
    </NodeCard>
  );
-});
+};

-export default function Node({ data }: NodeProps<FlowModuleItemType>) {
-  return <QuestionInputNode data={data} />;
-}
+export default React.memo(QuestionInputNode);
--- a/projects/app/src/components/core/module/Flow/components/nodes/NodeRunAPP.tsx
+++ b/projects/app/src/components/core/module/Flow/components/nodes/NodeRunAPP.tsx
@@ -7,11 +7,11 @@ import Container from '../modules/Container';
 import RenderInput from '../render/RenderInput';
 import RenderOutput from '../render/RenderOutput';

-const NodeRunAPP = React.memo(function NodeRunAPP({ data }: { data: FlowModuleItemType }) {
+const NodeRunAPP = ({ data, selected }: NodeProps<FlowModuleItemType>) => {
  const { moduleId, inputs, outputs } = data;

  return (
-    <NodeCard minW={'350px'} {...data}>
+    <NodeCard minW={'350px'} selected={selected} {...data}>
      <Container borderTop={'2px solid'} borderTopColor={'myGray.200'}>
        <RenderInput moduleId={moduleId} flowInputList={inputs} />
      </Container>
@@ -21,7 +21,5 @@ const NodeRunAPP = React.memo(function NodeRunAPP({ data }: { data: FlowModuleIt
      </Container>
    </NodeCard>
  );
-});
-export default function Node({ data }: NodeProps<FlowModuleItemType>) {
-  return <NodeRunAPP data={data} />;
-}
+};
+export default React.memo(NodeRunAPP);
--- a/projects/app/src/components/core/module/Flow/components/nodes/NodeSimple.tsx
+++ b/projects/app/src/components/core/module/Flow/components/nodes/NodeSimple.tsx
@@ -7,11 +7,11 @@ import Container from '../modules/Container';
 import RenderInput from '../render/RenderInput';
 import RenderOutput from '../render/RenderOutput';

-const NodeSimple = React.memo(function NodeSimple({ data }: { data: FlowModuleItemType }) {
+const NodeSimple = ({ data, selected }: NodeProps<FlowModuleItemType>) => {
  const { moduleId, inputs, outputs } = data;

  return (
-    <NodeCard minW={'350px'} {...data}>
+    <NodeCard minW={'350px'} selected={selected} {...data}>
      {inputs.length > 0 && (
        <>
          <Divider text="Input" />
@@ -30,7 +30,5 @@ const NodeSimple = React.memo(function NodeSimple({ data }: { data: FlowModuleIt
      )}
    </NodeCard>
  );
-});
-export default function Node({ data }: NodeProps<FlowModuleItemType>) {
-  return <NodeSimple data={data} />;
-}
+};
+export default React.memo(NodeSimple);
--- a/projects/app/src/components/core/module/Flow/components/nodes/NodeUserGuide.tsx
+++ b/projects/app/src/components/core/module/Flow/components/nodes/NodeUserGuide.tsx
@@ -18,11 +18,11 @@ import TTSSelect from '@/components/core/module/Flow/components/modules/TTSSelec
 import { splitGuideModule } from '@fastgpt/global/core/module/utils';
 import { useTranslation } from 'next-i18next';

-const NodeUserGuide = React.memo(function NodeUserGuide({ data }: { data: FlowModuleItemType }) {
+const NodeUserGuide = ({ data, selected }: NodeProps<FlowModuleItemType>) => {
  const theme = useTheme();
  return (
    <>
-      <NodeCard minW={'300px'} {...data}>
+      <NodeCard minW={'300px'} selected={selected} {...data}>
        <Container className="nodrag" borderTop={'2px solid'} borderTopColor={'myGray.200'}>
          <WelcomeText data={data} />
          <Box pt={4} pb={2}>
@@ -38,12 +38,11 @@ const NodeUserGuide = React.memo(function NodeUserGuide({ data }: { data: FlowMo
      </NodeCard>
    </>
  );
-});
+};

-export default function Node({ data }: NodeProps<FlowModuleItemType>) {
-  return <NodeUserGuide data={data} />;
-}
-export function WelcomeText({ data }: { data: FlowModuleItemType }) {
+export default React.memo(NodeUserGuide);
+
+function WelcomeText({ data }: { data: FlowModuleItemType }) {
  const { t } = useTranslation();
  const { inputs, moduleId } = data;
  const [, startTst] = useTransition();
--- a/projects/app/src/components/core/module/Flow/components/render/FieldEditModal.tsx
+++ b/projects/app/src/components/core/module/Flow/components/render/FieldEditModal.tsx
@@ -20,7 +20,7 @@ import {
  FlowNodeOutputTypeEnum
 } from '@fastgpt/global/core/module/node/constant';
 import { EditInputFieldMap, EditNodeFieldType } from '@fastgpt/global/core/module/node/type.d';
-import { useToast } from '@/web/common/hooks/useToast';
+import { useToast } from '@fastgpt/web/hooks/useToast';

 const FieldEditModal = ({
  editField = {
--- a/projects/app/src/components/core/module/Flow/components/render/NodeCard.tsx
+++ b/projects/app/src/components/core/module/Flow/components/render/NodeCard.tsx
@@ -1,5 +1,5 @@
 import React, { useMemo } from 'react';
-import { Box, Flex, useTheme, Menu, MenuButton, MenuList, MenuItem } from '@chakra-ui/react';
+import { Box, Flex, useTheme, MenuButton } from '@chakra-ui/react';
 import MyIcon from '@fastgpt/web/components/common/Icon';
 import Avatar from '@/components/Avatar';
 import type { FlowModuleItemType } from '@fastgpt/global/core/module/type.d';
@@ -7,7 +7,7 @@ import MyTooltip from '@/components/MyTooltip';
 import { QuestionOutlineIcon } from '@chakra-ui/icons';
 import { useTranslation } from 'next-i18next';
 import { useEditTitle } from '@/web/common/hooks/useEditTitle';
-import { useToast } from '@/web/common/hooks/useToast';
+import { useToast } from '@fastgpt/web/hooks/useToast';
 import { onChangeNode, onCopyNode, onResetNode, onDelNode } from '../../FlowProvider';
 import { FlowNodeTypeEnum } from '@fastgpt/global/core/module/node/constant';
 import { ModuleInputKeyEnum } from '@fastgpt/global/core/module/constants';
@@ -16,11 +16,13 @@ import { getPreviewPluginModule } from '@/web/core/plugin/api';
 import { getErrText } from '@fastgpt/global/common/error/utils';
 import { useConfirm } from '@/web/common/hooks/useConfirm';
 import { LOGO_ICON } from '@fastgpt/global/common/system/constants';
+import MyMenu from '@/components/MyMenu';

 type Props = FlowModuleItemType & {
  children?: React.ReactNode | React.ReactNode[] | string;
  minW?: string | number;
-  isPreview?: boolean;
+  forbidMenu?: boolean;
+  selected?: boolean;
 };

 const NodeCard = (props: Props) => {
@@ -34,7 +36,8 @@ const NodeCard = (props: Props) => {
    moduleId,
    flowType,
    inputs,
-    isPreview
+    selected,
+    forbidMenu
  } = props;

  const theme = useTheme();
@@ -113,12 +116,6 @@ const NodeCard = (props: Props) => {
        icon: 'delete',
        label: t('common.Delete'),
        onClick: () => onDelNode(moduleId)
-      },
-
-      {
-        icon: 'common/backLight',
-        label: t('common.Back'),
-        onClick: () => {}
      }
    ],
    [flowType, inputs, moduleId, name, onOpenModal, openConfirm, setLoading, t, toast]
@@ -129,13 +126,16 @@ const NodeCard = (props: Props) => {
      minW={minW}
      maxW={'500px'}
      bg={'white'}
-      border={theme.borders.md}
+      borderWidth={'1px'}
+      borderColor={selected ? 'primary.600' : 'borderColor.base'}
      borderRadius={'md'}
-      boxShadow={'sm'}
-      className={isPreview ? 'nodrag' : ''}
+      boxShadow={'1'}
+      _hover={{
+        boxShadow: '4'
+      }}
    >
      <Flex className="custom-drag-handle" px={4} py={3} alignItems={'center'}>
-        <Avatar src={avatar} borderRadius={'md'} objectFit={'contain'} w={'30px'} h={'30px'} />
+        <Avatar src={avatar} borderRadius={'0'} objectFit={'contain'} w={'30px'} h={'30px'} />
        <Box ml={3} fontSize={'lg'} color={'myGray.600'}>
          {t(name)}
        </Box>
@@ -145,28 +145,25 @@ const NodeCard = (props: Props) => {
          </MyTooltip>
        )}
        <Box flex={1} />
-        {!isPreview && (
-          <Menu autoSelect={false} isLazy>
-            <MenuButton
-              className={'nodrag'}
-              _hover={{ bg: 'myWhite.600' }}
-              cursor={'pointer'}
-              borderRadius={'md'}
-              onClick={(e) => {
-                e.stopPropagation();
-              }}
-            >
-              <MyIcon name={'more'} w={'14px'} p={2} />
-            </MenuButton>
-            <MenuList color={'myGray.700'} minW={`120px !important`} zIndex={10}>
-              {menuList.map((item) => (
-                <MenuItem key={item.label} onClick={item.onClick} py={[2, 3]}>
-                  <MyIcon name={item.icon as any} w={['14px', '16px']} />
-                  <Box ml={[1, 2]}>{item.label}</Box>
-                </MenuItem>
-              ))}
-            </MenuList>
-          </Menu>
+        {!forbidMenu && (
+          <MyMenu
+            offset={[-60, 5]}
+            width={120}
+            Button={
+              <MenuButton
+                className={'nodrag'}
+                _hover={{ bg: 'myWhite.600' }}
+                cursor={'pointer'}
+                borderRadius={'md'}
+                onClick={(e) => {
+                  e.stopPropagation();
+                }}
+              >
+                <MyIcon name={'more'} w={'14px'} p={2} />
+              </MenuButton>
+            }
+            menuList={menuList}
+          />
        )}
      </Flex>
      {children}
--- a/projects/app/src/components/core/module/Flow/components/render/RenderInput/index.tsx
+++ b/projects/app/src/components/core/module/Flow/components/render/RenderInput/index.tsx
@@ -123,25 +123,21 @@ const RenderInput = ({ flowInputList, moduleId, CustomComponent }: Props) => {
        return <Component inputs={filterInputs} item={input} moduleId={moduleId} />;
      })();

-      return (
+      return input.type !== FlowNodeInputTypeEnum.hidden ? (
        <Box key={input.key} _notLast={{ mb: 7 }} position={'relative'}>
          {input.key === ModuleInputKeyEnum.userChatInput && (
            <UserChatInput inputs={filterInputs} item={input} moduleId={moduleId} />
          )}
-          {input.type !== FlowNodeInputTypeEnum.hidden && (
-            <>
-              {!!input.label && (
-                <InputLabel moduleId={moduleId} inputKey={input.key} mode={mode} {...input} />
-              )}
-              {!!RenderComponent && (
-                <Box mt={2} className={'nodrag'}>
-                  {RenderComponent}
-                </Box>
-              )}
-            </>
+          {!!input.label && (
+            <InputLabel moduleId={moduleId} inputKey={input.key} mode={mode} {...input} />
+          )}
+          {!!RenderComponent && (
+            <Box mt={2} className={'nodrag'}>
+              {RenderComponent}
+            </Box>
          )}
        </Box>
-      );
+      ) : null;
    });
  }, [memoCustomComponent, filterInputs, mode, moduleId]);

--- a/projects/app/src/components/core/module/Flow/components/render/RenderInput/templates/SelectAiModel.tsx
+++ b/projects/app/src/components/core/module/Flow/components/render/RenderInput/templates/SelectAiModel.tsx
@@ -2,17 +2,11 @@ import React, { useCallback, useEffect } from 'react';
 import type { RenderInputProps } from '../type';
 import { onChangeNode } from '../../../../FlowProvider';
 import SelectAiModel from '@/components/Select/SelectAiModel';
-import { FlowNodeInputTypeEnum } from '@fastgpt/global/core/module/node/constant';
-import { chatModelList, cqModelList, extractModelList } from '@/web/common/system/staticData';
+import { useSystemStore } from '@/web/common/system/useSystemStore';

 const SelectAiModelRender = ({ item, inputs = [], moduleId }: RenderInputProps) => {
-  const modelList = (() => {
-    if (item.type === FlowNodeInputTypeEnum.selectChatModel) return chatModelList;
-    if (item.type === FlowNodeInputTypeEnum.selectCQModel) return cqModelList;
-    if (item.type === FlowNodeInputTypeEnum.selectExtractModel) return extractModelList;
-
-    return [];
-  })().map((item) => ({
+  const { llmModelList } = useSystemStore();
+  const modelList = llmModelList.map((item) => ({
    model: item.model,
    name: item.name,
    maxResponse: item.maxResponse
--- a/projects/app/src/components/core/module/Flow/components/render/RenderInput/templates/SelectDataset.tsx
+++ b/projects/app/src/components/core/module/Flow/components/render/RenderInput/templates/SelectDataset.tsx
@@ -10,7 +10,7 @@ import { useTranslation } from 'next-i18next';
 import { DatasetSearchModeEnum } from '@fastgpt/global/core/dataset/constants';
 import { FlowNodeTypeEnum } from '@fastgpt/global/core/module/node/constant';
 import { ModuleInputKeyEnum } from '@fastgpt/global/core/module/constants';
-import { chatModelList } from '@/web/common/system/staticData';
+import { useSystemStore } from '@/web/common/system/useSystemStore';

 import dynamic from 'next/dynamic';
 import MyIcon from '@fastgpt/web/components/common/Icon';
@@ -21,6 +21,7 @@ const DatasetParamsModal = dynamic(() => import('@/components/core/module/Datase
 const SelectDatasetRender = ({ inputs = [], item, moduleId }: RenderInputProps) => {
  const { t } = useTranslation();
  const theme = useTheme();
+  const { llmModelList } = useSystemStore();
  const [nodes, setNodes] = useState<useFlowProviderStoreType['nodes']>([]);
  const [data, setData] = useState({
    searchMode: DatasetSearchModeEnum.embedding,
@@ -49,7 +50,7 @@ const SelectDatasetRender = ({ inputs = [], item, moduleId }: RenderInputProps)
        const model =
          item.data.inputs.find((item) => item.key === ModuleInputKeyEnum.aiModel)?.value || '';
        const quoteMaxToken =
-          chatModelList.find((item) => item.model === model)?.quoteMaxToken || 3000;
+          llmModelList.find((item) => item.model === model)?.quoteMaxToken || 3000;

        maxTokens = Math.max(maxTokens, quoteMaxToken);
      }
--- a/projects/app/src/components/core/module/Flow/components/render/RenderInput/templates/SelectDatasetParams.tsx
+++ b/projects/app/src/components/core/module/Flow/components/render/RenderInput/templates/SelectDatasetParams.tsx
@@ -6,14 +6,15 @@ import { useTranslation } from 'next-i18next';
 import { DatasetSearchModeEnum } from '@fastgpt/global/core/dataset/constants';
 import { FlowNodeTypeEnum } from '@fastgpt/global/core/module/node/constant';
 import { ModuleInputKeyEnum } from '@fastgpt/global/core/module/constants';
-import { chatModelList } from '@/web/common/system/staticData';
 import MyIcon from '@fastgpt/web/components/common/Icon';
 import DatasetParamsModal from '@/components/core/module/DatasetParamsModal';
+import { useSystemStore } from '@/web/common/system/useSystemStore';

 const SelectDatasetParam = ({ inputs = [], moduleId }: RenderInputProps) => {
  const { nodes } = useFlowProviderStore();

  const { t } = useTranslation();
+  const { llmModelList } = useSystemStore();
  const [data, setData] = useState({
    searchMode: DatasetSearchModeEnum.embedding,
    limit: 5,
@@ -29,14 +30,14 @@ const SelectDatasetParam = ({ inputs = [], moduleId }: RenderInputProps) => {
        const model =
          item.data.inputs.find((item) => item.key === ModuleInputKeyEnum.aiModel)?.value || '';
        const quoteMaxToken =
-          chatModelList.find((item) => item.model === model)?.quoteMaxToken || 3000;
+          llmModelList.find((item) => item.model === model)?.quoteMaxToken || 3000;

        maxTokens = Math.max(maxTokens, quoteMaxToken);
      }
    });

    return maxTokens;
-  }, [nodes]);
+  }, [llmModelList, nodes]);

  const { isOpen, onOpen, onClose } = useDisclosure();

--- a/projects/app/src/components/core/module/Flow/components/render/RenderInput/templates/Slider.tsx
+++ b/projects/app/src/components/core/module/Flow/components/render/RenderInput/templates/Slider.tsx
@@ -8,7 +8,7 @@ import MySlider from '@/components/Slider';
 const SliderRender = ({ item, moduleId }: RenderInputProps) => {
  const { t } = useTranslation();
  return (
-    <Box pt={5} pb={4} px={2}>
+    <Box px={2}>
      <MySlider
        markList={item.markList}
        width={'100%'}
--- a/projects/app/src/components/core/module/Flow/components/render/RenderInput/templates/Textarea.tsx
+++ b/projects/app/src/components/core/module/Flow/components/render/RenderInput/templates/Textarea.tsx
@@ -4,37 +4,42 @@ import { useFlowProviderStore, onChangeNode } from '../../../../FlowProvider';
 import { useTranslation } from 'next-i18next';
 import PromptEditor from '@fastgpt/web/components/common/Textarea/PromptEditor';
 import {
-  formatVariablesIcon,
+  formatEditorVariablePickerIcon,
  getGuideModule,
  splitGuideModule
 } from '@fastgpt/global/core/module/utils';

-const TextareaRender = ({ item, moduleId }: RenderInputProps) => {
+const TextareaRender = ({ inputs = [], item, moduleId }: RenderInputProps) => {
  const { t } = useTranslation();
-  const [, startTst] = useTransition();
  const { nodes } = useFlowProviderStore();

  // get variable
-  const variables = useMemo(
-    () =>
-      formatVariablesIcon(
-        splitGuideModule(getGuideModule(nodes.map((node) => node.data)))?.variableModules || []
-      ),
-    [nodes]
-  );
+  const variables = useMemo(() => {
+    const globalVariables = formatEditorVariablePickerIcon(
+      splitGuideModule(getGuideModule(nodes.map((node) => node.data)))?.variableModules || []
+    );
+    const moduleVariables = formatEditorVariablePickerIcon(
+      inputs
+        .filter((input) => input.edit)
+        .map((item) => ({
+          key: item.key,
+          label: item.label
+        }))
+    );
+
+    return [...globalVariables, ...moduleVariables];
+  }, [inputs, nodes]);

  const onChange = useCallback(
    (e: string) => {
-      startTst(() => {
-        onChangeNode({
-          moduleId,
-          type: 'updateInput',
-          key: item.key,
-          value: {
-            ...item,
-            value: e
-          }
-        });
+      onChangeNode({
+        moduleId,
+        type: 'updateInput',
+        key: item.key,
+        value: {
+          ...item,
+          value: e
+        }
      });
    },
    [item, moduleId]
@@ -46,7 +51,7 @@ const TextareaRender = ({ item, moduleId }: RenderInputProps) => {
      title={t(item.label)}
      h={150}
      placeholder={t(item.placeholder || '')}
-      defaultValue={item.value}
+      value={item.value}
      onChange={onChange}
    />
  );
--- a/projects/app/src/components/core/module/Flow/index.tsx
+++ b/projects/app/src/components/core/module/Flow/index.tsx
@@ -19,6 +19,9 @@ const nodeTypes: Record<`${FlowNodeTypeEnum}`, any> = {
  [FlowNodeTypeEnum.historyNode]: NodeSimple,
  [FlowNodeTypeEnum.chatNode]: NodeSimple,
  [FlowNodeTypeEnum.datasetSearchNode]: NodeSimple,
+  [FlowNodeTypeEnum.datasetConcatNode]: dynamic(
+    () => import('./components/nodes/NodeDatasetConcat')
+  ),
  [FlowNodeTypeEnum.answerNode]: dynamic(() => import('./components/nodes/NodeAnswer')),
  [FlowNodeTypeEnum.classifyQuestion]: dynamic(() => import('./components/nodes/NodeCQNode')),
  [FlowNodeTypeEnum.contentExtract]: dynamic(() => import('./components/nodes/NodeExtract')),
--- a/projects/app/src/components/core/module/utils.ts
+++ b/projects/app/src/components/core/module/utils.ts
@@ -14,7 +14,7 @@ export const flowNode2Modules = ({
  const modules: ModuleItemType[] = nodes.map((item) => ({
    moduleId: item.data.moduleId,
    name: item.data.name,
-    avatar: item.data.avatar,
+    // avatar: item.data.avatar,
    flowType: item.data.flowType,
    showStatus: item.data.showStatus,
    position: item.position,