gm-printer 10.41.10-beta.180 → 10.41.10-beta.181
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/printer/table.js +2 -10
package/package.json
CHANGED
package/src/printer/table.js
CHANGED
|
@@ -216,12 +216,9 @@ class Table extends React.Component {
|
|
|
216
216
|
|
|
217
217
|
if (!width) return tdStyle
|
|
218
218
|
if (fontSize) minWidth = _.parseInt(fontSize) * 2
|
|
219
|
-
// 宽列也要锁 width:只设 minWidth 时打印阶段列宽会被该页内容重新分配,
|
|
220
|
-
// 与测量阶段(全量行 auto 布局)不一致,边界文本换行数漂移导致分页后页尾空白/溢出
|
|
221
219
|
if (width >= 150) {
|
|
222
220
|
tdStyle = {
|
|
223
|
-
minWidth: width
|
|
224
|
-
width
|
|
221
|
+
minWidth: width
|
|
225
222
|
}
|
|
226
223
|
} else {
|
|
227
224
|
tdStyle = {
|
|
@@ -249,16 +246,11 @@ class Table extends React.Component {
|
|
|
249
246
|
const needDiyTag = config.diyTagSubtotal?.show && dataKey.includes('tagDiy')
|
|
250
247
|
const diyTagGroups = needDiyTag ? collectGroups(tableData, range) : []
|
|
251
248
|
|
|
252
|
-
// 列宽齐全(走过分页测量)时用 fixed:列宽锁定为测量值,不再随每页内容重新分配,
|
|
253
|
-
// 保证打印阶段换行/行高与测量阶段一致,分页边界才准确。
|
|
254
|
-
// 测量阶段自身(renderBefore)与合并打印首渲染(tablesInfo 为空)仍走 auto。
|
|
255
|
-
const isFixedLayout = thWidths.length === columns.length
|
|
256
|
-
|
|
257
249
|
return (
|
|
258
250
|
<table
|
|
259
251
|
style={{
|
|
260
252
|
// td会撑开table的宽度
|
|
261
|
-
tableLayout:
|
|
253
|
+
tableLayout: 'inherit',
|
|
262
254
|
wordBreak: 'break-all'
|
|
263
255
|
}}
|
|
264
256
|
>
|