vxe-table 3.16.0-beta.4 → 3.16.0-beta.5

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.
@@ -3164,18 +3164,18 @@ function handleLazyRecalculate($xeTable, reFull, reWidth, reHeight) {
3164
3164
  if (rceTimeout) {
3165
3165
  clearTimeout(rceTimeout);
3166
3166
  if (rceRunTime && rceRunTime + (refreshDelay - 5) < Date.now()) {
3167
- resolve(handleRecalculateStyle($xeTable, !!reFull, reWidth, reHeight));
3167
+ resolve(handleRecalculateStyle($xeTable, reFull, reWidth, reHeight));
3168
3168
  } else {
3169
3169
  $xeTable.$nextTick(() => {
3170
3170
  resolve();
3171
3171
  });
3172
3172
  }
3173
3173
  } else {
3174
- resolve(handleRecalculateStyle($xeTable, !!reFull, reWidth, reHeight));
3174
+ resolve(handleRecalculateStyle($xeTable, reFull, reWidth, reHeight));
3175
3175
  }
3176
3176
  internalData.rceTimeout = setTimeout(() => {
3177
3177
  internalData.rceTimeout = undefined;
3178
- handleRecalculateStyle($xeTable, !!reFull, reWidth, reHeight);
3178
+ handleRecalculateStyle($xeTable, reFull, reWidth, reHeight);
3179
3179
  }, refreshDelay);
3180
3180
  });
3181
3181
  }
@@ -3498,9 +3498,8 @@ function loadTableData($xeTable, datas, isReset) {
3498
3498
  $xeTable.checkSelectionStatus();
3499
3499
  return new Promise(resolve => {
3500
3500
  $xeTable.$nextTick().then(() => handleRecalculateStyle($xeTable, false, false, false)).then(() => {
3501
- calcCellHeight($xeTable);
3501
+ handleRecalculateStyle($xeTable, false, true, true);
3502
3502
  updateRowOffsetTop($xeTable);
3503
- return handleRecalculateStyle($xeTable, false, false, false);
3504
3503
  }).then(() => {
3505
3504
  let targetScrollLeft = lastScrollLeft;
3506
3505
  let targetScrollTop = lastScrollTop;
@@ -3518,14 +3517,14 @@ function loadTableData($xeTable, datas, isReset) {
3518
3517
  // 是否变更虚拟滚动
3519
3518
  if (oldScrollYLoad === sYLoad) {
3520
3519
  (0, _util.restoreScrollLocation)($xeTable, targetScrollLeft, targetScrollTop).then(() => {
3521
- calcCellHeight($xeTable);
3520
+ handleRecalculateStyle($xeTable, false, true, true);
3522
3521
  updateRowOffsetTop($xeTable);
3523
3522
  resolve();
3524
3523
  });
3525
3524
  } else {
3526
3525
  setTimeout(() => {
3527
3526
  (0, _util.restoreScrollLocation)($xeTable, targetScrollLeft, targetScrollTop).then(() => {
3528
- calcCellHeight($xeTable);
3527
+ handleRecalculateStyle($xeTable, false, true, true);
3529
3528
  updateRowOffsetTop($xeTable);
3530
3529
  resolve();
3531
3530
  });
@@ -3822,7 +3821,7 @@ function handleColumn($xeTable, collectColumn) {
3822
3821
  $xeTable.handleUpdateCustomColumn();
3823
3822
  }
3824
3823
  reactData.isColLoading = false;
3825
- return $xeTable.recalculate();
3824
+ return handleLazyRecalculate($xeTable, false, true, true);
3826
3825
  });
3827
3826
  });
3828
3827
  }