diff --git a/apps/common/main/resources/less/asc-mixins.less b/apps/common/main/resources/less/asc-mixins.less index 2b68ccbe3..69a4fcedc 100644 --- a/apps/common/main/resources/less/asc-mixins.less +++ b/apps/common/main/resources/less/asc-mixins.less @@ -138,7 +138,7 @@ @common-controls-width: 100px; .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; @media diff --git a/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js b/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js index 8a1197f4a..9a109d6bc 100644 --- a/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js +++ b/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js @@ -755,7 +755,7 @@ define([ var colorFilter = filterObj.asc_getFilter(); 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); @@ -863,7 +863,7 @@ define([ this.miNumFilter.setChecked(isCustomFilter && !isTextFilter, true); if (colorsFont && colorsFont.length>0) { - var colors = []; + var colors = ['transparent']; colorsFont.forEach(function(item, index) { 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) { - var colors = []; + var colors = ['transparent']; colorsFill.forEach(function(item, index) { colors.push(Common.Utils.ThemeColor.getHexColor(item.get_r(), item.get_g(), item.get_b()).toLocaleUpperCase()); });