From 3ba8b60f54d6ca2183473545889d6c84a0c15d85 Mon Sep 17 00:00:00 2001 From: snipe Date: Fri, 15 Sep 2023 20:28:28 +0100 Subject: [PATCH] Fixed regression that disabled sticky headers Signed-off-by: snipe --- public/js/build/app.js | Bin 1402526 -> 1402962 bytes public/js/dist/all.js | Bin 3161858 -> 3162294 bytes public/js/dist/bootstrap-table.js | Bin 1650987 -> 1719751 bytes public/mix-manifest.json | 6 +++--- .../views/partials/bootstrap-table.blade.php | 3 ++- webpack.mix.js | 3 ++- 6 files changed, 7 insertions(+), 5 deletions(-) diff --git a/public/js/build/app.js b/public/js/build/app.js index cfbed799e6534317229f616b757ff5a1400c8904..e3bdf3d55b23bc2124dec1ba69f337f165a4872b 100644 GIT binary patch delta 525 zcmbPtHuTbk&<*!XCp(m~)<@?h=BC;zB^DQFrst)m#OLHECzfR9=PAXiYwDFH=4hw` z>5`(%^z_ss4fW)V#Ju!Wz2elI)Z`K)bxmt71t?I_P)9eav^cehkTI-abEXR@35!gA zRr&#|lYnkZEg@tOmD~d~hRH~M^Tje&#(D(>ES{p4V+e;cH&Q@P-ndYr`DuCk({e^2 zW&&bnAZ7t#Rv=~rVs;?r0Afxc<^p1FAm#yLULfWJVtybN0AfKP76M}7?N7@^cD@4u D6KcC$ delta 111 zcmca~A#~o^&<*!Xr$;X0=AK+r_F=MRhtOo+idW5DmF-=Xj6lo;#LPg<0>rF9%m&2l pK+FNeoIuP4#N0s41H`;Q%m>8$Kr8^nf9Y diff --git a/public/js/dist/all.js b/public/js/dist/all.js index 4d5e9ac818054d00af51ae324cac4cea76e99cc8..eb0851dea5ef307a9a1c564a96b67573ac5d21e1 100644 GIT binary patch delta 586 zcmZqrcYtwQ<3YxT7RDB)7UmX~7Ss$U?U~{G~ zTrVXu-Oo?@19nFNU6)!y$S5kg2xttGk^1yPCrRn)0shjj>J=2Q_>EdFA{^Y@Na5XX z7$6PAGC(W~#Bx9^55x*UtO&$PK&%YJDnP6X#A-mS4#XNjtO>+gK&%bKIzX%o#CqEe J1N1Mx0|0DtyU73m delta 176 zcmWN=Ne;nK00!VZ)Ko>y?K9Loa|ruJZ_-6~Hprhi!n=sDu&J$6Sd)l-6Y+n^cRAd} z@fV6c1Y(FI0S!r{kVXbs=*Yo99t9L(qJ%OksG^2C8n9rW<;GPz$I{i)m0u+T+f@Em rzSZNU8K=mT+~gLwxx)^3xyOAT@Q_D5<_S-E#&cfql2_NrTi-r^8Rbeu diff --git a/public/js/dist/bootstrap-table.js b/public/js/dist/bootstrap-table.js index c01fba3e19035a8e5bb2b8769cee880912637316..50a349bb8bec2cabecaa26519a44f8fd72141451 100644 GIT binary patch delta 109 zcmZ4eDCPL?jD{A*7N!>F7M2#)7Pc1l7LF~P7i+e!kzsRXZ2vr0Z2RZA;^Exw7i&0y smF7M2#)7Pc1l7LF~P7i-#cJGp?E8;E&;m=}oofS4bM1%Ox( ch=qVy7>GrHSQLoGfLI)eCAQ~wN=9t~0N;Nl5C8xG diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 658c1fc3af..9c030ebae6 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,5 +1,5 @@ { - "/js/build/app.js": "/js/build/app.js?id=82ddaa718cced6fb0be6e8db6f16a0c0", + "/js/build/app.js": "/js/build/app.js?id=b52b79848c81c9b523b9dd92baf6a41e", "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=f677207c6cf9678eb539abecb408c374", "/css/build/overrides.css": "/css/build/overrides.css?id=5166569ede5a36802eadeea982686ca6", "/css/build/app.css": "/css/build/app.css?id=b612c48e78fece2e1e8042ae24cc5f1e", @@ -31,8 +31,8 @@ "/css/webfonts/fa-v4compatibility.woff2": "/css/webfonts/fa-v4compatibility.woff2?id=d36941873b661076f146b0221f13497d", "/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=281bcfe26549412d128f695234961081", "/js/build/vendor.js": "/js/build/vendor.js?id=3592e07ae9a6d1805a4ea3bd3c034aef", - "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=df78f0c4cc93c29c02a41144590f6350", - "/js/dist/all.js": "/js/dist/all.js?id=ba07d399f23b294f7c4983030b757423", + "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=52d208bde3fe141c99125b883c4528a0", + "/js/dist/all.js": "/js/dist/all.js?id=6c6c0361d29ca2eb43b53cd442a84aef", "/js/dist/all-defer.js": "/js/dist/all-defer.js?id=07e52318da2cdf3171c4d88113f25fb6", "/css/dist/skins/skin-green.min.css": "/css/dist/skins/skin-green.min.css?id=0a82a6ae6bb4e58fe62d162c4fb50397", "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=e36e83c2aa3c3afdbb8ebe2c0309e91d", diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php index c4cae63e87..2872638e3e 100644 --- a/resources/views/partials/bootstrap-table.blade.php +++ b/resources/views/partials/bootstrap-table.blade.php @@ -51,8 +51,9 @@ } }, stickyHeader: true, + stickyHeaderOffsetLeft: parseInt($('body').css('padding-left'), 10), + stickyHeaderOffsetRight: parseInt($('body').css('padding-right'), 10), locale: locale, - stickyHeaderOffsetY: stickyHeaderOffsetY + 'px', undefinedText: '', iconsPrefix: 'fa', cookieStorage: '{{ config('session.bs_table_storage') }}', diff --git a/webpack.mix.js b/webpack.mix.js index babab0fad6..384ad0960a 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -142,7 +142,7 @@ mix .combine( [ "./node_modules/bootstrap-table/dist/bootstrap-table.css", - "./node_modules/bootstrap-table/dist/extensions/sticky-header/bootstrap-table-sticky-header.css", + "./node_modules/bootstrap-table/dist//extensions/sticky-header/bootstrap-table-sticky-header.css", ], "public/css/dist/bootstrap-table.css" ) @@ -184,6 +184,7 @@ mix './node_modules/bootstrap-table/dist/extensions/mobile/bootstrap-table-mobile.js', './node_modules/bootstrap-table/dist/extensions/export/bootstrap-table-export.js', './node_modules/bootstrap-table/dist/extensions/cookie/bootstrap-table-cookie.js', + './node_modules/bootstrap-table/dist/extensions/sticky-header/bootstrap-table-sticky-header.js', './resources/assets/js/extensions/jquery.base64.js', './node_modules/tableexport.jquery.plugin/tableExport.min.js', './node_modules/tableexport.jquery.plugin/libs/jsPDF/jspdf.umd.min.js',