vxe-table 4.23.16 → 4.23.17

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/dist/all.esm.js CHANGED
@@ -123,7 +123,7 @@ function getDefaultConfig(val1, def1) {
123
123
  }
124
124
 
125
125
  // packages_temp/ui/index.ts
126
- var version = "4.23.16";
126
+ var version = "4.23.17";
127
127
  VxeUI2.version = version;
128
128
  VxeUI2.tableVersion = version;
129
129
  VxeUI2.setConfig({
@@ -952,7 +952,7 @@ function getPopupAppendElement(appendTo) {
952
952
  // packages_temp/ui/src/log.ts
953
953
  import { VxeUI as VxeUI3 } from "@vxe-ui/core";
954
954
  var { log } = VxeUI3;
955
- var tableVersion = `table v${"4.23.16"}`;
955
+ var tableVersion = `table v${"4.23.17"}`;
956
956
  function createComponentLog(name) {
957
957
  const uiVersion = VxeUI3.uiVersion ? `ui v${VxeUI3.uiVersion}` : "";
958
958
  const ganttVersion = VxeUI3.ganttVersion ? `gantt v${VxeUI3.ganttVersion}` : "";
@@ -17944,7 +17944,7 @@ var table_default = (
17944
17944
  internalData.mergeHeaderMaps = {};
17945
17945
  internalData.mergeHeaderCellMaps = {};
17946
17946
  internalData.mergeHeaderRowMaps = {};
17947
- internalData.mergeBodyColMaps = {};
17947
+ internalData.mergeHeaderColMaps = {};
17948
17948
  $xeTable.setMergeHeaderCells(merges);
17949
17949
  };
17950
17950
  const handleHeaderMerge = (merges) => {
@@ -18667,35 +18667,51 @@ var table_default = (
18667
18667
  updateColumnOffsetLeft();
18668
18668
  updateHeight();
18669
18669
  };
18670
- const calcCellAutoHeight = (rowid, rowRest, wrapperEl) => {
18670
+ const calcCellAutoHeight = (rowid, rowRest, wrapperEl, cacheElemList) => {
18671
18671
  const { fullCellHeightMaps } = internalData;
18672
18672
  let chRest = fullCellHeightMaps[rowid];
18673
18673
  if (!chRest) {
18674
18674
  chRest = {};
18675
18675
  fullCellHeightMaps[rowid] = chRest;
18676
18676
  }
18677
- const wrapperElemList = wrapperEl.querySelectorAll(`.vxe-cell--wrapper[rowid="${rowRest.rowid}"]`);
18678
- let firstCellStyle = null;
18679
- let topBottomPadding = 0;
18677
+ const wrapperElemList = cacheElemList || Array.from(wrapperEl.querySelectorAll(`.vxe-cell--wrapper[rowid="${rowRest.rowid}"]`));
18678
+ const cellItemList = [];
18680
18679
  let changeCH = false;
18681
18680
  for (let i = 0; i < wrapperElemList.length; i++) {
18682
18681
  const wrapperElem = wrapperElemList[i];
18683
18682
  const cellElem = wrapperElem.parentElement;
18684
- const cellStyle = cellElem.style;
18685
- const orHeight = cellStyle.height;
18686
- const colid = wrapperElem.getAttribute("colid") || "";
18687
- cellStyle.height = "";
18688
- if (!firstCellStyle) {
18689
- firstCellStyle = getComputedStyle(cellElem);
18690
- topBottomPadding = firstCellStyle ? Math.ceil(XEUtils24.toNumber(firstCellStyle.paddingTop) + XEUtils24.toNumber(firstCellStyle.paddingBottom)) : 0;
18691
- }
18692
- const cellHeight = wrapperElem ? wrapperElem.clientHeight : 0;
18693
- const colHeight = Math.ceil(cellHeight + topBottomPadding);
18683
+ if (!cellElem) {
18684
+ continue;
18685
+ }
18686
+ const orHeight = cellElem.style.height;
18687
+ if (orHeight) {
18688
+ cellElem.style.height = "";
18689
+ }
18690
+ cellItemList.push({
18691
+ wrapperElem,
18692
+ cellElem,
18693
+ colid: wrapperElem.getAttribute("colid") || "",
18694
+ orHeight
18695
+ });
18696
+ }
18697
+ let topBottomPadding = 0;
18698
+ if (cellItemList.length) {
18699
+ const firstCellStyle = getComputedStyle(cellItemList[0].cellElem);
18700
+ topBottomPadding = Math.ceil(XEUtils24.toNumber(firstCellStyle.paddingTop) + XEUtils24.toNumber(firstCellStyle.paddingBottom));
18701
+ }
18702
+ for (let i = 0; i < cellItemList.length; i++) {
18703
+ const { wrapperElem, colid } = cellItemList[i];
18704
+ const colHeight = Math.ceil(wrapperElem.clientHeight + topBottomPadding);
18694
18705
  if (chRest[colid] !== colHeight) {
18695
18706
  changeCH = true;
18696
18707
  chRest[colid] = colHeight;
18697
18708
  }
18698
- cellStyle.height = orHeight;
18709
+ }
18710
+ for (let i = 0; i < cellItemList.length; i++) {
18711
+ const { cellElem, orHeight } = cellItemList[i];
18712
+ if (orHeight) {
18713
+ cellElem.style.height = orHeight;
18714
+ }
18699
18715
  }
18700
18716
  const cellMaxHeight = getRowMaxHeight(chRest, changeCH);
18701
18717
  return cellMaxHeight;
@@ -18712,12 +18728,18 @@ var table_default = (
18712
18728
  const defaultRowHeight = computeDefaultRowHeight.value;
18713
18729
  if (!isAllOverflow && (scrollYLoad || scrollXLoad || treeConfig && treeOpts.showLine)) {
18714
18730
  const { handleGetRowId } = createHandleGetRowId($xeTable);
18731
+ const rowWrapperMaps = {};
18732
+ el.querySelectorAll(".vxe-cell--wrapper[rowid]").forEach((wrapperElem) => {
18733
+ const rid = wrapperElem.getAttribute("rowid") || "";
18734
+ const elemList = rowWrapperMaps[rid] || (rowWrapperMaps[rid] = []);
18735
+ elemList.push(wrapperElem);
18736
+ });
18715
18737
  el.setAttribute("data-calc-row", "Y");
18716
18738
  tableData.forEach((row) => {
18717
18739
  const rowid = handleGetRowId(row);
18718
18740
  const rowRest = fullAllDataRowIdData[rowid];
18719
18741
  if (rowRest) {
18720
- const reHeight = calcCellAutoHeight(rowid, rowRest, el);
18742
+ const reHeight = calcCellAutoHeight(rowid, rowRest, el, rowWrapperMaps[rowid] || []);
18721
18743
  rowRest.height = Math.max(defaultRowHeight, reHeight);
18722
18744
  }
18723
18745
  });
@@ -20510,7 +20532,7 @@ var table_default = (
20510
20532
  };
20511
20533
  const loadScrollXData = () => {
20512
20534
  const { isScrollXBig } = reactData;
20513
- const { mergeBodyList, mergeFooterList, mergeBodyRowMaps, scrollXStore } = internalData;
20535
+ const { mergeBodyList, mergeFooterList, mergeBodyColMaps, scrollXStore } = internalData;
20514
20536
  const { preloadSize, startIndex, endIndex, offsetSize } = scrollXStore;
20515
20537
  const { toVisibleIndex, visibleSize } = handleVirtualXVisible();
20516
20538
  const offsetItem = {
@@ -20519,7 +20541,7 @@ var table_default = (
20519
20541
  };
20520
20542
  scrollXStore.visibleStartIndex = toVisibleIndex - 1;
20521
20543
  scrollXStore.visibleEndIndex = toVisibleIndex + visibleSize + 1;
20522
- calculateMergerOffsetIndex(mergeBodyList.concat(mergeFooterList), mergeBodyRowMaps, offsetItem, "col");
20544
+ calculateMergerOffsetIndex(mergeBodyList.concat(mergeFooterList), mergeBodyColMaps, offsetItem, "col");
20523
20545
  const { startIndex: offsetStartIndex, endIndex: offsetEndIndex } = offsetItem;
20524
20546
  if (toVisibleIndex <= startIndex || toVisibleIndex >= endIndex - visibleSize - 1) {
20525
20547
  if (startIndex !== offsetStartIndex || endIndex !== offsetEndIndex) {
@@ -20895,7 +20917,7 @@ var table_default = (
20895
20917
  };
20896
20918
  const loadScrollYData = () => {
20897
20919
  const { isAllOverflow, isScrollYBig } = reactData;
20898
- const { mergeBodyList, mergeBodyColMaps, scrollYStore } = internalData;
20920
+ const { mergeBodyList, mergeBodyRowMaps, scrollYStore } = internalData;
20899
20921
  const { preloadSize, startIndex, endIndex, offsetSize } = scrollYStore;
20900
20922
  const autoOffsetYSize = isAllOverflow ? offsetSize : offsetSize + 1;
20901
20923
  const { toVisibleIndex, visibleSize } = handleVirtualYVisible();
@@ -20905,7 +20927,7 @@ var table_default = (
20905
20927
  };
20906
20928
  scrollYStore.visibleStartIndex = toVisibleIndex - 1;
20907
20929
  scrollYStore.visibleEndIndex = toVisibleIndex + visibleSize + 1;
20908
- calculateMergerOffsetIndex(mergeBodyList, mergeBodyColMaps, offsetItem, "row");
20930
+ calculateMergerOffsetIndex(mergeBodyList, mergeBodyRowMaps, offsetItem, "row");
20909
20931
  const { startIndex: offsetStartIndex, endIndex: offsetEndIndex } = offsetItem;
20910
20932
  if (toVisibleIndex <= startIndex || toVisibleIndex >= endIndex - visibleSize - 1) {
20911
20933
  if (startIndex !== offsetStartIndex || endIndex !== offsetEndIndex) {
@@ -20974,7 +20996,7 @@ var table_default = (
20974
20996
  loadScrollYData();
20975
20997
  }, fpsTime);
20976
20998
  };
20977
- const handleSyncScroll = (isRollX, isRollY) => {
20999
+ const handleSyncScroll = (isRollX, isRollY, isCompensate) => {
20978
21000
  const { scrollXLoad, scrollYLoad, isAllOverflow } = reactData;
20979
21001
  const autoWidthColumnList = computeAutoWidthColumnList.value;
20980
21002
  internalData.lcsRunTime = Date.now();
@@ -20995,7 +21017,9 @@ var table_default = (
20995
21017
  let xRest = null;
20996
21018
  let yRest = null;
20997
21019
  if (!isAllOverflow) {
20998
- calcCellHeight();
21020
+ if (!isCompensate) {
21021
+ calcCellHeight();
21022
+ }
20999
21023
  updateRowOffsetTop();
21000
21024
  }
21001
21025
  if (isRollX && scrollXLoad) {
@@ -21011,7 +21035,9 @@ var table_default = (
21011
21035
  autoCellWidth();
21012
21036
  }
21013
21037
  if (!isAllOverflow) {
21014
- calcCellHeight();
21038
+ if (!isCompensate) {
21039
+ calcCellHeight();
21040
+ }
21015
21041
  updateRowOffsetTop();
21016
21042
  }
21017
21043
  return $xeTable.updateScrollYSpace();
@@ -21032,7 +21058,7 @@ var table_default = (
21032
21058
  nextTick13(() => {
21033
21059
  updateRowExpandStyle();
21034
21060
  if (!internalData.lcsTimeout) {
21035
- handleSyncScroll(isRollX, isRollY);
21061
+ handleSyncScroll(isRollX, isRollY, true);
21036
21062
  }
21037
21063
  });
21038
21064
  }
@@ -22682,6 +22708,7 @@ var table_default = (
22682
22708
  const { fullAllDataRowIdData } = internalData;
22683
22709
  const rows = XEUtils24.isArray(rowOrId) ? rowOrId : [rowOrId];
22684
22710
  const el = refElem.value;
22711
+ let status = false;
22685
22712
  if (el) {
22686
22713
  const { handleGetRowId } = createHandleGetRowId($xeTable);
22687
22714
  el.setAttribute("data-calc-row", "Y");
@@ -22690,12 +22717,15 @@ var table_default = (
22690
22717
  const rowRest = fullAllDataRowIdData[rowid];
22691
22718
  if (rowRest) {
22692
22719
  rowRest.resizeHeight = calcCellAutoHeight(rowid, rowRest, el);
22720
+ status = true;
22693
22721
  }
22694
22722
  });
22695
22723
  el.removeAttribute("data-calc-row");
22696
22724
  reactData.calcCellHeightFlag++;
22697
22725
  }
22698
- return nextTick13();
22726
+ return nextTick13().then(() => {
22727
+ return { status };
22728
+ });
22699
22729
  },
22700
22730
  setRowHeight(rowOrId, height) {
22701
22731
  const { fullAllDataRowIdData } = internalData;