v4.6-3 (#471)

projects/app/src/components/ChatBox/QuoteModal.tsx

@@ -10,13 +10,12 @@ import InputDataModal, {
   type InputDataType
 } from '@/pages/dataset/detail/components/InputDataModal';
 import MyModal from '../MyModal';
-import { useTranslation } from 'react-i18next';
+import { useTranslation } from 'next-i18next';
 import { useRouter } from 'next/router';
 import type { SearchDataResponseItemType } from '@fastgpt/global/core/dataset/type';
 import MyTooltip from '../MyTooltip';
 import NextLink from 'next/link';
 import { useSystemStore } from '@/web/common/system/useSystemStore';
-import { useUserStore } from '@/web/support/user/useUserStore';
 
 const QuoteModal = ({
   rawSearch = [],
@@ -29,10 +28,9 @@ const QuoteModal = ({
   const { isPc } = useSystemStore();
   const theme = useTheme();
   const router = useRouter();
-  const { userInfo } = useUserStore();
   const { toast } = useToast();
   const { setIsLoading, Loading } = useLoading();
-  const [editInputData, setEditInputData] = useState<InputDataType & { datasetId: string }>();
+  const [editInputData, setEditInputData] = useState<InputDataType & { collectionId: string }>();
 
   const isShare = useMemo(() => router.pathname === '/chat/share', [router.pathname]);
 
@@ -99,7 +97,7 @@ const QuoteModal = ({
                   color={'black'}
                   sourceName={item.sourceName}
                   sourceId={item.sourceId}
-                  addr={!isShare}
+                  canView={!isShare}
                 />
                 <Box flex={1} />
                 {!isShare && (
@@ -131,7 +129,7 @@ const QuoteModal = ({
                   <MyTooltip label={t('core.dataset.Quote Length')}>
                     <Flex alignItems={'center'}>
                       <MyIcon name="common/text/t" w={'14px'} mr={1} color={'myGray.500'} />
-                      {item.q.length + item.a.length}
+                      {item.q.length + (item.a?.length || 0)}
                     </Flex>
                   </MyTooltip>
                   {!isShare && item.score && (
@@ -183,7 +181,6 @@ const QuoteModal = ({
       </MyModal>
       {editInputData && editInputData.id && (
         <InputDataModal
-          canWrite={userInfo?.team?.canWrite || false}
           onClose={() => setEditInputData(undefined)}
           onSuccess={() => {
             console.log('更新引用成功');
@@ -191,8 +188,8 @@ const QuoteModal = ({
           onDelete={() => {
             console.log('删除引用成功');
           }}
-          datasetId={editInputData.datasetId}
-          defaultValues={editInputData}
+          defaultValue={editInputData}
+          collectionId={editInputData.collectionId}
         />
       )}
     </>

projects/app/src/components/ChatBox/ResponseTags.tsx

@@ -2,7 +2,7 @@ import React, { useMemo, useState } from 'react';
 import type { ChatHistoryItemResType } from '@fastgpt/global/core/chat/api.d';
 import type { ChatItemType } from '@fastgpt/global/core/chat/type';
 import { Flex, BoxProps, useDisclosure, Image, useTheme } from '@chakra-ui/react';
-import { useTranslation } from 'react-i18next';
+import { useTranslation } from 'next-i18next';
 import { useSystemStore } from '@/web/common/system/useSystemStore';
 import type { SearchDataResponseItemType } from '@fastgpt/global/core/dataset/type';
 import dynamic from 'next/dynamic';

projects/app/src/components/ChatBox/SelectMarkCollection.tsx

@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React, { useMemo, useState } from 'react';
 import { ModalBody, useTheme, ModalFooter, Button, Box, Card, Flex, Grid } from '@chakra-ui/react';
 import { useTranslation } from 'next-i18next';
 import Avatar from '../Avatar';
@@ -8,6 +8,7 @@ import DatasetSelectModal, { useDatasetSelect } from '@/components/core/dataset/
 import dynamic from 'next/dynamic';
 import { AdminFbkType } from '@fastgpt/global/core/chat/type.d';
 import SelectCollections from '@/web/core/dataset/components/SelectCollections';
+import { getDefaultIndex } from '@fastgpt/global/core/dataset/utils';
 
 const InputDataModal = dynamic(() => import('@/pages/dataset/detail/components/InputDataModal'));
 
@@ -163,15 +164,13 @@ const SelectMarkCollection = ({
       {adminMarkData.datasetId && adminMarkData.collectionId && (
         <InputDataModal
           onClose={onClose}
-          datasetId={adminMarkData.datasetId}
-          defaultValues={{
+          collectionId={adminMarkData.collectionId}
+          defaultValue={{
             id: adminMarkData.dataId,
-            collectionId: adminMarkData.collectionId,
-            sourceName: '手动标注',
             q: adminMarkData.q,
-            a: adminMarkData.a
+            a: adminMarkData.a,
+            indexes: [getDefaultIndex({ dataId: `${Date.now()}` })]
           }}
-          canWrite
           onSuccess={(data) => {
             if (!data.q || !adminMarkData.datasetId || !adminMarkData.collectionId || !data.id) {
               return onClose();

projects/app/src/components/ChatBox/WholeResponseModal.tsx

@@ -1,7 +1,7 @@
 import React, { useMemo, useState } from 'react';
 import { Box, useTheme, Flex, Image } from '@chakra-ui/react';
 import type { ChatHistoryItemResType } from '@fastgpt/global/core/chat/api.d';
-import { useTranslation } from 'react-i18next';
+import { useTranslation } from 'next-i18next';
 import { ModuleTemplatesFlat } from '@/constants/flow/ModuleTemplate';
 import Tabs from '../Tabs';
 

projects/app/src/components/ChatBox/index.tsx

@@ -30,7 +30,7 @@ import {
 } from '@chakra-ui/react';
 import { feConfigs } from '@/web/common/system/staticData';
 import { eventBus } from '@/web/common/utils/eventbus';
-import { adaptChat2GptMessages } from '@/utils/common/adapt/message';
+import { adaptChat2GptMessages } from '@fastgpt/global/core/chat/adapt';
 import { useMarkdown } from '@/web/common/hooks/useMarkdown';
 import { ModuleItemType } from '@fastgpt/global/core/module/type.d';
 import { VariableInputEnum } from '@/constants/app';
@@ -41,7 +41,7 @@ import { htmlTemplate } from '@/constants/common';
 import { useRouter } from 'next/router';
 import { useSystemStore } from '@/web/common/system/useSystemStore';
 import { TaskResponseKeyEnum } from '@fastgpt/global/core/chat/constants';
-import { useTranslation } from 'react-i18next';
+import { useTranslation } from 'next-i18next';
 import { customAlphabet } from 'nanoid';
 import { adminUpdateChatFeedback, userUpdateChatFeedback } from '@/web/core/chat/api';
 import type { AdminMarkType } from './SelectMarkCollection';