Commit 3f44d496 authored by GoshaZotov's avatar GoshaZotov

fix bug 32963

parent b850eb76
...@@ -2151,7 +2151,7 @@ ...@@ -2151,7 +2151,7 @@
return res.length > 0 ? res.join(",") : ""; return res.length > 0 ? res.join(",") : "";
} }
var getSpan = function(text, format, isAddSpace) var getSpan = function(text, format, isAddSpace, isHyperLink)
{ {
var value = ""; var value = "";
...@@ -2170,7 +2170,18 @@ ...@@ -2170,7 +2170,18 @@
value += " "; value += " ";
} }
var elem = document.createElement("span"); var elem;
if(isHyperLink)
{
elem = document.createElement("a");
elem.href = isHyperLink.Hyperlink;
elem.title = isHyperLink.ToolTip;
}
else
{
elem = document.createElement("span");
}
elem.innerText = value; elem.innerText = value;
if(format) if(format)
...@@ -2198,6 +2209,7 @@ ...@@ -2198,6 +2209,7 @@
for(var j in row.c) for(var j in row.c)
{ {
var cell = row.c[j]; var cell = row.c[j];
var isHyperlink = worksheet.getCell3( i, j ).getHyperlink();
if(cell.oValue && cell.oValue.multiText) if(cell.oValue && cell.oValue.multiText)
{ {
...@@ -2217,7 +2229,7 @@ ...@@ -2217,7 +2229,7 @@
var format = cell.xfs && cell.xfs.font ? cell.xfs.font : null; var format = cell.xfs && cell.xfs.font ? cell.xfs.font : null;
var isAddSpace = row.c[parseInt(j) + 1] || (!row.c[parseInt(j) + 1] && worksheet.aGCells[parseInt(i) + 1]) ? true : false; var isAddSpace = row.c[parseInt(j) + 1] || (!row.c[parseInt(j) + 1] && worksheet.aGCells[parseInt(i) + 1]) ? true : false;
var elem = getSpan(cell.getValue(), format, isAddSpace); var elem = getSpan(cell.getValue(), format, isAddSpace, isHyperlink);
if(null !== elem) if(null !== elem)
{ {
res.appendChild(elem); res.appendChild(elem);
......
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