From 9daa2b1818c299358b8e4724b5e41978aac8ddcb Mon Sep 17 00:00:00 2001
From: Eugen Neuber <eugen.neuber@tugraz.at>
Date: Fri, 29 Nov 2019 13:37:48 +0100
Subject: [PATCH] Redisplay page length selector
---
packages/data-table-view/package.json | 8 +++++---
packages/data-table-view/src/vpu-data-table-view-demo.js | 3 ++-
packages/data-table-view/src/vpu-data-table-view.js | 5 ++++-
packages/data-table-view/vendor/auth | 2 +-
4 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/packages/data-table-view/package.json b/packages/data-table-view/package.json
index 0bd053b9..50068131 100644
--- a/packages/data-table-view/package.json
+++ b/packages/data-table-view/package.json
@@ -28,11 +28,13 @@
},
"dependencies": {
"@webcomponents/webcomponentsjs": "^2.2.10",
- "datatables.net-buttons": "^1.6.1",
- "datatables.net-buttons-dt": "^1.6.1",
- "datatables.net-dt": "^1.10.20",
+ "keycloak-js": "^8.0.0",
+ "event-target-shim": "^5.0.1",
+ "datatables.net-dt": "^1.10.19",
"datatables.net-responsive": "^2.2.3",
"datatables.net-responsive-dt": "^2.2.3",
+ "datatables.net-buttons": "^1.6.1",
+ "datatables.net-buttons-dt": "^1.6.1",
"i18next": "^17.0.3",
"jquery": "^3.4.1",
"jszip": "^3.2.2",
diff --git a/packages/data-table-view/src/vpu-data-table-view-demo.js b/packages/data-table-view/src/vpu-data-table-view-demo.js
index 3d8a8644..44a5c260 100644
--- a/packages/data-table-view/src/vpu-data-table-view-demo.js
+++ b/packages/data-table-view/src/vpu-data-table-view-demo.js
@@ -162,7 +162,8 @@ class DataTableViewDemo extends LitElement {
<div class="content">
<h4>DataTable: with data, paging and searching AND exportable</h4>
<div class="box">
- <vpu-data-table-view lang="${this.lang}" paging searching exportable export-name="Demo Export" id="vdtv1"></vpu-data-table-view>
+ <vpu-data-table-view paging searching exportable export-name="Demo Export"
+ lang="${this.lang}" id="vdtv1"></vpu-data-table-view>
</div>
<h4>DataTable: no data, no paging, no searching</h4>
<div class="box">
diff --git a/packages/data-table-view/src/vpu-data-table-view.js b/packages/data-table-view/src/vpu-data-table-view.js
index 2d9aaf07..16fac5ed 100644
--- a/packages/data-table-view/src/vpu-data-table-view.js
+++ b/packages/data-table-view/src/vpu-data-table-view.js
@@ -96,7 +96,7 @@ class DataTableView extends LitElement {
searching: this.searching,
columns: this.columns,
columnDefs: this.columnDefs,
- dom: (this.exportable ? 'B' : '') + 'frtip',
+ dom: (this.exportable ? '<"export-btn"B>' : '') + 'lfrtip',
buttons: [
{
extend: 'csvHtml5',
@@ -151,6 +151,9 @@ class DataTableView extends LitElement {
border-radius: var(--vpu-border-radius);
background: transparent;
}
+ .export-btn {
+ margin-bottom: .6rem;
+ }
`;
}
diff --git a/packages/data-table-view/vendor/auth b/packages/data-table-view/vendor/auth
index 81f1e335..688c3116 160000
--- a/packages/data-table-view/vendor/auth
+++ b/packages/data-table-view/vendor/auth
@@ -1 +1 @@
-Subproject commit 81f1e335fb1de83953527442683f10ff10cab864
+Subproject commit 688c31162459f6f642fe76494c6201d29b635ab2
--
GitLab