gitea/FastGPT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updae theme and fix some bug (#1711)

Browse Source
This commit is contained in:
Archer
2024-06-07 12:54:30 +08:00
committed by GitHub
parent 19c8a06d51
commit b20d075d35
153 changed files with 1587 additions and 1436 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
projects/app/src/components/core/ai/AISettingModal/index.tsx
View File

@@ -19,8 +19,6 @@ import type { SettingAIDataType } from '@fastgpt/global/core/app/type.d';
import { getDocPath } from '@/web/common/system/doc';
import AIModelSelector from '@/components/Select/AIModelSelector';
import { LLMModelItemType } from '@fastgpt/global/core/ai/model.d';
import MyTooltip from '@fastgpt/web/components/common/MyTooltip';
import { QuestionOutlineIcon } from '@chakra-ui/icons';
import QuestionTip from '@fastgpt/web/components/common/MyTooltip/QuestionTip';
const AIChatSettingsModal = ({
@@ -65,7 +63,8 @@ const AIChatSettingsModal = ({
const LabelStyles: BoxProps = {
display: 'flex',
alignItems: 'center',
fontSize: ['sm', 'md'],
fontSize: 'sm',
color: 'myGray.900',
width: ['80px', '90px']
};
@@ -209,14 +208,14 @@ const AIChatSettingsModal = ({
<Flex mt={8} alignItems={'center'}>
<Box {...LabelStyles}>
{t('core.app.Ai response')}
<MyTooltip label={t('core.module.template.AI response switch tip')}>
<QuestionOutlineIcon ml={1} />
</MyTooltip>
<QuestionTip
ml={1}
label={t('core.module.template.AI response switch tip')}
></QuestionTip>
</Box>
<Box flex={1} ml={'10px'}>
<Switch
isChecked={getValues(NodeInputKeyEnum.aiChatIsResponseText)}
size={'lg'}
onChange={(e) => {
const value = e.target.checked;
setValue(NodeInputKeyEnum.aiChatIsResponseText, value);

53
projects/app/src/components/core/app/DatasetParamsModal.tsx
View File

@@ -12,9 +12,8 @@ import {
useTheme
} from '@chakra-ui/react';
import { useForm } from 'react-hook-form';
import { QuestionOutlineIcon } from '@chakra-ui/icons';
import MySlider from '@/components/Slider';
import MyTooltip from '@/components/MyTooltip';
import MyTooltip from '@fastgpt/web/components/common/MyTooltip';
import MyModal from '@fastgpt/web/components/common/MyModal';
import { DatasetSearchModeEnum } from '@fastgpt/global/core/dataset/constants';
import { useTranslation } from 'next-i18next';
@@ -29,6 +28,8 @@ import PromptEditor from '@fastgpt/web/components/common/Textarea/PromptEditor';
import { useUserStore } from '@/web/support/user/useUserStore';
import { useToast } from '@fastgpt/web/hooks/useToast';
import SelectAiModel from '@/components/Select/AIModelSelector';
import QuestionTip from '@fastgpt/web/components/common/MyTooltip/QuestionTip';
import FormLabel from '@fastgpt/web/components/common/MyBox/FormLabel';
export type DatasetParamsProps = {
searchMode: `${DatasetSearchModeEnum}`;
@@ -158,8 +159,7 @@ const DatasetParamsModal = ({
cursor={'pointer'}
userSelect={'none'}
py={3}
pl={'14px'}
pr={'16px'}
px={4}
border={theme.borders.sm}
borderWidth={'1.5px'}
borderRadius={'md'}
@@ -191,8 +191,8 @@ const DatasetParamsModal = ({
>
<MyIcon name="core/dataset/rerank" w={'18px'} mr={'14px'} />
<Box pr={2} color={'myGray.800'} flex={'1 0 0'}>
<Box>{t('core.dataset.search.ReRank')}</Box>
<Box fontSize={['xs', 'sm']} color={'myGray.500'}>
<Box fontSize={'sm'}>{t('core.dataset.search.ReRank')}</Box>
<Box fontSize={'xs'} color={'myGray.500'}>
{t('core.dataset.search.ReRank desc')}
</Box>
</Box>
@@ -208,12 +208,13 @@ const DatasetParamsModal = ({
<Box pt={5}>
{limit !== undefined && (
<Box display={['block', 'flex']}>
<Box flex={'0 0 120px'} mb={[8, 0]}>
{t('core.dataset.search.Max Tokens')}
<MyTooltip label={t('core.dataset.search.Max Tokens Tips')} forceShow>
<QuestionOutlineIcon ml={1} />
</MyTooltip>
</Box>
<Flex flex={'0 0 120px'} mb={[8, 0]}>
<FormLabel>{t('core.dataset.search.Max Tokens')}</FormLabel>
<QuestionTip
ml={1}
label={t('core.dataset.search.Max Tokens Tips')}
></QuestionTip>
</Flex>
<Box flex={1} mx={4}>
<MySlider
markList={[
@@ -233,12 +234,13 @@ const DatasetParamsModal = ({
</Box>
)}
<Box display={['block', 'flex']} mt={10}>
<Box flex={'0 0 120px'} mb={[8, 0]}>
{t('core.dataset.search.Min Similarity')}
<MyTooltip label={t('core.dataset.search.Min Similarity Tips')} forceShow>
<QuestionOutlineIcon ml={1} />
</MyTooltip>
</Box>
<Flex flex={'0 0 120px'} mb={[8, 0]}>
<FormLabel>{t('core.dataset.search.Min Similarity')}</FormLabel>
<QuestionTip
ml={1}
label={t('core.dataset.search.Min Similarity Tips')}
></QuestionTip>
</Flex>
<Box flex={1} mx={4}>
{showSimilarity ? (
<MySlider
@@ -264,7 +266,7 @@ const DatasetParamsModal = ({
)}
{currentTabType === SearchSettingTabEnum.queryExtension && (
<Box>
<Box fontSize={'xs'} color={'myGray.500'}>
<Box transform={'translateY(-5px)'} fontSize={'xs'} color={'myGray.500'}>
{t('core.dataset.Query extension intro')}
</Box>
<Flex mt={3} alignItems={'center'}>
@@ -274,8 +276,8 @@ const DatasetParamsModal = ({
{datasetSearchUsingCfrForm === true && (
<>
<Flex mt={4} alignItems={'center'}>
<Box flex={'0 0 100px'}>{t('core.ai.Model')}</Box>
<Box flex={'1 0 0'}>
<FormLabel flex={['0 0 80px', '1 0 0']}>{t('core.ai.Model')}</FormLabel>
<Box flex={['1 0 0', '0 0 300px']}>
<SelectAiModel
width={'100%'}
value={queryExtensionModel}
@@ -288,10 +290,11 @@ const DatasetParamsModal = ({
</Flex>
<Box mt={3}>
<Flex alignItems={'center'}>
{t('core.app.edit.Query extension background prompt')}
<MyTooltip label={t('core.app.edit.Query extension background tip')} forceShow>
<QuestionOutlineIcon display={['none', 'inline']} ml={1} />
</MyTooltip>
<FormLabel>{t('core.app.edit.Query extension background prompt')}</FormLabel>
<QuestionTip
ml={1}
label={t('core.app.edit.Query extension background tip')}
></QuestionTip>
</Flex>
<Box mt={1}>
<PromptEditor

4
projects/app/src/components/core/app/DatasetSelectModal.tsx
View File

@@ -13,7 +13,7 @@ import {
import Avatar from '@/components/Avatar';
import type { SelectedDatasetType } from '@fastgpt/global/core/workflow/api.d';
import { useToast } from '@fastgpt/web/hooks/useToast';
import MyTooltip from '@/components/MyTooltip';
import MyTooltip from '@fastgpt/web/components/common/MyTooltip';
import MyIcon from '@fastgpt/web/components/common/Icon';
import { DatasetTypeEnum } from '@fastgpt/global/core/dataset/constants';
import { useTranslation } from 'next-i18next';
@@ -163,7 +163,7 @@ export const DatasetSelectModal = ({
className="textEllipsis"
ml={3}
fontWeight={'bold'}
fontSize={['md', 'lg', 'xl']}
fontSize={['md', 'lg']}
>
{item.name}
</Box>

23
projects/app/src/components/core/app/InputGuideConfig.tsx
View File

@@ -1,5 +1,5 @@
import MyIcon from '@fastgpt/web/components/common/Icon';
import MyTooltip from '@/components/MyTooltip';
import MyTooltip from '@fastgpt/web/components/common/MyTooltip';
import {
Box,
Button,
@@ -34,10 +34,10 @@ import { useToast } from '@fastgpt/web/hooks/useToast';
import { useSelectFile } from '@/web/common/file/hooks/useSelectFile';
import { readCsvRawText } from '@fastgpt/web/common/file/utils';
import { useRequest2 } from '@fastgpt/web/hooks/useRequest';
import { useRequest } from 'ahooks';
import HighlightText from '@fastgpt/web/components/common/String/HighlightText';
import { defaultChatInputGuideConfig } from '@fastgpt/global/core/app/constants';
import ChatFunctionTip from './Tip';
import FormLabel from '@fastgpt/web/components/common/MyBox/FormLabel';
const csvTemplate = `"第一列内容"
"只会将第一列内容导入，其余列会被忽略"
@@ -85,10 +85,10 @@ const InputGuideConfig = ({
return (
<Flex alignItems={'center'}>
<MyIcon name={'core/app/inputGuides'} mr={2} w={'20px'} />
<HStack>
<Box>{chatT('Input guide')}</Box>
<Flex alignItems={'center'}>
<FormLabel>{chatT('Input guide')}</FormLabel>
<ChatFunctionTip type={'inputGuide'} />
</HStack>
</Flex>
<Box flex={1} />
<MyTooltip label={chatT('Config input guide')}>
<Button
@@ -109,10 +109,9 @@ const InputGuideConfig = ({
>
<ModalBody px={[5, 16]} py={[4, 8]} w={'500px'}>
<Flex justifyContent={'space-between'} alignItems={'center'}>
{t('Is open')}
<FormLabel>{t('Is open')}</FormLabel>
<Switch
isChecked={isOpenQuestionGuide}
size={'lg'}
onChange={(e) => {
onChange({
...value,
@@ -124,7 +123,7 @@ const InputGuideConfig = ({
{isOpenQuestionGuide && (
<>
<Flex mt={8} alignItems={'center'}>
{chatT('Input guide lexicon')}
<FormLabel>{chatT('Input guide lexicon')}</FormLabel>
<Box fontSize={'xs'} px={2} bg={'myGray.100'} ml={1} rounded={'full'}>
{total}
</Box>
@@ -142,7 +141,7 @@ const InputGuideConfig = ({
</Flex>
<>
<Flex mt={8} alignItems={'center'}>
{chatT('Custom input guide url')}
<FormLabel>{chatT('Custom input guide url')}</FormLabel>
<Flex
onClick={() => window.open(getDocPath('/docs/course/chat_input_guide'))}
color={'primary.700'}
@@ -203,7 +202,7 @@ const LexiconConfigModal = ({ appId, onClose }: { appId: string; onClose: () =>
refreshDeps: [searchKey],
debounceWait: 300,
itemHeight: 46,
itemHeight: 48,
overscan: 20,
pageSize: 20,
@@ -381,6 +380,7 @@ const LexiconConfigModal = ({ appId, onClose }: { appId: string; onClose: () =>
<ScrollList
px={8}
flex={'1 0 0'}
fontSize={'sm'}
EmptyChildren={<EmptyTip text={chatT('Chat input guide lexicon is empty')} />}
>
{list.map((data, index) => {
@@ -394,7 +394,7 @@ const LexiconConfigModal = ({ appId, onClose }: { appId: string; onClose: () =>
key={index}
alignItems={'center'}
h={10}
mt={3}
mt={2}
_hover={{
'& .icon-list': {
display: 'flex'
@@ -402,7 +402,6 @@ const LexiconConfigModal = ({ appId, onClose }: { appId: string; onClose: () =>
}}
>
<Checkbox
size={'lg'}
mr={2}
isChecked={selected}
onChange={(e) => {

3
projects/app/src/components/core/app/QGSwitch.tsx
View File

@@ -3,6 +3,7 @@ import { Box, Flex, Switch, type SwitchProps } from '@chakra-ui/react';
import React from 'react';
import { useTranslation } from 'next-i18next';
import ChatFunctionTip from './Tip';
import FormLabel from '@fastgpt/web/components/common/MyBox/FormLabel';
// question generator switch
const QGSwitch = (props: SwitchProps) => {
@@ -10,7 +11,7 @@ const QGSwitch = (props: SwitchProps) => {
return (
<Flex alignItems={'center'}>
<MyIcon name={'core/chat/QGFill'} mr={2} w={'20px'} />
<Box fontWeight={'medium'}>{t('core.app.Question Guide')}</Box>
<FormLabel>{t('core.app.Question Guide')}</FormLabel>
<ChatFunctionTip type={'nextQuestion'} />
<Box flex={1} />
<Switch {...props} />

31
projects/app/src/components/core/app/ScheduledTriggerConfig.tsx
View File

@@ -1,4 +1,13 @@
import { Box, Button, Flex, ModalBody, useDisclosure, Switch, Textarea } from '@chakra-ui/react';
import {
Box,
Button,
Flex,
ModalBody,
useDisclosure,
Switch,
Textarea,
HStack
} from '@chakra-ui/react';
import React, { useCallback, useEffect, useMemo, useRef } from 'react';
import MyIcon from '@fastgpt/web/components/common/Icon';
import { useTranslation } from 'next-i18next';
@@ -10,6 +19,7 @@ import dynamic from 'next/dynamic';
import type { MultipleSelectProps } from '@fastgpt/web/components/common/MySelect/type.d';
import { cronParser2Fields } from '@fastgpt/global/common/string/time';
import TimezoneSelect from '@fastgpt/web/components/common/MySelect/TimezoneSelect';
import FormLabel from '@fastgpt/web/components/common/MyBox/FormLabel';
const MultipleRowSelect = dynamic(
() => import('@fastgpt/web/components/common/MySelect/MultipleRowSelect')
@@ -135,7 +145,7 @@ const ScheduledTriggerConfig = ({
defaultPrompt?: string;
}) => {
onChange({
cronString: cronString ?? value?.cronString ?? '0 0 * * *',
cronString: cronString ?? value?.cronString ?? '',
timezone: timezone ?? value?.timezone ?? Intl.DateTimeFormat().resolvedOptions().timeZone,
defaultPrompt: defaultPrompt ?? value?.defaultPrompt ?? ''
});
@@ -243,10 +253,10 @@ const ScheduledTriggerConfig = ({
<>
<Flex alignItems={'center'}>
<MyIcon name={'core/app/schedulePlan'} w={'20px'} />
<Flex alignItems={'center'} ml={2} flex={1}>
{t('core.app.Interval timer run')}
<QuestionTip ml={1} label={t('core.app.Interval timer tip')} />
</Flex>
<HStack ml={2} flex={1} spacing={1}>
<FormLabel>{t('core.app.Interval timer run')}</FormLabel>
<QuestionTip label={t('core.app.Interval timer tip')} />
</HStack>
<MyTooltip label={t('core.app.Config schedule plan')}>
<Button
variant={'transparentBase'}
@@ -269,9 +279,8 @@ const ScheduledTriggerConfig = ({
>
<ModalBody>
<Flex justifyContent={'space-between'} alignItems={'center'}>
<Box flex={'0 0 80px'}> {t('core.app.schedule.Open schedule')}</Box>
<FormLabel flex={'0 0 80px'}> {t('core.app.schedule.Open schedule')}</FormLabel>
<Switch
size={'lg'}
isChecked={isOpenSchedule}
onChange={(e) => {
if (e.target.checked) {
@@ -285,7 +294,7 @@ const ScheduledTriggerConfig = ({
{isOpenSchedule && (
<>
<Flex alignItems={'center'} mt={5}>
<Box flex={'0 0 80px'}>执行时机</Box>
<FormLabel flex={'0 0 80px'}>执行时间</FormLabel>
<Box flex={'1 0 0'}>
<MultipleRowSelect
label={formatLabel}
@@ -298,7 +307,7 @@ const ScheduledTriggerConfig = ({
</Box>
</Flex>
<Flex alignItems={'center'} mt={5}>
<Box flex={'0 0 80px'}>时区</Box>
<FormLabel flex={'0 0 80px'}>时区</FormLabel>
<Box flex={'1 0 0'}>
<TimezoneSelect
value={timezone}
@@ -309,7 +318,7 @@ const ScheduledTriggerConfig = ({
</Box>
</Flex>
<Box mt={5}>
<Box mb={1}>{t('core.app.schedule.Default prompt')}</Box>
<FormLabel mb={1}>{t('core.app.schedule.Default prompt')}</FormLabel>
<Textarea
value={defaultPrompt}
rows={8}

9
projects/app/src/components/core/app/TTSSelect.tsx
View File

@@ -1,5 +1,5 @@
import MyIcon from '@fastgpt/web/components/common/Icon';
import MyTooltip from '@/components/MyTooltip';
import MyTooltip from '@fastgpt/web/components/common/MyTooltip';
import { Box, Button, Flex, ModalBody, useDisclosure, Image } from '@chakra-ui/react';
import React, { useCallback, useMemo } from 'react';
import { useTranslation } from 'next-i18next';
@@ -12,6 +12,7 @@ import MySlider from '@/components/Slider';
import MySelect from '@fastgpt/web/components/common/MySelect';
import { defaultTTSConfig } from '@fastgpt/global/core/app/constants';
import ChatFunctionTip from './Tip';
import FormLabel from '@fastgpt/web/components/common/MyBox/FormLabel';
const TTSSelect = ({
value = defaultTTSConfig,
@@ -81,7 +82,7 @@ const TTSSelect = ({
return (
<Flex alignItems={'center'}>
<MyIcon name={'core/app/simpleMode/tts'} mr={2} w={'20px'} />
<Box fontWeight={'medium'}>{t('core.app.TTS')}</Box>
<FormLabel>{t('core.app.TTS')}</FormLabel>
<ChatFunctionTip type={'tts'} />
<Box flex={1} />
<MyTooltip label={t('core.app.Select TTS')}>
@@ -108,11 +109,11 @@ const TTSSelect = ({
>
<ModalBody px={[5, 16]} py={[4, 8]}>
<Flex justifyContent={'space-between'} alignItems={'center'}>
{t('core.app.tts.Speech model')}
<FormLabel>{t('core.app.tts.Speech model')}</FormLabel>
<MySelect w={'220px'} value={formatValue} list={list} onchange={onclickChange} />
</Flex>
<Flex mt={8} justifyContent={'space-between'}>
{t('core.app.tts.Speech speed')}
<FormLabel>{t('core.app.tts.Speech speed')}</FormLabel>
<MySlider
markList={[
{ label: '0.3', value: 0.3 },

2
projects/app/src/components/core/app/Tip.tsx
View File

@@ -65,7 +65,7 @@ const ChatFunctionTip = ({ type }: { type: `${FnTypeEnum}` }) => {
</Box>
</Box>
</Flex>
<Image src={data.imgUrl} w={'100%'} minH={['auto', '200px']} mt={2} alt={''} />
<Image src={data.imgUrl} w={'100%'} minH={['auto', '250px']} mt={2} alt={''} />
</Box>
}
/>

41
projects/app/src/components/core/app/VariableEdit.tsx
View File

@@ -22,7 +22,7 @@ import {
TableContainer,
useDisclosure
} from '@chakra-ui/react';
import { QuestionOutlineIcon, SmallAddIcon } from '@chakra-ui/icons';
import { SmallAddIcon } from '@chakra-ui/icons';
import { VariableInputEnum, variableMap } from '@fastgpt/global/core/workflow/constants';
import type { VariableItemType } from '@fastgpt/global/core/app/type.d';
import MyIcon from '@fastgpt/web/components/common/Icon';
@@ -31,12 +31,12 @@ import { useFieldArray } from 'react-hook-form';
import { customAlphabet } from 'nanoid';
const nanoid = customAlphabet('abcdefghijklmnopqrstuvwxyz1234567890', 6);
import MyModal from '@fastgpt/web/components/common/MyModal';
import MyTooltip from '@/components/MyTooltip';
import { useTranslation } from 'next-i18next';
import { useToast } from '@fastgpt/web/hooks/useToast';
import MyRadio from '@/components/common/MyRadio';
import { formatEditorVariablePickerIcon } from '@fastgpt/global/core/workflow/utils';
import ChatFunctionTip from './Tip';
import FormLabel from '@fastgpt/web/components/common/MyBox/FormLabel';
const VariableEdit = ({
variables = [],
@@ -96,9 +96,9 @@ const VariableEdit = ({
<Box>
<Flex alignItems={'center'}>
<MyIcon name={'core/app/simpleMode/variable'} w={'20px'} />
<Box ml={2} fontWeight={'medium'}>
<FormLabel ml={2} fontWeight={'medium'}>
{t('core.module.Variable')}
</Box>
</FormLabel>
<ChatFunctionTip type={'variable'} />
<Box flex={1} />
<Button
@@ -118,14 +118,19 @@ const VariableEdit = ({
{formatVariables.length > 0 && (
<Box mt={2} borderRadius={'md'} overflow={'hidden'} borderWidth={'1px'} borderBottom="none">
<TableContainer>
<Table bg={'white'}>
<Table>
<Thead>
<Tr bg={'myGray.50'}>
<Th w={'18px !important'} p={0} />
<Th>{t('core.module.variable.variable name')}</Th>
<Th>{t('core.module.variable.key')}</Th>
<Th>{t('common.Require Input')}</Th>
<Th></Th>
<Tr>
<Th
fontSize={'mini'}
borderRadius={'none !important'}
w={'18px !important'}
p={0}
/>
<Th fontSize={'mini'}>{t('core.module.variable.variable name')}</Th>
<Th fontSize={'mini'}>{t('core.module.variable.key')}</Th>
<Th fontSize={'mini'}>{t('common.Require Input')}</Th>
<Th fontSize={'mini'} borderRadius={'none !important'}></Th>
</Tr>
</Thead>
<Tbody>
@@ -174,12 +179,12 @@ const VariableEdit = ({
<ModalBody>
{variableType !== VariableInputEnum.custom && (
<Flex alignItems={'center'}>
<Box w={'70px'}>{t('common.Require Input')}</Box>
<FormLabel w={'70px'}>{t('common.Require Input')}</FormLabel>
<Switch {...registerEdit('variable.required')} />
</Flex>
)}
<Flex mt={5} alignItems={'center'}>
<Box w={'80px'}>{t('core.module.variable.variable name')}</Box>
<FormLabel w={'80px'}>{t('core.module.variable.variable name')}</FormLabel>
<Input
{...registerEdit('variable.label', {
required: t('core.module.variable.variable name is required')
@@ -187,7 +192,7 @@ const VariableEdit = ({
/>
</Flex>
<Flex mt={5} alignItems={'center'}>
<Box w={'80px'}>{t('core.module.variable.key')}</Box>
<FormLabel w={'80px'}>{t('core.module.variable.key')}</FormLabel>
<Input
{...registerEdit('variable.key', {
required: t('core.module.variable.key is required')
@@ -195,9 +200,9 @@ const VariableEdit = ({
/>
</Flex>
<Box mt={5} mb={2}>
<FormLabel mt={5} mb={2}>
{t('core.workflow.Variable.Variable type')}
</Box>
</FormLabel>
<MyRadio
gridGap={4}
gridTemplateColumns={'repeat(2,1fr)'}
@@ -220,9 +225,9 @@ const VariableEdit = ({
{variableType === VariableInputEnum.input && (
<>
<Box mt={5} mb={2}>
<FormLabel mt={5} mb={2}>
{t('core.module.variable.text max length')}
</Box>
</FormLabel>
<Box>
<NumberInput max={500} min={1} step={1} position={'relative'}>
<NumberInputField

3
projects/app/src/components/core/app/WelcomeTextConfig.tsx
View File

@@ -4,6 +4,7 @@ import MyIcon from '@fastgpt/web/components/common/Icon';
import ChatFunctionTip from './Tip';
import MyTextarea from '@/components/common/Textarea/MyTextarea';
import { useTranslation } from 'next-i18next';
import FormLabel from '@fastgpt/web/components/common/MyBox/FormLabel';
const WelcomeTextConfig = (props: TextareaProps) => {
const { t } = useTranslation();
@@ -11,7 +12,7 @@ const WelcomeTextConfig = (props: TextareaProps) => {
<>
<Flex alignItems={'center'}>
<MyIcon name={'core/app/simpleMode/chat'} w={'20px'} />
<Box ml={2}>{t('core.app.Welcome Text')}</Box>
<FormLabel ml={2}>{t('core.app.Welcome Text')}</FormLabel>
<ChatFunctionTip type={'welcome'} />
</Flex>
<MyTextarea

14
projects/app/src/components/core/app/WhisperConfig.tsx
View File

@@ -1,5 +1,5 @@
import MyIcon from '@fastgpt/web/components/common/Icon';
import MyTooltip from '@/components/MyTooltip';
import MyTooltip from '@fastgpt/web/components/common/MyTooltip';
import { Box, Button, Flex, ModalBody, useDisclosure, Switch } from '@chakra-ui/react';
import React, { useMemo } from 'react';
import { useTranslation } from 'next-i18next';
@@ -7,6 +7,7 @@ import type { AppWhisperConfigType } from '@fastgpt/global/core/app/type.d';
import MyModal from '@fastgpt/web/components/common/MyModal';
import QuestionTip from '@fastgpt/web/components/common/MyTooltip/QuestionTip';
import { defaultWhisperConfig } from '@fastgpt/global/core/app/constants';
import FormLabel from '@fastgpt/web/components/common/MyBox/FormLabel';
const WhisperConfig = ({
isOpenAudio,
@@ -33,7 +34,7 @@ const WhisperConfig = ({
return (
<Flex alignItems={'center'}>
<MyIcon name={'core/app/simpleMode/whisper'} mr={2} w={'20px'} />
<Box fontWeight={'medium'}>{t('core.app.Whisper')}</Box>
<FormLabel>{t('core.app.Whisper')}</FormLabel>
<Box flex={1} />
<MyTooltip label={t('core.app.Config whisper')}>
<Button
@@ -54,10 +55,9 @@ const WhisperConfig = ({
>
<ModalBody px={[5, 16]} py={[4, 8]}>
<Flex justifyContent={'space-between'} alignItems={'center'}>
{t('core.app.whisper.Switch')}
<FormLabel>{t('core.app.whisper.Switch')}</FormLabel>
<Switch
isChecked={isOpenWhisper}
size={'lg'}
onChange={(e) => {
onChange({
...value,
@@ -68,12 +68,11 @@ const WhisperConfig = ({
</Flex>
{isOpenWhisper && (
<Flex mt={8} alignItems={'center'}>
{t('core.app.whisper.Auto send')}
<FormLabel>{t('core.app.whisper.Auto send')}</FormLabel>
<QuestionTip label={t('core.app.whisper.Auto send tip')} />
<Box flex={'1 0 0'} />
<Switch
isChecked={value.autoSend}
size={'lg'}
onChange={(e) => {
onChange({
...value,
@@ -86,12 +85,11 @@ const WhisperConfig = ({
{isOpenWhisper && isAutoSend && (
<>
<Flex mt={8} alignItems={'center'}>
{t('core.app.whisper.Auto tts response')}
<FormLabel>{t('core.app.whisper.Auto tts response')}</FormLabel>
<QuestionTip label={t('core.app.whisper.Auto tts response tip')} />
<Box flex={'1 0 0'} />
<Switch
isChecked={value.autoTTSResponse}
size={'lg'}
onChange={(e) => {
onChange({
...value,

2
projects/app/src/components/core/dataset/QuoteItem.tsx
View File

@@ -5,7 +5,7 @@ import type { SearchDataResponseItemType } from '@fastgpt/global/core/dataset/ty
import NextLink from 'next/link';
import MyIcon from '@fastgpt/web/components/common/Icon';
import { useTranslation } from 'next-i18next';
import MyTooltip from '@/components/MyTooltip';
import MyTooltip from '@fastgpt/web/components/common/MyTooltip';
import dynamic from 'next/dynamic';
import MyBox from '@fastgpt/web/components/common/MyBox';
import { SearchScoreTypeEnum, SearchScoreTypeMap } from '@fastgpt/global/core/dataset/constants';

2
projects/app/src/components/core/dataset/RawSourceBox.tsx
View File

@@ -1,6 +1,6 @@
import React, { useMemo } from 'react';
import { Box, BoxProps } from '@chakra-ui/react';
import MyTooltip from '@/components/MyTooltip';
import MyTooltip from '@fastgpt/web/components/common/MyTooltip';
import { useTranslation } from 'next-i18next';
import { getCollectionSourceAndOpen } from '@/web/core/dataset/hooks/readCollectionSource';
import { getSourceNameIcon } from '@fastgpt/global/core/dataset/utils';

16
projects/app/src/components/core/dataset/SearchParamsTip.tsx
View File

@@ -39,13 +39,15 @@ const SearchParamsTip = ({
>
<Table fontSize={'xs'} overflow={'overlay'}>
<Thead>
<Tr color={'myGray.600'}>
<Th>{t('core.dataset.search.search mode')}</Th>
<Th>{t('core.dataset.search.Max Tokens')}</Th>
<Th>{t('core.dataset.search.Min Similarity')}</Th>
{hasReRankModel && <Th>{t('core.dataset.search.ReRank')}</Th>}
<Th>{t('core.module.template.Query extension')}</Th>
{hasEmptyResponseMode && <Th>{t('core.dataset.search.Empty result response')}</Th>}
<Tr bg={'transparent !important'}>
<Th fontSize={'mini'}>{t('core.dataset.search.search mode')}</Th>
<Th fontSize={'mini'}>{t('core.dataset.search.Max Tokens')}</Th>
<Th fontSize={'mini'}>{t('core.dataset.search.Min Similarity')}</Th>
{hasReRankModel && <Th fontSize={'mini'}>{t('core.dataset.search.ReRank')}</Th>}
<Th fontSize={'mini'}>{t('core.module.template.Query extension')}</Th>
{hasEmptyResponseMode && (
<Th fontSize={'mini'}>{t('core.dataset.search.Empty result response')}</Th>
)}
</Tr>
</Thead>
<Tbody>

4
projects/app/src/components/core/workflow/Flow/ChatTest.tsx
View File

@@ -12,7 +12,7 @@ import { SmallCloseIcon } from '@chakra-ui/icons';
import { Box, Flex, IconButton } from '@chakra-ui/react';
import MyIcon from '@fastgpt/web/components/common/Icon';
import { streamFetch } from '@/web/common/api/fetch';
import MyTooltip from '@/components/MyTooltip';
import MyTooltip from '@fastgpt/web/components/common/MyTooltip';
import { useUserStore } from '@/web/support/user/useUserStore';
import ChatBox from '@/components/ChatBox';
import type { ComponentRef, StartChatFnProps } from '@/components/ChatBox/type.d';
@@ -107,7 +107,7 @@ const ChatTest = (
transition={'.2s ease'}
>
<Flex py={4} px={5} whiteSpace={'nowrap'}>
<Box fontSize={'xl'} fontWeight={'bold'} flex={1}>
<Box fontSize={'lg'} fontWeight={'bold'} flex={1}>
{t('core.chat.Debug test')}
</Box>
<MyTooltip label={t('core.chat.Restart')}>

14
projects/app/src/components/core/workflow/Flow/NodeTemplatesModal.tsx
View File

@@ -47,7 +47,7 @@ enum TemplateTypeEnum {
'teamPlugin' = 'teamPlugin'
}
const sliderWidth = 380;
const sliderWidth = 390;
const NodeTemplatesModal = ({ isOpen, onClose }: ModuleTemplateListProps) => {
const { t } = useTranslation();
@@ -138,6 +138,7 @@ const NodeTemplatesModal = ({ isOpen, onClose }: ModuleTemplateListProps) => {
bottom={0}
w={`${sliderWidth}px`}
onClick={onClose}
fontSize={'sm'}
/>
<Flex
zIndex={3}
@@ -184,8 +185,6 @@ const NodeTemplatesModal = ({ isOpen, onClose }: ModuleTemplateListProps) => {
<IconButton
size={'sm'}
icon={<MyIcon name={'common/backFill'} w={'14px'} color={'myGray.700'} />}
w={'26px'}
h={'26px'}
borderColor={'myGray.300'}
variant={'grayBase'}
aria-label={''}
@@ -212,6 +211,7 @@ const NodeTemplatesModal = ({ isOpen, onClose }: ModuleTemplateListProps) => {
_hover={{
color: 'primary.600'
}}
fontSize={'sm'}
onClick={() => router.push('/plugin/list')}
>
<Box>去创建</Box>
@@ -341,7 +341,7 @@ const RenderList = React.memo(function RenderList({
>
{item.label && (
<Flex>
<Box fontWeight={'bold'} flex={1}>
<Box fontSize={'sm'} fontWeight={'bold'} flex={1}>
{t(item.label)}
</Box>
</Flex>
@@ -405,11 +405,11 @@ const RenderList = React.memo(function RenderList({
>
<Avatar
src={template.avatar}
w={'30px'}
w={'1.7rem'}
objectFit={'contain'}
borderRadius={'0'}
/>
<Box color={'black'} ml={5} flex={'1 0 0'}>
<Box color={'black'} fontSize={'sm'} ml={5} flex={'1 0 0'}>
{t(template.name)}
</Box>
</Flex>
@@ -421,7 +421,7 @@ const RenderList = React.memo(function RenderList({
</Box>
</Box>
);
}, [formatTemplates, isPc, onAddNode, onClose, setCurrentParent, t, templates.length]);
}, [appT, formatTemplates, isPc, onAddNode, onClose, setCurrentParent, t, templates.length]);
return Render;
});

2
projects/app/src/components/core/workflow/Flow/SelectAppModal.tsx
View File

@@ -74,7 +74,7 @@ const SelectAppModal = ({
})}
>
<Avatar src={app.avatar} w={['16px', '22px']} />
<Box fontWeight={'bold'} ml={1}>
<Box fontSize={'sm'} color={'myGray.900'} ml={1}>
{app.name}
</Box>
</Flex>

8
projects/app/src/components/core/workflow/Flow/components/ButtonEdge.tsx
View File

@@ -21,9 +21,10 @@ const ButtonEdge = (props: EdgeProps) => {
sourcePosition,
targetPosition,
selected,
sourceHandleId,
source,
sourceHandleId,
target,
targetHandleId,
style
} = props;
@@ -86,12 +87,13 @@ const ButtonEdge = (props: EdgeProps) => {
const edgeColor = useMemo(() => {
const targetEdge = workflowDebugData?.runtimeEdges.find(
(edge) => edge.source === source && edge.target === target
(edge) => edge.sourceHandle === sourceHandleId && edge.targetHandle === targetHandleId
);
if (!targetEdge) {
if (highlightEdge) return '#3370ff';
return '#94B5FF';
}
console.log(targetEdge);
// debug mode
const colorMap = {
[RuntimeEdgeStatusEnum.active]: '#39CC83',
@@ -99,7 +101,7 @@ const ButtonEdge = (props: EdgeProps) => {
[RuntimeEdgeStatusEnum.skipped]: '#8A95A7'
};
return colorMap[targetEdge.status];
}, [highlightEdge, source, target, workflowDebugData?.runtimeEdges]);
}, [highlightEdge, sourceHandleId, targetHandleId, workflowDebugData?.runtimeEdges]);
const memoEdgeLabel = useMemo(() => {
const arrowTransform = (() => {

2
projects/app/src/components/core/workflow/Flow/hooks/useDebug.tsx
View File

@@ -219,7 +219,7 @@ export const useDebug = () => {
if (input.valueType === WorkflowIOValueTypeEnum.boolean) {
return (
<Box>
<Switch size={'lg'} {...register(input.key)} />
<Switch {...register(input.key)} />
</Box>
);
}

2
projects/app/src/components/core/workflow/Flow/index.tsx
View File

@@ -28,7 +28,7 @@ import { useToast } from '@fastgpt/web/hooks/useToast';
import { useTranslation } from 'next-i18next';
import { FlowNodeItemType } from '@fastgpt/global/core/workflow/type/index.d';
import MyIcon from '@fastgpt/web/components/common/Icon';
import MyTooltip from '@/components/MyTooltip';
import MyTooltip from '@fastgpt/web/components/common/MyTooltip';
import { connectionLineStyle, defaultEdgeOptions } from '../constants';
import { useConfirm } from '@fastgpt/web/hooks/useConfirm';
import { useKeyboard } from './hooks/useKeyboard';

2
projects/app/src/components/core/workflow/Flow/nodes/NodeCQNode.tsx
View File

@@ -9,7 +9,7 @@ import type { ClassifyQuestionAgentItemType } from '@fastgpt/global/core/workflo
import MyIcon from '@fastgpt/web/components/common/Icon';
import { NodeInputKeyEnum } from '@fastgpt/global/core/workflow/constants';
import { useTranslation } from 'next-i18next';
import MyTooltip from '@/components/MyTooltip';
import MyTooltip from '@fastgpt/web/components/common/MyTooltip';
import { FlowNodeInputItemType } from '@fastgpt/global/core/workflow/type/io.d';
import { getNanoid } from '@fastgpt/global/common/string/tools';
import { SourceHandle } from './render/Handle';

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

@@ -13,10 +13,11 @@ import type { ContextExtractAgentItemType } from '@fastgpt/global/core/workflow/
import { useForm } from 'react-hook-form';
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 MyTooltip from '@fastgpt/web/components/common/MyTooltip';
import MySelect from '@fastgpt/web/components/common/MySelect';
import { fnValueTypeSelect } from '@/web/core/workflow/constants/dataType';
import QuestionTip from '@fastgpt/web/components/common/MyTooltip/QuestionTip';
import FormLabel from '@fastgpt/web/components/common/MyBox/FormLabel';
export const defaultField: ContextExtractAgentItemType = {
valueType: 'string',
@@ -53,17 +54,15 @@ const ExtractFieldModal = ({
>
<ModalBody>
<Flex mt={2} alignItems={'center'}>
<Flex alignItems={'center'} flex={['0 0 80px', '0 0 100px']}>
{t('core.module.extract.Required')}
<MyTooltip label={t('core.module.extract.Required Description')} forceShow>
<QuestionOutlineIcon ml={1} />
</MyTooltip>
<Flex alignItems={'center'} flex={['1 0 80px', '1 0 100px']}>
<FormLabel>{t('core.module.extract.Required')}</FormLabel>
<QuestionTip ml={1} label={t('core.module.extract.Required Description')}></QuestionTip>
</Flex>
<Switch {...register('required')} />
</Flex>
{required && (
<Flex mt={5} alignItems={'center'}>
<Box flex={['0 0 80px', '0 0 100px']}>{t('core.module.Default value')}</Box>
<FormLabel flex={['0 0 80px', '0 0 100px']}>{t('core.module.Default value')}</FormLabel>
<Input
bg={'myGray.50'}
placeholder={t('core.module.Default value placeholder')}
@@ -73,7 +72,7 @@ const ExtractFieldModal = ({
)}
<Flex alignItems={'center'} mt={5}>
<Box flex={['0 0 80px', '0 0 100px']}>{t('core.module.Data Type')}</Box>
<FormLabel flex={['0 0 80px', '0 0 100px']}>{t('core.module.Data Type')}</FormLabel>
<Box flex={'1 0 0'}>
<MySelect
list={fnValueTypeSelect}
@@ -86,7 +85,7 @@ const ExtractFieldModal = ({
</Flex>
<Flex mt={5} alignItems={'center'}>
<Box flex={['0 0 80px', '0 0 100px']}>{t('Field name')}</Box>
<FormLabel flex={['0 0 80px', '0 0 100px']}>{t('Field name')}</FormLabel>
<Input
bg={'myGray.50'}
placeholder="name/age/sql"
@@ -94,7 +93,9 @@ const ExtractFieldModal = ({
/>
</Flex>
<Flex mt={5} alignItems={'center'}>
<Box flex={['0 0 80px', '0 0 100px']}>{t('core.module.Field Description')}</Box>
<FormLabel flex={['0 0 80px', '0 0 100px']}>
{t('core.module.Field Description')}
</FormLabel>
<Input
bg={'myGray.50'}
placeholder={t('core.module.extract.Field Description Placeholder')}
@@ -104,10 +105,10 @@ const ExtractFieldModal = ({
{(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>
<FormLabel>
{t('core.module.extract.Enum Value')}({t('common.choosable')})
</FormLabel>
<QuestionTip ml={1} label={t('core.module.extract.Enum Description')}></QuestionTip>
</Flex>
<Textarea

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

@@ -78,10 +78,12 @@ const NodeExtract = ({ data }: NodeProps<FlowNodeItemType>) => {
<Table bg={'white'}>
<Thead>
<Tr>
<Th bg={'myGray.50'}>字段名</Th>
<Th bg={'myGray.50'} borderRadius={'none !important'}>
字段名
</Th>
<Th bg={'myGray.50'}>字段描述</Th>
<Th bg={'myGray.50'}>必须</Th>
<Th bg={'myGray.50'}></Th>
<Th bg={'myGray.50'} borderRadius={'none !important'}></Th>
</Tr>
</Thead>
<Tbody>

153
projects/app/src/components/core/workflow/Flow/nodes/NodeHttp/index.tsx
View File

@@ -26,7 +26,6 @@ import MyIcon from '@fastgpt/web/components/common/Icon';
import { FlowNodeInputItemType } from '@fastgpt/global/core/workflow/type/io.d';
import { useToast } from '@fastgpt/web/hooks/useToast';
import MyTooltip from '@fastgpt/web/components/common/MyTooltip';
import { QuestionOutlineIcon } from '@chakra-ui/icons';
import JSONEditor from '@fastgpt/web/components/common/Textarea/JsonEditor';
import { formatEditorVariablePickerIcon } from '@fastgpt/global/core/workflow/utils';
import { EditorVariablePickerType } from '@fastgpt/web/components/common/Textarea/PromptEditor/type';
@@ -40,6 +39,7 @@ import { WorkflowContext } from '../../../context';
import { getWorkflowGlobalVariables } from '@/web/core/workflow/utils';
import { useMemoizedFn } from 'ahooks';
import { AppContext } from '@/web/core/app/context/appContext';
import QuestionTip from '@fastgpt/web/components/common/MyTooltip/QuestionTip';
const CurlImportModal = dynamic(() => import('./CurlImportModal'));
export const HttpHeaders = [
@@ -305,9 +305,10 @@ export function RenderHttpProps({
<Box>
<Flex alignItems={'center'} mb={2} fontWeight={'medium'} color={'myGray.600'}>
{t('core.module.Http request props')}
<MyTooltip label={t('core.module.http.Props tip', { variable: variableText })}>
<QuestionOutlineIcon ml={1} />
</MyTooltip>
<QuestionTip
ml={1}
label={t('core.module.http.Props tip', { variable: variableText })}
></QuestionTip>
</Flex>
<Tabs
list={[
@@ -468,89 +469,97 @@ const RenderForm = ({
const Render = useMemo(() => {
return (
<TableContainer overflowY={'visible'} overflowX={'unset'}>
<Table>
<Thead>
<Tr>
<Th px={2}>{t('core.module.http.Props name')}</Th>
<Th px={2}>{t('core.module.http.Props value')}</Th>
</Tr>
</Thead>
<Tbody>
{list.map((item, index) => (
<Tr key={`${input.key}${index}`}>
<Box mt={2} borderRadius={'md'} overflow={'hidden'} borderWidth={'1px'} borderBottom={'none'}>
<TableContainer overflowY={'visible'} overflowX={'unset'}>
<Table>
<Thead>
<Tr>
<Th px={2} borderBottomLeftRadius={'none !important'}>
{t('core.module.http.Props name')}
</Th>
<Th px={2} borderBottomRadius={'none !important'}>
{t('core.module.http.Props value')}
</Th>
</Tr>
</Thead>
<Tbody>
{list.map((item, index) => (
<Tr key={`${input.key}${index}`}>
<Td p={0} w={'150px'}>
<HttpInput
hasVariablePlugin={false}
hasDropDownPlugin={tabType === TabEnum.headers}
setDropdownValue={(value) => {
handleKeyChange(index, value);
setUpdateTrigger((prev) => !prev);
}}
placeholder={t('core.module.http.Props name')}
value={item.key}
variables={leftVariables}
onBlur={(val) => {
handleKeyChange(index, val);
}}
updateTrigger={updateTrigger}
/>
</Td>
<Td p={0}>
<Box display={'flex'} alignItems={'center'}>
<HttpInput
placeholder={t('core.module.http.Props value')}
value={item.value}
variables={variables}
onBlur={(val) => {
setList((prevList) =>
prevList.map((item, i) =>
i === index ? { ...item, value: val } : item
)
);
setShouldUpdateNode(true);
}}
/>
<MyIcon
name={'delete'}
cursor={'pointer'}
_hover={{ color: 'red.600' }}
w={'14px'}
onClick={() => {
setList((prevlist) => prevlist.filter((val) => val.key !== item.key));
setShouldUpdateNode(true);
}}
/>
</Box>
</Td>
</Tr>
))}
<Tr>
<Td p={0} w={'150px'}>
<HttpInput
hasVariablePlugin={false}
hasDropDownPlugin={tabType === TabEnum.headers}
setDropdownValue={(value) => {
handleKeyChange(index, value);
setDropdownValue={(val) => {
handleAddNewProps(val);
setUpdateTrigger((prev) => !prev);
}}
placeholder={t('core.module.http.Props name')}
value={item.key}
placeholder={t('core.module.http.Add props')}
value={''}
variables={leftVariables}
onBlur={(val) => {
handleKeyChange(index, val);
}}
updateTrigger={updateTrigger}
onBlur={(val) => {
handleAddNewProps(val);
setUpdateTrigger((prev) => !prev);
}}
/>
</Td>
<Td p={0}>
<Box display={'flex'} alignItems={'center'}>
<HttpInput
placeholder={t('core.module.http.Props value')}
value={item.value}
variables={variables}
onBlur={(val) => {
setList((prevList) =>
prevList.map((item, i) => (i === index ? { ...item, value: val } : item))
);
setShouldUpdateNode(true);
}}
/>
<MyIcon
name={'delete'}
cursor={'pointer'}
_hover={{ color: 'red.600' }}
w={'14px'}
onClick={() => {
setList((prevlist) => prevlist.filter((val) => val.key !== item.key));
setShouldUpdateNode(true);
}}
/>
<HttpInput />
</Box>
</Td>
</Tr>
))}
<Tr>
<Td p={0} w={'150px'}>
<HttpInput
hasVariablePlugin={false}
hasDropDownPlugin={tabType === TabEnum.headers}
setDropdownValue={(val) => {
handleAddNewProps(val);
setUpdateTrigger((prev) => !prev);
}}
placeholder={t('core.module.http.Add props')}
value={''}
variables={leftVariables}
updateTrigger={updateTrigger}
onBlur={(val) => {
handleAddNewProps(val);
setUpdateTrigger((prev) => !prev);
}}
/>
</Td>
<Td p={0}>
<Box display={'flex'} alignItems={'center'}>
<HttpInput />
</Box>
</Td>
</Tr>
</Tbody>
</Table>
</TableContainer>
</Tbody>
</Table>
</TableContainer>
</Box>
);
}, [
handleAddNewProps,

7
projects/app/src/components/core/workflow/Flow/nodes/NodeIfElse/ListItem.tsx
View File

@@ -65,11 +65,8 @@ const ListItem = ({
>
<Container w={snapshot.isDragging ? '' : 'full'} className="nodrag">
<Flex mb={4} alignItems={'center'}>
<DragIcon
visibility={ifElseList.length > 1 ? 'visible' : 'hidden'}
provided={provided}
/>
<Box color={'black'} fontSize={'lg'} ml={2}>
{ifElseList.length > 1 && <DragIcon provided={provided} />}
<Box color={'black'} fontSize={'md'} ml={2}>
{getElseIFLabel(conditionIndex)}
</Box>
{conditionItem.list?.length > 1 && (

2
projects/app/src/components/core/workflow/Flow/nodes/NodeIfElse/index.tsx
View File

@@ -91,7 +91,7 @@ const NodeIfElse = ({ data, selected }: NodeProps<FlowNodeItemType>) => {
<Container position={'relative'}>
<Flex alignItems={'center'}>
<Box color={'black'} fontSize={'lg'} ml={2}>
<Box color={'black'} fontSize={'md'} ml={2}>
{IfElseResultEnum.ELSE}
</Box>
<SourceHandle

1
projects/app/src/components/core/workflow/Flow/nodes/NodeSystemConfig.tsx
View File

@@ -129,7 +129,6 @@ function QuestionGuide({ chatConfig: { questionGuide = false }, setAppDetail }:
return (
<QGSwitch
isChecked={questionGuide}
size={'md'}
onChange={(e) => {
const value = e.target.checked;
setAppDetail((state) => ({

1
projects/app/src/components/core/workflow/Flow/nodes/NodeVariableUpdate.tsx
View File

@@ -224,7 +224,6 @@ const NodeVariableUpdate = ({ data, selected }: NodeProps<FlowNodeItemType>) =>
if (valueType === WorkflowIOValueTypeEnum.boolean) {
return (
<Switch
size="lg"
defaultChecked={updateItem.value?.[1] === 'true'}
onChange={(e) => handleUpdate(String(e.target.checked))}
/>

31
projects/app/src/components/core/workflow/Flow/nodes/render/FieldEditModal.tsx
View File

@@ -26,6 +26,7 @@ import { NodeInputKeyEnum, WorkflowIOValueTypeEnum } from '@fastgpt/global/core/
import dynamic from 'next/dynamic';
import MyNumberInput from '@fastgpt/web/components/common/Input/NumberInput/index';
import { useI18n } from '@/web/context/I18n';
import FormLabel from '@fastgpt/web/components/common/MyBox/FormLabel';
const JsonEditor = dynamic(() => import('@fastgpt/web/components/common/Textarea/JsonEditor'));
const EmptyTip = dynamic(() => import('@fastgpt/web/components/common/EmptyTip'));
@@ -304,7 +305,7 @@ const FieldEditModal = ({
<Stack flex={1} gap={5}>
{showInputTypeSelect && (
<Flex alignItems={'center'}>
<Box flex={'0 0 70px'}>{t('core.module.Input Type')}</Box>
<FormLabel flex={'0 0 70px'}>{t('core.module.Input Type')}</FormLabel>
<Box flex={1}>
<MySelect
list={inputTypeList}
@@ -320,7 +321,7 @@ const FieldEditModal = ({
)}
{showValueTypeSelect && !showInputTypeSelect && (
<Flex alignItems={'center'}>
<Box flex={'0 0 70px'}>{t('core.module.Data Type')}</Box>
<FormLabel flex={'0 0 70px'}>{t('core.module.Data Type')}</FormLabel>
<Box flex={1}>
<MySelect
w={'full'}
@@ -336,7 +337,7 @@ const FieldEditModal = ({
)}
{showKeyInput && (
<Flex alignItems={'center'}>
<Box flex={'0 0 70px'}>{t('core.module.Field Name')}</Box>
<FormLabel flex={'0 0 70px'}>{t('core.module.Field Name')}</FormLabel>
<Input
bg={'myGray.50'}
placeholder="appointment/sql"
@@ -348,9 +349,9 @@ const FieldEditModal = ({
)}
{showDescriptionInput && (
<Box alignItems={'flex-start'}>
<Box flex={'0 0 70px'} mb={'1px'}>
<FormLabel flex={'0 0 70px'} mb={'1px'}>
{t('core.module.Field Description')}
</Box>
</FormLabel>
<Textarea
bg={'myGray.50'}
placeholder={
@@ -366,18 +367,18 @@ const FieldEditModal = ({
{showInputTypeSelect && (
<Stack flex={1} gap={5}>
<Flex alignItems={'center'}>
<Box flex={'0 0 70px'}>{workflowT('Field required')}</Box>
<FormLabel flex={'0 0 70px'}>{workflowT('Field required')}</FormLabel>
<Switch {...register('required')} />
</Flex>
{showToolInput && (
<Flex alignItems={'center'}>
<Box flex={'0 0 70px'}>工具参数</Box>
<FormLabel flex={'0 0 70px'}>工具参数</FormLabel>
<Switch {...register('isToolInput')} />
</Flex>
)}
{showValueTypeSelect && (
<Flex alignItems={'center'}>
<Box flex={'0 0 70px'}>{t('core.module.Data Type')}</Box>
<FormLabel flex={'0 0 70px'}>{t('core.module.Data Type')}</FormLabel>
<Box flex={1}>
<MySelect
w={'full'}
@@ -393,7 +394,7 @@ const FieldEditModal = ({
)}
{showDefaultValue && (
<Flex alignItems={'center'}>
<Box flex={'0 0 70px'}>{t('core.module.Default Value')}</Box>
<FormLabel flex={'0 0 70px'}>{t('core.module.Default Value')}</FormLabel>
{inputType === FlowNodeInputTypeEnum.numberInput && (
<Input
bg={'myGray.50'}
@@ -430,7 +431,7 @@ const FieldEditModal = ({
)}
{showMaxLenInput && (
<Flex alignItems={'center'}>
<Box flex={'0 0 70px'}>{t('core.module.Max Length')}</Box>
<FormLabel flex={'0 0 70px'}>{t('core.module.Max Length')}</FormLabel>
<MyNumberInput
flex={'1 0 0'}
bg={'myGray.50'}
@@ -447,7 +448,7 @@ const FieldEditModal = ({
{showMinMaxInput && (
<>
<Flex alignItems={'center'}>
<Box flex={'0 0 70px'}>{t('core.module.Max Value')}</Box>
<FormLabel flex={'0 0 70px'}>{t('core.module.Max Value')}</FormLabel>
<MyNumberInput
flex={'1 0 0'}
bg={'myGray.50'}
@@ -459,7 +460,7 @@ const FieldEditModal = ({
/>
</Flex>
<Flex alignItems={'center'}>
<Box flex={'0 0 70px'}>{t('core.module.Min Value')}</Box>
<FormLabel flex={'0 0 70px'}>{t('core.module.Min Value')}</FormLabel>
<MyNumberInput
flex={'1 0 0'}
bg={'myGray.50'}
@@ -475,13 +476,13 @@ const FieldEditModal = ({
{showDynamicInput && (
<Stack gap={5}>
<Flex alignItems={'center'}>
<Box flex={'0 0 70px'}>{t('core.module.Input Type')}</Box>
<FormLabel flex={'0 0 70px'}>{t('core.module.Input Type')}</FormLabel>
<Box flex={1} fontWeight={'bold'}>
{t('core.workflow.inputType.Reference')}
</Box>
</Flex>
<Flex alignItems={'center'}>
<Box flex={'0 0 70px'}>{t('core.module.Data Type')}</Box>
<FormLabel flex={'0 0 70px'}>{t('core.module.Data Type')}</FormLabel>
<Box flex={1}>
<MySelect
list={dataTypeSelectList}
@@ -496,7 +497,7 @@ const FieldEditModal = ({
</Box>
</Flex>
<Flex alignItems={'center'}>
<Box flex={'0 0 70px'}>{t('core.workflow.inputType.Required')}</Box>
<FormLabel flex={'0 0 70px'}>{t('core.workflow.inputType.Required')}</FormLabel>
<Box flex={1}>
<Switch {...register('dynamicParamDefaultValue.required')} />
</Box>

2
projects/app/src/components/core/workflow/Flow/nodes/render/Handle/ToolHandle.tsx
View File

@@ -1,4 +1,4 @@
import MyTooltip from '@/components/MyTooltip';
import MyTooltip from '@fastgpt/web/components/common/MyTooltip';
import { Box, BoxProps } from '@chakra-ui/react';
import { NodeOutputKeyEnum } from '@fastgpt/global/core/workflow/constants';
import { useTranslation } from 'next-i18next';

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

@@ -23,7 +23,7 @@ import { WorkflowContext } from '../../../context';
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 MyTooltip from '@fastgpt/web/components/common/MyTooltip';
import { useSystemStore } from '@/web/common/system/useSystemStore';
type Props = FlowNodeItemType & {
@@ -140,7 +140,7 @@ const NodeCard = (props: Props) => {
{/* avatar and name */}
<Flex alignItems={'center'}>
<Avatar src={avatar} borderRadius={'0'} objectFit={'contain'} w={'30px'} h={'30px'} />
<Box ml={3} fontSize={'lg'} fontWeight={'medium'}>
<Box ml={3} fontSize={'md'} fontWeight={'medium'}>
{t(name)}
</Box>
{!menuForbid?.rename && (

19
projects/app/src/components/core/workflow/Flow/nodes/render/RenderInput/Label.tsx
View File

@@ -2,8 +2,7 @@ import { FlowNodeInputItemType } from '@fastgpt/global/core/workflow/type/io.d';
import React, { useCallback, useMemo, useState } from 'react';
import { useTranslation } from 'next-i18next';
import { Box, Flex } from '@chakra-ui/react';
import MyTooltip from '@/components/MyTooltip';
import { QuestionOutlineIcon } from '@chakra-ui/icons';
import MyTooltip from '@fastgpt/web/components/common/MyTooltip';
import NodeInputSelect from '@fastgpt/web/components/core/workflow/NodeInputSelect';
import MyIcon from '@fastgpt/web/components/common/Icon';
@@ -14,6 +13,7 @@ import { FlowNodeInputTypeEnum } from '@fastgpt/global/core/workflow/node/consta
import ValueTypeLabel from '../ValueTypeLabel';
import { useContextSelector } from 'use-context-selector';
import { WorkflowContext } from '@/components/core/workflow/context';
import QuestionTip from '@fastgpt/web/components/common/MyTooltip/QuestionTip';
const FieldEditModal = dynamic(() => import('../FieldEditModal'));
type Props = {
@@ -62,19 +62,20 @@ const InputLabel = ({ nodeId, input }: Props) => {
return (
<Flex className="nodrag" cursor={'default'} alignItems={'center'} position={'relative'}>
<Box position={'relative'} fontWeight={'medium'} color={'myGray.600'}>
<Flex
alignItems={'center'}
position={'relative'}
fontWeight={'medium'}
color={'myGray.600'}
>
{required && (
<Box position={'absolute'} left={-2} top={-1} color={'red.600'}>
*
</Box>
)}
{t(label)}
{description && (
<MyTooltip label={t(description)} forceShow>
<QuestionOutlineIcon display={['none', 'inline']} ml={1} />
</MyTooltip>
)}
</Box>
{description && <QuestionTip ml={1} label={t(description)}></QuestionTip>}
</Flex>
{/* value type */}
{renderType === FlowNodeInputTypeEnum.reference && <ValueTypeLabel valueType={valueType} />}
{/* edit config */}

2
projects/app/src/components/core/workflow/Flow/nodes/render/RenderInput/templates/SelectDataset.tsx
View File

@@ -85,7 +85,7 @@ const SelectDatasetRender = ({ inputs = [], item, nodeId }: RenderInputProps) =>
w={0}
className="textEllipsis"
fontWeight={'bold'}
fontSize={['md', 'lg', 'xl']}
fontSize={['md', 'lg']}
>
{item.name}
</Box>

26
projects/app/src/components/core/workflow/Flow/nodes/render/RenderInput/templates/SettingQuotePrompt.tsx
View File

@@ -6,12 +6,11 @@ import { useForm } from 'react-hook-form';
import { PromptTemplateItem } from '@fastgpt/global/core/ai/type';
import { useTranslation } from 'next-i18next';
import { ModalBody } from '@chakra-ui/react';
import MyTooltip from '@/components/MyTooltip';
import MyTooltip from '@fastgpt/web/components/common/MyTooltip';
import {
Prompt_QuotePromptList,
Prompt_QuoteTemplateList
} from '@fastgpt/global/core/ai/prompt/AIChat';
import { QuestionOutlineIcon } from '@chakra-ui/icons';
import PromptEditor from '@fastgpt/web/components/common/Textarea/PromptEditor';
import PromptTemplate from '@/components/PromptTemplate';
import { NodeInputKeyEnum, WorkflowIOValueTypeEnum } from '@fastgpt/global/core/workflow/constants';
@@ -23,6 +22,8 @@ import { WorkflowContext } from '@/components/core/workflow/context';
import { getWorkflowGlobalVariables } from '@/web/core/workflow/utils';
import { useCreation } from 'ahooks';
import { AppContext } from '@/web/core/app/context/appContext';
import QuestionTip from '@fastgpt/web/components/common/MyTooltip/QuestionTip';
import FormLabel from '@fastgpt/web/components/common/MyBox/FormLabel';
const LabelStyles: BoxProps = {
fontSize: ['sm', 'md']
@@ -178,18 +179,17 @@ const SettingQuotePrompt = (props: RenderInputProps) => {
<ModalBody>
<Box>
<Flex {...LabelStyles} mb={1}>
{t('core.app.Quote templates')}
<MyTooltip
<FormLabel>{t('core.app.Quote templates')}</FormLabel>
<QuestionTip
ml={1}
label={t('template.Quote Content Tip', {
default: Prompt_QuoteTemplateList[0].value
})}
forceShow
>
<QuestionOutlineIcon display={['none', 'inline']} ml={1} />
</MyTooltip>
></QuestionTip>
<Box flex={1} />
<Box
{...selectTemplateBtn}
fontSize={'sm'}
onClick={() =>
setSelectTemplateData({
title: t('core.app.Select quote template'),
@@ -216,15 +216,13 @@ const SettingQuotePrompt = (props: RenderInputProps) => {
</Box>
<Box mt={4}>
<Flex {...LabelStyles} mb={1}>
{t('core.app.Quote prompt')}
<MyTooltip
<FormLabel>{t('core.app.Quote prompt')}</FormLabel>
<QuestionTip
ml={1}
label={t('template.Quote Prompt Tip', {
default: Prompt_QuotePromptList[0].value
})}
forceShow
>
<QuestionOutlineIcon display={['none', 'inline']} ml={1} />
</MyTooltip>
></QuestionTip>
</Flex>
<PromptEditor
variables={quotePromptVariables}

8
projects/app/src/components/core/workflow/Flow/nodes/render/VariableTable.tsx
View File

@@ -51,15 +51,17 @@ const VariableTable = ({
borderRadius={'md'}
overflow={'hidden'}
borderWidth={'1px'}
borderBottom="none"
borderBottom={'none'}
>
<TableContainer>
<Table bg={'white'}>
<Thead>
<Tr>
<Th>{t('core.module.variable.variable name')}</Th>
<Th borderBottomLeftRadius={'none !important'}>
{t('core.module.variable.variable name')}
</Th>
<Th>{t('core.workflow.Value type')}</Th>
<Th></Th>
<Th borderBottomRightRadius={'none !important'}></Th>
</Tr>
</Thead>
<Tbody>

4
projects/app/src/components/core/workflow/components/PublishHistoriesSlider.tsx
View File

@@ -105,7 +105,7 @@ const PublishHistoriesSlider = () => {
<Button
mx={'20px'}
variant={'whitePrimary'}
mb={1}
mb={2}
isDisabled={!selectedHistoryId}
onClick={() => {
setSelectedHistoryId(undefined);
@@ -125,7 +125,7 @@ const PublishHistoriesSlider = () => {
<Flex
key={data.index}
alignItems={'center'}
py={4}
py={3}
px={3}
borderRadius={'md'}
cursor={'pointer'}