vxe-table 4.7.86 → 4.7.88

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
@@ -1998,9 +1998,9 @@ function eqEmptyValue(cellValue) {
1998
1998
  ;// CONCATENATED MODULE: ./packages/ui/index.ts
1999
1999
 
2000
2000
 
2001
- const version = "4.7.86";
2001
+ const version = "4.7.88";
2002
2002
  core_.VxeUI.version = version;
2003
- core_.VxeUI.tableVersion = "4.7.86";
2003
+ core_.VxeUI.tableVersion = "4.7.88";
2004
2004
  core_.VxeUI.setConfig({
2005
2005
  emptyCell: ' ',
2006
2006
  table: {
@@ -2384,7 +2384,7 @@ var es_array_push = __webpack_require__(4114);
2384
2384
  const {
2385
2385
  log: log_log
2386
2386
  } = core_.VxeUI;
2387
- const log_version = `table v${"4.7.86"}`;
2387
+ const log_version = `table v${"4.7.88"}`;
2388
2388
  const warnLog = log_log.create('warn', log_version);
2389
2389
  const errLog = log_log.create('error', log_version);
2390
2390
  ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -3176,31 +3176,42 @@ function colToVisible($xeTable, column) {
3176
3176
  refTableBody
3177
3177
  } = $xeTable.getRefMaps();
3178
3178
  const {
3179
+ columnStore,
3179
3180
  scrollXLoad
3180
3181
  } = reactData;
3181
3182
  const {
3182
3183
  visibleColumn
3183
3184
  } = internalData;
3185
+ const {
3186
+ leftList,
3187
+ rightList
3188
+ } = columnStore;
3184
3189
  const tableBody = refTableBody.value;
3185
3190
  const bodyElem = tableBody ? tableBody.$el : null;
3191
+ let offsetFixedLeft = 0;
3192
+ leftList.forEach(item => {
3193
+ offsetFixedLeft += item.renderWidth;
3194
+ });
3195
+ let offsetFixedRight = 0;
3196
+ rightList.forEach(item => {
3197
+ offsetFixedRight += item.renderWidth;
3198
+ });
3186
3199
  if (bodyElem) {
3200
+ const bodyWidth = bodyElem.clientWidth;
3201
+ const bodySrcollLeft = bodyElem.scrollLeft;
3187
3202
  const tdElem = bodyElem.querySelector(`.${column.id}`);
3188
3203
  if (tdElem) {
3189
- const bodyWidth = bodyElem.clientWidth;
3190
- const bodySrcollLeft = bodyElem.scrollLeft;
3191
3204
  const tdOffsetParent = tdElem.offsetParent;
3192
3205
  const tdOffsetLeft = tdElem.offsetLeft + (tdOffsetParent ? tdOffsetParent.offsetLeft : 0);
3193
3206
  const tdWidth = tdElem.clientWidth;
3194
- // 检测行是否在可视区中
3195
- if (tdOffsetLeft < bodySrcollLeft || tdOffsetLeft > bodySrcollLeft + bodyWidth) {
3196
- // 向左定位
3197
- return $xeTable.scrollTo(tdOffsetLeft);
3198
- } else if (tdOffsetLeft + tdWidth >= bodyWidth + bodySrcollLeft) {
3199
- // 向右定位
3200
- return $xeTable.scrollTo(bodySrcollLeft + tdWidth);
3207
+ // 检测是否在可视区中
3208
+ if (tdOffsetLeft < bodySrcollLeft + offsetFixedLeft) {
3209
+ return $xeTable.scrollTo(tdOffsetLeft - offsetFixedLeft - 1);
3210
+ } else if (tdOffsetLeft + tdWidth >= bodyWidth + bodySrcollLeft - offsetFixedRight) {
3211
+ return $xeTable.scrollTo(tdOffsetLeft - offsetFixedLeft - offsetFixedRight + 1);
3201
3212
  }
3202
3213
  } else {
3203
- // 如果是虚拟渲染跨行滚动
3214
+ // 检测是否在虚拟渲染可视区中
3204
3215
  if (scrollXLoad) {
3205
3216
  let scrollLeft = 0;
3206
3217
  for (let index = 0; index < visibleColumn.length; index++) {
@@ -3210,7 +3221,10 @@ function colToVisible($xeTable, column) {
3210
3221
  }
3211
3222
  scrollLeft += currCol.renderWidth;
3212
3223
  }
3213
- return $xeTable.scrollTo(scrollLeft);
3224
+ if (scrollLeft < bodySrcollLeft) {
3225
+ return $xeTable.scrollTo(scrollLeft - offsetFixedLeft - 1);
3226
+ }
3227
+ return $xeTable.scrollTo(scrollLeft - offsetFixedLeft - offsetFixedRight + 1);
3214
3228
  }
3215
3229
  }
3216
3230
  }
@@ -8792,13 +8806,13 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
8792
8806
  return '';
8793
8807
  });
8794
8808
  const computeValidOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
8795
- return Object.assign({}, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(table_getConfig().table.validConfig, true), props.validConfig);
8809
+ return Object.assign({}, table_getConfig().table.validConfig, props.validConfig);
8796
8810
  });
8797
8811
  const computeSXOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
8798
- return Object.assign({}, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(table_getConfig().table.scrollX, true), props.scrollX);
8812
+ return Object.assign({}, table_getConfig().table.scrollX, props.scrollX);
8799
8813
  });
