Skip to content

Commit 5bb8935

Browse files
LZS911LZS911
authored
Merge pull request #776 from actiontech/fix/issue-703-2
[feature](DataExportManagement): Adjust display of reminder
2 parents 39d512a + 4834970 commit 5bb8935

File tree

5 files changed

+205
-57
lines changed

5 files changed

+205
-57
lines changed

‎packages/base/src/locale/zh-CN/dmsDataExport.ts‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,13 @@ export default {
6161
result: {
6262
success: '工单创建成功',
6363
guide: '查看刚刚创建的工单',
64-
retentionNotice: '审批通过后，系统会为您保留导出任务',
65-
retentionHours: '24 小时',
66-
retentionNoticeSuffix: '。',
67-
reminderNotice: '为确保您顺利获取文件，请及时查看审批结果并完成导出操作。'
64+
alertTitle: '审批通过后，请留意两件事：',
65+
exportTimeLimitTitle: '1. 导出操作时限：',
66+
exportTimeLimitDesc: '系统将为您保留此次导出任务24小时。',
67+
fileDownloadLimitTitle: '2. 文件下载时限：',
68+
fileDownloadLimitDesc: '导出文件生成后，文件本身也仅保留 24小时。',
69+
reminder:
70+
'为确保您能顺利获取文件，请及时查看审批结果，并立即完成导出和文件下载操作。'
6871
}
6972
},
7073
batchClose: {

‎packages/base/src/page/DataExportManagement/Create/__tests__/__snapshots__/index.test.tsx.snap‎

Lines changed: 82 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1235,32 +1235,93 @@ exports[`first should match snapshot when pageState is equal SUBMIT_RESULT 1`] =
12351235
>
12361236
<div
12371237
class="ant-space-item"
1238-
style="margin-bottom: 12px;"
1238+
style="margin-bottom: 32px;"
12391239
>
1240-
<span
1241-
class="ant-typography"
1240+
<div
1241+
class="ant-alert ant-alert-info ant-alert-with-description css-1se20qt"
1242+
data-show="true"
1243+
role="alert"
12421244
>
1243-
审批通过后，系统会为您保留导出任务
1244-
12451245
<span
1246-
class="ant-typography"
1246+
aria-label="info-circle"
1247+
class="anticon anticon-info-circle ant-alert-icon"
1248+
role="img"
12471249
>
1248-
<strong>
1249-
24 小时
1250-
</strong>
1250+
<svg
1251+
aria-hidden="true"
1252+
data-icon="info-circle"
1253+
fill="currentColor"
1254+
focusable="false"
1255+
height="1em"
1256+
viewBox="64 64 896 896"
1257+
width="1em"
1258+
>
1259+
<path
1260+
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"
1261+
/>
1262+
</svg>
12511263
</span>
1252-
。
1253-
</span>
1254-
</div>
1255-
<div
1256-
class="ant-space-item"
1257-
style="margin-bottom: 12px;"
1258-
>
1259-
<span
1260-
class="ant-typography"
1261-
>
1262-
为确保您顺利获取文件，请及时查看审批结果并完成导出操作。
1263-
</span>
1264+
<div
1265+
class="ant-alert-content"
1266+
>
1267+
<div
1268+
class="ant-alert-message"
1269+
>
1270+
审批通过后，请留意两件事：
1271+
</div>
1272+
<div
1273+
class="ant-alert-description"
1274+
>
1275+
<div
1276+
class="ant-space ant-space-vertical"
1277+
>
1278+
<div
1279+
class="ant-space-item"
1280+
style="margin-bottom: 8px;"
1281+
>
1282+
<span
1283+
class="ant-typography"
1284+
>
1285+
<span
1286+
class="ant-typography"
1287+
>
1288+
<strong>
1289+
1. 导出操作时限：
1290+
</strong>
1291+
</span>
1292+
系统将为您保留此次导出任务24小时。
1293+
</span>
1294+
</div>
1295+
<div
1296+
class="ant-space-item"
1297+
style="margin-bottom: 8px;"
1298+
>
1299+
<span
1300+
class="ant-typography"
1301+
>
1302+
<span
1303+
class="ant-typography"
1304+
>
1305+
<strong>
1306+
2. 文件下载时限：
1307+
</strong>
1308+
</span>
1309+
导出文件生成后，文件本身也仅保留 24小时。
1310+
</span>
1311+
</div>
1312+
<div
1313+
class="ant-space-item"
1314+
>
1315+
<span
1316+
class="ant-typography"
1317+
>
1318+
为确保您能顺利获取文件，请及时查看审批结果，并立即完成导出和文件下载操作。
1319+
</span>
1320+
</div>
1321+
</div>
1322+
</div>
1323+
</div>
1324+
</div>
12641325
</div>
12651326
<div
12661327
class="ant-space-item"

‎packages/base/src/page/DataExportManagement/Create/components/SubmitResult/__snapshots__/index.test.tsx.snap‎

Lines changed: 82 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -421,32 +421,93 @@ exports[`test base/DataExport/Create/SubmitResult should match snapshot 1`] = `
421421
>
422422
<div
423423
class="ant-space-item"
424-
style="margin-bottom: 12px;"
424+
style="margin-bottom: 32px;"
425425
>
426-
<span
427-
class="ant-typography"
426+
<div
427+
class="ant-alert ant-alert-info ant-alert-with-description css-1se20qt"
428+
data-show="true"
429+
role="alert"
428430
>
429-
审批通过后，系统会为您保留导出任务
430-
431431
<span
432-
class="ant-typography"
432+
aria-label="info-circle"
433+
class="anticon anticon-info-circle ant-alert-icon"
434+
role="img"
433435
>
434-
<strong>
435-
24 小时
436-
</strong>
436+
<svg
437+
aria-hidden="true"
438+
data-icon="info-circle"
439+
fill="currentColor"
440+
focusable="false"
441+
height="1em"
442+
viewBox="64 64 896 896"
443+
width="1em"
444+
>
445+
<path
446+
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"
447+
/>
448+
</svg>
437449
</span>
438-
。
439-
</span>
440-
</div>
441-
<div
442-
class="ant-space-item"
443-
style="margin-bottom: 12px;"
444-
>
445-
<span
446-
class="ant-typography"
447-
>
448-
为确保您顺利获取文件，请及时查看审批结果并完成导出操作。
449-
</span>
450+
<div
451+
class="ant-alert-content"
452+
>
453+
<div
454+
class="ant-alert-message"
455+
>
456+
审批通过后，请留意两件事：
457+
</div>
458+
<div
459+
class="ant-alert-description"
460+
>
461+
<div
462+
class="ant-space ant-space-vertical"
463+
>
464+
<div
465+
class="ant-space-item"
466+
style="margin-bottom: 8px;"
467+
>
468+
<span
469+
class="ant-typography"
470+
>
471+
<span
472+
class="ant-typography"
473+
>
474+
<strong>
475+
1. 导出操作时限：
476+
</strong>
477+
</span>
478+
系统将为您保留此次导出任务24小时。
479+
</span>
480+
</div>
481+
<div
482+
class="ant-space-item"
483+
style="margin-bottom: 8px;"
484+
>
485+
<span
486+
class="ant-typography"
487+
>
488+
<span
489+
class="ant-typography"
490+
>
491+
<strong>
492+
2. 文件下载时限：
493+
</strong>
494+
</span>
495+
导出文件生成后，文件本身也仅保留 24小时。
496+
</span>
497+
</div>
498+
<div
499+
class="ant-space-item"
500+
>
501+
<span
502+
class="ant-typography"
503+
>
504+
为确保您能顺利获取文件，请及时查看审批结果，并立即完成导出和文件下载操作。
505+
</span>
506+
</div>
507+
</div>
508+
</div>
509+
</div>
510+
</div>
450511
</div>
451512
<div
452513
class="ant-space-item"

‎packages/base/src/page/DataExportManagement/Create/components/SubmitResult/index.tsx‎

Lines changed: 26 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { useTranslation } from 'react-i18next';
55
import useCreateDataExportReduxManage from '../../hooks/index.redux';
66
import { ROUTE_PATHS } from '@actiontech/dms-kit';
77
import { Space, Typography } from 'antd';
8+
import { SubmitResultAlertStyleWrapper } from './style';
89

910
const ExportWorkflowSubmitResult: React.FC = () => {
1011
const { t } = useTranslation();
@@ -16,17 +17,31 @@ const ExportWorkflowSubmitResult: React.FC = () => {
1617
title={t('dmsDataExport.create.result.success')}
1718
subTitle={formValues?.baseValues.desc}
1819
extra={[
19-
<Space direction="vertical" size={12} key="retentionNotice">
20-
<Typography.Text>
21-
{t('dmsDataExport.create.result.retentionNotice')}{' '}
22-
<Typography.Text strong>
23-
{t('dmsDataExport.create.result.retentionHours')}
24-
</Typography.Text>
25-
{t('dmsDataExport.create.result.retentionNoticeSuffix')}
26-
</Typography.Text>
27-
<Typography.Text>
28-
{t('dmsDataExport.create.result.reminderNotice')}
29-
</Typography.Text>
20+
<Space direction="vertical" size={32} key="retentionNotice">
21+
<SubmitResultAlertStyleWrapper
22+
message={t('dmsDataExport.create.result.alertTitle')}
23+
description={
24+
<Space direction="vertical" size={8}>
25+
<Typography.Text>
26+
<Typography.Text strong>
27+
{t('dmsDataExport.create.result.exportTimeLimitTitle')}
28+
</Typography.Text>
29+
{t('dmsDataExport.create.result.exportTimeLimitDesc')}
30+
</Typography.Text>
31+
<Typography.Text>
32+
<Typography.Text strong>
33+
{t('dmsDataExport.create.result.fileDownloadLimitTitle')}
34+
</Typography.Text>
35+
{t('dmsDataExport.create.result.fileDownloadLimitDesc')}
36+
</Typography.Text>
37+
<Typography.Text>
38+
{t('dmsDataExport.create.result.reminder')}
39+
</Typography.Text>
40+
</Space>
41+
}
42+
type="info"
43+
showIcon
44+
/>
3045
<TypedLink
3146
to={ROUTE_PATHS.BASE.DATA_EXPORT.detail}
3247
params={{

‎packages/base/src/page/DataExportManagement/Create/components/SubmitResult/style.ts‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import { styled } from '@mui/material/styles';
2+
import { Alert } from 'antd';
3+
4+
export const SubmitResultAlertStyleWrapper = styled(Alert)`
5+
&.ant-alert.ant-alert-info .ant-alert-content {
6+
text-align: left;
7+
}
8+
`;

0 commit comments

Comments
 (0)