Skip to content

Commit eb3b0d9

Browse files
committed
Change the way TablixMembers are searched and used for TablixRowHierarchy so we process the deepest children, taking into account grouping and sorting when we come across them. Probably need to look at columns too.
Fix bug in SumParser to trim dataset name and use correct field. UI fixes.
1 parent 94b1ec6 commit eb3b0d9

File tree

7 files changed

+245
-194
lines changed

7 files changed

+245
-194
lines changed

assets/reportviewer.net.css

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,20 @@
1616
overflow: hidden;
1717
}
1818

19-
.reportparam-date, .reportparam-string, .reportparam-boolean {
20-
display: inline-flex;
21-
max-height: 35px;
19+
.reportparam-date, .reportparam-string, .reportparam-boolean {
2220
margin-left: 0.5rem;
2321
}
2422

23+
.reportparam-boolean {
24+
display: flex;
25+
}
26+
27+
.reportparam-boolean .custom-checkbox {
28+
align-content: end;
29+
}
30+
2531
.reportparam-date input, .reportparam-string input {
26-
width: auto;
27-
margin-left: 0.5rem;
32+
width: auto;
2833
}
2934

3035
.reportparam-list-select {
@@ -49,6 +54,19 @@
4954
height: 150px;
5055
}
5156

57+
.reportparam-list-dropdown.open {
58+
position: absolute;
59+
border-color: darkgray;
60+
border-width: 1px;
61+
border-style: solid;
62+
background-color: #ffffff;
63+
z-index: 1;
64+
}
65+
66+
.reportparam-list-dropdown.open .custom-checkbox {
67+
margin-left: 0.25rem;
68+
}
69+
5270
.reportparam-list-selectall {
5371
background-color: transparent;
5472
border: none;

assets/reportviewer.net.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,10 @@
108108
$('.report-viewer .reportparameters-container').on("click", function (e) {
109109
let load = false;
110110

111+
if (e.target !== e.currentTarget) {
112+
return;
113+
}
114+
111115
$.each(paramLists, function (idx, list) {
112116
let dropdownContainers = $(list).find('.reportparam-list-dropdown[class*="open"]');
113117

@@ -119,8 +123,8 @@
119123
}
120124
});
121125
});
122-
123-
if (load) {
126+
127+
if (load || paramLists.length === 0) {
124128
self.postReportParameters();
125129
}
126130
});

src/ReportViewer.NET.Web/wwwroot/css/site.css

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,20 @@
1616
overflow: hidden;
1717
}
1818

19-
.reportparam-date, .reportparam-string, .reportparam-boolean {
20-
display: inline-flex;
21-
max-height: 35px;
19+
.reportparam-date, .reportparam-string, .reportparam-boolean {
2220
margin-left: 0.5rem;
2321
}
2422

23+
.reportparam-boolean {
24+
display: flex;
25+
}
26+
27+
.reportparam-boolean .custom-checkbox {
28+
align-content: end;
29+
}
30+
2531
.reportparam-date input, .reportparam-string input {
26-
width: auto;
27-
margin-left: 0.5rem;
32+
width: auto;
2833
}
2934

3035
.reportparam-list-select {
@@ -49,6 +54,19 @@
4954
height: 150px;
5055
}
5156

57+
.reportparam-list-dropdown.open {
58+
position: absolute;
59+
border-color: darkgray;
60+
border-width: 1px;
61+
border-style: solid;
62+
background-color: #ffffff;
63+
z-index: 1;
64+
}
65+
66+
.reportparam-list-dropdown.open .custom-checkbox {
67+
margin-left: 0.25rem;
68+
}
69+
5270
.reportparam-list-selectall {
5371
background-color: transparent;
5472
border: none;

src/ReportViewer.NET.Web/wwwroot/js/site.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,10 @@
108108
$('.report-viewer .reportparameters-container').on("click", function (e) {
109109
let load = false;
110110

111+
if (e.target !== e.currentTarget) {
112+
return;
113+
}
114+
111115
$.each(paramLists, function (idx, list) {
112116
let dropdownContainers = $(list).find('.reportparam-list-dropdown[class*="open"]');
113117

@@ -119,8 +123,8 @@
119123
}
120124
});
121125
});
122-
123-
if (load) {
126+
127+
if (load || paramLists.length === 0) {
124128
self.postReportParameters();
125129
}
126130
});

0 commit comments

Comments
 (0)