vxe-table 3.10.0-beta.5 → 3.10.0-beta.6

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 (21) hide show
  1. package/es/style.css +1 -1
  2. package/es/table/src/body.js +10 -1
  3. package/es/ui/index.js +1 -1
  4. package/es/ui/src/log.js +1 -1
  5. package/lib/index.umd.js +11 -3
  6. package/lib/index.umd.min.js +1 -1
  7. package/lib/style.css +1 -1
  8. package/lib/table/src/body.js +9 -1
  9. package/lib/table/src/body.min.js +1 -1
  10. package/lib/ui/index.js +1 -1
  11. package/lib/ui/index.min.js +1 -1
  12. package/lib/ui/src/log.js +1 -1
  13. package/lib/ui/src/log.min.js +1 -1
  14. package/package.json +1 -1
  15. package/packages/table/src/body.ts +10 -1
  16. /package/es/{iconfont.1730463743051.ttf → iconfont.1730512473977.ttf} +0 -0
  17. /package/es/{iconfont.1730463743051.woff → iconfont.1730512473977.woff} +0 -0
  18. /package/es/{iconfont.1730463743051.woff2 → iconfont.1730512473977.woff2} +0 -0
  19. /package/lib/{iconfont.1730463743051.ttf → iconfont.1730512473977.ttf} +0 -0
  20. /package/lib/{iconfont.1730463743051.woff → iconfont.1730512473977.woff} +0 -0
  21. /package/lib/{iconfont.1730463743051.woff2 → iconfont.1730512473977.woff2} +0 -0
package/packages/table/src/body.ts CHANGED
@@ -268,6 +268,15 @@ function renderColumn (h: any, _vm: any, $xetable: any, seq: any, rowid: any, fi
268
268
  )
269
269
  }
270
270
  }
271
+ let cellHeight = ''
272
+ if (hasEllipsis && (scrollYRHeight || rowHeight)) {
273
+ cellHeight = `${scrollYRHeight || rowHeight}px`
274
+ } else if (scrollYLoad) {
275
+ if (!hasEllipsis) {
276
+ cellHeight = `${rest.height || 24}px`
277
+ }
278
+ }
279
+
271
280
  return h('td', {
272
281
  class: [
273
282
  'vxe-body--column',
@@ -293,7 +302,7 @@ function renderColumn (h: any, _vm: any, $xetable: any, seq: any, rowid: any, fi
293
302
  key: columnKey || columnOpts.useKey ? column.id : $columnIndex,
294
303
  attrs,
295
304
  style: Object.assign({
296
- height: hasEllipsis && (scrollYRHeight || rowHeight) ? `${scrollYRHeight || rowHeight}px` : (scrollYLoad ? `${rest.height || 24}px` : '')
305
+ height: cellHeight
297
306
  }, XEUtils.isFunction(compCellStyle) ? compCellStyle(params) : compCellStyle, XEUtils.isFunction(cellStyle) ? cellStyle(params) : cellStyle),
298
307
  on: tdOns
299
308
  }, tdVNs)