Skip to content

Commit eee6cb2

Browse files
authored
Merge pull request #773 from actiontech/fix/issue-703
[feature](DataExportManagement): Add a reminder about the export time limit
2 parents cb77155 + 0f54e4a commit eee6cb2

File tree

4 files changed

+122
-31
lines changed

4 files changed

+122
-31
lines changed

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,11 @@ export default {
6060
},
6161
result: {
6262
success: '工单创建成功',
63-
guide: '查看刚刚创建的工单'
63+
guide: '查看刚刚创建的工单',
64+
retentionNotice: '审批通过后,系统会为您保留导出任务',
65+
retentionHours: '24 小时',
66+
retentionNoticeSuffix: '。',
67+
reminderNotice: '为确保您顺利获取文件,请及时查看审批结果并完成导出操作。'
6468
}
6569
},
6670
batchClose: {

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

Lines changed: 46 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1230,18 +1230,55 @@ exports[`first should match snapshot when pageState is equal SUBMIT_RESULT 1`] =
12301230
<div
12311231
class="ant-result-extra"
12321232
>
1233-
<a
1234-
href="/project/700300/data/export/123"
1233+
<div
1234+
class="ant-space ant-space-vertical"
12351235
>
1236-
<button
1237-
class="ant-btn ant-btn-primary basic-button-wrapper css-1vnelmv"
1238-
type="button"
1236+
<div
1237+
class="ant-space-item"
1238+
style="margin-bottom: 12px;"
12391239
>
1240-
<span>
1241-
查看刚刚创建的工单
1240+
<span
1241+
class="ant-typography"
1242+
>
1243+
审批通过后,系统会为您保留导出任务
1244+
1245+
<span
1246+
class="ant-typography"
1247+
>
1248+
<strong>
1249+
24 小时
1250+
</strong>
1251+
</span>
1252+
12421253
</span>
1243-
</button>
1244-
</a>
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+
<div
1266+
class="ant-space-item"
1267+
>
1268+
<a
1269+
href="/project/700300/data/export/123"
1270+
>
1271+
<button
1272+
class="ant-btn ant-btn-primary basic-button-wrapper css-1vnelmv"
1273+
type="button"
1274+
>
1275+
<span>
1276+
查看刚刚创建的工单
1277+
</span>
1278+
</button>
1279+
</a>
1280+
</div>
1281+
</div>
12451282
</div>
12461283
</div>
12471284
</section>

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

Lines changed: 46 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -416,18 +416,55 @@ exports[`test base/DataExport/Create/SubmitResult should match snapshot 1`] = `
416416
<div
417417
class="ant-result-extra"
418418
>
419-
<a
420-
href="/project/700300/data/export/123"
419+
<div
420+
class="ant-space ant-space-vertical"
421421
>
422-
<button
423-
class="ant-btn ant-btn-primary basic-button-wrapper css-1vnelmv"
424-
type="button"
422+
<div
423+
class="ant-space-item"
424+
style="margin-bottom: 12px;"
425425
>
426-
<span>
427-
查看刚刚创建的工单
426+
<span
427+
class="ant-typography"
428+
>
429+
审批通过后,系统会为您保留导出任务
430+
431+
<span
432+
class="ant-typography"
433+
>
434+
<strong>
435+
24 小时
436+
</strong>
437+
</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+
为确保您顺利获取文件,请及时查看审批结果并完成导出操作。
428449
</span>
429-
</button>
430-
</a>
450+
</div>
451+
<div
452+
class="ant-space-item"
453+
>
454+
<a
455+
href="/project/700300/data/export/123"
456+
>
457+
<button
458+
class="ant-btn ant-btn-primary basic-button-wrapper css-1vnelmv"
459+
type="button"
460+
>
461+
<span>
462+
查看刚刚创建的工单
463+
</span>
464+
</button>
465+
</a>
466+
</div>
467+
</div>
431468
</div>
432469
</div>
433470
</section>

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

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ import { useCurrentProject } from '@actiontech/shared/lib/features';
44
import { useTranslation } from 'react-i18next';
55
import useCreateDataExportReduxManage from '../../hooks/index.redux';
66
import { ROUTE_PATHS } from '@actiontech/dms-kit';
7+
import { Space, Typography } from 'antd';
8+
79
const ExportWorkflowSubmitResult: React.FC = () => {
810
const { t } = useTranslation();
911
const { projectID } = useCurrentProject();
@@ -14,18 +16,29 @@ const ExportWorkflowSubmitResult: React.FC = () => {
1416
title={t('dmsDataExport.create.result.success')}
1517
subTitle={formValues?.baseValues.desc}
1618
extra={[
17-
<TypedLink
18-
key="jumpToOrderDetail"
19-
to={ROUTE_PATHS.BASE.DATA_EXPORT.detail}
20-
params={{
21-
projectID,
22-
workflowID: workflowID ?? ''
23-
}}
24-
>
25-
<BasicButton type="primary">
26-
{t('dmsDataExport.create.result.guide')}
27-
</BasicButton>
28-
</TypedLink>
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>
30+
<TypedLink
31+
to={ROUTE_PATHS.BASE.DATA_EXPORT.detail}
32+
params={{
33+
projectID,
34+
workflowID: workflowID ?? ''
35+
}}
36+
>
37+
<BasicButton type="primary">
38+
{t('dmsDataExport.create.result.guide')}
39+
</BasicButton>
40+
</TypedLink>
41+
</Space>
2942
]}
3043
/>
3144
);

0 commit comments

Comments
 (0)