Commit 010372e6 authored by GoshaZotov's avatar GoshaZotov Committed by Alexander.Trofimov

changes for color sort

parent 1f6eecb5
...@@ -6045,6 +6045,10 @@ ColorFilter.prototype.isHideValue = function(cell) { ...@@ -6045,6 +6045,10 @@ ColorFilter.prototype.isHideValue = function(cell) {
{ {
res = false; res = false;
} }
else if(fontColor === null && (null === filterColor || (null !== filterColor && (0 === filterColor.rgb || null === filterColor.rgb))))
{
res = false;
}
} }
} }
else else
...@@ -6054,6 +6058,10 @@ ColorFilter.prototype.isHideValue = function(cell) { ...@@ -6054,6 +6058,10 @@ ColorFilter.prototype.isHideValue = function(cell) {
{ {
res = false; res = false;
} }
else if(color === null && (null === this.dxf.fill.bg || (null !== this.dxf.fill.bg && null === this.dxf.fill.bg.rgb)))
{
res = false;
}
} }
} }
...@@ -6069,7 +6077,7 @@ ColorFilter.prototype.asc_getCColor = function () ...@@ -6069,7 +6077,7 @@ ColorFilter.prototype.asc_getCColor = function ()
{ {
var res = null; var res = null;
if(this.dxf && this.dxf.fill && null !== this.dxf.fill.bg) if(this.dxf && this.dxf.fill && null !== this.dxf.fill.bg && null !== this.dxf.fill.bg.rgb)
{ {
var color = this.dxf.fill.bg; var color = this.dxf.fill.bg;
......
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