n20-common-lib 2.20.2 → 2.20.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.20.2",
+  "version": "2.20.3",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/components/TablePro/index.vue

@@ -368,9 +368,9 @@ export default {
             column.minWidth = Math.ceil(textLength * CHAR_WIDTH + PADDING)
           }
 
-          const width = column.minWidth || column.width
+          // 优先使用width，如果width不存在才使用minWidth
+          const width = column.width || column.minWidth
           column['_width_'] = column['_width_'] || parseInt(width)
-          /*  column['width'] = parseInt(width) */
           columnsWidth += column['_width_']
         })
 
@@ -383,7 +383,10 @@ export default {
         return columns.map((column) => {
           if (!column.type) {
             const rate = column['_width_'] / columnsWidth
-            column['width'] = Math.max(windowWidth * rate, column.minWidth || column.width)
+            // 如果column有width，则保持原width不变；如果没有width，则计算新宽度但不小于minWidth
+            if (!column.width) {
+              column['width'] = Math.max(windowWidth * rate, column.minWidth)
+            }
             return column
           }
           return column