vxe-table 3.8.11 → 3.8.13

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.
Files changed (59) hide show
  1. package/lib/export/src/mixin.js +1 -1
  2. package/lib/export/src/mixin.min.js +1 -1
  3. package/lib/filter/src/mixin.js +19 -14
  4. package/lib/filter/src/mixin.min.js +1 -1
  5. package/lib/filter/src/panel.js +3 -3
  6. package/lib/filter/src/panel.min.js +1 -1
  7. package/lib/grid/src/grid.js +3 -3
  8. package/lib/grid/src/grid.min.js +1 -1
  9. package/lib/icon/style/style.css +1 -1
  10. package/lib/icon/style/style.min.css +1 -1
  11. package/lib/index.css +1 -1
  12. package/lib/index.umd.js +464 -361
  13. package/lib/index.umd.min.js +1 -1
  14. package/lib/modal/src/modal.js +33 -33
  15. package/lib/modal/src/modal.min.js +1 -1
  16. package/lib/style.css +1 -1
  17. package/lib/style.min.css +1 -1
  18. package/lib/table/src/cell.js +51 -11
  19. package/lib/table/src/cell.min.js +1 -1
  20. package/lib/table/src/column.js +2 -0
  21. package/lib/table/src/column.min.js +1 -1
  22. package/lib/table/src/columnInfo.js +2 -0
  23. package/lib/table/src/columnInfo.min.js +1 -1
  24. package/lib/table/src/methods.js +342 -292
  25. package/lib/table/src/methods.min.js +1 -1
  26. package/lib/table/src/table.js +9 -1
  27. package/lib/table/src/table.min.js +1 -1
  28. package/lib/table/style/style.css +12 -4
  29. package/lib/table/style/style.min.css +1 -1
  30. package/lib/tools/dom.js +1 -1
  31. package/lib/tools/dom.min.js +1 -1
  32. package/lib/tools/log.js +1 -1
  33. package/lib/tools/log.min.js +1 -1
  34. package/lib/v-x-e-table/index.js +1 -1
  35. package/lib/v-x-e-table/index.min.js +1 -1
  36. package/lib/v-x-e-table/src/conf.js +1 -1
  37. package/lib/v-x-e-table/src/conf.min.js +1 -1
  38. package/lib/vxe-table/style/style.css +12 -4
  39. package/lib/vxe-table/style/style.min.css +1 -1
  40. package/package.json +1 -1
  41. package/packages/export/src/mixin.js +1 -0
  42. package/packages/filter/src/mixin.js +17 -14
  43. package/packages/filter/src/panel.js +3 -3
  44. package/packages/grid/src/grid.js +3 -3
  45. package/packages/modal/src/modal.js +36 -36
  46. package/packages/table/src/cell.js +51 -10
  47. package/packages/table/src/column.js +2 -0
  48. package/packages/table/src/columnInfo.js +2 -0
  49. package/packages/table/src/methods.js +61 -15
  50. package/packages/table/src/table.js +7 -0
  51. package/packages/tools/dom.js +1 -1
  52. package/packages/v-x-e-table/src/conf.js +1 -1
  53. package/styles/table.scss +22 -6
  54. /package/lib/icon/style/{iconfont.1720519524864.ttf → iconfont.1721119959483.ttf} +0 -0
  55. /package/lib/icon/style/{iconfont.1720519524864.woff → iconfont.1721119959483.woff} +0 -0
  56. /package/lib/icon/style/{iconfont.1720519524864.woff2 → iconfont.1721119959483.woff2} +0 -0
  57. /package/lib/{iconfont.1720519524864.ttf → iconfont.1721119959483.ttf} +0 -0
  58. /package/lib/{iconfont.1720519524864.woff → iconfont.1721119959483.woff} +0 -0
  59. /package/lib/{iconfont.1720519524864.woff2 → iconfont.1721119959483.woff2} +0 -0
package/lib/index.umd.js CHANGED
@@ -11313,7 +11313,7 @@ var iconPrefix = 'vxe-icon-';
11313
11313
  MODAL_CLOSE: iconPrefix + 'close',
11314
11314
  MODAL_INFO: iconPrefix + 'info-circle-fill',
11315
11315
  MODAL_SUCCESS: iconPrefix + 'success-circle-fill',
11316
- MODAL_WARNING: iconPrefix + 'warnion-circle-fill',
11316
+ MODAL_WARNING: iconPrefix + 'warning-circle-fill',
11317
11317
  MODAL_ERROR: iconPrefix + 'error-circle-fill',
11318
11318
  MODAL_QUESTION: iconPrefix + 'question-circle-fill',
11319
11319
  MODAL_LOADING: iconPrefix + 'spinner roll',
@@ -11512,7 +11512,7 @@ var es_array_concat = __webpack_require__(8706);
11512
11512
 
11513
11513
 
11514
11514
  function getLog(message, params) {
11515
- return "[vxe-table v".concat("3.8.11", "] ").concat(conf.i18n(message, params));
11515
+ return "[vxe-table v".concat("3.8.13", "] ").concat(conf.i18n(message, params));
11516
11516
  }
