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 +58 -28
- package/dist/all.esm.min.js +3 -3
- package/es/table/src/table.js +56 -26
- package/es/ui/index.js +1 -1
- package/es/ui/src/log.js +1 -1
- package/lib/index.umd.js +58 -28
- package/lib/index.umd.min.js +3 -3
- package/lib/table/src/table.js +56 -26
- package/lib/ui/index.js +1 -1
- package/lib/ui/src/log.js +1 -1
- package/package.json +1 -1
- package/packages/table/src/table.ts +16073 -16028
- /package/dist/{iconfont.1794189355036.ttf → iconfont.1794294436168.ttf} +0 -0
- /package/dist/{iconfont.1794189355036.woff → iconfont.1794294436168.woff} +0 -0
- /package/dist/{iconfont.1794189355036.woff2 → iconfont.1794294436168.woff2} +0 -0
- /package/es/{iconfont.1794189355036.ttf → iconfont.1794294436168.ttf} +0 -0
- /package/es/{iconfont.1794189355036.woff → iconfont.1794294436168.woff} +0 -0
- /package/es/{iconfont.1794189355036.woff2 → iconfont.1794294436168.woff2} +0 -0
- /package/lib/{iconfont.1794189355036.ttf → iconfont.1794294436168.ttf} +0 -0
- /package/lib/{iconfont.1794189355036.woff → iconfont.1794294436168.woff} +0 -0
- /package/lib/{iconfont.1794189355036.woff2 → iconfont.1794294436168.woff2} +0 -0
package/es/table/src/table.js
CHANGED
|
@@ -1268,7 +1268,7 @@ var table_default = (
|
|
|
1268
1268
|
internalData.mergeHeaderMaps = {};
|
|
1269
1269
|
internalData.mergeHeaderCellMaps = {};
|
|
1270
1270
|
internalData.mergeHeaderRowMaps = {};
|
|
1271
|
-
internalData.
|
|
1271
|
+
internalData.mergeHeaderColMaps = {};
|
|
1272
1272
|
$xeTable.setMergeHeaderCells(merges);
|
|
1273
1273
|
};
|
|
1274
1274
|
const handleHeaderMerge = (merges) => {
|
|
@@ -1991,35 +1991,51 @@ var table_default = (
|
|
|
1991
1991
|
updateColumnOffsetLeft();
|
|
1992
1992
|
updateHeight();
|
|
1993
1993
|
};
|
|
1994
|
-
const calcCellAutoHeight = (rowid, rowRest, wrapperEl) => {
|
|
1994
|
+
const calcCellAutoHeight = (rowid, rowRest, wrapperEl, cacheElemList) => {
|
|
1995
1995
|
const { fullCellHeightMaps } = internalData;
|
|
1996
1996
|
let chRest = fullCellHeightMaps[rowid];
|
|
1997
1997
|
if (!chRest) {
|
|
1998
1998
|
chRest = {};
|
|
1999
1999
|
fullCellHeightMaps[rowid] = chRest;
|
|
2000
2000
|
}
|
|
2001
|
-
const wrapperElemList = wrapperEl.querySelectorAll(`.vxe-cell--wrapper[rowid="${rowRest.rowid}"]`);
|
|
2002
|
-
|
|
2003
|
-
let topBottomPadding = 0;
|
|
2001
|
+
const wrapperElemList = cacheElemList || Array.from(wrapperEl.querySelectorAll(`.vxe-cell--wrapper[rowid="${rowRest.rowid}"]`));
|
|
2002
|
+
const cellItemList = [];
|
|
2004
2003
|
let changeCH = false;
|
|
2005
2004
|
for (let i = 0; i < wrapperElemList.length; i++) {
|
|
2006
2005
|
const wrapperElem = wrapperElemList[i];
|
|
2007
2006
|
const cellElem = wrapperElem.parentElement;
|
|
2008
|
-
|
|
2009
|
-
|
|
2010
|
-
|
|
2011
|
-
|
|
2012
|
-
if (
|
|
2013
|
-
|
|
2014
|
-
|
|
2015
|
-
|
|
2016
|
-
|
|
2017
|
-
|
|
2007
|
+
if (!cellElem) {
|
|
2008
|
+
continue;
|
|
2009
|
+
}
|
|
2010
|
+
const orHeight = cellElem.style.height;
|
|
2011
|
+
if (orHeight) {
|
|
2012
|
+
cellElem.style.height = "";
|
|
2013
|
+
}
|
|
2014
|
+
cellItemList.push({
|
|
2015
|
+
wrapperElem,
|
|
2016
|
+
cellElem,
|
|
2017
|
+
colid: wrapperElem.getAttribute("colid") || "",
|
|
2018
|
+
orHeight
|
|
2019
|
+
});
|
|
2020
|
+
}
|
|
2021
|
+
let topBottomPadding = 0;
|
|
2022
|
+
if (cellItemList.length) {
|
|
2023
|
+
const firstCellStyle = getComputedStyle(cellItemList[0].cellElem);
|
|
2024
|
+
topBottomPadding = Math.ceil(XEUtils.toNumber(firstCellStyle.paddingTop) + XEUtils.toNumber(firstCellStyle.paddingBottom));
|
|
2025
|
+
}
|
|
2026
|
+
for (let i = 0; i < cellItemList.length; i++) {
|
|
2027
|
+
const { wrapperElem, colid } = cellItemList[i];
|
|
2028
|
+
const colHeight = Math.ceil(wrapperElem.clientHeight + topBottomPadding);
|
|
2018
2029
|
if (chRest[colid] !== colHeight) {
|
|
2019
2030
|
changeCH = true;
|
|
2020
2031
|
chRest[colid] = colHeight;
|
|
2021
2032
|
}
|
|
2022
|
-
|
|
2033
|
+
}
|
|
2034
|
+
for (let i = 0; i < cellItemList.length; i++) {
|
|
2035
|
+
const { cellElem, orHeight } = cellItemList[i];
|
|
2036
|
+
if (orHeight) {
|
|
2037
|
+
cellElem.style.height = orHeight;
|
|
2038
|
+
}
|
|
2023
2039
|
}
|
|
2024
2040
|
const cellMaxHeight = getRowMaxHeight(chRest, changeCH);
|
|
2025
2041
|
return cellMaxHeight;
|
|
@@ -2036,12 +2052,18 @@ var table_default = (
|
|
|
2036
2052
|
const defaultRowHeight = computeDefaultRowHeight.value;
|
|
2037
2053
|
if (!isAllOverflow && (scrollYLoad || scrollXLoad || treeConfig && treeOpts.showLine)) {
|
|
2038
2054
|
const { handleGetRowId } = createHandleGetRowId($xeTable);
|
|
2055
|
+
const rowWrapperMaps = {};
|
|
2056
|
+
el.querySelectorAll(".vxe-cell--wrapper[rowid]").forEach((wrapperElem) => {
|
|
2057
|
+
const rid = wrapperElem.getAttribute("rowid") || "";
|
|
2058
|
+
const elemList = rowWrapperMaps[rid] || (rowWrapperMaps[rid] = []);
|
|
2059
|
+
elemList.push(wrapperElem);
|
|
2060
|
+
});
|
|
2039
2061
|
el.setAttribute("data-calc-row", "Y");
|
|
2040
2062
|
tableData.forEach((row) => {
|
|
2041
2063
|
const rowid = handleGetRowId(row);
|
|
2042
2064
|
const rowRest = fullAllDataRowIdData[rowid];
|
|
2043
2065
|
if (rowRest) {
|
|
2044
|
-
const reHeight = calcCellAutoHeight(rowid, rowRest, el);
|
|
2066
|
+
const reHeight = calcCellAutoHeight(rowid, rowRest, el, rowWrapperMaps[rowid] || []);
|
|
2045
2067
|
rowRest.height = Math.max(defaultRowHeight, reHeight);
|
|
2046
2068
|
}
|
|
2047
2069
|
});
|
|
@@ -3834,7 +3856,7 @@ var table_default = (
|
|
|
3834
3856
|
};
|
|
3835
3857
|
const loadScrollXData = () => {
|
|
3836
3858
|
const { isScrollXBig } = reactData;
|
|
3837
|
-
const { mergeBodyList, mergeFooterList,
|
|
3859
|
+
const { mergeBodyList, mergeFooterList, mergeBodyColMaps, scrollXStore } = internalData;
|
|
3838
3860
|
const { preloadSize, startIndex, endIndex, offsetSize } = scrollXStore;
|
|
3839
3861
|
const { toVisibleIndex, visibleSize } = handleVirtualXVisible();
|
|
3840
3862
|
const offsetItem = {
|
|
@@ -3843,7 +3865,7 @@ var table_default = (
|
|
|
3843
3865
|
};
|
|
3844
3866
|
scrollXStore.visibleStartIndex = toVisibleIndex - 1;
|
|
3845
3867
|
scrollXStore.visibleEndIndex = toVisibleIndex + visibleSize + 1;
|
|
3846
|
-
calculateMergerOffsetIndex(mergeBodyList.concat(mergeFooterList),
|
|
3868
|
+
calculateMergerOffsetIndex(mergeBodyList.concat(mergeFooterList), mergeBodyColMaps, offsetItem, "col");
|
|
3847
3869
|
const { startIndex: offsetStartIndex, endIndex: offsetEndIndex } = offsetItem;
|
|
3848
3870
|
if (toVisibleIndex <= startIndex || toVisibleIndex >= endIndex - visibleSize - 1) {
|
|
3849
3871
|
if (startIndex !== offsetStartIndex || endIndex !== offsetEndIndex) {
|
|
@@ -4219,7 +4241,7 @@ var table_default = (
|
|
|
4219
4241
|
};
|
|
4220
4242
|
const loadScrollYData = () => {
|
|
4221
4243
|
const { isAllOverflow, isScrollYBig } = reactData;
|
|
4222
|
-
const { mergeBodyList,
|
|
4244
|
+
const { mergeBodyList, mergeBodyRowMaps, scrollYStore } = internalData;
|
|
4223
4245
|
const { preloadSize, startIndex, endIndex, offsetSize } = scrollYStore;
|
|
4224
4246
|
const autoOffsetYSize = isAllOverflow ? offsetSize : offsetSize + 1;
|
|
4225
4247
|
const { toVisibleIndex, visibleSize } = handleVirtualYVisible();
|
|
@@ -4229,7 +4251,7 @@ var table_default = (
|
|
|
4229
4251
|
};
|
|
4230
4252
|
scrollYStore.visibleStartIndex = toVisibleIndex - 1;
|
|
4231
4253
|
scrollYStore.visibleEndIndex = toVisibleIndex + visibleSize + 1;
|
|
4232
|
-
calculateMergerOffsetIndex(mergeBodyList,
|
|
4254
|
+
calculateMergerOffsetIndex(mergeBodyList, mergeBodyRowMaps, offsetItem, "row");
|
|
4233
4255
|
const { startIndex: offsetStartIndex, endIndex: offsetEndIndex } = offsetItem;
|
|
4234
4256
|
if (toVisibleIndex <= startIndex || toVisibleIndex >= endIndex - visibleSize - 1) {
|
|
4235
4257
|
if (startIndex !== offsetStartIndex || endIndex !== offsetEndIndex) {
|
|
@@ -4298,7 +4320,7 @@ var table_default = (
|
|
|
4298
4320
|
loadScrollYData();
|
|
4299
4321
|
}, fpsTime);
|
|
4300
4322
|
};
|
|
4301
|
-
const handleSyncScroll = (isRollX, isRollY) => {
|
|
4323
|
+
const handleSyncScroll = (isRollX, isRollY, isCompensate) => {
|
|
4302
4324
|
const { scrollXLoad, scrollYLoad, isAllOverflow } = reactData;
|
|
4303
4325
|
const autoWidthColumnList = computeAutoWidthColumnList.value;
|
|
4304
4326
|
internalData.lcsRunTime = Date.now();
|
|
@@ -4319,7 +4341,9 @@ var table_default = (
|
|
|
4319
4341
|
let xRest = null;
|
|
4320
4342
|
let yRest = null;
|
|
4321
4343
|
if (!isAllOverflow) {
|
|
4322
|
-
|
|
4344
|
+
if (!isCompensate) {
|
|
4345
|
+
calcCellHeight();
|
|
4346
|
+
}
|
|
4323
4347
|
updateRowOffsetTop();
|
|
4324
4348
|
}
|
|
4325
4349
|
if (isRollX && scrollXLoad) {
|
|
@@ -4335,7 +4359,9 @@ var table_default = (
|
|
|
4335
4359
|
autoCellWidth();
|
|
4336
4360
|
}
|
|
4337
4361
|
if (!isAllOverflow) {
|
|
4338
|
-
|
|
4362
|
+
if (!isCompensate) {
|
|
4363
|
+
calcCellHeight();
|
|
4364
|
+
}
|
|
4339
4365
|
updateRowOffsetTop();
|
|
4340
4366
|
}
|
|
4341
4367
|
return $xeTable.updateScrollYSpace();
|
|
@@ -4356,7 +4382,7 @@ var table_default = (
|
|
|
4356
4382
|
nextTick(() => {
|
|
4357
4383
|
updateRowExpandStyle();
|
|
4358
4384
|
if (!internalData.lcsTimeout) {
|
|
4359
|
-
handleSyncScroll(isRollX, isRollY);
|
|
4385
|
+
handleSyncScroll(isRollX, isRollY, true);
|
|
4360
4386
|
}
|
|
4361
4387
|
});
|
|
4362
4388
|
}
|
|
@@ -6006,6 +6032,7 @@ var table_default = (
|
|
|
6006
6032
|
const { fullAllDataRowIdData } = internalData;
|
|
6007
6033
|
const rows = XEUtils.isArray(rowOrId) ? rowOrId : [rowOrId];
|
|
6008
6034
|
const el = refElem.value;
|
|
6035
|
+
let status = false;
|
|
6009
6036
|
if (el) {
|
|
6010
6037
|
const { handleGetRowId } = createHandleGetRowId($xeTable);
|
|
6011
6038
|
el.setAttribute("data-calc-row", "Y");
|
|
@@ -6014,12 +6041,15 @@ var table_default = (
|
|
|
6014
6041
|
const rowRest = fullAllDataRowIdData[rowid];
|
|
6015
6042
|
if (rowRest) {
|
|
6016
6043
|
rowRest.resizeHeight = calcCellAutoHeight(rowid, rowRest, el);
|
|
6044
|
+
status = true;
|
|
6017
6045
|
}
|
|
6018
6046
|
});
|
|
6019
6047
|
el.removeAttribute("data-calc-row");
|
|
6020
6048
|
reactData.calcCellHeightFlag++;
|
|
6021
6049
|
}
|
|
6022
|
-
return nextTick()
|
|
6050
|
+
return nextTick().then(() => {
|
|
6051
|
+
return { status };
|
|
6052
|
+
});
|
|
6023
6053
|
},
|
|
6024
6054
|
setRowHeight(rowOrId, height) {
|
|
6025
6055
|
const { fullAllDataRowIdData } = internalData;
|
package/es/ui/index.js
CHANGED
package/es/ui/src/log.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { VxeUI } from "@vxe-ui/core";
|
|
2
2
|
const { log } = VxeUI;
|
|
3
|
-
const tableVersion = `table v${"4.23.
|
|
3
|
+
const tableVersion = `table v${"4.23.17"}`;
|
|
4
4
|
function createComponentLog(name) {
|
|
5
5
|
const uiVersion = VxeUI.uiVersion ? `ui v${VxeUI.uiVersion}` : "";
|
|
6
6
|
const ganttVersion = VxeUI.ganttVersion ? `gantt v${VxeUI.ganttVersion}` : "";
|
package/lib/index.umd.js
CHANGED
|
@@ -318,7 +318,7 @@ function getDefaultConfig(val1, def1) {
|
|
|
318
318
|
}
|
|
319
319
|
|
|
320
320
|
// packages_temp/ui/index.ts
|
|
321
|
-
var version = "4.23.
|
|
321
|
+
var version = "4.23.17";
|
|
322
322
|
import_core2.VxeUI.version = version;
|
|
323
323
|
import_core2.VxeUI.tableVersion = version;
|
|
324
324
|
import_core2.VxeUI.setConfig({
|
|
@@ -1147,7 +1147,7 @@ function getPopupAppendElement(appendTo) {
|
|
|
1147
1147
|
// packages_temp/ui/src/log.ts
|
|
1148
1148
|
var import_core3 = require("@vxe-ui/core");
|
|
1149
1149
|
var { log } = import_core3.VxeUI;
|
|
1150
|
-
var tableVersion = `table v${"4.23.
|
|
1150
|
+
var tableVersion = `table v${"4.23.17"}`;
|
|
1151
1151
|
function createComponentLog(name) {
|
|
1152
1152
|
const uiVersion = import_core3.VxeUI.uiVersion ? `ui v${import_core3.VxeUI.uiVersion}` : "";
|
|
1153
1153
|
const ganttVersion = import_core3.VxeUI.ganttVersion ? `gantt v${import_core3.VxeUI.ganttVersion}` : "";
|
|
@@ -18139,7 +18139,7 @@ var table_default = (
|
|
|
18139
18139
|
internalData.mergeHeaderMaps = {};
|
|
18140
18140
|
internalData.mergeHeaderCellMaps = {};
|
|
18141
18141
|
internalData.mergeHeaderRowMaps = {};
|
|
18142
|
-
internalData.
|
|
18142
|
+
internalData.mergeHeaderColMaps = {};
|
|
18143
18143
|
$xeTable.setMergeHeaderCells(merges);
|
|
18144
18144
|
};
|
|
18145
18145
|
const handleHeaderMerge = (merges) => {
|
|
@@ -18862,35 +18862,51 @@ var table_default = (
|
|
|
18862
18862
|
updateColumnOffsetLeft();
|
|
18863
18863
|
updateHeight();
|
|
18864
18864
|
};
|
|
18865
|
-
const calcCellAutoHeight = (rowid, rowRest, wrapperEl) => {
|
|
18865
|
+
const calcCellAutoHeight = (rowid, rowRest, wrapperEl, cacheElemList) => {
|
|
18866
18866
|
const { fullCellHeightMaps } = internalData;
|
|
18867
18867
|
let chRest = fullCellHeightMaps[rowid];
|
|
18868
18868
|
if (!chRest) {
|
|
18869
18869
|
chRest = {};
|
|
18870
18870
|
fullCellHeightMaps[rowid] = chRest;
|
|
18871
18871
|
}
|
|
18872
|
-
const wrapperElemList = wrapperEl.querySelectorAll(`.vxe-cell--wrapper[rowid="${rowRest.rowid}"]`);
|
|
18873
|
-
|
|
18874
|
-
let topBottomPadding = 0;
|
|
18872
|
+
const wrapperElemList = cacheElemList || Array.from(wrapperEl.querySelectorAll(`.vxe-cell--wrapper[rowid="${rowRest.rowid}"]`));
|
|
18873
|
+
const cellItemList = [];
|
|
18875
18874
|
let changeCH = false;
|
|
18876
18875
|
for (let i = 0; i < wrapperElemList.length; i++) {
|
|
18877
18876
|
const wrapperElem = wrapperElemList[i];
|
|
18878
18877
|
const cellElem = wrapperElem.parentElement;
|
|
18879
|
-
|
|
18880
|
-
|
|
18881
|
-
|
|
18882
|
-
|
|
18883
|
-
if (
|
|
18884
|
-
|
|
18885
|
-
|
|
18886
|
-
|
|
18887
|
-
|
|
18888
|
-
|
|
18878
|
+
if (!cellElem) {
|
|
18879
|
+
continue;
|
|
18880
|
+
}
|
|
18881
|
+
const orHeight = cellElem.style.height;
|
|
18882
|
+
if (orHeight) {
|
|
18883
|
+
cellElem.style.height = "";
|
|
18884
|
+
}
|
|
18885
|
+
cellItemList.push({
|
|
18886
|
+
wrapperElem,
|
|
18887
|
+
cellElem,
|
|
18888
|
+
colid: wrapperElem.getAttribute("colid") || "",
|
|
18889
|
+
orHeight
|
|
18890
|
+
});
|
|
18891
|
+
}
|
|
18892
|
+
let topBottomPadding = 0;
|
|
18893
|
+
if (cellItemList.length) {
|
|
18894
|
+
const firstCellStyle = getComputedStyle(cellItemList[0].cellElem);
|
|
18895
|
+
topBottomPadding = Math.ceil(import_xe_utils24.default.toNumber(firstCellStyle.paddingTop) + import_xe_utils24.default.toNumber(firstCellStyle.paddingBottom));
|
|
18896
|
+
}
|
|
18897
|
+
for (let i = 0; i < cellItemList.length; i++) {
|
|
18898
|
+
const { wrapperElem, colid } = cellItemList[i];
|
|
18899
|
+
const colHeight = Math.ceil(wrapperElem.clientHeight + topBottomPadding);
|
|
18889
18900
|
if (chRest[colid] !== colHeight) {
|
|
18890
18901
|
changeCH = true;
|
|
18891
18902
|
chRest[colid] = colHeight;
|
|
18892
18903
|
}
|
|
18893
|
-
|
|
18904
|
+
}
|
|
18905
|
+
for (let i = 0; i < cellItemList.length; i++) {
|
|
18906
|
+
const { cellElem, orHeight } = cellItemList[i];
|
|
18907
|
+
if (orHeight) {
|
|
18908
|
+
cellElem.style.height = orHeight;
|
|
18909
|
+
}
|
|
18894
18910
|
}
|
|
18895
18911
|
const cellMaxHeight = getRowMaxHeight(chRest, changeCH);
|
|
18896
18912
|
return cellMaxHeight;
|
|
@@ -18907,12 +18923,18 @@ var table_default = (
|
|
|
18907
18923
|
const defaultRowHeight = computeDefaultRowHeight.value;
|
|
18908
18924
|
if (!isAllOverflow && (scrollYLoad || scrollXLoad || treeConfig && treeOpts.showLine)) {
|
|
18909
18925
|
const { handleGetRowId } = createHandleGetRowId($xeTable);
|
|
18926
|
+
const rowWrapperMaps = {};
|
|
18927
|
+
el.querySelectorAll(".vxe-cell--wrapper[rowid]").forEach((wrapperElem) => {
|
|
18928
|
+
const rid = wrapperElem.getAttribute("rowid") || "";
|
|
18929
|
+
const elemList = rowWrapperMaps[rid] || (rowWrapperMaps[rid] = []);
|
|
18930
|
+
elemList.push(wrapperElem);
|
|
18931
|
+
});
|
|
18910
18932
|
el.setAttribute("data-calc-row", "Y");
|
|
18911
18933
|
tableData.forEach((row) => {
|
|
18912
18934
|
const rowid = handleGetRowId(row);
|
|
18913
18935
|
const rowRest = fullAllDataRowIdData[rowid];
|
|
18914
18936
|
if (rowRest) {
|
|
18915
|
-
const reHeight = calcCellAutoHeight(rowid, rowRest, el);
|
|
18937
|
+
const reHeight = calcCellAutoHeight(rowid, rowRest, el, rowWrapperMaps[rowid] || []);
|
|
18916
18938
|
rowRest.height = Math.max(defaultRowHeight, reHeight);
|
|
18917
18939
|
}
|
|
18918
18940
|
});
|
|
@@ -20705,7 +20727,7 @@ var table_default = (
|
|
|
20705
20727
|
};
|
|
20706
20728
|
const loadScrollXData = () => {
|
|
20707
20729
|
const { isScrollXBig } = reactData;
|
|
20708
|
-
const { mergeBodyList, mergeFooterList,
|
|
20730
|
+
const { mergeBodyList, mergeFooterList, mergeBodyColMaps, scrollXStore } = internalData;
|
|
20709
20731
|
const { preloadSize, startIndex, endIndex, offsetSize } = scrollXStore;
|
|
20710
20732
|
const { toVisibleIndex, visibleSize } = handleVirtualXVisible();
|
|
20711
20733
|
const offsetItem = {
|
|
@@ -20714,7 +20736,7 @@ var table_default = (
|
|
|
20714
20736
|
};
|
|
20715
20737
|
scrollXStore.visibleStartIndex = toVisibleIndex - 1;
|
|
20716
20738
|
scrollXStore.visibleEndIndex = toVisibleIndex + visibleSize + 1;
|
|
20717
|
-
calculateMergerOffsetIndex(mergeBodyList.concat(mergeFooterList),
|
|
20739
|
+
calculateMergerOffsetIndex(mergeBodyList.concat(mergeFooterList), mergeBodyColMaps, offsetItem, "col");
|
|
20718
20740
|
const { startIndex: offsetStartIndex, endIndex: offsetEndIndex } = offsetItem;
|
|
20719
20741
|
if (toVisibleIndex <= startIndex || toVisibleIndex >= endIndex - visibleSize - 1) {
|
|
20720
20742
|
if (startIndex !== offsetStartIndex || endIndex !== offsetEndIndex) {
|
|
@@ -21090,7 +21112,7 @@ var table_default = (
|
|
|
21090
21112
|
};
|
|
21091
21113
|
const loadScrollYData = () => {
|
|
21092
21114
|
const { isAllOverflow, isScrollYBig } = reactData;
|
|
21093
|
-
const { mergeBodyList,
|
|
21115
|
+
const { mergeBodyList, mergeBodyRowMaps, scrollYStore } = internalData;
|
|
21094
21116
|
const { preloadSize, startIndex, endIndex, offsetSize } = scrollYStore;
|
|
21095
21117
|
const autoOffsetYSize = isAllOverflow ? offsetSize : offsetSize + 1;
|
|
21096
21118
|
const { toVisibleIndex, visibleSize } = handleVirtualYVisible();
|
|
@@ -21100,7 +21122,7 @@ var table_default = (
|
|
|
21100
21122
|
};
|
|
21101
21123
|
scrollYStore.visibleStartIndex = toVisibleIndex - 1;
|
|
21102
21124
|
scrollYStore.visibleEndIndex = toVisibleIndex + visibleSize + 1;
|
|
21103
|
-
calculateMergerOffsetIndex(mergeBodyList,
|
|
21125
|
+
calculateMergerOffsetIndex(mergeBodyList, mergeBodyRowMaps, offsetItem, "row");
|
|
21104
21126
|
const { startIndex: offsetStartIndex, endIndex: offsetEndIndex } = offsetItem;
|
|
21105
21127
|
if (toVisibleIndex <= startIndex || toVisibleIndex >= endIndex - visibleSize - 1) {
|
|
21106
21128
|
if (startIndex !== offsetStartIndex || endIndex !== offsetEndIndex) {
|
|
@@ -21169,7 +21191,7 @@ var table_default = (
|
|
|
21169
21191
|
loadScrollYData();
|
|
21170
21192
|
}, fpsTime);
|
|
21171
21193
|
};
|
|
21172
|
-
const handleSyncScroll = (isRollX, isRollY) => {
|
|
21194
|
+
const handleSyncScroll = (isRollX, isRollY, isCompensate) => {
|
|
21173
21195
|
const { scrollXLoad, scrollYLoad, isAllOverflow } = reactData;
|
|
21174
21196
|
const autoWidthColumnList = computeAutoWidthColumnList.value;
|
|
21175
21197
|
internalData.lcsRunTime = Date.now();
|
|
@@ -21190,7 +21212,9 @@ var table_default = (
|
|
|
21190
21212
|
let xRest = null;
|
|
21191
21213
|
let yRest = null;
|
|
21192
21214
|
if (!isAllOverflow) {
|
|
21193
|
-
|
|
21215
|
+
if (!isCompensate) {
|
|
21216
|
+
calcCellHeight();
|
|
21217
|
+
}
|
|
21194
21218
|
updateRowOffsetTop();
|
|
21195
21219
|
}
|
|
21196
21220
|
if (isRollX && scrollXLoad) {
|
|
@@ -21206,7 +21230,9 @@ var table_default = (
|
|
|
21206
21230
|
autoCellWidth();
|
|
21207
21231
|
}
|
|
21208
21232
|
if (!isAllOverflow) {
|
|
21209
|
-
|
|
21233
|
+
if (!isCompensate) {
|
|
21234
|
+
calcCellHeight();
|
|
21235
|
+
}
|
|
21210
21236
|
updateRowOffsetTop();
|
|
21211
21237
|
}
|
|
21212
21238
|
return $xeTable.updateScrollYSpace();
|
|
@@ -21227,7 +21253,7 @@ var table_default = (
|
|
|
21227
21253
|
(0, import_vue22.nextTick)(() => {
|
|
21228
21254
|
updateRowExpandStyle();
|
|
21229
21255
|
if (!internalData.lcsTimeout) {
|
|
21230
|
-
handleSyncScroll(isRollX, isRollY);
|
|
21256
|
+
handleSyncScroll(isRollX, isRollY, true);
|
|
21231
21257
|
}
|
|
21232
21258
|
});
|
|
21233
21259
|
}
|
|
@@ -22877,6 +22903,7 @@ var table_default = (
|
|
|
22877
22903
|
const { fullAllDataRowIdData } = internalData;
|
|
22878
22904
|
const rows = import_xe_utils24.default.isArray(rowOrId) ? rowOrId : [rowOrId];
|
|
22879
22905
|
const el = refElem.value;
|
|
22906
|
+
let status = false;
|
|
22880
22907
|
if (el) {
|
|
22881
22908
|
const { handleGetRowId } = createHandleGetRowId($xeTable);
|
|
22882
22909
|
el.setAttribute("data-calc-row", "Y");
|
|
@@ -22885,12 +22912,15 @@ var table_default = (
|
|
|
22885
22912
|
const rowRest = fullAllDataRowIdData[rowid];
|
|
22886
22913
|
if (rowRest) {
|
|
22887
22914
|
rowRest.resizeHeight = calcCellAutoHeight(rowid, rowRest, el);
|
|
22915
|
+
status = true;
|
|
22888
22916
|
}
|
|
22889
22917
|
});
|
|
22890
22918
|
el.removeAttribute("data-calc-row");
|
|
22891
22919
|
reactData.calcCellHeightFlag++;
|
|
22892
22920
|
}
|
|
22893
|
-
return (0, import_vue22.nextTick)()
|
|
22921
|
+
return (0, import_vue22.nextTick)().then(() => {
|
|
22922
|
+
return { status };
|
|
22923
|
+
});
|
|
22894
22924
|
},
|
|
22895
22925
|
setRowHeight(rowOrId, height) {
|
|
22896
22926
|
const { fullAllDataRowIdData } = internalData;
|