Skip to content

Commit 0bf4a61

Browse files
GoodDayForSurfGoodDayForSurf
committed
Merge branch '25_2_check_angular_21_in_demos' of https://github.com/GoodDayForSurf/DevExtreme into 25_2_check_angular_21_in_demos
2 parents 2573553 + d676058 commit 0bf4a61

File tree

86 files changed

+3980
-1477
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+3980
-1477
lines changed

‎apps/demos/Demos/FileUploader/FileSelection/Angular/app/app.component.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {
33
Component,
44
ViewChild,
55
enableProdMode,
6-
provideZoneChangeDetection
6+
provideZoneChangeDetection,
77
} from '@angular/core';
88
import { NgForm } from '@angular/forms';
99
import { DxTextBoxModule, DxFileUploaderModule, DxButtonModule } from 'devextreme-angular';

‎apps/demos/Demos/Scheduler/Agenda/Angular/app/app.component.html‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -23,27 +23,4 @@
2323
icon="tags"
2424
>
2525
</dxi-scheduler-resource>
26-
27-
<dxo-scheduler-editing>
28-
<dxo-scheduler-form>
29-
<dxi-scheduler-item name="mainGroup">
30-
<dxi-scheduler-item name="subjectGroup"></dxi-scheduler-item>
31-
<dxi-scheduler-item name="dateGroup"></dxi-scheduler-item>
32-
<dxi-scheduler-item name="repeatGroup"></dxi-scheduler-item>
33-
<dxi-scheduler-item name="resourcesGroup">
34-
<dxi-scheduler-item
35-
name="assigneeIdGroup"
36-
[colCount]="3"
37-
[colCountByScreen]="{ xs: 3 }"
38-
>
39-
<dxi-scheduler-item name="assigneeIdIcon"></dxi-scheduler-item>
40-
<dxi-scheduler-item name="assigneeId"></dxi-scheduler-item>
41-
<dxi-scheduler-item name="priorityId"></dxi-scheduler-item>
42-
</dxi-scheduler-item>
43-
</dxi-scheduler-item>
44-
<dxi-scheduler-item name="descriptionGroup"></dxi-scheduler-item>
45-
</dxi-scheduler-item>
46-
<dxi-scheduler-item name="recurrenceGroup"></dxi-scheduler-item>
47-
</dxo-scheduler-form>
48-
</dxo-scheduler-editing>
4926
</dx-scheduler>

‎apps/demos/Demos/Scheduler/Agenda/React/App.tsx‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
import React from 'react';
22
import Scheduler, {
33
Resource,
4-
Editing,
5-
Form as SchedulerForm,
6-
Item,
74
type SchedulerTypes,
85
} from 'devextreme-react/scheduler';
96
import ArrayStore from 'devextreme/data/array_store';
@@ -39,25 +36,6 @@ const App = () => (
3936
label="Priority"
4037
icon="tags"
4138
/>
42-
43-
<Editing>
44-
<SchedulerForm>
45-
<Item name="mainGroup">
46-
<Item name="subjectGroup" />
47-
<Item name="dateGroup" />
48-
<Item name="repeatGroup" />
49-
<Item name="resourcesGroup">
50-
<Item name="assigneeIdGroup" colCount={3} colCountByScreen={{ xs: 3 }}>
51-
<Item name="assigneeIdIcon" />
52-
<Item name="assigneeId" />
53-
<Item name="priorityId" />
54-
</Item>
55-
</Item>
56-
<Item name="descriptionGroup" />
57-
</Item>
58-
<Item name="recurrenceGroup" />
59-
</SchedulerForm>
60-
</Editing>
6139
</Scheduler>
6240
);
6341

‎apps/demos/Demos/Scheduler/Agenda/ReactJs/App.js‎

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
import React from 'react';
2-
import Scheduler, {
3-
Resource,
4-
Editing,
5-
Form as SchedulerForm,
6-
Item,
7-
} from 'devextreme-react/scheduler';
2+
import Scheduler, { Resource } from 'devextreme-react/scheduler';
83
import ArrayStore from 'devextreme/data/array_store';
94
import { assignees, data, priorities } from './data.js';
105

