Skip to content

赵月辉 / fastgpt-migrated

Go to a project
Commit eb365fef by Jiangween Committed by GitHub
Options

Update i18n files and Upload component (#3040) 

* Update i18n files and Upload component

* 完善 i18n 和优化 Upload.tsx 文件

* 修改Upload.tsx 文件的问题...
parent 2e7047cb
Showing with 76 additions and 10 deletions
packages/web/i18n/en/common.json
...@@ -184,6 +184,7 @@ ...@@ -184,6 +184,7 @@
"common.Update Successful": "Updated Successfully", "common.Update Successful": "Updated Successfully",
"common.Username": "Username", "common.Username": "Username",
"common.Waiting": "Waiting", "common.Waiting": "Waiting",
"common.Error": "Error",
"common.Warning": "Warning", "common.Warning": "Warning",
"common.Website": "Website", "common.Website": "Website",
"common.all_result": "Full Results", "common.all_result": "Full Results",
...@@ -569,10 +570,12 @@ ...@@ -569,10 +570,12 @@
"core.dataset.import.Select source": "Select Source", "core.dataset.import.Select source": "Select Source",
"core.dataset.import.Source name": "Source Name", "core.dataset.import.Source name": "Source Name",
"core.dataset.import.Sources list": "Source List", "core.dataset.import.Sources list": "Source List",
"core.dataset.import.Continue upload": "Continue upload",
"core.dataset.import.Upload complete": "Upload complete",
"core.dataset.import.Start upload": "Start Upload", "core.dataset.import.Start upload": "Start Upload",
"core.dataset.import.Total files": "Total {{total}} Files", "core.dataset.import.Total files": "Total {{total}} Files",
"core.dataset.import.Training mode": "Training Mode", "core.dataset.import.Training mode": "Training Mode",
"core.dataset.import.Upload data": "Upload Data", "core.dataset.import.Upload data": "Confirm Upload",
"core.dataset.import.Upload file progress": "File Upload Progress", "core.dataset.import.Upload file progress": "File Upload Progress",
"core.dataset.import.Upload status": "Status", "core.dataset.import.Upload status": "Status",
"core.dataset.import.Web link": "Web Link", "core.dataset.import.Web link": "Web Link",
......
packages/web/i18n/zh/common.json
...@@ -191,6 +191,7 @@ ...@@ -191,6 +191,7 @@
"common.Update Successful": "更新成功", "common.Update Successful": "更新成功",
"common.Username": "用户名", "common.Username": "用户名",
"common.Waiting": "等待中", "common.Waiting": "等待中",
"common.Error": "错误",
"common.Warning": "警告", "common.Warning": "警告",
"common.Website": "网站", "common.Website": "网站",
"common.all_result": "完整结果", "common.all_result": "完整结果",
...@@ -575,10 +576,12 @@ ...@@ -575,10 +576,12 @@
"core.dataset.import.Select source": "选择来源", "core.dataset.import.Select source": "选择来源",
"core.dataset.import.Source name": "来源名", "core.dataset.import.Source name": "来源名",
"core.dataset.import.Sources list": "来源列表", "core.dataset.import.Sources list": "来源列表",
"core.dataset.import.Continue upload": "继续上传",
"core.dataset.import.Upload complete": "完成上传",
"core.dataset.import.Start upload": "开始上传", "core.dataset.import.Start upload": "开始上传",
"core.dataset.import.Total files": "共 {{total}} 个文件", "core.dataset.import.Total files": "共 {{total}} 个文件",
"core.dataset.import.Training mode": "训练模式", "core.dataset.import.Training mode": "训练模式",
"core.dataset.import.Upload data": "上传数据", "core.dataset.import.Upload data": "确认上传",
"core.dataset.import.Upload file progress": "文件上传进度", "core.dataset.import.Upload file progress": "文件上传进度",
"core.dataset.import.Upload status": "状态", "core.dataset.import.Upload status": "状态",
"core.dataset.import.Web link": "网页链接", "core.dataset.import.Web link": "网页链接",
......
projects/app/src/pages/dataset/detail/components/Import/commonProgress/Upload.tsx
import React from 'react'; import React, { useMemo } from 'react';
import { QuestionOutlineIcon } from '@chakra-ui/icons';
import { import {
Box, Box,
TableContainer, TableContainer,
...@@ -9,7 +10,9 @@ import { ...@@ -9,7 +10,9 @@ import {
Td, Td,
Tbody, Tbody,
Flex, Flex,
Button Button,
IconButton,
Tooltip
} from '@chakra-ui/react'; } from '@chakra-ui/react';
import { ImportDataSourceEnum } from '@fastgpt/global/core/dataset/constants'; import { ImportDataSourceEnum } from '@fastgpt/global/core/dataset/constants';
import { useTranslation } from 'next-i18next'; import { useTranslation } from 'next-i18next';
...@@ -42,6 +45,32 @@ const Upload = () => { ...@@ -42,6 +45,32 @@ const Upload = () => {
const { handleSubmit } = processParamsForm; const { handleSubmit } = processParamsForm;
const { totalFilesCount, waitingFilesCount, allFinished, hasCreatingFiles } = useMemo(() => {
const totalFilesCount = sources.length;
const { waitingFilesCount, allFinished, hasCreatingFiles } = sources.reduce(
(acc, file) => {
if (file.createStatus === 'waiting') acc.waitingFilesCount++;
if (file.createStatus === 'creating') acc.hasCreatingFiles = true;
if (file.createStatus !== 'finish') acc.allFinished = false;
return acc;
},
{ waitingFilesCount: 0, allFinished: true, hasCreatingFiles: false }
);
return { totalFilesCount, waitingFilesCount, allFinished, hasCreatingFiles };
}, [sources]);
const buttonText = useMemo(() => {
if (waitingFilesCount === totalFilesCount) {
return t('common:core.dataset.import.Start upload');
} else if (allFinished) {
return t('common:core.dataset.import.Upload complete');
} else {
return t('common:core.dataset.import.Continue upload');
}
}, [waitingFilesCount, totalFilesCount, allFinished, t]);
const { mutate: startUpload, isLoading } = useRequest({ const { mutate: startUpload, isLoading } = useRequest({
mutationFn: async ({ mode, customSplitChar, qaPrompt, webSelector }: ImportFormType) => { mutationFn: async ({ mode, customSplitChar, qaPrompt, webSelector }: ImportFormType) => {
if (sources.length === 0) return; if (sources.length === 0) return;
...@@ -117,10 +146,12 @@ const Upload = () => { ...@@ -117,10 +146,12 @@ const Upload = () => {
} }
}, },
onSuccess() { onSuccess() {
if (!sources.some((file) => file.errorMsg !== undefined)) {
toast({ toast({
title: t('common:core.dataset.import.Import success'), title: t('common:core.dataset.import.Import success'),
status: 'success' status: 'success'
}); });
}
// close import page // close import page
router.replace({ router.replace({
...@@ -130,13 +161,14 @@ const Upload = () => { ...@@ -130,13 +161,14 @@ const Upload = () => {
} }
}); });
}, },
onError() { onError(error) {
setSources((state) => setSources((state) =>
state.map((source) => state.map((source) =>
source.createStatus === 'creating' source.createStatus === 'creating'
? { ? {
...source, ...source,
createStatus: 'waiting' createStatus: 'waiting',
errorMsg: error.message || fileT('upload_failed')
} }
: source : source
) )
...@@ -157,6 +189,9 @@ const Upload = () => { ...@@ -157,6 +189,9 @@ const Upload = () => {
<Th borderBottom={'none'} py={4}> <Th borderBottom={'none'} py={4}>
{t('common:core.dataset.import.Upload status')} {t('common:core.dataset.import.Upload status')}
</Th> </Th>
<Th borderRightRadius={'md'} borderBottom={'none'} py={4}>
{t('common:common.Action')}
</Th>
</Tr> </Tr>
</Thead> </Thead>
<Tbody> <Tbody>
...@@ -172,6 +207,15 @@ const Upload = () => { ...@@ -172,6 +207,15 @@ const Upload = () => {
</Td> </Td>
<Td> <Td>
<Box display={'inline-block'}> <Box display={'inline-block'}>
{item.errorMsg ? (
<Tooltip label={item.errorMsg} fontSize="md">
<Flex alignItems="center">
<MyTag colorSchema={'red'}>{t('common:common.Error')}</MyTag>
<QuestionOutlineIcon ml={2} color="red.500" w="14px" />
</Flex>
</Tooltip>
) : (
<>
{item.createStatus === 'waiting' && ( {item.createStatus === 'waiting' && (
<MyTag colorSchema={'gray'}>{t('common:common.Waiting')}</MyTag> <MyTag colorSchema={'gray'}>{t('common:common.Waiting')}</MyTag>
)} )}
...@@ -181,8 +225,23 @@ const Upload = () => { ...@@ -181,8 +225,23 @@ const Upload = () => {
{item.createStatus === 'finish' && ( {item.createStatus === 'finish' && (
<MyTag colorSchema={'green'}>{t('common:common.Finish')}</MyTag> <MyTag colorSchema={'green'}>{t('common:common.Finish')}</MyTag>
)} )}
</>
)}
</Box> </Box>
</Td> </Td>
<Td>
{!hasCreatingFiles && item.createStatus !== 'finish' && (
<IconButton
variant={'grayDanger'}
size={'sm'}
icon={<MyIcon name={'delete'} w={'14px'} />}
aria-label={'Delete file'}
onClick={() => {
setSources((prevFiles) => prevFiles.filter((file) => file.id !== item.id));
}}
/>
)}
</Td>
</Tr> </Tr>
))} ))}
</Tbody> </Tbody>
...@@ -191,10 +250,11 @@ const Upload = () => { ...@@ -191,10 +250,11 @@ const Upload = () => {
<Flex justifyContent={'flex-end'} mt={4}> <Flex justifyContent={'flex-end'} mt={4}>
<Button isLoading={isLoading} onClick={handleSubmit((data) => startUpload(data))}> <Button isLoading={isLoading} onClick={handleSubmit((data) => startUpload(data))}>
{sources.length > 0 {totalFilesCount > 0 &&
? `${t('core.dataset.import.Total files', { total: sources.length })} | ` `${t('common:core.dataset.import.Total files', {
: ''} total: totalFilesCount
{t('common:core.dataset.import.Start upload')} })} | `}
{buttonText}
</Button> </Button>
</Flex> </Flex>
</Box> </Box>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment