vxe-table 3.6.13 → 3.6.14-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 (30) hide show
  1. package/lib/footer/src/footer.js +4 -2
  2. package/lib/footer/src/footer.min.js +1 -1
  3. package/lib/icon/style/style.css +1 -1
  4. package/lib/icon/style/style.min.css +1 -1
  5. package/lib/index.css +1 -1
  6. package/lib/index.umd.js +14 -8
  7. package/lib/index.umd.min.js +1 -1
  8. package/lib/style.css +1 -1
  9. package/lib/style.min.css +1 -1
  10. package/lib/table/src/body.js +3 -1
  11. package/lib/table/src/body.min.js +1 -1
  12. package/lib/table/src/methods.js +4 -2
  13. package/lib/table/src/methods.min.js +1 -1
  14. package/lib/tools/dom.js +1 -1
  15. package/lib/tools/dom.min.js +1 -1
  16. package/lib/tools/log.js +1 -1
  17. package/lib/tools/log.min.js +1 -1
  18. package/lib/v-x-e-table/index.js +1 -1
  19. package/lib/v-x-e-table/index.min.js +1 -1
  20. package/package.json +1 -1
  21. package/packages/footer/src/footer.js +4 -2
  22. package/packages/table/src/body.js +3 -2
  23. package/packages/table/src/methods.js +4 -2
  24. package/packages/tools/dom.js +1 -1
  25. /package/lib/icon/style/{iconfont.1681255874086.ttf → iconfont.1682555826742.ttf} +0 -0
  26. /package/lib/icon/style/{iconfont.1681255874086.woff → iconfont.1682555826742.woff} +0 -0
  27. /package/lib/icon/style/{iconfont.1681255874086.woff2 → iconfont.1682555826742.woff2} +0 -0
  28. /package/lib/{iconfont.1681255874086.ttf → iconfont.1682555826742.ttf} +0 -0
  29. /package/lib/{iconfont.1681255874086.woff → iconfont.1682555826742.woff} +0 -0
  30. /package/lib/{iconfont.1681255874086.woff2 → iconfont.1682555826742.woff2} +0 -0
package/lib/index.umd.js CHANGED
@@ -11033,7 +11033,7 @@ var es_array_concat = __webpack_require__(2222);
11033
11033
 
11034
11034
 
11035
11035
  function getLog(message, params) {
11036
- return "[vxe-table v".concat("3.6.13", "] ").concat(conf.i18n(message, params));
11036
+ return "[vxe-table v".concat("3.6.14-beta.0", "] ").concat(conf.i18n(message, params));
11037
11037
  }
11038
11038
  function outLog(type) {
11039
11039
  return function (message, params) {
@@ -12220,7 +12220,7 @@ function _t(key, args) {
12220
12220
  var v = 'v3';
12221
12221
  var VXETable = {
12222
12222
  v: v,
12223
- version: "3.6.13",
12223
+ version: "3.6.14-beta.0",
12224
12224
  reg: reg,
12225
12225
  use: use,
12226
12226
  setup: setup,
@@ -12587,7 +12587,7 @@ var DomTools = {
12587
12587
  */
12588
12588
  getEventTargetNode: function getEventTargetNode(evnt, container, queryCls, queryMethod) {
12589
12589
  var targetElem;
12590
- var target = evnt.target;
12590
+ var target = evnt.target.shadowRoot && evnt.composed ? evnt.composedPath()[0] || evnt.target : evnt.target;
12591
12591
  while (target && target.nodeType && target !== document) {
12592
12592
  if (queryCls && hasClass(target, queryCls) && (!queryMethod || queryMethod(target))) {
12593
12593
  targetElem = target;
@@ -13526,6 +13526,7 @@ function syncBodyScroll(_vm, fixedType, scrollTop, elem1, elem2) {
13526
13526
  tableData = $xetable.tableData,
13527
13527
  tableColumn = $xetable.tableColumn,
13528
13528
  visibleColumn = $xetable.visibleColumn,
13529
+ expandColumn = $xetable.expandColumn,
13529
13530
  allColumnOverflow = $xetable.showOverflow,
13530
13531
  keyboardConfig = $xetable.keyboardConfig,
13531
13532
  keyboardOpts = $xetable.keyboardOpts,
@@ -13540,7 +13541,8 @@ function syncBodyScroll(_vm, fixedType, scrollTop, elem1, elem2) {
13540
13541
  sYOpts = $xetable.sYOpts;
13541
13542
  // 如果是使用优化模式
13542
13543
  if (fixedType) {
13543
- if (scrollXLoad || scrollYLoad || (allColumnOverflow ? isAllOverflow : allColumnOverflow)) {
13544
+ // 如果存在展开行使用全量渲染
13545
+ if (!expandColumn && (scrollXLoad || scrollYLoad || (allColumnOverflow ? isAllOverflow : allColumnOverflow))) {
13544
13546
  if (!mergeList.length && !spanMethod && !(keyboardConfig && keyboardOpts.isMerge)) {
13545
13547
  tableColumn = fixedColumn;
13546
13548
  } else {
@@ -17679,7 +17681,8 @@ var Methods = {
17679
17681
 
17680
17682
  // 如果是使用优化模式
17681
17683
  if (fixedType) {
17682
- if (scrollXLoad || scrollYLoad || (allColumnOverflow ? isAllOverflow : allColumnOverflow)) {
17684
+ // 如果存在展开行使用全量渲染
17685
+ if (!_this25.expandColumn && (scrollXLoad || scrollYLoad || (allColumnOverflow ? isAllOverflow : allColumnOverflow))) {
17683
17686
  if (!mergeList.length && !spanMethod && !(keyboardConfig && keyboardOpts.isMerge)) {
17684
17687
  _renderColumnList = fixedColumn;
17685
17688
  } else {
@@ -17706,7 +17709,8 @@ var Methods = {
17706
17709
 
17707
17710
  // 如果是使用优化模式
17708
17711
  if (fixedType) {
17709
- if (scrollXLoad || allColumnFooterOverflow) {
17712
+ // 如果存在展开行使用全量渲染
17713
+ if (!_this25.expandColumn && (scrollXLoad || allColumnFooterOverflow)) {
17710
17714
  if (!mergeFooterList.length || !footerSpanMethod) {
17711
17715
  _renderColumnList2 = fixedColumn;
17712
17716
  } else {
@@ -32445,10 +32449,12 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
32445
32449
  overflowX = $xetable.overflowX,
32446
32450
  scrollbarWidth = $xetable.scrollbarWidth,
32447
32451
  tooltipOpts = $xetable.tooltipOpts,
32448
- visibleColumn = $xetable.visibleColumn;
32452
+ visibleColumn = $xetable.visibleColumn,
32453
+ expandColumn = $xetable.expandColumn;
32449
32454
  // 如果是使用优化模式
32450
32455
  if (fixedType) {
32451
- if (scrollXLoad || allColumnFooterOverflow) {
32456
+ // 如果存在展开行使用全量渲染
32457
+ if (!expandColumn && (scrollXLoad || allColumnFooterOverflow)) {
32452
32458
  if (!mergeFooterList.length || !footerSpanMethod) {
32453
32459
  tableColumn = fixedColumn;
32454
32460
  } else {