Skip to content

Commit ce73ef0

Browse files
authored
Merge pull request #688 from actiontech/fix/issue-626
[fix](DataExportManagement): Add required rule for database field
2 parents 1825e59 + 10058b4 commit ce73ef0

File tree

4 files changed

+29
-10
lines changed

4 files changed

+29
-10
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ exports[`first should match snapshot when pageState is equal CREATE_TASK 1`] = `
360360
</div>
361361
</div>
362362
<div
363-
class="ant-form-item css-1jlm9cy"
363+
class="ant-form-item has-required-style css-1jlm9cy"
364364
>
365365
<div
366366
class="ant-row ant-form-item-row"
@@ -369,7 +369,7 @@ exports[`first should match snapshot when pageState is equal CREATE_TASK 1`] = `
369369
class="ant-col ant-col-11 ant-form-item-label ant-form-item-label-left"
370370
>
371371
<label
372-
class="ant-form-item-no-colon"
372+
class="ant-form-item-required ant-form-item-no-colon"
373373
for="schema"
374374
title=""
375375
>
@@ -418,6 +418,7 @@ exports[`first should match snapshot when pageState is equal CREATE_TASK 1`] = `
418418
class="ant-form-item-control-input-content"
419419
>
420420
<div
421+
aria-required="true"
421422
class="ant-select ant-select-in-form-item basic-select-wrapper css-iy4o4x ant-select-single ant-select-show-arrow"
422423
>
423424
<div
@@ -433,6 +434,7 @@ exports[`first should match snapshot when pageState is equal CREATE_TASK 1`] = `
433434
aria-expanded="false"
434435
aria-haspopup="listbox"
435436
aria-owns="schema_list"
437+
aria-required="true"
436438
autocomplete="off"
437439
class="ant-select-selection-search-input"
438440
id="schema"

