Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[SSE] В список цветов фона для сортировки и фильтров добавлен прозрачный цвет (он же "нет заливки").

Browse source
This commit is contained in:
Julia Radzhabova 2016-05-05 10:00:22 +03:00
parent fa09ad78e2
commit 514f3d375c
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/common/main/resources/less/asc-mixins.less
View file

@ -138,7 +138,7 @@
@common-controls-width: 100px; @common-controls-width: 100px;
.img-commonctrl, .img-commonctrl,
.theme-colorpalette .color-transparent, .dropdown-menu li .checked:before, .input-error:before { .theme-colorpalette .color-transparent, .palette-color-ext .color-transparent, .dropdown-menu li .checked:before, .input-error:before {
background: e(%("url(%s)",'@{common-image-path}/@{common-controls}')) no-repeat; background: e(%("url(%s)",'@{common-image-path}/@{common-controls}')) no-repeat;
@media @media

6
apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js
View file

@ -755,7 +755,7 @@ define([
var colorFilter = filterObj.asc_getFilter(); var colorFilter = filterObj.asc_getFilter();
colorFilter.asc_setCellColor(isCellColor); colorFilter.asc_setCellColor(isCellColor);
colorFilter.asc_setCColor(Common.Utils.ThemeColor.getRgbColor(color)); colorFilter.asc_setCColor(color == 'transparent' ? null : Common.Utils.ThemeColor.getRgbColor(color));
this.api.asc_applyAutoFilter(this.configTo); this.api.asc_applyAutoFilter(this.configTo);
@ -863,7 +863,7 @@ define([
this.miNumFilter.setChecked(isCustomFilter && !isTextFilter, true); this.miNumFilter.setChecked(isCustomFilter && !isTextFilter, true);
if (colorsFont && colorsFont.length>0) { if (colorsFont && colorsFont.length>0) {
var colors = []; var colors = ['transparent'];
colorsFont.forEach(function(item, index) { colorsFont.forEach(function(item, index) {
colors.push(Common.Utils.ThemeColor.getHexColor(item.get_r(), item.get_g(), item.get_b()).toLocaleUpperCase()); colors.push(Common.Utils.ThemeColor.getHexColor(item.get_r(), item.get_g(), item.get_b()).toLocaleUpperCase());
}); });
@ -877,7 +877,7 @@ define([
} }
if (colorsFill && colorsFill.length>0) { if (colorsFill && colorsFill.length>0) {
var colors = []; var colors = ['transparent'];
colorsFill.forEach(function(item, index) { colorsFill.forEach(function(item, index) {
colors.push(Common.Utils.ThemeColor.getHexColor(item.get_r(), item.get_g(), item.get_b()).toLocaleUpperCase()); colors.push(Common.Utils.ThemeColor.getHexColor(item.get_r(), item.get_g(), item.get_b()).toLocaleUpperCase());
}); });