diff --git a/apps/demos/Demos/DataGrid/AdvancedMasterDetailView/Angular/app/app.component.html b/apps/demos/Demos/DataGrid/AdvancedMasterDetailView/Angular/app/app.component.html index 1ba99e52261e..1a8259bc4d84 100644 --- a/apps/demos/Demos/DataGrid/AdvancedMasterDetailView/Angular/app/app.component.html +++ b/apps/demos/Demos/DataGrid/AdvancedMasterDetailView/Angular/app/app.component.html @@ -5,6 +5,7 @@ [showBorders]="true" > + diff --git a/apps/demos/Demos/DataGrid/AdvancedMasterDetailView/React/App.tsx b/apps/demos/Demos/DataGrid/AdvancedMasterDetailView/React/App.tsx index acdeb083a308..9c9fc208a934 100644 --- a/apps/demos/Demos/DataGrid/AdvancedMasterDetailView/React/App.tsx +++ b/apps/demos/Demos/DataGrid/AdvancedMasterDetailView/React/App.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { - Column, DataGrid, MasterDetail, Paging, + Column, DataGrid, MasterDetail, Paging, Pager, } from 'devextreme-react/data-grid'; import { createStore } from 'devextreme-aspnet-data-nojquery'; import MasterDetailView from './MasterDetailView.tsx'; @@ -25,6 +25,7 @@ const App = () => ( component={MasterDetailView} /> + diff --git a/apps/demos/Demos/DataGrid/AdvancedMasterDetailView/ReactJs/App.js b/apps/demos/Demos/DataGrid/AdvancedMasterDetailView/ReactJs/App.js index 5c6f56658210..847738e0210e 100644 --- a/apps/demos/Demos/DataGrid/AdvancedMasterDetailView/ReactJs/App.js +++ b/apps/demos/Demos/DataGrid/AdvancedMasterDetailView/ReactJs/App.js @@ -1,6 +1,6 @@ import React from 'react'; import { - Column, DataGrid, MasterDetail, Paging, + Column, DataGrid, MasterDetail, Paging, Pager, } from 'devextreme-react/data-grid'; import { createStore } from 'devextreme-aspnet-data-nojquery'; import MasterDetailView from './MasterDetailView.js'; @@ -22,6 +22,7 @@ const App = () => ( component={MasterDetailView} /> + diff --git a/apps/demos/Demos/DataGrid/AdvancedMasterDetailView/Vue/App.vue b/apps/demos/Demos/DataGrid/AdvancedMasterDetailView/Vue/App.vue index aab9149fd857..068c45556825 100644 --- a/apps/demos/Demos/DataGrid/AdvancedMasterDetailView/Vue/App.vue +++ b/apps/demos/Demos/DataGrid/AdvancedMasterDetailView/Vue/App.vue @@ -6,6 +6,7 @@ :show-borders="true" > + @@ -27,6 +28,7 @@ import { DxDataGrid, DxColumn, DxPaging, + DxPager, DxMasterDetail, } from 'devextreme-vue/data-grid'; diff --git a/apps/demos/Demos/DataGrid/AdvancedMasterDetailView/jQuery/index.js b/apps/demos/Demos/DataGrid/AdvancedMasterDetailView/jQuery/index.js index ff37b921e5c7..080faa506792 100644 --- a/apps/demos/Demos/DataGrid/AdvancedMasterDetailView/jQuery/index.js +++ b/apps/demos/Demos/DataGrid/AdvancedMasterDetailView/jQuery/index.js @@ -10,6 +10,9 @@ $(() => { paging: { pageSize: 15, }, + pager: { + visible: true, + }, remoteOperations: true, columns: [ 'ContactName', diff --git a/apps/demos/Demos/DataGrid/BatchUpdateRequest/Angular/app/app.component.html b/apps/demos/Demos/DataGrid/BatchUpdateRequest/Angular/app/app.component.html index bf6640e52fc2..df6aa57bdf91 100644 --- a/apps/demos/Demos/DataGrid/BatchUpdateRequest/Angular/app/app.component.html +++ b/apps/demos/Demos/DataGrid/BatchUpdateRequest/Angular/app/app.component.html @@ -12,7 +12,7 @@ [allowDeleting]="true" [allowUpdating]="true" > - + diff --git a/apps/demos/Demos/DataGrid/BatchUpdateRequest/React/App.tsx b/apps/demos/Demos/DataGrid/BatchUpdateRequest/React/App.tsx index b48a0e81cca4..c1f16e2f08cb 100644 --- a/apps/demos/Demos/DataGrid/BatchUpdateRequest/React/App.tsx +++ b/apps/demos/Demos/DataGrid/BatchUpdateRequest/React/App.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import DataGrid, { DataGridRef, Column, DataGridTypes, Editing } from 'devextreme-react/data-grid'; +import DataGrid, { DataGridRef, Column, DataGridTypes, Editing, Pager, } from 'devextreme-react/data-grid'; import { createStore } from 'devextreme-aspnet-data-nojquery'; import 'whatwg-fetch'; @@ -58,6 +58,7 @@ const App = () => ( allowDeleting={true} allowUpdating={true} /> + diff --git a/apps/demos/Demos/DataGrid/BatchUpdateRequest/ReactJs/App.js b/apps/demos/Demos/DataGrid/BatchUpdateRequest/ReactJs/App.js index 524f3ff3c10f..d1fe7063121e 100644 --- a/apps/demos/Demos/DataGrid/BatchUpdateRequest/ReactJs/App.js +++ b/apps/demos/Demos/DataGrid/BatchUpdateRequest/ReactJs/App.js @@ -1,5 +1,5 @@ import React from 'react'; -import DataGrid, { Column, Editing } from 'devextreme-react/data-grid'; +import DataGrid, { Column, Editing, Pager } from 'devextreme-react/data-grid'; import { createStore } from 'devextreme-aspnet-data-nojquery'; import 'whatwg-fetch'; @@ -51,6 +51,7 @@ const App = () => ( allowDeleting={true} allowUpdating={true} /> + + diff --git a/apps/demos/Demos/DataGrid/ColumnsBasedOnADataSource/jQuery/index.js b/apps/demos/Demos/DataGrid/ColumnsBasedOnADataSource/jQuery/index.js index 45747ffa1b98..4ac8d2257371 100644 --- a/apps/demos/Demos/DataGrid/ColumnsBasedOnADataSource/jQuery/index.js +++ b/apps/demos/Demos/DataGrid/ColumnsBasedOnADataSource/jQuery/index.js @@ -3,5 +3,8 @@ $(() => { dataSource: orders, keyExpr: 'OrderNumber', showBorders: true, + pager: { + visible: true, + } }); }); diff --git a/apps/demos/Demos/DataGrid/CustomDataSource/Angular/app/app.component.html b/apps/demos/Demos/DataGrid/CustomDataSource/Angular/app/app.component.html index 3cb11a98d84c..2b5ef4da8461 100644 --- a/apps/demos/Demos/DataGrid/CustomDataSource/Angular/app/app.component.html +++ b/apps/demos/Demos/DataGrid/CustomDataSource/Angular/app/app.component.html @@ -13,6 +13,7 @@ diff --git a/apps/demos/Demos/DataGrid/CustomDataSource/React/App.tsx b/apps/demos/Demos/DataGrid/CustomDataSource/React/App.tsx index c30007eee83a..b1227dd81398 100644 --- a/apps/demos/Demos/DataGrid/CustomDataSource/React/App.tsx +++ b/apps/demos/Demos/DataGrid/CustomDataSource/React/App.tsx @@ -73,6 +73,7 @@ const App = () => ( /> diff --git a/apps/demos/Demos/DataGrid/CustomDataSource/ReactJs/App.js b/apps/demos/Demos/DataGrid/CustomDataSource/ReactJs/App.js index 8c95ea2449ae..050474c6af31 100644 --- a/apps/demos/Demos/DataGrid/CustomDataSource/ReactJs/App.js +++ b/apps/demos/Demos/DataGrid/CustomDataSource/ReactJs/App.js @@ -75,6 +75,7 @@ const App = () => ( /> diff --git a/apps/demos/Demos/DataGrid/CustomDataSource/Vue/App.vue b/apps/demos/Demos/DataGrid/CustomDataSource/Vue/App.vue index 35e5bd92f97a..1ec6cd5b4ebe 100644 --- a/apps/demos/Demos/DataGrid/CustomDataSource/Vue/App.vue +++ b/apps/demos/Demos/DataGrid/CustomDataSource/Vue/App.vue @@ -31,6 +31,7 @@ /> diff --git a/apps/demos/Demos/DataGrid/CustomDataSource/jQuery/index.js b/apps/demos/Demos/DataGrid/CustomDataSource/jQuery/index.js index fea28da9fede..d75c7856d104 100644 --- a/apps/demos/Demos/DataGrid/CustomDataSource/jQuery/index.js +++ b/apps/demos/Demos/DataGrid/CustomDataSource/jQuery/index.js @@ -47,6 +47,7 @@ $(() => { pageSize: 12, }, pager: { + visible: true, showPageSizeSelector: true, allowedPageSizes: [8, 12, 20], }, diff --git a/apps/demos/Demos/DataGrid/CustomEditors/Angular/app/app.component.html b/apps/demos/Demos/DataGrid/CustomEditors/Angular/app/app.component.html index 02e82892f754..62cbee9eb408 100644 --- a/apps/demos/Demos/DataGrid/CustomEditors/Angular/app/app.component.html +++ b/apps/demos/Demos/DataGrid/CustomEditors/Angular/app/app.component.html @@ -5,6 +5,7 @@ (onRowInserted)="$event.component.navigateToRow($event.key)" > + diff --git a/apps/demos/Demos/DataGrid/CustomEditors/React/App.tsx b/apps/demos/Demos/DataGrid/CustomEditors/React/App.tsx index c565313b3805..cab38dc0abee 100644 --- a/apps/demos/Demos/DataGrid/CustomEditors/React/App.tsx +++ b/apps/demos/Demos/DataGrid/CustomEditors/React/App.tsx @@ -8,6 +8,7 @@ import DataGrid, { Lookup, RequiredRule, DataGridTypes, + Pager, } from 'devextreme-react/data-grid'; import { createStore } from 'devextreme-aspnet-data-nojquery'; import SelectBox, { SelectBoxTypes } from 'devextreme-react/select-box'; @@ -94,6 +95,7 @@ const App = () => ( onRowInserted={onRowInserted} > + ( enabled={true} defaultPageSize={15} /> + + { enabled: true, pageSize: 15, }, + pager:{ + visible: true, + }, headerFilter: { visible: true, }, diff --git a/apps/demos/Demos/DataGrid/CustomNewRecordPosition/Angular/app/app.component.html b/apps/demos/Demos/DataGrid/CustomNewRecordPosition/Angular/app/app.component.html index 3d8ff1da2b52..3164106976d2 100644 --- a/apps/demos/Demos/DataGrid/CustomNewRecordPosition/Angular/app/app.component.html +++ b/apps/demos/Demos/DataGrid/CustomNewRecordPosition/Angular/app/app.component.html @@ -18,6 +18,7 @@ [changes]="changes" [(editRowKey)]="editRowKey" > + diff --git a/apps/demos/Demos/DataGrid/CustomNewRecordPosition/React/App.tsx b/apps/demos/Demos/DataGrid/CustomNewRecordPosition/React/App.tsx index 917200db5681..83acbf595494 100644 --- a/apps/demos/Demos/DataGrid/CustomNewRecordPosition/React/App.tsx +++ b/apps/demos/Demos/DataGrid/CustomNewRecordPosition/React/App.tsx @@ -1,6 +1,6 @@ import React, { useCallback, useState } from 'react'; import DataGrid, { - Column, Editing, ValidationRule, Button, IButtonProps, Toolbar, Item, Scrolling, DataGridTypes, + Column, Editing, ValidationRule, Button, IButtonProps, Toolbar, Item, Scrolling, DataGridTypes, Pager, } from 'devextreme-react/data-grid'; import SelectBox from 'devextreme-react/select-box'; import Guid from 'devextreme/core/guid'; @@ -56,6 +56,7 @@ const App = () => { editRowKey={editRowKey} onEditRowKeyChange={setEditRowKey} /> + diff --git a/apps/demos/Demos/DataGrid/CustomNewRecordPosition/ReactJs/App.js b/apps/demos/Demos/DataGrid/CustomNewRecordPosition/ReactJs/App.js index e62696dbdd07..50c4f5257e66 100644 --- a/apps/demos/Demos/DataGrid/CustomNewRecordPosition/ReactJs/App.js +++ b/apps/demos/Demos/DataGrid/CustomNewRecordPosition/ReactJs/App.js @@ -7,6 +7,7 @@ import DataGrid, { Toolbar, Item, Scrolling, + Pager, } from 'devextreme-react/data-grid'; import SelectBox from 'devextreme-react/select-box'; import Guid from 'devextreme/core/guid'; @@ -66,6 +67,7 @@ const App = () => { editRowKey={editRowKey} onEditRowKeyChange={setEditRowKey} /> + + import { ref } from 'vue'; import DxDataGrid, { - DxColumn, DxEditing, DxValidationRule, DxButton, DxToolbar, DxItem, DxScrolling, DxDataGridTypes, + DxColumn, DxEditing, DxValidationRule, DxButton, DxToolbar, DxItem, DxScrolling, DxDataGridTypes, DxPager, } from 'devextreme-vue/data-grid'; import DxSelectBox from 'devextreme-vue/select-box'; import Guid from 'devextreme/core/guid'; diff --git a/apps/demos/Demos/DataGrid/CustomNewRecordPosition/jQuery/index.js b/apps/demos/Demos/DataGrid/CustomNewRecordPosition/jQuery/index.js index 2a3219f2f202..1fd904f941ac 100644 --- a/apps/demos/Demos/DataGrid/CustomNewRecordPosition/jQuery/index.js +++ b/apps/demos/Demos/DataGrid/CustomNewRecordPosition/jQuery/index.js @@ -15,6 +15,9 @@ $(() => { useIcons: true, newRowPosition: 'viewportTop', }, + pager: { + visible: true, + }, remoteOperations: true, columns: [ { diff --git a/apps/demos/Demos/DataGrid/DeferredSelection/Angular/app/app.component.html b/apps/demos/Demos/DataGrid/DeferredSelection/Angular/app/app.component.html index b3b74913e0c3..a384313b651e 100644 --- a/apps/demos/Demos/DataGrid/DeferredSelection/Angular/app/app.component.html +++ b/apps/demos/Demos/DataGrid/DeferredSelection/Angular/app/app.component.html @@ -6,6 +6,7 @@ > + { > + { deferred={true} /> + + import { ref } from 'vue'; import { - DxDataGrid, DxColumn, DxFilterRow, DxSelection, DxDataGridTypes, + DxDataGrid, DxColumn, DxFilterRow, DxSelection, DxDataGridTypes, DxPager, } from 'devextreme-vue/data-grid'; import DxButton from 'devextreme-vue/button'; import { Options as DataSourceOptions } from 'devextreme/data/data_source'; diff --git a/apps/demos/Demos/DataGrid/DeferredSelection/jQuery/index.js b/apps/demos/Demos/DataGrid/DeferredSelection/jQuery/index.js index 431cf6353bd1..c25732045e21 100644 --- a/apps/demos/Demos/DataGrid/DeferredSelection/jQuery/index.js +++ b/apps/demos/Demos/DataGrid/DeferredSelection/jQuery/index.js @@ -20,6 +20,9 @@ $(() => { 'ResponsibleEmployee/Employee_Full_Name', ], }, + pager: { + visible: true, + }, selection: { mode: 'multiple', deferred: true, diff --git a/apps/demos/Demos/DataGrid/EditStateManagement/Angular/app/app.component.html b/apps/demos/Demos/DataGrid/EditStateManagement/Angular/app/app.component.html index a1cbb10d8181..6a7ddb500200 100644 --- a/apps/demos/Demos/DataGrid/EditStateManagement/Angular/app/app.component.html +++ b/apps/demos/Demos/DataGrid/EditStateManagement/Angular/app/app.component.html @@ -16,6 +16,7 @@ [(changes)]="changes" [(editRowKey)]="editRowKey" > + diff --git a/apps/demos/Demos/DataGrid/EditStateManagement/React/App.tsx b/apps/demos/Demos/DataGrid/EditStateManagement/React/App.tsx index 9840c1eb93ef..5c8ffc2d5b86 100644 --- a/apps/demos/Demos/DataGrid/EditStateManagement/React/App.tsx +++ b/apps/demos/Demos/DataGrid/EditStateManagement/React/App.tsx @@ -2,7 +2,7 @@ import React, { useCallback, useEffect, useMemo, useReducer, } from 'react'; import DataGrid, { - Column, DataGridTypes, Editing, + Column, DataGridTypes, Editing, Pager, } from 'devextreme-react/data-grid'; import { LoadPanel } from 'devextreme-react/load-panel'; import 'whatwg-fetch'; @@ -70,6 +70,7 @@ const App = () => { editRowKey={state.editRowKey} onEditRowKeyChange={onEditRowKeyChange} /> + diff --git a/apps/demos/Demos/DataGrid/EditStateManagement/ReactJs/App.js b/apps/demos/Demos/DataGrid/EditStateManagement/ReactJs/App.js index 6434f0b06278..5311baee77fd 100644 --- a/apps/demos/Demos/DataGrid/EditStateManagement/ReactJs/App.js +++ b/apps/demos/Demos/DataGrid/EditStateManagement/ReactJs/App.js @@ -1,7 +1,7 @@ import React, { useCallback, useEffect, useMemo, useReducer, } from 'react'; -import DataGrid, { Column, Editing } from 'devextreme-react/data-grid'; +import DataGrid, { Column, Editing, Pager } from 'devextreme-react/data-grid'; import { LoadPanel } from 'devextreme-react/load-panel'; import 'whatwg-fetch'; import reducer from './reducer.js'; @@ -68,6 +68,7 @@ const App = () => { editRowKey={state.editRowKey} onEditRowKeyChange={onEditRowKeyChange} /> + + { allowUpdating: true, allowDeleting: true, }, + pager: { + visible: true, + }, repaintChangesOnly: true, onOptionChanged(e) { if (e.name === 'editing') { diff --git a/apps/demos/Demos/DataGrid/Filtering/Angular/app/app.component.html b/apps/demos/Demos/DataGrid/Filtering/Angular/app/app.component.html index 66d1cb27c49d..74dd478ecdaa 100644 --- a/apps/demos/Demos/DataGrid/Filtering/Angular/app/app.component.html +++ b/apps/demos/Demos/DataGrid/Filtering/Angular/app/app.component.html @@ -14,6 +14,7 @@ [width]="240" placeholder="Search..." > + diff --git a/apps/demos/Demos/DataGrid/Filtering/React/App.tsx b/apps/demos/Demos/DataGrid/Filtering/React/App.tsx index 3be9156dda48..9e524bc5f5b3 100644 --- a/apps/demos/Demos/DataGrid/Filtering/React/App.tsx +++ b/apps/demos/Demos/DataGrid/Filtering/React/App.tsx @@ -1,6 +1,6 @@ import React, { useCallback, useRef, useState } from 'react'; import DataGrid, { - Column, FilterRow, HeaderFilter, Search, SearchPanel, + Column, FilterRow, HeaderFilter, Search, SearchPanel, Pager, } from 'devextreme-react/data-grid'; import SelectBox, { SelectBoxTypes } from 'devextreme-react/select-box'; import CheckBox, { CheckBoxTypes } from 'devextreme-react/check-box'; @@ -113,6 +113,7 @@ const App = () => { visible={true} width={240} placeholder="Search..." /> + { width={240} placeholder="Search..." /> + + { headerFilter: { visible: true, }, + pager: { + visible: true, + }, columns: [{ dataField: 'OrderNumber', caption: 'Invoice Number', diff --git a/apps/demos/Demos/DataGrid/FilteringAPI/Angular/app/app.component.html b/apps/demos/Demos/DataGrid/FilteringAPI/Angular/app/app.component.html index 95a9b589c870..e3829ae1d80e 100644 --- a/apps/demos/Demos/DataGrid/FilteringAPI/Angular/app/app.component.html +++ b/apps/demos/Demos/DataGrid/FilteringAPI/Angular/app/app.component.html @@ -18,6 +18,7 @@ [dataSource]="tasks" [showBorders]="true" > + { columnAutoWidth={true} showBorders={true} > + diff --git a/apps/demos/Demos/DataGrid/FilteringAPI/ReactJs/App.js b/apps/demos/Demos/DataGrid/FilteringAPI/ReactJs/App.js index c27450704bb4..d2724b74bc78 100644 --- a/apps/demos/Demos/DataGrid/FilteringAPI/ReactJs/App.js +++ b/apps/demos/Demos/DataGrid/FilteringAPI/ReactJs/App.js @@ -1,5 +1,5 @@ import React, { useCallback, useRef, useState } from 'react'; -import DataGrid, { Column } from 'devextreme-react/data-grid'; +import DataGrid, { Column, Pager } from 'devextreme-react/data-grid'; import SelectBox from 'devextreme-react/select-box'; import 'devextreme/data/odata/store'; @@ -64,6 +64,7 @@ const App = () => { columnAutoWidth={true} showBorders={true} > + + { 'ResponsibleEmployee/Employee_Full_Name', ], }, + pager: { + visible: true, + }, columnAutoWidth: true, showBorders: true, columns: [ diff --git a/apps/demos/Demos/DataGrid/FocusedRow/Angular/app/app.component.html b/apps/demos/Demos/DataGrid/FocusedRow/Angular/app/app.component.html index bf0b7142c0fb..859da16ebb8a 100644 --- a/apps/demos/Demos/DataGrid/FocusedRow/Angular/app/app.component.html +++ b/apps/demos/Demos/DataGrid/FocusedRow/Angular/app/app.component.html @@ -10,6 +10,7 @@ (onFocusedRowChanged)="onFocusedRowChanged($event)" > +
diff --git a/apps/demos/Demos/DataGrid/FocusedRow/React/App.tsx b/apps/demos/Demos/DataGrid/FocusedRow/React/App.tsx index eec0edd029e9..8327989badc2 100644 --- a/apps/demos/Demos/DataGrid/FocusedRow/React/App.tsx +++ b/apps/demos/Demos/DataGrid/FocusedRow/React/App.tsx @@ -1,6 +1,6 @@ import React, { useCallback, useState } from 'react'; import { - DataGrid, Column, Paging, DataGridTypes, + DataGrid, Column, Paging, DataGridTypes, Pager, } from 'devextreme-react/data-grid'; import { NumberBox, NumberBoxTypes } from 'devextreme-react/number-box'; import { CheckBox, CheckBoxTypes } from 'devextreme-react/check-box'; @@ -88,6 +88,7 @@ const App = () => { showBorders={true} > + diff --git a/apps/demos/Demos/DataGrid/FocusedRow/ReactJs/App.js b/apps/demos/Demos/DataGrid/FocusedRow/ReactJs/App.js index 27d539776fe6..f43631c8bf4b 100644 --- a/apps/demos/Demos/DataGrid/FocusedRow/ReactJs/App.js +++ b/apps/demos/Demos/DataGrid/FocusedRow/ReactJs/App.js @@ -1,5 +1,7 @@ import React, { useCallback, useState } from 'react'; -import { DataGrid, Column, Paging } from 'devextreme-react/data-grid'; +import { + DataGrid, Column, Paging, Pager, +} from 'devextreme-react/data-grid'; import { NumberBox } from 'devextreme-react/number-box'; import { CheckBox } from 'devextreme-react/check-box'; import 'devextreme/data/odata/store'; @@ -77,6 +79,7 @@ const App = () => { showBorders={true} > + +
@@ -80,7 +81,7 @@