diff --git a/apps/common/main/lib/component/Scroller.js b/apps/common/main/lib/component/Scroller.js
index 05c2ba80e..53e3783dd 100644
--- a/apps/common/main/lib/component/Scroller.js
+++ b/apps/common/main/lib/component/Scroller.js
@@ -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
diff --git a/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js b/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js
index 71a36ce1b..4993866f1 100644
--- a/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js
+++ b/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js
@@ -756,7 +756,12 @@ define([
'',
'<% } %>',
'',
- '
<%= Common.Utils.String.htmlEncode(value) %>
',
+ '',
+ '
<%= Common.Utils.String.htmlEncode(value) %>
',
+ '<% if (typeof count !=="undefined" && count) { %>',
+ '
<%= count%>
',
+ '<% } %>',
+ '
',
''
].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 () {
diff --git a/apps/spreadsheeteditor/main/resources/less/filterdialog.less b/apps/spreadsheeteditor/main/resources/less/filterdialog.less
index fd43d743a..1c3b82bb2 100644
--- a/apps/spreadsheeteditor/main/resources/less/filterdialog.less
+++ b/apps/spreadsheeteditor/main/resources/less/filterdialog.less
@@ -8,6 +8,12 @@
.list-item {
word-break: break-all;
}
+
+ &.scroll-padding {
+ .item {
+ padding-right: 14px;
+ }
+ }
}
.border-values {