[SSE] Auto filters: show filtered cells count

This commit is contained in:
Julia Radzhabova 2019-06-27 19:48:45 +03:00
parent 0e1f01b413
commit 8175ea22ce
3 changed files with 22 additions and 3 deletions

View file

@ -165,7 +165,12 @@ define([
$(this.el).find('.ps-scrollbar-y-rail').removeClass('always-visible-y');
$(this.el).find('.ps-scrollbar-y').addClass('always-visible-y');
}
},
isVisible: function() {
return $(this.el).find('.ps-scrollbar-y-rail').is(':visible');
}
}), {
isMouseCapture: function() {
return mouseCapture

View file

@ -756,7 +756,12 @@ define([
'<input type="button" class="img-commonctrl"/>',
'<% } %>',
'</label>',
'<div id="<%= id %>" class="list-item" style="pointer-events:none;margin-left:20px;display:inline-block;width: 185px;"><%= Common.Utils.String.htmlEncode(value) %></div>',
'<div id="<%= id %>" class="list-item" style="pointer-events:none; margin-left: 20px;display: flex;">',
'<div style="flex-grow: 1;"><%= Common.Utils.String.htmlEncode(value) %></div>',
'<% if (typeof count !=="undefined" && count) { %>',
'<div style="word-break: normal; margin-left: 10px; color: #afafaf;"><%= count%></div>',
'<% } %>',
'</div>',
'</div>'
].join(''))
});
@ -1195,7 +1200,7 @@ define([
}
var me = this,
isnumber, value,
isnumber, value, count,
index = 0, throughIndex = 2,
applyfilter = true,
selectAllState = false,
@ -1207,6 +1212,7 @@ define([
value = item.asc_getText();
isnumber = isNumeric(value);
applyfilter = true;
// count = item.asc_getCount();//Math.floor(Math.random() * 5000 + 1);
if (me.filter) {
if (null === value.match(me.filter)) {
@ -1227,7 +1233,8 @@ define([
strval : !isnumber ? value : '',
groupid : '1',
check : idxs[throughIndex],
throughIndex : throughIndex
throughIndex : throughIndex,
count: count ? count.toString() : ''
}));
if (idxs[throughIndex]) selectedCells++;
} else {
@ -1278,6 +1285,7 @@ define([
}
this.btnOk.setDisabled(this.cells.length<1);
this.cellsList.scroller.update({minScrollbarLength : 40, alwaysVisibleY: true, suppressScrollX: true});
this.cellsList.cmpEl.toggleClass('scroll-padding', this.cellsList.scroller.isVisible());
},
testFilter: function () {

View file

@ -8,6 +8,12 @@
.list-item {
word-break: break-all;
}
&.scroll-padding {
.item {
padding-right: 14px;
}
}
}
.border-values {