Skip to content

Commit 3ed1420

Browse files
authored
Revert "CardView - demos - WA for form items in angular" (#30221)
1 parent ad2bf54 commit 3ed1420

File tree

2 files changed

+83
-41
lines changed

2 files changed

+83
-41
lines changed

apps/demos/Demos/CardView/DataValidation/Angular/app/app.component.html

Lines changed: 44 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -17,34 +17,55 @@
1717
[popup]="popupConfig"
1818
>
1919
<dxo-card-view-form>
20-
<dxi-card-view-item dataField="firstName"></dxi-card-view-item>
21-
<dxi-card-view-item dataField="lastName"></dxi-card-view-item>
22-
<dxi-card-view-item dataField="birthDate"></dxi-card-view-item>
23-
<dxi-card-view-item dataField="picture"></dxi-card-view-item>
24-
<dxi-card-view-item dataField="hireDate"></dxi-card-view-item>
25-
<dxi-card-view-item dataField="title"></dxi-card-view-item>
26-
<dxi-card-view-item dataField="department"></dxi-card-view-item>
2720
<dxi-card-view-item
28-
dataField="notes"
29-
editorType="dxTextArea"
21+
caption="Personal Data"
22+
itemType="group"
23+
[colCount]="2"
3024
[colSpan]="2"
31-
[editorOptions]="{ height: 100 }"
32-
></dxi-card-view-item>
33-
<dxi-card-view-item dataField="picture"></dxi-card-view-item>
25+
>
26+
<dxi-card-view-item dataField="firstName"></dxi-card-view-item>
27+
<dxi-card-view-item dataField="lastName"></dxi-card-view-item>
28+
<dxi-card-view-item dataField="birthDate"></dxi-card-view-item>
29+
<dxi-card-view-item dataField="picture"></dxi-card-view-item>
30+
</dxi-card-view-item>
3431
<dxi-card-view-item
35-
dataField="address"
32+
caption="Main Info"
33+
itemType="group"
34+
[colCount]="2"
3635
[colSpan]="2"
37-
></dxi-card-view-item>
38-
<dxi-card-view-item dataField="city"></dxi-card-view-item>
39-
<dxi-card-view-item dataField="zipcode"></dxi-card-view-item>
36+
>
37+
<dxi-card-view-item dataField="hireDate"></dxi-card-view-item>
38+
<dxi-card-view-item dataField="title"></dxi-card-view-item>
39+
<dxi-card-view-item dataField="department"></dxi-card-view-item>
40+
<dxi-card-view-item
41+
dataField="notes"
42+
editorType="dxTextArea"
43+
[colSpan]="2"
44+
[editorOptions]="{ height: 100 }"
45+
></dxi-card-view-item>
46+
<dxi-card-view-item dataField="picture"></dxi-card-view-item>
47+
</dxi-card-view-item>
4048
<dxi-card-view-item
41-
dataField="mobilePhone"
42-
[editorOptions]="{
43-
mask: '+1 (000) 000-0000',
44-
useMaskedValue: true,
45-
}"
46-
></dxi-card-view-item>
47-
<dxi-card-view-item dataField="email"></dxi-card-view-item>
49+
caption="Contacts"
50+
itemType="group"
51+
[colCount]="2"
52+
[colSpan]="2"
53+
>
54+
<dxi-card-view-item
55+
dataField="address"
56+
[colSpan]="2"
57+
></dxi-card-view-item>
58+
<dxi-card-view-item dataField="city"></dxi-card-view-item>
59+
<dxi-card-view-item dataField="zipcode"></dxi-card-view-item>
60+
<dxi-card-view-item
61+
dataField="mobilePhone"
62+
[editorOptions]="{
63+
mask: '+1 (000) 000-0000',
64+
useMaskedValue: true,
65+
}"
66+
></dxi-card-view-item>
67+
<dxi-card-view-item dataField="email"></dxi-card-view-item>
68+
</dxi-card-view-item>
4869
</dxo-card-view-form>
4970
</dxo-card-view-editing>
5071
<dxi-card-view-column

apps/demos/Demos/CardView/PopupEditing/Angular/app/app.component.html

Lines changed: 39 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,28 +17,49 @@
1717
[popup]="popupConfig"
1818
>
1919
<dxo-card-view-form>
20-
<dxi-card-view-item dataField="firstName"></dxi-card-view-item>
21-
<dxi-card-view-item dataField="lastName"></dxi-card-view-item>
22-
<dxi-card-view-item dataField="birthDate"></dxi-card-view-item>
23-
<dxi-card-view-item dataField="picture"></dxi-card-view-item>
24-
<dxi-card-view-item dataField="hireDate"></dxi-card-view-item>
25-
<dxi-card-view-item dataField="title"></dxi-card-view-item>
26-
<dxi-card-view-item dataField="department"></dxi-card-view-item>
2720
<dxi-card-view-item
28-
dataField="notes"
29-
editorType="dxTextArea"
21+
caption="Personal Data"
22+
itemType="group"
23+
[colCount]="2"
3024
[colSpan]="2"
31-
[editorOptions]="{ height: 100 }"
32-
></dxi-card-view-item>
33-
<dxi-card-view-item dataField="picture"></dxi-card-view-item>
25+
>
26+
<dxi-card-view-item dataField="firstName"></dxi-card-view-item>
27+
<dxi-card-view-item dataField="lastName"></dxi-card-view-item>
28+
<dxi-card-view-item dataField="birthDate"></dxi-card-view-item>
29+
<dxi-card-view-item dataField="picture"></dxi-card-view-item>
30+
</dxi-card-view-item>
3431
<dxi-card-view-item
35-
dataField="address"
32+
caption="Main Info"
33+
itemType="group"
34+
[colCount]="2"
3635
[colSpan]="2"
37-
></dxi-card-view-item>
38-
<dxi-card-view-item dataField="city"></dxi-card-view-item>
39-
<dxi-card-view-item dataField="zipcode"></dxi-card-view-item>
40-
<dxi-card-view-item dataField="mobilePhone"></dxi-card-view-item>
41-
<dxi-card-view-item dataField="email"></dxi-card-view-item>
36+
>
37+
<dxi-card-view-item dataField="hireDate"></dxi-card-view-item>
38+
<dxi-card-view-item dataField="title"></dxi-card-view-item>
39+
<dxi-card-view-item dataField="department"></dxi-card-view-item>
40+
<dxi-card-view-item
41+
dataField="notes"
42+
editorType="dxTextArea"
43+
[colSpan]="2"
44+
[editorOptions]="{ height: 100 }"
45+
></dxi-card-view-item>
46+
<dxi-card-view-item dataField="picture"></dxi-card-view-item>
47+
</dxi-card-view-item>
48+
<dxi-card-view-item
49+
caption="Contacts"
50+
itemType="group"
51+
[colCount]="2"
52+
[colSpan]="2"
53+
>
54+
<dxi-card-view-item
55+
dataField="address"
56+
[colSpan]="2"
57+
></dxi-card-view-item>
58+
<dxi-card-view-item dataField="city"></dxi-card-view-item>
59+
<dxi-card-view-item dataField="zipcode"></dxi-card-view-item>
60+
<dxi-card-view-item dataField="mobilePhone"></dxi-card-view-item>
61+
<dxi-card-view-item dataField="email"></dxi-card-view-item>
62+
</dxi-card-view-item>
4263
</dxo-card-view-form>
4364
</dxo-card-view-editing>
4465
<dxi-card-view-column

0 commit comments

Comments
 (0)