packages/base/src/page/DataExportManagement/Create/components/CreateTask/ExportSourceForm/ExportSourceFormItem.tsx

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,15 @@ const ExportSourceFormItem: React.FC<
113113
</div>
114114
}
115115
name="schema"
116+
className="has-required-style"
117+
rules={[
118+
{
119+
required: true,
120+
message: t('common.form.placeholder.select', {
121+
name: t('dmsDataExport.create.form.source.schema')
122+
})
123+
}
124+
]}
116125
>
117126
<BasicSelect
118127
placeholder={t('common.form.placeholder.select', {

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ exports[`test base/DataExport/Create/CreateExportTask should match snapshot when
385385
</div>
386386
</div>
387387
<div
388-
class="ant-form-item css-1jlm9cy"
388+
class="ant-form-item has-required-style css-1jlm9cy"
389389
>
390390
<div
391391
class="ant-row ant-form-item-row"
@@ -394,7 +394,7 @@ exports[`test base/DataExport/Create/CreateExportTask should match snapshot when
394394
class="ant-col ant-col-11 ant-form-item-label ant-form-item-label-left"
395395
>
396396
<label
397-
class="ant-form-item-no-colon"
397+
class="ant-form-item-required ant-form-item-no-colon"
398398
for="schema"
399399
title=""
400400
>
@@ -443,6 +443,7 @@ exports[`test base/DataExport/Create/CreateExportTask should match snapshot when
443443
class="ant-form-item-control-input-content"
444444
>
445445
<div
446+
aria-required="true"
446447
class="ant-select ant-select-in-form-item basic-select-wrapper css-iy4o4x ant-select-single ant-select-show-arrow"
447448
>
448449
<div
@@ -458,6 +459,7 @@ exports[`test base/DataExport/Create/CreateExportTask should match snapshot when
458459
aria-expanded="false"
459460
aria-haspopup="listbox"
460461
aria-owns="schema_list"
462+
aria-required="true"
461463
autocomplete="off"
462464
class="ant-select-selection-search-input"
463465
id="schema"
@@ -1126,7 +1128,7 @@ exports[`test base/DataExport/Create/CreateExportTask should match snapshot when
11261128
</div>
11271129
</div>
11281130
<div
1129-
class="ant-form-item css-1jlm9cy"
1131+
class="ant-form-item has-required-style css-1jlm9cy"
11301132
>
11311133
<div
11321134
class="ant-row ant-form-item-row"
@@ -1135,7 +1137,7 @@ exports[`test base/DataExport/Create/CreateExportTask should match snapshot when
11351137
class="ant-col ant-col-11 ant-form-item-label ant-form-item-label-left"
11361138
>
11371139
<label
1138-
class="ant-form-item-no-colon"
1140+
class="ant-form-item-required ant-form-item-no-colon"
11391141
for="schema"
11401142
title=""
11411143
>
@@ -1184,6 +1186,7 @@ exports[`test base/DataExport/Create/CreateExportTask should match snapshot when
11841186
class="ant-form-item-control-input-content"
11851187
>
11861188
<div
1189+
aria-required="true"
11871190
class="ant-select ant-select-in-form-item basic-select-wrapper css-iy4o4x ant-select-single ant-select-show-arrow"
11881191
>
11891192
<div
@@ -1199,6 +1202,7 @@ exports[`test base/DataExport/Create/CreateExportTask should match snapshot when
11991202
aria-expanded="false"
12001203
aria-haspopup="listbox"
12011204
aria-owns="schema_list"
1205+
aria-required="true"
12021206
autocomplete="off"
12031207
class="ant-select-selection-search-input"
12041208
id="schema"

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ exports[`test base/DataExport/Create/UpdateInfoDrawer should match snapshot 1`]
399399
</div>
400400
</div>
401401
<div
402-
class="ant-form-item css-1jlm9cy"
402+
class="ant-form-item has-required-style css-1jlm9cy"
403403
>
404404
<div
405405
class="ant-row ant-form-item-row"
@@ -408,7 +408,7 @@ exports[`test base/DataExport/Create/UpdateInfoDrawer should match snapshot 1`]
408408
class="ant-col ant-col-11 ant-form-item-label ant-form-item-label-left"
409409
>
410410
<label
411-
class="ant-form-item-no-colon"
411+
class="ant-form-item-required ant-form-item-no-colon"
412412
for="schema"
413413
title=""
414414
>
@@ -457,6 +457,7 @@ exports[`test base/DataExport/Create/UpdateInfoDrawer should match snapshot 1`]
457457
class="ant-form-item-control-input-content"
458458
>
459459
<div
460+
aria-required="true"
460461
class="ant-select ant-select-in-form-item basic-select-wrapper css-iy4o4x ant-select-single ant-select-show-arrow"
461462
>
462463
<div
@@ -472,6 +473,7 @@ exports[`test base/DataExport/Create/UpdateInfoDrawer should match snapshot 1`]
472473
aria-expanded="false"
473474
aria-haspopup="listbox"
474475
aria-owns="schema_list"
476+
aria-required="true"
475477
autocomplete="off"
476478
class="ant-select-selection-search-input"
477479
id="schema"
@@ -1198,7 +1200,7 @@ exports[`test base/DataExport/Create/UpdateInfoDrawer should match snapshot when
11981200
</div>
11991201
</div>
12001202
<div
1201-
class="ant-form-item css-1jlm9cy"
1203+
class="ant-form-item has-required-style css-1jlm9cy"
12021204
>
12031205
<div
12041206
class="ant-row ant-form-item-row"
@@ -1207,7 +1209,7 @@ exports[`test base/DataExport/Create/UpdateInfoDrawer should match snapshot when
12071209
class="ant-col ant-col-11 ant-form-item-label ant-form-item-label-left"
12081210
>
12091211
<label
1210-
class="ant-form-item-no-colon"
1212+
class="ant-form-item-required ant-form-item-no-colon"
12111213
for="schema"
12121214
title=""
12131215
>
@@ -1256,6 +1258,7 @@ exports[`test base/DataExport/Create/UpdateInfoDrawer should match snapshot when
12561258
class="ant-form-item-control-input-content"
12571259
>
12581260
<div
1261+
aria-required="true"
12591262
class="ant-select ant-select-in-form-item basic-select-wrapper css-iy4o4x ant-select-single ant-select-show-arrow"
12601263
>
12611264
<div
@@ -1271,6 +1274,7 @@ exports[`test base/DataExport/Create/UpdateInfoDrawer should match snapshot when
12711274
aria-expanded="false"
12721275
aria-haspopup="listbox"
12731276
aria-owns="schema_list"
1277+
aria-required="true"
12741278
autocomplete="off"
12751279
class="ant-select-selection-search-input"
12761280
id="schema"

0 commit comments

Comments
 (0)