8800
8814
  const computeSYOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
8801
- return Object.assign({}, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(table_getConfig().table.scrollY, true), props.scrollY);
8815
+ return Object.assign({}, table_getConfig().table.scrollY, props.scrollY);
8802
8816
  });
8803
8817
  const computeRowHeightMaps = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
8804
8818
  return {
@@ -8809,31 +8823,31 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
8809
8823
  };
8810
8824
  });
8811
8825
  const computeColumnOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
8812
- return Object.assign({}, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(table_getConfig().table.columnConfig, true), props.columnConfig);
8826
+ return Object.assign({}, table_getConfig().table.columnConfig, props.columnConfig);
8813
8827
  });
8814
8828
  const computeRowOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
8815
- return Object.assign({}, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(table_getConfig().table.rowConfig, true), props.rowConfig);
8829
+ return Object.assign({}, table_getConfig().table.rowConfig, props.rowConfig);
8816
8830
  });
8817
8831
  const computeResizeOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
8818
- return Object.assign({}, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(table_getConfig().table.resizeConfig, true), props.resizeConfig);
8832
+ return Object.assign({}, table_getConfig().table.resizeConfig, props.resizeConfig);
8819
8833
  });
8820
8834
  const computeResizableOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
8821
- return Object.assign({}, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(table_getConfig().table.resizableConfig, true), props.resizableConfig);
8835
+ return Object.assign({}, table_getConfig().table.resizableConfig, props.resizableConfig);
8822
8836
  });
8823
8837
  const computeSeqOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
8824
8838
  return Object.assign({
8825
8839
  startIndex: 0
8826
- }, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(table_getConfig().table.seqConfig, true), props.seqConfig);
8840
+ }, table_getConfig().table.seqConfig, props.seqConfig);
8827
8841
  });
8828
8842
  const computeRadioOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
8829
- return Object.assign({}, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(table_getConfig().table.radioConfig, true), props.radioConfig);
8843
+ return Object.assign({}, table_getConfig().table.radioConfig, props.radioConfig);
8830
8844
  });
8831
8845
  const computeCheckboxOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
8832
- return Object.assign({}, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(table_getConfig().table.checkboxConfig, true), props.checkboxConfig);
8846
+ return Object.assign({}, table_getConfig().table.checkboxConfig, props.checkboxConfig);
8833
8847
  });
8834
8848
  let computeTooltipOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
8835
8849
  computeTooltipOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
8836
- return Object.assign({}, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(table_getConfig().tooltip, true), external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(table_getConfig().table.tooltipConfig, true), props.tooltipConfig);
8850
+ return Object.assign({}, table_getConfig().tooltip, table_getConfig().table.tooltipConfig, props.tooltipConfig);
8837
8851
  });
8838
8852
  const computeTipConfig = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
8839
8853
  const tooltipOpts = computeTooltipOpts.value;
@@ -8848,33 +8862,33 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
8848
8862
  }, tooltipOpts);
8849
8863
  });
8850
8864
  const computeEditOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
8851
- return Object.assign({}, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(table_getConfig().table.editConfig, true), props.editConfig);
8865
+ return Object.assign({}, table_getConfig().table.editConfig, props.editConfig);
8852
8866
  });
8853
8867
  const computeSortOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
8854
8868
  return Object.assign({
8855
8869
  orders: ['asc', 'desc', null]
8856
- }, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(table_getConfig().table.sortConfig, true), props.sortConfig);
8870
+ }, table_getConfig().table.sortConfig, props.sortConfig);
8857
8871
  });
8858
8872
  const computeFilterOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
8859
- return Object.assign({}, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(table_getConfig().table.filterConfig, true), props.filterConfig);
8873
+ return Object.assign({}, table_getConfig().table.filterConfig, props.filterConfig);
8860
8874
  });
