4.6.7-alpha commit (#743)

Co-authored-by: Archer <545436317@qq.com>
Co-authored-by: heheer <71265218+newfish-cmyk@users.noreply.github.com>

projects/app/src/pages/dataset/list/component/CreateModal.tsx

@@ -17,7 +17,7 @@ import MySelect from '@/components/Select';
 import { vectorModelList, qaModelList } from '@/web/common/system/staticData';
 import { useTranslation } from 'next-i18next';
 import MyRadio from '@/components/common/MyRadio';
-import { DatasetTypeEnum } from '@fastgpt/global/core/dataset/constant';
+import { DatasetTypeEnum } from '@fastgpt/global/core/dataset/constants';
 import { feConfigs } from '@/web/common/system/staticData';
 import { MongoImageTypeEnum } from '@fastgpt/global/common/file/image/constants';
 
@@ -149,40 +149,44 @@ const CreateModal = ({ onClose, parentId }: { onClose: () => void; parentId?: st
             />
           </Flex>
         </Box>
-        <Flex mt={6} alignItems={'center'}>
-          <Box flex={'0 0 100px'}>{t('core.ai.model.Vector Model')}</Box>
-          <Box flex={1}>
-            <MySelect
-              w={'100%'}
-              value={getValues('vectorModel')}
-              list={vectorModelList.map((item) => ({
-                label: item.name,
-                value: item.model
-              }))}
-              onchange={(e) => {
-                setValue('vectorModel', e);
-                setRefresh((state) => !state);
-              }}
-            />
-          </Box>
-        </Flex>
-        <Flex mt={6} alignItems={'center'}>
-          <Box flex={'0 0 100px'}>{t('core.ai.model.Dataset Agent Model')}</Box>
-          <Box flex={1}>
-            <MySelect
-              w={'100%'}
-              value={getValues('agentModel')}
-              list={qaModelList.map((item) => ({
-                label: item.name,
-                value: item.model
-              }))}
-              onchange={(e) => {
-                setValue('agentModel', e);
-                setRefresh((state) => !state);
-              }}
-            />
-          </Box>
-        </Flex>
+        {vectorModelList.length > 1 && (
+          <Flex mt={6} alignItems={'center'}>
+            <Box flex={'0 0 100px'}>{t('core.ai.model.Vector Model')}</Box>
+            <Box flex={1}>
+              <MySelect
+                w={'100%'}
+                value={getValues('vectorModel')}
+                list={vectorModelList.map((item) => ({
+                  label: item.name,
+                  value: item.model
+                }))}
+                onchange={(e) => {
+                  setValue('vectorModel', e);
+                  setRefresh((state) => !state);
+                }}
+              />
+            </Box>
+          </Flex>
+        )}
+        {qaModelList.length > 1 && (
+          <Flex mt={6} alignItems={'center'}>
+            <Box flex={'0 0 100px'}>{t('core.ai.model.Dataset Agent Model')}</Box>
+            <Box flex={1}>
+              <MySelect
+                w={'100%'}
+                value={getValues('agentModel')}
+                list={qaModelList.map((item) => ({
+                  label: item.name,
+                  value: item.model
+                }))}
+                onchange={(e) => {
+                  setValue('agentModel', e);
+                  setRefresh((state) => !state);
+                }}
+              />
+            </Box>
+          </Flex>
+        )}
       </ModalBody>
 
       <ModalFooter>

projects/app/src/pages/dataset/list/component/MoveModal.tsx

@@ -14,7 +14,7 @@ import Avatar from '@/components/Avatar';
 import MyTooltip from '@/components/MyTooltip';
 import MyModal from '@/components/MyModal';
 import MyIcon from '@fastgpt/web/components/common/Icon';
-import { DatasetTypeEnum } from '@fastgpt/global/core/dataset/constant';
+import { DatasetTypeEnum } from '@fastgpt/global/core/dataset/constants';
 import { useTranslation } from 'next-i18next';
 import { useQuery } from '@tanstack/react-query';
 import { getDatasets, putDatasetById, getDatasetPaths } from '@/web/core/dataset/api';

projects/app/src/pages/dataset/list/index.tsx

@@ -29,10 +29,11 @@ import MyIcon from '@fastgpt/web/components/common/Icon';
 import { serviceSideProps } from '@/web/common/utils/i18n';
 import dynamic from 'next/dynamic';
 import {
-  FolderAvatarSrc,
   DatasetTypeEnum,
-  DatasetTypeMap
-} from '@fastgpt/global/core/dataset/constant';
+  DatasetTypeMap,
+  FolderIcon,
+  FolderImgUrl
+} from '@fastgpt/global/core/dataset/constants';
 import MyMenu from '@/components/MyMenu';
 import { useRequest } from '@/web/common/hooks/useRequest';
 import { useSystemStore } from '@/web/common/system/useSystemStore';
@@ -167,7 +168,7 @@ const Kb = () => {
                 <MenuButton h={'100%'}>
                   <Flex alignItems={'center'} px={'20px'}>
                     <AddIcon mr={2} />
-                    <Box>{t('Create New')}</Box>
+                    <Box>{t('common.Create New')}</Box>
                   </Flex>
                 </MenuButton>
               </Button>
@@ -176,7 +177,7 @@ const Kb = () => {
               {
                 child: (
                   <Flex>
-                    <Image src={FolderAvatarSrc} alt={''} w={'20px'} mr={1} />
+                    <MyIcon name={FolderIcon} w={'20px'} mr={1} />
                     {t('Folder')}
                   </Flex>
                 ),
@@ -404,7 +405,10 @@ const Kb = () => {
               fontSize={'sm'}
               color={'myGray.500'}
             >
-              {dataset.intro || t('core.dataset.Intro Placeholder')}
+              {dataset.intro ||
+                (dataset.type === DatasetTypeEnum.folder
+                  ? t('core.dataset.Folder placeholder')
+                  : t('core.dataset.Intro Placeholder'))}
             </Box>
             <Flex alignItems={'center'} fontSize={'sm'}>
               <Box flex={1}>
@@ -437,7 +441,7 @@ const Kb = () => {
                 parentId,
                 name,
                 type: DatasetTypeEnum.folder,
-                avatar: FolderAvatarSrc,
+                avatar: FolderImgUrl,
                 intro: ''
               });
               refetch();