diff --git a/packages/Webkul/Ui/src/DataGrid/DataGrid.php b/packages/Webkul/Ui/src/DataGrid/DataGrid.php index b797704c1..7a4933df2 100644 --- a/packages/Webkul/Ui/src/DataGrid/DataGrid.php +++ b/packages/Webkul/Ui/src/DataGrid/DataGrid.php @@ -715,6 +715,7 @@ abstract class DataGrid 'enableMassActions' => $this->enableMassAction, 'enableActions' => $this->enableAction, 'paginated' => $this->paginate, + 'itemsPerPage' => $this->itemsPerPage, 'norecords' => __('ui::app.datagrid.no-records'), 'extraFilters' => $necessaryExtraFilters ]); diff --git a/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php b/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php index c8f0fc365..7b5cce24d 100644 --- a/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php +++ b/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php @@ -101,11 +101,7 @@ @@ -306,7 +302,8 @@ booleanConditionSelect: false, numberConditionSelect: false, datetimeConditionSelect: false, - perPage: 10, + perPage: {{ $results['itemsPerPage'] ?: 10 }}, + perPageProduct: [10, 20, 30, 40, 50], extraFilters: @json($results['extraFilters']), } }, @@ -321,6 +318,10 @@ } } } + + if (this.perPageProduct.indexOf(parseInt(this.perPage)) === -1) { + this.perPageProduct.unshift(this.perPage); + } }, methods: {