vxe-table 4.22.4 → 4.23.0-beta.0

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 (71) hide show
  1. package/dist/all.esm.js +149 -89
  2. package/dist/style.css +1 -1
  3. package/es/grid/src/grid.js +14 -2
  4. package/es/style.css +1 -1
  5. package/es/table/module/custom/panel.js +4 -3
  6. package/es/table/module/edit/hook.js +5 -4
  7. package/es/table/module/export/hook.js +6 -4
  8. package/es/table/module/filter/hook.js +2 -2
  9. package/es/table/module/keyboard/hook.js +4 -3
  10. package/es/table/module/menu/hook.js +3 -3
  11. package/es/table/render/index.js +7 -4
  12. package/es/table/src/body.js +4 -4
  13. package/es/table/src/header.js +4 -3
  14. package/es/table/src/table.js +90 -63
  15. package/es/table/src/util.js +7 -3
  16. package/es/ui/index.js +1 -1
  17. package/es/ui/src/log.js +1 -1
  18. package/es/ui/src/utils.js +9 -0
  19. package/lib/grid/src/grid.js +13 -1
  20. package/lib/grid/src/grid.min.js +1 -1
  21. package/lib/index.umd.js +114 -64
  22. package/lib/index.umd.min.js +1 -1
  23. package/lib/style.css +1 -1
  24. package/lib/table/module/custom/panel.js +3 -1
  25. package/lib/table/module/custom/panel.min.js +1 -1
  26. package/lib/table/module/edit/hook.js +4 -3
  27. package/lib/table/module/edit/hook.min.js +1 -1
  28. package/lib/table/module/export/hook.js +9 -3
  29. package/lib/table/module/export/hook.min.js +1 -1
  30. package/lib/table/module/filter/hook.js +1 -1
  31. package/lib/table/module/filter/hook.min.js +1 -1
  32. package/lib/table/module/keyboard/hook.js +4 -3
  33. package/lib/table/module/keyboard/hook.min.js +1 -1
  34. package/lib/table/module/menu/hook.js +2 -2
  35. package/lib/table/module/menu/hook.min.js +1 -1
  36. package/lib/table/render/index.js +11 -5
  37. package/lib/table/render/index.min.js +1 -1
  38. package/lib/table/src/body.js +3 -3
  39. package/lib/table/src/body.min.js +1 -1
  40. package/lib/table/src/header.js +3 -2
  41. package/lib/table/src/header.min.js +1 -1
  42. package/lib/table/src/table.js +38 -36
  43. package/lib/table/src/table.min.js +1 -1
  44. package/lib/table/src/util.js +12 -2
  45. package/lib/table/src/util.min.js +1 -1
  46. package/lib/ui/index.js +1 -1
  47. package/lib/ui/index.min.js +1 -1
  48. package/lib/ui/src/log.js +1 -1
  49. package/lib/ui/src/log.min.js +1 -1
  50. package/lib/ui/src/utils.js +10 -0
  51. package/lib/ui/src/utils.min.js +1 -1
  52. package/package.json +2 -2
  53. package/packages/grid/src/grid.ts +14 -2
  54. package/packages/table/module/custom/panel.ts +4 -3
  55. package/packages/table/module/edit/hook.ts +5 -4
  56. package/packages/table/module/export/hook.ts +6 -4
  57. package/packages/table/module/filter/hook.ts +2 -2
  58. package/packages/table/module/keyboard/hook.ts +4 -3
  59. package/packages/table/module/menu/hook.ts +3 -3
  60. package/packages/table/render/index.ts +7 -4
  61. package/packages/table/src/body.ts +4 -4
  62. package/packages/table/src/header.ts +4 -3
  63. package/packages/table/src/table.ts +87 -61
  64. package/packages/table/src/util.ts +7 -3
  65. package/packages/ui/src/utils.ts +10 -0
  66. /package/es/{iconfont.1791617063720.ttf → iconfont.1791880428511.ttf} +0 -0
  67. /package/es/{iconfont.1791617063720.woff → iconfont.1791880428511.woff} +0 -0
  68. /package/es/{iconfont.1791617063720.woff2 → iconfont.1791880428511.woff2} +0 -0
  69. /package/lib/{iconfont.1791617063720.ttf → iconfont.1791880428511.ttf} +0 -0
  70. /package/lib/{iconfont.1791617063720.woff → iconfont.1791880428511.woff} +0 -0
  71. /package/lib/{iconfont.1791617063720.woff2 → iconfont.1791880428511.woff2} +0 -0
package/es/grid/src/grid.js CHANGED
@@ -2,7 +2,7 @@ import { h, ref, computed, provide, reactive, onBeforeUnmount, watch, nextTick,
2
2
  import { defineVxeComponent } from '../../ui/src/comp';
3
3
  import XEUtils from 'xe-utils';
4
4
  import { getLastZIndex, nextZIndex, isEnableConf } from '../../ui/src/utils';
5
- import { getOffsetHeight, getPaddingTopBottomSize, getDomNode, toCssUnit } from '../../ui/src/dom';
5
+ import { getOffsetHeight, getPaddingTopBottomSize, getDomNode, toCssUnit, hasClass } from '../../ui/src/dom';
6
6
  import { VxeUI } from '../../ui';
7
7
  import { gridProps } from './props';
8
8
  import { gridEmits } from './emits';
@@ -1641,10 +1641,22 @@ export default defineVxeComponent({
1641
1641
  }
1642
1642
  return 0;
1643
1643
  },
1644
+ getParentElem() {
1645
+ const el = refElem.value;
1646
+ if (!el) {
1647
+ return null;
1648
+ }
1649
+ let parentEl = el.parentElement;
1650
+ // 如果是虚拟滚动条
1651
+ if (parentEl && hasClass(parentEl, 'vxe-scrollbar--view-inner')) {
1652
+ parentEl = parentEl.parentElement;
1653
+ }
1654
+ return parentEl;
1655
+ },
1644
1656
  getParentHeight() {
1645
1657
  const el = refElem.value;
1646
1658
  if (el) {
1647
- const parentEl = el.parentElement;
1659
+ const parentEl = $xeGrid.getParentElem();
1648
1660
  return (reactData.isZMax ? getDomNode().visibleHeight : (parentEl ? XEUtils.toNumber(getComputedStyle(parentEl).height) : 0)) - gridPrivateMethods.getExcludeHeight();
1649
1661
  }
1650
1662
  return 0;