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

[SSE] Fix applying scales formatting

Browse source
This commit is contained in:
Julia Radzhabova 2021-02-02 17:01:24 +03:00
parent 335a21c843
commit 8ab9c050b6
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/spreadsheeteditor/main/app/view/FormatRulesEditDlg.js
View file

@ -1004,6 +1004,7 @@ define([
}, },
_setDefaults: function (props) { _setDefaults: function (props) {
this._originalProps = props;
var type = props ? props.asc_getType() : this.type, var type = props ? props.asc_getType() : this.type,
ruleType, ruleType,
subtype = this.subtype; subtype = this.subtype;
@ -1201,7 +1202,7 @@ define([
var rec = this.ruleStore.findWhere({index: this.cmbCategory.getValue()}); var rec = this.ruleStore.findWhere({index: this.cmbCategory.getValue()});
if (rec) { if (rec) {
props = new AscCommonExcel.CConditionalFormattingRule(); props = this._originalProps || new AscCommonExcel.CConditionalFormattingRule();
var type = rec.get('type'); var type = rec.get('type');
props.asc_setType(type); props.asc_setType(type);
if (type == Asc.c_oAscCFType.containsText || type == Asc.c_oAscCFType.containsBlanks || type == Asc.c_oAscCFType.duplicateValues || if (type == Asc.c_oAscCFType.containsText || type == Asc.c_oAscCFType.containsBlanks || type == Asc.c_oAscCFType.duplicateValues ||
@ -1576,11 +1577,11 @@ define([
}, },
onScaleColorsSelect: function(picker, color) { onScaleColorsSelect: function(picker, color) {
picker.currentColor = color; picker.colorPicker.currentColor = color;
if (this.scaleProps ) { if (this.scaleProps ) {
var colors = this.scaleProps.asc_getColors(); var colors = this.scaleProps.asc_getColors();
colors[Math.min(picker.options.type, colors.length-1)] = Common.Utils.ThemeColor.getRgbColor(picker.currentColor); colors[Math.min(picker.options.type, colors.length-1)] = Common.Utils.ThemeColor.getRgbColor(picker.colorPicker.currentColor);
this.scaleProps.asc_setColors(colors); this.scaleProps.asc_setColors(colors);
this.previewFormat(); this.previewFormat();
} }