n20-common-lib 2.10.19 → 2.10.20

package/package.json

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

package/src/components/TablePro/index.vue

@@ -61,7 +61,7 @@
           :field="item.prop"
         >
           <template slot-scope="scope">
-            <renderer :renderContent="item.render" :scope="scope"></renderer>
+            <renderer :render-content="item.render" :scope="scope" />
           </template>
         </vxe-column>
         <vxe-column
@@ -216,6 +216,11 @@ export default {
       key: 0
     }
   },
+  computed: {
+    _columns() {
+      return this.calcColumnWidth(this.columns)
+    }
+  },
   watch: {
     columns() {
       this.colsKey = this.colsKey + 1
@@ -231,11 +236,6 @@ export default {
       }
     }
   },
-  computed: {
-    _columns() {
-      return this.calcColumnWidth(this.columns)
-    }
-  },
   activated() {
     this.$refs.vxeTable.loadData(this.data)
   },
@@ -336,9 +336,7 @@ export default {
     calcColumnWidth(columns) {
       columns = XEUtils.clone(columns, true)
       const wrapperEl = document.querySelector('div#app')
-      const notHasWidth = columns.filter(
-        (column) => !column.width && !column.minWidth && column.label !== $lc('操作')
-      )
+      const notHasWidth = columns.filter((column) => !column.width && !column.minWidth && column.label !== $lc('操作'))
       if (!wrapperEl || notHasWidth.length > 0) {
         return columns
       }
@@ -349,7 +347,7 @@ export default {
           if (column.static && column.label === $lc('操作') && !column.width && !column.minWidth) {
             column.width = 80
           }
-          if (column.type) {
+          if (column.type === 'checkbox') {
             column.width = 80
           }
           const width = column.minWidth || column.width
@@ -358,6 +356,7 @@ export default {
           column['minWidth'] = undefined
           columnsWidth += column.width
         })
+
         if (columnsWidth >= windowWidth) return columns
         return columns.map((column) => {
           if (!column.type) {
@@ -365,9 +364,11 @@ export default {
             column['width'] = windowWidth * rate
             return column
           }
+
           return column
         })
       }
+
       return calc(columns)
     }
   }