8861
8875
  const computeMouseOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
8862
- return Object.assign({}, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(table_getConfig().table.mouseConfig, true), props.mouseConfig);
8876
+ return Object.assign({}, table_getConfig().table.mouseConfig, props.mouseConfig);
8863
8877
  });
8864
8878
  const computeAreaOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
8865
- return Object.assign({}, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(table_getConfig().table.areaConfig, true), props.areaConfig);
8879
+ return Object.assign({}, table_getConfig().table.areaConfig, props.areaConfig);
8866
8880
  });
8867
8881
  const computeKeyboardOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
8868
- return Object.assign({}, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(table_getConfig().table.keyboardConfig, true), props.keyboardConfig);
8882
+ return Object.assign({}, table_getConfig().table.keyboardConfig, props.keyboardConfig);
8869
8883
  });
8870
8884
  const computeClipOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
8871
- return Object.assign({}, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(table_getConfig().table.clipConfig, true), props.clipConfig);
8885
+ return Object.assign({}, table_getConfig().table.clipConfig, props.clipConfig);
8872
8886
  });
8873
8887
  const computeFNROpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
8874
- return Object.assign({}, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(table_getConfig().table.fnrConfig, true), props.fnrConfig);
8888
+ return Object.assign({}, table_getConfig().table.fnrConfig, props.fnrConfig);
8875
8889
  });
8876
8890
  const computeMenuOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
8877
- return Object.assign({}, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(table_getConfig().table.menuConfig, true), props.menuConfig);
8891
+ return Object.assign({}, table_getConfig().table.menuConfig, props.menuConfig);
8878
8892
  });
8879
8893
  const computeHeaderMenu = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
8880
8894
  const menuOpts = computeMenuOpts.value;
@@ -8911,31 +8925,31 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
8911
8925
  return rest;
8912
8926
  });
8913
8927
  const computeExportOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
8914
- return Object.assign({}, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(table_getConfig().table.exportConfig, true), props.exportConfig);
8928
+ return Object.assign({}, table_getConfig().table.exportConfig, props.exportConfig);
8915
8929
  });
8916
8930
  const computeImportOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
8917
- return Object.assign({}, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(table_getConfig().table.importConfig, true), props.importConfig);
8931
+ return Object.assign({}, table_getConfig().table.importConfig, props.importConfig);
8918
8932
  });
8919
8933
  const computePrintOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
8920
- return Object.assign({}, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(table_getConfig().table.printConfig, true), props.printConfig);
8934
+ return Object.assign({}, table_getConfig().table.printConfig, props.printConfig);
8921
8935
  });
8922
8936
  const computeExpandOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
8923
- return Object.assign({}, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(table_getConfig().table.expandConfig, true), props.expandConfig);
8937
+ return Object.assign({}, table_getConfig().table.expandConfig, props.expandConfig);
8924
8938
  });
8925
8939
  const computeTreeOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
8926
- return Object.assign({}, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(table_getConfig().table.treeConfig, true), props.treeConfig);
8940
+ return Object.assign({}, table_getConfig().table.treeConfig, props.treeConfig);
8927
8941
  });
8928
8942
  const computeEmptyOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
8929
- return Object.assign({}, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(table_getConfig().table.emptyRender, true), props.emptyRender);
8943
+ return Object.assign({}, table_getConfig().table.emptyRender, props.emptyRender);
8930
8944
  });
8931
8945
  const computeLoadingOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
8932
- return Object.assign({}, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(table_getConfig().table.loadingConfig, true), props.loadingConfig);
8946
+ return Object.assign({}, table_getConfig().table.loadingConfig, props.loadingConfig);
8933
8947
  });
8934
8948
  const computeCellOffsetWidth = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
8935
8949
  return props.border ? Math.max(2, Math.ceil(reactData.scrollbarWidth / reactData.tableColumn.length)) : 1;
8936
8950
  });
8937
8951
  const computeCustomOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
8938
- return Object.assign({}, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(table_getConfig().table.customConfig, true), props.customConfig);
8952
+ return Object.assign({}, table_getConfig().table.customConfig, props.customConfig);
8939
8953
  });
8940
8954
  const computeAutoWidthColumnList = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
8941
8955
  const {
@@ -9210,7 +9224,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
9210
9224
  visibleSize: 8
9211
9225
  };
9212
9226
  };
