fix: Report View single vertical scrollbarversion-14
@@ -518,6 +518,9 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { | |||||
} else { | } else { | ||||
this.page.show_form(); | this.page.show_form(); | ||||
} | } | ||||
this.page.body[0].style.setProperty('--report-filter-height', this.page.page_form.css('height')); | |||||
this.page.body.parent().css('margin-bottom', 'unset'); | |||||
} | } | ||||
set_filters(filters) { | set_filters(filters) { | ||||
@@ -49,6 +49,8 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView { | |||||
this.setup_columns(); | this.setup_columns(); | ||||
super.setup_new_doc_event(); | super.setup_new_doc_event(); | ||||
this.page.main.addClass('report-view'); | this.page.main.addClass('report-view'); | ||||
this.page.body[0].style.setProperty('--report-filter-height', this.page.page_form.css('height')); | |||||
this.page.body.parent().css('margin-bottom', 'unset'); | |||||
} | } | ||||
toggle_side_bar() { | toggle_side_bar() { | ||||
@@ -84,14 +84,37 @@ | |||||
margin-bottom: 10px; | margin-bottom: 10px; | ||||
} | } | ||||
.layout-main-section .frappe-card { | |||||
--report-filter-height: 0px; | |||||
} | |||||
.report-wrapper { | .report-wrapper { | ||||
overflow: auto; | overflow: auto; | ||||
.datatable { | |||||
height: calc(100vh - var(--report-filter-height) - 205px); | |||||
.dt-scrollable { | |||||
height: calc(100vh - var(--report-filter-height) - 275px); | |||||
} | |||||
} | |||||
} | } | ||||
.report-view { | .report-view { | ||||
.dt-row:last-child:not(.dt-row-filter) { | |||||
.dt-cell { | |||||
border-bottom: 1px solid var(--border-color); | |||||
.result { | |||||
min-height: 50vh !important; | |||||
.dt-row:last-child:not(.dt-row-filter) { | |||||
.dt-cell { | |||||
border-bottom: 1px solid var(--border-color); | |||||
} | |||||
} | |||||
.datatable { | |||||
height: calc(100vh - var(--report-filter-height) - 225px); | |||||
.dt-scrollable { | |||||
height: calc(100vh - var(--report-filter-height) - 295px); | |||||
} | |||||
} | } | ||||
} | } | ||||
} | } | ||||