Context extract support value type (#1620)

* perf: chat box components

* perf: chatbox context

* feat: extract support value type

* workflow performance

* update doc

* feat: error response

* feat: error response

* oauth sort

* perf: logo

* fix: update laf account

* perf: team permission api

* update type

projects/app/src/components/core/workflow/Flow/nodes/NodeCode.tsx

@@ -29,13 +29,13 @@ const NodeCode = ({ data, selected }: NodeProps<FlowNodeItemType>) => {
     content: workflowT('code.Reset template confirm')
   });
 
-  const CustomComponent = useMemo(
-    () => ({
+  const CustomComponent = useMemo(() => {
+    return {
       [NodeInputKeyEnum.code]: (item: FlowNodeInputItemType) => {
         return (
           <Box>
             <Flex mb={1} alignItems={'flex-end'}>
-              <Box flex={'1'}>{workflowT('Code')}</Box>
+              <Box flex={'1'}>Javascript{workflowT('Code')}</Box>
               <Box
                 cursor={'pointer'}
                 color={'primary.500'}
@@ -74,9 +74,8 @@ const NodeCode = ({ data, selected }: NodeProps<FlowNodeItemType>) => {
           </Box>
         );
       }
-    }),
-    [nodeId, onChangeNode, openConfirm, workflowT]
-  );
+    };
+  }, [nodeId, onChangeNode, openConfirm, workflowT]);
 
   return (
     <NodeCard minW={'400px'} selected={selected} {...data}>

projects/app/src/components/core/workflow/Flow/nodes/NodeExtract/ExtractFieldModal.tsx

@@ -1,4 +1,4 @@
-import React, { useMemo, useState } from 'react';
+import React from 'react';
 import {
   Box,
   Button,
@@ -15,8 +15,11 @@ import MyModal from '@fastgpt/web/components/common/MyModal';
 import { useTranslation } from 'next-i18next';
 import MyTooltip from '@/components/MyTooltip';
 import { QuestionOutlineIcon } from '@chakra-ui/icons';
+import MySelect from '@fastgpt/web/components/common/MySelect';
+import { fnValueTypeSelect } from '@/web/core/workflow/constants/dataType';
 
 export const defaultField: ContextExtractAgentItemType = {
+  valueType: 'string',
   required: false,
   defaultValue: '',
   desc: '',
@@ -34,10 +37,11 @@ const ExtractFieldModal = ({
   onSubmit: (data: ContextExtractAgentItemType) => void;
 }) => {
   const { t } = useTranslation();
-  const { register, handleSubmit, watch } = useForm<ContextExtractAgentItemType>({
+  const { register, setValue, handleSubmit, watch } = useForm<ContextExtractAgentItemType>({
     defaultValues: defaultField
   });
   const required = watch('required');
+  const valueType = watch('valueType');
 
   return (
     <MyModal
@@ -68,8 +72,21 @@ const ExtractFieldModal = ({
           </Flex>
         )}
 
+        <Flex alignItems={'center'} mt={5}>
+          <Box flex={['0 0 80px', '0 0 100px']}>{t('core.module.Data Type')}</Box>
+          <Box flex={'1 0 0'}>
+            <MySelect
+              list={fnValueTypeSelect}
+              value={valueType}
+              onchange={(e: any) => {
+                setValue('valueType', e);
+              }}
+            />
+          </Box>
+        </Flex>
+
         <Flex mt={5} alignItems={'center'}>
-          <Box flex={['0 0 80px', '0 0 100px']}>{t('core.module.Field key')}</Box>
+          <Box flex={['0 0 80px', '0 0 100px']}>{t('Field name')}</Box>
           <Input
             bg={'myGray.50'}
             placeholder="name/age/sql"
@@ -84,21 +101,23 @@ const ExtractFieldModal = ({
             {...register('desc', { required: true })}
           />
         </Flex>
-        <Box mt={5}>
-          <Flex alignItems={'center'}>
-            {t('core.module.extract.Enum Value')}({t('common.choosable')})
-            <MyTooltip label={t('core.module.extract.Enum Description')} forceShow>
-              <QuestionOutlineIcon ml={1} />
-            </MyTooltip>
-          </Flex>
+        {(valueType === 'string' || valueType === 'number') && (
+          <Box mt={5}>
+            <Flex alignItems={'center'}>
+              {t('core.module.extract.Enum Value')}({t('common.choosable')})
+              <MyTooltip label={t('core.module.extract.Enum Description')} forceShow>
+                <QuestionOutlineIcon ml={1} />
+              </MyTooltip>
+            </Flex>
 
-          <Textarea
-            rows={5}
-            bg={'myGray.50'}
-            placeholder={'apple\npeach\nwatermelon'}
-            {...register('enum')}
-          />
-        </Box>
+            <Textarea
+              rows={5}
+              bg={'myGray.50'}
+              placeholder={'apple\npeach\nwatermelon'}
+              {...register('enum')}
+            />
+          </Box>
+        )}
       </ModalBody>
 
       <ModalFooter>

projects/app/src/components/core/workflow/Flow/nodes/NodeExtract/index.tsx

@@ -18,7 +18,6 @@ import NodeCard from '../render/NodeCard';
 import Container from '../../components/Container';
 import { AddIcon } from '@chakra-ui/icons';
 import RenderInput from '../render/RenderInput';
-import Divider from '../../components/Divider';
 import type { ContextExtractAgentItemType } from '@fastgpt/global/core/workflow/type/index.d';
 import RenderOutput from '../render/RenderOutput';
 import MyIcon from '@fastgpt/web/components/common/Icon';
@@ -79,7 +78,7 @@ const NodeExtract = ({ data }: NodeProps<FlowNodeItemType>) => {
               <Table bg={'white'}>
                 <Thead>
                   <Tr>
-                    <Th bg={'myGray.50'}>字段 key</Th>
+                    <Th bg={'myGray.50'}>字段名</Th>
                     <Th bg={'myGray.50'}>字段描述</Th>
                     <Th bg={'myGray.50'}>必须</Th>
                     <Th bg={'myGray.50'}></Th>

projects/app/src/components/core/workflow/Flow/nodes/NodeLaf.tsx

@@ -79,7 +79,6 @@ const NodeLaf = (props: NodeProps<FlowNodeItemType>) => {
         };
       } catch (err) {
         await putUpdateTeam({
-          teamId: userInfo?.team.teamId || '',
           lafAccount: { token: '', appid: '', pat: '' }
         });
         initUserInfo();

projects/app/src/components/core/workflow/Flow/nodes/render/NodeCard.tsx

@@ -2,10 +2,7 @@ import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { Box, Button, Card, Flex } from '@chakra-ui/react';
 import MyIcon from '@fastgpt/web/components/common/Icon';
 import Avatar from '@/components/Avatar';
-import type {
-  FlowNodeItemType,
-  FlowNodeTemplateType
-} from '@fastgpt/global/core/workflow/type/index.d';
+import type { FlowNodeItemType } from '@fastgpt/global/core/workflow/type/index.d';
 import { useTranslation } from 'next-i18next';
 import { useEditTitle } from '@/web/common/hooks/useEditTitle';
 import { useToast } from '@fastgpt/web/hooks/useToast';
@@ -16,7 +13,7 @@ import { ToolTargetHandle } from './Handle/ToolHandle';
 import { useEditTextarea } from '@fastgpt/web/hooks/useEditTextarea';
 import { ConnectionSourceHandle, ConnectionTargetHandle } from './Handle/ConnectionHandle';
 import { useDebug } from '../../hooks/useDebug';
-import { ResponseBox } from '@/components/ChatBox/WholeResponseModal';
+import { ResponseBox } from '@/components/ChatBox/components/WholeResponseModal';
 import EmptyTip from '@fastgpt/web/components/common/EmptyTip';
 import { getPreviewPluginModule } from '@/web/core/plugin/api';
 import { storeNode2FlowNode, updateFlowNodeVersion } from '@/web/core/workflow/utils';
@@ -27,7 +24,6 @@ import { useI18n } from '@/web/context/I18n';
 import { moduleTemplatesFlat } from '@fastgpt/global/core/workflow/template/constants';
 import { QuestionOutlineIcon } from '@chakra-ui/icons';
 import MyTooltip from '@/components/MyTooltip';
-import { isEqual } from 'lodash';
 import { useSystemStore } from '@/web/common/system/useSystemStore';
 
 type Props = FlowNodeItemType & {

projects/app/src/components/core/workflow/Flow/nodes/render/RenderToolInput/EditFieldModal.tsx

@@ -20,6 +20,7 @@ import { useToast } from '@fastgpt/web/hooks/useToast';
 import { FlowNodeInputItemType } from '@fastgpt/global/core/workflow/type/io.d';
 import { useContextSelector } from 'use-context-selector';
 import { WorkflowContext } from '@/components/core/workflow/context';
+import { fnValueTypeSelect } from '@/web/core/workflow/constants/dataType';
 
 const EditFieldModal = ({
   defaultValue = defaultEditFormData,
@@ -35,21 +36,6 @@ const EditFieldModal = ({
   });
   const valueType = watch('valueType');
 
-  const selectTypeList = useRef([
-    {
-      label: t('core.module.valueType.string'),
-      value: 'string'
-    },
-    {
-      label: t('core.module.valueType.number'),
-      value: 'number'
-    },
-    {
-      label: t('core.module.valueType.boolean'),
-      value: 'boolean'
-    }
-  ]);
-
   const { mutate: onclickSubmit } = useRequest({
     mutationFn: async (e: FlowNodeInputItemType) => {
       const inputConfig: FlowNodeInputItemType = {
@@ -105,7 +91,7 @@ const EditFieldModal = ({
           <Box flex={'0 0 80px'}>{t('core.module.Data Type')}</Box>
           <Box flex={'1 0 0'}>
             <MySelect
-              list={selectTypeList.current}
+              list={fnValueTypeSelect}
               value={valueType}
               onchange={(e: any) => {
                 setValue('valueType', e);