Commit 79455927 authored by Alexander.Trofimov's avatar Alexander.Trofimov

fix bug 33734

parent 1ba08fd7
...@@ -2696,7 +2696,7 @@ ...@@ -2696,7 +2696,7 @@
var o; var o;
var i, j, l, cf, cell, ranges, values, value, v, tmp, min, mid, max, dxf, compareFunction, nc, sum; var i, j, l, cf, cell, ranges, values, value, v, tmp, min, mid, max, dxf, compareFunction, nc, sum;
for (i = 0; i < aCFs.length; ++i) { for (i = 0; i < aCFs.length; ++i) {
cf = aCFs[i] cf = aCFs[i];
ranges = cf.ranges; ranges = cf.ranges;
// ToDo убрать null === sqref когда научимся мультиселект обрабатывать (\\192.168.5.2\source\DOCUMENTS\XLSX\Matematika Quantum Sedekah.xlsx) // ToDo убрать null === sqref когда научимся мультиселект обрабатывать (\\192.168.5.2\source\DOCUMENTS\XLSX\Matematika Quantum Sedekah.xlsx)
if (!cf.isValid()) { if (!cf.isValid()) {
...@@ -2706,7 +2706,8 @@ ...@@ -2706,7 +2706,8 @@
aRules = cf.aRules.sort(function(v1, v2) { aRules = cf.aRules.sort(function(v1, v2) {
return v1.priority - v2.priority; return v1.priority - v2.priority;
}); });
if (oRule = aRules[0]) { for (j = 0; j < aRules.length; ++j) {
oRule = aRules[j];
// ToDo dataBar, expression, iconSet (page 2679) // ToDo dataBar, expression, iconSet (page 2679)
if (AscCommonExcel.ECfType.colorScale === oRule.type) { if (AscCommonExcel.ECfType.colorScale === oRule.type) {
if (1 !== oRule.aRuleElements.length) { if (1 !== oRule.aRuleElements.length) {
...@@ -5140,7 +5141,7 @@ Woorksheet.prototype.isApplyFilterBySheet = function(){ ...@@ -5140,7 +5141,7 @@ Woorksheet.prototype.isApplyFilterBySheet = function(){
this.oValue.cleanCache(); this.oValue.cleanCache();
}; };
Cell.prototype.setConditionalFormattingStyle=function(xfs){ Cell.prototype.setConditionalFormattingStyle=function(xfs){
this.conditionalFormattingXfs = xfs; this.conditionalFormattingXfs = xfs || this.conditionalFormattingXfs;
this.compiledXfs = null; this.compiledXfs = null;
this.oValue.cleanCache(); this.oValue.cleanCache();
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment