vxe-table 4.12.0-beta.4 → 4.12.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.
package/lib/index.umd.js CHANGED
@@ -3138,7 +3138,7 @@ function eqEmptyValue(cellValue) {
3138
3138
  ;// ./packages/ui/index.ts
3139
3139
 
3140
3140
 
3141
- const version = "4.12.0-beta.4";
3141
+ const version = "4.12.0-beta.5";
3142
3142
  core_.VxeUI.version = version;
3143
3143
  core_.VxeUI.tableVersion = version;
3144
3144
  core_.VxeUI.setConfig({
@@ -3586,7 +3586,7 @@ var esnext_iterator_some = __webpack_require__(7550);
3586
3586
  const {
3587
3587
  log: log_log
3588
3588
  } = core_.VxeUI;
3589
- const log_version = `table v${"4.12.0-beta.4"}`;
3589
+ const log_version = `table v${"4.12.0-beta.5"}`;
3590
3590
  const warnLog = log_log.create('warn', log_version);
3591
3591
  const errLog = log_log.create('error', log_version);
3592
3592
  ;// ./packages/table/src/columnInfo.ts
@@ -14676,6 +14676,7 @@ const maxXWidth = 5e6;
14676
14676
  } = props;
14677
14677
  const {
14678
14678
  fullAllDataRowIdData,
14679
+ fullDataRowIdData,
14679
14680
  tableSourceData,
14680
14681
  sourceDataRowIdData,
14681
14682
  tableFullData,
@@ -14711,7 +14712,7 @@ const maxXWidth = 5e6;
14711
14712
  } else {
14712
14713
  external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().destructuring(row, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(oRow, true));
14713
14714
  }
14714
- if ($xeTable.isRemoveByRow(row)) {
14715
+ if (!fullDataRowIdData[rowid] && $xeTable.isRemoveByRow(row)) {
14715
14716
  const rowRest = fullAllDataRowIdData[rowid];
14716
14717
  if (rowRest) {
14717
14718
  const reRow = rowRest.row;
@@ -17966,7 +17967,15 @@ const maxXWidth = 5e6;
17966
17967
  if (el) {
17967
17968
  const parentElem = el.parentNode;
17968
17969
  const parentPaddingSize = height === '100%' || height === 'auto' ? getPaddingTopBottomSize(parentElem) : 0;
17969
- return Math.floor($xeGrid ? $xeGrid.getParentHeight() : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(getComputedStyle(parentElem).height) - parentPaddingSize);
17970
+ let parentWrapperHeight = 0;
17971
+ if (parentElem) {
17972
+ if ($xeGrid && hasClass(parentElem, 'vxe-grid--table-wrapper')) {
17973
+ parentWrapperHeight = $xeGrid.getParentHeight();
17974
+ } else {
17975
+ parentWrapperHeight = parentElem.clientHeight;
17976
+ }
17977
+ }
17978
+ return Math.floor(parentWrapperHeight - parentPaddingSize);
17970
17979
  }
17971
17980
  return 0;
17972
17981
  },