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

[SSE] Fix editing rule settings

Browse source
This commit is contained in:
Julia Radzhabova 2021-01-27 00:32:45 +03:00
parent e8359bea7a
commit d29a058ce6
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1204,19 +1204,21 @@ define([
props = new AscCommonExcel.CConditionalFormattingRule(); props = 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.notContainsText || type == Asc.c_oAscCFType.beginsWith || if (type == Asc.c_oAscCFType.containsText || type == Asc.c_oAscCFType.containsBlanks || type == Asc.c_oAscCFType.duplicateValues ||
type == Asc.c_oAscCFType.endsWith || type == Asc.c_oAscCFType.timePeriod || type == Asc.c_oAscCFType.aboveAverage || type == Asc.c_oAscCFType.timePeriod || type == Asc.c_oAscCFType.aboveAverage ||
type == Asc.c_oAscCFType.top10 || type == Asc.c_oAscCFType.cellIs || type == Asc.c_oAscCFType.expression) { type == Asc.c_oAscCFType.top10 || type == Asc.c_oAscCFType.cellIs || type == Asc.c_oAscCFType.expression) {
props.asc_setDxf(this.xfsFormat); props.asc_setDxf(this.xfsFormat);
} }
switch (type) { switch (type) {
case Asc.c_oAscCFType.containsText: case Asc.c_oAscCFType.containsText:
case Asc.c_oAscCFType.notContainsText: var value = this.txtRange1.getValue();
case Asc.c_oAscCFType.beginsWith:
case Asc.c_oAscCFType.endsWith:
var value = this.txtRange1.setValue();
value && props.asc_setContainsText(value); value && props.asc_setContainsText(value);
props.asc_setType(this.cmbRule.getValue());
break;
case Asc.c_oAscCFType.containsBlanks:
case Asc.c_oAscCFType.duplicateValues:
props.asc_setType(this.cmbRule.getValue());
break; break;
case Asc.c_oAscCFType.timePeriod: case Asc.c_oAscCFType.timePeriod:
props.asc_setTimePeriod(this.cmbRule.getValue()); props.asc_setTimePeriod(this.cmbRule.getValue());
@ -1239,7 +1241,7 @@ define([
props.asc_setValue2(this.txtRange2.getValue()); props.asc_setValue2(this.txtRange2.getValue());
break; break;
case Asc.c_oAscCFType.expression: case Asc.c_oAscCFType.expression:
props.asc_getValue1(this.txtRange1.getValue()); props.asc_setValue1(this.txtRange1.getValue());
break; break;
case Asc.c_oAscCFType.colorScale: case Asc.c_oAscCFType.colorScale:
var scaleProps = new AscCommonExcel.CColorScale(); var scaleProps = new AscCommonExcel.CColorScale();