9213
- const calculateMergerOffserIndex = (list, offsetItem, type) => {
9227
+ const calculateMergerOffsetIndex = (list, offsetItem, type) => {
9214
9228
  for (let mcIndex = 0, len = list.length; mcIndex < len; mcIndex++) {
9215
9229
  const mergeItem = list[mcIndex];
9216
9230
  const {
@@ -9593,7 +9607,9 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
9593
9607
  });
9594
9608
  } else {
9595
9609
  const labelEl = cellEl.firstChild;
9596
- titleWidth = labelEl.offsetWidth;
9610
+ if (labelEl) {
9611
+ titleWidth = labelEl.offsetWidth;
9612
+ }
9597
9613
  }
9598
9614
  if (titleWidth) {
9599
9615
  colWidth = Math.max(colWidth, Math.ceil(titleWidth) + 4);
@@ -9873,6 +9889,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
9873
9889
  treeExpandedMaps
9874
9890
  } = reactData;
9875
9891
  const treeOpts = computeTreeOpts.value;
9892
+ const childrenField = treeOpts.children || treeOpts.childrenField;
9876
9893
  if (treeConfig && treeOpts.transform) {
9877
9894
  const fullData = [];
9878
9895
  const expandMaps = {};
@@ -9884,7 +9901,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
9884
9901
  fullData.push(row);
9885
9902
  }
9886
9903
  }, {
9887
- children: treeOpts.mapChildrenField
9904
+ children: childrenField
9888
9905
  });
9889
9906
  internalData.afterFullData = fullData;
9890
9907
  updateScrollYStatus(fullData);
@@ -9908,6 +9925,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
9908
9925
  const filterOpts = computeFilterOpts.value;
9909
9926
  const sortOpts = computeSortOpts.value;
9910
9927
  const treeOpts = computeTreeOpts.value;
9928
+ const childrenField = treeOpts.children || treeOpts.childrenField;
9911
9929
  const {
9912
9930
  transform
9913
9931
  } = treeOpts;
