theluyuan/layui-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix table 导出 序号

Browse Source
This commit is contained in:
Theluyuan 2023-10-24 13:28:08 +08:00
parent 01a43630c6
commit f62909247c
4 changed files with 66 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
es/table/index.js
View File

@ -1187,16 +1187,16 @@ const _sfc_main = defineComponent({
tableStr += `<td colspan=${colspan} rowspan=${rowspan}>${item[name]}</td>`; tableStr += `<td colspan=${colspan} rowspan=${rowspan}>${item[name]}</td>`;
} }
} }
});
if (tableColumn.type == "number") { if (tableColumn.type == "number") {
const rowColSpan = props.spanMethod(item, tableColumn, rowIndex, columnIndex); const rowColSpan = props.spanMethod(item, tableColumn, rowIndex, columnIndex);
const rowspan = rowColSpan ? rowColSpan[0] : 1; const rowspan = rowColSpan ? rowColSpan[0] : 1;
const colspan = rowColSpan ? rowColSpan[1] : 1; const colspan = rowColSpan ? rowColSpan[1] : 1;
if (rowspan != 0 && colspan != 0) { if (rowspan != 0 && colspan != 0) {
tableStr += `<td colspan=${colspan} rowspan=${rowspan}>${columnIndex}</td>`; tableStr += `<td colspan=${colspan} rowspan=${rowspan}>${rowIndex}</td>`;
} }
} }
}); });
});
tableStr += "</tr>"; tableStr += "</tr>";
}); });
var worksheet = "Sheet1"; var worksheet = "Sheet1";

4
lib/index.js
View File

@ -19634,16 +19634,16 @@ const _sfc_main$D = defineComponent({
tableStr += `<td colspan=${colspan} rowspan=${rowspan}>${item[name]}</td>`; tableStr += `<td colspan=${colspan} rowspan=${rowspan}>${item[name]}</td>`;
} }
} }
});
if (tableColumn.type == "number") { if (tableColumn.type == "number") {
const rowColSpan = props.spanMethod(item, tableColumn, rowIndex, columnIndex); const rowColSpan = props.spanMethod(item, tableColumn, rowIndex, columnIndex);
const rowspan = rowColSpan ? rowColSpan[0] : 1; const rowspan = rowColSpan ? rowColSpan[0] : 1;
const colspan = rowColSpan ? rowColSpan[1] : 1; const colspan = rowColSpan ? rowColSpan[1] : 1;
if (rowspan != 0 && colspan != 0) { if (rowspan != 0 && colspan != 0) {
tableStr += `<td colspan=${colspan} rowspan=${rowspan}>${columnIndex}</td>`; tableStr += `<td colspan=${colspan} rowspan=${rowspan}>${rowIndex}</td>`;
} }
} }
}); });
});
tableStr += "</tr>"; tableStr += "</tr>";
}); });
var worksheet = "Sheet1"; var worksheet = "Sheet1";

5
src/component/table/index.vue
View File

@ -417,6 +417,8 @@ const exportData = () => {
tableStr += `<td colspan=${colspan} rowspan=${rowspan}>${item[name]}</td>`; tableStr += `<td colspan=${colspan} rowspan=${rowspan}>${item[name]}</td>`;
} }
} }
});
if(tableColumn.type == "number"){ if(tableColumn.type == "number"){
const rowColSpan = props.spanMethod( const rowColSpan = props.spanMethod(
item, item,
@ -427,11 +429,10 @@ const exportData = () => {
const rowspan = rowColSpan ? rowColSpan[0] : 1; const rowspan = rowColSpan ? rowColSpan[0] : 1;
const colspan = rowColSpan ? rowColSpan[1] : 1; const colspan = rowColSpan ? rowColSpan[1] : 1;
if (rowspan != 0 && colspan != 0) { if (rowspan != 0 && colspan != 0) {
tableStr += `<td colspan=${colspan} rowspan=${rowspan}>${columnIndex}</td>`; tableStr += `<td colspan=${colspan} rowspan=${rowspan}>${rowIndex}</td>`;
} }
} }
}); });
});
tableStr += "</tr>"; tableStr += "</tr>";
}); });
var worksheet = "Sheet1"; var worksheet = "Sheet1";

92
umd/index.js
View File

File diff suppressed because one or more lines are too long