n20-common-lib 2.19.11 → 2.19.13
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
CHANGED
|
@@ -370,8 +370,8 @@ export default {
|
|
|
370
370
|
|
|
371
371
|
const width = column.minWidth || column.width
|
|
372
372
|
column['_width_'] = column['_width_'] || parseInt(width)
|
|
373
|
-
/*
|
|
374
|
-
columnsWidth += column
|
|
373
|
+
/* column['width'] = parseInt(width) */
|
|
374
|
+
columnsWidth += column['_width_']
|
|
375
375
|
})
|
|
376
376
|
|
|
377
377
|
// 如果总宽度超过容器宽度,直接返回
|
|
@@ -383,8 +383,7 @@ export default {
|
|
|
383
383
|
return columns.map((column) => {
|
|
384
384
|
if (!column.type) {
|
|
385
385
|
const rate = column['_width_'] / columnsWidth
|
|
386
|
-
column['width'] = Math.
|
|
387
|
-
|
|
386
|
+
column['width'] = Math.max(windowWidth * rate, column.minWidth || column.width)
|
|
388
387
|
return column
|
|
389
388
|
}
|
|
390
389
|
return column
|