Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions packages/base/src/locale/zh-CN/dmsDataExport.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,13 @@ export default {
result: {
success: '工单创建成功',
guide: '查看刚刚创建的工单',
retentionNotice: '审批通过后,系统会为您保留导出任务',
retentionHours: '24 小时',
retentionNoticeSuffix: '。',
reminderNotice: '为确保您顺利获取文件,请及时查看审批结果并完成导出操作。'
alertTitle: '审批通过后,请留意两件事:',
exportTimeLimitTitle: '1. 导出操作时限:',
exportTimeLimitDesc: '系统将为您保留此次导出任务24小时。',
fileDownloadLimitTitle: '2. 文件下载时限:',
fileDownloadLimitDesc: '导出文件生成后,文件本身也仅保留 24小时。',
reminder:
'为确保您能顺利获取文件,请及时查看审批结果,并立即完成导出和文件下载操作。'
}
},
batchClose: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1235,32 +1235,93 @@ exports[`first should match snapshot when pageState is equal SUBMIT_RESULT 1`] =
>
<div
class="ant-space-item"
style="margin-bottom: 12px;"
style="margin-bottom: 32px;"
>
<span
class="ant-typography"
<div
class="ant-alert ant-alert-info ant-alert-with-description css-1se20qt"
data-show="true"
role="alert"
>
审批通过后,系统会为您保留导出任务