@@ -10023,8 +10041,10 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
10023
10041
  if (treeConfig && transform) {
10024
10042
  // 筛选虚拟树
10025
10043
  tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree(tableFullTreeData, handleFilter, {
10026
- ...treeOpts,
10027
- original: true
10044
+ original: true,
10045
+ isEvery: true,
10046
+ children: treeOpts.mapChildrenField,
10047
+ mapChildren: childrenField
10028
10048
  });
10029
10049
  tableData = tableTree;
10030
10050
  } else {
@@ -10035,8 +10055,10 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
10035
10055
  if (treeConfig && transform) {
10036
10056
  // 还原虚拟树
10037
10057
  tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree(tableFullTreeData, () => true, {
10038
- ...treeOpts,
10039
- original: true
10058
+ original: true,
10059
+ isEvery: true,
10060
+ children: treeOpts.mapChildrenField,
10061
+ mapChildren: childrenField
10040
10062
  });
10041
10063
  tableData = tableTree;
10042
10064
  } else {
@@ -10084,8 +10106,10 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
10084
10106
  if (treeConfig && transform) {
10085
10107
  // 还原虚拟树
10086
10108
  tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree(tableFullTreeData, () => true, {
10087
- ...treeOpts,
10088
- original: true
10109
+ original: true,
10110
+ isEvery: true,
10111
+ children: treeOpts.mapChildrenField,
10112
+ mapChildren: childrenField
10089
10113
  });
10090
10114
  tableData = tableTree;
10091
10115
  } else {
@@ -11185,7 +11209,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
11185
11209
  startIndex: Math.max(0, toVisibleIndex - 1 - offsetSize),
11186
11210
  endIndex: toVisibleIndex + visibleSize + offsetSize
11187
11211
  };
11188
- calculateMergerOffserIndex(mergeList.concat(mergeFooterList), offsetItem, 'col');
11212
+ calculateMergerOffsetIndex(mergeList.concat(mergeFooterList), offsetItem, 'col');
11189
11213
  const {
11190
11214
  startIndex: offsetStartIndex,
11191
11215
  endIndex: offsetEndIndex
@@ -11521,7 +11545,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
11521
11545
  startIndex: Math.max(0, toVisibleIndex - 1 - offsetSize),
11522
11546
  endIndex: toVisibleIndex + visibleSize + offsetSize
11523
11547
  };
11524
- calculateMergerOffserIndex(mergeList, offsetItem, 'row');
11548
+ calculateMergerOffsetIndex(mergeList, offsetItem, 'row');
11525
11549
  const {
11526
11550
  startIndex: offsetStartIndex,
11527
11551
  endIndex: offsetEndIndex
@@ -14664,8 +14688,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
14664
14688
  treeConfig
14665
14689
  } = props;
14666
14690
  const treeOpts = computeTreeOpts.value;
14667
- let {
14668
- fullDataRowIdData,
14691
+ const {
14669
14692
  fullAllDataRowIdData,
14670
14693
  tableFullData,
14671
14694
  tableFullTreeData
@@ -14674,6 +14697,8 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
14674
14697
  const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
14675
14698
  const rowkey = getRowkey($xeTable);
14676
14699
  const isLazy = treeConfig && treeOpts.lazy;
14700
+ const fullAllDataRowIdMaps = {};
14701
+ const fullDataRowIdMaps = {};
14677
14702
  const handleRow = (row, index, items, path, parent, nodes) => {
14678
14703
  let rowid = getRowid($xeTable, row);
14679
14704
  const seq = treeConfig && path ? toTreePathSeq(path) : index + 1;
@@ -14685,26 +14710,30 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
14685
14710
  if (isLazy && row[hasChildField] && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(row[childrenField])) {
14686
14711
  row[childrenField] = null;
14687
14712
  }
14688
- const rest = {
14689
- row,
14690
- rowid,
14691
- seq,
14692
- index: treeConfig && parent ? -1 : index,
14693
- _index: -1,
14694
- $index: -1,
14695
- items,
14696
- parent,
14697
- level
14698
- };
14713
+ let cacheItem = fullAllDataRowIdData[rowid];
14714
+ if (!cacheItem) {
14715
+ cacheItem = {
14716
+ row,
14717
+ rowid,
14718
+ seq,
14719
+ index: -1,
14720
+ _index: -1,
14721
+ $index: -1,
14722
+ items,
14723
+ parent,
14724
+ level
14725
+ };
14726
+ }
14699
14727
  if (isSource) {
14700
- fullDataRowIdData[rowid] = rest;
14728
+ cacheItem.index = treeConfig && parent ? -1 : index;
14729
+ fullDataRowIdMaps[rowid] = cacheItem;
14701
14730
  }
14702
- fullAllDataRowIdData[rowid] = rest;
14731
+ fullAllDataRowIdMaps[rowid] = cacheItem;
14703
14732
  };
14704
14733
  if (isSource) {
14705
- fullDataRowIdData = internalData.fullDataRowIdData = {};
14734
+ internalData.fullDataRowIdData = fullDataRowIdMaps;
14706
14735
  }
14707
- fullAllDataRowIdData = internalData.fullAllDataRowIdData = {};
14736
+ internalData.fullAllDataRowIdData = fullAllDataRowIdMaps;
14708
14737
  if (treeConfig) {
14709
14738
  external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(tableFullTreeData, handleRow, {
14710
14739
  children: childrenField
@@ -23325,16 +23354,16 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
23325
23354
  return proxyOpts.showActiveMsg;
23326
23355
  });
23327
23356
  const computePagerOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
23328
- return Object.assign({}, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(grid_getConfig().grid.pagerConfig, true), props.pagerConfig);
23357
+ return Object.assign({}, grid_getConfig().grid.pagerConfig, props.pagerConfig);
23329
23358
  });
23330
23359
  const computeFormOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
23331
- return Object.assign({}, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(grid_getConfig().grid.formConfig, true), props.formConfig);
23360
+ return Object.assign({}, grid_getConfig().grid.formConfig, props.formConfig);
23332
23361
  });
23333
23362
  const computeToolbarOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
23334
- return Object.assign({}, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(grid_getConfig().grid.toolbarConfig, true), props.toolbarConfig);
23363
+ return Object.assign({}, grid_getConfig().grid.toolbarConfig, props.toolbarConfig);
23335
23364
  });
23336
23365
  const computeZoomOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
23337
- return Object.assign({}, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(grid_getConfig().grid.zoomConfig, true), props.zoomConfig);
23366
+ return Object.assign({}, grid_getConfig().grid.zoomConfig, props.zoomConfig);
23338
23367
  });
23339
23368
  const computeStyles = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
23340
23369
  return reactData.isZMax ? {
@@ -25425,7 +25454,7 @@ core_.VxeUI.setTheme('light');
25425
25454
  ;// CONCATENATED MODULE: ./index.ts
25426
25455
 
25427
25456
 
25428
- if (typeof window !== 'undefined' && window.VXETable) {
25457
+ if (typeof window !== 'undefined' && window.Vue) {
25429
25458
  if (!window.VxeUITable) {
25430
25459
  window.VxeUITable = components_namespaceObject;
25431
25460
  }