Skip to content

Bump DataTables version & fix header alignment #5724

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 10 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 23 additions & 3 deletions src/resources/assets/css/common.css
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ form .select2.select2-container {
position: relative;
}

#crudTable_processing.dataTables_processing.card {
#crudTable_processing.dt-processing.card {
all: unset;
position: absolute;
background: rgba(255, 255, 255, 0.9);
Expand All @@ -77,15 +77,19 @@ form .select2.select2-container {
border-radius: 5px;
}

#crudTable_processing.dataTables_processing.card > img {
table.fixedHeader-floating, table.fixedHeader-locked {
background-color: white;
}

#crudTable_processing.dt-processing.card > img {
margin: 0;
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
}

#crudTable_processing.dataTables_processing.card > div {
#crudTable_processing.dt-processing.card > div {
display: none !important;
}

Expand Down Expand Up @@ -175,6 +179,22 @@ form .select2.select2-container {
border: 0;
}

#crudTable_wrapper > div.table-footer > div:nth-child(1) > div.dt-length {
display: flex;
}

#crudTable_wrapper > div.table-footer > div:nth-child(1) > div.dt-length select {
width: 4rem;
}

#crudTable_wrapper > div.table-footer > div:nth-child(1) > div.dt-length > label{
white-space: nowrap;
}

div.dt-container div.dt-paging ul.pagination {
justify-content: flex-end;
}

/*/Table - List View/*/
.navbar-filters {
min-height: 25px;
Expand Down
58 changes: 36 additions & 22 deletions src/resources/views/crud/inc/datatables_logic.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,19 @@
@endphp

{{-- DATA TABLES SCRIPT --}}
@basset('https://cdn.datatables.net/1.13.1/js/jquery.dataTables.min.js')
@basset('https://cdn.datatables.net/1.13.1/js/dataTables.bootstrap5.min.js')
@basset('https://cdn.datatables.net/responsive/2.4.0/js/dataTables.responsive.min.js')
@basset('https://cdn.datatables.net/responsive/2.4.0/css/responsive.dataTables.min.css')
@basset('https://cdn.datatables.net/fixedheader/3.3.1/js/dataTables.fixedHeader.min.js')
@basset('https://cdn.datatables.net/fixedheader/3.3.1/css/fixedHeader.dataTables.min.css')

@basset(base_path('vendor/backpack/crud/src/resources/assets/img/spinner.svg'), false)
@basset("https://cdn.datatables.net/2.1.8/js/dataTables.min.js")
@basset("https://cdn.datatables.net/2.1.8/js/dataTables.bootstrap5.min.js")
@basset("https://cdn.datatables.net/responsive/3.0.3/js/dataTables.responsive.min.js")
@basset('https://cdn.datatables.net/fixedheader/4.0.1/js/dataTables.fixedHeader.min.js')
@basset(base_path('vendor/backpack/crud/src/resources/assets/img/spinner.svg'), false)


@push('before_styles')
@basset('https://cdn.datatables.net/2.1.8/css/dataTables.bootstrap5.min.css')
@basset("https://cdn.datatables.net/responsive/3.0.3/css/responsive.dataTables.min.css")
@basset('https://cdn.datatables.net/fixedheader/4.0.1/css/fixedHeader.dataTables.min.css')
@endpush
<script>
// here we will check if the cached dataTables paginator length is conformable with current paginator settings.
// datatables caches the ajax responses with pageLength in LocalStorage so when changing this
Expand Down Expand Up @@ -154,7 +158,7 @@ functionsToRunOnDataTablesDrawEvent: [],
@if ($crud->getResponsiveTable())
responsive: {
details: {
display: $.fn.dataTable.Responsive.display.modal( {
display: DataTable.Responsive.display.modal( {
header: function ( row ) {
// show the content of the first column
// as the modal header
Expand Down Expand Up @@ -299,6 +303,7 @@ functionsToRunOnDataTablesDrawEvent: [],
"totalEntryCount": "{{$crud->getOperationSetting('totalEntryCount') ?? false}}"
},
},
pagingType: "simple_numbers",
dom:
"<'row hidden'<'col-sm-6'i><'col-sm-6 d-print-none'f>>" +
"<'table-content row'<'col-sm-12'tr>>" +
Expand Down Expand Up @@ -338,15 +343,15 @@ functionsToRunOnDataTablesDrawEvent: [],

// move search bar
$("#datatable_search_stack input").remove();
$("#crudTable_filter input").appendTo($('#datatable_search_stack .input-icon'));
$(".dt-search input").appendTo($('#datatable_search_stack .input-icon'));
$("#datatable_search_stack input").removeClass('form-control-sm');
$("#crudTable_filter").remove();
$(".dt-search").remove();

// remove btn-secondary from export and column visibility buttons
$("#crudTable_wrapper .table-footer .btn-secondary").removeClass('btn-secondary');

// remove forced overflow on load
$(".navbar.navbar-filters + div").css('overflow','initial');
$(".navbar.navbar-filters + div").css('overflow','hidden');

// move "showing x out of y" info to header
@if($crud->getSubheading())
Expand Down Expand Up @@ -405,29 +410,38 @@ functionsToRunOnDataTablesDrawEvent: [],
// on DataTable draw event run all functions in the queue
// (eg. delete and details_row buttons add functions to this queue)
$('#crudTable').on( 'draw.dt', function () {
crud.functionsToRunOnDataTablesDrawEvent.forEach(function(functionName) {
// in datatables 2.0.3 the implementation was changed to use `replaceChildren`, for that reason scripts
// that came with the response are no longer executed, like the delete button script or any other ajax
// button created by the developer. For that reason, we move them to the end of the body
// ensuring they are re-evaluated on each draw event.
document.getElementById('crudTable').querySelectorAll('script').forEach(function(script) {
const newScript = document.createElement('script');
newScript.text = script.text;
document.body.appendChild(newScript);
});

crud.functionsToRunOnDataTablesDrawEvent.forEach(function(functionName) {
crud.executeFunctionByName(functionName);
});
if ($('#crudTable').data('has-line-buttons-as-dropdown')) {
formatActionColumnAsDropdown();
}
});

if ($('#crudTable').data('has-line-buttons-as-dropdown')) {
formatActionColumnAsDropdown();
}

if (! crud.table.responsive.hasHidden()) {
crud.table.columns().header()[0].style.paddingLeft = '0.6rem';
}

if (crud.table.responsive.hasHidden()) {
if (crud.table.responsive.hasHidden()) {
$('.dtr-control').removeClass('d-none');
$('.dtr-control').addClass('d-inline');
$("#crudTable").removeClass('has-hidden-columns').addClass('has-hidden-columns');
}

}
}).dataTable();

// when datatables-colvis (column visibility) is toggled
// rebuild the datatable using the datatable-responsive plugin
$('#crudTable').on( 'column-visibility.dt', function (event) {
console.log('column-visibility.dt');
crud.table.responsive.rebuild();
} ).dataTable();

Expand Down Expand Up @@ -510,5 +524,5 @@ function formatActionColumnAsDropdown() {
});
}
</script>

@include('crud::inc.details_row_logic')
@include('crud::inc.details_row_logic')
Loading