mirror of
https://github.com/PanJiaChen/vue-element-admin.git
synced 2025-04-05 19:41:51 +08:00
Merge 50c03aec9ba82a814fc1b40a430956e740504684 into 6858a9ad67483025f6a9432a926beb9327037be3
This commit is contained in:
commit
7650f64edd
4
src/vendor/Export2Excel.js
vendored
4
src/vendor/Export2Excel.js
vendored
@ -26,8 +26,8 @@ function generateArray(table) {
|
|||||||
|
|
||||||
//Handle Row Span
|
//Handle Row Span
|
||||||
if (rowspan || colspan) {
|
if (rowspan || colspan) {
|
||||||
rowspan = rowspan || 1;
|
rowspan = Number(rowspan || 1);
|
||||||
colspan = colspan || 1;
|
colspan = Number(colspan || 1);
|
||||||
ranges.push({
|
ranges.push({
|
||||||
s: {
|
s: {
|
||||||
r: R,
|
r: R,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user