{
const { t } = useTranslation();
const router = useRouter();
- const { userInfo, initUserInfo } = useUserStore();
+ const { userInfo } = useUserStore();
const { setLoading } = useSystemStore();
const { data: myTeams = [] } = useRequest2(() => getTeamList(TeamMemberStatusEnum.active), {
@@ -33,12 +31,11 @@ const TeamSelector = ({
async (teamId: string) => {
setLoading(true);
await putSwitchTeam(teamId);
- return initUserInfo();
},
{
onFinally: () => {
+ router.reload();
setLoading(false);
- onChange?.();
},
errorToast: t('common:user.team.Switch Team Failed')
}
@@ -46,48 +43,21 @@ const TeamSelector = ({
const teamList = useMemo(() => {
return myTeams.map((team) => ({
- label: (
- onSwitchTeam(team.teamId)}
- _hover={{
- cursor: 'pointer'
- }}
- >
-
- {team.teamName}
-
-
- ),
+ icon: team.avatar,
+ iconSize: '1.25rem',
+ label: team.teamName,
value: team.teamId
}));
- }, [myTeams, onSwitchTeam]);
+ }, [myTeams]);
const formatTeamList = useMemo(() => {
return [
...(showManage
? [
{
- label: (
- router.push('/account/team')}
- >
-
- {t('user:manage_team')}
-
-
- ),
+ icon: 'common/setting',
+ iconSize: '1.25rem',
+ label: t('user:manage_team'),
value: 'manage',
showBorder: true
}
@@ -95,11 +65,24 @@ const TeamSelector = ({
: []),
...teamList
];
- }, [showManage, t, teamList, router]);
+ }, [showManage, t, teamList]);
+
+ const handleChange = (value: string) => {
+ if (value === 'manage') {
+ router.push('/account/team');
+ } else {
+ onSwitchTeam(value);
+ }
+ };
return (
-
);
};
diff --git a/projects/app/src/pageComponents/account/bill/BillTable.tsx b/projects/app/src/pageComponents/account/bill/BillTable.tsx
index 5e993c1a3..42aba9d51 100644
--- a/projects/app/src/pageComponents/account/bill/BillTable.tsx
+++ b/projects/app/src/pageComponents/account/bill/BillTable.tsx
@@ -111,7 +111,7 @@ const BillTable = () => {
list={billTypeList}
value={billType}
size={'sm'}
- onchange={(e) => {
+ onChange={(e) => {
setBillType(e);
}}
w={'130px'}
@@ -220,13 +220,7 @@ function BillDetailModal({ bill, onClose }: { bill: BillSchemaType; onClose: ()
{bill.metadata.payWay === 'balance' ? (
t('user:bill.not_need_invoice')
) : (
-
- {
- (bill.metadata.payWay = bill.hasInvoice
- ? t('account_bill:yes')
- : t('account_bill:no'))
- }
-
+ {bill.hasInvoice ? t('account_bill:yes') : t('account_bill:no')}
)}
)}
diff --git a/projects/app/src/pageComponents/account/model/AddModelBox.tsx b/projects/app/src/pageComponents/account/model/AddModelBox.tsx
index 3ed5f0825..a94d8b881 100644
--- a/projects/app/src/pageComponents/account/model/AddModelBox.tsx
+++ b/projects/app/src/pageComponents/account/model/AddModelBox.tsx
@@ -213,7 +213,7 @@ export const ModelEditModal = ({
setValue('provider', value)}
+ onChange={(value) => setValue('provider', value)}
list={providerList.current}
{...InputStyles}
/>
diff --git a/projects/app/src/pageComponents/account/model/Channel/EditChannelModal.tsx b/projects/app/src/pageComponents/account/model/Channel/EditChannelModal.tsx
index 97943fd96..3771ca093 100644
--- a/projects/app/src/pageComponents/account/model/Channel/EditChannelModal.tsx
+++ b/projects/app/src/pageComponents/account/model/Channel/EditChannelModal.tsx
@@ -79,7 +79,7 @@ const EditChannelModal = ({
order: provider.order,
defaultBaseUrl: value.defaultBaseUrl,
keyHelp: value.keyHelp,
- icon: provider.avatar,
+ icon: mapData?.avatar ?? provider.avatar,
label: t(mapData.label as any),
value: Number(key)
};
@@ -90,6 +90,7 @@ const EditChannelModal = ({
manual: false
}
);
+
const selectedProvider = useMemo(() => {
const res = providerList.find((item) => item.value === providerType);
return res;
@@ -193,7 +194,7 @@ const EditChannelModal = ({
placeholder={t('account_model:select_provider_placeholder')}
value={providerType}
isSearch
- onchange={(val) => {
+ onChange={(val) => {
setValue('type', val);
}}
/>
@@ -332,6 +333,8 @@ const MultipleSelect = ({ value = [], list = [], onSelect }: SelectProps) => {
const { isOpen, onOpen, onClose } = useDisclosure();
const { copyData } = useCopyData();
+ const [search, setSearch] = useState('');
+
const onclickItem = useCallback(
(val: string) => {
if (value.includes(val)) {
@@ -342,12 +345,11 @@ const MultipleSelect = ({ value = [], list = [], onSelect }: SelectProps) => {
top: BoxRef.current.scrollHeight
});
}
+ setSearch('');
},
[value, onSelect]
);
- const [search, setSearch] = useState('');
-
const filterUnSelected = useMemo(() => {
return list
.filter((item) => !value.includes(item.value))
diff --git a/projects/app/src/pageComponents/account/model/Channel/ModelTest.tsx b/projects/app/src/pageComponents/account/model/Channel/ModelTest.tsx
index 54895df06..15e5cb30a 100644
--- a/projects/app/src/pageComponents/account/model/Channel/ModelTest.tsx
+++ b/projects/app/src/pageComponents/account/model/Channel/ModelTest.tsx
@@ -25,6 +25,7 @@ import QuestionTip from '@fastgpt/web/components/common/MyTooltip/QuestionTip';
import { getErrText } from '@fastgpt/global/common/error/utils';
import { batchRun } from '@fastgpt/global/common/system/utils';
import { useToast } from '@fastgpt/web/hooks/useToast';
+import MyIconButton from '@fastgpt/web/components/common/Icon/button';
type ModelTestItem = {
label: React.ReactNode;
@@ -34,7 +35,15 @@ type ModelTestItem = {
duration?: number;
};
-const ModelTest = ({ models, onClose }: { models: string[]; onClose: () => void }) => {
+const ModelTest = ({
+ channelId,
+ models,
+ onClose
+}: {
+ channelId: number;
+ models: string[];
+ onClose: () => void;
+}) => {
const { t } = useTranslation();
const { toast } = useToast();
const [testModelList, setTestModelList] = useState([]);
@@ -57,6 +66,7 @@ const ModelTest = ({ models, onClose }: { models: string[]; onClose: () => void
colorSchema: 'red'
}
});
+
const { loading: loadingModels } = useRequest2(getSystemModelList, {
manual: false,
refreshDeps: [models],
@@ -95,7 +105,7 @@ const ModelTest = ({ models, onClose }: { models: string[]; onClose: () => void
);
const start = Date.now();
try {
- await getTestModel(model);
+ await getTestModel({ model, channelId });
const duration = Date.now() - start;
setTestModelList((prev) =>
prev.map((item) =>
@@ -134,13 +144,47 @@ const ModelTest = ({ models, onClose }: { models: string[]; onClose: () => void
refreshDeps: [testModelList]
}
);
+ const { runAsync: onTestOneModel, loading: testingOneModel } = useRequest2(
+ async (model: string) => {
+ const start = Date.now();
+
+ setTestModelList((prev) =>
+ prev.map((item) =>
+ item.model === model ? { ...item, status: 'running', message: '' } : item
+ )
+ );
+
+ try {
+ await getTestModel({ model, channelId });
+ const duration = Date.now() - start;
+
+ setTestModelList((prev) =>
+ prev.map((item) =>
+ item.model === model ? { ...item, status: 'success', duration: duration / 1000 } : item
+ )
+ );
+ } catch (error) {
+ setTestModelList((prev) =>
+ prev.map((item) =>
+ item.model === model ? { ...item, status: 'error', message: getErrText(error) } : item
+ )
+ );
+ }
+ },
+ {
+ manual: true
+ }
+ );
+
+ const isTestLoading = testingOneModel || isTesting;
return (
@@ -148,8 +192,10 @@ const ModelTest = ({ models, onClose }: { models: string[]; onClose: () => void
- {t('account_model:model')}
+ {t('account_model:model_name')}
+ {t('account:model.model_id')}
{t('account_model:channel_status')}
+
@@ -158,6 +204,7 @@ const ModelTest = ({ models, onClose }: { models: string[]; onClose: () => void
return (
{item.label}
+ {item.model}
@@ -173,6 +220,16 @@ const ModelTest = ({ models, onClose }: { models: string[]; onClose: () => void
)}
+
+ {
+ onTestOneModel(item.model);
+ }}
+ />
+
);
})}
@@ -184,7 +241,7 @@ const ModelTest = ({ models, onClose }: { models: string[]; onClose: () => void
{t('common:common.Cancel')}
-
+
{t('account_model:start_test', { num: testModelList.length })}
diff --git a/projects/app/src/pageComponents/account/model/Channel/index.tsx b/projects/app/src/pageComponents/account/model/Channel/index.tsx
index 795cfd521..accd1ba32 100644
--- a/projects/app/src/pageComponents/account/model/Channel/index.tsx
+++ b/projects/app/src/pageComponents/account/model/Channel/index.tsx
@@ -74,7 +74,7 @@ const ChannelTable = ({ Tab }: { Tab: React.ReactNode }) => {
}
});
- const [testModels, setTestModels] = useState();
+ const [modelTestData, setTestModelData] = useState<{ channelId: number; models: string[] }>();
const isLoading =
loadingChannelList ||
@@ -165,7 +165,11 @@ const ChannelTable = ({ Tab }: { Tab: React.ReactNode }) => {
{
icon: 'core/chat/sendLight',
label: t('account_model:model_test'),
- onClick: () => setTestModels(item.models)
+ onClick: () =>
+ setTestModelData({
+ channelId: item.id,
+ models: item.models
+ })
},
...(item.status === ChannelStatusEnum.ChannelStatusEnabled
? [
@@ -222,7 +226,9 @@ const ChannelTable = ({ Tab }: { Tab: React.ReactNode }) => {
onSuccess={refreshChannelList}
/>
)}
- {!!testModels && setTestModels(undefined)} />}
+ {!!modelTestData && (
+ setTestModelData(undefined)} />
+ )}
);
};
diff --git a/projects/app/src/pageComponents/account/model/Log/index.tsx b/projects/app/src/pageComponents/account/model/Log/index.tsx
index e2320b0ea..afe811895 100644
--- a/projects/app/src/pageComponents/account/model/Log/index.tsx
+++ b/projects/app/src/pageComponents/account/model/Log/index.tsx
@@ -206,7 +206,7 @@ const ChannelLog = ({ Tab }: { Tab: React.ReactNode }) => {
list={channelList}
placeholder={t('account_model:select_channel')}
value={filterProps.channelId}
- onchange={(val) => setFilterProps({ ...filterProps, channelId: val })}
+ onChange={(val) => setFilterProps({ ...filterProps, channelId: val })}
/>
@@ -219,7 +219,7 @@ const ChannelLog = ({ Tab }: { Tab: React.ReactNode }) => {
list={modelList}
placeholder={t('account_model:select_model')}
value={filterProps.model}
- onchange={(val) => setFilterProps({ ...filterProps, model: val })}
+ onChange={(val) => setFilterProps({ ...filterProps, model: val })}
/>
@@ -234,7 +234,7 @@ const ChannelLog = ({ Tab }: { Tab: React.ReactNode }) => {
{ label: t('common:common.failed'), value: 'error' }
]}
value={filterProps.code_type}
- onchange={(val) => setFilterProps({ ...filterProps, code_type: val })}
+ onChange={(val) => setFilterProps({ ...filterProps, code_type: val })}
/>
@@ -298,11 +298,15 @@ const LogDetail = ({ data, onClose }: { data: LogDetailType; onClose: () => void
const { data: detailData } = useRequest2(
async () => {
if (data.code === 200) return data;
- const res = await getLogDetail(data.id);
- return {
- ...res,
- ...data
- };
+ try {
+ const res = await getLogDetail(data.id);
+ return {
+ ...res,
+ ...data
+ };
+ } catch (error) {
+ return data;
+ }
},
{
manual: false
diff --git a/projects/app/src/pageComponents/account/model/ModelConfigTable.tsx b/projects/app/src/pageComponents/account/model/ModelConfigTable.tsx
index 7bf61393e..0b6d368be 100644
--- a/projects/app/src/pageComponents/account/model/ModelConfigTable.tsx
+++ b/projects/app/src/pageComponents/account/model/ModelConfigTable.tsx
@@ -280,6 +280,10 @@ const ModelTable = ({ Tab }: { Tab: React.ReactNode }) => {
isCustom: true,
isActive: true,
+
+ isDefault: false,
+ isDefaultDatasetTextModel: false,
+ isDefaultDatasetImageModel: false,
// @ts-ignore
type
});
@@ -326,7 +330,7 @@ const ModelTable = ({ Tab }: { Tab: React.ReactNode }) => {
w={'200px'}
bg={'myGray.50'}
value={provider}
- onchange={setProvider}
+ onChange={setProvider}
list={filterProviderList}
/>
@@ -338,7 +342,7 @@ const ModelTable = ({ Tab }: { Tab: React.ReactNode }) => {
w={'150px'}
bg={'myGray.50'}
value={modelType}
- onchange={setModelType}
+ onChange={setModelType}
list={selectModelTypeList.current}
/>
@@ -436,7 +440,7 @@ const ModelTable = ({ Tab }: { Tab: React.ReactNode }) => {
onTestModel(item.model)}
+ onClick={() => onTestModel({ model: item.model })}
/>
{
+ onChange={(e) => {
setDefaultData((state) => ({
...state,
llm: llmModelList.find((item) => item.model === e)
@@ -616,7 +620,7 @@ const DefaultModelModal = ({
value: item.model,
label: item.name
}))}
- onchange={(e) => {
+ onChange={(e) => {
setDefaultData((state) => ({
...state,
embedding: embeddingModelList.find((item) => item.model === e)
@@ -635,7 +639,7 @@ const DefaultModelModal = ({
value: item.model,
label: item.name
}))}
- onchange={(e) => {
+ onChange={(e) => {
setDefaultData((state) => ({
...state,
tts: ttsModelList.find((item) => item.model === e)
@@ -654,7 +658,7 @@ const DefaultModelModal = ({
value: item.model,
label: item.name
}))}
- onchange={(e) => {
+ onChange={(e) => {
setDefaultData((state) => ({
...state,
stt: sttModelList.find((item) => item.model === e)
@@ -673,7 +677,7 @@ const DefaultModelModal = ({
value: item.model,
label: item.name
}))}
- onchange={(e) => {
+ onChange={(e) => {
setDefaultData((state) => ({
...state,
rerank: reRankModelList.find((item) => item.model === e)
@@ -696,7 +700,7 @@ const DefaultModelModal = ({
value: item.model,
label: item.name
}))}
- onchange={(e) => {
+ onChange={(e) => {
setDefaultData((state) => ({
...state,
datasetTextLLM: datasetModelList.find((item) => item.model === e)
@@ -718,7 +722,7 @@ const DefaultModelModal = ({
value: item.model,
label: item.name
}))}
- onchange={(e) => {
+ onChange={(e) => {
setDefaultData((state) => ({
...state,
datasetImageLLM: vlmModelList.find((item) => item.model === e)
diff --git a/projects/app/src/pageComponents/account/team/EditInfoModal.tsx b/projects/app/src/pageComponents/account/team/EditInfoModal.tsx
index e5c5bd4c5..c42ceaa90 100644
--- a/projects/app/src/pageComponents/account/team/EditInfoModal.tsx
+++ b/projects/app/src/pageComponents/account/team/EditInfoModal.tsx
@@ -142,7 +142,7 @@ function EditModal({
width={'fit-content'}
>
{t('account_info:please_bind_contact')}
+ {t('account_team:please_bind_contact')}
);
})()}
diff --git a/projects/app/src/pageComponents/account/team/GroupManage/index.tsx b/projects/app/src/pageComponents/account/team/GroupManage/index.tsx
index bd568d815..dc9ae458c 100644
--- a/projects/app/src/pageComponents/account/team/GroupManage/index.tsx
+++ b/projects/app/src/pageComponents/account/team/GroupManage/index.tsx
@@ -172,7 +172,7 @@ function MemberTable({ Tabs }: { Tabs: React.ReactNode }) {
{group.name === DefaultGroupName ? (
- v.avatar)} groupId={group._id} />
+ v.avatar)} />
) : hasGroupManagePer(group) ? (
onManageMember(group)}>
@@ -180,7 +180,6 @@ function MemberTable({ Tabs }: { Tabs: React.ReactNode }) {
avatars={group.members.map(
(v) => members.find((m) => m.tmbId === v.tmbId)?.avatar ?? ''
)}
- groupId={group._id}
/>
@@ -189,7 +188,6 @@ function MemberTable({ Tabs }: { Tabs: React.ReactNode }) {
avatars={group.members.map(
(v) => members.find((m) => m.tmbId === v.tmbId)?.avatar ?? ''
)}
- groupId={group._id}
/>
)}
diff --git a/projects/app/src/pageComponents/account/team/Invite/CreateInvitationModal.tsx b/projects/app/src/pageComponents/account/team/Invite/CreateInvitationModal.tsx
new file mode 100644
index 000000000..8f1d43a3c
--- /dev/null
+++ b/projects/app/src/pageComponents/account/team/Invite/CreateInvitationModal.tsx
@@ -0,0 +1,105 @@
+import { postCreateInvitationLink } from '@/web/support/user/team/api';
+import {
+ Box,
+ Button,
+ Grid,
+ Radio,
+ RadioGroup,
+ Input,
+ ModalBody,
+ ModalCloseButton,
+ ModalFooter,
+ HStack
+} from '@chakra-ui/react';
+import {
+ InvitationLinkCreateType,
+ InvitationLinkExpiresType
+} from '@fastgpt/service/support/user/team/invitationLink/type';
+import FormLabel from '@fastgpt/web/components/common/MyBox/FormLabel';
+import MyModal from '@fastgpt/web/components/common/MyModal';
+import MySelect from '@fastgpt/web/components/common/MySelect';
+import { useRequest2 } from '@fastgpt/web/hooks/useRequest';
+import { useTranslation } from 'next-i18next';
+import { useForm } from 'react-hook-form';
+
+function CreateInvitationModal({ onClose }: { onClose: () => void }) {
+ const { t } = useTranslation();
+ const expiresOptions: Array<{ label: string; value: InvitationLinkExpiresType }> = [
+ { label: t('account_team:30mins'), value: '30m' }, // 30 mins
+ { label: t('account_team:7days'), value: '7d' }, // 7 days
+ { label: t('account_team:1year'), value: '1y' } // 1 year
+ ];
+
+ const { register, handleSubmit, watch, setValue } = useForm({
+ defaultValues: {
+ description: '',
+ expires: expiresOptions[1].value,
+ usedTimesLimit: 1
+ }
+ });
+
+ const expires = watch('expires');
+ const usedTimesLimit = watch('usedTimesLimit');
+
+ const { runAsync: createInvitationLink, loading } = useRequest2(postCreateInvitationLink, {
+ manual: true,
+ successToast: t('common:common.Create Success'),
+ errorToast: t('common:common.Create Failed'),
+ onFinally: () => onClose()
+ });
+
+ return (
+ {t('account_team:create_invitation_link')}}
+ >
+
+
+ <>
+ {t('account_team:invitation_link_description')}
+ {t('account_team:expires')}
+ setValue('expires', val)}
+ minW="120px"
+ />
+
+
+ <>
+ {t('account_team:used_times_limit')}
+ setValue('usedTimesLimit', Number(val) as 1 | -1)}
+ value={String(usedTimesLimit)}
+ >
+
+ {t('account_team:1person')}
+ {t('account_team:unlimited')}
+
+
+
+
+
+
+
+ {t('common:common.Cancel')}
+
+
+ {t('common:common.Confirm')}
+
+
+
+ );
+}
+
+export default CreateInvitationModal;
diff --git a/projects/app/src/pageComponents/account/team/Invite/HandleInviteModal.tsx b/projects/app/src/pageComponents/account/team/Invite/HandleInviteModal.tsx
new file mode 100644
index 000000000..608e7b031
--- /dev/null
+++ b/projects/app/src/pageComponents/account/team/Invite/HandleInviteModal.tsx
@@ -0,0 +1,77 @@
+import { getInvitationInfo, postAcceptInvitationLink } from '@/web/support/user/team/api';
+import { Box, Button, Flex, ModalBody, ModalCloseButton } from '@chakra-ui/react';
+import Avatar from '@fastgpt/web/components/common/Avatar';
+import MyModal from '@fastgpt/web/components/common/MyModal';
+import { useRequest2 } from '@fastgpt/web/hooks/useRequest';
+import { useTranslation } from 'next-i18next';
+import { useRouter } from 'next/router';
+import { useContextSelector } from 'use-context-selector';
+import { TeamContext } from '../context';
+
+function Invite({ invitelinkid }: { invitelinkid: string }) {
+ const router = useRouter();
+ const { t } = useTranslation();
+
+ const { onSwitchTeam } = useContextSelector(TeamContext, (v) => v);
+
+ const onClose = () => {
+ router.push('/account/team');
+ };
+
+ const { data: invitationInfo } = useRequest2(() => getInvitationInfo(invitelinkid), {
+ manual: false,
+ onError: onClose
+ });
+
+ const { runAsync: acceptInvitation, loading: accepting } = useRequest2(
+ () => postAcceptInvitationLink(invitelinkid),
+ {
+ manual: true,
+ successToast: t('common:common.Success'),
+ onSuccess: async () => {
+ onSwitchTeam(invitationInfo!.teamId);
+ onClose();
+ }
+ }
+ );
+
+ return invitationInfo ? (
+
+
+
+ {invitationInfo.teamName}
+
+ {t('account_team:accept')}
+
+
+ {t('account_team:ignore')}
+
+
+
+
+ ) : null;
+}
+
+export default Invite;
diff --git a/projects/app/src/pageComponents/account/team/Invite/InviteModal.tsx b/projects/app/src/pageComponents/account/team/Invite/InviteModal.tsx
new file mode 100644
index 000000000..744941e37
--- /dev/null
+++ b/projects/app/src/pageComponents/account/team/Invite/InviteModal.tsx
@@ -0,0 +1,278 @@
+import MemberTag from '@/components/support/user/team/Info/MemberTag';
+import { useSystemStore } from '@/web/common/system/useSystemStore';
+import { getInvitationLinkList, putUpdateInvitationInfo } from '@/web/support/user/team/api';
+import { useUserStore } from '@/web/support/user/useUserStore';
+import {
+ Box,
+ Button,
+ Divider,
+ Flex,
+ Grid,
+ HStack,
+ ModalBody,
+ ModalFooter,
+ Table,
+ TableContainer,
+ Tbody,
+ Td,
+ Th,
+ Thead,
+ Tr,
+ useDisclosure
+} from '@chakra-ui/react';
+import AvatarGroup from '@fastgpt/web/components/common/Avatar/AvatarGroup';
+import EmptyTip from '@fastgpt/web/components/common/EmptyTip';
+import Icon from '@fastgpt/web/components/common/Icon';
+import MyModal from '@fastgpt/web/components/common/MyModal';
+import MyPopover from '@fastgpt/web/components/common/MyPopover';
+import Tag from '@fastgpt/web/components/common/Tag';
+import { useCopyData } from '@fastgpt/web/hooks/useCopyData';
+import { useRequest2 } from '@fastgpt/web/hooks/useRequest';
+import format from 'date-fns/format';
+import { useTranslation } from 'next-i18next';
+import dynamic from 'next/dynamic';
+import { useCallback } from 'react';
+
+const CreateInvitationModal = dynamic(() => import('./CreateInvitationModal'));
+
+const InviteModal = ({
+ teamId,
+ onClose,
+ onSuccess
+}: {
+ teamId: string;
+ onClose: () => void;
+ onSuccess: () => void;
+}) => {
+ const { t } = useTranslation();
+
+ const {
+ data: invitationLinkList,
+ loading: isLoadingLink,
+ runAsync: refetchInvitationLinkList
+ } = useRequest2(() => getInvitationLinkList(), {
+ manual: false
+ });
+
+ const { isOpen: isOpenCreate, onOpen: onOpenCreate, onClose: onCloseCreate } = useDisclosure();
+
+ const isLoading = isLoadingLink;
+ const { copyData } = useCopyData();
+ const { userInfo } = useUserStore();
+ const { feConfigs } = useSystemStore();
+
+ const onCopy = useCallback(
+ (linkId: string) => {
+ const url = location.origin + `/account/team?invitelinkid=${linkId}`;
+ const teamName = userInfo?.team.teamName;
+ const systemName = feConfigs.systemTitle;
+ const userName = userInfo?.team.memberName;
+ copyData(
+ t('account_team:invitation_copy_link', {
+ teamName,
+ systemName,
+ userName,
+ url
+ })
+ );
+ },
+ [copyData]
+ );
+
+ const { runAsync: onForbid, loading: forbiding } = useRequest2(
+ (linkId: string) =>
+ putUpdateInvitationInfo({
+ linkId,
+ forbidden: true
+ }),
+ {
+ manual: true,
+ onSuccess: refetchInvitationLinkList,
+ successToast: t('account_team:forbid_success')
+ }
+ );
+
+ return (
+
+
+
+
+
+ {t('account_team:invitation_link_list')}
+
+
+ {t('account_team:create_invitation_link')}
+
+
+
+
+
+
+ {t('account_team:invitation_link_description')}
+
+ {t('account_team:expires')}
+ {t('account_team:used_times_limit')}
+ {t('account_team:invited')}
+
+ {t('common:common.Action')}
+
+
+
+ {!!invitationLinkList?.length && (
+
+ {invitationLinkList?.map((item) => {
+ const isForbidden = item.forbidden || new Date(item.expires) < new Date();
+ return (
+
+
+ {item.description}
+
+
+ {isForbidden ? (
+ {t('account_team:has_forbidden')}
+ ) : (
+ format(new Date(item.expires), 'yyyy-MM-dd HH:mm')
+ )}
+
+
+ {item.usedTimesLimit === -1
+ ? t('account_team:unlimited')
+ : item.usedTimesLimit}
+
+
+ {item.members.length > 0 && (
+
+ i.avatar)} />
+
+ }
+ trigger="click"
+ closeOnBlur={true}
+ >
+ {() => (
+
+
+ {t('account_team:has_invited')}
+
+ {item.members.length}
+
+
+
+ {item.members.map((member) => (
+
+
+ ))}
+
+
+ )}
+
+ )}
+
+
+ {!isForbidden && (
+ <>
+ onCopy(item._id)}
+ color="myGray.900"
+ >
+
+
+
+
+ {t('account_team:forbid_hint')}
+
+
+
+ {t('common:common.Cancel')}
+
+ {
+ onForbid(item._id);
+ onClosePopover();
+ }}
+ >
+ {t('account_team:confirm_forbidden')}
+
+
+
+ )}
+
+
+ )}
+
+
+ );
+ })}
+
+ )}
+
+ {!invitationLinkList?.length &&
+
+
+
+ {t('account_team:invitation_link_auto_clean_hint')}
+
+
+ {isOpenCreate && (
+ Promise.all([onCloseCreate(), refetchInvitationLinkList()])}
+ />
+ )}
+
+ );
+};
+
+export default InviteModal;
diff --git a/projects/app/src/pageComponents/account/team/InviteModal.tsx b/projects/app/src/pageComponents/account/team/InviteModal.tsx
deleted file mode 100644
index 916ebae21..000000000
--- a/projects/app/src/pageComponents/account/team/InviteModal.tsx
+++ /dev/null
@@ -1,90 +0,0 @@
-import React, { useState } from 'react';
-import MyModal from '@fastgpt/web/components/common/MyModal';
-import { useTranslation } from 'next-i18next';
-import { ModalCloseButton, ModalBody, Box, ModalFooter, Button } from '@chakra-ui/react';
-import TagTextarea from '@/components/common/Textarea/TagTextarea';
-import { useRequest2 } from '@fastgpt/web/hooks/useRequest';
-import { postInviteTeamMember } from '@/web/support/user/team/api';
-import { useConfirm } from '@fastgpt/web/hooks/useConfirm';
-import type { InviteMemberResponse } from '@fastgpt/global/support/user/team/controller.d';
-
-const InviteModal = ({
- teamId,
- onClose,
- onSuccess
-}: {
- teamId: string;
- onClose: () => void;
- onSuccess: () => void;
-}) => {
- const { t } = useTranslation();
- const { ConfirmModal, openConfirm } = useConfirm({
- title: t('user:team.Invite Member Result Tip'),
- showCancel: false
- });
-
- const [inviteUsernames, setInviteUsernames] = useState([]);
-
- const { runAsync: onInvite, loading: isLoading } = useRequest2(
- () =>
- postInviteTeamMember({
- teamId,
- usernames: inviteUsernames
- }),
- {
- onSuccess(res: InviteMemberResponse) {
- onSuccess();
- openConfirm(
- () => onClose(),
- undefined,
-
- {t('user:team.Invite Member Success Tip', {
- success: res.invite.length,
- inValid: res.inValid.map((item) => item.username).join(', '),
- inTeam: res.inTeam.map((item) => item.username).join(', ')
- })}
-
- )();
- },
- errorToast: t('user:team.Invite Member Failed Tip')
- }
- );
-
- return (
-
- {t('common:user.team.Invite Member')}
-
- {t('common:user.team.Invite Member Tips')}
-
-
- }
- maxW={['90vw', '400px']}
- overflow={'unset'}
- >
-
- {t('common:user.Account')}
-
-
-
- {t('user:team.Confirm Invite')}
-
-
-
- );
-};
-
-export default InviteModal;
diff --git a/projects/app/src/pageComponents/account/team/MemberTable.tsx b/projects/app/src/pageComponents/account/team/MemberTable.tsx
index fe9968da8..bba44c550 100644
--- a/projects/app/src/pageComponents/account/team/MemberTable.tsx
+++ b/projects/app/src/pageComponents/account/team/MemberTable.tsx
@@ -17,7 +17,7 @@ import {
import { useTranslation } from 'next-i18next';
import { useUserStore } from '@/web/support/user/useUserStore';
import { useConfirm } from '@fastgpt/web/hooks/useConfirm';
-import { delRemoveMember, updateStatus } from '@/web/support/user/team/api';
+import { delRemoveMember, postRestoreMember } from '@/web/support/user/team/api';
import Tag from '@fastgpt/web/components/common/Tag';
import Icon from '@fastgpt/web/components/common/Icon';
import { useContextSelector } from 'use-context-selector';
@@ -41,7 +41,7 @@ import SearchInput from '@fastgpt/web/components/common/Input/SearchInput';
import { useState } from 'react';
import { downloadFetch } from '@/web/common/system/utils';
-const InviteModal = dynamic(() => import('./InviteModal'));
+const InviteModal = dynamic(() => import('./Invite/InviteModal'));
const TeamTagModal = dynamic(() => import('@/components/support/user/team/TeamTagModal'));
function MemberTable({ Tabs }: { Tabs: React.ReactNode }) {
@@ -118,7 +118,7 @@ function MemberTable({ Tabs }: { Tabs: React.ReactNode }) {
errorToast: t('account_team:sync_member_failed')
});
- const { runAsync: onRestore, loading: isUpdateInvite } = useRequest2(updateStatus, {
+ const { runAsync: onRestore, loading: isUpdateInvite } = useRequest2(postRestoreMember, {
onSuccess() {
refetchMembers();
},
@@ -175,22 +175,7 @@ function MemberTable({ Tabs }: { Tabs: React.ReactNode }) {
borderRadius={'md'}
ml={3}
leftIcon={
@@ -236,7 +221,7 @@ function MemberTable({ Tabs }: { Tabs: React.ReactNode }) {
{t('account_team:user_name')}
- {t('account_team:contact')}
+ {t('common:contact_way')}
{t('account_team:org')}
{t('account_team:join_update_time')}
@@ -253,12 +238,7 @@ function MemberTable({ Tabs }: { Tabs: React.ReactNode }) {
{member.memberName}
- {member.status === 'waiting' && (
-
- {t('account_team:waiting')}
-
- )}
- {member.status === 'leave' && (
+ {member.status !== 'active' && (
{t('account_team:leave')}
@@ -295,7 +275,7 @@ function MemberTable({ Tabs }: { Tabs: React.ReactNode }) {
{userInfo?.team.permission.hasManagePer &&
member.role !== TeamMemberRoleEnum.owner &&
member.tmbId !== userInfo?.team.tmbId &&
- (member.status !== TeamMemberStatusEnum.leave ? (
+ (member.status === TeamMemberStatusEnum.active ? (
{
- openRestoreMember(
- () =>
- onRestore({
- tmbId: member.tmbId,
- status: TeamMemberStatusEnum.active
- }),
- undefined,
- t('account_team:restore_tip', {
- username: member.memberName
- })
- )();
- }}
- />
+ member.status === TeamMemberStatusEnum.forbidden && (
+ {
+ openRestoreMember(
+ () => onRestore(member.tmbId),
+ undefined,
+ t('account_team:restore_tip', {
+ username: member.memberName
+ })
+ )();
+ }}
+ />
+ )
))}
diff --git a/projects/app/src/pageComponents/account/team/context.tsx b/projects/app/src/pageComponents/account/team/context.tsx
index 99ab3e2c3..d2e264a5f 100644
--- a/projects/app/src/pageComponents/account/team/context.tsx
+++ b/projects/app/src/pageComponents/account/team/context.tsx
@@ -101,6 +101,7 @@ export const TeamModalContextProvider = ({ children }: { children: ReactNode })
const { runAsync: onSwitchTeam, loading: isSwitchingTeam } = useRequest2(
async (teamId: string) => {
await putSwitchTeam(teamId);
+ refetchMembers();
return initUserInfo();
},
{
diff --git a/projects/app/src/pageComponents/app/detail/Logs/DetailLogsModal.tsx b/projects/app/src/pageComponents/app/detail/Logs/DetailLogsModal.tsx
index 4a20b9d87..a8518ea1f 100644
--- a/projects/app/src/pageComponents/app/detail/Logs/DetailLogsModal.tsx
+++ b/projects/app/src/pageComponents/app/detail/Logs/DetailLogsModal.tsx
@@ -19,6 +19,7 @@ import ChatRecordContextProvider, {
} from '@/web/core/chat/context/chatRecordContext';
import { useRequest2 } from '@fastgpt/web/hooks/useRequest';
import { useContextSelector } from 'use-context-selector';
+import ChatQuoteList from '@/pageComponents/chat/ChatQuoteList';
const PluginRunBox = dynamic(() => import('@/components/core/chat/ChatContainer/PluginRunBox'));
const ChatBox = dynamic(() => import('@/components/core/chat/ChatContainer/ChatBox'));
@@ -37,6 +38,8 @@ const DetailLogsModal = ({ appId, chatId, onClose }: Props) => {
const setChatBoxData = useContextSelector(ChatItemContext, (v) => v.setChatBoxData);
const pluginRunTab = useContextSelector(ChatItemContext, (v) => v.pluginRunTab);
const setPluginRunTab = useContextSelector(ChatItemContext, (v) => v.setPluginRunTab);
+ const quoteData = useContextSelector(ChatItemContext, (v) => v.quoteData);
+ const setQuoteData = useContextSelector(ChatItemContext, (v) => v.setQuoteData);
const chatRecords = useContextSelector(ChatRecordContext, (v) => v.chatRecords);
const totalRecordsCount = useContextSelector(ChatRecordContext, (v) => v.totalRecordsCount);
@@ -79,7 +82,7 @@ const DetailLogsModal = ({ appId, chatId, onClose }: Props) => {
right={0}
h={['100%', '96%']}
w={'100%'}
- maxW={['100%', '600px']}
+ maxW={quoteData ? ['100%', '1080px'] : ['100%', '600px']}
bg={'white'}
boxShadow={'3px 0 20px rgba(0,0,0,0.2)'}
borderRadius={'md'}
@@ -148,26 +151,48 @@ const DetailLogsModal = ({ appId, chatId, onClose }: Props) => {
)}
{/* Chat container */}
-
- {isPlugin ? (
-
+
+
+ {isPlugin ? (
+ ) : (
+
+
+ {quoteData && (
+
+ setQuoteData(undefined)}
+ />
- ) : (
-
+
+
diff --git a/projects/app/src/pageComponents/app/detail/Publish/API/index.tsx b/projects/app/src/pageComponents/app/detail/Publish/API/index.tsx
index 31d101ee6..55ed788fe 100644
--- a/projects/app/src/pageComponents/app/detail/Publish/API/index.tsx
+++ b/projects/app/src/pageComponents/app/detail/Publish/API/index.tsx
@@ -1,12 +1,10 @@
import React, { useEffect, useState } from 'react';
import ApiKeyTable from '@/components/support/apikey/Table';
import { useTranslation } from 'next-i18next';
-import { Box } from '@chakra-ui/react';
-import { useI18n } from '@/web/context/I18n';
const API = ({ appId }: { appId: string }) => {
- const { publishT } = useI18n();
- return
{t('common:Name')}
QPM
-
@@ -385,11 +385,11 @@ function EditLinkModal({
- {publishT('token_auth')}
- {t('publish:token_auth')}
+
-
+
+ {t('common:support.outlink.share.Chat_quote_reader')}
+
+ */}
{t('common:support.outlink.share.show_complete_quote')}
@@ -436,6 +467,7 @@ function EditLinkModal({
onChange(e) {
if (e.target.checked) {
setValue('responseDetail', true);
+ // setValue('showFullText', true);
}
}
})}
diff --git a/projects/app/src/pageComponents/app/detail/Publish/index.tsx b/projects/app/src/pageComponents/app/detail/Publish/index.tsx
index ae0ceeedb..a13b32ef3 100644
--- a/projects/app/src/pageComponents/app/detail/Publish/index.tsx
+++ b/projects/app/src/pageComponents/app/detail/Publish/index.tsx
@@ -99,7 +99,7 @@ const OutLink = () => {
if (!feConfigs.isPlus && config.isProFn) {
toast({
status: 'warning',
- title: t('common:common.system.Commercial version function')
+ title: t('common:commercial_function_tip')
});
} else {
setLinkType(e as PublishChannelEnum);
diff --git a/projects/app/src/pageComponents/app/detail/SimpleApp/ChatTest.tsx b/projects/app/src/pageComponents/app/detail/SimpleApp/ChatTest.tsx
index 0ef02db7e..7a4b2dabb 100644
--- a/projects/app/src/pageComponents/app/detail/SimpleApp/ChatTest.tsx
+++ b/projects/app/src/pageComponents/app/detail/SimpleApp/ChatTest.tsx
@@ -7,24 +7,26 @@ import MyIcon from '@fastgpt/web/components/common/Icon';
import { useSafeState } from 'ahooks';
import { AppSimpleEditFormType } from '@fastgpt/global/core/app/type';
import { form2AppWorkflow } from '@/web/core/app/utils';
-import { useI18n } from '@/web/context/I18n';
import { useContextSelector } from 'use-context-selector';
import { AppContext } from '../context';
import { useChatTest } from '../useChatTest';
-import { useDatasetStore } from '@/web/core/dataset/store/dataset';
-import ChatItemContextProvider from '@/web/core/chat/context/chatItemContext';
+import ChatItemContextProvider, { ChatItemContext } from '@/web/core/chat/context/chatItemContext';
import ChatRecordContextProvider from '@/web/core/chat/context/chatRecordContext';
import { useChatStore } from '@/web/core/chat/context/useChatStore';
import MyBox from '@fastgpt/web/components/common/MyBox';
+import { cardStyles } from '../constants';
+import ChatQuoteList from '@/pageComponents/chat/ChatQuoteList';
-type Props = { appForm: AppSimpleEditFormType };
-const ChatTest = ({ appForm }: Props) => {
+type Props = {
+ appForm: AppSimpleEditFormType;
+ setRenderEdit: React.Dispatch>;
+};
+const ChatTest = ({ appForm, setRenderEdit }: Props) => {
const { t } = useTranslation();
- const { appT } = useI18n();
const { appDetail } = useContextSelector(AppContext, (v) => v);
- // form2AppWorkflow dependent allDatasets
- const { allDatasets } = useDatasetStore();
+ const quoteData = useContextSelector(ChatItemContext, (v) => v.quoteData);
+ const setQuoteData = useContextSelector(ChatItemContext, (v) => v.setQuoteData);
const [workflowData, setWorkflowData] = useSafeState({
nodes: appDetail.modules || [],
@@ -33,9 +35,12 @@ const ChatTest = ({ appForm }: Props) => {
useEffect(() => {
const { nodes, edges } = form2AppWorkflow(appForm, t);
- // console.log(form2AppWorkflow(appForm, t));
setWorkflowData({ nodes, edges });
- }, [appForm, setWorkflowData, allDatasets, t]);
+ }, [appForm, setWorkflowData, t]);
+
+ useEffect(() => {
+ setRenderEdit(!quoteData);
+ }, [quoteData, setRenderEdit]);
const { ChatContainer, restartChat, loading } = useChatTest({
...workflowData,
@@ -44,41 +49,56 @@ const ChatTest = ({ appForm }: Props) => {
});
return (
-
-
-
- {appT('chat_debug')}
+
+
+
+
+ {t('app:chat_debug')}
+
+
+
+
+
+
-
-
+ {quoteData && (
+
+ setQuoteData(undefined)}
/>
-
-
-
-
-
+
+ )}
+
);
};
-const Render = ({ appForm }: Props) => {
+const Render = ({ appForm, setRenderEdit }: Props) => {
const { chatId } = useChatStore();
const { appDetail } = useContextSelector(AppContext, (v) => v);
@@ -95,10 +115,11 @@ const Render = ({ appForm }: Props) => {
showRouteToAppDetail={true}
showRouteToDatasetDetail={true}
isShowReadRawSource={true}
+ // isShowFullText={true}
showNodeStatus
>
-
);
diff --git a/projects/app/src/pageComponents/app/detail/SimpleApp/Edit.tsx b/projects/app/src/pageComponents/app/detail/SimpleApp/Edit.tsx
index d083e4ed3..85af33adb 100644
--- a/projects/app/src/pageComponents/app/detail/SimpleApp/Edit.tsx
+++ b/projects/app/src/pageComponents/app/detail/SimpleApp/Edit.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useState } from 'react';
import { Box } from '@chakra-ui/react';
import ChatTest from './ChatTest';
@@ -21,6 +21,7 @@ const Edit = ({
setPast: (value: React.SetStateAction) => void;
}) => {
const { isPc } = useSystem();
+ const [renderEdit, setRenderEdit] = useState(true);
return (
-
-
-
+ {renderEdit && (
+
+
+
-
-
+
-
+ )}
{isPc && (
-
-
+
)}
diff --git a/projects/app/src/pageComponents/app/detail/SimpleApp/EditForm.tsx b/projects/app/src/pageComponents/app/detail/SimpleApp/EditForm.tsx
index f0014f6a3..8bf8b2084 100644
--- a/projects/app/src/pageComponents/app/detail/SimpleApp/EditForm.tsx
+++ b/projects/app/src/pageComponents/app/detail/SimpleApp/EditForm.tsx
@@ -12,7 +12,6 @@ import {
import type { AppSimpleEditFormType } from '@fastgpt/global/core/app/type.d';
import { useRouter } from 'next/router';
import { useTranslation } from 'next-i18next';
-import { useDatasetStore } from '@/web/core/dataset/store/dataset';
import dynamic from 'next/dynamic';
import MyTooltip from '@fastgpt/web/components/common/MyTooltip';
@@ -68,18 +67,9 @@ const EditForm = ({
const { t } = useTranslation();
const { appDetail } = useContextSelector(AppContext, (v) => v);
-
- const { allDatasets } = useDatasetStore();
+ const selectDatasets = useMemo(() => appForm?.dataset?.datasets, [appForm]);
const [, startTst] = useTransition();
- const selectDatasets = useMemo(
- () =>
- allDatasets.filter((item) =>
- appForm.dataset?.datasets.find((dataset) => dataset.datasetId === item._id)
- ),
- [allDatasets, appForm?.dataset?.datasets]
- );
-
const {
isOpen: isOpenDatasetSelect,
onOpen: onOpenKbSelect,
@@ -115,6 +105,7 @@ const EditForm = ({
const tokenLimit = useMemo(() => {
return selectedModel?.quoteMaxToken || 3000;
}, [selectedModel?.quoteMaxToken]);
+
// Force close image select when model not support vision
useEffect(() => {
if (!selectedModel.vision) {
@@ -252,7 +243,7 @@ const EditForm = ({
)}
{selectDatasets.map((item) => (
-
+
({
- datasetId: item._id,
- vectorModel: item.vectorModel
+ datasetId: item.datasetId,
+ vectorModel: item.vectorModel,
+ name: item.name,
+ avatar: item.avatar
}))}
onClose={onCloseKbSelect}
onChange={(e) => {
@@ -441,8 +434,6 @@ const EditForm = ({
...e
}
}));
-
- console.dir(e);
}}
/>
)}
diff --git a/projects/app/src/pageComponents/app/detail/SimpleApp/Header.tsx b/projects/app/src/pageComponents/app/detail/SimpleApp/Header.tsx
index f863f2c39..a2cde2dff 100644
--- a/projects/app/src/pageComponents/app/detail/SimpleApp/Header.tsx
+++ b/projects/app/src/pageComponents/app/detail/SimpleApp/Header.tsx
@@ -17,7 +17,6 @@ import { publishStatusStyle } from '../constants';
import { useSystem } from '@fastgpt/web/hooks/useSystem';
import { formatTime2YMDHMS } from '@fastgpt/global/common/string/time';
import { useSystemStore } from '@/web/common/system/useSystemStore';
-import { useDatasetStore } from '@/web/core/dataset/store/dataset';
import SaveButton from '../Workflow/components/SaveButton';
import { useBoolean, useDebounceEffect, useLockFn } from 'ahooks';
import { appWorkflow2Form } from '@fastgpt/global/core/app/utils';
@@ -61,7 +60,6 @@ const Header = ({
const currentTab = useContextSelector(AppContext, (v) => v.currentTab);
const { lastAppListRouteType } = useSystemStore();
- const { allDatasets } = useDatasetStore();
const { data: paths = [] } = useRequest2(() => getAppFolderPath(appId), {
manual: false,
@@ -159,7 +157,7 @@ const Header = ({
const val = compareSimpleAppSnapshot(savedSnapshot?.appForm, appForm);
setIsSaved(val);
},
- [past, allDatasets],
+ [past],
{ wait: 500 }
);
diff --git a/projects/app/src/pageComponents/app/detail/SimpleApp/index.tsx b/projects/app/src/pageComponents/app/detail/SimpleApp/index.tsx
index 93ba84504..e02a1659b 100644
--- a/projects/app/src/pageComponents/app/detail/SimpleApp/index.tsx
+++ b/projects/app/src/pageComponents/app/detail/SimpleApp/index.tsx
@@ -10,7 +10,6 @@ import { Box, Flex } from '@chakra-ui/react';
import { useTranslation } from 'next-i18next';
import { SimpleAppSnapshotType, useSimpleAppSnapshots } from './useSnapshots';
import { useDebounceEffect, useMount } from 'ahooks';
-import { useDatasetStore } from '@/web/core/dataset/store/dataset';
import { v1Workflow2V2 } from '@/web/core/workflow/adapt';
import { getAppConfigByDiff } from '@/web/core/app/diff';
@@ -19,7 +18,6 @@ const PublishChannel = dynamic(() => import('../Publish'));
const SimpleEdit = () => {
const { t } = useTranslation();
- const { loadAllDatasets } = useDatasetStore();
const { currentTab, appDetail } = useContextSelector(AppContext, (v) => v);
const { forbiddenSaveSnapshot, past, setPast, saveSnapshot } = useSimpleAppSnapshots(
@@ -30,9 +28,6 @@ const SimpleEdit = () => {
// Init app form
useMount(() => {
- // show selected dataset
- loadAllDatasets();
-
if (appDetail.version !== 'v2') {
return setAppForm(
appWorkflow2Form({
diff --git a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/ChatTest.tsx b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/ChatTest.tsx
index 94c6057a0..428500286 100644
--- a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/ChatTest.tsx
+++ b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/ChatTest.tsx
@@ -20,6 +20,7 @@ import ChatRecordContextProvider, {
} from '@/web/core/chat/context/chatRecordContext';
import { useChatStore } from '@/web/core/chat/context/useChatStore';
import MyBox from '@fastgpt/web/components/common/MyBox';
+import ChatQuoteList from '@/pageComponents/chat/ChatQuoteList';
type Props = {
isOpen: boolean;
@@ -41,10 +42,13 @@ const ChatTest = ({ isOpen, nodes = [], edges = [], onClose }: Props) => {
});
const pluginRunTab = useContextSelector(ChatItemContext, (v) => v.pluginRunTab);
const setPluginRunTab = useContextSelector(ChatItemContext, (v) => v.setPluginRunTab);
+ const quoteData = useContextSelector(ChatItemContext, (v) => v.quoteData);
+ const setQuoteData = useContextSelector(ChatItemContext, (v) => v.setQuoteData);
+
const chatRecords = useContextSelector(ChatRecordContext, (v) => v.chatRecords);
return (
- <>
+
{
left={0}
bottom={0}
right={0}
- onClick={onClose}
+ onClick={() => {
+ setQuoteData(undefined);
+ onClose();
+ }}
/>
{
top={5}
right={0}
h={isOpen ? '95%' : '0'}
- w={isOpen ? ['100%', '460px'] : '0'}
+ w={isOpen ? (quoteData ? ['100%', '960px'] : ['100%', '460px']) : '0'}
bg={'white'}
boxShadow={'3px 0 20px rgba(0,0,0,0.2)'}
borderRadius={'md'}
@@ -137,11 +144,34 @@ const ChatTest = ({ isOpen, nodes = [], edges = [], onClose }: Props) => {
)}
-
-
+
+
+
+
+ {quoteData && (
+
+ setQuoteData(undefined)}
+ />
+
+ )}
+
-
+
);
};
@@ -162,6 +192,7 @@ const Render = (Props: Props) => {
showRouteToAppDetail={true}
showRouteToDatasetDetail={true}
isShowReadRawSource={true}
+ // isShowFullText={true}
showNodeStatus
>
diff --git a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/NodeExtract/ExtractFieldModal.tsx b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/NodeExtract/ExtractFieldModal.tsx
index 2666643ae..76499b21d 100644
--- a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/NodeExtract/ExtractFieldModal.tsx
+++ b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/NodeExtract/ExtractFieldModal.tsx
@@ -84,7 +84,7 @@ const ExtractFieldModal = ({
list={toolValueTypeList}
value={valueType}
- onchange={(e) => {
+ onChange={(e) => {
setValue('valueType', e as any);
}}
/>
diff --git a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/NodeHttp/index.tsx b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/NodeHttp/index.tsx
index fead8357a..f25996fd6 100644
--- a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/NodeHttp/index.tsx
+++ b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/NodeHttp/index.tsx
@@ -217,7 +217,7 @@ const RenderHttpMethodAndUrl = React.memo(function RenderHttpMethodAndUrl({
value: 'PATCH'
}
]}
- onchange={(e) => {
+ onChange={(e) => {
onChangeNode({
nodeId,
type: 'updateInput',
diff --git a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/NodeIfElse/ListItem.tsx b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/NodeIfElse/ListItem.tsx
index 0a0de9788..080a1d008 100644
--- a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/NodeIfElse/ListItem.tsx
+++ b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/NodeIfElse/ListItem.tsx
@@ -396,7 +396,7 @@ const ConditionSelect = ({
w={'100%'}
list={filterQuiredConditionList}
value={condition}
- onchange={onSelect}
+ onChange={onSelect}
placeholder={t('common:chose_condition')}
/>
);
@@ -441,7 +441,7 @@ const ConditionValueInput = ({
{ label: 'True', value: 'true' },
{ label: 'False', value: 'false' }
]}
- onchange={onChange}
+ onChange={onChange}
value={value}
placeholder={workflowT('ifelse.Select value')}
isDisabled={
diff --git a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/NodeLaf.tsx b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/NodeLaf.tsx
index e6dba1321..dd75a7dbf 100644
--- a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/NodeLaf.tsx
+++ b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/NodeLaf.tsx
@@ -235,7 +235,7 @@ const NodeLaf = (props: NodeProps) => {
isLoading={isLoadingFunctions}
list={lafFunctionSelectList}
placeholder={t('common:core.module.laf.Select laf function')}
- onchange={(e) => {
+ onChange={(e) => {
onChangeNode({
nodeId,
type: 'updateInput',
diff --git a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/NodePluginIO/InputTypeConfig.tsx b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/NodePluginIO/InputTypeConfig.tsx
index 4d05214f6..bb8367dfa 100644
--- a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/NodePluginIO/InputTypeConfig.tsx
+++ b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/NodePluginIO/InputTypeConfig.tsx
@@ -209,7 +209,7 @@ const InputTypeConfig = ({
(item) => item.value !== WorkflowIOValueTypeEnum.arrayAny
)}
value={valueType}
- onchange={(e) => {
+ onChange={(e) => {
setValue('valueType', e);
}}
/>
@@ -346,7 +346,7 @@ const InputTypeConfig = ({
? defaultValue
: ''
}
- onchange={(e) => {
+ onChange={(e) => {
setValue('defaultValue', e);
}}
w={'200px'}
diff --git a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/NodePluginIO/PluginOutputEditModal.tsx b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/NodePluginIO/PluginOutputEditModal.tsx
index aad0a38c3..f070dc200 100644
--- a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/NodePluginIO/PluginOutputEditModal.tsx
+++ b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/NodePluginIO/PluginOutputEditModal.tsx
@@ -144,7 +144,7 @@ const PluginOutputEditModal = ({
(item) => item.value !== WorkflowIOValueTypeEnum.arrayAny
)}
value={valueType}
- onchange={(e) => {
+ onChange={(e) => {
setValue('valueType', e);
}}
/>
diff --git a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/NodeToolParams/ToolParamsEditModal.tsx b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/NodeToolParams/ToolParamsEditModal.tsx
index 6569d14f1..611708abc 100644
--- a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/NodeToolParams/ToolParamsEditModal.tsx
+++ b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/NodeToolParams/ToolParamsEditModal.tsx
@@ -123,7 +123,7 @@ const ToolParamsEditModal = ({
{
+ onChange={(e: any) => {
setValue('valueType', e);
}}
/>
diff --git a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/render/RenderInput/FieldEditModal.tsx b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/render/RenderInput/FieldEditModal.tsx
index 8e2ff1a10..590d5579c 100644
--- a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/render/RenderInput/FieldEditModal.tsx
+++ b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/render/RenderInput/FieldEditModal.tsx
@@ -137,7 +137,7 @@ const FieldModal = ({
(item) => item.value !== WorkflowIOValueTypeEnum.arrayAny
)}
value={valueType}
- onchange={(e) => {
+ onChange={(e) => {
setValue('valueType', e);
}}
/>
diff --git a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/render/RenderInput/templates/Select.tsx b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/render/RenderInput/templates/Select.tsx
index 10be85625..29f2e5658 100644
--- a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/render/RenderInput/templates/Select.tsx
+++ b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/render/RenderInput/templates/Select.tsx
@@ -14,7 +14,7 @@ const SelectRender = ({ item, nodeId }: RenderInputProps) => {
width={'100%'}
value={item.value}
list={item.list || []}
- onchange={(e) => {
+ onChange={(e) => {
onChangeNode({
nodeId,
type: 'updateInput',
diff --git a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/render/RenderInput/templates/SelectDataset.tsx b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/render/RenderInput/templates/SelectDataset.tsx
index 89d2aa677..982e534f3 100644
--- a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/render/RenderInput/templates/SelectDataset.tsx
+++ b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/render/RenderInput/templates/SelectDataset.tsx
@@ -1,13 +1,10 @@
import React, { useEffect, useMemo, useState } from 'react';
import type { RenderInputProps } from '../type';
import { Box, Button, Flex, Grid, Switch, useDisclosure, useTheme } from '@chakra-ui/react';
-import { useDatasetStore } from '@/web/core/dataset/store/dataset';
import { SelectedDatasetType } from '@fastgpt/global/core/workflow/api';
import Avatar from '@fastgpt/web/components/common/Avatar';
-import { useQuery } from '@tanstack/react-query';
import { useTranslation } from 'next-i18next';
import { DatasetSearchModeEnum } from '@fastgpt/global/core/dataset/constants';
-
import dynamic from 'next/dynamic';
import MyIcon from '@fastgpt/web/components/common/Icon';
import { useContextSelector } from 'use-context-selector';
@@ -32,26 +29,17 @@ export const SelectDatasetRender = React.memo(function SelectDatasetRender({
usingReRank: false
});
- const { allDatasets, loadAllDatasets } = useDatasetStore();
const {
isOpen: isOpenDatasetSelect,
onOpen: onOpenDatasetSelect,
onClose: onCloseDatasetSelect
} = useDisclosure();
- const selectedDatasetsValue = useMemo(() => {
+ const selectedDatasets = useMemo(() => {
if (Array.isArray(item.value)) return item.value as SelectedDatasetType;
return [] as SelectedDatasetType;
}, [item.value]);
- const selectedDatasets = useMemo(() => {
- return allDatasets.filter((dataset) =>
- selectedDatasetsValue?.find((item) => item.datasetId === dataset._id)
- );
- }, [allDatasets, selectedDatasetsValue]);
-
- useQuery(['loadAllDatasets'], loadAllDatasets);
-
useEffect(() => {
inputs.forEach((input) => {
// @ts-ignore
@@ -82,7 +70,7 @@ export const SelectDatasetRender = React.memo(function SelectDatasetRender({
{selectedDatasets.map((item) => (
({
+ datasetId: item.datasetId,
+ vectorModel: item.vectorModel,
+ name: item.name,
+ avatar: item.avatar
+ }))}
onChange={(e) => {
onChangeNode({
nodeId,
@@ -133,7 +126,6 @@ export const SelectDatasetRender = React.memo(function SelectDatasetRender({
onCloseDatasetSelect,
onOpenDatasetSelect,
selectedDatasets,
- selectedDatasetsValue,
t
]);
diff --git a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/render/RenderInput/templates/SelectDatasetParams.tsx b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/render/RenderInput/templates/SelectDatasetParams.tsx
index 38918d816..888332f0d 100644
--- a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/render/RenderInput/templates/SelectDatasetParams.tsx
+++ b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/render/RenderInput/templates/SelectDatasetParams.tsx
@@ -6,13 +6,14 @@ import { DatasetSearchModeEnum } from '@fastgpt/global/core/dataset/constants';
import { FlowNodeTypeEnum } from '@fastgpt/global/core/workflow/node/constant';
import { NodeInputKeyEnum } from '@fastgpt/global/core/workflow/constants';
import MyIcon from '@fastgpt/web/components/common/Icon';
-import DatasetParamsModal, { DatasetParamsProps } from '@/components/core/app/DatasetParamsModal';
+import DatasetParamsModal from '@/components/core/app/DatasetParamsModal';
import { useSystemStore } from '@/web/common/system/useSystemStore';
import SearchParamsTip from '@/components/core/dataset/SearchParamsTip';
import { useContextSelector } from 'use-context-selector';
import { WorkflowContext } from '@/pageComponents/app/detail/WorkflowComponents/context';
import { getWebLLMModel } from '@/web/common/system/utils';
import { defaultDatasetMaxTokens } from '@fastgpt/global/core/app/constants';
+import { AppDatasetSearchParamsType } from '@fastgpt/global/core/app/type';
const SelectDatasetParam = ({ inputs = [], nodeId }: RenderInputProps) => {
const onChangeNode = useContextSelector(WorkflowContext, (v) => v.onChangeNode);
@@ -21,11 +22,14 @@ const SelectDatasetParam = ({ inputs = [], nodeId }: RenderInputProps) => {
const { t } = useTranslation();
const { defaultModels } = useSystemStore();
- const [data, setData] = useState({
+ const [data, setData] = useState({
searchMode: DatasetSearchModeEnum.embedding,
- limit: 5,
+ embeddingWeight: 0.5,
+ limit: 3000,
similarity: 0.5,
usingReRank: false,
+ rerankModel: defaultModels.llm?.model,
+ rerankWeight: 0.6,
datasetSearchUsingExtensionQuery: true,
datasetSearchExtensionModel: defaultModels.llm?.model,
datasetSearchExtensionBg: ''
diff --git a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/render/RenderInput/templates/SelectLLMModel.tsx b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/render/RenderInput/templates/SelectLLMModel.tsx
index f0b7b8830..df9f60271 100644
--- a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/render/RenderInput/templates/SelectLLMModel.tsx
+++ b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/render/RenderInput/templates/SelectLLMModel.tsx
@@ -57,7 +57,7 @@ const SelectAiModelRender = ({ item, nodeId }: RenderInputProps) => {
value: item.model,
label: item.name
}))}
- onchange={onChangeModel}
+ onChange={onChangeModel}
/>
);
}, [item.value, modelList, onChangeModel]);
diff --git a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/render/RenderInput/templates/SettingQuotePrompt.tsx b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/render/RenderInput/templates/SettingQuotePrompt.tsx
index 1d8296aa8..26cc7a66e 100644
--- a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/render/RenderInput/templates/SettingQuotePrompt.tsx
+++ b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/render/RenderInput/templates/SettingQuotePrompt.tsx
@@ -201,7 +201,7 @@ const EditModal = ({ onClose, ...props }: RenderInputProps & { onClose: () => vo
description: t('workflow:dataset_quote_role_user_option_desc')
}
]}
- onchange={(e) => {
+ onChange={(e) => {
setValue('quoteRole', e);
}}
/>
diff --git a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/render/RenderOutput/FieldEditModal.tsx b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/render/RenderOutput/FieldEditModal.tsx
index 1e6154d1d..7a349d191 100644
--- a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/render/RenderOutput/FieldEditModal.tsx
+++ b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/render/RenderOutput/FieldEditModal.tsx
@@ -131,7 +131,7 @@ const FieldModal = ({
(item) => item.value !== WorkflowIOValueTypeEnum.arrayAny
)}
value={valueType}
- onchange={(e) => {
+ onChange={(e) => {
setValue('valueType', e);
}}
/>
diff --git a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/render/RenderToolInput/EditFieldModal.tsx b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/render/RenderToolInput/EditFieldModal.tsx
index 85c368f67..ab3528cf5 100644
--- a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/render/RenderToolInput/EditFieldModal.tsx
+++ b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/render/RenderToolInput/EditFieldModal.tsx
@@ -97,7 +97,7 @@ const EditFieldModal = ({
{
+ onChange={(e: any) => {
setValue('valueType', e);
}}
/>
diff --git a/projects/app/src/pageComponents/app/list/TemplateMarketModal.tsx b/projects/app/src/pageComponents/app/list/TemplateMarketModal.tsx
index 6ecec441b..fbcd1e2b2 100644
--- a/projects/app/src/pageComponents/app/list/TemplateMarketModal.tsx
+++ b/projects/app/src/pageComponents/app/list/TemplateMarketModal.tsx
@@ -289,7 +289,7 @@ const TemplateMarketModal = ({
h={'8'}
value={currentAppType}
- onchange={(value) => {
+ onChange={(value) => {
setCurrentAppType(value);
}}
bg={'myGray.100'}
diff --git a/projects/app/src/pageComponents/app/list/TypeTag.tsx b/projects/app/src/pageComponents/app/list/TypeTag.tsx
index 9fa4d3e6e..377cdaff2 100644
--- a/projects/app/src/pageComponents/app/list/TypeTag.tsx
+++ b/projects/app/src/pageComponents/app/list/TypeTag.tsx
@@ -3,31 +3,32 @@ import { AppTypeEnum } from '@fastgpt/global/core/app/constants';
import { useI18n } from '@/web/context/I18n';
import MyIcon from '@fastgpt/web/components/common/Icon';
import { Box, Flex } from '@chakra-ui/react';
+import { useTranslation } from 'next-i18next';
const AppTypeTag = ({ type }: { type: AppTypeEnum }) => {
- const { appT } = useI18n();
+ const { t } = useTranslation();
const map = useRef({
[AppTypeEnum.simple]: {
- label: appT('type.Simple bot'),
+ label: t('app:type.Simple bot'),
icon: 'core/app/type/simple',
bg: '#DBF3FF',
color: '#0884DD'
},
[AppTypeEnum.workflow]: {
- label: appT('type.Workflow bot'),
+ label: t('app:type.Workflow bot'),
icon: 'core/app/type/workflow',
bg: '#E4E1FC',
color: '#6F5DD7'
},
[AppTypeEnum.plugin]: {
- label: appT('type.Plugin'),
+ label: t('app:type.Plugin'),
icon: 'core/app/type/plugin',
bg: '#D0F5EE',
color: '#007E7C'
},
[AppTypeEnum.httpPlugin]: {
- label: appT('type.Http plugin'),
+ label: t('app:type.Http plugin'),
icon: 'core/app/type/httpPlugin',
bg: '#FFE4EE',
color: '#E82F72'
diff --git a/projects/app/src/pageComponents/chat/ChatHistorySlider.tsx b/projects/app/src/pageComponents/chat/ChatHistorySlider.tsx
index 96fa84926..b8496ede2 100644
--- a/projects/app/src/pageComponents/chat/ChatHistorySlider.tsx
+++ b/projects/app/src/pageComponents/chat/ChatHistorySlider.tsx
@@ -46,6 +46,7 @@ const ChatHistorySlider = ({ confirmClearText }: { confirmClearText: string }) =
const appName = useContextSelector(ChatItemContext, (v) => v.chatBoxData?.app.name);
const appAvatar = useContextSelector(ChatItemContext, (v) => v.chatBoxData?.app.avatar);
const showRouteToAppDetail = useContextSelector(ChatItemContext, (v) => v.showRouteToAppDetail);
+ const setQuoteData = useContextSelector(ChatItemContext, (v) => v.setQuoteData);
const concatHistory = useMemo(() => {
const formatHistories: HistoryItemType[] = histories.map((item) => {
@@ -144,7 +145,10 @@ const ChatHistorySlider = ({ confirmClearText }: { confirmClearText: string }) =
borderRadius={'xl'}
leftIcon={>;
+ quoteIndex: number;
+ setQuoteIndex: Dispatch>;
+ refreshList: () => void;
+ canEdit: boolean;
+
+ updated?: boolean;
+ isCurrentSelected: boolean;
+ q: string;
+ a?: string;
+ dataId: string;
+ collectionId: string;
+}) => {
+ const { t } = useTranslation();
+ const { copyData } = useCopyData();
+ const hasBeenSearched = quoteIndex !== undefined && quoteIndex > -1;
+ const [editInputData, setEditInputData] = useState<{ dataId: string; collectionId: string }>();
+
+ return (
+ <>
+ {
+ quoteRefs.current.set(dataId, el);
+ }}
+ p={2}
+ py={2}
+ cursor={hasBeenSearched ? 'pointer' : 'default'}
+ bg={isCurrentSelected ? '#FFF9E7' : hasBeenSearched ? '#FFFCF2' : ''}
+ position={'relative'}
+ overflow={'hidden'}
+ border={'1px solid '}
+ borderColor={isCurrentSelected ? 'yellow.200' : 'transparent'}
+ wordBreak={'break-all'}
+ fontSize={'sm'}
+ _hover={
+ hasBeenSearched
+ ? {
+ '& .hover-data': { visibility: 'visible' }
+ }
+ : {
+ bg: 'linear-gradient(180deg, #FBFBFC 7.61%, #F0F1F6 100%)',
+ borderTopColor: 'myGray.50',
+ '& .hover-data': { visibility: 'visible' }
+ }
+ }
+ onClick={(e) => {
+ e.stopPropagation();
+
+ if (hasBeenSearched) {
+ setQuoteIndex(quoteIndex);
+ }
+ }}
+ >
+ {updated && (
+
+
+ {t('common:core.dataset.data.Updated')}
+
+
+ )}
+
+
+ )}
+
+
+
+
+
+ {canEdit && (
+
+
+ setEditInputData({
+ dataId,
+ collectionId
+ })
+ }
+ >
+
+
+ )}
+
+ copyData(`${q}${a ? '\n' + a : ''}`)}
+ >
+
+
+
+
+ {editInputData && (
+ setEditInputData(undefined)}
+ onSuccess={refreshList}
+ dataId={editInputData.dataId}
+ collectionId={editInputData.collectionId}
+ />
+ )}
+
+ );
+};
+
+export default CollectionQuoteItem;
diff --git a/projects/app/src/pageComponents/chat/ChatQuoteList/CollectionQuoteReader.tsx b/projects/app/src/pageComponents/chat/ChatQuoteList/CollectionQuoteReader.tsx
new file mode 100644
index 000000000..b3002ee06
--- /dev/null
+++ b/projects/app/src/pageComponents/chat/ChatQuoteList/CollectionQuoteReader.tsx
@@ -0,0 +1,304 @@
+import { Box, Flex, HStack } from '@chakra-ui/react';
+import { SearchDataResponseItemType } from '@fastgpt/global/core/dataset/type';
+import { getSourceNameIcon } from '@fastgpt/global/core/dataset/utils';
+import MyIcon from '@fastgpt/web/components/common/Icon';
+import { useRouter } from 'next/router';
+import { useTranslation } from 'next-i18next';
+import DownloadButton from './DownloadButton';
+import { useRequest2 } from '@fastgpt/web/hooks/useRequest';
+import { downloadFetch } from '@/web/common/system/utils';
+import { useMemo, useState } from 'react';
+import { getDatasetDataPermission } from '@/web/core/dataset/api';
+import ScoreTag from './ScoreTag';
+import { formatScore } from '@/components/core/dataset/QuoteItem';
+import NavButton from './NavButton';
+import { useLinkedScroll } from '@fastgpt/web/hooks/useLinkedScroll';
+import CollectionQuoteItem from './CollectionQuoteItem';
+import { GetCollectionQuoteDataProps } from '@/web/core/chat/context/chatItemContext';
+import { useUserStore } from '@/web/support/user/useUserStore';
+import { getCollectionQuote } from '@/web/core/chat/api';
+import MyIconButton from '@fastgpt/web/components/common/Icon/button';
+import MyBox from '@fastgpt/web/components/common/MyBox';
+import { getCollectionSourceAndOpen } from '@/web/core/dataset/hooks/readCollectionSource';
+import { QuoteDataItemType } from '@/service/core/chat/constants';
+
+const CollectionReader = ({
+ rawSearch,
+ metadata,
+ onClose
+}: {
+ rawSearch: SearchDataResponseItemType[];
+ metadata: GetCollectionQuoteDataProps;
+ onClose: () => void;
+}) => {
+ const { t } = useTranslation();
+ const router = useRouter();
+ const { userInfo } = useUserStore();
+
+ const { collectionId, datasetId, chatItemDataId, sourceId, sourceName } = metadata;
+ const [quoteIndex, setQuoteIndex] = useState(0);
+
+ // Get dataset permission
+ const { data: datasetData } = useRequest2(async () => await getDatasetDataPermission(datasetId), {
+ manual: !userInfo || !datasetId,
+ refreshDeps: [datasetId, userInfo]
+ });
+
+ const filterResults = useMemo(() => {
+ setQuoteIndex(0);
+ return rawSearch
+ .filter((item) => item.collectionId === collectionId)
+ .sort((a, b) => (a.chunkIndex || 0) - (b.chunkIndex || 0));
+ }, [collectionId, rawSearch]);
+ const currentQuoteItem = useMemo(() => {
+ const item = filterResults[quoteIndex];
+ if (item) {
+ return {
+ id: item.id,
+ index: item.chunkIndex,
+ score: item.score
+ };
+ }
+ }, [filterResults, quoteIndex]);
+
+ // Get quote list
+ const params = useMemo(
+ () => ({
+ collectionId,
+ chatItemDataId,
+ chatId: metadata.chatId,
+ appId: metadata.appId,
+ ...metadata.outLinkAuthData
+ }),
+ [chatItemDataId, collectionId, metadata.appId, metadata.chatId, metadata.outLinkAuthData]
+ );
+
+ const {
+ dataList: datasetDataList,
+ isLoading,
+ ScrollData,
+ itemRefs,
+ loadInitData
+ } = useLinkedScroll(getCollectionQuote, {
+ params,
+ currentData: currentQuoteItem
+ });
+
+ const isDeleted = useMemo(
+ () => !isLoading && !datasetDataList.find((item) => item._id === currentQuoteItem?.id),
+ [datasetDataList, currentQuoteItem?.id, isLoading]
+ );
+
+ const formatedDataList = useMemo(
+ () =>
+ datasetDataList.map((item: QuoteDataItemType) => {
+ const isCurrentSelected = currentQuoteItem?.id === item._id;
+ const quoteIndex = filterResults.findIndex((res) => res.id === item._id);
+
+ return {
+ ...item,
+ isCurrentSelected,
+ quoteIndex
+ };
+ }),
+ [currentQuoteItem?.id, datasetDataList, filterResults]
+ );
+
+ const { runAsync: handleDownload } = useRequest2(async () => {
+ await downloadFetch({
+ url: '/api/core/dataset/collection/export',
+ filename: 'data.csv',
+ body: {
+ appId: metadata.appId,
+ chatId: metadata.chatId,
+ chatItemDataId,
+ collectionId,
+ ...metadata.outLinkAuthData
+ }
+ });
+ });
+
+ const handleRead = getCollectionSourceAndOpen({
+ appId: metadata.appId,
+ chatId: metadata.chatId,
+ chatItemDataId,
+ collectionId,
+ ...metadata.outLinkAuthData
+ });
+
+ return (
+
+ {/* title */}
+
+ {/* name */}
+
+
+ {
+ router.push(
+ `/dataset/detail?datasetId=${datasetId}¤tTab=dataCard&collectionId=${collectionId}`
+ );
+ }
+ })}
+ >
+ {sourceName || t('common:common.UnKnow Source')}
+
+
+
+
+
+ {datasetData?.permission?.hasReadPer && (
+ {
+ router.push(`/dataset/detail?datasetId=${datasetId}`);
+ }
+ }
+ : {})}
+ >
+ {t('chat:data_source', {
+ name: datasetData.datasetName
+ })}
+
+ )}
+
+
+ {/* header control */}
+ {datasetDataList.length > 0 && (
+
+
+ {/* 引用序号 */}
+
+
+ {t('common:core.chat.Quote')} {quoteIndex + 1}
+
+
+ /
+
+
+ {filterResults.length}
+
+
+
+ {/* 检索分数 */}
+ {currentQuoteItem?.score ? (
+
+
+ ) : null}
+
+
+ setQuoteIndex(quoteIndex - 1)}
+ />
+ setQuoteIndex(quoteIndex + 1)}
+ />
+
+
+
+ {t('common:core.chat.quote.Quote Tip')}
+
+
+ )}
+
+ {/* quote list */}
+ {isLoading || datasetDataList.length > 0 ? (
+
+
+ {formatedDataList.map((item, index) => (
+ >}
+ quoteIndex={item.quoteIndex}
+ setQuoteIndex={setQuoteIndex}
+ refreshList={() => loadInitData({ scrollWhenFinish: false, refresh: true })}
+ updated={item.updated}
+ isCurrentSelected={item.isCurrentSelected}
+ q={item.q}
+ a={item.a}
+ dataId={item._id}
+ collectionId={collectionId}
+ canEdit={!!userInfo && !!datasetData?.permission?.hasWritePer}
+ />
+ ))}
+
+
+ ) : (
+
+
+
+
+ {t('chat:chat.quote.No Data')}
+
+
+ )}
+
+ );
+};
+
+export default CollectionReader;
diff --git a/projects/app/src/pageComponents/chat/ChatQuoteList/DownloadButton.tsx b/projects/app/src/pageComponents/chat/ChatQuoteList/DownloadButton.tsx
new file mode 100644
index 000000000..322975333
--- /dev/null
+++ b/projects/app/src/pageComponents/chat/ChatQuoteList/DownloadButton.tsx
@@ -0,0 +1,54 @@
+import MyMenu from '@fastgpt/web/components/common/MyMenu';
+import { useTranslation } from 'next-i18next';
+import MyIconButton from '@fastgpt/web/components/common/Icon/button';
+
+const DownloadButton = ({
+ canAccessRawData,
+ onDownload,
+ onRead
+}: {
+ canAccessRawData: boolean;
+ onDownload: () => void;
+ onRead: () => void;
+}) => {
+ const { t } = useTranslation();
+
+ if (canAccessRawData) {
+ return (
+
+
+ );
+};
+
+export default NavButton;
diff --git a/projects/app/src/pageComponents/chat/ChatQuoteList/QuoteItem.tsx b/projects/app/src/pageComponents/chat/ChatQuoteList/QuoteItem.tsx
new file mode 100644
index 000000000..b917ea5be
--- /dev/null
+++ b/projects/app/src/pageComponents/chat/ChatQuoteList/QuoteItem.tsx
@@ -0,0 +1,163 @@
+import { ScoreItemType } from '@/components/core/dataset/QuoteItem';
+import { Box, Flex } from '@chakra-ui/react';
+import MyIcon from '@fastgpt/web/components/common/Icon';
+import ScoreTag from './ScoreTag';
+import Markdown from '@/components/Markdown';
+import MyTooltip from '@fastgpt/web/components/common/MyTooltip';
+import { useTranslation } from 'next-i18next';
+import { useCopyData } from '@fastgpt/web/hooks/useCopyData';
+
+const QuoteItem = ({
+ index,
+ icon,
+ sourceName,
+ score,
+ q,
+ a
+}: {
+ index: number;
+ icon: string;
+ sourceName: string;
+ score: { primaryScore?: ScoreItemType; secondaryScore: ScoreItemType[] };
+ q: string;
+ a?: string;
+}) => {
+ const { t } = useTranslation();
+ const { copyData } = useCopyData();
+ const isDeleted = !q;
+
+ return (
+
+
+
+
+ {index + 1}
+
+
+
+ {sourceName}
+
+
+
+ {score && !isDeleted && (
+
+
+ )}
+
+ {!isDeleted ? (
+ <>
+
+
+ )}
+
+ ) : (
+
+
+ )}
+
+
+
+
+
+
+ {
+ copyData(q + '\n' + a);
+ }}
+ >
+
+
+
+
+ );
+};
+
+export default QuoteItem;
diff --git a/projects/app/src/pageComponents/chat/ChatQuoteList/QuoteReader.tsx b/projects/app/src/pageComponents/chat/ChatQuoteList/QuoteReader.tsx
new file mode 100644
index 000000000..95af0e63f
--- /dev/null
+++ b/projects/app/src/pageComponents/chat/ChatQuoteList/QuoteReader.tsx
@@ -0,0 +1,161 @@
+import { Box, Flex } from '@chakra-ui/react';
+import { SearchDataResponseItemType } from '@fastgpt/global/core/dataset/type';
+import MyIcon from '@fastgpt/web/components/common/Icon';
+import MyBox from '@fastgpt/web/components/common/MyBox';
+import { useTranslation } from 'next-i18next';
+import { useRequest2 } from '@fastgpt/web/hooks/useRequest';
+import QuoteItem from './QuoteItem';
+import { useMemo } from 'react';
+import { getSourceNameIcon } from '@fastgpt/global/core/dataset/utils';
+import { formatScore } from '@/components/core/dataset/QuoteItem';
+import { GetAllQuoteDataProps } from '@/web/core/chat/context/chatItemContext';
+import { getQuoteDataList } from '@/web/core/chat/api';
+
+const QuoteReader = ({
+ rawSearch,
+ metadata,
+ onClose
+}: {
+ rawSearch: SearchDataResponseItemType[];
+ metadata: GetAllQuoteDataProps;
+ onClose: () => void;
+}) => {
+ const { t } = useTranslation();
+
+ const filterRawSearch = useMemo(() => {
+ return rawSearch.filter((item) => metadata.collectionIdList.includes(item.collectionId));
+ }, [rawSearch, metadata.collectionIdList]);
+
+ const { data: quoteList, loading } = useRequest2(
+ async () =>
+ await getQuoteDataList({
+ datasetDataIdList: filterRawSearch.map((item) => item.id),
+ collectionIdList: metadata.collectionIdList,
+ chatItemDataId: metadata.chatItemDataId,
+ appId: metadata.appId,
+ chatId: metadata.chatId,
+ ...metadata.outLinkAuthData
+ }),
+ {
+ refreshDeps: [metadata, filterRawSearch],
+ manual: false
+ }
+ );
+
+ const formatedDataList = useMemo(() => {
+ return filterRawSearch
+ .map((searchItem) => {
+ const dataItem = quoteList?.find((item) => item._id === searchItem.id);
+
+ return {
+ id: searchItem.id,
+ q: dataItem?.q || 'Can not find Data',
+ a: dataItem?.a || '',
+ score: formatScore(searchItem.score),
+ sourceName: searchItem?.sourceName || '',
+ icon: getSourceNameIcon({
+ sourceId: searchItem.sourceId,
+ sourceName: searchItem.sourceName
+ })
+ };
+ })
+ .sort((a, b) => {
+ return (b.score.primaryScore?.value || 0) - (a.score.primaryScore?.value || 0);
+ });
+ }, [quoteList, filterRawSearch]);
+
+ return (
+
+ {/* title */}
+
+
+
+ {metadata.sourceId ? (
+ <>
+
+ {metadata.sourceName || t('common:common.UnKnow Source')}
+
+
+ ) : (
+ <>
+
+ {t('common:core.chat.Quote Amount', { amount: filterRawSearch.length })}
+
+
+ )}
+
+
+ {t('common:core.chat.quote.Quote Tip')}
+
+
+
+
+
+
+ {/* quote list */}
+
+ {!loading && (
+
+ {formatedDataList?.map((item, index) => (
+
+ )}
+
+
+ );
+};
+
+export default QuoteReader;
diff --git a/projects/app/src/pageComponents/chat/ChatQuoteList/ScoreTag.tsx b/projects/app/src/pageComponents/chat/ChatQuoteList/ScoreTag.tsx
new file mode 100644
index 000000000..32c1f0de3
--- /dev/null
+++ b/projects/app/src/pageComponents/chat/ChatQuoteList/ScoreTag.tsx
@@ -0,0 +1,78 @@
+import { ScoreItemType, scoreTheme } from '@/components/core/dataset/QuoteItem';
+import { Box, Flex, Progress } from '@chakra-ui/react';
+import { SearchScoreTypeMap } from '@fastgpt/global/core/dataset/constants';
+import MyTooltip from '@fastgpt/web/components/common/MyTooltip';
+import { useTranslation } from 'next-i18next';
+
+const ScoreTag = (score: { primaryScore?: ScoreItemType; secondaryScore: ScoreItemType[] }) => {
+ const { t } = useTranslation();
+
+ return (
+
+ {score?.primaryScore && (
+
+ {score.secondaryScore.map((item, i) => (
+
+
+
+ #{item.index + 1}
+
+
+ {t(SearchScoreTypeMap[item.type]?.label as any)}: {item.value.toFixed(4)}
+
+
+
+ {SearchScoreTypeMap[item.type]?.showScore && (
+
+
+ ))}
+
+ ) : (
+ t(SearchScoreTypeMap[score.primaryScore.type]?.desc as any)
+ )
+ }
+ >
+
+
+ {t(SearchScoreTypeMap[score.primaryScore.type]?.label as any)}
+ {SearchScoreTypeMap[score.primaryScore.type]?.showScore
+ ? ` ${score.primaryScore.value.toFixed(4)}`
+ : `: ${score.primaryScore.index + 1}`}
+
+
+
+ )}
+
+ );
+};
+
+export default ScoreTag;
diff --git a/projects/app/src/pageComponents/chat/ChatQuoteList/index.tsx b/projects/app/src/pageComponents/chat/ChatQuoteList/index.tsx
new file mode 100644
index 000000000..9103e9c70
--- /dev/null
+++ b/projects/app/src/pageComponents/chat/ChatQuoteList/index.tsx
@@ -0,0 +1,28 @@
+import React from 'react';
+import { SearchDataResponseItemType } from '@fastgpt/global/core/dataset/type';
+import { GetQuoteProps } from '@/web/core/chat/context/chatItemContext';
+import CollectionQuoteReader from './CollectionQuoteReader';
+import QuoteReader from './QuoteReader';
+
+const ChatQuoteList = ({
+ rawSearch = [],
+ metadata,
+ onClose
+}: {
+ rawSearch: SearchDataResponseItemType[];
+ metadata: GetQuoteProps;
+ onClose: () => void;
+}) => {
+ return (
+ <>
+ {'collectionId' in metadata && (
+
- {trainingType === DatasetCollectionDataProcessModeEnum.chunk && feConfigs?.isPlus && (
+ {trainingType === DatasetCollectionDataProcessModeEnum.chunk && (
{t('dataset:enhanced_indexes')}
-
- {t('dataset:auto_indexes')}
-
+
+
+ {t('dataset:auto_indexes')}
+
+
-
+
{t('dataset:image_auto_parse')}
@@ -271,7 +284,7 @@ function DataProcess() {
}
}}
>
- {getValues('qaPrompt')}
+ {qaPrompt}
- {/*
-
-
- {t('common:core.ai.model.Dataset Agent Model')}
-
- ({
- label: item.name,
- value: item.model
- }))}
- onchange={(e) => {
- setValue('llmModel', e);
- }}
- />
-
-
-
- {t('dataset:vllm_model')}
-
- ({
- label: item.name,
- value: item.model
- }))}
- onchange={(e) => {
- setValue('vlmModel', e);
- }}
- />
-
-
-
- */}
-
{
@@ -372,7 +347,7 @@ function DataProcess() {
{isOpenCustomPrompt && (
{
setValue('qaPrompt', e);
}}
diff --git a/projects/app/src/pageComponents/dataset/detail/Import/diffSource/APIDataset.tsx b/projects/app/src/pageComponents/dataset/detail/Import/diffSource/APIDataset.tsx
index dee1dd83f..a8facf7ee 100644
--- a/projects/app/src/pageComponents/dataset/detail/Import/diffSource/APIDataset.tsx
+++ b/projects/app/src/pageComponents/dataset/detail/Import/diffSource/APIDataset.tsx
@@ -21,6 +21,7 @@ const DataProcess = dynamic(() => import('../commonProgress/DataProcess'), {
loading: () =>
- {feConfigs?.isPlus && (
-
-
- {t('dataset:vllm_model')}
-
-
- ({
- label: item.name,
- value: item.model
- }))}
- fontSize={'mini'}
- onchange={(e) => {
- const vlmModel = vllmModelList.find((item) => item.model === e);
- if (!vlmModel) return;
- setValue('vlmModel', vlmModel);
- return handleSubmit((data) => onSave({ ...data, vlmModel }))();
- }}
- />
-
+
+
+ {t('dataset:vllm_model')}
+
+
+ ({
+ label: item.name,
+ value: item.model
+ }))}
+ fontSize={'mini'}
+ onChange={(e) => {
+ const vlmModel = vllmModelList.find((item) => item.model === e);
+ if (!vlmModel) return;
+ setValue('vlmModel', vlmModel);
+ return handleSubmit((data) => onSave({ ...data, vlmModel }))();
+ }}
+ />
- )}
+
{feConfigs?.isPlus && (
diff --git a/projects/app/src/pageComponents/dataset/detail/InputDataModal.tsx b/projects/app/src/pageComponents/dataset/detail/InputDataModal.tsx
index ce69dea01..b6f82b96b 100644
--- a/projects/app/src/pageComponents/dataset/detail/InputDataModal.tsx
+++ b/projects/app/src/pageComponents/dataset/detail/InputDataModal.tsx
@@ -1,12 +1,6 @@
import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import { Box, Flex, Button, Textarea } from '@chakra-ui/react';
-import {
- FieldArrayWithId,
- UseFieldArrayRemove,
- UseFormRegister,
- useFieldArray,
- useForm
-} from 'react-hook-form';
+import { Box, Flex, Button, Textarea, ModalFooter, HStack, VStack } from '@chakra-ui/react';
+import { UseFormRegister, useFieldArray, useForm } from 'react-hook-form';
import {
postInsertData2Dataset,
putDatasetDataById,
@@ -17,36 +11,36 @@ import { useToast } from '@fastgpt/web/hooks/useToast';
import MyIcon from '@fastgpt/web/components/common/Icon';
import MyModal from '@fastgpt/web/components/common/MyModal';
import MyTooltip from '@fastgpt/web/components/common/MyTooltip';
-import { useQuery } from '@tanstack/react-query';
import { useTranslation } from 'next-i18next';
import { useRequest2 } from '@fastgpt/web/hooks/useRequest';
import { getSourceNameIcon } from '@fastgpt/global/core/dataset/utils';
import { DatasetDataIndexItemType } from '@fastgpt/global/core/dataset/type';
import DeleteIcon from '@fastgpt/web/components/common/Icon/delete';
import { defaultCollectionDetail } from '@/web/core/dataset/constants';
-import { getDocPath } from '@/web/common/system/doc';
import MyBox from '@fastgpt/web/components/common/MyBox';
import { getErrText } from '@fastgpt/global/common/error/utils';
import { useSystemStore } from '@/web/common/system/useSystemStore';
-import QuestionTip from '@fastgpt/web/components/common/MyTooltip/QuestionTip';
-import LightRowTabs from '@fastgpt/web/components/common/Tabs/LightRowTabs';
import styles from './styles.module.scss';
import {
DatasetDataIndexTypeEnum,
getDatasetIndexMapData
} from '@fastgpt/global/core/dataset/data/constants';
+import FillRowTabs from '@fastgpt/web/components/common/Tabs/FillRowTabs';
+import FormLabel from '@fastgpt/web/components/common/MyBox/FormLabel';
+import MyIconButton from '@fastgpt/web/components/common/Icon/button';
export type InputDataType = {
q: string;
a: string;
indexes: (Omit & {
dataId?: string; // pg data id
+ fold: boolean;
})[];
};
enum TabEnum {
- content = 'content',
- index = 'index'
+ chunk = 'chunk',
+ qa = 'qa'
}
const InputDataModal = ({
@@ -64,73 +58,47 @@ const InputDataModal = ({
}) => {
const { t } = useTranslation();
const { toast } = useToast();
- const [currentTab, setCurrentTab] = useState(TabEnum.content);
const { embeddingModelList, defaultModels } = useSystemStore();
+ const [currentTab, setCurrentTab] = useState(TabEnum.chunk);
+
const { register, handleSubmit, reset, control } = useForm();
const {
fields: indexes,
- append: appendIndexes,
- remove: removeIndexes
+ prepend: prependIndexes,
+ remove: removeIndexes,
+ update: updateIndexes
} = useFieldArray({
control,
name: 'indexes'
});
- const tabList = [
- {
- label: (
-
- {t('common:dataset.data.edit.divide_content')}
-
- ),
- value: TabEnum.content
- },
- {
- label: (
-
- {t('common:dataset.data.edit.Index', { amount: indexes.length })}
-
-
- window.open(getDocPath('/docs/guide/knowledge_base/dataset_engine/'), '_blank')
- }
- _hover={{
- color: 'primary.600',
- cursor: 'pointer'
- }}
- />
-
-
- ),
- value: TabEnum.index
- }
- ];
-
- const { data: collection = defaultCollectionDetail } = useQuery(
- ['loadCollectionId', collectionId],
+ const { data: collection = defaultCollectionDetail } = useRequest2(
() => {
return getDatasetCollectionById(collectionId);
+ },
+ {
+ manual: false,
+ refreshDeps: [collectionId]
}
);
- const { isFetching: isFetchingData } = useQuery(
- ['getDatasetDataItemById', dataId],
- () => {
+ const { loading: isFetchingData } = useRequest2(
+ async () => {
if (dataId) return getDatasetDataItemById(dataId);
return null;
},
{
+ manual: false,
+ refreshDeps: [dataId],
onSuccess(res) {
if (res) {
reset({
q: res.q,
a: res.a,
- indexes: res.indexes
+ indexes: res.indexes.map((item) => ({
+ ...item,
+ fold: true
+ }))
});
} else if (defaultValue) {
reset({
@@ -138,6 +106,10 @@ const InputDataModal = ({
a: defaultValue.a
});
}
+
+ if (res?.a || defaultValue?.a) {
+ setCurrentTab(TabEnum.qa);
+ }
},
onError(err) {
toast({
@@ -161,7 +133,6 @@ const InputDataModal = ({
const { runAsync: sureImportData, loading: isImporting } = useRequest2(
async (e: InputDataType) => {
if (!e.q) {
- setCurrentTab(TabEnum.content);
return Promise.reject(t('common:dataset.data.input is empty'));
}
@@ -175,9 +146,9 @@ const InputDataModal = ({
const dataId = await postInsertData2Dataset({
collectionId: collection._id,
q: e.q,
- a: e.a,
+ a: currentTab === TabEnum.qa ? e.a : '',
// Contains no default index
- indexes: e.indexes
+ indexes: e.indexes.filter((item) => !!item.text?.trim())
});
return {
@@ -186,6 +157,7 @@ const InputDataModal = ({
};
},
{
+ refreshDeps: [currentTab],
successToast: t('common:dataset.data.Input Success Tip'),
onSuccess(e) {
reset({
@@ -205,11 +177,11 @@ const InputDataModal = ({
async (e: InputDataType) => {
if (!dataId) return Promise.reject(t('common:common.error.unKnow'));
- // not exactly same
await putDatasetDataById({
dataId,
- ...e,
- indexes: e.indexes
+ q: e.q,
+ a: currentTab === TabEnum.qa ? e.a : '',
+ indexes: e.indexes.filter((item) => !!item.text?.trim())
});
return {
@@ -218,6 +190,7 @@ const InputDataModal = ({
};
},
{
+ refreshDeps: [currentTab],
successToast: t('common:dataset.data.Update Success Tip'),
onSuccess(data) {
onSuccess(data);
@@ -267,49 +240,174 @@ const InputDataModal = ({
isLoading={isLoading}
h={'100%'}
py={[6, '1.5rem']}
- px={[5, '3.25rem']}
>
-
-
-
- list={tabList}
- p={0}
- value={currentTab}
- onChange={(e: TabEnum) => setCurrentTab(e)}
- />
-
- {currentTab === TabEnum.index && (
-
- appendIndexes({
- type: DatasetDataIndexTypeEnum.custom,
- text: ''
- })
- }
- >
-
-
-
- )}
-
-
- {currentTab === TabEnum.content &&
+ {
+ setCurrentTab(e);
+ }}
+ />
-
+
+ {/* Data */}
+
+
+
+ {currentTab === TabEnum.chunk
+ ? t('common:dataset_data_input_chunk_content')
+ : t('common:dataset_data_input_q')}
+
+
+
+ {currentTab === TabEnum.qa && (
+
+
+ {t('common:dataset_data_input_a')}
+
+
+
+ )}
+
+ {/* Index */}
+
+
+
+ {t('common:dataset.data.edit.Index', {
+ amount: indexes.length
+ })}
+
+
+ prependIndexes({
+ type: DatasetDataIndexTypeEnum.custom,
+ text: '',
+ fold: false
+ })
+ }
+ >
+
+
+
+
+
+
+ {indexes?.map((index, i) => {
+ const data = getDatasetIndexMapData(index.type);
+ return (
+
+ {/* Header */}
+
+ {t(data.label)}
+ {/* Delete */}
+ {index.type !== 'default' && (
+
+ {
+ removeIndexes(i);
+ }}
+ />
+
+ )}
+ {indexes.length > 1 && (
+ {
+ updateIndexes(i, { ...index, fold: !index.fold });
+ }}
+ />
+ )}
+
+ {/* Content */}
+ 1}
+ maxToken={maxToken}
+ register={register}
+ onFocus={() => {
+ updateIndexes(i, { ...index, fold: false });
+ }}
+ />
+
+ );
+ })}
+
+
+
+
+
@@ -322,7 +420,7 @@ const InputDataModal = ({
{dataId ? t('common:common.Confirm Update') : t('common:common.Confirm Import')}
-
+
);
@@ -330,153 +428,23 @@ const InputDataModal = ({
export default React.memo(InputDataModal);
-const InputTab = ({
- maxToken,
- register
-}: {
- maxToken: number;
- register: UseFormRegister;
-}) => {
- const { t } = useTranslation();
-
- return (
- <>
-
-
-
- *
- {t('common:core.dataset.data.Main Content')}
-
-
-
-
-
-
-
- {t('common:core.dataset.data.Auxiliary Data')}
-
-
-
-
-
-
-
- );
-};
-
-const DataIndex = ({
- maxToken,
- register,
- indexes,
- removeIndexes
-}: {
- maxToken: number;
- register: UseFormRegister;
- indexes: FieldArrayWithId[];
- removeIndexes: UseFieldArrayRemove;
-}) => {
- const { t } = useTranslation();
-
- return (
- <>
-
- {indexes?.map((index, i) => {
- const data = getDatasetIndexMapData(index.type);
- return (
-
-
-
- {t(data.label)}
-
- {index.type !== 'default' && (
- {
- removeIndexes(i);
- }}
- />
- )}
-
-
- );
- })}
-
-
- );
-};
-
const textareaMinH = '40px';
const DataIndexTextArea = ({
value,
index,
maxToken,
register,
- disabled
+ disabled,
+ isFolder,
+ onFocus
}: {
value: string;
index: number;
maxToken: number;
register: UseFormRegister;
disabled?: boolean;
+ isFolder: boolean;
+ onFocus: () => void;
}) => {
const { t } = useTranslation();
const TextareaDom = useRef(null);
@@ -501,41 +469,76 @@ const DataIndexTextArea = ({
}
}, []);
- return disabled ? (
-
- {value}
+ const onclickMark = () => {
+ TextareaDom?.current?.focus();
+ onFocus();
+ };
+
+ return (
+
+ {disabled ? (
+
+ {value}
+
+ ) : (
+
+