n20-common-lib 2.18.0 → 2.18.2

package/package.json

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

package/src/components/TablePro/index.vue

@@ -341,13 +341,19 @@ export default {
         }
       })
       const wrapperEl = document.querySelector('div#app')
-      const notHasWidth = columns.filter((column) => !column.width && !column.minWidth && column.label !== $lc('操作'))
-      if (!wrapperEl || notHasWidth.length > 0) {
+      if (!wrapperEl) {
         return columns
       }
       const { width: windowWidth } = wrapperEl.getBoundingClientRect()
+
+      // 定义每个字符的平均宽度（像素）
+      const CHAR_WIDTH = 20 // 根据实际字体大小调整
+      const PADDING = 20 // 左右padding
+
       function calc(columns) {
         let columnsWidth = 0
+
+        // 先计算每列的基础宽度
         columns.forEach((column) => {
           if (column.static && column.label === $lc('操作') && !column.width && !column.minWidth) {
             column.width = 80
@@ -355,24 +361,35 @@ export default {
           if (column.type === 'checkbox') {
             column.width = 80
           }
+
+          // 如果没有设置宽度，根据字符数计算最小宽度
+          if (!column.width && !column.minWidth) {
+            const textLength = column.label.length
+            column.minWidth = Math.ceil(textLength * CHAR_WIDTH + PADDING)
+          }
+
           const width = column.minWidth || column.width
           column['_width_'] = column['_width_'] || parseInt(width)
           column['width'] = parseInt(width)
-          column['minWidth'] = undefined
           columnsWidth += column.width
         })
 
-        if (columnsWidth >= windowWidth) return columns
+        // 如果总宽度超过容器宽度，直接返回
+        if (columnsWidth >= windowWidth) {
+          return columns
+        }
+
+        // 否则按比例分配剩余空间
         return columns.map((column) => {
           if (!column.type) {
             const rate = column['_width_'] / columnsWidth
-            column['width'] = Math.ceil(windowWidth * rate)
+            column['width'] = Math.max(windowWidth * rate, column.minWidth || column.width)
             return column
           }
-
           return column
         })
       }
+
       return calc(columns)
     }
   }

package/src/directives/VTitle/index.js

@@ -42,7 +42,7 @@ function tipShow(el, arg) {
   if (el.$tooltipTitle) {
     // 修改这里的判断逻辑
     const shouldShowTooltip =
-      el.$tooltipTitleOverflow || el.clientWidth < el.scrollWidth || el.offsetWidth < el.scrollWidth
+      !el.$tooltipTitleOverflow || el.clientWidth < el.scrollWidth || el.offsetWidth < el.scrollWidth
 
     if (shouldShowTooltip) {
       text = el.$tooltipTitle