n20-common-lib 2.22.39 → 2.22.40

package/package.json

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

package/src/components/TablePro/index.vue

@@ -145,6 +145,47 @@ import empty from '../Empty'
 import tableSetSize from '../TableSetSize/index.vue'
 import { $lc } from '../../utils/i18n/index.js'
 import XEUtils from 'xe-utils'
+
+/** 将 Element 表格风格的 show-overflow-tooltip 转为 vxe-column 的 show-overflow */
+function hasOverflowTooltipKey(item) {
+  return (
+    Object.prototype.hasOwnProperty.call(item, 'showOverflowTooltip') ||
+    Object.prototype.hasOwnProperty.call(item, 'show-overflow-tooltip')
+  )
+}
+
+function applyTooltipToShowOverflow(item) {
+  const explicitOverflow =
+    item.showOverflow !== undefined ? item.showOverflow : item['show-overflow']
+  const hasTooltipKey = hasOverflowTooltipKey(item)
+  if (!hasTooltipKey && explicitOverflow === undefined) {
+    return item
+  }
+  const out = { ...item }
+  if (hasTooltipKey) {
+    delete out['show-overflow-tooltip']
+    delete out.showOverflowTooltip
+  }
+  if (explicitOverflow !== undefined) {
+    out['show-overflow'] = explicitOverflow
+  } else if (hasTooltipKey) {
+    const tooltipVal = item.showOverflowTooltip ?? item['show-overflow-tooltip']
+    // 与 n20 Table（ux-table）overflowF 一致：无 tooltip 时用 ellipsis，仅省略无浮层
+    out['show-overflow'] = tooltipVal ? 'tooltip' : 'ellipsis'
+  }
+  return out
+}
+
+function mapColumnOverflowForVxe(item) {
+  if (!item) return item
+  if (item.children && item.children.length) {
+    const children = item.children.map(mapColumnOverflowForVxe)
+    const childChanged = children.some((c, i) => c !== item.children[i])
+    if (!childChanged) return item
+    return { ...item, children }
+  }
+  return applyTooltipToShowOverflow(item)
+}
 const renderer = {
   name: 'renderer',
   props: {
@@ -244,11 +285,8 @@ export default {
   },
   computed: {
     _columns() {
-      if (this.isAutoWidth) {
-        return this.calcColumnWidth(this.columns)
-      } else {
-        return this.columns
-      }
+      const raw = this.isAutoWidth ? this.calcColumnWidth(this.columns) : this.columns
+      return raw.map(mapColumnOverflowForVxe)
     }
   },
   watch: {