vxe-table 3.8.16 → 3.8.18

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 (63) hide show
  1. package/lib/edit/src/mixin.js +39 -29
  2. package/lib/edit/src/mixin.min.js +1 -1
  3. package/lib/export/src/mixin.js +26 -6
  4. package/lib/export/src/mixin.min.js +1 -1
  5. package/lib/grid/src/grid.js +63 -20
  6. package/lib/grid/src/grid.min.js +1 -1
  7. package/lib/icon/style/{iconfont.1721369585843.ttf → iconfont.1723040514481.ttf} +0 -0
  8. package/lib/icon/style/iconfont.1723040514481.woff +0 -0
  9. package/lib/icon/style/iconfont.1723040514481.woff2 +0 -0
  10. package/lib/icon/style/style.css +81 -3
  11. package/lib/icon/style/style.min.css +81 -3
  12. package/lib/{iconfont.1721369585843.ttf → iconfont.1723040514481.ttf} +0 -0
  13. package/lib/iconfont.1723040514481.woff +0 -0
  14. package/lib/iconfont.1723040514481.woff2 +0 -0
  15. package/lib/index.css +1 -1
  16. package/lib/index.umd.js +180 -87
  17. package/lib/index.umd.min.js +1 -1
  18. package/lib/input/src/input.js +14 -6
  19. package/lib/input/src/input.min.js +1 -1
  20. package/lib/style.css +1 -1
  21. package/lib/style.min.css +1 -1
  22. package/lib/table/src/methods.js +25 -24
  23. package/lib/table/src/methods.min.js +1 -1
  24. package/lib/table/src/table.js +15 -3
  25. package/lib/table/src/table.min.js +1 -1
  26. package/lib/table/style/style.css +70 -46
  27. package/lib/table/style/style.min.css +1 -1
  28. package/lib/toolbar/src/toolbar.js +3 -0
  29. package/lib/toolbar/src/toolbar.min.js +1 -1
  30. package/lib/tools/log.js +1 -1
  31. package/lib/tools/log.min.js +1 -1
  32. package/lib/v-x-e-table/index.js +1 -1
  33. package/lib/v-x-e-table/index.min.js +1 -1
  34. package/lib/v-x-e-table/src/conf.js +2 -1
  35. package/lib/v-x-e-table/src/conf.min.js +1 -1
  36. package/lib/v-x-e-table/src/renderer.js +1 -1
  37. package/lib/v-x-e-table/src/renderer.min.js +1 -1
  38. package/lib/v-x-e-table/style/style.css +57 -3
  39. package/lib/v-x-e-table/style/style.min.css +1 -1
  40. package/lib/vxe-icon/style/style.css +81 -3
  41. package/lib/vxe-icon/style/style.min.css +1 -1
  42. package/lib/vxe-table/style/style.css +70 -46
  43. package/lib/vxe-table/style/style.min.css +1 -1
  44. package/package.json +2 -2
  45. package/packages/edit/src/mixin.js +10 -3
  46. package/packages/export/src/mixin.js +15 -4
  47. package/packages/grid/src/grid.js +48 -18
  48. package/packages/input/src/input.js +14 -8
  49. package/packages/table/src/methods.js +23 -22
  50. package/packages/table/src/table.js +40 -28
  51. package/packages/toolbar/src/toolbar.js +3 -0
  52. package/packages/v-x-e-table/src/conf.js +2 -1
  53. package/packages/v-x-e-table/src/renderer.js +1 -1
  54. package/styles/icon/iconfont.ttf +0 -0
  55. package/styles/icon/iconfont.woff +0 -0
  56. package/styles/icon/iconfont.woff2 +0 -0
  57. package/styles/icon.scss +53 -4
  58. package/styles/old-icon.scss +4 -0
  59. package/styles/table.scss +37 -17
  60. package/lib/icon/style/iconfont.1721369585843.woff +0 -0
  61. package/lib/icon/style/iconfont.1721369585843.woff2 +0 -0
  62. package/lib/iconfont.1721369585843.woff +0 -0
  63. package/lib/iconfont.1721369585843.woff2 +0 -0
