vxe-table 3.11.38 → 3.11.39

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 (37) hide show
  1. package/es/style.css +1 -1
  2. package/es/table/render/index.js +44 -11
  3. package/es/table/src/body.js +29 -26
  4. package/es/table/src/footer.js +29 -18
  5. package/es/table/src/header.js +25 -7
  6. package/es/table/src/methods.js +25 -16
  7. package/es/ui/index.js +1 -1
  8. package/es/ui/src/log.js +1 -1
  9. package/lib/index.umd.js +192 -126
  10. package/lib/index.umd.min.js +1 -1
  11. package/lib/style.css +1 -1
  12. package/lib/table/render/index.js +44 -11
  13. package/lib/table/render/index.min.js +1 -1
  14. package/lib/table/src/body.js +47 -47
  15. package/lib/table/src/body.min.js +1 -1
  16. package/lib/table/src/footer.js +41 -32
  17. package/lib/table/src/footer.min.js +1 -1
  18. package/lib/table/src/header.js +35 -15
  19. package/lib/table/src/header.min.js +1 -1
  20. package/lib/table/src/methods.js +23 -19
  21. package/lib/table/src/methods.min.js +1 -1
  22. package/lib/ui/index.js +1 -1
  23. package/lib/ui/index.min.js +1 -1
  24. package/lib/ui/src/log.js +1 -1
  25. package/lib/ui/src/log.min.js +1 -1
  26. package/package.json +2 -2
  27. package/packages/table/render/index.ts +45 -11
  28. package/packages/table/src/body.ts +32 -26
  29. package/packages/table/src/footer.ts +33 -18
  30. package/packages/table/src/header.ts +25 -7
  31. package/packages/table/src/methods.ts +25 -19
  32. /package/es/{iconfont.1735003904481.ttf → iconfont.1735027791418.ttf} +0 -0
  33. /package/es/{iconfont.1735003904481.woff → iconfont.1735027791418.woff} +0 -0
  34. /package/es/{iconfont.1735003904481.woff2 → iconfont.1735027791418.woff2} +0 -0
  35. /package/lib/{iconfont.1735003904481.ttf → iconfont.1735027791418.ttf} +0 -0
  36. /package/lib/{iconfont.1735003904481.woff → iconfont.1735027791418.woff} +0 -0
  37. /package/lib/{iconfont.1735003904481.woff2 → iconfont.1735027791418.woff2} +0 -0
package/lib/table/src/methods.js CHANGED
@@ -3468,11 +3468,8 @@ const Methods = {
3468
3468
  editStore,
3469
3469
  currentRow,
3470
3470
  mouseConfig,
3471
- keyboardConfig,
3472
- keyboardOpts,
3473
3471
  spanMethod,
3474
- mergeList,
3475
- mergeFooterList,
3472
+ expandColumn,
3476
3473
  footerSpanMethod,
3477
3474
  isAllOverflow,
3478
3475
  visibleColumn
@@ -3529,10 +3526,17 @@ const Methods = {
3529
3526
  if (isGroup) {
3530
3527
  renderColumnList = visibleColumn;
3531
3528
  } else {
3532
- // 如果是使用优化模式
3533
3529
  if (fixedType) {
3534
- if (scrollXLoad || allColumnHeaderOverflow) {
3535
- renderColumnList = fixedColumn;
3530
+ // 如果是使用优化模式
3531
+ if (allColumnHeaderOverflow) {
3532
+ // 如果不支持优化模式
3533
+ if (spanMethod || footerSpanMethod) {
3534
+ renderColumnList = visibleColumn;
3535
+ } else {
3536
+ renderColumnList = fixedColumn || [];
3537
+ }
3538
+ } else {
3539
+ renderColumnList = visibleColumn;
3536
3540
  }
3537
3541
  }
3538
3542
  }
@@ -3619,14 +3623,14 @@ const Methods = {
3619
3623
  }
3620
3624
  let tWidth = tableWidth;
3621
3625
  let renderColumnList = tableColumn;
3622
- // 如果是使用优化模式
3623
3626
  if (fixedType) {
3624
- // 如果存在展开行使用全量渲染
3625
- if (!this.expandColumn && (scrollXLoad || scrollYLoad || (allColumnOverflow ? isAllOverflow : allColumnOverflow))) {
3626
- if (!mergeList.length && !spanMethod && !(keyboardConfig && keyboardOpts.isMerge)) {
3627
- renderColumnList = fixedColumn;
3628
- } else {
3627
+ // 如果是使用优化模式
3628
+ if (scrollXLoad || scrollYLoad || allColumnOverflow && isAllOverflow) {
3629
+ // 如果不支持优化模式
3630
+ if (expandColumn || spanMethod || footerSpanMethod) {
3629
3631
  renderColumnList = visibleColumn;
3632
+ } else {
3633
+ renderColumnList = fixedColumn || [];
3630
3634
  }
3631
3635
  } else {
3632
3636
  renderColumnList = visibleColumn;
@@ -3644,14 +3648,14 @@ const Methods = {
3644
3648
  } else if (layout === 'footer') {
3645
3649
  let tWidth = tableWidth;
3646
3650
  let renderColumnList = tableColumn;
3647
- // 如果是使用优化模式
3648
3651
  if (fixedType) {
3649
- // 如果存在展开行使用全量渲染
3650
- if (!this.expandColumn && (scrollXLoad || allColumnFooterOverflow)) {
3651
- if (!mergeFooterList.length || !footerSpanMethod) {
3652
- renderColumnList = fixedColumn;
3653
- } else {
3652
+ // 如果是使用优化模式
3653
+ if (allColumnFooterOverflow) {
3654
+ // 如果不支持优化模式
3655
+ if (spanMethod || footerSpanMethod) {
3654
3656
  renderColumnList = visibleColumn;
3657
+ } else {
3658
+ renderColumnList = fixedColumn || [];
3655
3659
  }
3656
3660
  } else {
3657
3661
  renderColumnList = visibleColumn;