diff --git a/resources/img/pagination-images/first.svg b/resources/img/pagination-images/first.svg new file mode 100644 index 0000000000..7399ee56fa --- /dev/null +++ b/resources/img/pagination-images/first.svg @@ -0,0 +1,3 @@ + diff --git a/resources/img/pagination-images/last.svg b/resources/img/pagination-images/last.svg new file mode 100644 index 0000000000..621fd4a98e --- /dev/null +++ b/resources/img/pagination-images/last.svg @@ -0,0 +1,3 @@ + diff --git a/resources/img/pagination-images/next.svg b/resources/img/pagination-images/next.svg new file mode 100644 index 0000000000..99343901d6 --- /dev/null +++ b/resources/img/pagination-images/next.svg @@ -0,0 +1,3 @@ + diff --git a/resources/img/pagination-images/previous.svg b/resources/img/pagination-images/previous.svg new file mode 100644 index 0000000000..499314c292 --- /dev/null +++ b/resources/img/pagination-images/previous.svg @@ -0,0 +1,3 @@ + diff --git a/resources/js/components/shared/FilterTable.vue b/resources/js/components/shared/FilterTable.vue index 5104c6a41c..91728576ba 100644 --- a/resources/js/components/shared/FilterTable.vue +++ b/resources/js/components/shared/FilterTable.vue @@ -38,6 +38,7 @@
@@ -183,6 +184,7 @@ export default { startX: 0, startWidth: 0, resizingColumnIndex: -1, + originalWidths: [], }; }, computed: { @@ -215,6 +217,9 @@ export default { }, calculateColumnWidth(widthAdjust = 1) { this.visibleHeaders.forEach((headerColumn, index) => { + if (!this.originalWidths[index]) { + this.originalWidths[index] = headerColumn.width || this.calculateContent(index); + } if (this.calculateContent(index) !== 0) { headerColumn.width = (this.calculateContent(index) * widthAdjust) - 32; } @@ -253,6 +258,11 @@ export default { this.resizingColumnIndex = -1; } }, + resetSize(index) { + if (this.originalWidths[index]) { + this.visibleHeaders[index].width = this.originalWidths[index]; + } + }, handleRowClick(row, event) { this.$emit("table-row-click", row, event); }, @@ -282,8 +292,6 @@ export default { border-right: 1px solid rgba(0, 0, 0, 0.125); border-bottom: 1px solid rgba(0, 0, 0, 0.125); border-radius: 5px; - scrollbar-width: 8px; - scrollbar-color: #6C757D; max-height: calc(100vh - 150px); } @@ -456,14 +464,6 @@ export default { white-space: nowrap; } } -.pm-table-container::-webkit-scrollbar { - width: 8px; - height: 8px; -} -.pm-table-container::-webkit-scrollbar-thumb { - background-color: #6C757D; - border-radius: 20px; -} .ellipsis-dropdown-main ul.dropdown-menu.dropdown-menu-right.show { max-height: 250px; overflow-y: auto; diff --git a/resources/js/components/shared/PaginationTable.vue b/resources/js/components/shared/PaginationTable.vue index 0323ebb1cf..3c2dd9a5cc 100644 --- a/resources/js/components/shared/PaginationTable.vue +++ b/resources/js/components/shared/PaginationTable.vue @@ -1,29 +1,51 @@