Skip to content

S
sdkjs
Commit c9d53918 authored by Sergey Luzyanin's avatar Sergey Luzyanin
Browse files
Options

build chart cache without format

parent ec98cfed
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
common/Drawings/Format/ChartSpace.js
View file @ c9d53918
...@@ -2664,12 +2664,13 @@ CChartSpace.prototype.checkValByNumRef = function(workbook, ser, val, bVertical) ...@@ -2664,12 +2664,13 @@ CChartSpace.prototype.checkValByNumRef = function(workbook, ser, val, bVertical)
if(!row_hidden && !source_worksheet.getColHidden(j) || (this.displayHidden === true)) if(!row_hidden && !source_worksheet.getColHidden(j) || (this.displayHidden === true))
{ {
cell = source_worksheet.getCell3(range.r1, j); cell = source_worksheet.getCell3(range.r1, j);
if(typeof cell.getValueWithFormat() === "string" && cell.getValueWithFormat().length > 0) var value = parseFloat(cell.getValue());
if(AscFormat.isRealNumber(value))
{ {
hidden = false; hidden = false;
pt = new AscFormat.CNumericPoint(); pt = new AscFormat.CNumericPoint();
pt.setIdx(pt_index); pt.setIdx(pt_index);
pt.setVal(parseFloat(cell.getValue())); pt.setVal(value);
if(cell.getNumFormatStr() !== lit_format_code) if(cell.getNumFormatStr() !== lit_format_code)
{ {
pt.setFormatCode(cell.getNumFormatStr()) pt.setFormatCode(cell.getNumFormatStr())
...@@ -2725,12 +2726,13 @@ CChartSpace.prototype.checkValByNumRef = function(workbook, ser, val, bVertical) ...@@ -2725,12 +2726,13 @@ CChartSpace.prototype.checkValByNumRef = function(workbook, ser, val, bVertical)
if(!col_hidden && !source_worksheet.getRowHidden(j) || (this.displayHidden === true)) if(!col_hidden && !source_worksheet.getRowHidden(j) || (this.displayHidden === true))
{ {
cell = source_worksheet.getCell3(j, range.c1); cell = source_worksheet.getCell3(j, range.c1);
if(typeof cell.getValueWithFormat() === "string" && cell.getValueWithFormat().length > 0) var value = parseFloat(cell.getValue());
if(AscFormat.isRealNumber(value))
{ {
hidden = false; hidden = false;
pt = new AscFormat.CNumericPoint(); pt = new AscFormat.CNumericPoint();
pt.setIdx(pt_index); pt.setIdx(pt_index);
pt.setVal(parseFloat(cell.getValue())); pt.setVal(value);
if(cell.getNumFormatStr() !== lit_format_code) if(cell.getNumFormatStr() !== lit_format_code)
{ {
pt.setFormatCode(cell.getNumFormatStr()) pt.setFormatCode(cell.getNumFormatStr())
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7