package/lib/index.umd.js CHANGED
@@ -11355,7 +11355,8 @@ var iconPrefix = 'vxe-icon-';
11355
11355
  proxyConfig: {
11356
11356
  enabled: true,
11357
11357
  autoLoad: true,
11358
- message: true,
11358
+ showResponseMsg: true,
11359
+ showActiveMsg: true,
11359
11360
  props: {
11360
11361
  list: null,
11361
11362
  result: 'result',
@@ -11512,7 +11513,7 @@ var es_array_concat = __webpack_require__(8706);
11512
11513
 
11513
11514
 
11514
11515
  function getLog(message, params) {
11515
- return "[vxe-table v".concat("3.8.16", "] ").concat(conf.i18n(message, params));
11516
+ return "[vxe-table v".concat("3.8.18", "] ").concat(conf.i18n(message, params));
11516
11517
  }
11517
11518
  function outLog(type) {
11518
11519
  return function (message, params) {
@@ -12303,7 +12304,7 @@ function getSelectCellValue(renderOpts, _ref7) {
12303
12304
  var selectItem;
12304
12305
  var labelProp = optionProps.label || 'label';
12305
12306
  var valueProp = optionProps.value || 'value';
12306
- if (!isEmptyValue(cellValue)) {
12307
+ if (!(cellValue === null || cellValue === undefined)) {
12307
12308
  return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().map(props.multiple ? cellValue : [cellValue], optionGroups ? function (value) {
12308
12309
  var groupOptions = optionGroupProps.options || 'options';
12309
12310
  for (var index = 0; index < optionGroups.length; index++) {
@@ -13216,7 +13217,7 @@ function component(comp) {
13216
13217
  components[comp.name] = comp;
13217
13218
  }
13218
13219
  }
13219
- var version = "3.8.16";
13220
+ var version = "3.8.18";
13220
13221
  var tableVersion = version;
13221
13222
  var VxeUI = {
13222
13223
  v: v,
@@ -18621,7 +18622,6 @@ var Methods = {
18621
18622
  return this.refreshColumn(true);
18622
18623
  },
18623
18624
  handleCustomRestore: function handleCustomRestore(storeData) {
18624
- var tableFullColumn = this.tableFullColumn;
18625
18625
  var collectColumn = this.collectColumn;
18626
18626
  var resizableData = storeData.resizableData,
18627
18627
  sortData = storeData.sortData,
@@ -18630,7 +18630,7 @@ var Methods = {
18630
18630
  var hasCustomSort = false;
18631
18631
  // 处理还原
18632
18632
  if (resizableData || sortData || visibleData || fixedData) {
18633
- tableFullColumn.forEach(function (column) {
18633
+ external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, function (column, index, items, path, parent) {
18634
18634
  var colKey = column.getKey();
18635
18635
  // 支持一级
18636
18636
  if (!parent) {
@@ -18662,7 +18662,7 @@ var Methods = {
18662
18662
  */
18663
18663
  restoreCustomStorage: function restoreCustomStorage() {
18664
18664
  var _this21 = this;
18665
- var id = this.id,
18665
+ var tableId = this.tableId,
18666
18666
  customConfig = this.customConfig,
18667
18667
  customOpts = this.customOpts;
18668
18668
  var storage = customOpts.storage,
@@ -18674,14 +18674,14 @@ var Methods = {
18674
18674
  var isCustomFixed = isAllCustom || storageOpts.fixed;
18675
18675
  var isCustomSort = isAllCustom || storageOpts.sort;
18676
18676
  if (customConfig && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
18677
- if (!id) {
18677
+ if (!tableId) {
18678
18678
  errLog('vxe.error.reqProp', ['id']);
18679
18679
  return;
18680
18680
  }
18681
- var storeData = getCustomStorageMap(id);
18681
+ var storeData = getCustomStorageMap(tableId);
18682
18682
  if (restoreStore) {
18683
18683
  return Promise.resolve(restoreStore({
18684
- id: id,
18684
+ id: tableId,
18685
18685
  type: 'restore',
18686
18686
  storeData: storeData
18687
18687
  })).then(function (storeData) {
@@ -18778,7 +18778,7 @@ var Methods = {
18778
18778
  return storeData;
18779
18779
  },
18780
18780
  saveCustomStore: function saveCustomStore(type) {
18781
- var id = this.id,
18781
+ var tableId = this.tableId,
18782
18782
  customOpts = this.customOpts;
18783
18783
  var updateStore = customOpts.updateStore,
18784
18784
  storage = customOpts.storage;
@@ -18789,7 +18789,7 @@ var Methods = {
18789
18789
  var isCustomFixed = isAllCustom || storageOpts.fixed;
18790
18790
  var isCustomSort = isAllCustom || storageOpts.sort;
18791
18791
  if (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort) {
18792
- if (!id) {
18792
+ if (!tableId) {
18793
18793
  errLog('vxe.error.reqProp', ['id']);
18794
18794
  return this.$nextTick();
18795
18795
  }
@@ -18801,12 +18801,12 @@ var Methods = {
18801
18801
  } : this.getCustomStoreData();
18802
18802
  if (updateStore) {
18803
18803
  return updateStore({
18804
- id: id,
18804
+ id: tableId,
18805
18805
  type: type,
18806
18806
  storeData: storeData
18807
18807
  });
18808
18808
  } else {
18809
- setCustomStorageMap(id, type === 'reset' ? null : storeData);
18809
+ setCustomStorageMap(tableId, type === 'reset' ? null : storeData);
18810
18810
  }
18811
18811
  }
18812
18812
  return this.$nextTick();
@@ -19652,15 +19652,17 @@ var Methods = {
19652
19652
  this.clearSelected();
19653
19653
  }
19654
19654
  if (areaOpts.autoClear) {
19655
- var cellAreas = this.getCellAreas();
19656
- if (cellAreas.length && !getEventTargetNode(evnt, document.body, 'vxe-table--ignore-areas-clear').flag) {
19657
- this.preventEvent(evnt, 'event.clearAreas', {}, function () {
19658
- _this29.clearCellAreas();
19659
- _this29.clearCopyCellArea();
19660
- _this29.emitEvent('clear-cell-area-selection', {
19661
- cellAreas: cellAreas
19662
- }, evnt);
19663
- });
19655
+ if (this.getCellAreas) {
19656
+ var cellAreas = this.getCellAreas();
19657
+ if (cellAreas && cellAreas.length && !getEventTargetNode(evnt, document.body, 'vxe-table--ignore-areas-clear').flag) {
19658
+ this.preventEvent(evnt, 'event.clearAreas', {}, function () {
19659
+ _this29.clearCellAreas();
19660
+ _this29.clearCopyCellArea();
19661
+ _this29.emitEvent('clear-cell-area-selection', {
19662
+ cellAreas: cellAreas
19663
+ }, evnt);
19664
+ });
19665
+ }
19664
19666
  }
19665
19667
  }
19666
19668
  }
@@ -23204,7 +23206,7 @@ function handleUupdateResize(_vm) {
23204
23206
  mixins: [size],
23205
23207
  props: {
23206
23208
  /** 基本属性 */
23207
- id: String,
23209
+ id: [String, Function],
23208
23210
  // 数据
23209
23211
  data: Array,
23210
23212
  // 表格的高度
@@ -23720,6 +23722,18 @@ function handleUupdateResize(_vm) {
23720
23722
  };
23721
23723
  },
23722
23724
  computed: {
23725
+ tableId: function tableId() {
23726
+ var id = this.id;
23727
+ if (id) {
23728
+ if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(id)) {
23729
+ return "".concat(id({
23730
+ $table: this
23731
+ }) || '');
23732
+ }
23733
+ return "".concat(id);
23734
+ }
23735
+ return '';
23736
+ },
23723
23737
  validOpts: function validOpts() {
23724
23738
  return Object.assign({
23725
23739
  message: 'default'
@@ -24359,7 +24373,7 @@ function handleUupdateResize(_vm) {
24359
24373
  ctxMenuStore: ctxMenuStore,
24360
24374
  ctxMenuOpts: ctxMenuOpts
24361
24375
  }
24362
- }) : _e(),
24376
+ }) : _e(), h('div', {}, [
24363
24377
  /**
24364
24378
  * 通用提示
24365
24379
  */
@@ -24386,7 +24400,7 @@ function handleUupdateResize(_vm) {
24386
24400
  'old-cell-valid': editRules && conf.cellVaildMode === 'obsolete'
24387
24401
  }, 'vxe-table--valid-error'],
24388
24402
  props: validOpts.message === 'tooltip' || tableData.length === 1 ? validTipOpts : null
24389
- }) : _e()]);
24403
+ }) : _e()])]);
24390
24404
  },
24391
24405
  methods: methods
24392
24406
  });
@@ -25888,23 +25902,33 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
25888
25902
  * 获取表格数据集,包含新增、删除、修改
25889
25903
  */
25890
25904
  _getRecordset: function _getRecordset() {
25905
+ var _this5 = this;
25906
+ var removeRecords = this.getRemoveRecords();
25907
+ var pendingRecords = this.getPendingRecords();
25908
+ var delRecords = removeRecords.concat(pendingRecords);
25909
+ // 如果已经被删除,则无需放到更新数组
25910
+ var updateRecords = this.getUpdateRecords().filter(function (row) {
25911
+ return !delRecords.some(function (item) {
25912
+ return _this5.eqRow(item, row);
25913
+ });
25914
+ });
25891
25915
  return {
25892
25916
  insertRecords: this.getInsertRecords(),
25893
- removeRecords: this.getRemoveRecords(),
25894
- updateRecords: this.getUpdateRecords(),
25895
- pendingRecords: this.getPendingRecords()
25917
+ removeRecords: removeRecords,
25918
+ updateRecords: updateRecords,
25919
+ pendingRecords: pendingRecords
25896
25920
  };
25897
25921
  },
25898
25922
  /**
25899
25923
  * 获取新增的临时数据
25900
25924
  */
25901
25925
  _getInsertRecords: function _getInsertRecords() {
25902
- var _this5 = this;
25926
+ var _this6 = this;
25903
25927
  var fullAllDataRowIdData = this.fullAllDataRowIdData;
25904
25928
  var insertList = this.editStore.insertList;
25905
25929
  var insertRecords = [];
25906
25930
  insertList.forEach(function (row) {
25907
- var rowid = getRowid(_this5, row);
25931
+ var rowid = getRowid(_this6, row);
25908
25932
  if (fullAllDataRowIdData[rowid]) {
25909
25933
  insertRecords.push(row);
25910
25934
  }
@@ -25951,7 +25975,7 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
25951
25975
  * 处理激活编辑
25952
25976
  */
25953
25977
  handleActived: function handleActived(params, evnt) {
25954
- var _this6 = this;
25978
+ var _this7 = this;
25955
25979
  var editStore = this.editStore,
25956
25980
  editOpts = this.editOpts,
25957
25981
  tableColumn = this.tableColumn,
@@ -25991,18 +26015,18 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
25991
26015
  actived.column = column;
25992
26016
  if (mode === 'row') {
25993
26017
  tableColumn.forEach(function (column) {
25994
- return _this6._getColumnModel(row, column);
26018
+ return _this7._getColumnModel(row, column);
25995
26019
  });
25996
26020
  } else {
25997
26021
  this._getColumnModel(row, column);
25998
26022
  }
25999
26023
  var afterEditMethod = editOpts.afterEditMethod;
26000
26024
  this.$nextTick(function () {
26001
- _this6.handleFocus(params, evnt);
26025
+ _this7.handleFocus(params, evnt);
26002
26026
  if (afterEditMethod) {
26003
26027
  afterEditMethod(_objectSpread2(_objectSpread2({}, params), {}, {
26004
- $table: _this6,
26005
- $grid: _this6.$xegrid
26028
+ $table: _this7,
26029
+ $grid: _this7.$xegrid
26006
26030
  }));
26007
26031
  }
26008
26032
  });
@@ -26045,7 +26069,7 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
26045
26069
  actived.args = params;
26046
26070
  actived.column = column;
26047
26071
  setTimeout(function () {
26048
- _this6.handleFocus(params, evnt);
26072
+ _this7.handleFocus(params, evnt);
26049
26073
  });
26050
26074
  }
26051
26075
  focused.column = null;
@@ -26073,7 +26097,7 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
26073
26097
  }
26074
26098
  },
26075
26099
  _syncActivedCell: function _syncActivedCell() {
26076
- var _this7 = this;
26100
+ var _this8 = this;
26077
26101
  var tableColumn = this.tableColumn,
26078
26102
  editStore = this.editStore,
26079
26103
  editOpts = this.editOpts;
@@ -26083,7 +26107,7 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
26083
26107
  if (row || column) {
26084
26108
  if (editOpts.mode === 'row') {
26085
26109
  tableColumn.forEach(function (column) {
26086
- return _this7._setColumnModel(row, column);
26110
+ return _this8._setColumnModel(row, column);
26087
26111
  });
26088
26112
  } else {
26089
26113
  this._setColumnModel(row, column);
@@ -26228,22 +26252,22 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
26228
26252
  * 激活单元格编辑
26229
26253
  */
26230
26254
  _setEditCell: function _setEditCell(row, fieldOrColumn) {
26231
- var _this8 = this;
26255
+ var _this9 = this;
26232
26256
  var editConfig = this.editConfig;
26233
26257
  var column = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(fieldOrColumn) ? this.getColumnByField(fieldOrColumn) : fieldOrColumn;
26234
26258
  if (row && column && isEnableConf(editConfig) && isEnableConf(column.editRender)) {
26235
26259
  return this.scrollToRow(row, true).then(function () {
26236
- var cell = _this8.getCellElement(row, column);
26260
+ var cell = _this9.getCellElement(row, column);
26237
26261
  if (cell) {
26238
- _this8.handleActived({
26262
+ _this9.handleActived({
26239
26263
  row: row,
26240
- rowIndex: _this8.getRowIndex(row),
26264
+ rowIndex: _this9.getRowIndex(row),
26241
26265
  column: column,
26242
- columnIndex: _this8.getColumnIndex(column),
26266
+ columnIndex: _this9.getColumnIndex(column),
26243
26267
  cell: cell,
26244
- $table: _this8
26268
+ $table: _this9
26245
26269
  });
26246
- _this8.lastCallTime = Date.now();
26270
+ _this9.lastCallTime = Date.now();
26247
26271
  }
26248
26272
  });
26249
26273
  }
@@ -26277,7 +26301,7 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
26277
26301
  * 处理选中源
26278
26302
  */
26279
26303
  handleSelected: function handleSelected(params, evnt) {
26280
- var _this9 = this;
26304
+ var _this10 = this;
26281
26305
  var mouseConfig = this.mouseConfig,
26282
26306
  mouseOpts = this.mouseOpts,
26283
26307
  editOpts = this.editOpts,
@@ -26290,23 +26314,23 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
26290
26314
  var selectMethod = function selectMethod() {
26291
26315
  if (isMouseSelected && (selected.row !== row || selected.column !== column)) {
26292
26316
  if (actived.row !== row || (editOpts.mode === 'cell' ? actived.column !== column : false)) {
26293
- _this9.clearEdit(evnt);
26294
- _this9.clearSelected(evnt);
26295
- _this9.clearCellAreas(evnt);
26296
- _this9.clearCopyCellArea(evnt);
26317
+ _this10.clearEdit(evnt);
26318
+ _this10.clearSelected(evnt);
26319
+ _this10.clearCellAreas(evnt);
26320
+ _this10.clearCopyCellArea(evnt);
26297
26321
  selected.args = params;
26298
26322
  selected.row = row;
26299
26323
  selected.column = column;
26300
26324
  if (isMouseSelected) {
26301
- _this9.addColSdCls();
26325
+ _this10.addColSdCls();
26302
26326
  }
26303
- _this9.focus();
26327
+ _this10.focus();
26304
26328
  if (evnt) {
26305
- _this9.emitEvent('cell-selected', params, evnt);
26329
+ _this10.emitEvent('cell-selected', params, evnt);
26306
26330
  }
26307
26331
  }
26308
26332
  }
26309
- return _this9.$nextTick();
26333
+ return _this10.$nextTick();
26310
26334
  };
26311
26335
  return selectMethod();
26312
26336
  },
@@ -28245,8 +28269,8 @@ function renderExtraSuffixIcon(h, _vm) {
28245
28269
  return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(conf.input.placeholder) ? conf.i18n('vxe.base.pleaseInput') : conf.input.placeholder;
28246
28270
  }
28247
28271
  },
28248
- maxlength: [String, Number],
28249
- autocomplete: {
28272
+ maxLength: [String, Number],
28273
+ autoComplete: {
28250
28274
  type: String,
28251
28275
  default: 'off'
28252
28276
  },
@@ -28360,7 +28384,11 @@ function renderExtraSuffixIcon(h, _vm) {
28360
28384
  default: function _default() {
28361
28385
  return conf.input.transfer;
28362
28386
  }
28363
- }
28387
+ },
28388
+ // 已废弃
28389
+ maxlength: [String, Number],
28390
+ // 已废弃
28391
+ autocomplete: String
28364
28392
  },
28365
28393
  inject: {
28366
28394
  $xeform: {
@@ -28409,7 +28437,9 @@ function renderExtraSuffixIcon(h, _vm) {
28409
28437
  return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getSize(this.inputValue);
28410
28438
  },
28411
28439
  isCountError: function isCountError() {
28412
- return this.maxlength && this.inputCount > external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(this.maxlength);
28440
+ var maxLength = this.maxLength,
28441
+ maxlength = this.maxlength;
28442
+ return (maxLength || maxlength) && this.inputCount > external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(maxLength || maxlength);
28413
28443
  },
28414
28444
  stepValue: function stepValue() {
28415
28445
  var type = this.type,
@@ -28767,9 +28797,10 @@ function renderExtraSuffixIcon(h, _vm) {
28767
28797
  },
28768
28798
  inpMaxlength: function inpMaxlength() {
28769
28799
  var isNumType = this.isNumType,
28800
+ maxLength = this.maxLength,
28770
28801
  maxlength = this.maxlength;
28771
28802
  // 数值最大长度限制 16 位,包含小数
28772
- return isNumType && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(maxlength) ? 16 : maxlength;
28803
+ return isNumType && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(maxLength || maxlength) ? 16 : maxLength || maxlength;
28773
28804
  },
28774
28805
  inpReadonly: function inpReadonly() {
28775
28806
  var type = this.type,
@@ -28885,6 +28916,7 @@ function renderExtraSuffixIcon(h, _vm) {
28885
28916
  align = this.align,
28886
28917
  readonly = this.readonly,
28887
28918
  disabled = this.disabled,
28919
+ autoComplete = this.autoComplete,
28888
28920
  autocomplete = this.autocomplete;
28889
28921
  var childs = [];
28890
28922
  var prefix = rendePrefixIcon(h, this);
@@ -28908,7 +28940,7 @@ function renderExtraSuffixIcon(h, _vm) {
28908
28940
  maxlength: inpMaxlength,
28909
28941
  readonly: inpReadonly,
28910
28942
  disabled: disabled,
28911
- autocomplete: autocomplete
28943
+ autocomplete: autoComplete || autocomplete
28912
28944
  },
28913
28945
  on: {
28914
28946
  keydown: this.keydownEvent,
@@ -32135,6 +32167,7 @@ var web_url_search_params_size = __webpack_require__(8721);
32135
32167
 
32136
32168
 
32137
32169
 
32170
+
32138
32171
 
32139
32172
 
32140
32173
  var formatText = utils.formatText;
@@ -33031,6 +33064,9 @@ function handleImport($xetable, content, opts) {
33031
33064
  $xetable.createData(rows).then(function (data) {
33032
33065
  var loadRest;
33033
33066
  if (opts.mode === 'insert' || opts.mode === 'insertBottom') {
33067
+ loadRest = $xetable.insertAt(data, -1);
33068
+ }
33069
+ if (opts.mode === 'insertTop') {
33034
33070
  loadRest = $xetable.insert(data);
33035
33071
  } else {
33036
33072
  loadRest = $xetable.reloadData(data);
@@ -33103,7 +33139,7 @@ function handleFileImport($xetable, file, opts) {
33103
33139
  $xetable._importReject = _importReject;
33104
33140
  if (window.FileReader) {
33105
33141
  var options = Object.assign({
33106
- mode: 'insertBottom'
33142
+ mode: 'insertTop'
33107
33143
  }, opts, {
33108
33144
  type: type,
33109
33145
  filename: filename
@@ -33621,6 +33657,8 @@ var convertToRows = function convertToRows(originColumns) {
33621
33657
  _$xegrid$proxyOpts$pr = _$xegrid$proxyOpts.props,
33622
33658
  props = _$xegrid$proxyOpts$pr === void 0 ? {} : _$xegrid$proxyOpts$pr;
33623
33659
  var ajaxMethods = ajax.queryAll;
33660
+ var queryAllSuccessMethods = ajax.queryAllSuccess;
33661
+ var queryAllErrorMethods = ajax.queryAllError;
33624
33662
  if (false) {}
33625
33663
  if (ajaxMethods) {
33626
33664
  var _params = {
@@ -33632,14 +33670,23 @@ var convertToRows = function convertToRows(originColumns) {
33632
33670
  target: ajaxMethods,
33633
33671
  options: opts
33634
33672
  };
33635
- return Promise.resolve((beforeQueryAll || ajaxMethods)(_params)).catch(function (e) {
33636
- return e;
33637
- }).then(function (rest) {
33673
+ return Promise.resolve((beforeQueryAll || ajaxMethods)(_params)).then(function (rest) {
33638
33674
  opts.data = (props.list ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(rest, props.list) : rest) || [];
33639
33675
  if (afterQueryAll) {
33640
33676
  afterQueryAll(_params);
33641
33677
  }
33678
+ if (queryAllSuccessMethods) {
33679
+ queryAllSuccessMethods(_objectSpread2(_objectSpread2({}, _params), {}, {
33680
+ response: rest
33681
+ }));
33682
+ }
33642
33683
  return handleExport(_this, opts);
33684
+ }).catch(function (rest) {
33685
+ if (queryAllErrorMethods) {
33686
+ queryAllErrorMethods(_objectSpread2(_objectSpread2({}, _params), {}, {
33687
+ response: rest
33688
+ }));
33689
+ }
33643
33690
  });
33644
33691
  }
33645
33692
  }
@@ -33743,10 +33790,10 @@ var convertToRows = function convertToRows(originColumns) {
33743
33790
  var _this4 = this;
33744
33791
  var importOpts = this.importOpts;
33745
33792
  var defOpts = Object.assign({
33746
- mode: 'insertBottom',
33793
+ mode: 'insertTop',
33747
33794
  message: true,
33748
33795
  types: external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(importOpts._typeMaps),
33749
- modes: ['insertBottom', 'covering']
33796
+ modes: ['insertTop', 'covering']
33750
33797
  }, options, importOpts);
33751
33798
  var types = defOpts.types || [];
33752
33799
  var modes = defOpts.modes || [];
@@ -36375,11 +36422,15 @@ Object.keys(packages_table.methods).forEach(function (name) {
36375
36422
  };
36376
36423
  },
36377
36424
  computed: {
36378
- isMsg: function isMsg() {
36379
- return this.proxyOpts.message !== false;
36425
+ isRespMsg: function isRespMsg() {
36426
+ var proxyOpts = this.proxyOpts;
36427
+ return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(proxyOpts.message) ? proxyOpts.message : proxyOpts.showResponseMsg;
36428
+ },
36429
+ isActiveMsg: function isActiveMsg() {
36430
+ return this.proxyOpts.showActiveMsg;
36380
36431
  },
36381
36432
  proxyOpts: function proxyOpts() {
36382
- return Object.assign({}, conf.grid.proxyConfig, this.proxyConfig);
36433
+ return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().merge({}, conf.grid.proxyConfig, this.proxyConfig);
36383
36434
  },
36384
36435
  pagerOpts: function pagerOpts() {
36385
36436
  return Object.assign({}, conf.grid.pagerConfig, this.pagerConfig);
@@ -36620,7 +36671,8 @@ Object.keys(packages_table.methods).forEach(function (name) {
36620
36671
  pagerConfig = this.pagerConfig,
36621
36672
  editRules = this.editRules,
36622
36673
  formData = this.formData,
36623
- isMsg = this.isMsg,
36674
+ isRespMsg = this.isRespMsg,
36675
+ isActiveMsg = this.isActiveMsg,
36624
36676
  validConfig = this.validConfig,
36625
36677
  pagerOpts = this.pagerOpts;
36626
36678
  var beforeQuery = proxyOpts.beforeQuery,
@@ -36695,6 +36747,8 @@ Object.keys(packages_table.methods).forEach(function (name) {
36695
36747
  case 'query':
36696
36748
  {
36697
36749
  var ajaxMethods = ajax.query;
36750
+ var querySuccessMethods = ajax.querySuccess;
36751
+ var queryErrorMethods = ajax.queryError;
36698
36752
  if (ajaxMethods) {
36699
36753
  var isInited = code === '_init';
36700
36754
  var isReload = code === 'reload';
@@ -36734,7 +36788,7 @@ Object.keys(packages_table.methods).forEach(function (name) {
36734
36788
  filterList = $xetable.getCheckedFilters();
36735
36789
  }
36736
36790
  }
36737
- var params = {
36791
+ var commitParams = {
36738
36792
  code: code,
36739
36793
  button: button,
36740
36794
  isInited: isInited,
@@ -36750,7 +36804,7 @@ Object.keys(packages_table.methods).forEach(function (name) {
36750
36804
  this.sortData = sortList;
36751
36805
  this.filterData = filterList;
36752
36806
  this.tableLoading = true;
36753
- var applyArgs = [params].concat(args);
36807
+ var applyArgs = [commitParams].concat(args);
36754
36808
  return Promise.resolve((beforeQuery || ajaxMethods).apply(void 0, _toConsumableArray(applyArgs))).then(function (rest) {
36755
36809
  _this5.tableLoading = false;
36756
36810
  if (rest) {
@@ -36784,11 +36838,21 @@ Object.keys(packages_table.methods).forEach(function (name) {
36784
36838
  if (afterQuery) {
36785
36839
  afterQuery.apply(void 0, _toConsumableArray(applyArgs));
36786
36840
  }
36841
+ if (querySuccessMethods) {
36842
+ querySuccessMethods(_objectSpread2(_objectSpread2({}, commitParams), {}, {
36843
+ response: rest
36844
+ }));
36845
+ }
36787
36846
  return {
36788
36847
  status: true
36789
36848
  };
36790
- }).catch(function () {
36849
+ }).catch(function (rest) {
36791
36850
  _this5.tableLoading = false;
36851
+ if (queryErrorMethods) {
36852
+ queryErrorMethods(_objectSpread2(_objectSpread2({}, commitParams), {}, {
36853
+ response: rest
36854
+ }));
36855
+ }
36792
36856
  return {
36793
36857
  status: false
36794
36858
  };
@@ -36801,6 +36865,8 @@ Object.keys(packages_table.methods).forEach(function (name) {
36801
36865
  case 'delete':
36802
36866
  {
36803
36867
  var _ajaxMethods = ajax.delete;
36868
+ var deleteSuccessMethods = ajax.deleteSuccess;
36869
+ var deleteErrorMethods = ajax.deleteError;
36804
36870
  if (_ajaxMethods) {
36805
36871
  var selectRecords = $xetable.getCheckboxRecords();
36806
36872
  var removeRecords = selectRecords.filter(function (row) {
@@ -36809,14 +36875,15 @@ Object.keys(packages_table.methods).forEach(function (name) {
36809
36875
  var body = {
36810
36876
  removeRecords: removeRecords
36811
36877
  };
36812
- var _applyArgs = [{
36878
+ var _commitParams = {
36813
36879
  $grid: this,
36814
36880
  code: code,
36815
36881
  button: button,
36816
36882
  body: body,
36817
36883
  form: formData,
36818
36884
  options: _ajaxMethods
36819
- }].concat(args);
36885
+ };
36886
+ var _applyArgs = [_commitParams].concat(args);
36820
36887
  if (selectRecords.length) {
36821
36888
  return this.handleDeleteRow(code, 'vxe.grid.deleteSelectRecord', function () {
36822
36889
  if (!removeRecords.length) {
@@ -36826,7 +36893,7 @@ Object.keys(packages_table.methods).forEach(function (name) {
36826
36893
  return Promise.resolve((beforeDelete || _ajaxMethods).apply(void 0, _toConsumableArray(_applyArgs))).then(function (rest) {
36827
36894
  _this5.tableLoading = false;
36828
36895
  $xetable.setPendingRow(removeRecords, false);
36829
- if (isMsg) {
36896
+ if (isRespMsg) {
36830
36897
  // 检测弹窗模块
36831
36898
  if (false) {}
36832
36899
  v_x_e_table.modal.message({
@@ -36839,12 +36906,17 @@ Object.keys(packages_table.methods).forEach(function (name) {
36839
36906
  } else {
36840
36907
  _this5.commitProxy('query');
36841
36908
  }
36909
+ if (deleteSuccessMethods) {
36910
+ deleteSuccessMethods(_objectSpread2(_objectSpread2({}, _commitParams), {}, {
36911
+ response: rest
36912
+ }));
36913
+ }
36842
36914
  return {
36843
36915
  status: true
36844
36916
  };
36845
36917
  }).catch(function (rest) {
36846
36918
  _this5.tableLoading = false;
36847
- if (isMsg) {
36919
+ if (isRespMsg) {
36848
36920
  // 检测弹窗模块
36849
36921
  if (false) {}
36850
36922
  v_x_e_table.modal.message({
@@ -36853,13 +36925,18 @@ Object.keys(packages_table.methods).forEach(function (name) {
36853
36925
  status: 'error'
36854
36926
  });
36855
36927
  }
36928
+ if (deleteErrorMethods) {
36929
+ deleteErrorMethods(_objectSpread2(_objectSpread2({}, _commitParams), {}, {
36930
+ response: rest
36931
+ }));
36932
+ }
36856
36933
  return {
36857
36934
  status: false
36858
36935
  };
36859
36936
  });
36860
36937
  });
36861
36938
  } else {
36862
- if (isMsg) {
36939
+ if (isActiveMsg) {
36863
36940
  // 检测弹窗模块
36864
36941
  if (false) {}
36865
36942
  v_x_e_table.modal.message({
@@ -36877,20 +36954,23 @@ Object.keys(packages_table.methods).forEach(function (name) {
36877
36954
  case 'save':
36878
36955
  {
36879
36956
  var _ajaxMethods2 = ajax.save;
36957
+ var saveSuccessMethods = ajax.saveSuccess;
36958
+ var saveErrorMethods = ajax.saveError;
36880
36959
  if (_ajaxMethods2) {
36881
36960
  var _body = this.getRecordset();
36882
36961
  var insertRecords = _body.insertRecords,
36883
36962
  _removeRecords = _body.removeRecords,
36884
36963
  updateRecords = _body.updateRecords,
36885
36964
  pendingRecords = _body.pendingRecords;
36886
- var _applyArgs2 = [{
36965
+ var _commitParams2 = {
36887
36966
  $grid: this,
36888
36967
  code: code,
36889
36968
  button: button,
36890
36969
  body: _body,
36891
36970
  form: formData,
36892
36971
  options: _ajaxMethods2
36893
- }].concat(args);
36972
+ };
36973
+ var _applyArgs2 = [_commitParams2].concat(args);
36894
36974
  // 排除掉新增且标记为删除的数据
36895
36975
  if (insertRecords.length) {
36896
36976
  _body.pendingRecords = pendingRecords.filter(function (row) {
@@ -36918,7 +36998,7 @@ Object.keys(packages_table.methods).forEach(function (name) {
36918
36998
  return Promise.resolve((beforeSave || _ajaxMethods2).apply(void 0, _toConsumableArray(_applyArgs2))).then(function (rest) {
36919
36999
  _this5.tableLoading = false;
36920
37000
  $xetable.clearPendingRow();
36921
- if (isMsg) {
37001
+ if (isRespMsg) {
36922
37002
  // 检测弹窗模块
36923
37003
  if (false) {}
36924
37004
  v_x_e_table.modal.message({
@@ -36931,12 +37011,17 @@ Object.keys(packages_table.methods).forEach(function (name) {
36931
37011
  } else {
36932
37012
  _this5.commitProxy('query');
36933
37013
  }
37014
+ if (saveSuccessMethods) {
37015
+ saveSuccessMethods(_objectSpread2(_objectSpread2({}, _commitParams2), {}, {
37016
+ response: rest
37017
+ }));
37018
+ }
36934
37019
  return {
36935
37020
  status: true
36936
37021
  };
36937
37022
  }).catch(function (rest) {
36938
37023
  _this5.tableLoading = false;
36939
- if (isMsg) {
37024
+ if (isRespMsg) {
36940
37025
  // 检测弹窗模块
36941
37026
  if (false) {}
36942
37027
  v_x_e_table.modal.message({
@@ -36945,12 +37030,17 @@ Object.keys(packages_table.methods).forEach(function (name) {
36945
37030
  status: 'error'
36946
37031
  });
36947
37032
  }
37033
+ if (saveErrorMethods) {
37034
+ saveErrorMethods(_objectSpread2(_objectSpread2({}, _commitParams2), {}, {
37035
+ response: rest
37036
+ }));
37037
+ }
36948
37038
  return {
36949
37039
  status: false
36950
37040
  };
36951
37041
  });
36952
37042
  } else {
36953
- if (isMsg) {
37043
+ if (isActiveMsg) {
36954
37044
  // 检测弹窗模块
36955
37045
  if (false) {}
36956
37046
  v_x_e_table.modal.message({
@@ -36996,7 +37086,7 @@ Object.keys(packages_table.methods).forEach(function (name) {
36996
37086
  },
36997
37087
  handleDeleteRow: function handleDeleteRow(code, alertKey, callback) {
36998
37088
  var selectRecords = this.getCheckboxRecords();
36999
- if (this.isMsg) {
37089
+ if (this.isActiveMsg) {
37000
37090
  if (selectRecords.length) {
37001
37091
  return v_x_e_table.modal.confirm({
37002
37092
  id: "cfm_".concat(code),
@@ -37066,13 +37156,13 @@ Object.keys(packages_table.methods).forEach(function (name) {
37066
37156
  });
37067
37157
  },
37068
37158
  triggerPendingEvent: function triggerPendingEvent(code) {
37069
- var isMsg = this.isMsg;
37159
+ var isActiveMsg = this.isActiveMsg;
37070
37160
  var selectRecords = this.getCheckboxRecords();
37071
37161
  if (selectRecords.length) {
37072
37162
  this.togglePendingRow(selectRecords);
37073
37163
  this.clearCheckboxRow();
37074
37164
  } else {
37075
- if (isMsg) {
37165
+ if (isActiveMsg) {
37076
37166
  // 检测弹窗模块
37077
37167
  if (false) {}
37078
37168
  v_x_e_table.modal.message({
@@ -37296,6 +37386,7 @@ var renderDropdowns = function renderDropdowns(h, _vm, item, isBtn) {
37296
37386
  disabled: child.disabled,
37297
37387
  loading: child.loading,
37298
37388
  type: child.type,
37389
+ mode: child.mode,
37299
37390
  icon: child.icon,
37300
37391
  circle: child.circle,
37301
37392
  round: child.round,
@@ -37356,6 +37447,7 @@ function renderBtns(h, _vm) {
37356
37447
  disabled: item.disabled,
37357
37448
  loading: item.loading,
37358
37449
  type: item.type,
37450
+ mode: item.mode,
37359
37451
  icon: item.icon,
37360
37452
  circle: item.circle,
37361
37453
  round: item.round,
@@ -37422,6 +37514,7 @@ function renderRightTools(h, _vm) {
37422
37514
  disabled: item.disabled,
37423
37515
  loading: item.loading,
37424
37516
  type: item.type,
37517
+ mode: item.mode,
37425
37518
  icon: item.icon,
37426
37519
  circle: item.circle,
37427
37520
  round: item.round,