v4.6.1 (#497)

projects/app/src/components/core/dataset/SelectModal.tsx

@@ -6,6 +6,7 @@ import { useTranslation } from 'next-i18next';
 import { useSystemStore } from '@/web/common/system/useSystemStore';
 import { Box, Flex, ModalHeader } from '@chakra-ui/react';
 import MyIcon from '@/components/Icon';
+import ParentPaths from '@/components/common/ParentPaths';
 
 type PathItemType = {
   parentId: string;
@@ -14,7 +15,6 @@ type PathItemType = {
 
 const DatasetSelectContainer = ({
   isOpen,
-  parentId,
   setParentId,
   paths,
   onClose,
@@ -22,7 +22,6 @@ const DatasetSelectContainer = ({
   children
 }: {
   isOpen: boolean;
-  parentId?: string;
   setParentId: Dispatch<string>;
   paths: PathItemType[];
   onClose: () => void;
@@ -35,45 +34,17 @@ const DatasetSelectContainer = ({
   return (
     <MyModal isOpen={isOpen} onClose={onClose} w={'100%'} maxW={['90vw', '900px']} isCentered>
       <Flex flexDirection={'column'} h={'90vh'}>
-        <ModalHeader>
-          {!!parentId ? (
-            <Flex
-              flex={1}
-              userSelect={'none'}
-              fontSize={['sm', 'lg']}
-              fontWeight={'normal'}
-              color={'myGray.900'}
-            >
-              {paths.map((item, i) => (
-                <Flex key={item.parentId} mr={2} alignItems={'center'}>
-                  <Box
-                    fontSize={'lg'}
-                    borderRadius={'md'}
-                    {...(i === paths.length - 1
-                      ? {
-                          cursor: 'default'
-                        }
-                      : {
-                          cursor: 'pointer',
-                          _hover: {
-                            color: 'myBlue.600'
-                          },
-                          onClick: () => {
-                            setParentId(item.parentId);
-                          }
-                        })}
-                  >
-                    {item.parentName}
-                  </Box>
-                  {i !== paths.length - 1 && (
-                    <MyIcon name={'rightArrowLight'} color={'myGray.500'} w={['18px', '24px']} />
-                  )}
-                </Flex>
-              ))}
-            </Flex>
-          ) : (
-            <Box>{t('chat.Select Mark Kb')}</Box>
-          )}
+        <ModalHeader fontWeight={'normal'}>
+          <ParentPaths
+            paths={paths.map((path, i) => ({
+              parentId: path.parentId,
+              parentName: path.parentName
+            }))}
+            FirstPathDom={t('chat.Select Mark Kb')}
+            onClick={(e) => {
+              setParentId(e);
+            }}
+          />
           {!!tips && (
             <Box fontSize={'sm'} color={'myGray.500'} fontWeight={'normal'}>
               {tips}
@@ -94,16 +65,7 @@ export function useDatasetSelect() {
     Promise.all([getDatasets({ parentId }), getDatasetPaths(parentId)])
   );
 
-  const paths = useMemo(
-    () => [
-      {
-        parentId: '',
-        parentName: t('dataset.My Dataset')
-      },
-      ...(data?.[1] || [])
-    ],
-    [data, t]
-  );
+  const paths = useMemo(() => [...(data?.[1] || [])], [data]);
 
   return {
     parentId,

projects/app/src/components/core/module/DatasetSelectModal.tsx

@@ -26,6 +26,8 @@ import { useTranslation } from 'next-i18next';
 import { useDatasetStore } from '@/web/core/dataset/store/dataset';
 import { feConfigs } from '@/web/common/system/staticData';
 import DatasetSelectContainer, { useDatasetSelect } from '@/components/core/dataset/SelectModal';
+import { useLoading } from '@/web/common/hooks/useLoading';
+import EmptyTip from '@/components/EmptyTip';
 
 export type KbParamsType = {
   searchSimilarity: number;
@@ -54,7 +56,8 @@ export const DatasetSelectModal = ({
     })
   );
   const { toast } = useToast();
-  const { paths, parentId, setParentId, datasets } = useDatasetSelect();
+  const { paths, setParentId, datasets, isLoading } = useDatasetSelect();
+  const { Loading } = useLoading();
 
   const filterKbList = useMemo(() => {
     return {
@@ -71,9 +74,8 @@ export const DatasetSelectModal = ({
     <DatasetSelectContainer
       isOpen={isOpen}
       paths={paths}
-      parentId={parentId}
       setParentId={setParentId}
-      tips={'仅能选择同一个索引模型的知识库'}
+      tips={t('dataset.Select Dataset Tips')}
       onClose={onClose}
     >
       <Flex h={'100%'} flexDirection={'column'} flex={'1 0 0'}>
@@ -158,7 +160,7 @@ export const DatasetSelectModal = ({
                           if (vectorModel && vectorModel !== item.vectorModel.model) {
                             return toast({
                               status: 'warning',
-                              title: '仅能选择同一个索引模型的知识库'
+                              title: t('dataset.Select Dataset Tips')
                             });
                           }
                           setSelectedKbList((state) => [
@@ -197,14 +199,7 @@ export const DatasetSelectModal = ({
               })()
             )}
           </Grid>
-          {filterKbList.unSelected.length === 0 && (
-            <Flex mt={5} flexDirection={'column'} alignItems={'center'}>
-              <MyIcon name="empty" w={'48px'} h={'48px'} mt={'20vh'} color={'transparent'} />
-              <Box mt={2} color={'myGray.500'}>
-                这个目录已经没东西可选了~
-              </Box>
-            </Flex>
-          )}
+          {filterKbList.unSelected.length === 0 && <EmptyTip text={t('common.folder.empty')} />}
         </ModalBody>
 
         <ModalFooter>
@@ -219,9 +214,11 @@ export const DatasetSelectModal = ({
               onChange(filterKbList);
             }}
           >
-            完成
+            {t('common.Done')}
           </Button>
         </ModalFooter>
+
+        <Loading fixed={false} loading={isLoading} />
       </Flex>
     </DatasetSelectContainer>
   );