vxe-table 3.13.10 → 3.13.12

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 (36) hide show
  1. package/es/index.css +1 -1
  2. package/es/index.min.css +1 -1
  3. package/es/style.css +1 -1
  4. package/es/style.min.css +1 -1
  5. package/es/table/src/methods.js +34 -14
  6. package/es/table/style.css +20 -22
  7. package/es/table/style.min.css +1 -1
  8. package/es/ui/index.js +1 -1
  9. package/es/ui/src/log.js +1 -1
  10. package/es/vxe-table/style.css +20 -22
  11. package/es/vxe-table/style.min.css +1 -1
  12. package/lib/index.css +1 -1
  13. package/lib/index.min.css +1 -1
  14. package/lib/index.umd.js +32 -16
  15. package/lib/index.umd.min.js +1 -1
  16. package/lib/style.css +1 -1
  17. package/lib/style.min.css +1 -1
  18. package/lib/table/src/methods.js +30 -14
  19. package/lib/table/src/methods.min.js +1 -1
  20. package/lib/table/style/style.css +20 -22
  21. package/lib/table/style/style.min.css +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/lib/vxe-table/style/style.css +20 -22
  27. package/lib/vxe-table/style/style.min.css +1 -1
  28. package/package.json +1 -1
  29. package/packages/table/src/methods.ts +33 -19
  30. package/styles/components/table.scss +66 -22
  31. /package/es/{iconfont.1740398494462.ttf → iconfont.1740558658469.ttf} +0 -0
  32. /package/es/{iconfont.1740398494462.woff → iconfont.1740558658469.woff} +0 -0
  33. /package/es/{iconfont.1740398494462.woff2 → iconfont.1740558658469.woff2} +0 -0
  34. /package/lib/{iconfont.1740398494462.ttf → iconfont.1740558658469.ttf} +0 -0
  35. /package/lib/{iconfont.1740398494462.woff → iconfont.1740558658469.woff} +0 -0
  36. /package/lib/{iconfont.1740398494462.woff2 → iconfont.1740558658469.woff2} +0 -0
package/lib/table/src/methods.js CHANGED
@@ -652,16 +652,10 @@ function updateStyle($xeTable) {
652
652
  if (layout === 'header') {
653
653
  // 表头体样式处理
654
654
  // 横向滚动渲染
655
- let tWidth = tableWidth;
656
655
  let renderColumnList = tableColumn;
657
656
  let isOptimizeMode = false;
658
657
  if (isGroup) {
659
658
  renderColumnList = visibleColumn;
660
- if (fixedType) {
661
- if (wrapperElem) {
662
- wrapperElem.style.width = tWidth ? `${tWidth}px` : '';
663
- }
664
- }
665
659
  } else {
666
660
  // 如果是使用优化模式
667
661
  if (scrollXLoad || scrollYLoad || allColumnHeaderOverflow) {
@@ -677,14 +671,26 @@ function updateStyle($xeTable) {
677
671
  if (isOptimizeMode) {
678
672
  renderColumnList = fixedColumn || [];
679
673
  }
680
- if (!isOptimizeMode) {
674
+ }
675
+ }
676
+ const tWidth = renderColumnList.reduce((previous, column) => previous + column.renderWidth, 0);
677
+ if (fixedType) {
678
+ if (isGroup) {
679
+ if (wrapperElem) {
680
+ wrapperElem.style.width = tableWidth ? `${tableWidth}px` : '';
681
+ }
682
+ } else {
683
+ if (isOptimizeMode) {
681
684
  if (wrapperElem) {
682
685
  wrapperElem.style.width = tWidth ? `${tWidth}px` : '';
683
686
  }
687
+ } else {
688
+ if (wrapperElem) {
689
+ wrapperElem.style.width = tableWidth ? `${tableWidth}px` : '';
690
+ }
684
691
  }
685
692
  }
686
693
  }
687
- tWidth = renderColumnList.reduce((previous, column) => previous + column.renderWidth, 0);
688
694
  if (currScrollElem) {
689
695
  currScrollElem.style.height = `${headerHeight}px`;
690
696
  }
@@ -739,7 +745,6 @@ function updateStyle($xeTable) {
739
745
  fixedWrapperElem.style.height = `${customHeight > 0 ? customHeight : tableHeight + headerHeight + footerHeight + osbHeight}px`;
740
746
  fixedWrapperElem.style.width = `${fixedColumn.reduce((previous, column) => previous + column.renderWidth, 0)}px`;
741
747
  }
742
- let tWidth = tableWidth;
743
748
  let renderColumnList = tableColumn;
744
749
  let isOptimizeMode = false;
745
750
  // 如果是使用优化模式
@@ -755,13 +760,19 @@ function updateStyle($xeTable) {
755
760
  if (isOptimizeMode) {
756
761
  renderColumnList = fixedColumn || [];
757
762
  }
758
- if (!isOptimizeMode) {
763
+ }
764
+ const tWidth = renderColumnList.reduce((previous, column) => previous + column.renderWidth, 0);
765
+ if (fixedType) {
766
+ if (isOptimizeMode) {
759
767
  if (wrapperElem) {
760
768
  wrapperElem.style.width = tWidth ? `${tWidth}px` : '';
761
769
  }
770
+ } else {
771
+ if (wrapperElem) {
772
+ wrapperElem.style.width = tableWidth ? `${tableWidth}px` : '';
773
+ }
762
774
  }
763
775
  }
764
- tWidth = renderColumnList.reduce((previous, column) => previous + column.renderWidth, 0);
765
776
  if (tableElem) {
766
777
  tableElem.style.width = tWidth ? `${tWidth}px` : '';
767
778
  // 兼容性处理
@@ -772,7 +783,6 @@ function updateStyle($xeTable) {
772
783
  emptyBlockElem.style.width = tWidth ? `${tWidth}px` : '';
773
784
  }
774
785
  } else if (layout === 'footer') {
775
- let tWidth = tableWidth;
776
786
  let renderColumnList = tableColumn;
777
787
  let isOptimizeMode = false;
778
788
  // 如果是使用优化模式
@@ -788,13 +798,19 @@ function updateStyle($xeTable) {
788
798
  if (isOptimizeMode) {
789
799
  renderColumnList = fixedColumn || [];
790
800
  }
791
- if (!isOptimizeMode) {
801
+ }
802
+ const tWidth = renderColumnList.reduce((previous, column) => previous + column.renderWidth, 0);
803
+ if (fixedType) {
804
+ if (isOptimizeMode) {
792
805
  if (wrapperElem) {
793
806
  wrapperElem.style.width = tWidth ? `${tWidth}px` : '';
794
807
  }
808
+ } else {
809
+ if (wrapperElem) {
810
+ wrapperElem.style.width = tableWidth ? `${tableWidth}px` : '';
811
+ }
795
812
  }
796
813
  }
797
- tWidth = renderColumnList.reduce((previous, column) => previous + column.renderWidth, 0);
798
814
  if (currScrollElem) {
799
815
  currScrollElem.style.height = `${footerHeight}px`;
800
816
  // 如果是固定列