@@ -38,29 +33,6 @@ const App = () => (
3833
label="Priority"
3934
icon="tags"
4035
/>
41-
42-
<Editing>
43-
<SchedulerForm>
44-
<Item name="mainGroup">
45-
<Item name="subjectGroup" />
46-
<Item name="dateGroup" />
47-
<Item name="repeatGroup" />
48-
<Item name="resourcesGroup">
49-
<Item
50-
name="assigneeIdGroup"
51-
colCount={3}
52-
colCountByScreen={{ xs: 3 }}
53-
>
54-
<Item name="assigneeIdIcon" />
55-
<Item name="assigneeId" />
56-
<Item name="priorityId" />
57-
</Item>
58-
</Item>
59-
<Item name="descriptionGroup" />
60-
</Item>
61-
<Item name="recurrenceGroup" />
62-
</SchedulerForm>
63-
</Editing>
6436
</Scheduler>
6537
);
6638
export default App;

‎apps/demos/Demos/Scheduler/Agenda/Vue/App.vue‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -22,38 +22,12 @@
2222
label="Priority"
2323
icon="tags"
2424
/>
25-
26-
<DxEditing>
27-
<DxSchedulerForm>
28-
<DxItem name="mainGroup">
29-
<DxItem name="subjectGroup"/>
30-
<DxItem name="dateGroup"/>
31-
<DxItem name="repeatGroup"/>
32-
<DxItem name="resourcesGroup">
33-
<DxItem
34-
:col-count="3"
35-
:col-count-by-screen="{ xs: 3 }"
36-
name="assigneeIdGroup"
37-
>
38-
<DxItem name="assigneeIdIcon"/>
39-
<DxItem name="assigneeId"/>
40-
<DxItem name="priorityId"/>
41-
</DxItem>
42-
</DxItem>
43-
<DxItem name="descriptionGroup"/>
44-
</DxItem>
45-
<DxItem name="recurrenceGroup"/>
46-
</DxSchedulerForm>
47-
</DxEditing>
4825
</DxScheduler>
4926
</template>
5027
<script setup lang="ts">
5128
import DxScheduler, {
5229
DxResource,
53-
DxEditing,
54-
DxForm as DxSchedulerForm,
5530
} from 'devextreme-vue/scheduler';
56-
import { DxItem } from 'devextreme-vue/form';
5731
import { ArrayStore } from 'devextreme-vue/common/data';
5832
import { data, assignees, priorities } from './data.ts';
5933

‎apps/demos/Demos/Scheduler/Agenda/jQuery/index.js‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -23,35 +23,6 @@ $(() => {
2323
label: 'Priority',
2424
icon: 'tags',
2525
}],
26-
editing: {
27-
form: {
28-
items: [
29-
{
30-
name: 'mainGroup',
31-
items: [
32-
'subjectGroup',
33-
'dateGroup',
34-
'repeatGroup',
35-
{
36-
name: 'resourcesGroup',
37-
items: [
38-
{
39-
name: 'assigneeIdGroup',
40-
colCount: 3,
41-
colCountByScreen: {
42-
xs: 3,
43-
},
44-
items: ['assigneeIdIcon', 'assigneeId', 'priorityId'],
45-
},
46-
],
47-
},
48-
'descriptionGroup',
49-
],
50-
},
51-
'recurrenceGroup',
52-
],
53-
},
54-
},
5526
height: 600,
5627
});
5728
});

‎apps/demos/Demos/Scheduler/Timelines/Angular/app/app.component.html‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -26,27 +26,4 @@
2626
label="Priority"
2727
icon="tags"
2828
></dxi-scheduler-resource>
29-
30-
<dxo-scheduler-editing>
31-
<dxo-scheduler-form>
32-
<dxi-scheduler-item name="mainGroup">
33-
<dxi-scheduler-item name="subjectGroup"></dxi-scheduler-item>
34-
<dxi-scheduler-item name="dateGroup"></dxi-scheduler-item>
35-
<dxi-scheduler-item name="repeatGroup"></dxi-scheduler-item>
36-
<dxi-scheduler-item name="resourcesGroup">
37-
<dxi-scheduler-item
38-
name="ownerIdGroup"
39-
[colCount]="3"
40-
[colCountByScreen]="{ xs: 3 }"
41-
>
42-
<dxi-scheduler-item name="ownerIdIcon"></dxi-scheduler-item>
43-
<dxi-scheduler-item name="ownerId"></dxi-scheduler-item>
44-
<dxi-scheduler-item name="priority"></dxi-scheduler-item>
45-
</dxi-scheduler-item>
46-
</dxi-scheduler-item>
47-
<dxi-scheduler-item name="descriptionGroup"></dxi-scheduler-item>
48-
</dxi-scheduler-item>
49-
<dxi-scheduler-item name="recurrenceGroup"></dxi-scheduler-item>
50-
</dxo-scheduler-form>
51-
</dxo-scheduler-editing>
5229
</dx-scheduler>

