mali-ui-plus 1.0.15 → 1.0.17

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -19492,7 +19492,7 @@ var GlobalConfig = {
19492
19492
  ;// CONCATENATED MODULE: ./node_modules/vxe-table/es/tools/log.js
19493
19493
 
19494
19494
  function getLog(message, params) {
19495
- return "[vxe-table v".concat("4.3.7", "] ").concat(conf.i18n(message, params));
19495
+ return "[vxe-table v".concat("4.3.11-beta.2", "] ").concat(conf.i18n(message, params));
19496
19496
  }
19497
19497
  function outLog(type) {
19498
19498
  return function (message, params) {
@@ -19561,7 +19561,7 @@ function isEmptyValue(cellValue) {
19561
19561
  function parseFile(file) {
19562
19562
  var name = file.name;
19563
19563
  var tIndex = xe_utils_default().lastIndexOf(name, '.');
19564
- var type = name.substring(tIndex + 1, name.length);
19564
+ var type = name.substring(tIndex + 1, name.length).toLowerCase();
19565
19565
  var filename = name.substring(0, tIndex);
19566
19566
  return {
19567
19567
  filename: filename,
@@ -21092,7 +21092,7 @@ var config = new VXETableConfig();
21092
21092
  var v = 'v4';
21093
21093
  var VXETable = {
21094
21094
  v: v,
21095
- version: "4.3.7",
21095
+ version: "4.3.11-beta.2",
21096
21096
  setup: setup,
21097
21097
  interceptor: interceptor,
21098
21098
  renderer: renderer,
@@ -24757,6 +24757,15 @@ function toFloatValueFixed(inputValue, digitsValue) {
24757
24757
  }
24758
24758
  ;// CONCATENATED MODULE: ./node_modules/vxe-table/es/input/src/input.js
24759
24759
 
24760
+ var input_spreadArray = undefined && undefined.__spreadArray || function (to, from, pack) {
24761
+ if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
24762
+ if (ar || !(i in from)) {
24763
+ if (!ar) ar = Array.prototype.slice.call(from, 0, i);
24764
+ ar[i] = from[i];
24765
+ }
24766
+ }
24767
+ return to.concat(ar || Array.prototype.slice.call(from));
24768
+ };
24760
24769
 
24761
24770
 
24762
24771
 
@@ -25448,6 +25457,10 @@ var quarterSize = 8;
25448
25457
  };
25449
25458
  var focusEvent = function (evnt) {
25450
25459
  reactData.isActivated = true;
25460
+ var isDatePickerType = computeIsDatePickerType.value;
25461
+ if (isDatePickerType) {
25462
+ datePickerOpenEvent(evnt);
25463
+ }
25451
25464
  triggerEvent(evnt);
25452
25465
  };
25453
25466
  var clickPrefixEvent = function (evnt) {
@@ -25601,17 +25614,24 @@ var quarterSize = 8;
25601
25614
  var dateMultipleValue = computeDateMultipleValue.value;
25602
25615
  if (isDateTimeType) {
25603
25616
  // 如果是datetime特殊类型
25604
- var dateListValue = computeDateListValue.value;
25617
+ var dateListValue = input_spreadArray([], computeDateListValue.value, true);
25605
25618
  var datetimeRest_1 = [];
25619
+ var eqIndex = xe_utils_default().findIndexOf(dateListValue, function (val) {
25620
+ return xe_utils_default().isDateSame(date, val, 'yyyyMMdd');
25621
+ });
25622
+ if (eqIndex === -1) {
25623
+ dateListValue.push(date);
25624
+ } else {
25625
+ dateListValue.splice(eqIndex, 1);
25626
+ }
25606
25627
  dateListValue.forEach(function (item) {
25607
- if (item && !xe_utils_default().isDateSame(date, item, 'yyyyMMdd')) {
25628
+ if (item) {
25608
25629
  item.setHours(datetimePanelValue.getHours());
25609
25630
  item.setMinutes(datetimePanelValue.getMinutes());
25610
25631
  item.setSeconds(datetimePanelValue.getSeconds());
25611
25632
  datetimeRest_1.push(item);
25612
25633
  }
25613
25634
  });
25614
- datetimeRest_1.push(date);
25615
25635
  emitModel(datetimeRest_1.map(function (date) {
25616
25636
  return xe_utils_default().toDateString(date, dateValueFormat);
25617
25637
  }).join(','), {
@@ -26096,10 +26116,40 @@ var quarterSize = 8;
26096
26116
  };
26097
26117
  var dateConfirmEvent = function () {
26098
26118
  var multiple = props.multiple;
26119
+ var datetimePanelValue = reactData.datetimePanelValue;
26099
26120
  var dateValue = computeDateValue.value;
26100
26121
  var isDateTimeType = computeIsDateTimeType.value;
26101
- if (isDateTimeType || multiple) {
26102
- dateChange(dateValue || reactData.currentDate);
26122
+ if (isDateTimeType) {
26123
+ var dateValueFormat_1 = computeDateValueFormat.value;
26124
+ if (multiple) {
26125
+ // 如果为多选
26126
+ var dateMultipleValue = computeDateMultipleValue.value;
26127
+ if (isDateTimeType) {
26128
+ // 如果是datetime特殊类型
26129
+ var dateListValue = input_spreadArray([], computeDateListValue.value, true);
26130
+ var datetimeRest_2 = [];
26131
+ dateListValue.forEach(function (item) {
26132
+ if (item) {
26133
+ item.setHours(datetimePanelValue.getHours());
26134
+ item.setMinutes(datetimePanelValue.getMinutes());
26135
+ item.setSeconds(datetimePanelValue.getSeconds());
26136
+ datetimeRest_2.push(item);
26137
+ }
26138
+ });
26139
+ emitModel(datetimeRest_2.map(function (date) {
26140
+ return xe_utils_default().toDateString(date, dateValueFormat_1);
26141
+ }).join(','), {
26142
+ type: 'update'
26143
+ });
26144
+ } else {
26145
+ // 如果是日期类型
26146
+ emitModel(dateMultipleValue.join(','), {
26147
+ type: 'update'
26148
+ });
26149
+ }
26150
+ } else {
26151
+ dateChange(dateValue || reactData.currentDate);
26152
+ }
26103
26153
  }
26104
26154
  hidePanel();
26105
26155
  };
@@ -26320,10 +26370,6 @@ var quarterSize = 8;
26320
26370
  }
26321
26371
  };
26322
26372
  var clickEvent = function (evnt) {
26323
- var isDatePickerType = computeIsDatePickerType.value;
26324
- if (isDatePickerType) {
26325
- datePickerOpenEvent(evnt);
26326
- }
26327
26373
  triggerEvent(evnt);
26328
26374
  };
26329
26375
  // 弹出面板
@@ -31749,7 +31795,7 @@ var Cell = {
31749
31795
  return renderTitleContent(params, getSlotVNs(compConf.renderHeader(renderOpts, params)));
31750
31796
  }
31751
31797
  }
31752
- return renderTitleContent(params, [formatText(column.getTitle(), 1)]);
31798
+ return renderTitleContent(params, formatText(column.getTitle(), 1));
31753
31799
  },
31754
31800
  renderDefaultHeader: function (params) {
31755
31801
  return renderHelpIcon(params).concat(Cell.renderHeaderTitle(params));
@@ -31862,7 +31908,7 @@ var Cell = {
31862
31908
  column = params.column;
31863
31909
  var slots = column.slots;
31864
31910
  var headerSlot = slots ? slots.header : null;
31865
- return renderTitleContent(params, headerSlot ? $table.callSlot(headerSlot, params) : [formatText(column.getTitle(), 1)]);
31911
+ return renderTitleContent(params, headerSlot ? $table.callSlot(headerSlot, params) : formatText(column.getTitle(), 1));
31866
31912
  },
31867
31913
  renderSeqCell: function (params) {
31868
31914
  var $table = params.$table,
@@ -32919,7 +32965,7 @@ var grid_spreadArray = undefined && undefined.__spreadArray || function (to, fro
32919
32965
 
32920
32966
  var tableComponentPropKeys = Object.keys(props);
32921
32967
  var tableComponentMethodKeys = ['clearAll', 'syncData', 'updateData', 'loadData', 'reloadData', 'reloadRow', 'loadColumn', 'reloadColumn', 'getRowNode', 'getColumnNode', 'getRowIndex', 'getVTRowIndex', 'getVMRowIndex', 'getColumnIndex', 'getVTColumnIndex', 'getVMColumnIndex', 'createData', 'createRow', 'revertData', 'clearData', 'isInsertByRow', 'isUpdateByRow', 'getColumns', 'getColumnById', 'getColumnByField', 'getTableColumn', 'getData', 'getCheckboxRecords', 'getParentRow', 'getRowSeq', 'getRowById', 'getRowid', 'getTableData', 'hideColumn', 'showColumn', 'resetColumn', 'refreshColumn', 'refreshScroll', 'recalculate', 'closeTooltip', 'isAllCheckboxChecked', 'isAllCheckboxIndeterminate', 'getCheckboxIndeterminateRecords', 'setCheckboxRow', 'isCheckedByCheckboxRow', 'isIndeterminateByCheckboxRow', 'toggleCheckboxRow', 'setAllCheckboxRow', 'getRadioReserveRecord', 'clearRadioReserve', 'getCheckboxReserveRecords', 'clearCheckboxReserve', 'toggleAllCheckboxRow', 'clearCheckboxRow', 'setCurrentRow', 'isCheckedByRadioRow', 'setRadioRow', 'clearCurrentRow', 'clearRadioRow', 'getCurrentRecord', 'getRadioRecord', 'getCurrentColumn', 'setCurrentColumn', 'clearCurrentColumn', 'sort', 'clearSort', 'isSort', 'getSortColumns', 'closeFilter', 'isFilter', 'isRowExpandLoaded', 'clearRowExpandLoaded', 'reloadRowExpand', 'reloadRowExpand', 'toggleRowExpand', 'setAllRowExpand', 'setRowExpand', 'isExpandByRow', 'clearRowExpand', 'clearRowExpandReserve', 'getRowExpandRecords', 'getTreeExpandRecords', 'isTreeExpandLoaded', 'clearTreeExpandLoaded', 'reloadTreeExpand', 'reloadTreeChilds', 'toggleTreeExpand', 'setAllTreeExpand', 'setTreeExpand', 'isTreeExpandByRow', 'clearTreeExpand', 'clearTreeExpandReserve', 'getScroll', 'scrollTo', 'scrollToRow', 'scrollToColumn', 'clearScroll', 'updateFooter', 'updateStatus', 'setMergeCells', 'removeInsertRow', 'removeMergeCells', 'getMergeCells', 'clearMergeCells', 'setMergeFooterItems', 'removeMergeFooterItems', 'getMergeFooterItems', 'clearMergeFooterItems', 'openTooltip', 'focus', 'blur', 'connect'];
32922
- var gridComponentEmits = grid_spreadArray(grid_spreadArray([], emits, true), ['page-change', 'form-submit', 'form-submit-invalid', 'form-reset', 'form-collapse', 'form-toggle-collapse', 'toolbar-button-click', 'toolbar-tool-click', 'zoom'], false);
32968
+ var gridComponentEmits = grid_spreadArray(grid_spreadArray([], emits, true), ['page-change', 'form-submit', 'form-submit-invalid', 'form-reset', 'form-collapse', 'form-toggle-collapse', 'proxy-query', 'proxy-delete', 'proxy-save', 'toolbar-button-click', 'toolbar-tool-click', 'zoom'], false);
32923
32969
  /* harmony default export */ var grid = ((0,external_commonjs_vue_commonjs2_vue_root_Vue_.defineComponent)({
32924
32970
  name: 'VxeGrid',
32925
32971
  props: grid_assign(grid_assign({}, props), {
@@ -33201,7 +33247,7 @@ var gridComponentEmits = grid_spreadArray(grid_spreadArray([], emits, true), ['p
33201
33247
  escClosable: true
33202
33248
  }).then(function (type) {
33203
33249
  if (type === 'confirm') {
33204
- callback();
33250
+ return callback();
33205
33251
  }
33206
33252
  });
33207
33253
  } else {
@@ -33229,7 +33275,9 @@ var gridComponentEmits = grid_spreadArray(grid_spreadArray([], emits, true), ['p
33229
33275
  tablePage.pageSize = pageSize;
33230
33276
  gridMethods.dispatchEvent('page-change', params);
33231
33277
  if (proxyConfig) {
33232
- gridMethods.commitProxy('query');
33278
+ gridMethods.commitProxy('query').then(function (rest) {
33279
+ gridMethods.dispatchEvent('proxy-query', rest, params.$event);
33280
+ });
33233
33281
  }
33234
33282
  };
33235
33283
  var sortChangeEvent = function (params) {
@@ -33242,7 +33290,9 @@ var gridComponentEmits = grid_spreadArray(grid_spreadArray([], emits, true), ['p
33242
33290
  reactData.sortData = params.sortList;
33243
33291
  if (proxyConfig) {
33244
33292
  reactData.tablePage.currentPage = 1;
33245
- gridMethods.commitProxy('query');
33293
+ gridMethods.commitProxy('query').then(function (rest) {
33294
+ gridMethods.dispatchEvent('proxy-query', rest, params.$event);
33295
+ });
33246
33296
  }
33247
33297
  }
33248
33298
  gridMethods.dispatchEvent('sort-change', params);
@@ -33257,7 +33307,9 @@ var gridComponentEmits = grid_spreadArray(grid_spreadArray([], emits, true), ['p
33257
33307
  reactData.filterData = params.filterList;
33258
33308
  if (proxyConfig) {
33259
33309
  reactData.tablePage.currentPage = 1;
33260
- gridMethods.commitProxy('query');
33310
+ gridMethods.commitProxy('query').then(function (rest) {
33311
+ gridMethods.dispatchEvent('proxy-query', rest, params.$event);
33312
+ });
33261
33313
  }
33262
33314
  }
33263
33315
  gridMethods.dispatchEvent('filter-change', params);
@@ -33265,14 +33317,22 @@ var gridComponentEmits = grid_spreadArray(grid_spreadArray([], emits, true), ['p
33265
33317
  var submitFormEvent = function (params) {
33266
33318
  var proxyConfig = props.proxyConfig;
33267
33319
  if (proxyConfig) {
33268
- gridMethods.commitProxy('reload');
33320
+ gridMethods.commitProxy('reload').then(function (rest) {
33321
+ gridMethods.dispatchEvent('proxy-query', grid_assign(grid_assign({}, rest), {
33322
+ isReload: true
33323
+ }), params.$event);
33324
+ });
33269
33325
  }
33270
33326
  gridMethods.dispatchEvent('form-submit', params);
33271
33327
  };
33272
33328
  var resetFormEvent = function (params) {
33273
33329
  var proxyConfig = props.proxyConfig;
33274
33330
  if (proxyConfig) {
33275
- gridMethods.commitProxy('reload');
33331
+ gridMethods.commitProxy('reload').then(function (rest) {
33332
+ gridMethods.dispatchEvent('proxy-query', grid_assign(grid_assign({}, rest), {
33333
+ isReload: true
33334
+ }), params.$event);
33335
+ });
33276
33336
  }
33277
33337
  gridMethods.dispatchEvent('form-reset', params);
33278
33338
  };
@@ -33559,8 +33619,12 @@ var gridComponentEmits = grid_spreadArray(grid_spreadArray([], emits, true), ['p
33559
33619
  if (!proxyInited) {
33560
33620
  reactData.proxyInited = true;
33561
33621
  if (proxyOpts.autoLoad !== false) {
33562
- (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(function () {
33622
+ (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(function () {
33563
33623
  return gridMethods.commitProxy('_init');
33624
+ }).then(function (rest) {
33625
+ gridMethods.dispatchEvent('proxy-query', grid_assign(grid_assign({}, rest), {
33626
+ isInited: true
33627
+ }), new Event('init'));
33564
33628
  });
33565
33629
  }
33566
33630
  }
@@ -33619,14 +33683,12 @@ var gridComponentEmits = grid_spreadArray(grid_spreadArray([], emits, true), ['p
33619
33683
  var btnParams = button ? button.params : null;
33620
33684
  switch (code) {
33621
33685
  case 'insert':
33622
- $xetable.insert({});
33623
- break;
33686
+ return $xetable.insert({});
33624
33687
  case 'insert_actived':
33625
- $xetable.insert({}).then(function (_a) {
33688
+ return $xetable.insert({}).then(function (_a) {
33626
33689
  var row = _a.row;
33627
- return $xetable.setActiveRow(row);
33690
+ return $xetable.setEditRow(row);
33628
33691
  });
33629
- break;
33630
33692
  case 'mark_cancel':
33631
33693
  triggerPendingEvent(code);
33632
33694
  break;
@@ -33647,8 +33709,7 @@ var gridComponentEmits = grid_spreadArray(grid_spreadArray([], emits, true), ['p
33647
33709
  $xetable.openExport(btnParams);
33648
33710
  break;
33649
33711
  case 'reset_custom':
33650
- $xetable.resetColumn(true);
33651
- break;
33712
+ return $xetable.resetColumn(true);
33652
33713
  case '_init':
33653
33714
  case 'reload':
33654
33715
  case 'query':
@@ -33695,9 +33756,11 @@ var gridComponentEmits = grid_spreadArray(grid_spreadArray([], emits, true), ['p
33695
33756
  filterList = $xetable.getCheckedFilters();
33696
33757
  }
33697
33758
  }
33698
- var params = {
33759
+ var commitParams = {
33699
33760
  code: code,
33700
33761
  button: button,
33762
+ isInited: isInited,
33763
+ isReload: isReload,
33701
33764
  $grid: $xegrid,
33702
33765
  page: pageParams,
33703
33766
  sort: sortList.length ? sortList[0] : {},
@@ -33709,10 +33772,8 @@ var gridComponentEmits = grid_spreadArray(grid_spreadArray([], emits, true), ['p
33709
33772
  reactData.sortData = sortList;
33710
33773
  reactData.filterData = filterList;
33711
33774
  reactData.tableLoading = true;
33712
- var applyArgs_1 = [params].concat(args);
33713
- return Promise.resolve((beforeQuery || ajaxMethods).apply(void 0, applyArgs_1)).catch(function (e) {
33714
- return e;
33715
- }).then(function (rest) {
33775
+ var applyArgs_1 = [commitParams].concat(args);
33776
+ return Promise.resolve((beforeQuery || ajaxMethods).apply(void 0, applyArgs_1)).then(function (rest) {
33716
33777
  reactData.tableLoading = false;
33717
33778
  if (rest) {
33718
33779
  if (isEnableConf(pagerConfig)) {
@@ -33733,6 +33794,13 @@ var gridComponentEmits = grid_spreadArray(grid_spreadArray([], emits, true), ['p
33733
33794
  if (afterQuery) {
33734
33795
  afterQuery.apply(void 0, applyArgs_1);
33735
33796
  }
33797
+ return {
33798
+ status: true
33799
+ };
33800
+ }).catch(function () {
33801
+ return {
33802
+ status: false
33803
+ };
33736
33804
  });
33737
33805
  } else {
33738
33806
  if (false) {}
@@ -33750,13 +33818,14 @@ var gridComponentEmits = grid_spreadArray(grid_spreadArray([], emits, true), ['p
33750
33818
  var body = {
33751
33819
  removeRecords: removeRecords_1
33752
33820
  };
33753
- var applyArgs_2 = [{
33821
+ var commitParams = {
33754
33822
  $grid: $xegrid,
33755
33823
  code: code,
33756
33824
  button: button,
33757
33825
  body: body,
33758
33826
  options: ajaxMethods_1
33759
- }].concat(args);
33827
+ };
33828
+ var applyArgs_2 = [commitParams].concat(args);
33760
33829
  if (selectRecords_1.length) {
33761
33830
  return handleDeleteRow(code, 'vxe.grid.deleteSelectRecord', function () {
33762
33831
  if (!removeRecords_1.length) {
@@ -33781,6 +33850,9 @@ var gridComponentEmits = grid_spreadArray(grid_spreadArray([], emits, true), ['p
33781
33850
  } else {
33782
33851
  gridMethods.commitProxy('query');
33783
33852
  }
33853
+ return {
33854
+ status: true
33855
+ };
33784
33856
  }).catch(function (rest) {
33785
33857
  reactData.tableLoading = false;
33786
33858
  if (isMsg) {
@@ -33791,6 +33863,9 @@ var gridComponentEmits = grid_spreadArray(grid_spreadArray([], emits, true), ['p
33791
33863
  status: 'error'
33792
33864
  });
33793
33865
  }
33866
+ return {
33867
+ status: false
33868
+ };
33794
33869
  });
33795
33870
  });
33796
33871
  } else {
@@ -33820,13 +33895,14 @@ var gridComponentEmits = grid_spreadArray(grid_spreadArray([], emits, true), ['p
33820
33895
  removeRecords_2 = body_1.removeRecords,
33821
33896
  updateRecords_1 = body_1.updateRecords,
33822
33897
  pendingRecords_1 = body_1.pendingRecords;
33823
- var applyArgs_3 = [{
33898
+ var commitParams = {
33824
33899
  $grid: $xegrid,
33825
33900
  code: code,
33826
33901
  button: button,
33827
33902
  body: body_1,
33828
33903
  options: ajaxMethods_2
33829
- }].concat(args);
33904
+ };
33905
+ var applyArgs_3 = [commitParams].concat(args);
33830
33906
  // 排除掉新增且标记为删除的数据
33831
33907
  if (insertRecords_1.length) {
33832
33908
  body_1.pendingRecords = pendingRecords_1.filter(function (row) {
@@ -33867,6 +33943,9 @@ var gridComponentEmits = grid_spreadArray(grid_spreadArray([], emits, true), ['p
33867
33943
  } else {
33868
33944
  gridMethods.commitProxy('query');
33869
33945
  }
33946
+ return {
33947
+ status: true
33948
+ };
33870
33949
  }).catch(function (rest) {
33871
33950
  reactData.tableLoading = false;
33872
33951
  if (isMsg) {
@@ -33878,6 +33957,9 @@ var gridComponentEmits = grid_spreadArray(grid_spreadArray([], emits, true), ['p
33878
33957
  status: 'error'
33879
33958
  });
33880
33959
  }
33960
+ return {
33961
+ status: false
33962
+ };
33881
33963
  });
33882
33964
  } else {
33883
33965
  if (isMsg) {
@@ -33994,15 +34076,25 @@ var gridComponentEmits = grid_spreadArray(grid_spreadArray([], emits, true), ['p
33994
34076
  }
33995
34077
  return 0;
33996
34078
  },
34079
+ triggerToolbarCommitEvent: function (params, evnt) {
34080
+ var code = params.code;
34081
+ return gridMethods.commitProxy(params, evnt).then(function (rest) {
34082
+ if (code && rest && rest.status && ['query', 'reload', 'delete', 'save'].includes(code)) {
34083
+ gridMethods.dispatchEvent(code === 'delete' || code === 'save' ? "proxy-".concat(code) : 'proxy-query', grid_assign(grid_assign({}, rest), {
34084
+ isReload: code === 'reload'
34085
+ }), evnt);
34086
+ }
34087
+ });
34088
+ },
33997
34089
  triggerToolbarBtnEvent: function (button, evnt) {
33998
- gridMethods.commitProxy(button, evnt);
34090
+ gridPrivateMethods.triggerToolbarCommitEvent(button, evnt);
33999
34091
  gridMethods.dispatchEvent('toolbar-button-click', {
34000
34092
  code: button.code,
34001
34093
  button: button
34002
34094
  }, evnt);
34003
34095
  },
34004
34096
  triggerToolbarTolEvent: function (tool, evnt) {
34005
- gridMethods.commitProxy(tool, evnt);
34097
+ gridPrivateMethods.triggerToolbarCommitEvent(tool, evnt);
34006
34098
  gridMethods.dispatchEvent('toolbar-tool-click', {
34007
34099
  code: tool.code,
34008
34100
  tool: tool,
@@ -34017,11 +34109,20 @@ var gridComponentEmits = grid_spreadArray(grid_spreadArray([], emits, true), ['p
34017
34109
  }
34018
34110
  };
34019
34111
  Object.assign($xegrid, gridExtendTableMethods, gridMethods, gridPrivateMethods);
34112
+ var columnFlag = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)(0);
34113
+ (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(function () {
34114
+ return props.columns ? props.columns.length : -1;
34115
+ }, function () {
34116
+ columnFlag.value++;
34117
+ });
34020
34118
  (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(function () {
34021
34119
  return props.columns;
34022
- }, function (value) {
34120
+ }, function () {
34121
+ columnFlag.value++;
34122
+ });
34123
+ (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(columnFlag, function () {
34023
34124
  (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(function () {
34024
- return $xegrid.loadColumn(value || []);
34125
+ return $xegrid.loadColumn(props.columns || []);
34025
34126
  });
34026
34127
  });
34027
34128
  (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(function () {
@@ -34389,7 +34490,7 @@ var toolbar_assign = undefined && undefined.__assign || function () {
34389
34490
  }
34390
34491
  }, 300);
34391
34492
  };
34392
- var refreshEvent = function () {
34493
+ var refreshEvent = function (evnt) {
34393
34494
  var isRefresh = reactData.isRefresh;
34394
34495
  var refreshOpts = computeRefreshOpts.value;
34395
34496
  if (!isRefresh) {
@@ -34407,7 +34508,9 @@ var toolbar_assign = undefined && undefined.__assign || function () {
34407
34508
  }
34408
34509
  } else if ($xegrid) {
34409
34510
  reactData.isRefresh = true;
34410
- $xegrid.commitProxy(refreshOpts.code || 'reload').catch(function (e) {
34511
+ $xegrid.triggerToolbarCommitEvent({
34512
+ code: refreshOpts.code || 'reload'
34513
+ }, evnt).catch(function (e) {
34411
34514
  return e;
34412
34515
  }).then(function () {
34413
34516
  reactData.isRefresh = false;
@@ -34431,6 +34534,7 @@ var toolbar_assign = undefined && undefined.__assign || function () {
34431
34534
  code: code,
34432
34535
  button: item,
34433
34536
  $table: $xetable,
34537
+ $grid: $xetable.xegrid,
34434
34538
  $event: evnt
34435
34539
  };
34436
34540
  if (commandMethod) {
@@ -34451,6 +34555,7 @@ var toolbar_assign = undefined && undefined.__assign || function () {
34451
34555
  code: code,
34452
34556
  tool: item,
34453
34557
  $table: $xetable,
34558
+ $grid: $xetable.xegrid,
34454
34559
  $event: evnt
34455
34560
  };
34456
34561
  if (commandMethod) {
@@ -34968,10 +35073,12 @@ var pager_assign = undefined && undefined.__assign || function () {
34968
35073
  };
34969
35074
  var triggerJumpEvent = function (evnt) {
34970
35075
  var inputElem = evnt.target;
34971
- var inpValue = xe_utils_default().toNumber(inputElem.value);
35076
+ var inpValue = xe_utils_default().toInteger(inputElem.value);
34972
35077
  var pageCount = computePageCount.value;
34973
35078
  var current = inpValue <= 0 ? 1 : inpValue >= pageCount ? pageCount : inpValue;
34974
- inputElem.value = xe_utils_default().toValueString(current);
35079
+ var currPage = xe_utils_default().toValueString(current);
35080
+ inputElem.value = currPage;
35081
+ reactData.inpCurrPage = currPage;
34975
35082
  changeCurrentPage(current, evnt);
34976
35083
  };
34977
35084
  var computeNumList = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(function () {
@@ -35027,11 +35134,17 @@ var pager_assign = undefined && undefined.__assign || function () {
35027
35134
  var pageSizeEvent = function (params) {
35028
35135
  var value = params.value;
35029
35136
  var pageSize = xe_utils_default().toNumber(value);
35137
+ var pageCount = getPageCount(props.total, pageSize);
35138
+ var currentPage = props.currentPage;
35139
+ if (currentPage > pageCount) {
35140
+ currentPage = pageCount;
35141
+ emit('update:currentPage', pageCount);
35142
+ }
35030
35143
  emit('update:pageSize', pageSize);
35031
35144
  pagerMethods.dispatchEvent('page-change', {
35032
35145
  type: 'size',
35033
35146
  pageSize: pageSize,
35034
- currentPage: Math.min(props.currentPage, getPageCount(props.total, pageSize))
35147
+ currentPage: currentPage
35035
35148
  });
35036
35149
  };
35037
35150
  var jumpInputEvent = function (evnt) {
@@ -36531,7 +36644,8 @@ function isActivetem($xeform, formItem) {
36531
36644
  field: field,
36532
36645
  property: field,
36533
36646
  item: formItem,
36534
- $form: $xeform
36647
+ $form: $xeform,
36648
+ $grid: $xeform.xegrid
36535
36649
  });
36536
36650
  }
36537
36651
  function watchItem(props, formItem) {
@@ -36611,7 +36725,8 @@ function renderTitle($xeform, item) {
36611
36725
  field: field,
36612
36726
  property: field,
36613
36727
  item: item,
36614
- $form: $xeform
36728
+ $form: $xeform,
36729
+ $grid: $xeform.xegrid
36615
36730
  };
36616
36731
  var titleSlot = slots ? slots.title : null;
36617
36732
  var contVNs = [];
@@ -36669,7 +36784,6 @@ var form_config_item_assign = undefined && undefined.__assign || function () {
36669
36784
  var VxeFormConfigItem = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.defineComponent)({
36670
36785
  name: 'VxeFormConfigItem',
36671
36786
  props: {
36672
- itemConfig2: Object,
36673
36787
  itemConfig: Object
36674
36788
  },
36675
36789
  setup: function (props) {
@@ -36727,7 +36841,8 @@ var VxeFormConfigItem = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.defineC
36727
36841
  field: field,
36728
36842
  property: field,
36729
36843
  item: item,
36730
- $form: $xeform
36844
+ $form: $xeform,
36845
+ $grid: $xeform.xegrid
36731
36846
  };
36732
36847
  if (visible === false) {
36733
36848
  return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)();
@@ -36795,9 +36910,7 @@ var VxeFormConfigItem = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.defineC
36795
36910
  'is--hidden': folding && collapseAll,
36796
36911
  'is--active': isActivetem($xeform, item),
36797
36912
  'is--error': showError
36798
- }],
36799
- itemConfig: item,
36800
- key: item.id
36913
+ }]
36801
36914
  }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
36802
36915
  class: 'vxe-form--item-inner'
36803
36916
  }, [title || titleSlot ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', form_config_item_assign({
@@ -37000,6 +37113,7 @@ function getResetValue(value, resetValue) {
37000
37113
  visible: false
37001
37114
  }
37002
37115
  });
37116
+ var $xegrid = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.inject)('$xegrid', null);
37003
37117
  var refElem = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
37004
37118
  var refTooltip = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
37005
37119
  var formMethods = {};
@@ -37022,6 +37136,7 @@ function getResetValue(value, resetValue) {
37022
37136
  props: props,
37023
37137
  context: context,
37024
37138
  reactData: reactData,
37139
+ xegrid: $xegrid,
37025
37140
  getRefMaps: function () {
37026
37141
  return refMaps;
37027
37142
  },
@@ -37120,7 +37235,8 @@ function getResetValue(value, resetValue) {
37120
37235
  field: field,
37121
37236
  property: field,
37122
37237
  item: item,
37123
- $form: $xeform
37238
+ $form: $xeform,
37239
+ $grid: $xeform.xegrid
37124
37240
  });
37125
37241
  } else if (field) {
37126
37242
  xe_utils_default().set(data, field, resetValue === null ? getResetValue(xe_utils_default().get(data, field), undefined) : xe_utils_default().clone(resetValue, true));
@@ -37418,6 +37534,7 @@ function getResetValue(value, resetValue) {
37418
37534
  dispatchEvent: function (type, params, evnt) {
37419
37535
  emit(type, Object.assign({
37420
37536
  $form: $xeform,
37537
+ $grid: $xegrid,
37421
37538
  $event: evnt
37422
37539
  }, params));
37423
37540
  },
@@ -37439,15 +37556,33 @@ function getResetValue(value, resetValue) {
37439
37556
  handleTitleTipLeaveEvent: handleTitleTipLeaveEvent
37440
37557
  };
37441
37558
  Object.assign($xeform, formMethods, formPrivateMethods);
37559
+ var staticItemFlag = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)(0);
37560
+ (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(function () {
37561
+ return reactData.staticItems.length;
37562
+ }, function () {
37563
+ staticItemFlag.value++;
37564
+ });
37442
37565
  (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(function () {
37443
37566
  return reactData.staticItems;
37444
- }, function (value) {
37445
- reactData.formItems = value;
37567
+ }, function () {
37568
+ staticItemFlag.value++;
37569
+ });
37570
+ (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(staticItemFlag, function () {
37571
+ reactData.formItems = reactData.staticItems;
37572
+ });
37573
+ var itemFlag = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)(0);
37574
+ (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(function () {
37575
+ return props.items ? props.items.length : -1;
37576
+ }, function () {
37577
+ itemFlag.value++;
37446
37578
  });
37447
37579
  (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(function () {
37448
37580
  return props.items;
37449
- }, function (value) {
37450
- loadItem(value || []);
37581
+ }, function () {
37582
+ itemFlag.value++;
37583
+ });
37584
+ (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(itemFlag, function () {
37585
+ loadItem(props.items || []);
37451
37586
  });
37452
37587
  (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(function () {
37453
37588
  return props.collapseStatus;
@@ -37485,7 +37620,6 @@ function getResetValue(value, resetValue) {
37485
37620
  }, customLayout ? defaultSlot ? defaultSlot({}) : [] : formItems.map(function (item, index) {
37486
37621
  return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(form_config_item, {
37487
37622
  key: index,
37488
- itemConfig2: item,
37489
37623
  itemConfig: item
37490
37624
  });
37491
37625
  })), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
@@ -37658,7 +37792,8 @@ var formItemProps = {
37658
37792
  field: field,
37659
37793
  property: field,
37660
37794
  item: item,
37661
- $form: $xeform
37795
+ $form: $xeform,
37796
+ $grid: $xeform.xegrid
37662
37797
  };
37663
37798
  var isRequired = false;
37664
37799
  if (visible === false) {
@@ -38497,7 +38632,8 @@ function createResizeEvent(callback) {
38497
38632
  visibleSize: 0
38498
38633
  });
38499
38634
  internalData.fullData = fullData;
38500
- reactData.scrollYLoad = !!sYOpts.enabled && sYOpts.gt > -1 && sYOpts.gt <= fullData.length;
38635
+ // 如果gt为0,则总是启用
38636
+ reactData.scrollYLoad = !!sYOpts.enabled && sYOpts.gt > -1 && (sYOpts.gt === 0 || sYOpts.gt <= fullData.length);
38501
38637
  handleData();
38502
38638
  return computeScrollLoad().then(function () {
38503
38639
  refreshScroll();
@@ -38517,10 +38653,19 @@ function createResizeEvent(callback) {
38517
38653
  clearScroll: clearScroll
38518
38654
  };
38519
38655
  Object.assign($xelist, listMethods);
38656
+ var dataFlag = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)(0);
38657
+ (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(function () {
38658
+ return props.data ? props.data.length : -1;
38659
+ }, function () {
38660
+ dataFlag.value++;
38661
+ });
38520
38662
  (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(function () {
38521
38663
  return props.data;
38522
- }, function (value) {
38523
- listMethods.loadData(value || []);
38664
+ }, function () {
38665
+ dataFlag.value++;
38666
+ });
38667
+ (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(dataFlag, function () {
38668
+ listMethods.loadData(props.data || []);
38524
38669
  });
38525
38670
  (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(function () {
38526
38671
  return props.syncResize;
@@ -38534,6 +38679,11 @@ function createResizeEvent(callback) {
38534
38679
  });
38535
38680
  }
38536
38681
  });
38682
+ (0,external_commonjs_vue_commonjs2_vue_root_Vue_.onActivated)(function () {
38683
+ recalculate().then(function () {
38684
+ return refreshScroll();
38685
+ });
38686
+ });
38537
38687
  var resizeObserver;
38538
38688
  (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(function () {
38539
38689
  GlobalEvent.on($xelist, 'resize', function () {
@@ -39152,6 +39302,7 @@ var lineOffsetSizes = {
39152
39302
  };
39153
39303
  var params = {
39154
39304
  $table: $xetable,
39305
+ $grid: $xetable.xegrid,
39155
39306
  seq: seq,
39156
39307
  rowid: rowid,
39157
39308
  row: row,
@@ -40193,6 +40344,7 @@ var header_renderType = 'header';
40193
40344
  var _columnIndex = $xetable.getVTColumnIndex(column);
40194
40345
  var params = {
40195
40346
  $table: $xetable,
40347
+ $grid: $xetable.xegrid,
40196
40348
  $rowIndex: $rowIndex,
40197
40349
  column: column,
40198
40350
  columnIndex: columnIndex,
@@ -40526,6 +40678,7 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
40526
40678
  var itemIndex = _columnIndex;
40527
40679
  var params = {
40528
40680
  $table: $xetable,
40681
+ $grid: $xetable.xegrid,
40529
40682
  _rowIndex: _rowIndex,
40530
40683
  $rowIndex: $rowIndex,
40531
40684
  column: column,
@@ -42366,7 +42519,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
42366
42519
  var checkAll = checkboxOpts.checkAll,
42367
42520
  checkRowKeys = checkboxOpts.checkRowKeys;
42368
42521
  if (checkAll) {
42369
- tableMethods.setAllCheckboxRow(true);
42522
+ handleCheckedAllCheckboxRow(true, true);
42370
42523
  } else if (checkRowKeys) {
42371
42524
  var defSelection_1 = [];
42372
42525
  checkRowKeys.forEach(function (rowid) {
@@ -42374,7 +42527,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
42374
42527
  defSelection_1.push(fullDataRowIdData_1[rowid].row);
42375
42528
  }
42376
42529
  });
42377
- tableMethods.setCheckboxRow(defSelection_1, true);
42530
+ handleCheckedCheckboxRow(defSelection_1, true, true);
42378
42531
  }
42379
42532
  }
42380
42533
  };
@@ -42391,7 +42544,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
42391
42544
  reserve = radioOpts.reserve;
42392
42545
  if (rowid) {
42393
42546
  if (fullDataRowIdData[rowid]) {
42394
- tableMethods.setRadioRow(fullDataRowIdData[rowid].row);
42547
+ handleCheckedRadioRow(fullDataRowIdData[rowid].row, true);
42395
42548
  }
42396
42549
  if (reserve) {
42397
42550
  var rowkey = getRowkey($xetable);
@@ -42441,6 +42594,150 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
42441
42594
  }
42442
42595
  }
42443
42596
  };
42597
+ var handleCheckedRadioRow = function (row, isForce) {
42598
+ var radioOpts = computeRadioOpts.value;
42599
+ var checkMethod = radioOpts.checkMethod;
42600
+ if (row && (isForce || !checkMethod || checkMethod({
42601
+ row: row
42602
+ }))) {
42603
+ reactData.selectRow = row;
42604
+ handleRadioReserveRow(row);
42605
+ }
42606
+ return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
42607
+ };
42608
+ var handleCheckedCheckboxRow = function (rows, value, isForce) {
42609
+ if (rows && !xe_utils_default().isArray(rows)) {
42610
+ rows = [rows];
42611
+ }
42612
+ rows.forEach(function (row) {
42613
+ return tablePrivateMethods.handleSelectRow({
42614
+ row: row
42615
+ }, !!value, isForce);
42616
+ });
42617
+ return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
42618
+ };
42619
+ var handleCheckedAllCheckboxRow = function (value, isForce) {
42620
+ var treeConfig = props.treeConfig;
42621
+ var selection = reactData.selection;
42622
+ var afterFullData = internalData.afterFullData,
42623
+ checkboxReserveRowMap = internalData.checkboxReserveRowMap;
42624
+ var treeOpts = computeTreeOpts.value;
42625
+ var checkboxOpts = computeCheckboxOpts.value;
42626
+ var checkField = checkboxOpts.checkField,
42627
+ reserve = checkboxOpts.reserve,
42628
+ checkStrictly = checkboxOpts.checkStrictly,
42629
+ checkMethod = checkboxOpts.checkMethod;
42630
+ var selectRows = [];
42631
+ var beforeSelection = treeConfig ? [] : selection.filter(function (row) {
42632
+ return $xetable.findRowIndexOf(afterFullData, row) === -1;
42633
+ });
42634
+ if (checkStrictly) {
42635
+ reactData.isAllSelected = value;
42636
+ } else {
42637
+ /**
42638
+ * 绑定属性方式(高性能,有污染)
42639
+ * 必须在行数据存在对应的属性,否则将不响应
42640
+ */
42641
+ if (checkField) {
42642
+ var checkValFn = function (row) {
42643
+ if (isForce || !checkMethod || checkMethod({
42644
+ row: row
42645
+ })) {
42646
+ if (value) {
42647
+ selectRows.push(row);
42648
+ }
42649
+ xe_utils_default().set(row, checkField, value);
42650
+ }
42651
+ };
42652
+ // 如果存在选中方法
42653
+ // 如果方法成立,则更新值,否则忽略该数据
42654
+ if (treeConfig) {
42655
+ xe_utils_default().eachTree(afterFullData, checkValFn, treeOpts);
42656
+ } else {
42657
+ afterFullData.forEach(checkValFn);
42658
+ }
42659
+ } else {
42660
+ /**
42661
+ * 默认方式(低性能,无污染)
42662
+ * 无需任何属性,直接绑定
42663
+ */
42664
+ if (treeConfig) {
42665
+ if (value) {
42666
+ /**
42667
+ * 如果是树勾选
42668
+ * 如果方法成立,则添加到临时集合中
42669
+ */
42670
+ xe_utils_default().eachTree(afterFullData, function (row) {
42671
+ if (isForce || !checkMethod || checkMethod({
42672
+ row: row
42673
+ })) {
42674
+ selectRows.push(row);
42675
+ }
42676
+ }, treeOpts);
42677
+ } else {
42678
+ /**
42679
+ * 如果是树取消
42680
+ * 如果方法成立,则不添加到临时集合中
42681
+ */
42682
+ if (!isForce && checkMethod) {
42683
+ xe_utils_default().eachTree(afterFullData, function (row) {
42684
+ if (checkMethod({
42685
+ row: row
42686
+ }) ? 0 : $xetable.findRowIndexOf(selection, row) > -1) {
42687
+ selectRows.push(row);
42688
+ }
42689
+ }, treeOpts);
42690
+ }
42691
+ }
42692
+ } else {
42693
+ if (value) {
42694
+ /**
42695
+ * 如果是行勾选
42696
+ * 如果存在选中方法且成立或者本身已勾选,则添加到临时集合中
42697
+ * 如果不存在选中方法,则添加所有数据到临时集合中
42698
+ */
42699
+ if (!isForce && checkMethod) {
42700
+ selectRows = afterFullData.filter(function (row) {
42701
+ return $xetable.findRowIndexOf(selection, row) > -1 || checkMethod({
42702
+ row: row
42703
+ });
42704
+ });
42705
+ } else {
42706
+ selectRows = afterFullData.slice(0);
42707
+ }
42708
+ } else {
42709
+ /**
42710
+ * 如果是行取消
42711
+ * 如果方法成立,则不添加到临时集合中;如果方法不成立则判断当前是否已勾选,如果已被勾选则添加到新集合中
42712
+ * 如果不存在选中方法,无需处理,临时集合默认为空
42713
+ */
42714
+ if (!isForce && checkMethod) {
42715
+ selectRows = afterFullData.filter(function (row) {
42716
+ return checkMethod({
42717
+ row: row
42718
+ }) ? 0 : $xetable.findRowIndexOf(selection, row) > -1;
42719
+ });
42720
+ }
42721
+ }
42722
+ }
42723
+ }
42724
+ if (reserve) {
42725
+ if (value) {
42726
+ selectRows.forEach(function (row) {
42727
+ checkboxReserveRowMap[getRowid($xetable, row)] = row;
42728
+ });
42729
+ } else {
42730
+ afterFullData.forEach(function (row) {
42731
+ return handleCheckboxReserveRow(row, false);
42732
+ });
42733
+ }
42734
+ }
42735
+ reactData.selection = checkField ? [] : beforeSelection.concat(selectRows);
42736
+ }
42737
+ reactData.treeIndeterminates = [];
42738
+ tablePrivateMethods.checkSelectionStatus();
42739
+ return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
42740
+ };
42444
42741
  // 还原展开、选中等相关状态
42445
42742
  var handleReserveStatus = function () {
42446
42743
  var treeConfig = props.treeConfig;
@@ -42465,14 +42762,14 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
42465
42762
  if (radioOpts.reserve && radioReserveRow) {
42466
42763
  var rowid = getRowid($xetable, radioReserveRow);
42467
42764
  if (fullDataRowIdData[rowid]) {
42468
- tableMethods.setRadioRow(fullDataRowIdData[rowid].row);
42765
+ handleCheckedRadioRow(fullDataRowIdData[rowid].row, true);
42469
42766
  }
42470
42767
  }
42471
42768
  // 复选框
42472
42769
  reactData.selection = getRecoverRow(selection); // 刷新多选行状态
42473
42770
  // 还原保留选中状态
42474
42771
  if (checkboxOpts.reserve) {
42475
- tableMethods.setCheckboxRow(handleReserveRow(internalData.checkboxReserveRowMap), true);
42772
+ handleCheckedCheckboxRow(handleReserveRow(internalData.checkboxReserveRowMap), true, true);
42476
42773
  }
42477
42774
  if (currentRow && !fullAllDataRowIdData[getRowid($xetable, currentRow)]) {
42478
42775
  reactData.currentRow = null; // 刷新当前行状态
@@ -42547,7 +42844,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
42547
42844
  }
42548
42845
  // 如果当前节点已选中,则展开后子节点也被选中
42549
42846
  if (!checkStrictly && tableMethods.isCheckedByCheckboxRow(row)) {
42550
- tableMethods.setCheckboxRow(childRows, true);
42847
+ handleCheckedCheckboxRow(childRows, true);
42551
42848
  }
42552
42849
  return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(function () {
42553
42850
  if (transform) {
@@ -42916,7 +43213,8 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
42916
43213
  });
42917
43214
  }
42918
43215
  var visibleColumn = leftList.concat(centerList).concat(rightList);
42919
- var scrollXLoad = !!sXOpts.enabled && sXOpts.gt > -1 && sXOpts.gt < tableFullColumn.length;
43216
+ // 如果gt为0,则总是启用
43217
+ var scrollXLoad = !!sXOpts.enabled && sXOpts.gt > -1 && (sXOpts.gt === 0 || sXOpts.gt < tableFullColumn.length);
42920
43218
  reactData.hasFixedColumn = leftList.length > 0 || rightList.length > 0;
42921
43219
  Object.assign(columnStore, {
42922
43220
  leftList: leftList,
@@ -42951,7 +43249,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
42951
43249
  return tableMethods.updateFooter().then(function () {
42952
43250
  return tableMethods.recalculate();
42953
43251
  }).then(function () {
42954
- tablePrivateMethods.updateCellAreas();
43252
+ tableMethods.updateCellAreas();
42955
43253
  return tableMethods.recalculate();
42956
43254
  });
42957
43255
  };
@@ -42985,7 +43283,8 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
42985
43283
  var sYOpts = computeSYOpts.value;
42986
43284
  var treeOpts = computeTreeOpts.value;
42987
43285
  var transform = treeOpts.transform;
42988
- var scrollYLoad = (transform || !treeConfig) && !!sYOpts.enabled && sYOpts.gt > -1 && sYOpts.gt < fullData.length;
43286
+ // 如果gt为0,则总是启用
43287
+ var scrollYLoad = (transform || !treeConfig) && !!sYOpts.enabled && sYOpts.gt > -1 && (sYOpts.gt === 0 || sYOpts.gt < fullData.length);
42989
43288
  reactData.scrollYLoad = scrollYLoad;
42990
43289
  return scrollYLoad;
42991
43290
  };
@@ -43141,6 +43440,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
43141
43440
  dispatchEvent: function (type, params, evnt) {
43142
43441
  emit(type, Object.assign({
43143
43442
  $table: $xetable,
43443
+ $grid: $xegrid,
43144
43444
  $event: evnt
43145
43445
  }, params));
43146
43446
  },
@@ -43181,7 +43481,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
43181
43481
  return tableMethods.refreshScroll();
43182
43482
  }
43183
43483
  }).then(function () {
43184
- tablePrivateMethods.updateCellAreas();
43484
+ tableMethods.updateCellAreas();
43185
43485
  return tableMethods.recalculate(true);
43186
43486
  }).then(function () {
43187
43487
  // 存在滚动行为未结束情况
@@ -43870,11 +44170,12 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
43870
44170
  */
43871
44171
  getCheckboxIndeterminateRecords: function (isFull) {
43872
44172
  var treeConfig = props.treeConfig;
43873
- var afterFullData = internalData.afterFullData;
44173
+ var fullDataRowIdData = internalData.fullDataRowIdData;
43874
44174
  var treeIndeterminates = reactData.treeIndeterminates;
43875
44175
  if (treeConfig) {
43876
44176
  return isFull ? treeIndeterminates.slice(0) : treeIndeterminates.filter(function (row) {
43877
- return $xetable.findRowIndexOf(afterFullData, row) > -1;
44177
+ var rowid = getRowid($xetable, row);
44178
+ return fullDataRowIdData[rowid];
43878
44179
  });
43879
44180
  }
43880
44181
  return [];
@@ -43885,15 +44186,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
43885
44186
  * @param {Boolean} value 是否选中
43886
44187
  */
43887
44188
  setCheckboxRow: function (rows, value) {
43888
- if (rows && !xe_utils_default().isArray(rows)) {
43889
- rows = [rows];
43890
- }
43891
- rows.forEach(function (row) {
43892
- return tablePrivateMethods.handleSelectRow({
43893
- row: row
43894
- }, !!value);
43895
- });
43896
- return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
44189
+ return handleCheckedCheckboxRow(rows, value, true);
43897
44190
  },
43898
44191
  isCheckedByCheckboxRow: function (row) {
43899
44192
  var selection = reactData.selection;
@@ -43912,9 +44205,13 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
43912
44205
  * 多选,切换某一行的选中状态
43913
44206
  */
43914
44207
  toggleCheckboxRow: function (row) {
43915
- tablePrivateMethods.handleToggleCheckRowEvent(null, {
44208
+ var selection = reactData.selection;
44209
+ var checkboxOpts = computeCheckboxOpts.value;
44210
+ var checkField = checkboxOpts.checkField;
44211
+ var value = checkField ? !xe_utils_default().get(row, checkField) : $xetable.findRowIndexOf(selection, row) === -1;
44212
+ tablePrivateMethods.handleSelectRow({
43916
44213
  row: row
43917
- });
44214
+ }, value, true);
43918
44215
  return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
43919
44216
  },
43920
44217
  /**
@@ -43922,126 +44219,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
43922
44219
  * @param {Boolean} value 是否选中
43923
44220
  */
43924
44221
  setAllCheckboxRow: function (value) {
43925
- var treeConfig = props.treeConfig;
43926
- var selection = reactData.selection;
43927
- var afterFullData = internalData.afterFullData,
43928
- checkboxReserveRowMap = internalData.checkboxReserveRowMap;
43929
- var treeOpts = computeTreeOpts.value;
43930
- var checkboxOpts = computeCheckboxOpts.value;
43931
- var checkField = checkboxOpts.checkField,
43932
- reserve = checkboxOpts.reserve,
43933
- checkStrictly = checkboxOpts.checkStrictly,
43934
- checkMethod = checkboxOpts.checkMethod;
43935
- var selectRows = [];
43936
- var beforeSelection = treeConfig ? [] : selection.filter(function (row) {
43937
- return $xetable.findRowIndexOf(afterFullData, row) === -1;
43938
- });
43939
- if (checkStrictly) {
43940
- reactData.isAllSelected = value;
43941
- } else {
43942
- /**
43943
- * 绑定属性方式(高性能,有污染)
43944
- * 必须在行数据存在对应的属性,否则将不响应
43945
- */
43946
- if (checkField) {
43947
- var checkValFn = function (row) {
43948
- if (!checkMethod || checkMethod({
43949
- row: row
43950
- })) {
43951
- if (value) {
43952
- selectRows.push(row);
43953
- }
43954
- xe_utils_default().set(row, checkField, value);
43955
- }
43956
- };
43957
- // 如果存在选中方法
43958
- // 如果方法成立,则更新值,否则忽略该数据
43959
- if (treeConfig) {
43960
- xe_utils_default().eachTree(afterFullData, checkValFn, treeOpts);
43961
- } else {
43962
- afterFullData.forEach(checkValFn);
43963
- }
43964
- } else {
43965
- /**
43966
- * 默认方式(低性能,无污染)
43967
- * 无需任何属性,直接绑定
43968
- */
43969
- if (treeConfig) {
43970
- if (value) {
43971
- /**
43972
- * 如果是树勾选
43973
- * 如果方法成立,则添加到临时集合中
43974
- */
43975
- xe_utils_default().eachTree(afterFullData, function (row) {
43976
- if (!checkMethod || checkMethod({
43977
- row: row
43978
- })) {
43979
- selectRows.push(row);
43980
- }
43981
- }, treeOpts);
43982
- } else {
43983
- /**
43984
- * 如果是树取消
43985
- * 如果方法成立,则不添加到临时集合中
43986
- */
43987
- if (checkMethod) {
43988
- xe_utils_default().eachTree(afterFullData, function (row) {
43989
- if (checkMethod({
43990
- row: row
43991
- }) ? 0 : $xetable.findRowIndexOf(selection, row) > -1) {
43992
- selectRows.push(row);
43993
- }
43994
- }, treeOpts);
43995
- }
43996
- }
43997
- } else {
43998
- if (value) {
43999
- /**
44000
- * 如果是行勾选
44001
- * 如果存在选中方法且成立或者本身已勾选,则添加到临时集合中
44002
- * 如果不存在选中方法,则添加所有数据到临时集合中
44003
- */
44004
- if (checkMethod) {
44005
- selectRows = afterFullData.filter(function (row) {
44006
- return $xetable.findRowIndexOf(selection, row) > -1 || checkMethod({
44007
- row: row
44008
- });
44009
- });
44010
- } else {
44011
- selectRows = afterFullData.slice(0);
44012
- }
44013
- } else {
44014
- /**
44015
- * 如果是行取消
44016
- * 如果方法成立,则不添加到临时集合中;如果方法不成立则判断当前是否已勾选,如果已被勾选则添加到新集合中
44017
- * 如果不存在选中方法,无需处理,临时集合默认为空
44018
- */
44019
- if (checkMethod) {
44020
- selectRows = afterFullData.filter(function (row) {
44021
- return checkMethod({
44022
- row: row
44023
- }) ? 0 : $xetable.findRowIndexOf(selection, row) > -1;
44024
- });
44025
- }
44026
- }
44027
- }
44028
- }
44029
- if (reserve) {
44030
- if (value) {
44031
- selectRows.forEach(function (row) {
44032
- checkboxReserveRowMap[getRowid($xetable, row)] = row;
44033
- });
44034
- } else {
44035
- afterFullData.forEach(function (row) {
44036
- return handleCheckboxReserveRow(row, false);
44037
- });
44038
- }
44039
- }
44040
- reactData.selection = checkField ? [] : beforeSelection.concat(selectRows);
44041
- }
44042
- reactData.treeIndeterminates = [];
44043
- tablePrivateMethods.checkSelectionStatus();
44044
- return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
44222
+ return handleCheckedAllCheckboxRow(value, true);
44045
44223
  },
44046
44224
  /**
44047
44225
  * 获取单选框保留选中的行
@@ -44173,7 +44351,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
44173
44351
  var rowOpts = computeRowOpts.value;
44174
44352
  var el = refElem.value;
44175
44353
  tableMethods.clearCurrentRow();
44176
- tableMethods.clearCurrentColumn();
44354
+ // tableMethods.clearCurrentColumn()
44177
44355
  reactData.currentRow = row;
44178
44356
  if (rowOpts.isCurrent || props.highlightCurrentRow) {
44179
44357
  if (el) {
@@ -44192,15 +44370,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
44192
44370
  * @param {Row} row 行对象
44193
44371
  */
44194
44372
  setRadioRow: function (row) {
44195
- var radioOpts = computeRadioOpts.value;
44196
- var checkMethod = radioOpts.checkMethod;
44197
- if (row && (!checkMethod || checkMethod({
44198
- row: row
44199
- }))) {
44200
- reactData.selectRow = row;
44201
- handleRadioReserveRow(row);
44202
- }
44203
- return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
44373
+ return handleCheckedRadioRow(row, true);
44204
44374
  },
44205
44375
  /**
44206
44376
  * 用于当前行,手动清空当前高亮的状态
@@ -44273,7 +44443,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
44273
44443
  setCurrentColumn: function (fieldOrColumn) {
44274
44444
  var column = handleFieldOrColumn($xetable, fieldOrColumn);
44275
44445
  if (column) {
44276
- tableMethods.clearCurrentRow();
44446
+ // tableMethods.clearCurrentRow()
44277
44447
  tableMethods.clearCurrentColumn();
44278
44448
  reactData.currentColumn = column;
44279
44449
  }
@@ -44908,7 +45078,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
44908
45078
  }
44909
45079
  setMerges(merges, reactData.mergeList, internalData.afterFullData);
44910
45080
  return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(function () {
44911
- return tablePrivateMethods.updateCellAreas();
45081
+ return tableMethods.updateCellAreas();
44912
45082
  });
44913
45083
  },
44914
45084
  /**
@@ -44921,7 +45091,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
44921
45091
  }
44922
45092
  var rest = removeMerges(merges, reactData.mergeList, internalData.afterFullData);
44923
45093
  return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(function () {
44924
- tablePrivateMethods.updateCellAreas();
45094
+ tableMethods.updateCellAreas();
44925
45095
  return rest;
44926
45096
  });
44927
45097
  },
@@ -44944,7 +45114,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
44944
45114
  }
44945
45115
  setMerges(merges, reactData.mergeFooterList);
44946
45116
  return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(function () {
44947
- return tablePrivateMethods.updateCellAreas();
45117
+ return tableMethods.updateCellAreas();
44948
45118
  });
44949
45119
  },
44950
45120
  removeMergeFooterItems: function (merges) {
@@ -44953,7 +45123,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
44953
45123
  }
44954
45124
  var rest = removeMerges(merges, reactData.mergeFooterList);
44955
45125
  return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(function () {
44956
- tablePrivateMethods.updateCellAreas();
45126
+ tableMethods.updateCellAreas();
44957
45127
  return rest;
44958
45128
  });
44959
45129
  },
@@ -44970,6 +45140,14 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
44970
45140
  reactData.mergeFooterList = [];
44971
45141
  return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
44972
45142
  },
45143
+ updateCellAreas: function () {
45144
+ var mouseConfig = props.mouseConfig;
45145
+ var mouseOpts = computeMouseOpts.value;
45146
+ if (mouseConfig && mouseOpts.area && $xetable.handleUpdateCellAreas) {
45147
+ return $xetable.handleUpdateCellAreas();
45148
+ }
45149
+ return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
45150
+ },
44973
45151
  focus: function () {
44974
45152
  internalData.isActivated = true;
44975
45153
  return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
@@ -45464,7 +45642,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
45464
45642
  if ($xetable.closeMenu) {
45465
45643
  $xetable.closeMenu();
45466
45644
  }
45467
- tablePrivateMethods.updateCellAreas();
45645
+ tableMethods.updateCellAreas();
45468
45646
  tableMethods.recalculate(true);
45469
45647
  };
45470
45648
  var handleTargetEnterEvent = function (isClear) {
@@ -45905,7 +46083,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
45905
46083
  * 多选,行选中事件
45906
46084
  * value 选中true 不选false 半选-1
45907
46085
  */
45908
- handleSelectRow: function (_a, value) {
46086
+ handleSelectRow: function (_a, value, isForce) {
45909
46087
  var row = _a.row;
45910
46088
  var treeConfig = props.treeConfig;
45911
46089
  var selection = reactData.selection,
@@ -45926,7 +46104,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
45926
46104
  } else {
45927
46105
  // 更新子节点状态
45928
46106
  xe_utils_default().eachTree([row], function (item) {
45929
- if ($xetable.eqRow(item, row) || !checkMethod || checkMethod({
46107
+ if ($xetable.eqRow(item, row) || isForce || !checkMethod || checkMethod({
45930
46108
  row: item
45931
46109
  })) {
45932
46110
  xe_utils_default().set(item, checkField, value);
@@ -45943,7 +46121,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
45943
46121
  }, treeOpts);
45944
46122
  if (matchObj && matchObj.parent) {
45945
46123
  var parentStatus = void 0;
45946
- var vItems_1 = checkMethod ? matchObj.items.filter(function (item) {
46124
+ var vItems_1 = !isForce && checkMethod ? matchObj.items.filter(function (item) {
45947
46125
  return checkMethod({
45948
46126
  row: item
45949
46127
  });
@@ -45963,10 +46141,10 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
45963
46141
  }
45964
46142
  return tablePrivateMethods.handleSelectRow({
45965
46143
  row: matchObj.parent
45966
- }, parentStatus);
46144
+ }, parentStatus, isForce);
45967
46145
  }
45968
46146
  } else {
45969
- if (!checkMethod || checkMethod({
46147
+ if (isForce || !checkMethod || checkMethod({
45970
46148
  row: row
45971
46149
  })) {
45972
46150
  xe_utils_default().set(row, checkField, value);
@@ -45985,7 +46163,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
45985
46163
  } else {
45986
46164
  // 更新子节点状态
45987
46165
  xe_utils_default().eachTree([row], function (item) {
45988
- if ($xetable.eqRow(item, row) || !checkMethod || checkMethod({
46166
+ if ($xetable.eqRow(item, row) || isForce || !checkMethod || checkMethod({
45989
46167
  row: item
45990
46168
  })) {
45991
46169
  if (value) {
@@ -46008,7 +46186,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
46008
46186
  }, treeOpts);
46009
46187
  if (matchObj && matchObj.parent) {
46010
46188
  var parentStatus = void 0;
46011
- var vItems_2 = checkMethod ? matchObj.items.filter(function (item) {
46189
+ var vItems_2 = !isForce && checkMethod ? matchObj.items.filter(function (item) {
46012
46190
  return checkMethod({
46013
46191
  row: item
46014
46192
  });
@@ -46028,10 +46206,10 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
46028
46206
  }
46029
46207
  return tablePrivateMethods.handleSelectRow({
46030
46208
  row: matchObj.parent
46031
- }, parentStatus);
46209
+ }, parentStatus, isForce);
46032
46210
  }
46033
46211
  } else {
46034
- if (!checkMethod || checkMethod({
46212
+ if (isForce || !checkMethod || checkMethod({
46035
46213
  row: row
46036
46214
  })) {
46037
46215
  if (value) {
@@ -46093,8 +46271,14 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
46093
46271
  column = params.column;
46094
46272
  var cell = evnt.currentTarget;
46095
46273
  handleTargetEnterEvent(tooltipStore.column !== column || tooltipStore.row !== row);
46096
- if (isEnableConf(editConfig)) {
46097
- if (editOpts.mode === 'row' && actived.row === row || actived.row === row && actived.column === column) {
46274
+ // 单元格处于编辑状态时不触发提示框
46275
+ if (column.editRender && isEnableConf(editConfig)) {
46276
+ // 如果是行编辑模式
46277
+ if (editOpts.mode === 'row' && actived.row === row) {
46278
+ return;
46279
+ }
46280
+ // 如果是单元格编辑模式
46281
+ if (actived.row === row && actived.column === column) {
46098
46282
  return;
46099
46283
  }
46100
46284
  }
@@ -46317,7 +46501,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
46317
46501
  * 多选,选中所有事件
46318
46502
  */
46319
46503
  triggerCheckAllEvent: function (evnt, value) {
46320
- tableMethods.setAllCheckboxRow(value);
46504
+ handleCheckedAllCheckboxRow(value);
46321
46505
  if (evnt) {
46322
46506
  tableMethods.dispatchEvent('checkbox-all', {
46323
46507
  records: tableMethods.getCheckboxRecords(),
@@ -46337,7 +46521,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
46337
46521
  var newValue = row;
46338
46522
  var isChange = oldValue !== newValue;
46339
46523
  if (isChange) {
46340
- tableMethods.setRadioRow(newValue);
46524
+ handleCheckedRadioRow(newValue);
46341
46525
  } else if (!radioOpts.strict) {
46342
46526
  isChange = oldValue === newValue;
46343
46527
  if (isChange) {
@@ -46613,13 +46797,6 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
46613
46797
  internalData.tZindex = nextZIndex();
46614
46798
  }
46615
46799
  },
46616
- updateCellAreas: function () {
46617
- var mouseConfig = props.mouseConfig;
46618
- var mouseOpts = computeMouseOpts.value;
46619
- if (mouseConfig && mouseOpts.area && $xetable.handleUpdateCellAreas) {
46620
- $xetable.handleUpdateCellAreas();
46621
- }
46622
- },
46623
46800
  /**
46624
46801
  * 行 hover 事件
46625
46802
  */
@@ -46798,12 +46975,21 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
46798
46975
  tableMethods.recalculate();
46799
46976
  }
46800
46977
  }
46978
+ var dataFlag = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)(0);
46979
+ (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(function () {
46980
+ return props.data ? props.data.length : -1;
46981
+ }, function () {
46982
+ dataFlag.value++;
46983
+ });
46801
46984
  (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(function () {
46802
46985
  return props.data;
46803
- }, function (value) {
46986
+ }, function () {
46987
+ dataFlag.value++;
46988
+ });
46989
+ (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(dataFlag, function () {
46804
46990
  var inited = internalData.inited,
46805
46991
  initStatus = internalData.initStatus;
46806
- loadTableData(value || []).then(function () {
46992
+ loadTableData(props.data || []).then(function () {
46807
46993
  var scrollXLoad = reactData.scrollXLoad,
46808
46994
  scrollYLoad = reactData.scrollYLoad,
46809
46995
  expandColumn = reactData.expandColumn;
@@ -46815,18 +47001,36 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
46815
47001
  if (!inited) {
46816
47002
  handleInitDefaults();
46817
47003
  }
46818
- if (false) {}
47004
+ if (false) { var checkboxColumn, checkboxOpts; }
46819
47005
  tableMethods.recalculate();
46820
47006
  });
46821
47007
  });
47008
+ var staticColumnFlag = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)(0);
47009
+ (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(function () {
47010
+ return reactData.staticColumns.length;
47011
+ }, function () {
47012
+ staticColumnFlag.value++;
47013
+ });
46822
47014
  (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(function () {
46823
47015
  return reactData.staticColumns;
46824
- }, function (value) {
46825
- handleColumn(value);
47016
+ }, function () {
47017
+ staticColumnFlag.value++;
47018
+ });
47019
+ (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(staticColumnFlag, function () {
47020
+ handleColumn(reactData.staticColumns);
47021
+ });
47022
+ var tableColumnFlag = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)(0);
47023
+ (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(function () {
47024
+ return reactData.tableColumn.length;
47025
+ }, function () {
47026
+ tableColumnFlag.value++;
46826
47027
  });
46827
47028
  (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(function () {
46828
47029
  return reactData.tableColumn;
46829
47030
  }, function () {
47031
+ tableColumnFlag.value++;
47032
+ });
47033
+ (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(tableColumnFlag, function () {
46830
47034
  tablePrivateMethods.analyColumnWidth();
46831
47035
  });
46832
47036
  (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(function () {
@@ -46874,23 +47078,41 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
46874
47078
  });
46875
47079
  }
46876
47080
  });
47081
+ var mergeCellFlag = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)(0);
47082
+ (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(function () {
47083
+ return props.mergeCells ? props.mergeCells.length : -1;
47084
+ }, function () {
47085
+ mergeCellFlag.value++;
47086
+ });
46877
47087
  (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(function () {
46878
47088
  return props.mergeCells;
46879
- }, function (value) {
47089
+ }, function () {
47090
+ mergeCellFlag.value++;
47091
+ });
47092
+ (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(mergeCellFlag, function () {
46880
47093
  tableMethods.clearMergeCells();
46881
47094
  (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(function () {
46882
- if (value) {
46883
- tableMethods.setMergeCells(value);
47095
+ if (props.mergeCells) {
47096
+ tableMethods.setMergeCells(props.mergeCells);
46884
47097
  }
46885
47098
  });
46886
47099
  });
47100
+ var mergeFooterItemFlag = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)(0);
47101
+ (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(function () {
47102
+ return props.mergeFooterItems ? props.mergeFooterItems.length : -1;
47103
+ }, function () {
47104
+ mergeFooterItemFlag.value++;
47105
+ });
46887
47106
  (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(function () {
46888
47107
  return props.mergeFooterItems;
46889
- }, function (value) {
47108
+ }, function () {
47109
+ mergeFooterItemFlag.value++;
47110
+ });
47111
+ (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(mergeFooterItemFlag, function () {
46890
47112
  tableMethods.clearMergeFooterItems();
46891
47113
  (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(function () {
46892
- if (value) {
46893
- tableMethods.setMergeFooterItems(value);
47114
+ if (props.mergeFooterItems) {
47115
+ tableMethods.setMergeFooterItems(props.mergeFooterItems);
46894
47116
  }
46895
47117
  });
46896
47118
  });
@@ -47238,6 +47460,7 @@ dynamicApp.component(table.name, table);
47238
47460
  notSlot: '插槽 "{0}" 不存在',
47239
47461
  noTree: '树结构不支持 "{0}"',
47240
47462
  notProp: '不支持的参数 "{0}"',
47463
+ checkProp: '当数据量过大时可能会导致复选框卡顿,建议设置参数 "{0}" 提升渲染速度',
47241
47464
  coverProp: '"{0}" 的参数 "{1}" 被覆盖,这可能会出现错误',
47242
47465
  delFunc: '方法 "{0}" 已废弃,请使用 "{1}"',
47243
47466
  delProp: '参数 "{0}" 已废弃,请使用 "{1}"',
@@ -66360,7 +66583,7 @@ const MlTreevue_type_script_lang_ts_setup_true_hoisted_2 = {
66360
66583
  const list = [];
66361
66584
  if (props.checkStrictly || props.indeterminateToChecked) {
66362
66585
  xe_utils_default().eachTree(props.data, item => {
66363
- if (selectRowMaps.checked.includes(item[nodeOts.key])) {
66586
+ if (checkedRowKeys.value.includes(item[nodeOts.key])) {
66364
66587
  list.push(item);
66365
66588
  }
66366
66589
  }, {
@@ -66493,7 +66716,7 @@ const MlTreevue_type_script_lang_ts_setup_true_hoisted_2 = {
66493
66716
  });
66494
66717
  };
66495
66718
  const checkEvent = (row, checked) => {
66496
- const checkedKeys = selectRowKeys.value;
66719
+ const checkedKeys = eTreeRef.value.getCheckedKeys();
66497
66720
  emit('update:checkRowKeys', checkedKeys);
66498
66721
  emit('checkbox-change', {
66499
66722
  row,
@@ -66565,10 +66788,17 @@ const MlTreevue_type_script_lang_ts_setup_true_hoisted_2 = {
66565
66788
  setAllTreeExpand
66566
66789
  };
66567
66790
  expose(mlTree);
66568
- (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(() => props.checkRowKeys, val => {
66569
- selectRowKeys.value = val;
66570
- checkedRowKeys.value = val || [];
66571
- setCheckboxRowKeys(val || []);
66791
+ const checkedFlag = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)(0);
66792
+ (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(() => props.checkRowKeys.length, () => {
66793
+ checkedFlag.value++;
66794
+ });
66795
+ (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(() => props.checkRowKeys, () => {
66796
+ checkedFlag.value++;
66797
+ });
66798
+ (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(checkedFlag, () => {
66799
+ selectRowKeys.value = props.checkRowKeys;
66800
+ checkedRowKeys.value = props.checkRowKeys;
66801
+ setCheckboxRowKeys(props.checkRowKeys);
66572
66802
  });
66573
66803
  (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(() => props.expandedKeys, value => {
66574
66804
  expandRowKeys.value = value;
@@ -66628,7 +66858,7 @@ const MlTreevue_type_script_lang_ts_setup_true_hoisted_2 = {
66628
66858
  }, {
66629
66859
  title: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(({
66630
66860
  data
66631
- }) => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.renderSlot)(_ctx.$slots, "default", (0,external_commonjs_vue_commonjs2_vue_root_Vue_.normalizeProps)((0,external_commonjs_vue_commonjs2_vue_root_Vue_.guardReactiveProps)({
66861
+ }) => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.renderSlot)(_ctx.$slots, "title", (0,external_commonjs_vue_commonjs2_vue_root_Vue_.normalizeProps)((0,external_commonjs_vue_commonjs2_vue_root_Vue_.guardReactiveProps)({
66632
66862
  row: data
66633
66863
  })))]),
66634
66864
  _: 3
@@ -66638,10 +66868,10 @@ const MlTreevue_type_script_lang_ts_setup_true_hoisted_2 = {
66638
66868
  }));
66639
66869
  ;// CONCATENATED MODULE: ./components/ml-tree/MlTree.vue?vue&type=script&lang=ts&setup=true
66640
66870
 
66641
- ;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/vue-loader/dist/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./components/ml-tree/MlTree.vue?vue&type=style&index=0&id=71204ddc&lang=scss
66871
+ ;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/vue-loader/dist/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./components/ml-tree/MlTree.vue?vue&type=style&index=0&id=f9ceef54&lang=scss
66642
66872
  // extracted by mini-css-extract-plugin
66643
66873
 
66644
- ;// CONCATENATED MODULE: ./components/ml-tree/MlTree.vue?vue&type=style&index=0&id=71204ddc&lang=scss
66874
+ ;// CONCATENATED MODULE: ./components/ml-tree/MlTree.vue?vue&type=style&index=0&id=f9ceef54&lang=scss
66645
66875
 
66646
66876
  ;// CONCATENATED MODULE: ./components/ml-tree/MlTree.vue
66647
66877
 
@@ -70062,9 +70292,15 @@ const MlCard_exports_ = MlCardvue_type_script_lang_ts_setup_true;
70062
70292
 
70063
70293
 
70064
70294
  const MlEditorvue_type_script_lang_ts_setup_true_hoisted_1 = {
70065
- class: "ml-kindeditor"
70295
+ key: 0,
70296
+ class: "ml-editor is-readonly"
70297
+ };
70298
+ const MlEditorvue_type_script_lang_ts_setup_true_hoisted_2 = ["innerHTML"];
70299
+ const MlEditorvue_type_script_lang_ts_setup_true_hoisted_3 = {
70300
+ key: 1,
70301
+ class: "ml-editor"
70066
70302
  };
70067
- const MlEditorvue_type_script_lang_ts_setup_true_hoisted_2 = ["id"];
70303
+ const MlEditorvue_type_script_lang_ts_setup_true_hoisted_4 = ["id"];
70068
70304
 
70069
70305
 
70070
70306
 
@@ -70095,6 +70331,20 @@ const MlEditorvue_type_script_lang_ts_setup_true_hoisted_2 = ["id"];
70095
70331
  const textareaRef = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
70096
70332
  let editor;
70097
70333
  let isModelUpdate = false;
70334
+ const warpperStyles = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
70335
+ const width = props.width ? `width:${isNaN(Number(props.width)) ? props.width : `${props.width}px`};` : '';
70336
+ const height = props.height ? `height:${isNaN(Number(props.height)) ? props.height : `${props.height}px`};` : '';
70337
+ return {
70338
+ width,
70339
+ height
70340
+ };
70341
+ });
70342
+ const isReadonly = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
70343
+ if (props.readonly === null) {
70344
+ return $xeform ? $xeform.props.readonly : false;
70345
+ }
70346
+ return props.readonly;
70347
+ });
70098
70348
  const setHtml = content => {
70099
70349
  if (editor) {
70100
70350
  editor.html(content || '');
@@ -70147,6 +70397,9 @@ const MlEditorvue_type_script_lang_ts_setup_true_hoisted_2 = ["id"];
70147
70397
  }
70148
70398
  });
70149
70399
  (0,external_commonjs_vue_commonjs2_vue_root_Vue_.onMounted)(() => {
70400
+ if (props.readonly) {
70401
+ return;
70402
+ }
70150
70403
  editor = kindeditor.create(`#${editId.value}`, {
70151
70404
  loadStyleMode: false,
70152
70405
  resizeType: 0,
@@ -70168,24 +70421,32 @@ const MlEditorvue_type_script_lang_ts_setup_true_hoisted_2 = ["id"];
70168
70421
  }
70169
70422
  });
70170
70423
  return (_ctx, _cache) => {
70171
- return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementBlock)("div", MlEditorvue_type_script_lang_ts_setup_true_hoisted_1, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("textarea", {
70424
+ return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.unref)(isReadonly) ? ((0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementBlock)("div", MlEditorvue_type_script_lang_ts_setup_true_hoisted_1, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("div", {
70425
+ class: "ml-editor-readonly-warpper",
70426
+ innerHTML: __props.modelValue,
70427
+ style: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.normalizeStyle)((0,external_commonjs_vue_commonjs2_vue_root_Vue_.unref)(warpperStyles))
70428
+ }, null, 12, MlEditorvue_type_script_lang_ts_setup_true_hoisted_2)])) : ((0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementBlock)("div", MlEditorvue_type_script_lang_ts_setup_true_hoisted_3, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("textarea", {
70172
70429
  ref_key: "textareaRef",
70173
70430
  ref: textareaRef,
70174
70431
  id: editId.value,
70175
- style: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.normalizeStyle)({
70176
- width: __props.width,
70177
- height: __props.height
70178
- })
70179
- }, null, 12, MlEditorvue_type_script_lang_ts_setup_true_hoisted_2)]);
70432
+ style: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.normalizeStyle)((0,external_commonjs_vue_commonjs2_vue_root_Vue_.unref)(warpperStyles))
70433
+ }, null, 12, MlEditorvue_type_script_lang_ts_setup_true_hoisted_4)]));
70180
70434
  };
70181
70435
  }
70182
70436
  }));
70183
70437
  ;// CONCATENATED MODULE: ./components/ml-editor/MlEditor.vue?vue&type=script&lang=ts&setup=true
70184
70438
 
70439
+ ;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/vue-loader/dist/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./components/ml-editor/MlEditor.vue?vue&type=style&index=0&id=2422bdcf&lang=scss
70440
+ // extracted by mini-css-extract-plugin
70441
+
70442
+ ;// CONCATENATED MODULE: ./components/ml-editor/MlEditor.vue?vue&type=style&index=0&id=2422bdcf&lang=scss
70443
+
70185
70444
  ;// CONCATENATED MODULE: ./components/ml-editor/MlEditor.vue
70186
70445
 
70187
70446
 
70188
70447
 
70448
+ ;
70449
+
70189
70450
  const MlEditor_exports_ = MlEditorvue_type_script_lang_ts_setup_true;
70190
70451
 
70191
70452
  /* harmony default export */ var MlEditor = (MlEditor_exports_);
@@ -71923,7 +72184,7 @@ function index_config(options) {
71923
72184
  return config_0;
71924
72185
  }
71925
72186
  const MaliUI = {
71926
- version: "1.0.14",
72187
+ version: "1.0.16",
71927
72188
  modal: index_esm.modal,
71928
72189
  install: index_install,
71929
72190
  config: index_config,