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

Реализовал возможность обновлять условное форматирование.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@68281 954022d7-b5bf-4e40-9824-e11837661b57
parent e5f62901
......@@ -200,10 +200,6 @@
};
function CGradient (c1, c2) {
if ( !(this instanceof CGradient) ) {
return new CGradient (c1, c2);
}
this.MaxColorIndex = 512;
this.base_shift = 8;
......
......@@ -3274,12 +3274,12 @@ Woorksheet.prototype.initPostOpen = function(handlers){
}
}
this._initConditionalFormatting();
this._updateConditionalFormatting(null);
this.handlers = handlers;
this._setHandlersTablePart();
};
Woorksheet.prototype._initConditionalFormatting = function() {
Woorksheet.prototype._updateConditionalFormatting = function(range) {
var oGradient = null;
var aCFs = this.aConditionalFormatting;
var aRules, oRule;
......@@ -3289,6 +3289,11 @@ Woorksheet.prototype._initConditionalFormatting = function() {
var arrayCells = [];
var tmp, i, j, cell;
for (i = 0; i < aCFs.length; ++i) {
// ToDo убрать null === aCFs[i].SqRefRange когда научимся мультиселект обрабатывать (\\192.168.5.2\source\DOCUMENTS\XLSX\Matematika Quantum Sedekah.xlsx)
if (null === aCFs[i].SqRefRange) {
continue;
}
if (!range || range.intersection(aCFs[i].SqRefRange)) {
aRules = aCFs[i].aRules;
for (j = 0; j < aRules.length; ++j) {
oRule = aRules[j];
......@@ -3301,8 +3306,7 @@ Woorksheet.prototype._initConditionalFormatting = function() {
break;
}
oRuleElement = oRule.aRuleElements[0];
// ToDo убрать null === aCFs[i].SqRefRange когда научимся мультиселект обрабатывать (\\192.168.5.2\source\DOCUMENTS\XLSX\Matematika Quantum Sedekah.xlsx)
if (!(oRuleElement instanceof Asc.CColorScale) || null === aCFs[i].SqRefRange) {
if (!(oRuleElement instanceof Asc.CColorScale)) {
break;
}
......@@ -3338,6 +3342,7 @@ Woorksheet.prototype._initConditionalFormatting = function() {
}
}
}
}
};
Woorksheet.prototype._forEachCell=function(fAction){
for(var rowInd in this.aGCells){
......
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