‎apps/demos/Demos/Scheduler/Timelines/React/App.tsx‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@ import React from 'react';
22

33
import Scheduler, {
44
Resource,
5-
Editing,
6-
Form as SchedulerForm,
7-
Item,
85
type SchedulerTypes,
96
} from 'devextreme-react/scheduler';
107

@@ -43,25 +40,6 @@ const App = () => (
4340
label="Priority"
4441
icon="tags"
4542
/>
46-
47-
<Editing>
48-
<SchedulerForm>
49-
<Item name="mainGroup">
50-
<Item name="subjectGroup" />
51-
<Item name="dateGroup" />
52-
<Item name="repeatGroup" />
53-
<Item name="resourcesGroup">
54-
<Item name="ownerIdGroup" colCount={3} colCountByScreen={{ xs: 3 }}>
55-
<Item name="ownerIdIcon" />
56-
<Item name="ownerId" />
57-
<Item name="priority" />
58-
</Item>
59-
</Item>
60-
<Item name="descriptionGroup" />
61-
</Item>
62-
<Item name="recurrenceGroup" />
63-
</SchedulerForm>
64-
</Editing>
6543
</Scheduler>
6644
);
6745

‎apps/demos/Demos/Scheduler/Timelines/ReactJs/App.js‎

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
import React from 'react';
2-
import Scheduler, {
3-
Resource,
4-
Editing,
5-
Form as SchedulerForm,
6-
Item,
7-
} from 'devextreme-react/scheduler';
2+
import Scheduler, { Resource } from 'devextreme-react/scheduler';
83
import { data, resourcesData, priorityData } from './data.js';
94

105
const currentDate = new Date(2021, 1, 2);
@@ -39,29 +34,6 @@ const App = () => (
3934
label="Priority"
4035
icon="tags"
4136
/>
42-
43-
<Editing>
44-
<SchedulerForm>
45-
<Item name="mainGroup">
46-
<Item name="subjectGroup" />
47-
<Item name="dateGroup" />
48-
<Item name="repeatGroup" />
49-
<Item name="resourcesGroup">
50-
<Item
51-
name="ownerIdGroup"
52-
colCount={3}
53-
colCountByScreen={{ xs: 3 }}
54-
>
55-
<Item name="ownerIdIcon" />
56-
<Item name="ownerId" />
57-
<Item name="priority" />
58-
</Item>
59-
</Item>
60-
<Item name="descriptionGroup" />
61-
</Item>
62-
<Item name="recurrenceGroup" />
63-
</SchedulerForm>
64-
</Editing>
6537
</Scheduler>
6638
);
6739
export default App;

‎apps/demos/Demos/Scheduler/Timelines/Vue/App.vue‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -27,40 +27,14 @@
2727
label="Priority"
2828
icon="tags"
2929
/>
30-
31-
<DxEditing>
32-
<DxSchedulerForm>
33-
<DxItem name="mainGroup">
34-
<DxItem name="subjectGroup"/>
35-
<DxItem name="dateGroup"/>
36-
<DxItem name="repeatGroup"/>
37-
<DxItem name="resourcesGroup">
38-
<DxItem
39-
:col-count="3"
40-
:col-count-by-screen="{ xs: 3 }"
41-
name="ownerIdGroup"
42-
>
43-
<DxItem name="ownerIdIcon"/>
44-
<DxItem name="ownerId"/>
45-
<DxItem name="priority"/>
46-
</DxItem>
47-
</DxItem>
48-
<DxItem name="descriptionGroup"/>
49-
</DxItem>
50-
<DxItem name="recurrenceGroup"/>
51-
</DxSchedulerForm>
52-
</DxEditing>
5330
</DxScheduler>
5431
</template>
5532
<script setup lang="ts">
5633
import {
5734
DxScheduler,
5835
DxResource,
59-
DxEditing,
60-
DxForm as DxSchedulerForm,
6136
type DxSchedulerTypes,
6237
} from 'devextreme-vue/scheduler';
63-
import { DxItem } from 'devextreme-vue/form';
6438
import { data, priorityData, resourcesData } from './data.ts';
6539
6640
const views: DxSchedulerTypes.ViewType[] = ['timelineDay', 'timelineWeek', 'timelineWorkWeek', 'timelineMonth'];

0 commit comments

Comments
 (0)