Skip to content

Commit b4f6f11

Browse files
Merge branch '25_1' of https://github.com/DevExpress/DevExtreme into 25_1_update_demos_menu_v1
2 parents effa03b + eaa8b5d commit b4f6f11

319 files changed

Lines changed: 836 additions & 599 deletions

File tree

Some content is hidden

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

apps/demos/Demos/Autocomplete/Overview/Angular/app/app.component.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
44
import { HttpClient, HttpClientModule, HttpParams } from '@angular/common/http';
55
import { lastValueFrom } from 'rxjs';
66
import { DxAutocompleteModule, DxTemplateModule } from 'devextreme-angular';
7-
import CustomStore from 'devextreme/data/custom_store';
8-
import ODataStore from 'devextreme/data/odata/store';
7+
import { CustomStore, ODataStore } from 'devextreme-angular/common/data';
98
import { Service } from './app.service';
109

1110
if (!/localhost/.test(document.location.host)) {

apps/demos/Demos/Autocomplete/Overview/React/App.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import React, { useCallback, useState } from 'react';
2-
import ODataStore from 'devextreme/data/odata/store';
2+
import { ODataStore, CustomStore } from 'devextreme-react/common/data';
33
import { Autocomplete, type AutocompleteTypes } from 'devextreme-react/autocomplete';
4-
import CustomStore from 'devextreme/data/custom_store';
54
import 'whatwg-fetch';
65
import { names, surnames, positions } from './data.ts';
76

apps/demos/Demos/Autocomplete/Overview/ReactJs/App.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import React, { useCallback, useState } from 'react';
2-
import ODataStore from 'devextreme/data/odata/store';
2+
import { ODataStore, CustomStore } from 'devextreme-react/common/data';
33
import { Autocomplete } from 'devextreme-react/autocomplete';
4-
import CustomStore from 'devextreme/data/custom_store';
54
import 'whatwg-fetch';
65
import { names, surnames, positions } from './data.js';
76

apps/demos/Demos/Autocomplete/Overview/Vue/App.vue

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,8 @@
9696
</template>
9797
<script setup lang="ts">
9898
import { ref } from 'vue';
99-
import ODataStore from 'devextreme/data/odata/store';
99+
import { ODataStore, CustomStore, type LoadOptions } from 'devextreme-vue/common/data';
100100
import { DxAutocomplete } from 'devextreme-vue/autocomplete';
101-
import { type LoadOptions } from 'devextreme-vue/common/data';
102-
import CustomStore from 'devextreme/data/custom_store';
103101
import 'whatwg-fetch';
104102
import { names, surnames, positions } from './data.ts';
105103

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<dx-card-view
33
[dataSource]="employees"
44
[keyExpr]="'ID'"
5+
[allowColumnReordering]="true"
56
[cardsPerRow]="'auto'"
67
[cardMinWidth]="250"
78
[headerFilter]="headerFilterConfig"

apps/demos/Demos/CardView/Overview/React/App.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ const App = () => (
3838
<CardView
3939
dataSource={employees}
4040
keyExpr="ID"
41+
allowColumnReordering={true}
4142
cardsPerRow="auto"
4243
cardMinWidth={250}
4344
headerFilter={headerFilterConfig}

apps/demos/Demos/CardView/Overview/ReactJs/App.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ const App = () => (
3434
<CardView
3535
dataSource={employees}
3636
keyExpr="ID"
37+
allowColumnReordering={true}
3738
cardsPerRow="auto"
3839
cardMinWidth={250}
3940
headerFilter={headerFilterConfig}

apps/demos/Demos/CardView/Overview/Vue/App.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<DxCardView
33
:data-source="employees"
44
key-expr="ID"
5+
:allow-column-reordering="true"
56
cards-per-row="auto"
67
:card-min-width="250"
78
:header-filter="headerFilterConfig"

apps/demos/Demos/CardView/Overview/jQuery/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ $(() => {
1414
'Email',
1515
],
1616
keyExpr: 'ID',
17+
allowColumnReordering: true,
1718
cardsPerRow: 'auto',
1819
cardMinWidth: 250,
1920
cardCover: {

apps/demos/Demos/Charts/BarSparklines/Angular/app/app.component.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ import { HttpClient, HttpClientModule } from '@angular/common/http';
55
import { lastValueFrom } from 'rxjs';
66

77
import { DxSparklineModule, DxSelectBoxModule } from 'devextreme-angular';
8-
import DataSource from 'devextreme/data/data_source';
9-
import CustomStore from 'devextreme/data/custom_store';
8+
import { DataSource, CustomStore } from 'devextreme-angular/common/data';
109

1110
if (!/localhost/.test(document.location.host)) {
1211
enableProdMode();

0 commit comments

Comments
 (0)