Skip to content

Commit c973b69

Browse files
Migrate Forms/FileManager/HtmlEditor demos to the new nested component syntax (#31557)
1 parent 8d9ffd4 commit c973b69

File tree

15 files changed

+384
-343
lines changed

15 files changed

+384
-343
lines changed

apps/demos/Demos/FileManager/BindingToEF/Angular/app/app.component.html

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,32 @@
55
[allowedFileExtensions]="allowedFileExtensions"
66
height="550"
77
>
8-
<dxo-permissions
8+
<dxo-file-manager-permissions
99
[create]="true"
1010
[copy]="true"
1111
[move]="true"
1212
[delete]="true"
1313
[rename]="true"
1414
>
15-
</dxo-permissions>
16-
<dxo-item-view>
17-
<dxo-details>
18-
<dxi-column dataField="thumbnail"></dxi-column>
19-
<dxi-column dataField="name"></dxi-column>
20-
<dxi-column dataField="dateModified" caption="Modified"></dxi-column>
21-
<dxi-column
15+
</dxo-file-manager-permissions>
16+
<dxo-file-manager-item-view>
17+
<dxo-file-manager-details>
18+
<dxi-file-manager-column dataField="thumbnail"></dxi-file-manager-column>
19+
<dxi-file-manager-column dataField="name"></dxi-file-manager-column>
20+
<dxi-file-manager-column
21+
dataField="dateModified"
22+
caption="Modified"
23+
></dxi-file-manager-column>
24+
<dxi-file-manager-column
2225
dataField="created"
2326
caption="Created"
2427
dataType="date"
25-
></dxi-column>
26-
<dxi-column
28+
></dxi-file-manager-column>
29+
<dxi-file-manager-column
2730
dataField="modifiedBy"
2831
caption="Modified By"
2932
visibleIndex="2"
30-
></dxi-column>
31-
</dxo-details>
32-
</dxo-item-view>
33+
></dxi-file-manager-column>
34+
</dxo-file-manager-details>
35+
</dxo-file-manager-item-view>
3336
</dx-file-manager>
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<dx-file-manager id="fileManager" [fileSystemProvider]="fileItems" height="450">
2-
<dxo-permissions
2+
<dxo-file-manager-permissions
33
[create]="true"
44
[copy]="true"
55
[move]="true"
@@ -8,5 +8,5 @@
88
[upload]="true"
99
[download]="true"
1010
>
11-
</dxo-permissions>
11+
</dxo-file-manager-permissions>
1212
</dx-file-manager>

apps/demos/Demos/FileManager/CustomThumbnails/Angular/app/app.component.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
[customizeThumbnail]="customizeIcon"
55
height="450"
66
>
7-
<dxo-item-view mode="thumbnails"> </dxo-item-view>
8-
<dxo-permissions
7+
<dxo-file-manager-item-view mode="thumbnails"> </dxo-file-manager-item-view>
8+
<dxo-file-manager-permissions
99
[create]="true"
1010
[copy]="true"
1111
[move]="true"
@@ -14,5 +14,5 @@
1414
[upload]="true"
1515
[download]="true"
1616
>
17-
</dxo-permissions>
17+
</dxo-file-manager-permissions>
1818
</dx-file-manager>

apps/demos/Demos/FileManager/Overview/Angular/app/app.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
currentPath="Widescreen"
55
(onSelectedFileOpened)="displayImagePopup($event)"
66
>
7-
<dxo-permissions
7+
<dxo-file-manager-permissions
88
[create]="true"
99
[copy]="true"
1010
[move]="true"
@@ -13,7 +13,7 @@
1313
[upload]="true"
1414
[download]="true"
1515
>
16-
</dxo-permissions>
16+
</dxo-file-manager-permissions>
1717
</dx-file-manager>
1818

1919
<dx-popup

apps/demos/Demos/FileManager/UICustomization/Angular/app/app.component.html

Lines changed: 70 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -4,66 +4,89 @@
44
(onContextMenuItemClick)="onItemClick($event)"
55
height="450"
66
>
7-
<dxo-permissions
7+
<dxo-file-manager-permissions
88
[create]="true"
99
[delete]="true"
1010
[rename]="true"
1111
[download]="true"
1212
>
13-
</dxo-permissions>
14-
<dxo-item-view [showParentFolder]="false">
15-
<dxo-details>
16-
<dxi-column dataField="thumbnail"></dxi-column>
17-
<dxi-column dataField="name"></dxi-column>
18-
<dxi-column
13+
</dxo-file-manager-permissions>
14+
<dxo-file-manager-item-view [showParentFolder]="false">
15+
<dxo-file-manager-details>
16+
<dxi-file-manager-column dataField="thumbnail"></dxi-file-manager-column>
17+
<dxi-file-manager-column dataField="name"></dxi-file-manager-column>
18+
<dxi-file-manager-column
1919
dataField="category"
2020
caption="Category"
2121
width="95"
22-
></dxi-column>
23-
<dxi-column dataField="dateModified"></dxi-column>
24-
<dxi-column dataField="size"></dxi-column>
25-
</dxo-details>
26-
</dxo-item-view>
27-
<dxo-toolbar>
28-
<dxi-item name="showNavPane" [visible]="true"></dxi-item>
29-
<dxi-item name="separator"></dxi-item>
30-
<dxi-item name="create"></dxi-item>
31-
<dxi-item
22+
></dxi-file-manager-column>
23+
<dxi-file-manager-column
24+
dataField="dateModified"
25+
></dxi-file-manager-column>
26+
<dxi-file-manager-column dataField="size"></dxi-file-manager-column>
27+
</dxo-file-manager-details>
28+
</dxo-file-manager-item-view>
29+
<dxo-file-manager-toolbar>
30+
<dxi-file-manager-item
31+
name="showNavPane"
32+
[visible]="true"
33+
></dxi-file-manager-item>
34+
<dxi-file-manager-item name="separator"></dxi-file-manager-item>
35+
<dxi-file-manager-item name="create"></dxi-file-manager-item>
36+
<dxi-file-manager-item
3237
widget="dxMenu"
3338
location="before"
3439
[options]="newFileMenuOptions"
35-
></dxi-item>
36-
<dxi-item name="refresh"></dxi-item>
37-
<dxi-item name="separator" location="after"></dxi-item>
38-
<dxi-item name="switchView"></dxi-item>
40+
></dxi-file-manager-item>
41+
<dxi-file-manager-item name="refresh"></dxi-file-manager-item>
42+
<dxi-file-manager-item
43+
name="separator"
44+
location="after"
45+
></dxi-file-manager-item>
46+
<dxi-file-manager-item name="switchView"></dxi-file-manager-item>
3947

40-
<dxi-file-selection-item name="rename"></dxi-file-selection-item>
41-
<dxi-file-selection-item name="separator"></dxi-file-selection-item>
42-
<dxi-file-selection-item name="delete"></dxi-file-selection-item>
43-
<dxi-file-selection-item name="separator"></dxi-file-selection-item>
44-
<dxi-file-selection-item
48+
<dxi-file-manager-file-selection-item
49+
name="rename"
50+
></dxi-file-manager-file-selection-item>
51+
<dxi-file-manager-file-selection-item
52+
name="separator"
53+
></dxi-file-manager-file-selection-item>
54+
<dxi-file-manager-file-selection-item
55+
name="delete"
56+
></dxi-file-manager-file-selection-item>
57+
<dxi-file-manager-file-selection-item
58+
name="separator"
59+
></dxi-file-manager-file-selection-item>
60+
<dxi-file-manager-file-selection-item
4561
widget="dxMenu"
4662
location="before"
4763
[options]="changeCategoryMenuOptions"
48-
></dxi-file-selection-item>
49-
<dxi-file-selection-item name="refresh"></dxi-file-selection-item>
50-
<dxi-file-selection-item name="clearSelection"></dxi-file-selection-item>
51-
</dxo-toolbar>
52-
<dxo-context-menu>
53-
<dxi-item name="create"></dxi-item>
54-
<dxi-item text="Create new file" icon="plus">
55-
<dxi-item text="Text Document"></dxi-item>
56-
<dxi-item text="RTF Document"></dxi-item>
57-
<dxi-item text="Spreadsheet"></dxi-item>
58-
</dxi-item>
59-
<dxi-item name="rename" [beginGroup]="true"></dxi-item>
60-
<dxi-item name="delete"></dxi-item>
61-
<dxi-item text="Category" icon="tags" [beginGroup]="true">
62-
<dxi-item text="Work"></dxi-item>
63-
<dxi-item text="Important"></dxi-item>
64-
<dxi-item text="Home"></dxi-item>
65-
<dxi-item text="None"></dxi-item>
66-
</dxi-item>
67-
<dxi-item name="refresh"></dxi-item>
68-
</dxo-context-menu>
64+
></dxi-file-manager-file-selection-item>
65+
<dxi-file-manager-file-selection-item
66+
name="refresh"
67+
></dxi-file-manager-file-selection-item>
68+
<dxi-file-manager-file-selection-item
69+
name="clearSelection"
70+
></dxi-file-manager-file-selection-item>
71+
</dxo-file-manager-toolbar>
72+
<dxo-file-manager-context-menu>
73+
<dxi-file-manager-item name="create"></dxi-file-manager-item>
74+
<dxi-file-manager-item text="Create new file" icon="plus">
75+
<dxi-file-manager-item text="Text Document"></dxi-file-manager-item>
76+
<dxi-file-manager-item text="RTF Document"></dxi-file-manager-item>
77+
<dxi-file-manager-item text="Spreadsheet"></dxi-file-manager-item>
78+
</dxi-file-manager-item>
79+
<dxi-file-manager-item
80+
name="rename"
81+
[beginGroup]="true"
82+
></dxi-file-manager-item>
83+
<dxi-file-manager-item name="delete"></dxi-file-manager-item>
84+
<dxi-file-manager-item text="Category" icon="tags" [beginGroup]="true">
85+
<dxi-file-manager-item text="Work"></dxi-file-manager-item>
86+
<dxi-file-manager-item text="Important"></dxi-file-manager-item>
87+
<dxi-file-manager-item text="Home"></dxi-file-manager-item>
88+
<dxi-file-manager-item text="None"></dxi-file-manager-item>
89+
</dxi-file-manager-item>
90+
<dxi-file-manager-item name="refresh"></dxi-file-manager-item>
91+
</dxo-file-manager-context-menu>
6992
</dx-file-manager>

apps/demos/Demos/Form/Grouping/Angular/app/app.component.html

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -3,60 +3,60 @@ <h3>Personal details</h3>
33
</div>
44
<div id="form-container">
55
<dx-form id="form" [formData]="employee" [colCount]="2">
6-
<dxi-item
6+
<dxi-form-item
77
itemType="group"
88
captionTemplate="info"
99
caption="System Information"
1010
>
11-
<dxi-item dataField="ID"></dxi-item>
12-
<dxi-item
11+
<dxi-form-item dataField="ID"></dxi-form-item>
12+
<dxi-form-item
1313
itemType="group"
1414
captionTemplate="user"
1515
caption="Main Information"
1616
>
17-
<dxi-item dataField="FirstName"></dxi-item>
18-
<dxi-item dataField="LastName"></dxi-item>
19-
<dxi-item dataField="HireDate"></dxi-item>
20-
<dxi-item dataField="Position"></dxi-item>
21-
<dxi-item dataField="OfficeNo"></dxi-item>
22-
</dxi-item>
23-
</dxi-item>
24-
<dxi-item
17+
<dxi-form-item dataField="FirstName"></dxi-form-item>
18+
<dxi-form-item dataField="LastName"></dxi-form-item>
19+
<dxi-form-item dataField="HireDate"></dxi-form-item>
20+
<dxi-form-item dataField="Position"></dxi-form-item>
21+
<dxi-form-item dataField="OfficeNo"></dxi-form-item>
22+
</dxi-form-item>
23+
</dxi-form-item>
24+
<dxi-form-item
2525
itemType="group"
2626
captionTemplate="personal"
2727
caption="Personal Data"
2828
>
29-
<dxi-item dataField="BirthDate"></dxi-item>
30-
<dxi-item
29+
<dxi-form-item dataField="BirthDate"></dxi-form-item>
30+
<dxi-form-item
3131
itemType="group"
3232
captionTemplate="address"
3333
caption="Home Address"
3434
>
35-
<dxi-item dataField="Address"></dxi-item>
36-
<dxi-item dataField="City"></dxi-item>
37-
<dxi-item dataField="State"></dxi-item>
38-
<dxi-item dataField="Zipcode"></dxi-item>
39-
</dxi-item>
40-
</dxi-item>
41-
<dxi-item
35+
<dxi-form-item dataField="Address"></dxi-form-item>
36+
<dxi-form-item dataField="City"></dxi-form-item>
37+
<dxi-form-item dataField="State"></dxi-form-item>
38+
<dxi-form-item dataField="Zipcode"></dxi-form-item>
39+
</dxi-form-item>
40+
</dxi-form-item>
41+
<dxi-form-item
4242
itemType="group"
4343
captionTemplate="contact"
4444
caption="Contact Information"
4545
>
46-
<dxi-item itemType="tabbed">
47-
<dxo-tab-panel-options [deferRendering]="false">
48-
</dxo-tab-panel-options>
49-
<dxi-tab title="Phone">
50-
<dxi-item dataField="Phone"></dxi-item>
51-
</dxi-tab>
52-
<dxi-tab title="Skype">
53-
<dxi-item dataField="Skype"></dxi-item>
54-
</dxi-tab>
55-
<dxi-tab title="Email">
56-
<dxi-item dataField="Email"></dxi-item>
57-
</dxi-tab>
58-
</dxi-item>
59-
</dxi-item>
46+
<dxi-form-item itemType="tabbed">
47+
<dxo-form-tab-panel-options [deferRendering]="false">
48+
</dxo-form-tab-panel-options>
49+
<dxi-form-tab title="Phone">
50+
<dxi-form-item dataField="Phone"></dxi-form-item>
51+
</dxi-form-tab>
52+
<dxi-form-tab title="Skype">
53+
<dxi-form-item dataField="Skype"></dxi-form-item>
54+
</dxi-form-tab>
55+
<dxi-form-tab title="Email">
56+
<dxi-form-item dataField="Email"></dxi-form-item>
57+
</dxi-form-tab>
58+
</dxi-form-item>
59+
</dxi-form-item>
6060

6161
<ng-container *ngFor="let label of groupCaptionTemplates">
6262
<div *dxTemplate="let data of label.name">

0 commit comments

Comments
 (0)