npm - n20-common-lib - Versions diffs - 2.10.10 → 2.10.12 - Mend

n20-common-lib 2.10.10 → 2.10.12

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.

Files changed (2) hide show

package/package.json +1 -1
package/src/components/TablePro/index.vue +9 -0

package/package.json CHANGED Viewed

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

package/src/components/TablePro/index.vue CHANGED Viewed

@@ -336,6 +336,12 @@ 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('操作')
+      )
+      if (!wrapperEl || notHasWidth.length > 0) {
+        return columns
+      }
       const { width: windowWidth } = wrapperEl.getBoundingClientRect()
       function calc(columns) {
         let columnsWidth = 0
@@ -343,6 +349,9 @@ export default {
           if (column.static && column.label === $lc('操作') && !column.width && !column.minWidth) {
             column.width = 80
           }
+          if (column.type) {
+            column.width = 80
+          }
           const width = column.minWidth || column.width
           column['_width_'] = column['_width_'] || parseInt(width)
           column['width'] = parseInt(width)