11517
11517
  function outLog(type) {
11518
11518
  return function (message, params) {
@@ -13207,7 +13207,7 @@ function component(comp) {
13207
13207
  components[comp.name] = comp;
13208
13208
  }
13209
13209
  }
13210
- var version = "3.8.11";
13210
+ var version = "3.8.13";
13211
13211
  var tableVersion = version;
13212
13212
  var VxeUI = {
13213
13213
  v: v,
@@ -13297,6 +13297,7 @@ var ColumnInfo = /*#__PURE__*/function () {
13297
13297
  headerClassName: _vm.headerClassName,
13298
13298
  footerClassName: _vm.footerClassName,
13299
13299
  formatter: formatter,
13300
+ footerFormatter: _vm.footerFormatter,
13300
13301
  sortable: _vm.sortable,
13301
13302
  sortBy: _vm.sortBy,
13302
13303
  sortType: _vm.sortType,
@@ -13352,6 +13353,7 @@ var ColumnInfo = /*#__PURE__*/function () {
13352
13353
  renderWidth: 0,
13353
13354
  renderHeight: 0,
13354
13355
  renderResizeWidth: 0,
13356
+ renderAutoWidth: 0,
13355
13357
  resizeWidth: 0,
13356
13358
  // 手动调整
13357
13359
 
@@ -13583,7 +13585,7 @@ var DomTools = {
13583
13585
  var val = $xetable[key];
13584
13586
  var num = 0;
13585
13587
  if (val) {
13586
- if (val === 'auto') {
13588
+ if (val === '100%' || val === 'auto') {
13587
13589
  num = $xetable.parentHeight;
13588
13590
  } else {
13589
13591
  var excludeHeight = $xetable.getExcludeHeight();
@@ -15781,6 +15783,9 @@ var es_string_trim = __webpack_require__(2762);
15781
15783
 
15782
15784
 
15783
15785
 
15786
+
15787
+
15788
+
15784
15789
  function renderTitlePrefixIcon(h, params) {
15785
15790
  var $table = params.$table,
15786
15791
  column = params.column;
@@ -15858,6 +15863,18 @@ function renderTitleContent(h, params, content) {
15858
15863
  on: ons
15859
15864
  }, getSlotVNs(content))];
15860
15865
  }
15866
+ function formatFooterLabel(footerFormatter, params) {
15867
+ if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(footerFormatter)) {
15868
+ return footerFormatter(params);
15869
+ }
15870
+ var isArr = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(footerFormatter);
15871
+ var gFormatOpts = isArr ? formats.get(footerFormatter[0]) : formats.get(footerFormatter);
15872
+ var footerFormatMethod = gFormatOpts ? gFormatOpts.tableFooterCellFormatMethod : null;
15873
+ if (footerFormatMethod) {
15874
+ return isArr ? footerFormatMethod.apply(void 0, [params].concat(_toConsumableArray(footerFormatter.slice(1)))) : footerFormatMethod(params);
15875
+ }
15876
+ return '';
15877
+ }
15861
15878
  function getFooterContent(h, params) {
15862
15879
  var $table = params.$table,
15863
15880
  column = params.column,
@@ -15866,7 +15883,8 @@ function getFooterContent(h, params) {
15866
15883
  items = params.items;
15867
15884
  var slots = column.slots,
15868
15885
  editRender = column.editRender,
15869
- cellRender = column.cellRender;
15886
+ cellRender = column.cellRender,
15887
+ footerFormatter = column.footerFormatter;
15870
15888
  var renderOpts = editRender || cellRender;
15871
15889
  if (slots && slots.footer) {
15872
15890
  return $table.callSlot(slots.footer, params, h);
@@ -15878,11 +15896,26 @@ function getFooterContent(h, params) {
15878
15896
  return getSlotVNs(rtFooter.call($table, h, renderOpts, params));
15879
15897
  }
15880
15898
  }
15899
+ var itemValue = '';
15881
15900
  // 兼容老模式
15882
15901
  if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(items)) {
15883
- return [utils.formatText(items[_columnIndex], 1)];
15902
+ itemValue = items[_columnIndex];
15903
+ return [footerFormatter ? formatFooterLabel(footerFormatter, {
15904
+ itemValue: itemValue,
15905
+ column: column,
15906
+ row: row,
15907
+ items: items,
15908
+ _columnIndex: _columnIndex
15909
+ }) : utils.formatText(itemValue, 1)];
15884
15910
  }
15885
- return [utils.formatText(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field), 1)];
15911
+ itemValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field);
15912
+ return [footerFormatter ? formatFooterLabel(footerFormatter, {
15913
+ itemValue: itemValue,
15914
+ column: column,
15915
+ row: row,
15916
+ items: items,
15917
+ _columnIndex: _columnIndex
15918
+ }) : utils.formatText(itemValue, 1)];
15886
15919
  }
15887
15920
  function getDefaultCellLabel(params) {
15888
15921
  var $table = params.$table,
@@ -16020,7 +16053,8 @@ var Cell = {
16020
16053
  isHidden = params.isHidden;
16021
16054
  var treeOpts = $table.treeOpts,
16022
16055
  treeExpandedMaps = $table.treeExpandedMaps,
16023
- treeExpandLazyLoadedMaps = $table.treeExpandLazyLoadedMaps;
16056
+ treeExpandLazyLoadedMaps = $table.treeExpandLazyLoadedMaps,
16057
+ fullAllDataRowIdData = $table.fullAllDataRowIdData;
16024
16058
  var row = params.row,
16025
16059
  column = params.column,
16026
16060
  level = params.level;
@@ -16035,8 +16069,10 @@ var Cell = {
16035
16069
  var childrenField = treeOpts.children || treeOpts.childrenField;
16036
16070
  var hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
16037
16071
  var rowChilds = row[childrenField];
16072
+ var hasChild = rowChilds && rowChilds.length;
16038
16073
  var hasLazyChilds = false;
16039
16074
  var isAceived = false;
16075
+ var isLazyLoading = false;
16040
16076
  var isLazyLoaded = false;
16041
16077
  var on = {};
16042
16078
  if (slots && slots.icon) {
@@ -16046,8 +16082,10 @@ var Cell = {
16046
16082
  var rowid = getRowid($table, row);
16047
16083
  isAceived = !!treeExpandedMaps[rowid];
16048
16084
  if (lazy) {
16049
- isLazyLoaded = !!treeExpandLazyLoadedMaps[rowid];
16085
+ var rest = fullAllDataRowIdData[rowid];
16086
+ isLazyLoading = !!treeExpandLazyLoadedMaps[rowid];
16050
16087
  hasLazyChilds = row[hasChildField];
16088
+ isLazyLoaded = !!rest.treeLoaded;
16051
16089
  }
16052
16090
  }
16053
16091
  if (!trigger || trigger === 'default') {
@@ -16062,11 +16100,11 @@ var Cell = {
16062
16100
  style: {
16063
16101
  paddingLeft: "".concat(level * indent, "px")
16064
16102
  }
16065
- }, [showIcon && (rowChilds && rowChilds.length || hasLazyChilds) ? [h('div', {
16103
+ }, [showIcon && (lazy ? isLazyLoaded ? hasChild : hasLazyChilds : hasChild) ? [h('div', {
16066
16104
  class: 'vxe-tree--btn-wrapper',
16067
16105
  on: on
16068
16106
  }, [h('i', {
16069
- class: ['vxe-tree--node-btn', isLazyLoaded ? iconLoaded || conf.icon.TABLE_TREE_LOADED : isAceived ? iconOpen || conf.icon.TABLE_TREE_OPEN : iconClose || conf.icon.TABLE_TREE_CLOSE]
16107
+ class: ['vxe-tree--node-btn', isLazyLoading ? iconLoaded || conf.icon.TABLE_TREE_LOADED : isAceived ? iconOpen || conf.icon.TABLE_TREE_OPEN : iconClose || conf.icon.TABLE_TREE_CLOSE]
16070
16108
  })])] : null, h('div', {
16071
16109
  class: 'vxe-tree-cell'
16072
16110
  }, cellVNodes)])];
@@ -16396,7 +16434,7 @@ var Cell = {
16396
16434
  var slots = column.slots;
16397
16435
  var defaultSlot = slots ? slots.default : null;
16398
16436
  var isAceived = false;
16399
- var isLazyLoaded = false;
16437
+ var isLazyLoading = false;
16400
16438
  if (slots && slots.icon) {
16401
16439
  return $table.callSlot(slots.icon, params, h);
16402
16440
  }
@@ -16404,7 +16442,7 @@ var Cell = {
16404
16442
  var rowid = getRowid($table, row);
16405
16443
  isAceived = !!rowExpandedMaps[rowid];
16406
16444
  if (lazy) {
16407
- isLazyLoaded = !!rowExpandLazyLoadedMaps[rowid];
16445
+ isLazyLoading = !!rowExpandLazyLoadedMaps[rowid];
16408
16446
  }
16409
16447
  }
16410
16448
  return [showIcon && (!visibleMethod || visibleMethod(params)) ? h('span', {
@@ -16417,7 +16455,7 @@ var Cell = {
16417
16455
  }
16418
16456
  }
16419
16457
  }, [h('i', {
16420
- class: ['vxe-table--expand-btn', isLazyLoaded ? iconLoaded || conf.icon.TABLE_EXPAND_LOADED : isAceived ? iconOpen || conf.icon.TABLE_EXPAND_OPEN : iconClose || conf.icon.TABLE_EXPAND_CLOSE]
16458
+ class: ['vxe-table--expand-btn', isLazyLoading ? iconLoaded || conf.icon.TABLE_EXPAND_LOADED : isAceived ? iconOpen || conf.icon.TABLE_EXPAND_OPEN : iconClose || conf.icon.TABLE_EXPAND_CLOSE]
16421
16459
  })]) : null, defaultSlot || labelField ? h('span', {
16422
16460
  class: 'vxe-table--expand-label'
16423
16461
  }, defaultSlot ? $table.callSlot(defaultSlot, params, h) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, labelField)) : null];
@@ -18903,6 +18941,7 @@ var Methods = {
18903
18941
  var scaleList = [];
18904
18942
  var scaleMinList = [];
18905
18943
  var autoList = [];
18944
+ var remainList = [];
18906
18945
  this.tableFullColumn.forEach(function (column) {
18907
18946
  if (defaultWidth && !column.width) {
18908
18947
  column.width = defaultWidth;
@@ -18913,6 +18952,8 @@ var Methods = {
18913
18952
  if (column.visible) {
18914
18953
  if (column.resizeWidth) {
18915
18954
  resizeList.push(column);
18955
+ } else if (column.width === 'auto') {
18956
+ autoList.push(column);
18916
18957
  } else if (dom.isPx(column.width)) {
18917
18958
  pxList.push(column);
18918
18959
  } else if (dom.isScale(column.width)) {
@@ -18922,7 +18963,7 @@ var Methods = {
18922
18963
  } else if (dom.isScale(column.minWidth)) {
18923
18964
  scaleMinList.push(column);
18924
18965
  } else {
18925
- autoList.push(column);
18966
+ remainList.push(column);
18926
18967
  }
18927
18968
  }
18928
18969
  });
@@ -18932,7 +18973,8 @@ var Methods = {
18932
18973
  pxMinList: pxMinList,
18933
18974
  scaleList: scaleList,
18934
18975
  scaleMinList: scaleMinList,
18935
- autoList: autoList
18976
+ autoList: autoList,
18977
+ remainList: remainList
18936
18978
  });
18937
18979
  },
18938
18980
  /**
@@ -18982,6 +19024,7 @@ var Methods = {
18982
19024
  var headerElem = tableHeader ? tableHeader.$el : null;
18983
19025
  var footerElem = tableFooter ? tableFooter.$el : null;
18984
19026
  if (bodyElem) {
19027
+ this.calcCellWidth();
18985
19028
  this.autoCellWidth(headerElem, bodyElem, footerElem);
18986
19029
  if (refull === true) {
18987
19030
  // 初始化时需要在列计算之后再执行优化运算,达到最优显示效果
@@ -18993,6 +19036,40 @@ var Methods = {
18993
19036
  }
18994
19037
  return this.computeScrollLoad();
18995
19038
  },
19039
+ calcCellWidth: function calcCellWidth() {
19040
+ var _this26 = this;
19041
+ var autoWidthColumnList = this.autoWidthColumnList,
19042
+ tableData = this.tableData;
19043
+ if (!tableData.length || !autoWidthColumnList.length) {
19044
+ this.isCalcColumn = false;
19045
+ return this.$nextTick();
19046
+ }
19047
+ this.isCalcColumn = true;
19048
+ return this.$nextTick().then(function () {
19049
+ var el = _this26.$el;
19050
+ if (el) {
19051
+ autoWidthColumnList.forEach(function (column) {
19052
+ var cellElList = el.querySelectorAll(".vxe-header--column.".concat(column.id, ">.vxe-cell,.vxe-body--column.").concat(column.id, ">.vxe-cell,.vxe-footer--column.").concat(column.id, ">.vxe-cell"));
19053
+ var firstCellEl = cellElList[0];
19054
+ var paddingSize = 0;
19055
+ if (firstCellEl) {
19056
+ var cellStyle = getComputedStyle(firstCellEl);
19057
+ paddingSize = Math.floor(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellStyle.paddingLeft) + external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellStyle.paddingRight)) + 2;
19058
+ }
19059
+ var colWidth = column.renderAutoWidth - paddingSize + 2;
19060
+ external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayEach(cellElList, function (cellEl) {
19061
+ var labelEl = cellEl.firstChild;
19062
+ if (labelEl) {
19063
+ colWidth = Math.max(colWidth, labelEl.offsetWidth);
19064
+ }
19065
+ });
19066
+ column.renderAutoWidth = colWidth + paddingSize;
19067
+ });
19068
+ _this26.analyColumnWidth();
19069
+ }
19070
+ _this26.isCalcColumn = false;
19071
+ });
19072
+ },
18996
19073
  /**
18997
19074
  * 列宽算法
18998
19075
  * 支持 px、%、固定 混合分配
@@ -19016,7 +19093,8 @@ var Methods = {
19016
19093
  pxList = columnStore.pxList,
19017
19094
  scaleList = columnStore.scaleList,
19018
19095
  scaleMinList = columnStore.scaleMinList,
19019
- autoList = columnStore.autoList;
19096
+ autoList = columnStore.autoList,
19097
+ remainList = columnStore.remainList;
19020
19098
  // 最小宽
19021
19099
  pxMinList.forEach(function (column) {
19022
19100
  var minWidth = parseInt(column.minWidth);
@@ -19041,6 +19119,12 @@ var Methods = {
19041
19119
  tableWidth += width;
19042
19120
  column.renderWidth = width;
19043
19121
  });
19122
+ // 自适应宽
19123
+ autoList.forEach(function (column) {
19124
+ var width = Math.max(60, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toInteger(column.renderAutoWidth));
19125
+ tableWidth += width;
19126
+ column.renderWidth = width;
19127
+ });
19044
19128
  // 调整了列宽
19045
19129
  resizeList.forEach(function (column) {
19046
19130
  var width = parseInt(column.resizeWidth);
@@ -19048,7 +19132,7 @@ var Methods = {
19048
19132
  column.renderWidth = width;
19049
19133
  });
19050
19134
  remainWidth -= tableWidth;
19051
- meanWidth = remainWidth > 0 ? Math.floor(remainWidth / (scaleMinList.length + pxMinList.length + autoList.length)) : 0;
19135
+ meanWidth = remainWidth > 0 ? Math.floor(remainWidth / (scaleMinList.length + pxMinList.length + remainList.length)) : 0;
19052
19136
  if (fit) {
19053
19137
  if (remainWidth > 0) {
19054
19138
  scaleMinList.concat(pxMinList).forEach(function (column) {
@@ -19059,8 +19143,8 @@ var Methods = {
19059
19143
  } else {
19060
19144
  meanWidth = minCellWidth;
19061
19145
  }
19062
- // 自适应
19063
- autoList.forEach(function (column) {
19146
+ // 剩余均分
19147
+ remainList.forEach(function (column) {
19064
19148
  var width = Math.max(meanWidth, minCellWidth);
19065
19149
  column.renderWidth = width;
19066
19150
  tableWidth += width;
@@ -19070,7 +19154,7 @@ var Methods = {
19070
19154
  * 偏移量算法
19071
19155
  * 如果所有列足够放的情况下,从最后动态列开始分配
19072
19156
  */
19073
- var dynamicList = scaleList.concat(scaleMinList).concat(pxMinList).concat(autoList);
19157
+ var dynamicList = scaleList.concat(scaleMinList).concat(pxMinList).concat(remainList);
19074
19158
  var dynamicSize = dynamicList.length - 1;
19075
19159
  if (dynamicSize > 0) {
19076
19160
  var odiffer = bodyWidth - tableWidth;
@@ -19100,19 +19184,23 @@ var Methods = {
19100
19184
  } else {
19101
19185
  this.headerHeight = 0;
19102
19186
  }
19187
+ var overflowX = false;
19188
+ var footerHeight = 0;
19189
+ var scrollbarHeight = 0;
19103
19190
  if (footerElem) {
19104
- var footerHeight = footerElem.offsetHeight;
19105
- this.scrollbarHeight = Math.max(footerHeight - footerElem.clientHeight, 0);
19106
- this.overflowX = tableWidth > footerElem.clientWidth;
19107
- this.footerHeight = footerHeight;
19191
+ footerHeight = footerElem.offsetHeight;
19192
+ overflowX = tableWidth > footerElem.clientWidth;
19193
+ scrollbarHeight = Math.max(footerHeight - footerElem.clientHeight, 0);
19108
19194
  } else {
19109
- this.footerHeight = 0;
19110
- this.scrollbarHeight = Math.max(tableHeight - bodyElem.clientHeight, 0);
19111
- this.overflowX = tableWidth > bodyWidth;
19195
+ overflowX = tableWidth > bodyWidth;
19196
+ scrollbarHeight = Math.max(tableHeight - bodyElem.clientHeight, 0);
19112
19197
  }
19198
+ this.footerHeight = footerHeight;
19199
+ this.overflowX = tableWidth > bodyWidth;
19200
+ this.scrollbarHeight = scrollbarHeight;
19113
19201
  this.updateHeight();
19114
19202
  this.parentHeight = Math.max(this.headerHeight + this.footerHeight + 20, this.getParentHeight());
19115
- if (this.overflowX) {
19203
+ if (overflowX) {
19116
19204
  this.checkScrolling();
19117
19205
  }
19118
19206
  },
@@ -19122,7 +19210,7 @@ var Methods = {
19122
19210
  this.customMaxHeight = calcHeight(this, 'maxHeight');
19123
19211
  },
19124
19212
  updateStyle: function updateStyle() {
19125
- var _this26 = this;
19213
+ var _this27 = this;
19126
19214
  var $refs = this.$refs,
19127
19215
  isGroup = this.isGroup,
19128
19216
  fullColumnIdData = this.fullColumnIdData,
@@ -19211,7 +19299,7 @@ var Methods = {
19211
19299
  var listElem = elemStore["".concat(name, "-").concat(layout, "-list")];
19212
19300
  if (isGroup && listElem) {
19213
19301
  external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayEach(listElem.querySelectorAll('.col--group'), function (thElem) {
19214
- var colNode = _this26.getColumnNode(thElem);
19302
+ var colNode = _this27.getColumnNode(thElem);
19215
19303
  if (colNode) {
19216
19304
  var column = colNode.item;
19217
19305
  var showHeaderOverflow = column.showHeaderOverflow;
@@ -19282,7 +19370,7 @@ var Methods = {
19282
19370
  // 如果是使用优化模式
19283
19371
  if (fixedType) {
19284
19372
  // 如果存在展开行使用全量渲染
19285
- if (!_this26.expandColumn && (scrollXLoad || scrollYLoad || (allColumnOverflow ? isAllOverflow : allColumnOverflow))) {
19373
+ if (!_this27.expandColumn && (scrollXLoad || scrollYLoad || (allColumnOverflow ? isAllOverflow : allColumnOverflow))) {
19286
19374
  if (!mergeList.length && !spanMethod && !(keyboardConfig && keyboardOpts.isMerge)) {
19287
19375
  _renderColumnList = fixedColumn;
19288
19376
  } else {
@@ -19310,7 +19398,7 @@ var Methods = {
19310
19398
  // 如果是使用优化模式
19311
19399
  if (fixedType) {
19312
19400
  // 如果存在展开行使用全量渲染
19313
- if (!_this26.expandColumn && (scrollXLoad || allColumnFooterOverflow)) {
19401
+ if (!_this27.expandColumn && (scrollXLoad || allColumnFooterOverflow)) {
19314
19402
  if (!mergeFooterList.length || !footerSpanMethod) {
19315
19403
  _renderColumnList2 = fixedColumn;
19316
19404
  } else {
@@ -19377,9 +19465,9 @@ var Methods = {
19377
19465
  var colWidth = column.renderWidth;
19378
19466
  if (cellElem) {
19379
19467
  if (colspan > 1) {
19380
- var columnIndex = _this26.getColumnIndex(column);
19468
+ var columnIndex = _this27.getColumnIndex(column);
19381
19469
  for (var _index = 1; _index < colspan; _index++) {
19382
- var nextColumn = _this26.getColumns(columnIndex + _index);
19470
+ var nextColumn = _this27.getColumns(columnIndex + _index);
19383
19471
  if (nextColumn) {
19384
19472
  colWidth += nextColumn.renderWidth;
19385
19473
  }
@@ -19421,7 +19509,7 @@ var Methods = {
19421
19509
  }
19422
19510
  },
19423
19511
  preventEvent: function preventEvent(evnt, type, args, next, end) {
19424
- var _this27 = this;
19512
+ var _this28 = this;
19425
19513
  var evntList = v_x_e_table.interceptor.get(type);
19426
19514
 
19427
19515
  // 兼容老版本
@@ -19434,8 +19522,8 @@ var Methods = {
19434
19522
  var rest;
19435
19523
  if (!evntList.some(function (func) {
19436
19524
  return func(Object.assign({
19437
- $grid: _this27.$xegrid,
19438
- $table: _this27,
19525
+ $grid: _this28.$xegrid,
19526
+ $table: _this28,
19439
19527
  $event: evnt
19440
19528
  }, args)) === false;
19441
19529
  })) {
@@ -19452,7 +19540,7 @@ var Methods = {
19452
19540
  * 全局按下事件处理
19453
19541
  */
19454
19542
  handleGlobalMousedownEvent: function handleGlobalMousedownEvent(evnt) {
19455
- var _this28 = this;
19543
+ var _this29 = this;
19456
19544
  var $el = this.$el,
19457
19545
  $refs = this.$refs,
19458
19546
  $xegrid = this.$xegrid,
@@ -19493,7 +19581,7 @@ var Methods = {
19493
19581
  } else {
19494
19582
  if (!getEventTargetNode(evnt, document.body, 'vxe-table--ignore-clear').flag) {
19495
19583
  this.preventEvent(evnt, 'event.clearCustom', {}, function () {
19496
- return _this28.closeCustom();
19584
+ return _this29.closeCustom();
19497
19585
  });
19498
19586
  }
19499
19587
  }
@@ -19529,7 +19617,7 @@ var Methods = {
19529
19617
  isClear = getEventTargetNode(evnt, $el, 'vxe-footer--row').flag;
19530
19618
  }
19531
19619
  // 如果固定了高度且点击了行之外的空白处,则清除激活状态
19532
- if (!isClear && _this28.height && !_this28.overflowY) {
19620
+ if (!isClear && _this29.height && !_this29.overflowY) {
19533
19621
  var bodyWrapperElem = evnt.target;
19534
19622
  if (methods_hasClass(bodyWrapperElem, 'vxe-table--body-wrapper')) {
19535
19623
  isClear = evnt.offsetY < bodyWrapperElem.clientHeight;
@@ -19539,7 +19627,7 @@ var Methods = {
19539
19627
  // 如果点击了当前表格之外
19540
19628
  !getEventTargetNode(evnt, $el).flag) {
19541
19629
  setTimeout(function () {
19542
- return _this28.clearEdit(evnt);
19630
+ return _this29.clearEdit(evnt);
19543
19631
  });
19544
19632
  }
19545
19633
  });
@@ -19556,9 +19644,9 @@ var Methods = {
19556
19644
  var cellAreas = this.getCellAreas();
19557
19645
  if (cellAreas.length && !getEventTargetNode(evnt, document.body, 'vxe-table--ignore-areas-clear').flag) {
19558
19646
  this.preventEvent(evnt, 'event.clearAreas', {}, function () {
19559
- _this28.clearCellAreas();
19560
- _this28.clearCopyCellArea();
19561
- _this28.emitEvent('clear-cell-area-selection', {
19647
+ _this29.clearCellAreas();
19648
+ _this29.clearCopyCellArea();
19649
+ _this29.emitEvent('clear-cell-area-selection', {
19562
19650
  cellAreas: cellAreas
19563
19651
  }, evnt);
19564
19652
  });
@@ -19596,7 +19684,7 @@ var Methods = {
19596
19684
  * 表格键盘事件
19597
19685
  */
19598
19686
  keydownEvent: function keydownEvent(evnt) {
19599
- var _this29 = this;
19687
+ var _this30 = this;
19600
19688
  var filterStore = this.filterStore,
19601
19689
  ctxMenuStore = this.ctxMenuStore,
19602
19690
  editStore = this.editStore,
@@ -19609,30 +19697,30 @@ var Methods = {
19609
19697
  var isEsc = keyCode === 27;
19610
19698
  if (isEsc) {
19611
19699
  this.preventEvent(evnt, 'event.keydown', null, function () {
19612
- _this29.emitEvent('keydown-start', {}, evnt);
19613
- if (keyboardConfig && mouseConfig && mouseOpts.area && _this29.handleKeyboardEvent) {
19614
- _this29.handleKeyboardEvent(evnt);
19700
+ _this30.emitEvent('keydown-start', {}, evnt);
19701
+ if (keyboardConfig && mouseConfig && mouseOpts.area && _this30.handleKeyboardEvent) {
19702
+ _this30.handleKeyboardEvent(evnt);
19615
19703
  } else if (actived.row || filterStore.visible || ctxMenuStore.visible) {
19616
19704
  evnt.stopPropagation();
19617
19705
  // 如果按下了 Esc 键,关闭快捷菜单、筛选
19618
- _this29.closeFilter();
19619
- _this29.closeMenu();
19706
+ _this30.closeFilter();
19707
+ _this30.closeMenu();
19620
19708
  if (keyboardConfig && keyboardOpts.isEsc) {
19621
19709
  // 如果是激活编辑状态,则取消编辑
19622
19710
  if (actived.row) {
19623
19711
  var params = actived.args;
19624
- _this29.clearEdit(evnt);
19712
+ _this30.clearEdit(evnt);
19625
19713
  // 如果配置了选中功能,则为选中状态
19626
19714
  if (mouseConfig && mouseOpts.selected) {
19627
- _this29.$nextTick(function () {
19628
- return _this29.handleSelected(params, evnt);
19715
+ _this30.$nextTick(function () {
19716
+ return _this30.handleSelected(params, evnt);
19629
19717
  });
19630
19718
  }
19631
19719
  }
19632
19720
  }
19633
19721
  }
19634
- _this29.emitEvent('keydown', {}, evnt);
19635
- _this29.emitEvent('keydown-end', {}, evnt);
19722
+ _this30.emitEvent('keydown', {}, evnt);
19723
+ _this30.emitEvent('keydown-end', {}, evnt);
19636
19724
  });
19637
19725
  }
19638
19726
  },
@@ -19640,26 +19728,26 @@ var Methods = {
19640
19728
  * 全局键盘事件
19641
19729
  */
19642
19730
  handleGlobalKeydownEvent: function handleGlobalKeydownEvent(evnt) {
19643
- var _this30 = this;
19731
+ var _this31 = this;
19644
19732
  // 该行为只对当前激活的表格有效
19645
19733
  if (this.isActivated) {
19646
19734
  this.preventEvent(evnt, 'event.keydown', null, function () {
19647
- var filterStore = _this30.filterStore,
19648
- isCtxMenu = _this30.isCtxMenu,
19649
- ctxMenuStore = _this30.ctxMenuStore,
19650
- editStore = _this30.editStore,
19651
- editOpts = _this30.editOpts,
19652
- editConfig = _this30.editConfig,
19653
- mouseConfig = _this30.mouseConfig,
19654
- mouseOpts = _this30.mouseOpts,
19655
- keyboardConfig = _this30.keyboardConfig,
19656
- keyboardOpts = _this30.keyboardOpts,
19657
- treeConfig = _this30.treeConfig,
19658
- treeOpts = _this30.treeOpts,
19659
- highlightCurrentRow = _this30.highlightCurrentRow,
19660
- currentRow = _this30.currentRow,
19661
- bodyCtxMenu = _this30.bodyCtxMenu,
19662
- rowOpts = _this30.rowOpts;
19735
+ var filterStore = _this31.filterStore,
19736
+ isCtxMenu = _this31.isCtxMenu,
19737
+ ctxMenuStore = _this31.ctxMenuStore,
19738
+ editStore = _this31.editStore,
19739
+ editOpts = _this31.editOpts,
19740
+ editConfig = _this31.editConfig,
19741
+ mouseConfig = _this31.mouseConfig,
19742
+ mouseOpts = _this31.mouseOpts,
19743
+ keyboardConfig = _this31.keyboardConfig,
19744
+ keyboardOpts = _this31.keyboardOpts,
19745
+ treeConfig = _this31.treeConfig,
19746
+ treeOpts = _this31.treeOpts,
19747
+ highlightCurrentRow = _this31.highlightCurrentRow,
19748
+ currentRow = _this31.currentRow,
19749
+ bodyCtxMenu = _this31.bodyCtxMenu,
19750
+ rowOpts = _this31.rowOpts;
19663
19751
  var selected = editStore.selected,
19664
19752
  actived = editStore.actived;
19665
19753
  var keyCode = evnt.keyCode;
@@ -19686,7 +19774,7 @@ var Methods = {
19686
19774
  var params;
19687
19775
  if (filterStore.visible) {
19688
19776
  if (isEsc) {
19689
- _this30.closeFilter();
19777
+ _this31.closeFilter();
19690
19778
  }
19691
19779
  return;
19692
19780
  }
@@ -19694,19 +19782,19 @@ var Methods = {
19694
19782
  // 如果配置了右键菜单; 支持方向键操作、回车
19695
19783
  evnt.preventDefault();
19696
19784
  if (ctxMenuStore.showChild && hasChildrenList(ctxMenuStore.selected)) {
19697
- _this30.moveCtxMenu(evnt, keyCode, ctxMenuStore, 'selectChild', 37, false, ctxMenuStore.selected.children);
19785
+ _this31.moveCtxMenu(evnt, keyCode, ctxMenuStore, 'selectChild', 37, false, ctxMenuStore.selected.children);
19698
19786
  } else {
19699
- _this30.moveCtxMenu(evnt, keyCode, ctxMenuStore, 'selected', 39, true, _this30.ctxMenuList);
19787
+ _this31.moveCtxMenu(evnt, keyCode, ctxMenuStore, 'selected', 39, true, _this31.ctxMenuList);
19700
19788
  }
19701
- } else if (keyboardConfig && mouseConfig && mouseOpts.area && _this30.handleKeyboardEvent) {
19702
- _this30.handleKeyboardEvent(evnt);
19789
+ } else if (keyboardConfig && mouseConfig && mouseOpts.area && _this31.handleKeyboardEvent) {
19790
+ _this31.handleKeyboardEvent(evnt);
19703
19791
  } else if (keyboardConfig && isSpacebar && keyboardOpts.isChecked && selected.row && selected.column && (selected.column.type === 'checkbox' || selected.column.type === 'radio')) {
19704
19792
  // 空格键支持选中复选框
19705
19793
  evnt.preventDefault();
19706
19794
  if (selected.column.type === 'checkbox') {
19707
- _this30.handleToggleCheckRowEvent(evnt, selected.args);
19795
+ _this31.handleToggleCheckRowEvent(evnt, selected.args);
19708
19796
  } else {
19709
- _this30.triggerRadioRowEvent(evnt, selected.args);
19797
+ _this31.triggerRadioRowEvent(evnt, selected.args);
19710
19798
  }
19711
19799
  } else if (isF2 && isEnableConf(editConfig)) {
19712
19800
  if (!isEditStatus) {
@@ -19714,15 +19802,15 @@ var Methods = {
19714
19802
  if (selected.row && selected.column) {
19715
19803
  evnt.stopPropagation();
19716
19804
  evnt.preventDefault();
19717
- _this30.handleActived(selected.args, evnt);
19805
+ _this31.handleActived(selected.args, evnt);
19718
19806
  }
19719
19807
  }
19720
19808
  } else if (isContextMenu) {
19721
19809
  // 如果按下上下文键
19722
- _this30._keyCtx = selected.row && selected.column && bodyCtxMenu.length;
19723
- clearTimeout(_this30.keyCtxTimeout);
19724
- _this30.keyCtxTimeout = setTimeout(function () {
19725
- _this30._keyCtx = false;
19810
+ _this31._keyCtx = selected.row && selected.column && bodyCtxMenu.length;
19811
+ clearTimeout(_this31.keyCtxTimeout);
19812
+ _this31.keyCtxTimeout = setTimeout(function () {
19813
+ _this31._keyCtx = false;
19726
19814
  }, 1000);
19727
19815
  } else if (isEnter && !hasAltKey && keyboardConfig && keyboardOpts.isEnter && (selected.row || actived.row || treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow)) {
19728
19816
  // 退出选中
@@ -19730,11 +19818,11 @@ var Methods = {
19730
19818
  // 如果是激活编辑状态,则取消编辑
19731
19819
  if (actived.row) {
19732
19820
  params = actived.args;
19733
- _this30.clearEdit(evnt);
19821
+ _this31.clearEdit(evnt);
19734
19822
  // 如果配置了选中功能,则为选中状态
19735
19823
  if (mouseConfig && mouseOpts.selected) {
19736
- _this30.$nextTick(function () {
19737
- return _this30.handleSelected(params, evnt);
19824
+ _this31.$nextTick(function () {
19825
+ return _this31.handleSelected(params, evnt);
19738
19826
  });
19739
19827
  }
19740
19828
  }
@@ -19744,15 +19832,15 @@ var Methods = {
19744
19832
  var targetArgs = selected.row ? selected.args : actived.args;
19745
19833
  if (hasShiftKey) {
19746
19834
  if (keyboardOpts.enterToTab) {
19747
- _this30.moveTabSelected(targetArgs, hasShiftKey, evnt);
19835
+ _this31.moveTabSelected(targetArgs, hasShiftKey, evnt);
19748
19836
  } else {
19749
- _this30.moveSelected(targetArgs, isLeftArrow, true, isRightArrow, false, evnt);
19837
+ _this31.moveSelected(targetArgs, isLeftArrow, true, isRightArrow, false, evnt);
19750
19838
  }
19751
19839
  } else {
19752
19840
  if (keyboardOpts.enterToTab) {
19753
- _this30.moveTabSelected(targetArgs, hasShiftKey, evnt);
19841
+ _this31.moveTabSelected(targetArgs, hasShiftKey, evnt);
19754
19842
  } else {
19755
- _this30.moveSelected(targetArgs, isLeftArrow, false, isRightArrow, true, evnt);
19843
+ _this31.moveSelected(targetArgs, isLeftArrow, false, isRightArrow, true, evnt);
19756
19844
  }
19757
19845
  }
19758
19846
  } else if (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
@@ -19762,13 +19850,13 @@ var Methods = {
19762
19850
  evnt.preventDefault();
19763
19851
  var targetRow = childrens[0];
19764
19852
  params = {
19765
- $table: _this30,
19853
+ $table: _this31,
19766
19854
  row: targetRow
19767
19855
  };
19768
- _this30.setTreeExpand(currentRow, true).then(function () {
19769
- return _this30.scrollToRow(targetRow);
19856
+ _this31.setTreeExpand(currentRow, true).then(function () {
19857
+ return _this31.scrollToRow(targetRow);
19770
19858
  }).then(function () {
19771
- return _this30.triggerCurrentRowEvent(evnt, params);
19859
+ return _this31.triggerCurrentRowEvent(evnt, params);
19772
19860
  });
19773
19861
  }
19774
19862
  }
@@ -19777,18 +19865,18 @@ var Methods = {
19777
19865
  if (!isEditStatus) {
19778
19866
  // 如果按下了方向键
19779
19867
  if (selected.row && selected.column) {
19780
- _this30.moveSelected(selected.args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt);
19868
+ _this31.moveSelected(selected.args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt);
19781
19869
  } else if ((isUpArrow || isDwArrow) && (rowOpts.isCurrent || highlightCurrentRow)) {
19782
19870
  // 当前行按键上下移动
19783
- _this30.moveCurrentRow(isUpArrow, isDwArrow, evnt);
19871
+ _this31.moveCurrentRow(isUpArrow, isDwArrow, evnt);
19784
19872
  }
19785
19873
  }
19786
19874
  } else if (isTab && keyboardConfig && keyboardOpts.isTab) {
19787
19875
  // 如果按下了 Tab 键切换
19788
19876
  if (selected.row || selected.column) {
19789
- _this30.moveTabSelected(selected.args, hasShiftKey, evnt);
19877
+ _this31.moveTabSelected(selected.args, hasShiftKey, evnt);
19790
19878
  } else if (actived.row || actived.column) {
19791
- _this30.moveTabSelected(actived.args, hasShiftKey, evnt);
19879
+ _this31.moveTabSelected(actived.args, hasShiftKey, evnt);
19792
19880
  }
19793
19881
  } else if (keyboardConfig && (treeConfig || isEnableConf(editConfig)) && (isDel || (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow ? hasBackspaceKey && keyboardOpts.isArrow : hasBackspaceKey))) {
19794
19882
  if (!isEditStatus) {
@@ -19798,10 +19886,10 @@ var Methods = {
19798
19886
  if (keyboardOpts.isDel && isEnableConf(editConfig) && (selected.row || selected.column)) {
19799
19887
  var delPaqrams = {
19800
19888
  row: selected.row,
19801
- rowIndex: _this30.getRowIndex(selected.row),
19889
+ rowIndex: _this31.getRowIndex(selected.row),
19802
19890
  column: selected.column,
19803
- columnIndex: _this30.getColumnIndex(selected.column),
19804
- $table: _this30
19891
+ columnIndex: _this31.getColumnIndex(selected.column),
19892
+ $table: _this31
19805
19893
  };
19806
19894
  if (delMethod) {
19807
19895
  delMethod(delPaqrams);
@@ -19812,22 +19900,22 @@ var Methods = {
19812
19900
  if (backMethod) {
19813
19901
  backMethod({
19814
19902
  row: selected.row,
19815
- rowIndex: _this30.getRowIndex(selected.row),
19903
+ rowIndex: _this31.getRowIndex(selected.row),
19816
19904
  column: selected.column,
19817
- columnIndex: _this30.getColumnIndex(selected.column),
19818
- $table: _this30
19905
+ columnIndex: _this31.getColumnIndex(selected.column),
19906
+ $table: _this31
19819
19907
  });
19820
19908
  } else {
19821
- _this30.handleActived(selected.args, evnt);
19909
+ _this31.handleActived(selected.args, evnt);
19822
19910
  }
19823
19911
  } else if (isDel) {
19824
19912
  // 如果按下 del 键,更新表尾数据
19825
- _this30.updateFooter();
19913
+ _this31.updateFooter();
19826
19914
  }
19827
- _this30.emitEvent('cell-delete-value', delPaqrams, evnt);
19915
+ _this31.emitEvent('cell-delete-value', delPaqrams, evnt);
19828
19916
  } else if (hasBackspaceKey && keyboardOpts.isArrow && treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
19829
19917
  // 如果树形表格回退键关闭当前行返回父节点
19830
- var _XEUtils$findTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(_this30.afterFullData, function (item) {
19918
+ var _XEUtils$findTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(_this31.afterFullData, function (item) {
19831
19919
  return item === currentRow;
19832
19920
  }, {
19833
19921
  children: childrenField
@@ -19836,13 +19924,13 @@ var Methods = {
19836
19924
  if (parentRow) {
19837
19925
  evnt.preventDefault();
19838
19926
  params = {
19839
- $table: _this30,
19927
+ $table: _this31,
19840
19928
  row: parentRow
19841
19929
  };
19842
- _this30.setTreeExpand(parentRow, false).then(function () {
19843
- return _this30.scrollToRow(parentRow);
19930
+ _this31.setTreeExpand(parentRow, false).then(function () {
19931
+ return _this31.scrollToRow(parentRow);
19844
19932
  }).then(function () {
19845
- return _this30.triggerCurrentRowEvent(evnt, params);
19933
+ return _this31.triggerCurrentRowEvent(evnt, params);
19846
19934
  });
19847
19935
  }
19848
19936
  }
@@ -19857,39 +19945,39 @@ var Methods = {
19857
19945
  if (selected.column && selected.row && isEnableConf(selected.column.editRender)) {
19858
19946
  var beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod;
19859
19947
  if (!beforeEditMethod || beforeEditMethod(_objectSpread2(_objectSpread2({}, selected.args), {}, {
19860
- $table: _this30,
19861
- $grid: _this30.$xegrid
19948
+ $table: _this31,
19949
+ $grid: _this31.$xegrid
19862
19950
  }))) {
19863
19951
  if (editMethod) {
19864
19952
  editMethod({
19865
19953
  row: selected.row,
19866
- rowIndex: _this30.getRowIndex(selected.row),
19954
+ rowIndex: _this31.getRowIndex(selected.row),
19867
19955
  column: selected.column,
19868
- columnIndex: _this30.getColumnIndex(selected.column),
19869
- $table: _this30,
19870
- $grid: _this30.$xegrid
19956
+ columnIndex: _this31.getColumnIndex(selected.column),
19957
+ $table: _this31,
19958
+ $grid: _this31.$xegrid
19871
19959
  });
19872
19960
  } else {
19873
19961
  setCellValue(selected.row, selected.column, null);
19874
- _this30.handleActived(selected.args, evnt);
19962
+ _this31.handleActived(selected.args, evnt);
19875
19963
  }
19876
19964
  var afterEditMethod = editOpts.afterEditMethod;
19877
19965
  if (afterEditMethod) {
19878
- _this30.$nextTick(function () {
19966
+ _this31.$nextTick(function () {
19879
19967
  afterEditMethod({
19880
19968
  row: selected.row,
19881
- rowIndex: _this30.getRowIndex(selected.row),
19969
+ rowIndex: _this31.getRowIndex(selected.row),
19882
19970
  column: selected.column,
19883
- columnIndex: _this30.getColumnIndex(selected.column),
19884
- $table: _this30,
19885
- $grid: _this30.$xegrid
19971
+ columnIndex: _this31.getColumnIndex(selected.column),
19972
+ $table: _this31,
19973
+ $grid: _this31.$xegrid
19886
19974
  });
19887
19975
  });
19888
19976
  }
19889
19977
  }
19890
19978
  }
19891
19979
  }
19892
- _this30.emitEvent('keydown', {}, evnt);
19980
+ _this31.emitEvent('keydown', {}, evnt);
19893
19981
  });
19894
19982
  }
19895
19983
  },
@@ -19964,7 +20052,7 @@ var Methods = {
19964
20052
  }
19965
20053
  },
19966
20054
  handleTargetLeaveEvent: function handleTargetLeaveEvent() {
19967
- var _this31 = this;
20055
+ var _this32 = this;
19968
20056
  var tooltipOpts = this.tooltipOpts;
19969
20057
  var $tooltip = this.$refs.tooltip;
19970
20058
  if ($tooltip) {
@@ -19972,9 +20060,9 @@ var Methods = {
19972
20060
  }
19973
20061
  if (tooltipOpts.enterable) {
19974
20062
  this.tooltipTimeout = setTimeout(function () {
19975
- $tooltip = _this31.$refs.tooltip;
20063
+ $tooltip = _this32.$refs.tooltip;
19976
20064
  if ($tooltip && !$tooltip.isActived()) {
19977
- _this31.closeTooltip();
20065
+ _this32.closeTooltip();
19978
20066
  }
19979
20067
  }, tooltipOpts.leaveDelay);
19980
20068
  } else {
@@ -20194,12 +20282,12 @@ var Methods = {
20194
20282
  }
20195
20283
  },
20196
20284
  handleCheckedCheckboxRow: function handleCheckedCheckboxRow(rows, value, isForce) {
20197
- var _this32 = this;
20285
+ var _this33 = this;
20198
20286
  if (rows && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rows)) {
20199
20287
  rows = [rows];
20200
20288
  }
20201
20289
  rows.forEach(function (row) {
20202
- return _this32.handleSelectRow({
20290
+ return _this33.handleSelectRow({
20203
20291
  row: row
20204
20292
  }, !!value, isForce);
20205
20293
  });
@@ -20230,7 +20318,7 @@ var Methods = {
20230
20318
  * value 选中true 不选false 半选-1
20231
20319
  */
20232
20320
  handleSelectRow: function handleSelectRow(_ref5, value, isForce) {
20233
- var _this33 = this;
20321
+ var _this34 = this;
20234
20322
  var row = _ref5.row;
20235
20323
  var selectCheckboxMaps = this.selectCheckboxMaps,
20236
20324
  afterFullData = this.afterFullData,
@@ -20258,15 +20346,15 @@ var Methods = {
20258
20346
  } else {
20259
20347
  // 更新子节点状态
20260
20348
  external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([row], function (item) {
20261
- if (_this33.eqRow(item, row) || isForce || !checkMethod || checkMethod({
20349
+ if (_this34.eqRow(item, row) || isForce || !checkMethod || checkMethod({
20262
20350
  row: item
20263
20351
  })) {
20264
20352
  external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(item, checkField, value);
20265
20353
  if (indeterminateField) {
20266
20354
  external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, indeterminateField, false);
20267
20355
  }
20268
- delete treeIndeterminateMaps[getRowid(_this33, item)];
20269
- _this33.handleCheckboxReserveRow(row, value);
20356
+ delete treeIndeterminateMaps[getRowid(_this34, item)];
20357
+ _this34.handleCheckboxReserveRow(row, value);
20270
20358
  }
20271
20359
  }, {
20272
20360
  children: childrenField
@@ -20274,7 +20362,7 @@ var Methods = {
20274
20362
  }
20275
20363
  // 如果存在父节点,更新父节点状态
20276
20364
  var matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(afterFullData, function (item) {
20277
- return _this33.eqRow(item, row);
20365
+ return _this34.eqRow(item, row);
20278
20366
  }, {
20279
20367
  children: childrenField
20280
20368
  });
@@ -20287,20 +20375,20 @@ var Methods = {
20287
20375
  if (checkMethod({
20288
20376
  row: item
20289
20377
  })) {
20290
- var itemRid = getRowid(_this33, item);
20378
+ var itemRid = getRowid(_this34, item);
20291
20379
  vItemMaps[itemRid] = item;
20292
20380
  vItems.push(item);
20293
20381
  }
20294
20382
  });
20295
20383
  } else {
20296
20384
  matchObj.items.forEach(function (item) {
20297
- var itemRid = getRowid(_this33, item);
20385
+ var itemRid = getRowid(_this34, item);
20298
20386
  vItemMaps[itemRid] = item;
20299
20387
  vItems.push(item);
20300
20388
  });
20301
20389
  }
20302
20390
  var indeterminatesItem = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().find(matchObj.items, function (item) {
20303
- return !!treeIndeterminateMaps[getRowid(_this33, item)];
20391
+ return !!treeIndeterminateMaps[getRowid(_this34, item)];
20304
20392
  });
20305
20393
  if (indeterminatesItem) {
20306
20394
  parentStatus = -1;
@@ -20312,7 +20400,7 @@ var Methods = {
20312
20400
  }
20313
20401
  });
20314
20402
  parentStatus = selectItems.filter(function (item) {
20315
- return vItemMaps[getRowid(_this33, item)];
20403
+ return vItemMaps[getRowid(_this34, item)];
20316
20404
  }).length === vItems.length ? true : selectItems.length || value === -1 ? -1 : false;
20317
20405
  }
20318
20406
  this.selectCheckboxMaps = selectRowMaps;
@@ -20343,8 +20431,8 @@ var Methods = {
20343
20431
  } else {
20344
20432
  // 更新子节点状态
20345
20433
  external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([row], function (item) {
20346
- var itemRid = getRowid(_this33, item);
20347
- if (_this33.eqRow(item, row) || isForce || !checkMethod || checkMethod({
20434
+ var itemRid = getRowid(_this34, item);
20435
+ if (_this34.eqRow(item, row) || isForce || !checkMethod || checkMethod({
20348
20436
  row: item
20349
20437
  })) {
20350
20438
  if (value) {
@@ -20357,8 +20445,8 @@ var Methods = {
20357
20445
  if (indeterminateField) {
20358
20446
  external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, indeterminateField, false);
20359
20447
  }
20360
- delete treeIndeterminateMaps[getRowid(_this33, item)];
20361
- _this33.handleCheckboxReserveRow(row, value);
20448
+ delete treeIndeterminateMaps[getRowid(_this34, item)];
20449
+ _this34.handleCheckboxReserveRow(row, value);
20362
20450
  }
20363
20451
  }, {
20364
20452
  children: childrenField
@@ -20366,7 +20454,7 @@ var Methods = {
20366
20454
  }
20367
20455
  // 如果存在父节点,更新父节点状态
20368
20456
  var _matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(afterFullData, function (item) {
20369
- return _this33.eqRow(item, row);
20457
+ return _this34.eqRow(item, row);
20370
20458
  }, {
20371
20459
  children: childrenField
20372
20460
  });
@@ -20379,33 +20467,33 @@ var Methods = {
20379
20467
  if (checkMethod({
20380
20468
  row: item
20381
20469
  })) {
20382
- var itemRid = getRowid(_this33, item);
20470
+ var itemRid = getRowid(_this34, item);
20383
20471
  _vItemMaps[itemRid] = item;
20384
20472
  _vItems.push(item);
20385
20473
  }
20386
20474
  });
20387
20475
  } else {
20388
20476
  _matchObj.items.forEach(function (item) {
20389
- var itemRid = getRowid(_this33, item);
20477
+ var itemRid = getRowid(_this34, item);
20390
20478
  _vItemMaps[itemRid] = item;
20391
20479
  _vItems.push(item);
20392
20480
  });
20393
20481
  }
20394
20482
  var _indeterminatesItem = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().find(_matchObj.items, function (item) {
20395
- return !!treeIndeterminateMaps[getRowid(_this33, item)];
20483
+ return !!treeIndeterminateMaps[getRowid(_this34, item)];
20396
20484
  });
20397
20485
  if (_indeterminatesItem) {
20398
20486
  _parentStatus = -1;
20399
20487
  } else {
20400
20488
  var _selectItems = [];
20401
20489
  _matchObj.items.forEach(function (item) {
20402
- var itemRid = getRowid(_this33, item);
20490
+ var itemRid = getRowid(_this34, item);
20403
20491
  if (selectRowMaps[itemRid]) {
20404
20492
  _selectItems.push(item);
20405
20493
  }
20406
20494
  });
20407
20495
  _parentStatus = _selectItems.filter(function (item) {
20408
- return _vItemMaps[getRowid(_this33, item)];
20496
+ return _vItemMaps[getRowid(_this34, item)];
20409
20497
  }).length === _vItems.length ? true : _selectItems.length || value === -1 ? -1 : false;
20410
20498
  }
20411
20499
  this.selectCheckboxMaps = selectRowMaps;
@@ -20507,7 +20595,7 @@ var Methods = {
20507
20595
  return this.$nextTick();
20508
20596
  },
20509
20597
  handleCheckedAllCheckboxRow: function handleCheckedAllCheckboxRow(value, isForce) {
20510
- var _this34 = this;
20598
+ var _this35 = this;
20511
20599
  var afterFullData = this.afterFullData,
20512
20600
  treeConfig = this.treeConfig,
20513
20601
  treeOpts = this.treeOpts,
@@ -20546,7 +20634,7 @@ var Methods = {
20546
20634
  row: row
20547
20635
  })) {
20548
20636
  if (value) {
20549
- selectRowMaps[getRowid(_this34, row)] = row;
20637
+ selectRowMaps[getRowid(_this35, row)] = row;
20550
20638
  }
20551
20639
  external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, checkField, value);
20552
20640
  }
@@ -20578,7 +20666,7 @@ var Methods = {
20578
20666
  if (isForce || !checkMethod || checkMethod({
20579
20667
  row: row
20580
20668
  })) {
20581
- selectRowMaps[getRowid(_this34, row)] = row;
20669
+ selectRowMaps[getRowid(_this35, row)] = row;
20582
20670
  }
20583
20671
  }, {
20584
20672
  children: childrenField
@@ -20590,7 +20678,7 @@ var Methods = {
20590
20678
  */
20591
20679
  if (!isForce && checkMethod) {
20592
20680
  external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(afterFullData, function (row) {
20593
- var rowid = getRowid(_this34, row);
20681
+ var rowid = getRowid(_this35, row);
20594
20682
  if (checkMethod({
20595
20683
  row: row
20596
20684
  }) ? 0 : selectCheckboxMaps[rowid]) {
@@ -20610,7 +20698,7 @@ var Methods = {
20610
20698
  */
20611
20699
  if (!isForce && checkMethod) {
20612
20700
  afterFullData.forEach(function (row) {
20613
- var rowid = getRowid(_this34, row);
20701
+ var rowid = getRowid(_this35, row);
20614
20702
  if (selectCheckboxMaps[rowid] || checkMethod({
20615
20703
  row: row
20616
20704
  })) {
@@ -20619,7 +20707,7 @@ var Methods = {
20619
20707
  });
20620
20708
  } else {
20621
20709
  afterFullData.forEach(function (row) {
20622
- selectRowMaps[getRowid(_this34, row)] = row;
20710
+ selectRowMaps[getRowid(_this35, row)] = row;
20623
20711
  });
20624
20712
  }
20625
20713
  } else {
@@ -20630,7 +20718,7 @@ var Methods = {
20630
20718
  */
20631
20719
  if (!isForce && checkMethod) {
20632
20720
  afterFullData.forEach(function (row) {
20633
- var rowid = getRowid(_this34, row);
20721
+ var rowid = getRowid(_this35, row);
20634
20722
  if (checkMethod({
20635
20723
  row: row
20636
20724
  }) ? 0 : selectCheckboxMaps[rowid]) {
@@ -20648,7 +20736,7 @@ var Methods = {
20648
20736
  });
20649
20737
  } else {
20650
20738
  afterFullData.forEach(function (row) {
20651
- return _this34.handleCheckboxReserveRow(row, false);
20739
+ return _this35.handleCheckboxReserveRow(row, false);
20652
20740
  });
20653
20741
  }
20654
20742
  }
@@ -20667,7 +20755,7 @@ var Methods = {
20667
20755
  return this.handleCheckedAllCheckboxRow(value, true);
20668
20756
  },
20669
20757
  checkSelectionStatus: function checkSelectionStatus() {
20670
- var _this35 = this;
20758
+ var _this36 = this;
20671
20759
  var afterFullData = this.afterFullData,
20672
20760
  selectCheckboxMaps = this.selectCheckboxMaps,
20673
20761
  treeIndeterminateMaps = this.treeIndeterminateMaps,
@@ -20703,11 +20791,11 @@ var Methods = {
20703
20791
  if (treeConfig) {
20704
20792
  if (indeterminateField) {
20705
20793
  isIndeterminate = !isAllSelected && afterFullData.some(function (row) {
20706
- return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, indeterminateField) || !!treeIndeterminateMaps[getRowid(_this35, row)];
20794
+ return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, indeterminateField) || !!treeIndeterminateMaps[getRowid(_this36, row)];
20707
20795
  });
20708
20796
  } else {
20709
20797
  isIndeterminate = !isAllSelected && afterFullData.some(function (row) {
20710
- return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField) || !!treeIndeterminateMaps[getRowid(_this35, row)];
20798
+ return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField) || !!treeIndeterminateMaps[getRowid(_this36, row)];
20711
20799
  });
20712
20800
  }
20713
20801
  } else {
@@ -20729,23 +20817,23 @@ var Methods = {
20729
20817
  disableRows.push(row);
20730
20818
  return true;
20731
20819
  }
20732
- if (selectCheckboxMaps[getRowid(_this35, row)]) {
20820
+ if (selectCheckboxMaps[getRowid(_this36, row)]) {
20733
20821
  checkRows.push(row);
20734
20822
  return true;
20735
20823
  }
20736
20824
  return false;
20737
20825
  } : function (row) {
20738
- return selectCheckboxMaps[getRowid(_this35, row)];
20826
+ return selectCheckboxMaps[getRowid(_this36, row)];
20739
20827
  });
20740
20828
  isAllSelected = isAllResolve && afterFullData.length !== disableRows.length;
20741
20829
  if (treeConfig) {
20742
20830
  isIndeterminate = !isAllSelected && afterFullData.some(function (row) {
20743
- var itemRid = getRowid(_this35, row);
20831
+ var itemRid = getRowid(_this36, row);
20744
20832
  return treeIndeterminateMaps[itemRid] || selectCheckboxMaps[itemRid];
20745
20833
  });
20746
20834
  } else {
20747
20835
  isIndeterminate = !isAllSelected && afterFullData.some(function (row) {
20748
- return selectCheckboxMaps[getRowid(_this35, row)];
20836
+ return selectCheckboxMaps[getRowid(_this36, row)];
20749
20837
  });
20750
20838
  }
20751
20839
  }
@@ -20854,7 +20942,7 @@ var Methods = {
20854
20942
  * 获取复选框保留选中的行
20855
20943
  */
20856
20944
  getCheckboxReserveRecords: function getCheckboxReserveRecords(isFull) {
20857
- var _this36 = this;
20945
+ var _this37 = this;
20858
20946
  var fullDataRowIdData = this.fullDataRowIdData,
20859
20947
  afterFullData = this.afterFullData,
20860
20948
  checkboxReserveRowMap = this.checkboxReserveRowMap,
@@ -20867,13 +20955,13 @@ var Methods = {
20867
20955
  var afterFullIdMaps = {};
20868
20956
  if (treeConfig) {
20869
20957
  external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(afterFullData, function (row) {
20870
- afterFullIdMaps[getRowid(_this36, row)] = 1;
20958
+ afterFullIdMaps[getRowid(_this37, row)] = 1;
20871
20959
  }, {
20872
20960
  children: childrenField
20873
20961
  });
20874
20962
  } else {
20875
20963
  afterFullData.forEach(function (row) {
20876
- afterFullIdMaps[getRowid(_this36, row)] = 1;
20964
+ afterFullIdMaps[getRowid(_this37, row)] = 1;
20877
20965
  });
20878
20966
  }
20879
20967
  external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(checkboxReserveRowMap, function (oldRow, oldRowid) {
@@ -20945,7 +21033,7 @@ var Methods = {
20945
21033
  * 清空行为不管是否被禁用还是保留记录,都将彻底清空选中状态
20946
21034
  */
20947
21035
  clearCheckboxRow: function clearCheckboxRow() {
20948
- var _this37 = this;
21036
+ var _this38 = this;
20949
21037
  var tableFullData = this.tableFullData,
20950
21038
  treeConfig = this.treeConfig,
20951
21039
  treeOpts = this.treeOpts,
@@ -20971,7 +21059,7 @@ var Methods = {
20971
21059
  }
20972
21060
  if (reserve) {
20973
21061
  tableFullData.forEach(function (row) {
20974
- return _this37.handleCheckboxReserveRow(row, false);
21062
+ return _this38.handleCheckboxReserveRow(row, false);
20975
21063
  });
20976
21064
  }
20977
21065
  this.isAllSelected = false;
@@ -21216,12 +21304,12 @@ var Methods = {
21216
21304
  * 如果存在规则,则校验
21217
21305
  */
21218
21306
  handleChangeCell: function handleChangeCell(evnt, params) {
21219
- var _this38 = this;
21307
+ var _this39 = this;
21220
21308
  this.checkValidate('blur').catch(function (e) {
21221
21309
  return e;
21222
21310
  }).then(function () {
21223
- _this38.handleActived(params, evnt).then(function () {
21224
- return _this38.checkValidate('change');
21311
+ _this39.handleActived(params, evnt).then(function () {
21312
+ return _this39.checkValidate('change');
21225
21313
  }).catch(function (e) {
21226
21314
  return e;
21227
21315
  });
@@ -21322,7 +21410,7 @@ var Methods = {
21322
21410
  * 如果是双击模式,则激活为编辑状态
21323
21411
  */
21324
21412
  triggerCellDblclickEvent: function triggerCellDblclickEvent(evnt, params) {
21325
- var _this39 = this;
21413
+ var _this40 = this;
21326
21414
  var editStore = this.editStore,
21327
21415
  editConfig = this.editConfig,
21328
21416
  editOpts = this.editOpts;
@@ -21335,15 +21423,15 @@ var Methods = {
21335
21423
  this.checkValidate('blur').catch(function (e) {
21336
21424
  return e;
21337
21425
  }).then(function () {
21338
- _this39.handleActived(params, evnt).then(function () {
21339
- return _this39.checkValidate('change');
21426
+ _this40.handleActived(params, evnt).then(function () {
21427
+ return _this40.checkValidate('change');
21340
21428
  }).catch(function (e) {
21341
21429
  return e;
21342
21430
  });
21343
21431
  });
21344
21432
  } else if (editOpts.mode === 'cell') {
21345
21433
  this.handleActived(params, evnt).then(function () {
21346
- return _this39.checkValidate('change');
21434
+ return _this40.checkValidate('change');
21347
21435
  }).catch(function (e) {
21348
21436
  return e;
21349
21437
  });
@@ -21353,7 +21441,7 @@ var Methods = {
21353
21441
  this.emitEvent('cell-dblclick', params, evnt);
21354
21442
  },
21355
21443
  handleDefaultSort: function handleDefaultSort() {
21356
- var _this40 = this;
21444
+ var _this41 = this;
21357
21445
  var sortConfig = this.sortConfig,
21358
21446
  sortOpts = this.sortOpts;
21359
21447
  var defaultSort = sortOpts.defaultSort;
@@ -21366,7 +21454,7 @@ var Methods = {
21366
21454
  var field = item.field,
21367
21455
  order = item.order;
21368
21456
  if (field && order) {
21369
- var column = _this40.getColumnByField(field);
21457
+ var column = _this41.getColumnByField(field);
21370
21458
  if (column && column.sortable) {
21371
21459
  column.order = order;
21372
21460
  column.sortTime = Date.now() + index;
@@ -21413,7 +21501,7 @@ var Methods = {
21413
21501
  }
21414
21502
  },
21415
21503
  setPendingRow: function setPendingRow(rows, status) {
21416
- var _this41 = this;
21504
+ var _this42 = this;
21417
21505
  var pendingMaps = _objectSpread2({}, this.pendingRowMaps);
21418
21506
  var pendingList = _toConsumableArray(this.pendingRowList);
21419
21507
  if (rows && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rows)) {
@@ -21421,7 +21509,7 @@ var Methods = {
21421
21509
  }
21422
21510
  if (status) {
21423
21511
  rows.forEach(function (row) {
21424
- var rowid = getRowid(_this41, row);
21512
+ var rowid = getRowid(_this42, row);
21425
21513
  if (rowid && !pendingMaps[rowid]) {
21426
21514
  pendingList.push(row);
21427
21515
  pendingMaps[rowid] = row;
@@ -21429,9 +21517,9 @@ var Methods = {
21429
21517
  });
21430
21518
  } else {
21431
21519
  rows.forEach(function (row) {
21432
- var rowid = getRowid(_this41, row);
21520
+ var rowid = getRowid(_this42, row);
21433
21521
  if (rowid && pendingMaps[rowid]) {
21434
- var pendingIndex = _this41.findRowIndexOf(pendingList, row);
21522
+ var pendingIndex = _this42.findRowIndexOf(pendingList, row);
21435
21523
  if (pendingIndex > -1) {
21436
21524
  pendingList.splice(pendingIndex, 1);
21437
21525
  }
@@ -21444,17 +21532,17 @@ var Methods = {
21444
21532
  return this.$nextTick();
21445
21533
  },
21446
21534
  togglePendingRow: function togglePendingRow(rows) {
21447
- var _this42 = this;
21535
+ var _this43 = this;
21448
21536
  var pendingMaps = _objectSpread2({}, this.pendingRowMaps);
21449
21537
  var pendingList = _toConsumableArray(this.pendingRowList);
21450
21538
  if (rows && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rows)) {
21451
21539
  rows = [rows];
21452
21540
  }
21453
21541
  rows.forEach(function (row) {
21454
- var rowid = getRowid(_this42, row);
21542
+ var rowid = getRowid(_this43, row);
21455
21543
  if (rowid) {
21456
21544
  if (pendingMaps[rowid]) {
21457
- var pendingIndex = _this42.findRowIndexOf(pendingList, row);
21545
+ var pendingIndex = _this43.findRowIndexOf(pendingList, row);
21458
21546
  if (pendingIndex > -1) {
21459
21547
  pendingList.splice(pendingIndex, 1);
21460
21548
  }
@@ -21483,7 +21571,7 @@ var Methods = {
21483
21571
  return this.$nextTick();
21484
21572
  },
21485
21573
  sort: function sort(sortConfs, sortOrder) {
21486
- var _this43 = this;
21574
+ var _this44 = this;
21487
21575
  var sortOpts = this.sortOpts;
21488
21576
  var multiple = sortOpts.multiple,
21489
21577
  remote = sortOpts.remote,
@@ -21509,14 +21597,14 @@ var Methods = {
21509
21597
  order = confs.order;
21510
21598
  var column = field;
21511
21599
  if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(field)) {
21512
- column = _this43.getColumnByField(field);
21600
+ column = _this44.getColumnByField(field);
21513
21601
  }
21514
21602
  if (column && (column.sortable || column.remoteSort)) {
21515
21603
  if (!firstSortColumn) {
21516
21604
  firstSortColumn = column;
21517
21605
  }
21518
21606
  if (orders.indexOf(order) === -1) {
21519
- order = getNextSortOrder(_this43, column);
21607
+ order = getNextSortOrder(_this44, column);
21520
21608
  }
21521
21609
  if (column.order !== order) {
21522
21610
  column.order = order;
@@ -21529,8 +21617,8 @@ var Methods = {
21529
21617
  this.handleTableData(true);
21530
21618
  }
21531
21619
  return this.$nextTick().then(function () {
21532
- _this43.updateCellAreas();
21533
- return _this43.updateStyle();
21620
+ _this44.updateCellAreas();
21621
+ return _this44.updateStyle();
21534
21622
  });
21535
21623
  }
21536
21624
  return this.$nextTick();
@@ -21664,14 +21752,14 @@ var Methods = {
21664
21752
  * @param {Row} row 行对象
21665
21753
  */
21666
21754
  reloadRowExpand: function reloadRowExpand(row) {
21667
- var _this44 = this;
21755
+ var _this45 = this;
21668
21756
  var expandOpts = this.expandOpts,
21669
21757
  rowExpandLazyLoadedMaps = this.rowExpandLazyLoadedMaps;
21670
21758
  var lazy = expandOpts.lazy;
21671
21759
  var rowid = getRowid(this, row);
21672
21760
  if (lazy && !rowExpandLazyLoadedMaps[rowid]) {
21673
21761
  this.clearRowExpandLoaded(row).then(function () {
21674
- return _this44.handleAsyncRowExpand(row);
21762
+ return _this45.handleAsyncRowExpand(row);
21675
21763
  });
21676
21764
  }
21677
21765
  return this.$nextTick();
@@ -21761,39 +21849,39 @@ var Methods = {
21761
21849
  return this.setRowExpand(expandedRows, expanded);
21762
21850
  },
21763
21851
  handleAsyncRowExpand: function handleAsyncRowExpand(row) {
21764
- var _this45 = this;
21852
+ var _this46 = this;
21765
21853
  var fullAllDataRowMap = this.fullAllDataRowMap,
21766
21854
  expandOpts = this.expandOpts;
21767
21855
  var rest = fullAllDataRowMap.get(row);
21768
21856
  return new Promise(function (resolve) {
21769
21857
  var loadMethod = expandOpts.loadMethod;
21770
21858
  if (loadMethod) {
21771
- var rowExpandLazyLoadedMaps = _this45.rowExpandLazyLoadedMaps;
21859
+ var rowExpandLazyLoadedMaps = _this46.rowExpandLazyLoadedMaps;
21772
21860
  var rowTempExpandLazyLoadedMaps = _objectSpread2({}, rowExpandLazyLoadedMaps);
21773
- var rowid = getRowid(_this45, row);
21861
+ var rowid = getRowid(_this46, row);
21774
21862
  rowTempExpandLazyLoadedMaps[rowid] = row;
21775
- _this45.rowExpandLazyLoadedMaps = rowTempExpandLazyLoadedMaps;
21863
+ _this46.rowExpandLazyLoadedMaps = rowTempExpandLazyLoadedMaps;
21776
21864
  loadMethod({
21777
- $table: _this45,
21865
+ $table: _this46,
21778
21866
  row: row,
21779
- rowIndex: _this45.getRowIndex(row),
21780
- $rowIndex: _this45.getVMRowIndex(row)
21867
+ rowIndex: _this46.getRowIndex(row),
21868
+ $rowIndex: _this46.getVMRowIndex(row)
21781
21869
  }).then(function () {
21782
21870
  rest.expandLoaded = true;
21783
- var rowExpandedMaps = _this45.rowExpandedMaps;
21871
+ var rowExpandedMaps = _this46.rowExpandedMaps;
21784
21872
  var rowTempExpandedMaps = _objectSpread2({}, rowExpandedMaps);
21785
21873
  rowTempExpandedMaps[rowid] = row;
21786
- _this45.rowExpandedMaps = rowTempExpandedMaps;
21874
+ _this46.rowExpandedMaps = rowTempExpandedMaps;
21787
21875
  }).catch(function () {
21788
21876
  rest.expandLoaded = false;
21789
21877
  }).finally(function () {
21790
- var rowExpandLazyLoadedMaps = _this45.rowExpandLazyLoadedMaps;
21878
+ var rowExpandLazyLoadedMaps = _this46.rowExpandLazyLoadedMaps;
21791
21879
  var rowTempExpandLazyLoadedMaps = _objectSpread2({}, rowExpandLazyLoadedMaps);
21792
21880
  if (rowTempExpandLazyLoadedMaps[rowid]) {
21793
21881
  delete rowTempExpandLazyLoadedMaps[rowid];
21794
21882
  }
21795
- _this45.rowExpandLazyLoadedMaps = rowTempExpandLazyLoadedMaps;
21796
- resolve(_this45.$nextTick().then(_this45.recalculate));
21883
+ _this46.rowExpandLazyLoadedMaps = rowTempExpandLazyLoadedMaps;
21884
+ resolve(_this46.$nextTick().then(_this46.recalculate));
21797
21885
  });
21798
21886
  } else {
21799
21887
  resolve();
@@ -21808,7 +21896,7 @@ var Methods = {
21808
21896
  * @param {Boolean} expanded 是否展开
21809
21897
  */
21810
21898
  setRowExpand: function setRowExpand(rows, expanded) {
21811
- var _this46 = this;
21899
+ var _this47 = this;
21812
21900
  var rowExpandedMaps = this.rowExpandedMaps,
21813
21901
  fullAllDataRowIdData = this.fullAllDataRowIdData,
21814
21902
  rowExpandLazyLoadedMaps = this.rowExpandLazyLoadedMaps,
@@ -21838,18 +21926,18 @@ var Methods = {
21838
21926
  columnIndex: columnIndex,
21839
21927
  $columnIndex: $columnIndex,
21840
21928
  row: row,
21841
- rowIndex: _this46.getRowIndex(row),
21842
- $rowIndex: _this46.getVMRowIndex(row)
21929
+ rowIndex: _this47.getRowIndex(row),
21930
+ $rowIndex: _this47.getVMRowIndex(row)
21843
21931
  });
21844
21932
  }) : rows;
21845
21933
  if (expanded) {
21846
21934
  validRows.forEach(function (row) {
21847
- var rowid = getRowid(_this46, row);
21935
+ var rowid = getRowid(_this47, row);
21848
21936
  if (!rExpandedMaps[rowid]) {
21849
21937
  var rest = fullAllDataRowIdData[rowid];
21850
21938
  var isLoad = lazy && !rest.expandLoaded && !rowExpandLazyLoadedMaps[rowid];
21851
21939
  if (isLoad) {
21852
- lazyRests.push(_this46.handleAsyncRowExpand(row));
21940
+ lazyRests.push(_this47.handleAsyncRowExpand(row));
21853
21941
  } else {
21854
21942
  rExpandedMaps[rowid] = row;
21855
21943
  }
@@ -21857,7 +21945,7 @@ var Methods = {
21857
21945
  });
21858
21946
  } else {
21859
21947
  validRows.forEach(function (item) {
21860
- var rowid = getRowid(_this46, item);
21948
+ var rowid = getRowid(_this47, item);
21861
21949
  if (rExpandedMaps[rowid]) {
21862
21950
  delete rExpandedMaps[rowid];
21863
21951
  }
@@ -21865,7 +21953,7 @@ var Methods = {
21865
21953
  }
21866
21954
  if (reserve) {
21867
21955
  validRows.forEach(function (row) {
21868
- return _this46.handleRowExpandReserve(row, expanded);
21956
+ return _this47.handleRowExpandReserve(row, expanded);
21869
21957
  });
21870
21958
  }
21871
21959
  }
@@ -21890,7 +21978,7 @@ var Methods = {
21890
21978
  * 手动清空展开行状态,数据会恢复成未展开的状态
21891
21979
  */
21892
21980
  clearRowExpand: function clearRowExpand() {
21893
- var _this47 = this;
21981
+ var _this48 = this;
21894
21982
  var expandOpts = this.expandOpts,
21895
21983
  tableFullData = this.tableFullData;
21896
21984
  var reserve = expandOpts.reserve;
@@ -21898,12 +21986,12 @@ var Methods = {
21898
21986
  this.rowExpandedMaps = {};
21899
21987
  if (reserve) {
21900
21988
  tableFullData.forEach(function (row) {
21901
- return _this47.handleRowExpandReserve(row, false);
21989
+ return _this48.handleRowExpandReserve(row, false);
21902
21990
  });
21903
21991
  }
21904
21992
  return this.$nextTick().then(function () {
21905
21993
  if (expList.length) {
21906
- _this47.recalculate();
21994
+ _this48.recalculate();
21907
21995
  }
21908
21996
  });
21909
21997
  },
@@ -21986,7 +22074,7 @@ var Methods = {
21986
22074
  * @param {Row} row 行对象
21987
22075
  */
21988
22076
  reloadTreeExpand: function reloadTreeExpand(row) {
21989
- var _this48 = this;
22077
+ var _this49 = this;
21990
22078
  var treeOpts = this.treeOpts,
21991
22079
  treeExpandLazyLoadedMaps = this.treeExpandLazyLoadedMaps;
21992
22080
  var transform = treeOpts.transform,
@@ -21995,14 +22083,14 @@ var Methods = {
21995
22083
  var rowid = getRowid(this, row);
21996
22084
  if (lazy && row[hasChildField] && !treeExpandLazyLoadedMaps[rowid]) {
21997
22085
  this.clearTreeExpandLoaded(row).then(function () {
21998
- return _this48.handleAsyncTreeExpandChilds(row);
22086
+ return _this49.handleAsyncTreeExpandChilds(row);
21999
22087
  }).then(function () {
22000
22088
  if (transform) {
22001
- _this48.handleVirtualTreeToList();
22002
- return _this48.handleTableData();
22089
+ _this49.handleVirtualTreeToList();
22090
+ return _this49.handleTableData();
22003
22091
  }
22004
22092
  }).then(function () {
22005
- return _this48.recalculate();
22093
+ return _this49.recalculate();
22006
22094
  });
22007
22095
  }
22008
22096
  return this.$nextTick();
@@ -22078,7 +22166,7 @@ var Methods = {
22078
22166
  }
22079
22167
  },
22080
22168
  handleAsyncTreeExpandChilds: function handleAsyncTreeExpandChilds(row) {
22081
- var _this49 = this;
22169
+ var _this50 = this;
22082
22170
  var treeOpts = this.treeOpts,
22083
22171
  checkboxOpts = this.checkboxOpts;
22084
22172
  var transform = treeOpts.transform,
@@ -22086,13 +22174,13 @@ var Methods = {
22086
22174
  var checkStrictly = checkboxOpts.checkStrictly;
22087
22175
  return new Promise(function (resolve) {
22088
22176
  if (loadMethod) {
22089
- var fullAllDataRowMap = _this49.fullAllDataRowMap,
22090
- treeExpandLazyLoadedMaps = _this49.treeExpandLazyLoadedMaps;
22091
- var rowid = getRowid(_this49, row);
22177
+ var fullAllDataRowMap = _this50.fullAllDataRowMap,
22178
+ treeExpandLazyLoadedMaps = _this50.treeExpandLazyLoadedMaps;
22179
+ var rowid = getRowid(_this50, row);
22092
22180
  var rest = fullAllDataRowMap.get(row);
22093
22181
  treeExpandLazyLoadedMaps[rowid] = row;
22094
22182
  loadMethod({
22095
- $table: _this49,
22183
+ $table: _this50,
22096
22184
  row: row
22097
22185
  }).then(function (childRecords) {
22098
22186
  // 响应成功后则展开行,并将子节点挂载到该节点下
@@ -22104,20 +22192,20 @@ var Methods = {
22104
22192
  childRecords = [];
22105
22193
  }
22106
22194
  if (childRecords) {
22107
- return _this49.loadTreeChildren(row, childRecords).then(function (childRows) {
22108
- var treeExpandedMaps = _this49.treeExpandedMaps;
22195
+ return _this50.loadTreeChildren(row, childRecords).then(function (childRows) {
22196
+ var treeExpandedMaps = _this50.treeExpandedMaps;
22109
22197
  var treeTempExpandedMaps = _objectSpread2({}, treeExpandedMaps);
22110
22198
  if (childRows.length && !treeTempExpandedMaps[rowid]) {
22111
22199
  treeTempExpandedMaps[rowid] = row;
22112
- _this49.treeExpandedMaps = treeTempExpandedMaps;
22200
+ _this50.treeExpandedMaps = treeTempExpandedMaps;
22113
22201
  }
22114
22202
  // 如果当前节点已选中,则展开后子节点也被选中
22115
- if (!checkStrictly && _this49.isCheckedByCheckboxRow(row)) {
22116
- _this49.handleCheckedCheckboxRow(childRows, true, true);
22203
+ if (!checkStrictly && _this50.isCheckedByCheckboxRow(row)) {
22204
+ _this50.handleCheckedCheckboxRow(childRows, true, true);
22117
22205
  }
22118
- return _this49.$nextTick().then(function () {
22206
+ return _this50.$nextTick().then(function () {
22119
22207
  if (transform) {
22120
- return _this49.handleTableData();
22208
+ return _this50.handleTableData();
22121
22209
  }
22122
22210
  });
22123
22211
  });
@@ -22125,13 +22213,13 @@ var Methods = {
22125
22213
  }).catch(function () {
22126
22214
  // 如果响应异常,则不展开,再次点击后将重新触发懒加载
22127
22215
  rest.treeLoaded = false;
22128
- var treeExpandLazyLoadedMaps = _this49.treeExpandLazyLoadedMaps;
22216
+ var treeExpandLazyLoadedMaps = _this50.treeExpandLazyLoadedMaps;
22129
22217
  if (treeExpandLazyLoadedMaps[rowid]) {
22130
22218
  treeExpandLazyLoadedMaps[rowid] = null;
22131
22219
  }
22132
22220
  }).finally(function () {
22133
- _this49.$nextTick().then(function () {
22134
- return _this49.recalculate();
22221
+ _this50.$nextTick().then(function () {
22222
+ return _this50.recalculate();
22135
22223
  }).then(function () {
22136
22224
  return resolve();
22137
22225
  });
@@ -22168,7 +22256,7 @@ var Methods = {
22168
22256
  * @returns
22169
22257
  */
22170
22258
  handleBaseTreeExpand: function handleBaseTreeExpand(rows, expanded) {
22171
- var _this50 = this;
22259
+ var _this51 = this;
22172
22260
  var fullAllDataRowMap = this.fullAllDataRowMap,
22173
22261
  tableFullData = this.tableFullData,
22174
22262
  treeExpandedMaps = this.treeExpandedMaps,
@@ -22204,7 +22292,7 @@ var Methods = {
22204
22292
  });
22205
22293
  if (matchObj) {
22206
22294
  matchObj.items.forEach(function (item) {
22207
- var rowid = getRowid(_this50, item);
22295
+ var rowid = getRowid(_this51, item);
22208
22296
  if (treeTempExpandedMaps[rowid]) {
22209
22297
  delete treeTempExpandedMaps[rowid];
22210
22298
  }
@@ -22213,13 +22301,13 @@ var Methods = {
22213
22301
  }
22214
22302
  if (expanded) {
22215
22303
  validRows.forEach(function (row) {
22216
- var rowid = getRowid(_this50, row);
22304
+ var rowid = getRowid(_this51, row);
22217
22305
  if (!treeTempExpandedMaps[rowid]) {
22218
22306
  var rest = fullAllDataRowMap.get(row);
22219
22307
  var isLoad = lazy && row[hasChildField] && !rest.treeLoaded && !treeExpandLazyLoadedMaps[rowid];
22220
22308
  // 是否使用懒加载
22221
22309
  if (isLoad) {
22222
- result.push(_this50.handleAsyncTreeExpandChilds(row));
22310
+ result.push(_this51.handleAsyncTreeExpandChilds(row));
22223
22311
  } else {
22224
22312
  if (row[childrenField] && row[childrenField].length) {
22225
22313
  treeTempExpandedMaps[rowid] = row;
@@ -22229,7 +22317,7 @@ var Methods = {
22229
22317
  });
22230
22318
  } else {
22231
22319
  validRows.forEach(function (item) {
22232
- var rowid = getRowid(_this50, item);
22320
+ var rowid = getRowid(_this51, item);
22233
22321
  if (treeTempExpandedMaps[rowid]) {
22234
22322
  delete treeTempExpandedMaps[rowid];
22235
22323
  }
@@ -22237,7 +22325,7 @@ var Methods = {
22237
22325
  }
22238
22326
  if (reserve) {
22239
22327
  validRows.forEach(function (row) {
22240
- return _this50.handleTreeExpandReserve(row, expanded);
22328
+ return _this51.handleTreeExpandReserve(row, expanded);
22241
22329
  });
22242
22330
  }
22243
22331
  this.treeExpandedMaps = treeTempExpandedMaps;
@@ -22250,12 +22338,12 @@ var Methods = {
22250
22338
  * @returns
22251
22339
  */
22252
22340
  handleVirtualTreeExpand: function handleVirtualTreeExpand(rows, expanded) {
22253
- var _this51 = this;
22341
+ var _this52 = this;
22254
22342
  return this.handleBaseTreeExpand(rows, expanded).then(function () {
22255
- _this51.handleVirtualTreeToList();
22256
- return _this51.handleTableData();
22343
+ _this52.handleVirtualTreeToList();
22344
+ return _this52.handleTableData();
22257
22345
  }).then(function () {
22258
- return _this51.recalculate();
22346
+ return _this52.recalculate();
22259
22347
  });
22260
22348
  },
22261
22349
  /**
@@ -22295,7 +22383,7 @@ var Methods = {
22295
22383
  * 手动清空树形节点的展开状态,数据会恢复成未展开的状态
22296
22384
  */
22297
22385
  clearTreeExpand: function clearTreeExpand() {
22298
- var _this52 = this;
22386
+ var _this53 = this;
22299
22387
  var treeOpts = this.treeOpts,
22300
22388
  tableFullData = this.tableFullData;
22301
22389
  var transform = treeOpts.transform,
@@ -22305,19 +22393,19 @@ var Methods = {
22305
22393
  this.treeExpandedMaps = {};
22306
22394
  if (reserve) {
22307
22395
  external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(tableFullData, function (row) {
22308
- return _this52.handleTreeExpandReserve(row, false);
22396
+ return _this53.handleTreeExpandReserve(row, false);
22309
22397
  }, {
22310
22398
  children: childrenField
22311
22399
  });
22312
22400
  }
22313
22401
  return this.handleTableData().then(function () {
22314
22402
  if (transform) {
22315
- _this52.handleVirtualTreeToList();
22316
- return _this52.handleTableData();
22403
+ _this53.handleVirtualTreeToList();
22404
+ return _this53.handleTableData();
22317
22405
  }
22318
22406
  }).then(function () {
22319
22407
  if (expList.length) {
22320
- _this52.recalculate();
22408
+ _this53.recalculate();
22321
22409
  }
22322
22410
  });
22323
22411
  },
@@ -22436,28 +22524,28 @@ var Methods = {
22436
22524
  },
22437
22525
  // 计算可视渲染相关数据
22438
22526
  computeScrollLoad: function computeScrollLoad() {
22439
- var _this53 = this;
22527
+ var _this54 = this;
22440
22528
  return this.$nextTick().then(function () {
22441
- var sYOpts = _this53.sYOpts,
22442
- sXOpts = _this53.sXOpts,
22443
- scrollXLoad = _this53.scrollXLoad,
22444
- scrollYLoad = _this53.scrollYLoad,
22445
- scrollXStore = _this53.scrollXStore,
22446
- scrollYStore = _this53.scrollYStore;
22529
+ var sYOpts = _this54.sYOpts,
22530
+ sXOpts = _this54.sXOpts,
22531
+ scrollXLoad = _this54.scrollXLoad,
22532
+ scrollYLoad = _this54.scrollYLoad,
22533
+ scrollXStore = _this54.scrollXStore,
22534
+ scrollYStore = _this54.scrollYStore;
22447
22535
  // 计算 X 逻辑
22448
22536
  if (scrollXLoad) {
22449
- var _computeVirtualX3 = computeVirtualX(_this53),
22537
+ var _computeVirtualX3 = computeVirtualX(_this54),
22450
22538
  visibleXSize = _computeVirtualX3.visibleSize;
22451
22539
  var offsetXSize = sXOpts.oSize ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(sXOpts.oSize) : browse.msie ? 10 : browse.edge ? 5 : 0;
22452
22540
  scrollXStore.offsetSize = offsetXSize;
22453
22541
  scrollXStore.visibleSize = visibleXSize;
22454
22542
  scrollXStore.endIndex = Math.max(scrollXStore.startIndex + scrollXStore.visibleSize + offsetXSize, scrollXStore.endIndex);
22455
- _this53.updateScrollXData();
22543
+ _this54.updateScrollXData();
22456
22544
  } else {
22457
- _this53.updateScrollXSpace();
22545
+ _this54.updateScrollXSpace();
22458
22546
  }
22459
22547
  // 计算 Y 逻辑
22460
- var _computeVirtualY = computeVirtualY(_this53),
22548
+ var _computeVirtualY = computeVirtualY(_this54),
22461
22549
  rowHeight = _computeVirtualY.rowHeight,
22462
22550
  visibleYSize = _computeVirtualY.visibleSize;
22463
22551
  scrollYStore.rowHeight = rowHeight;
@@ -22466,12 +22554,12 @@ var Methods = {
22466
22554
  scrollYStore.offsetSize = offsetYSize;
22467
22555
  scrollYStore.visibleSize = visibleYSize;
22468
22556
  scrollYStore.endIndex = Math.max(scrollYStore.startIndex + visibleYSize + offsetYSize, scrollYStore.endIndex);
22469
- _this53.updateScrollYData();
22557
+ _this54.updateScrollYData();
22470
22558
  } else {
22471
- _this53.updateScrollYSpace();
22559
+ _this54.updateScrollYSpace();
22472
22560
  }
22473
- _this53.rowHeight = rowHeight;
22474
- _this53.$nextTick(_this53.updateStyle);
22561
+ _this54.rowHeight = rowHeight;
22562
+ _this54.$nextTick(_this54.updateStyle);
22475
22563
  });
22476
22564
  },
22477
22565
  handleTableColumn: function handleTableColumn() {
@@ -22481,11 +22569,11 @@ var Methods = {
22481
22569
  this.tableColumn = scrollXLoad ? visibleColumn.slice(scrollXStore.startIndex, scrollXStore.endIndex) : visibleColumn.slice(0);
22482
22570
  },
22483
22571
  updateScrollXData: function updateScrollXData() {
22484
- var _this54 = this;
22572
+ var _this55 = this;
22485
22573
  // this.tableColumn = []
22486
22574
  this.$nextTick(function () {
22487
- _this54.handleTableColumn();
22488
- _this54.updateScrollXSpace();
22575
+ _this55.handleTableColumn();
22576
+ _this55.updateScrollXSpace();
22489
22577
  });
22490
22578
  },
22491
22579
  // 更新横向 X 可视渲染上下剩余空间大小
@@ -22536,11 +22624,11 @@ var Methods = {
22536
22624
  }
22537
22625
  },
22538
22626
  updateScrollYData: function updateScrollYData() {
22539
- var _this55 = this;
22627
+ var _this56 = this;
22540
22628
  // this.tableData = []
22541
22629
  this.$nextTick(function () {
22542
- _this55.handleTableData();
22543
- _this55.updateScrollYSpace();
22630
+ _this56.handleTableData();
22631
+ _this56.updateScrollYSpace();
22544
22632
  });
22545
22633
  },
22546
22634
  // 更新纵向 Y 可视渲染上下剩余空间大小
@@ -22581,7 +22669,7 @@ var Methods = {
22581
22669
  * @param {Number} scrollTop 上距离
22582
22670
  */
22583
22671
  scrollTo: function scrollTo(scrollLeft, scrollTop) {
22584
- var _this56 = this;
22672
+ var _this57 = this;
22585
22673
  var $refs = this.$refs;
22586
22674
  var tableBody = $refs.tableBody,
22587
22675
  rightBody = $refs.rightBody,
@@ -22598,7 +22686,7 @@ var Methods = {
22598
22686
  if (this.scrollXLoad || this.scrollYLoad) {
22599
22687
  return new Promise(function (resolve) {
22600
22688
  return setTimeout(function () {
22601
- return resolve(_this56.$nextTick());
22689
+ return resolve(_this57.$nextTick());
22602
22690
  }, 50);
22603
22691
  });
22604
22692
  }
@@ -22640,7 +22728,7 @@ var Methods = {
22640
22728
  * @param {Row} row 行对象
22641
22729
  */
22642
22730
  scrollToTreeRow: function scrollToTreeRow(row) {
22643
- var _this57 = this;
22731
+ var _this58 = this;
22644
22732
  var tableFullData = this.tableFullData,
22645
22733
  treeConfig = this.treeConfig,
22646
22734
  treeOpts = this.treeOpts;
@@ -22655,14 +22743,14 @@ var Methods = {
22655
22743
  if (matchObj) {
22656
22744
  var nodes = matchObj.nodes;
22657
22745
  nodes.forEach(function (row, index) {
22658
- if (index < nodes.length - 1 && !_this57.isTreeExpandByRow(row)) {
22659
- rests.push(_this57.setTreeExpand(row, true));
22746
+ if (index < nodes.length - 1 && !_this58.isTreeExpandByRow(row)) {
22747
+ rests.push(_this58.setTreeExpand(row, true));
22660
22748
  }
22661
22749
  });
22662
22750
  }
22663
22751
  }
22664
22752
  return Promise.all(rests).then(function () {
22665
- return rowToVisible(_this57, row);
22753
+ return rowToVisible(_this58, row);
22666
22754
  });
22667
22755
  },
22668
22756
  /**
@@ -22724,32 +22812,32 @@ var Methods = {
22724
22812
  * 如果单元格配置了校验规则,则会进行校验
22725
22813
  */
22726
22814
  updateStatus: function updateStatus(slotParams, cellValue) {
22727
- var _this58 = this;
22815
+ var _this59 = this;
22728
22816
  var customVal = !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(cellValue);
22729
22817
  return this.$nextTick().then(function () {
22730
- var $refs = _this58.$refs,
22731
- editRules = _this58.editRules,
22732
- validStore = _this58.validStore;
22818
+ var $refs = _this59.$refs,
22819
+ editRules = _this59.editRules,
22820
+ validStore = _this59.validStore;
22733
22821
  var tableBody = $refs.tableBody;
22734
22822
  if (slotParams && tableBody && editRules) {
22735
22823
  var row = slotParams.row,
22736
22824
  column = slotParams.column;
22737
22825
  var type = 'change';
22738
- if (_this58.hasCellRules) {
22739
- if (_this58.hasCellRules(type, row, column)) {
22740
- var cell = _this58.getCellElement(row, column);
22826
+ if (_this59.hasCellRules) {
22827
+ if (_this59.hasCellRules(type, row, column)) {
22828
+ var cell = _this59.getCellElement(row, column);
22741
22829
  if (cell) {
22742
- return _this58.validCellRules(type, row, column, cellValue).then(function () {
22830
+ return _this59.validCellRules(type, row, column, cellValue).then(function () {
22743
22831
  if (customVal && validStore.visible) {
22744
22832
  setCellValue(row, column, cellValue);
22745
22833
  }
22746
- _this58.clearValidate(row, column);
22834
+ _this59.clearValidate(row, column);
22747
22835
  }).catch(function (_ref7) {
22748
22836
  var rule = _ref7.rule;
22749
22837
  if (customVal) {
22750
22838
  setCellValue(row, column, cellValue);
22751
22839
  }
22752
- _this58.showValidTooltip({
22840
+ _this59.showValidTooltip({
22753
22841
  rule: rule,
22754
22842
  row: row,
22755
22843
  column: column,
@@ -22770,14 +22858,14 @@ var Methods = {
22770
22858
  * @param {TableMergeConfig[]} merges { row: Row|number, column: ColumnInfo|number, rowspan: number, colspan: number }
22771
22859
  */
22772
22860
  setMergeCells: function setMergeCells(merges) {
22773
- var _this59 = this;
22861
+ var _this60 = this;
22774
22862
  if (this.spanMethod) {
22775
22863
  errLog('vxe.error.errConflicts', ['merge-cells', 'span-method']);
22776
22864
  }
22777
22865
  setMerges(this, merges, this.mergeList, this.afterFullData);
22778
22866
  return this.$nextTick().then(function () {
22779
- _this59.updateCellAreas();
22780
- return _this59.updateStyle();
22867
+ _this60.updateCellAreas();
22868
+ return _this60.updateStyle();
22781
22869
  });
22782
22870
  },
22783
22871
  /**
@@ -22785,14 +22873,14 @@ var Methods = {
22785
22873
  * @param {TableMergeConfig[]} merges 多个或数组 [{row:Row|number, col:ColumnInfo|number}]
22786
22874
  */
22787
22875
  removeMergeCells: function removeMergeCells(merges) {
22788
- var _this60 = this;
22876
+ var _this61 = this;
22789
22877
  if (this.spanMethod) {
22790
22878
  errLog('vxe.error.errConflicts', ['merge-cells', 'span-method']);
22791
22879
  }
22792
22880
  var rest = removeMerges(this, merges, this.mergeList, this.afterFullData);
22793
22881
  return this.$nextTick().then(function () {
22794
- _this60.updateCellAreas();
22795
- _this60.updateStyle();
22882
+ _this61.updateCellAreas();
22883
+ _this61.updateStyle();
22796
22884
  return rest;
22797
22885
  });
22798
22886
  },
@@ -22806,35 +22894,35 @@ var Methods = {
22806
22894
  * 清除所有单元格合并
22807
22895
  */
22808
22896
  clearMergeCells: function clearMergeCells() {
22809
- var _this61 = this;
22897
+ var _this62 = this;
22810
22898
  this.mergeList = [];
22811
22899
  return this.$nextTick().then(function () {
22812
- return _this61.updateStyle();
22900
+ return _this62.updateStyle();
22813
22901
  });
22814
22902
  },
22815
22903
  handleDefaultMergeFooterItems: function handleDefaultMergeFooterItems() {
22816
22904
  this.setMergeFooterItems(this.mergeFooterItems);
22817
22905
  },
22818
22906
  setMergeFooterItems: function setMergeFooterItems(merges) {
22819
- var _this62 = this;
22907
+ var _this63 = this;
22820
22908
  if (this.footerSpanMethod) {
22821
22909
  errLog('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
22822
22910
  }
22823
22911
  setMerges(this, merges, this.mergeFooterList, null);
22824
22912
  return this.$nextTick().then(function () {
22825
- _this62.updateCellAreas();
22826
- return _this62.updateStyle();
22913
+ _this63.updateCellAreas();
22914
+ return _this63.updateStyle();
22827
22915
  });
22828
22916
  },
22829
22917
  removeMergeFooterItems: function removeMergeFooterItems(merges) {
22830
- var _this63 = this;
22918
+ var _this64 = this;
22831
22919
  if (this.footerSpanMethod) {
22832
22920
  errLog('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
22833
22921
  }
22834
22922
  var rest = removeMerges(this, merges, this.mergeFooterList, null);
22835
22923
  return this.$nextTick().then(function () {
22836
- _this63.updateCellAreas();
22837
- _this63.updateStyle();
22924
+ _this64.updateCellAreas();
22925
+ _this64.updateStyle();
22838
22926
  return rest;
22839
22927
  });
22840
22928
  },
@@ -22848,10 +22936,10 @@ var Methods = {
22848
22936
  * 清除所有表尾合并
22849
22937
  */
22850
22938
  clearMergeFooterItems: function clearMergeFooterItems() {
22851
- var _this64 = this;
22939
+ var _this65 = this;
22852
22940
  this.mergeFooterList = [];
22853
22941
  return this.$nextTick().then(function () {
22854
- return _this64.updateStyle();
22942
+ return _this65.updateStyle();
22855
22943
  });
22856
22944
  },
22857
22945
  updateZindex: function updateZindex() {
@@ -22906,9 +22994,9 @@ var Methods = {
22906
22994
  return this.getCellElement(row, column);
22907
22995
  },
22908
22996
  findRowIndexOf: function findRowIndexOf(list, row) {
22909
- var _this65 = this;
22997
+ var _this66 = this;
22910
22998
  return row ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findIndexOf(list, function (item) {
22911
- return _this65.eqRow(item, row);
22999
+ return _this66.eqRow(item, row);
22912
23000
  }) : -1;
22913
23001
  },
22914
23002
  eqRow: function eqRow(row1, row2) {
@@ -23405,6 +23493,7 @@ function handleUupdateResize(_vm) {
23405
23493
  data: function data() {
23406
23494
  return {
23407
23495
  tId: "".concat(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().uniqueId()),
23496
+ isCalcColumn: false,
23408
23497
  // 低性能的静态列
23409
23498
  staticColumns: [],
23410
23499
  // 渲染的列分组
@@ -23755,6 +23844,12 @@ function handleUupdateResize(_vm) {
23755
23844
  customOpts: function customOpts() {
23756
23845
  return Object.assign({}, conf.table.customConfig, this.customConfig);
23757
23846
  },
23847
+ autoWidthColumnList: function autoWidthColumnList() {
23848
+ var visibleColumn = this.visibleColumn;
23849
+ return visibleColumn.filter(function (column) {
23850
+ return column.width === 'auto';
23851
+ });
23852
+ },
23758
23853
  fixedColumnSize: function fixedColumnSize() {
23759
23854
  var collectColumn = this.collectColumn;
23760
23855
  var fixedSize = 0;
@@ -24067,6 +24162,7 @@ function handleUupdateResize(_vm) {
24067
24162
  var _e = this._e,
24068
24163
  $scopedSlots = this.$scopedSlots,
24069
24164
  tId = this.tId,
24165
+ isCalcColumn = this.isCalcColumn,
24070
24166
  tableData = this.tableData,
24071
24167
  tableColumn = this.tableColumn,
24072
24168
  tableGroupColumn = this.tableGroupColumn,
@@ -24110,7 +24206,7 @@ function handleUupdateResize(_vm) {
24110
24206
  rightList = columnStore.rightList;
24111
24207
  var currLoading = this._isLoading || loading;
24112
24208
  return h('div', {
24113
- class: ['vxe-table', 'vxe-table--render-default', "tid_".concat(tId), vSize ? "size--".concat(vSize) : '', "border--".concat(tableBorder), (_ref = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_ref, "valid-msg--".concat(validOpts.msgMode), !!editRules), 'vxe-editable', !!editConfig), 'old-cell-valid', editRules && conf.cellVaildMode === 'obsolete'), 'cell--highlight', highlightCell), 'cell--selected', mouseConfig && mouseOpts.selected), 'cell--area', mouseConfig && mouseOpts.area), 'row--highlight', rowOpts.isHover || highlightHoverRow), 'column--highlight', columnOpts.isHover || highlightHoverColumn), 'checkbox--range', checkboxOpts.range), 'is--header', showHeader), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_ref, 'is--footer', showFooter), 'is--group', isGroup), 'is--tree-line', treeConfig && (treeOpts.showLine || treeOpts.line)), 'is--fixed-left', leftList.length), 'is--fixed-right', rightList.length), 'is--animat', !!this.animat), 'is--round', this.round), 'is--stripe', !treeConfig && stripe), 'is--loading', currLoading), 'is--empty', !currLoading && !tableData.length), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_ref, 'is--scroll-y', overflowY), 'is--scroll-x', overflowX), 'is--virtual-x', scrollXLoad), 'is--virtual-y', scrollYLoad))],
24209
+ class: ['vxe-table', 'vxe-table--render-default', "tid_".concat(tId), vSize ? "size--".concat(vSize) : '', "border--".concat(tableBorder), (_ref = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_ref, "valid-msg--".concat(validOpts.msgMode), !!editRules), 'vxe-editable', !!editConfig), 'old-cell-valid', editRules && conf.cellVaildMode === 'obsolete'), 'cell--highlight', highlightCell), 'cell--selected', mouseConfig && mouseOpts.selected), 'cell--area', mouseConfig && mouseOpts.area), 'row--highlight', rowOpts.isHover || highlightHoverRow), 'column--highlight', columnOpts.isHover || highlightHoverColumn), 'checkbox--range', checkboxOpts.range), 'column--calc', isCalcColumn), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_ref, 'is--header', showHeader), 'is--footer', showFooter), 'is--group', isGroup), 'is--tree-line', treeConfig && (treeOpts.showLine || treeOpts.line)), 'is--fixed-left', leftList.length), 'is--fixed-right', rightList.length), 'is--animat', !!this.animat), 'is--round', this.round), 'is--stripe', !treeConfig && stripe), 'is--loading', currLoading), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_ref, 'is--empty', !currLoading && !tableData.length), 'is--scroll-y', overflowY), 'is--scroll-x', overflowX), 'is--virtual-x', scrollXLoad), 'is--virtual-y', scrollYLoad))],
24114
24210
  on: {
24115
24211
  keydown: this.keydownEvent
24116
24212
  }
@@ -24364,7 +24460,7 @@ var Table = VxeTable;
24364
24460
  'is--active': filterStore.visible
24365
24461
  }],
24366
24462
  style: filterStore.style
24367
- }, filterStore.visible ? this.renderOptions(h, filterRender, compConf).concat(this.renderFooter(h)) : []);
24463
+ }, filterStore.visible && column ? this.renderOptions(h, filterRender, compConf).concat(this.renderFooter(h)) : []);
24368
24464
  },
24369
24465
  methods: {
24370
24466
  renderOptions: function renderOptions(h, filterRender, compConf) {
@@ -24375,7 +24471,7 @@ var Table = VxeTable;
24375
24471
  column = filterStore.column,
24376
24472
  multiple = filterStore.multiple,
24377
24473
  maxHeight = filterStore.maxHeight;
24378
- var slots = column.slots;
24474
+ var slots = column ? column.slots : null;
24379
24475
  var rtFilter = compConf ? compConf.renderTableFilter || compConf.renderFilter : null;
24380
24476
  if (slots && slots.filter) {
24381
24477
  return [h('div', {
@@ -24452,7 +24548,7 @@ var Table = VxeTable;
24452
24548
  var filterRender = column.filterRender;
24453
24549
  var compConf = isEnableConf(filterRender) ? v_x_e_table.renderer.get(filterRender.name) : null;
24454
24550
  var isDisabled = !hasCheckOption && !filterStore.isAllSelected && !filterStore.isIndeterminate;
24455
- return multiple && (compConf ? !(compConf.showTableFilterFooter === false || compConf.showFilterFooter === false) : true) ? [h('div', {
24551
+ return multiple && (compConf ? !(compConf.showTableFilterFooter === false || compConf.showFilterFooter === false || compConf.isFooter === false) : true) ? [h('div', {
24456
24552
  class: 'vxe-table--filter-footer'
24457
24553
  }, [h('button', {
24458
24554
  class: {
@@ -24640,29 +24736,34 @@ var Table = VxeTable;
24640
24736
  this.initStore.filter = true;
24641
24737
  this.$nextTick(function () {
24642
24738
  var $refs = _this.$refs;
24643
- var bodyElem = $refs.tableBody.$el;
24644
- var filterWrapperElem = $refs.filterWrapper.$el;
24645
- var filterWidth = 0;
24646
- var filterHeight = 0;
24647
- var filterHeadElem = null;
24648
- var filterFootElem = null;
24649
- if (filterWrapperElem) {
24650
- filterWidth = filterWrapperElem.offsetWidth;
24651
- filterHeight = filterWrapperElem.offsetHeight;
24652
- filterHeadElem = filterWrapperElem.querySelector('.vxe-table--filter-header');
24653
- filterFootElem = filterWrapperElem.querySelector('.vxe-table--filter-footer');
24739
+ var tableHeader = $refs.tableHeader,
24740
+ tableBody = $refs.tableBody,
24741
+ filterWrapper = $refs.filterWrapper;
24742
+ var bodyElem = tableBody.$el;
24743
+ var headerElem = tableHeader ? tableHeader.$el : null;
24744
+ if (!bodyElem) {
24745
+ return;
24746
+ }
24747
+ var filterWrapperElem = filterWrapper.$el;
24748
+ if (!filterWrapperElem) {
24749
+ return;
24654
24750
  }
24751
+ var filterWidth = filterWrapperElem.offsetWidth;
24752
+ var filterHeight = filterWrapperElem.offsetHeight;
24753
+ var filterHeadElem = filterWrapperElem.querySelector('.vxe-table--filter-header');
24754
+ var filterFootElem = filterWrapperElem.querySelector('.vxe-table--filter-footer');
24655
24755
  var centerWidth = filterWidth / 2;
24656
24756
  var minMargin = 10;
24657
24757
  var maxLeft = bodyElem.clientWidth - filterWidth - minMargin;
24658
24758
  var left, right;
24659
24759
  var style = {
24660
- top: "".concat(targetElem.offsetTop + targetElem.offsetParent.offsetTop + targetElem.offsetHeight + 8, "px")
24760
+ top: "".concat(targetElem.offsetTop + targetElem.offsetParent.offsetTop + targetElem.offsetHeight, "px")
24661
24761
  };
24662
24762
  // 判断面板不能大于表格高度
24663
24763
  var maxHeight = null;
24664
- if (filterHeight >= bodyElem.clientHeight) {
24665
- maxHeight = Math.max(60, bodyElem.clientHeight - (filterFootElem ? filterFootElem.offsetHeight : 0) - (filterHeadElem ? filterHeadElem.offsetHeight : 0));
24764
+ var bodyHeight = bodyElem.clientHeight - (headerElem ? headerElem.clientHeight / 2 : 0);
24765
+ if (filterHeight >= bodyHeight) {
24766
+ maxHeight = Math.max(40, bodyHeight - (filterFootElem ? filterFootElem.offsetHeight : 0) - (filterHeadElem ? filterHeadElem.offsetHeight : 0));
24666
24767
  }
24667
24768
  if (column.fixed === 'left') {
24668
24769
  left = targetElem.offsetLeft + targetElem.offsetParent.offsetLeft - centerWidth;
@@ -26535,12 +26636,12 @@ var msgQueue = [];
26535
26636
  },
26536
26637
  data: function data() {
26537
26638
  return {
26538
- inited: false,
26639
+ initialized: false,
26539
26640
  visible: false,
26540
26641
  contentVisible: false,
26541
26642
  modalTop: 0,
26542
26643
  modalZindex: 0,
26543
- zoomLocat: null,
26644
+ revertLocat: null,
26544
26645
  firstOpen: true
26545
26646
  };
26546
26647
  },
@@ -26606,7 +26707,7 @@ var msgQueue = [];
26606
26707
  $scopedSlots = this.$scopedSlots,
26607
26708
  _this$slots = this.slots,
26608
26709
  slots = _this$slots === void 0 ? {} : _this$slots,
26609
- inited = this.inited,
26710
+ initialized = this.initialized,
26610
26711
  vSize = this.vSize,
26611
26712
  className = this.className,
26612
26713
  type = this.type,
@@ -26619,7 +26720,7 @@ var msgQueue = [];
26619
26720
  status = this.status,
26620
26721
  iconStatus = this.iconStatus,
26621
26722
  showFooter = this.showFooter,
26622
- zoomLocat = this.zoomLocat,
26723
+ revertLocat = this.revertLocat,
26623
26724
  modalTop = this.modalTop,
26624
26725
  dblclickZoom = this.dblclickZoom,
26625
26726
  contentVisible = this.contentVisible,
@@ -26647,7 +26748,7 @@ var msgQueue = [];
26647
26748
  headerOns.dblclick = this.toggleZoomEvent;
26648
26749
  }
26649
26750
  return h('div', {
26650
- class: ['vxe-modal--wrapper', "type--".concat(type), className || '', (_ref = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_ref, "size--".concat(vSize), vSize), "status--".concat(status), status), 'is--animat', animat), 'lock--scroll', lockScroll), 'lock--view', lockView), 'is--resize', resize), 'is--mask', mask), 'is--maximize', zoomLocat), 'is--visible', contentVisible), 'is--active', visible), _defineProperty(_ref, 'is--loading', loading))],
26751
+ class: ['vxe-modal--wrapper', "type--".concat(type), className || '', (_ref = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_ref, "size--".concat(vSize), vSize), "status--".concat(status), status), 'is--animat', animat), 'lock--scroll', lockScroll), 'lock--view', lockView), 'is--resize', resize), 'is--mask', mask), 'is--maximize', revertLocat), 'is--visible', contentVisible), 'is--active', visible), _defineProperty(_ref, 'is--loading', loading))],
26651
26752
  style: {
26652
26753
  zIndex: this.modalZindex,
26653
26754
  top: modalTop ? "".concat(modalTop, "px") : null
@@ -26667,7 +26768,7 @@ var msgQueue = [];
26667
26768
  'is--ellipsis': !isMsg && showTitleOverflow
26668
26769
  }],
26669
26770
  on: headerOns
26670
- }, headerSlot ? !inited || destroyOnClose && !visible ? [] : getSlotVNs(headerSlot.call(this, {
26771
+ }, headerSlot ? !initialized || destroyOnClose && !visible ? [] : getSlotVNs(headerSlot.call(this, {
26671
26772
  $modal: this
26672
26773
  }, h)) : [h('div', {
26673
26774
  class: 'vxe-modal--header-title'
@@ -26680,9 +26781,9 @@ var msgQueue = [];
26680
26781
  }, getSlotVNs(cornerSlot({
26681
26782
  $modal: this
26682
26783
  }))) : _e(), showZoom ? h('i', {
26683
- class: ['vxe-modal--zoom-btn', 'trigger--btn', zoomLocat ? conf.icon.MODAL_ZOOM_OUT : conf.icon.MODAL_ZOOM_IN],
26784
+ class: ['vxe-modal--zoom-btn', 'trigger--btn', revertLocat ? conf.icon.MODAL_ZOOM_OUT : conf.icon.MODAL_ZOOM_IN],
26684
26785
  attrs: {
26685
- title: conf.i18n("vxe.modal.zoom".concat(zoomLocat ? 'Out' : 'In'))
26786
+ title: conf.i18n("vxe.modal.zoom".concat(revertLocat ? 'Out' : 'In'))
26686
26787
  },
26687
26788
  on: {
26688
26789
  click: this.toggleZoomEvent
@@ -26703,7 +26804,7 @@ var msgQueue = [];
26703
26804
  class: ['vxe-modal--status-icon', iconStatus || conf.icon["MODAL_".concat(status).toLocaleUpperCase()]]
26704
26805
  })]) : null, h('div', {
26705
26806
  class: 'vxe-modal--content'
26706
- }, defaultSlot ? !inited || destroyOnClose && !visible ? [] : getSlotVNs(defaultSlot.call(this, {
26807
+ }, defaultSlot ? !initialized || destroyOnClose && !visible ? [] : getSlotVNs(defaultSlot.call(this, {
26707
26808
  $modal: this
26708
26809
  }, h)) : getFuncText(content)),
26709
26810
  /**
@@ -26716,7 +26817,7 @@ var msgQueue = [];
26716
26817
  }
26717
26818
  }) : null]), showFooter ? h('div', {
26718
26819
  class: 'vxe-modal--footer'
26719
- }, footerSlot ? !inited || destroyOnClose && !visible ? [] : getSlotVNs(footerSlot.call(this, {
26820
+ }, footerSlot ? !initialized || destroyOnClose && !visible ? [] : getSlotVNs(footerSlot.call(this, {
26720
26821
  $modal: this
26721
26822
  }, h)) : [external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(showCancelButton) ? showCancelButton : type === 'confirm' ? h('vxe-button', {
26722
26823
  key: 1,
@@ -26824,14 +26925,14 @@ var msgQueue = [];
26824
26925
  var $refs = this.$refs,
26825
26926
  _this$events5 = this.events,
26826
26927
  events = _this$events5 === void 0 ? {} : _this$events5,
26827
- inited = this.inited,
26928
+ initialized = this.initialized,
26828
26929
  duration = this.duration,
26829
26930
  visible = this.visible,
26830
26931
  isMsg = this.isMsg,
26831
26932
  remember = this.remember,
26832
26933
  showFooter = this.showFooter;
26833
- if (!inited) {
26834
- this.inited = true;
26934
+ if (!initialized) {
26935
+ this.initialized = true;
26835
26936
  if (this.transfer) {
26836
26937
  document.body.appendChild(this.$el);
26837
26938
  }
@@ -26982,7 +27083,7 @@ var msgQueue = [];
26982
27083
  }
26983
27084
  _this5.contentVisible = false;
26984
27085
  if (!remember) {
26985
- _this5.zoomLocat = null;
27086
+ _this5.revertLocat = null;
26986
27087
  }
26987
27088
  external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().remove(allActivedModals, function (item) {
26988
27089
  return item === _this5;
@@ -27024,18 +27125,18 @@ var msgQueue = [];
27024
27125
  return this.$refs.modalBox;
27025
27126
  },
27026
27127
  isMaximized: function isMaximized() {
27027
- return !!this.zoomLocat;
27128
+ return !!this.revertLocat;
27028
27129
  },
27029
27130
  maximize: function maximize() {
27030
27131
  var _this7 = this;
27031
27132
  return this.$nextTick().then(function () {
27032
- if (!_this7.zoomLocat) {
27133
+ if (!_this7.revertLocat) {
27033
27134
  var marginSize = Math.max(0, _this7.marginSize);
27034
27135
  var modalBoxElem = _this7.getBox();
27035
27136
  var _DomTools$getDomNode = dom.getDomNode(),
27036
27137
  visibleHeight = _DomTools$getDomNode.visibleHeight,
27037
27138
  visibleWidth = _DomTools$getDomNode.visibleWidth;
27038
- _this7.zoomLocat = {
27139
+ _this7.revertLocat = {
27039
27140
  top: modalBoxElem.offsetTop,
27040
27141
  left: modalBoxElem.offsetLeft,
27041
27142
  width: modalBoxElem.offsetWidth + (modalBoxElem.style.width ? 0 : 1),
@@ -27054,15 +27155,15 @@ var msgQueue = [];
27054
27155
  revert: function revert() {
27055
27156
  var _this8 = this;
27056
27157
  return this.$nextTick().then(function () {
27057
- var zoomLocat = _this8.zoomLocat;
27058
- if (zoomLocat) {
27158
+ var revertLocat = _this8.revertLocat;
27159
+ if (revertLocat) {
27059
27160
  var modalBoxElem = _this8.getBox();
27060
- _this8.zoomLocat = null;
27161
+ _this8.revertLocat = null;
27061
27162
  Object.assign(modalBoxElem.style, {
27062
- top: "".concat(zoomLocat.top, "px"),
27063
- left: "".concat(zoomLocat.left, "px"),
27064
- width: "".concat(zoomLocat.width, "px"),
27065
- height: "".concat(zoomLocat.height, "px")
27163
+ top: "".concat(revertLocat.top, "px"),
27164
+ left: "".concat(revertLocat.left, "px"),
27165
+ width: "".concat(revertLocat.width, "px"),
27166
+ height: "".concat(revertLocat.height, "px")
27066
27167
  });
27067
27168
  _this8.savePosStorage();
27068
27169
  }
@@ -27070,18 +27171,18 @@ var msgQueue = [];
27070
27171
  },
27071
27172
  zoom: function zoom() {
27072
27173
  var _this9 = this;
27073
- return this[this.zoomLocat ? 'revert' : 'maximize']().then(function () {
27174
+ return this[this.revertLocat ? 'revert' : 'maximize']().then(function () {
27074
27175
  return _this9.isMaximized();
27075
27176
  });
27076
27177
  },
27077
27178
  toggleZoomEvent: function toggleZoomEvent(evnt) {
27078
27179
  var _this10 = this;
27079
27180
  var $listeners = this.$listeners,
27080
- zoomLocat = this.zoomLocat,
27181
+ revertLocat = this.revertLocat,
27081
27182
  _this$events7 = this.events,
27082
27183
  events = _this$events7 === void 0 ? {} : _this$events7;
27083
27184
  var params = {
27084
- type: zoomLocat ? 'revert' : 'max',
27185
+ type: revertLocat ? 'revert' : 'max',
27085
27186
  $modal: this,
27086
27187
  $event: evnt
27087
27188
  };
@@ -27130,9 +27231,9 @@ var msgQueue = [];
27130
27231
  var remember = this.remember,
27131
27232
  storage = this.storage,
27132
27233
  marginSize = this.marginSize,
27133
- zoomLocat = this.zoomLocat;
27234
+ revertLocat = this.revertLocat;
27134
27235
  var modalBoxElem = this.getBox();
27135
- if (!zoomLocat && evnt.button === 0 && !dom.getEventTargetNode(evnt, modalBoxElem, 'trigger--btn').flag) {
27236
+ if (!revertLocat && evnt.button === 0 && !dom.getEventTargetNode(evnt, modalBoxElem, 'trigger--btn').flag) {
27136
27237
  evnt.preventDefault();
27137
27238
  var domMousemove = document.onmousemove;
27138
27239
  var domMouseup = document.onmouseup;
@@ -27340,7 +27441,7 @@ var msgQueue = [];
27340
27441
  }
27341
27442
  };
27342
27443
  document.onmouseup = function () {
27343
- _this12.zoomLocat = null;
27444
+ _this12.revertLocat = null;
27344
27445
  document.onmousemove = domMousemove;
27345
27446
  document.onmouseup = domMouseup;
27346
27447
  setTimeout(function () {
@@ -27394,7 +27495,7 @@ var msgQueue = [];
27394
27495
  modalBoxElem.style.height = "".concat(height, "px");
27395
27496
  }
27396
27497
  if (zoomLeft && zoomTop) {
27397
- this.zoomLocat = {
27498
+ this.revertLocat = {
27398
27499
  left: zoomLeft,
27399
27500
  top: zoomTop,
27400
27501
  width: zoomWidth,
@@ -27409,11 +27510,11 @@ var msgQueue = [];
27409
27510
  remember = this.remember,
27410
27511
  storage = this.storage,
27411
27512
  storageKey = this.storageKey,
27412
- zoomLocat = this.zoomLocat;
27513
+ revertLocat = this.revertLocat;
27413
27514
  if (remember && storage) {
27414
27515
  var modalBoxElem = this.getBox();
27415
27516
  var posStorageMap = this.getStorageMap(storageKey);
27416
- posStorageMap[id] = [modalBoxElem.style.left, modalBoxElem.style.top, modalBoxElem.style.width, modalBoxElem.style.height].concat(zoomLocat ? [zoomLocat.left, zoomLocat.top, zoomLocat.width, zoomLocat.height] : []).map(function (val) {
27517
+ posStorageMap[id] = [modalBoxElem.style.left, modalBoxElem.style.top, modalBoxElem.style.width, modalBoxElem.style.height].concat(revertLocat ? [revertLocat.left, revertLocat.top, revertLocat.width, revertLocat.height] : []).map(function (val) {
27417
27518
  return val ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(val) : '';
27418
27519
  }).join(',');
27419
27520
  localStorage.setItem(storageKey, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toJSONString(posStorageMap));
@@ -32397,7 +32498,7 @@ function hasEllipsis($xetable, column, property, allColumnOverflow) {
32397
32498
  }
32398
32499
  function createHtmlPage(opts, content) {
32399
32500
  var style = opts.style;
32400
- return ['<!DOCTYPE html><html>', '<head>', '<meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no,minimal-ui">', "<title>".concat(opts.sheetName, "</title>"), '<style media="print">.vxe-page-break-before{page-break-before:always;}.vxe-page-break-after{page-break-after:always;}</style>', "<style>".concat(defaultHtmlStyle, "</style>"), style ? "<style>".concat(style, "</style>") : '', '</head>', "<body>".concat(content, "</body>"), '</html>'].join('');
32501
+ return ['<!DOCTYPE html><html>', '<head>', '<meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no,minimal-ui">', "<title>".concat(opts.sheetName, "</title>"), '<style media="print">.vxe-page-break-before{page-break-before:always;}.vxe-page-break-after{page-break-after:always;}</style>', '<style>.vxe-table{white-space:pre;}</style>', "<style>".concat(defaultHtmlStyle, "</style>"), style ? "<style>".concat(style, "</style>") : '', '</head>', "<body>".concat(content, "</body>"), '</html>'].join('');
32401
32502
  }
32402
32503
  function toHtml($xetable, opts, columns, datas) {
32403
32504
  var id = $xetable.id,
@@ -35728,6 +35829,8 @@ var column_props = {
35728
35829
  footerClassName: [String, Function],
35729
35830
  // 格式化显示内容
35730
35831
  formatter: [Function, Array, String],
35832
+ // 格式化表尾显示内容
35833
+ footerFormatter: [Function, Array, String],
35731
35834
  // 是否允许排序
35732
35835
  sortable: Boolean,
35733
35836
  // 在 v3 中废弃
@@ -36306,9 +36409,9 @@ Object.keys(packages_table.methods).forEach(function (name) {
36306
36409
  var tableProps = Object.assign({}, tableExtendProps);
36307
36410
  if (isZMax) {
36308
36411
  if (tableExtendProps.maxHeight) {
36309
- tableProps.maxHeight = 'auto';
36412
+ tableProps.maxHeight = '100%';
36310
36413
  } else {
36311
- tableProps.height = 'auto';
36414
+ tableProps.height = '100%';
36312
36415
  }
36313
36416
  }
36314
36417
  if (proxyConfig) {
@@ -36411,7 +36514,7 @@ Object.keys(packages_table.methods).forEach(function (name) {
36411
36514
  topWrapper = $refs.topWrapper,
36412
36515
  bottomWrapper = $refs.bottomWrapper,
36413
36516
  pagerWrapper = $refs.pagerWrapper;
36414
- var parentPaddingSize = isZMax || height !== 'auto' ? 0 : getPaddingTopBottomSize($el.parentNode);
36517
+ var parentPaddingSize = isZMax || !(height === 'auto' || height === '100%') ? 0 : getPaddingTopBottomSize($el.parentNode);
36415
36518
  return parentPaddingSize + getPaddingTopBottomSize($el) + getOffsetHeight(formWrapper) + getOffsetHeight(toolbarWrapper) + getOffsetHeight(topWrapper) + getOffsetHeight(bottomWrapper) + getOffsetHeight(pagerWrapper);
36416
36519
  },
36417
36520
  initToolbar: function initToolbar() {