<span
class="ant-typography"
aria-label="info-circle"
class="anticon anticon-info-circle ant-alert-icon"
role="img"
>
<strong>
24 小时
</strong>
<svg
aria-hidden="true"
data-icon="info-circle"
fill="currentColor"
focusable="false"
height="1em"
viewBox="64 64 896 896"
width="1em"
>
<path
d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm32 664c0 4.4-3.6 8-8 8h-48c-4.4 0-8-3.6-8-8V456c0-4.4 3.6-8 8-8h48c4.4 0 8 3.6 8 8v272zm-32-344a48.01 48.01 0 010-96 48.01 48.01 0 010 96z"
/>
</svg>
</span>
</span>
</div>
<div
class="ant-space-item"
style="margin-bottom: 12px;"
>
<span
class="ant-typography"
>
为确保您顺利获取文件,请及时查看审批结果并完成导出操作。
</span>
<div
class="ant-alert-content"
>
<div
class="ant-alert-message"
>
审批通过后,请留意两件事:
</div>
<div
class="ant-alert-description"
>
<div
class="ant-space ant-space-vertical"
>
<div
class="ant-space-item"
style="margin-bottom: 8px;"
>
<span
class="ant-typography"
>
<span
class="ant-typography"
>
<strong>
1. 导出操作时限:
</strong>
</span>
系统将为您保留此次导出任务24小时。
</span>
</div>
<div
class="ant-space-item"
style="margin-bottom: 8px;"
>
<span
class="ant-typography"
>
<span
class="ant-typography"
>
<strong>
2. 文件下载时限:
</strong>
</span>
导出文件生成后,文件本身也仅保留 24小时。
</span>
</div>
<div
class="ant-space-item"
>
<span
class="ant-typography"
>
为确保您能顺利获取文件,请及时查看审批结果,并立即完成导出和文件下载操作。
</span>
</div>
</div>
</div>
</div>
</div>
</div>
<div
class="ant-space-item"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -421,32 +421,93 @@ exports[`test base/DataExport/Create/SubmitResult should match snapshot 1`] = `
>
<div
class="ant-space-item"
style="margin-bottom: 12px;"
style="margin-bottom: 32px;"
>
<span
class="ant-typography"
<div
class="ant-alert ant-alert-info ant-alert-with-description css-1se20qt"
data-show="true"
role="alert"
>
审批通过后,系统会为您保留导出任务

<span
class="ant-typography"
aria-label="info-circle"
class="anticon anticon-info-circle ant-alert-icon"
role="img"
>
<strong>
24 小时
</strong>
<svg
aria-hidden="true"
data-icon="info-circle"
fill="currentColor"
focusable="false"
height="1em"
viewBox="64 64 896 896"
width="1em"
>
<path
d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm32 664c0 4.4-3.6 8-8 8h-48c-4.4 0-8-3.6-8-8V456c0-4.4 3.6-8 8-8h48c4.4 0 8 3.6 8 8v272zm-32-344a48.01 48.01 0 010-96 48.01 48.01 0 010 96z"
/>
</svg>
</span>
</span>
</div>
<div
class="ant-space-item"
style="margin-bottom: 12px;"
>
<span
class="ant-typography"
>
为确保您顺利获取文件,请及时查看审批结果并完成导出操作。
</span>
<div
class="ant-alert-content"
>
<div
class="ant-alert-message"
>
审批通过后,请留意两件事:
</div>
<div
class="ant-alert-description"
>
<div
class="ant-space ant-space-vertical"
>
<div
class="ant-space-item"
style="margin-bottom: 8px;"
>
<span
class="ant-typography"
>
<span
class="ant-typography"
>
<strong>
1. 导出操作时限:
</strong>
</span>
系统将为您保留此次导出任务24小时。
</span>
</div>
<div
class="ant-space-item"
style="margin-bottom: 8px;"
>
<span
class="ant-typography"
>
<span
class="ant-typography"
>
<strong>
2. 文件下载时限:
</strong>
</span>
导出文件生成后,文件本身也仅保留 24小时。
</span>
</div>
<div
class="ant-space-item"
>
<span
class="ant-typography"
>
为确保您能顺利获取文件,请及时查看审批结果,并立即完成导出和文件下载操作。
</span>
</div>
</div>
</div>
</div>
</div>
</div>
<div
class="ant-space-item"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { useTranslation } from 'react-i18next';
import useCreateDataExportReduxManage from '../../hooks/index.redux';
import { ROUTE_PATHS } from '@actiontech/dms-kit';
import { Space, Typography } from 'antd';
import { SubmitResultAlertStyleWrapper } from './style';

const ExportWorkflowSubmitResult: React.FC = () => {
const { t } = useTranslation();
Expand All @@ -16,17 +17,31 @@ const ExportWorkflowSubmitResult: React.FC = () => {
title={t('dmsDataExport.create.result.success')}
subTitle={formValues?.baseValues.desc}
extra={[
<Space direction="vertical" size={12} key="retentionNotice">
<Typography.Text>
{t('dmsDataExport.create.result.retentionNotice')}{' '}
<Typography.Text strong>
{t('dmsDataExport.create.result.retentionHours')}
</Typography.Text>
{t('dmsDataExport.create.result.retentionNoticeSuffix')}
</Typography.Text>
<Typography.Text>
{t('dmsDataExport.create.result.reminderNotice')}
</Typography.Text>
<Space direction="vertical" size={32} key="retentionNotice">
<SubmitResultAlertStyleWrapper
message={t('dmsDataExport.create.result.alertTitle')}
description={
<Space direction="vertical" size={8}>
<Typography.Text>
<Typography.Text strong>
{t('dmsDataExport.create.result.exportTimeLimitTitle')}
</Typography.Text>
{t('dmsDataExport.create.result.exportTimeLimitDesc')}
</Typography.Text>
<Typography.Text>
<Typography.Text strong>
{t('dmsDataExport.create.result.fileDownloadLimitTitle')}
</Typography.Text>
{t('dmsDataExport.create.result.fileDownloadLimitDesc')}
</Typography.Text>
<Typography.Text>
{t('dmsDataExport.create.result.reminder')}
</Typography.Text>
</Space>
}
type="info"
showIcon
/>
<TypedLink
to={ROUTE_PATHS.BASE.DATA_EXPORT.detail}
params={{
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import { styled } from '@mui/material/styles';
import { Alert } from 'antd';

export const SubmitResultAlertStyleWrapper = styled(Alert)`
&.ant-alert.ant-alert-info .ant-alert-content {
text-align: left;
}
`;