fix xlsx merge cells logic

This commit is contained in:
ThomasChan 2019-09-25 15:13:40 +08:00
parent 760c55d533
commit aaefb5344e
4 changed files with 24 additions and 4 deletions

@ -19184,7 +19184,12 @@ function parse_dom_table(table/*:HTMLElement*/, _opts/*:?any*/)/*:Worksheet*/ {
}
}
if (cInRange.indexOf(C) !== -1) {
C = Math.max.apply(null, cInRange) + 1;
for (let i = 0; i < cInRange.length; i++) {
C += 1;
if (cInRange.indexOf(C) === -1) {
break;
}
}
}
/* TODO: figure out how to extract nonstandard mso- style */
CS = +elt.colSpan || 1;

7
xlsx.js generated

@ -19068,7 +19068,12 @@ function parse_dom_table(table, _opts) {
}
}
if (cInRange.indexOf(C) !== -1) {
C = Math.max.apply(null, cInRange) + 1;
for (let i = 0; i < cInRange.length; i++) {
C += 1;
if (cInRange.indexOf(C) === -1) {
break;
}
}
}
/* TODO: figure out how to extract nonstandard mso- style */
CS = +elt.colSpan || 1;

@ -7403,7 +7403,12 @@ function parse_dom_table(table/*:HTMLElement*/, _opts/*:?any*/)/*:Worksheet*/ {
}
}
if (cInRange.indexOf(C) !== -1) {
C = Math.max.apply(null, cInRange) + 1;
for (let i = 0; i < cInRange.length; i++) {
C += 1;
if (cInRange.indexOf(C) === -1) {
break;
}
}
}
/* TODO: figure out how to extract nonstandard mso- style */
CS = +elt.colSpan || 1;

@ -7312,7 +7312,12 @@ function parse_dom_table(table, _opts) {
}
}
if (cInRange.indexOf(C) !== -1) {
C = Math.max.apply(null, cInRange) + 1;
for (let i = 0; i < cInRange.length; i++) {
C += 1;
if (cInRange.indexOf(C) === -1) {
break;
}
}
}
/* TODO: figure out how to extract nonstandard mso- style */
CS = +elt.colSpan || 1;