Skip to content

Commit 5f12860

Browse files
authored
Merge pull request #166 from smartXJ/fix/multi-header-column-width
fix: 修复多表头列合并后, 设计和预览的列宽不一致的问题
2 parents 6af216d + ceac195 commit 5f12860

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

src/hiprint/hiprint.bundle.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5697,7 +5697,7 @@ var hiprint = function (t) {
56975697
if (this.printElementType.formatter) return (n = $("<div></div>")).append(this.printElementType.formatter(t)), (i = n.find("table")).addClass("hiprint-printElement-tableTarget"), i;
56985698
var o = $('<table class="hiprint-printElement-tableTarget" style="border-collapse: collapse;"></table>');
56995699
let headerList = _table_TableExcelHelper__WEBPACK_IMPORTED_MODULE_6__.a.createTableHead(this.getColumns(), this.options.getWidth() / this.options.getGridColumns());
5700-
return this.isNotDesign ? o.append(headerList) : o.append(headerList[0]), o.append(_table_TableExcelHelper__WEBPACK_IMPORTED_MODULE_6__.a.createTableRow(this.getColumns(), t, e, this.options, this.printElementType)), "no" == this.options.tableFooterRepeat || _table_TableExcelHelper__WEBPACK_IMPORTED_MODULE_6__.a.createTableFooter(this.printElementType.columns, t, this.options, this.printElementType, e, t).insertBefore(o.find("tbody")), o;
5700+
return (this.isNotDesign && ['first', 'none'].includes(this.options.tableHeaderRepeat)) ? o.append(headerList) : o.append(headerList[0]), o.append(_table_TableExcelHelper__WEBPACK_IMPORTED_MODULE_6__.a.createTableRow(this.getColumns(), t, e, this.options, this.printElementType)), "no" == this.options.tableFooterRepeat || _table_TableExcelHelper__WEBPACK_IMPORTED_MODULE_6__.a.createTableFooter(this.printElementType.columns, t, this.options, this.printElementType, e, t).insertBefore(o.find("tbody")), o;
57015701
}, TablePrintElement.prototype.getEmptyRowTarget = function () {
57025702
return _table_TableExcelHelper__WEBPACK_IMPORTED_MODULE_6__.a.createEmptyRowTarget(this.getColumns(), this);
57035703
}, TablePrintElement.prototype.getHtml = function (t, e) {

0 commit comments

Comments
 (0)