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

support uniqueValues and duplicateValues in conditional formatting

parent 4cc453b5
...@@ -1901,7 +1901,7 @@ function angleInterfaceToFormat(val) ...@@ -1901,7 +1901,7 @@ function angleInterfaceToFormat(val)
function getUniqueKeys(array) { function getUniqueKeys(array) {
var i, o = {}; var i, o = {};
for (i = 0; i < array.length; ++i) { for (i = 0; i < array.length; ++i) {
o[array[i]] = !o.hasOwnProperty(array[i]); o[array[i]] = o.hasOwnProperty(array[i]);
} }
return o; return o;
} }
...@@ -3496,7 +3496,7 @@ Woorksheet.prototype._updateConditionalFormatting = function(range) { ...@@ -3496,7 +3496,7 @@ Woorksheet.prototype._updateConditionalFormatting = function(range) {
var aRules, oRule; var aRules, oRule;
var oRuleElement = null; var oRuleElement = null;
var o; var o;
var i, j, cell, sqref, values, tmp, min, max, dxf; var i, j, cell, sqref, values, tmp, min, max, dxf, condition;
for (i = 0; i < aCFs.length; ++i) { for (i = 0; i < aCFs.length; ++i) {
sqref = aCFs[i].sqref; sqref = aCFs[i].sqref;
// 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)
...@@ -3549,8 +3549,16 @@ Woorksheet.prototype._updateConditionalFormatting = function(range) { ...@@ -3549,8 +3549,16 @@ Woorksheet.prototype._updateConditionalFormatting = function(range) {
} }
} }
break; break;
case Asc.ECfType.duplicateValues:
case Asc.ECfType.uniqueValues: case Asc.ECfType.uniqueValues:
o = getUniqueKeys(values.v); if (oRule.dxf) {
condition = oRule.type === Asc.ECfType.uniqueValues;
values = this._getValuesForConditionalFormatting(sqref);
o = getUniqueKeys(values.v);
for (cell = 0; cell < values.c.length; ++cell) {
values.c[cell].setConditionalFormattingStyle((condition === o[values.v[cell]]) ? null : oRule.dxf);
}
}
break; break;
} }
} }
......
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