vxe-table 3.11.29 → 3.11.30-beta.1

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 (33) hide show
  1. package/es/style.css +1 -1
  2. package/es/table/module/custom/mixin.js +31 -19
  3. package/es/table/module/keyboard/mixin.js +2 -1
  4. package/es/table/src/methods.js +237 -272
  5. package/es/table/src/table.js +23 -9
  6. package/es/ui/index.js +1 -1
  7. package/es/ui/src/log.js +1 -1
  8. package/lib/index.umd.js +329 -345
  9. package/lib/index.umd.min.js +1 -1
  10. package/lib/style.css +1 -1
  11. package/lib/table/module/custom/mixin.js +36 -23
  12. package/lib/table/module/custom/mixin.min.js +1 -1
  13. package/lib/table/module/keyboard/mixin.js +2 -3
  14. package/lib/table/module/keyboard/mixin.min.js +1 -1
  15. package/lib/table/src/methods.js +264 -306
  16. package/lib/table/src/methods.min.js +1 -1
  17. package/lib/table/src/table.js +25 -9
  18. package/lib/table/src/table.min.js +1 -1
  19. package/lib/ui/index.js +1 -1
  20. package/lib/ui/index.min.js +1 -1
  21. package/lib/ui/src/log.js +1 -1
  22. package/lib/ui/src/log.min.js +1 -1
  23. package/package.json +2 -2
  24. package/packages/table/module/custom/mixin.ts +35 -19
  25. package/packages/table/module/keyboard/mixin.ts +3 -1
  26. package/packages/table/src/methods.ts +247 -262
  27. package/packages/table/src/table.ts +26 -9
  28. /package/es/{iconfont.1734067799153.ttf → iconfont.1734093222885.ttf} +0 -0
  29. /package/es/{iconfont.1734067799153.woff → iconfont.1734093222885.woff} +0 -0
  30. /package/es/{iconfont.1734067799153.woff2 → iconfont.1734093222885.woff2} +0 -0
  31. /package/lib/{iconfont.1734067799153.ttf → iconfont.1734093222885.ttf} +0 -0
  32. /package/lib/{iconfont.1734067799153.woff → iconfont.1734093222885.woff} +0 -0
  33. /package/lib/{iconfont.1734067799153.woff2 → iconfont.1734093222885.woff2} +0 -0
@@ -702,20 +702,37 @@ export default {
702
702
  const { tableColumn, visibleColumn } = this
703
703
  return tableColumn.length || visibleColumn.length ? visibleColumn.filter((column: any) => column.width === 'auto' || column.minWidth === 'auto') : []
704
704
  },
705
- fixedColumnSize () {
706
- const { collectColumn } = this
705
+ computeFixedColumnSize () {
706
+ const $xeTable = this
707
+ const reactData = $xeTable
708
+ const internalData = $xeTable
709
+
710
+ const { tableColumn } = reactData
711
+ const { collectColumn } = internalData
707
712
  let fixedSize = 0
708
- collectColumn.forEach((column: any) => {
709
- if (column.renderFixed) {
710
- fixedSize++
711
- }
712
- })
713
+ // 只判断第一层
714
+ if (tableColumn.length && collectColumn.length) {
715
+ collectColumn.forEach((column: any) => {
716
+ if (column.renderFixed) {
717
+ fixedSize++
718
+ }
719
+ })
720
+ }
713
721
  return fixedSize
714
722
  },
723
+ fixedColumnSize () {
724
+ const $xeTable = this
725
+
726
+ return $xeTable.computeFixedColumnSize
727
+ },
715
728
  computeIsMaxFixedColumn () {
716
- const { maxFixedSize } = this.columnOpts
729
+ const $xeTable = this
730
+
731
+ const fixedColumnSize = $xeTable.computeFixedColumnSize
732
+ const columnOpts = $xeTable.columnOpts
733
+ const { maxFixedSize } = columnOpts
717
734
  if (maxFixedSize) {
718
- return this.fixedColumnSize >= maxFixedSize
735
+ return fixedColumnSize >= maxFixedSize
719
736
  }
720
737
  return false
721
738
  },