vxe-table 3.8.15 → 3.8.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.
Files changed (73) 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/filter/src/mixin.js +5 -0
  6. package/lib/filter/src/mixin.min.js +1 -1
  7. package/lib/grid/src/grid.js +63 -20
  8. package/lib/grid/src/grid.min.js +1 -1
  9. package/lib/icon/style/{iconfont.1721269958416.ttf → iconfont.1723002262597.ttf} +0 -0
  10. package/lib/icon/style/iconfont.1723002262597.woff +0 -0
  11. package/lib/icon/style/iconfont.1723002262597.woff2 +0 -0
  12. package/lib/icon/style/style.css +81 -3
  13. package/lib/icon/style/style.min.css +81 -3
  14. package/lib/{iconfont.1721269958416.ttf → iconfont.1723002262597.ttf} +0 -0
  15. package/lib/iconfont.1723002262597.woff +0 -0
  16. package/lib/iconfont.1723002262597.woff2 +0 -0
  17. package/lib/index.css +1 -1
  18. package/lib/index.umd.js +182 -85
  19. package/lib/index.umd.min.js +1 -1
  20. package/lib/input/src/input.js +14 -6
  21. package/lib/input/src/input.min.js +1 -1
  22. package/lib/style.css +1 -1
  23. package/lib/style.min.css +1 -1
  24. package/lib/table/src/column.js +1 -1
  25. package/lib/table/src/column.min.js +1 -1
  26. package/lib/table/src/columnInfo.js +2 -1
  27. package/lib/table/src/columnInfo.min.js +1 -1
  28. package/lib/table/src/methods.js +18 -16
  29. package/lib/table/src/methods.min.js +1 -1
  30. package/lib/table/style/style.css +70 -46
  31. package/lib/table/style/style.min.css +1 -1
  32. package/lib/toolbar/src/toolbar.js +3 -0
  33. package/lib/toolbar/src/toolbar.min.js +1 -1
  34. package/lib/tools/log.js +1 -1
  35. package/lib/tools/log.min.js +1 -1
  36. package/lib/tools/utils.js +1 -1
  37. package/lib/tools/utils.min.js +1 -1
  38. package/lib/v-x-e-table/index.js +1 -1
  39. package/lib/v-x-e-table/index.min.js +1 -1
  40. package/lib/v-x-e-table/src/conf.js +2 -1
  41. package/lib/v-x-e-table/src/conf.min.js +1 -1
  42. package/lib/v-x-e-table/src/renderer.js +16 -7
  43. package/lib/v-x-e-table/src/renderer.min.js +1 -1
  44. package/lib/v-x-e-table/style/style.css +57 -3
  45. package/lib/v-x-e-table/style/style.min.css +1 -1
  46. package/lib/vxe-icon/style/style.css +81 -3
  47. package/lib/vxe-icon/style/style.min.css +1 -1
  48. package/lib/vxe-table/style/style.css +70 -46
  49. package/lib/vxe-table/style/style.min.css +1 -1
  50. package/package.json +2 -2
  51. package/packages/edit/src/mixin.js +10 -3
  52. package/packages/export/src/mixin.js +15 -4
  53. package/packages/filter/src/mixin.js +5 -0
  54. package/packages/grid/src/grid.js +48 -18
  55. package/packages/input/src/input.js +14 -8
  56. package/packages/table/src/column.js +1 -1
  57. package/packages/table/src/columnInfo.js +2 -1
  58. package/packages/table/src/methods.js +16 -14
  59. package/packages/toolbar/src/toolbar.js +3 -0
  60. package/packages/tools/utils.js +1 -1
  61. package/packages/v-x-e-table/src/conf.js +2 -1
  62. package/packages/v-x-e-table/src/renderer.js +11 -4
  63. package/styles/form.scss +4 -4
  64. package/styles/icon/iconfont.ttf +0 -0
  65. package/styles/icon/iconfont.woff +0 -0
  66. package/styles/icon/iconfont.woff2 +0 -0
  67. package/styles/icon.scss +53 -4
  68. package/styles/old-icon.scss +4 -0
  69. package/styles/table.scss +37 -17
  70. package/lib/icon/style/iconfont.1721269958416.woff +0 -0
  71. package/lib/icon/style/iconfont.1721269958416.woff2 +0 -0
  72. package/lib/iconfont.1721269958416.woff +0 -0
  73. package/lib/iconfont.1721269958416.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.15", "] ").concat(conf.i18n(message, params));
11516
+ return "[vxe-table v".concat("3.8.17", "] ").concat(conf.i18n(message, params));
11516
11517
  }
11517
11518
  function outLog(type) {
11518
11519
  return function (message, params) {
@@ -11754,7 +11755,7 @@ var UtilTools = {
11754
11755
  return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, column.field, value);
11755
11756
  },
11756
11757
  // 组装列配置
11757
- assemColumn: function assemColumn(_vm) {
11758
+ assembleColumn: function assembleColumn(_vm) {
11758
11759
  var $el = _vm.$el,
11759
11760
  $xetable = _vm.$xetable,
11760
11761
  $xecolumn = _vm.$xecolumn,
@@ -12231,6 +12232,15 @@ function handleFilterMethod(_ref5) {
12231
12232
  /* eslint-disable eqeqeq */
12232
12233
  return cellValue == data;
12233
12234
  }
12235
+ function handleInputFilterMethod(_ref6) {
12236
+ var option = _ref6.option,
12237
+ row = _ref6.row,
12238
+ column = _ref6.column;
12239
+ var data = option.data;
12240
+ var cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.property);
12241
+ /* eslint-disable eqeqeq */
12242
+ return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toValueString(cellValue).indexOf(data) > -1;
12243
+ }
12234
12244
  function nativeSelectEditRender(h, renderOpts, params) {
12235
12245
  return [h('select', {
12236
12246
  class: 'vxe-default-select',
@@ -12279,9 +12289,9 @@ function oldSelectEditRender(h, renderOpts, params) {
12279
12289
  on: getEditOns(renderOpts, params)
12280
12290
  })];
12281
12291
  }
12282
- function getSelectCellValue(renderOpts, _ref6) {
12283
- var row = _ref6.row,
12284
- column = _ref6.column;
12292
+ function getSelectCellValue(renderOpts, _ref7) {
12293
+ var row = _ref7.row,
12294
+ column = _ref7.column;
12285
12295
  var _renderOpts$props = renderOpts.props,
12286
12296
  props = _renderOpts$props === void 0 ? {} : _renderOpts$props,
12287
12297
  options = renderOpts.options,
@@ -12294,7 +12304,7 @@ function getSelectCellValue(renderOpts, _ref6) {
12294
12304
  var selectItem;
12295
12305
  var labelProp = optionProps.label || 'label';
12296
12306
  var valueProp = optionProps.value || 'value';
12297
- if (!isEmptyValue(cellValue)) {
12307
+ if (!(cellValue === null || cellValue === undefined)) {
12298
12308
  return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().map(props.multiple ? cellValue : [cellValue], optionGroups ? function (value) {
12299
12309
  var groupOptions = optionGroupProps.options || 'options';
12300
12310
  for (var index = 0; index < optionGroups.length; index++) {
@@ -12497,7 +12507,7 @@ var renderMap = {
12497
12507
  renderEdit: nativeEditRender,
12498
12508
  renderDefault: nativeEditRender,
12499
12509
  renderFilter: nativeFilterRender,
12500
- defaultFilterMethod: handleFilterMethod,
12510
+ defaultFilterMethod: handleInputFilterMethod,
12501
12511
  renderItemContent: nativeItemRender
12502
12512
  },
12503
12513
  textarea: {
@@ -12560,7 +12570,7 @@ var renderMap = {
12560
12570
  },
12561
12571
  renderDefault: defaultEditRender,
12562
12572
  renderFilter: defaultFilterRender,
12563
- defaultFilterMethod: handleFilterMethod,
12573
+ defaultFilterMethod: handleInputFilterMethod,
12564
12574
  renderItemContent: defaultItemRender
12565
12575
  },
12566
12576
  VxeTextarea: {
@@ -12688,7 +12698,7 @@ var renderMap = {
12688
12698
  },
12689
12699
  renderDefault: oldEditRender,
12690
12700
  renderFilter: oldFilterRender,
12691
- defaultFilterMethod: handleFilterMethod,
12701
+ defaultFilterMethod: handleInputFilterMethod,
12692
12702
  renderItemContent: oldItemRender
12693
12703
  },
12694
12704
  $textarea: {
@@ -13207,7 +13217,7 @@ function component(comp) {
13207
13217
  components[comp.name] = comp;
13208
13218
  }
13209
13219
  }
13210
- var version = "3.8.15";
13220
+ var version = "3.8.17";
13211
13221
  var tableVersion = version;
13212
13222
  var VxeUI = {
13213
13223
  v: v,
@@ -13383,7 +13393,8 @@ var ColumnInfo = /*#__PURE__*/function () {
13383
13393
  }, {
13384
13394
  key: "getKey",
13385
13395
  value: function getKey() {
13386
- return this.field || (this.type ? "type=".concat(this.type) : null);
13396
+ var type = this.type;
13397
+ return this.field || (type ? "type=".concat(type) : null);
13387
13398
  }
13388
13399
  }, {
13389
13400
  key: "update",
@@ -17493,7 +17504,7 @@ var Methods = {
17493
17504
  });
17494
17505
  row[childrenField] = rows;
17495
17506
  if (transform) {
17496
- row[mapChildrenField] = rows;
17507
+ row[mapChildrenField] = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(rows, false);
17497
17508
  }
17498
17509
  _this12.updateAfterDataIndex();
17499
17510
  return rows;
@@ -19642,15 +19653,17 @@ var Methods = {
19642
19653
  this.clearSelected();
19643
19654
  }
19644
19655
  if (areaOpts.autoClear) {
19645
- var cellAreas = this.getCellAreas();
19646
- if (cellAreas.length && !getEventTargetNode(evnt, document.body, 'vxe-table--ignore-areas-clear').flag) {
19647
- this.preventEvent(evnt, 'event.clearAreas', {}, function () {
19648
- _this29.clearCellAreas();
19649
- _this29.clearCopyCellArea();
19650
- _this29.emitEvent('clear-cell-area-selection', {
19651
- cellAreas: cellAreas
19652
- }, evnt);
19653
- });
19656
+ if (this.getCellAreas) {
19657
+ var cellAreas = this.getCellAreas();
19658
+ if (cellAreas && cellAreas.length && !getEventTargetNode(evnt, document.body, 'vxe-table--ignore-areas-clear').flag) {
19659
+ this.preventEvent(evnt, 'event.clearAreas', {}, function () {
19660
+ _this29.clearCellAreas();
19661
+ _this29.clearCopyCellArea();
19662
+ _this29.emitEvent('clear-cell-area-selection', {
19663
+ cellAreas: cellAreas
19664
+ }, evnt);
19665
+ });
19666
+ }
19654
19667
  }
19655
19668
  }
19656
19669
  }
@@ -23018,7 +23031,7 @@ var Methods = {
23018
23031
  };
23019
23032
 
23020
23033
  // Module methods
23021
- var funcs = 'setFilter,openFilter,clearFilter,getCheckedFilters,closeMenu,setActiveCellArea,getActiveCellArea,getCellAreas,clearCellAreas,copyCellArea,cutCellArea,pasteCellArea,getCopyCellArea,getCopyCellAreas,clearCopyCellArea,setCellAreas,openFNR,openFind,openReplace,closeFNR,getSelectedCell,clearSelected,insert,insertAt,insertNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearEdit,clearActived,getEditRecord,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell,setSelectCell,clearValidate,fullValidate,validate,openExport,openPrint,getPrintHtml,exportData,openImport,importData,saveFile,readFile,importByFile,print,openCustom,closeCustom'.split(',');
23034
+ var funcs = 'setFilter,openFilter,clearFilter,getCheckedFilters,updateFilterOptionStatus,closeMenu,setActiveCellArea,getActiveCellArea,getCellAreas,clearCellAreas,copyCellArea,cutCellArea,pasteCellArea,getCopyCellArea,getCopyCellAreas,clearCopyCellArea,setCellAreas,openFNR,openFind,openReplace,closeFNR,getSelectedCell,clearSelected,insert,insertAt,insertNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearEdit,clearActived,getEditRecord,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell,setSelectCell,clearValidate,fullValidate,validate,openExport,openPrint,getPrintHtml,exportData,openImport,importData,saveFile,readFile,importByFile,print,openCustom,closeCustom'.split(',');
23022
23035
  funcs.forEach(function (name) {
23023
23036
  Methods[name] = function () {
23024
23037
  if (false) {}
@@ -24953,6 +24966,11 @@ var Table = VxeTable;
24953
24966
  });
24954
24967
  }
24955
24968
  return this.updateData();
24969
+ },
24970
+ _updateFilterOptionStatus: function _updateFilterOptionStatus(item, checked) {
24971
+ item._checked = checked;
24972
+ item.checked = checked;
24973
+ return this.$nextTick();
24956
24974
  }
24957
24975
  }
24958
24976
  });
@@ -25873,23 +25891,33 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
25873
25891
  * 获取表格数据集,包含新增、删除、修改
25874
25892
  */
25875
25893
  _getRecordset: function _getRecordset() {
25894
+ var _this5 = this;
25895
+ var removeRecords = this.getRemoveRecords();
25896
+ var pendingRecords = this.getPendingRecords();
25897
+ var delRecords = removeRecords.concat(pendingRecords);
25898
+ // 如果已经被删除,则无需放到更新数组
25899
+ var updateRecords = this.getUpdateRecords().filter(function (row) {
25900
+ return !delRecords.some(function (item) {
25901
+ return _this5.eqRow(item, row);
25902
+ });
25903
+ });
25876
25904
  return {
25877
25905
  insertRecords: this.getInsertRecords(),
25878
- removeRecords: this.getRemoveRecords(),
25879
- updateRecords: this.getUpdateRecords(),
25880
- pendingRecords: this.getPendingRecords()
25906
+ removeRecords: removeRecords,
25907
+ updateRecords: updateRecords,
25908
+ pendingRecords: pendingRecords
25881
25909
  };
25882
25910
  },
25883
25911
  /**
25884
25912
  * 获取新增的临时数据
25885
25913
  */
25886
25914
  _getInsertRecords: function _getInsertRecords() {
25887
- var _this5 = this;
25915
+ var _this6 = this;
25888
25916
  var fullAllDataRowIdData = this.fullAllDataRowIdData;
25889
25917
  var insertList = this.editStore.insertList;
25890
25918
  var insertRecords = [];
25891
25919
  insertList.forEach(function (row) {
25892
- var rowid = getRowid(_this5, row);
25920
+ var rowid = getRowid(_this6, row);
25893
25921
  if (fullAllDataRowIdData[rowid]) {
25894
25922
  insertRecords.push(row);
25895
25923
  }
@@ -25936,7 +25964,7 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
25936
25964
  * 处理激活编辑
25937
25965
  */
25938
25966
  handleActived: function handleActived(params, evnt) {
25939
- var _this6 = this;
25967
+ var _this7 = this;
25940
25968
  var editStore = this.editStore,
25941
25969
  editOpts = this.editOpts,
25942
25970
  tableColumn = this.tableColumn,
@@ -25976,18 +26004,18 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
25976
26004
  actived.column = column;
25977
26005
  if (mode === 'row') {
25978
26006
  tableColumn.forEach(function (column) {
25979
- return _this6._getColumnModel(row, column);
26007
+ return _this7._getColumnModel(row, column);
25980
26008
  });
25981
26009
  } else {
25982
26010
  this._getColumnModel(row, column);
25983
26011
  }
25984
26012
  var afterEditMethod = editOpts.afterEditMethod;
25985
26013
  this.$nextTick(function () {
25986
- _this6.handleFocus(params, evnt);
26014
+ _this7.handleFocus(params, evnt);
25987
26015
  if (afterEditMethod) {
25988
26016
  afterEditMethod(_objectSpread2(_objectSpread2({}, params), {}, {
25989
- $table: _this6,
25990
- $grid: _this6.$xegrid
26017
+ $table: _this7,
26018
+ $grid: _this7.$xegrid
25991
26019
  }));
25992
26020
  }
25993
26021
  });
@@ -26030,7 +26058,7 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
26030
26058
  actived.args = params;
26031
26059
  actived.column = column;
26032
26060
  setTimeout(function () {
26033
- _this6.handleFocus(params, evnt);
26061
+ _this7.handleFocus(params, evnt);
26034
26062
  });
26035
26063
  }
26036
26064
  focused.column = null;
@@ -26058,7 +26086,7 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
26058
26086
  }
26059
26087
  },
26060
26088
  _syncActivedCell: function _syncActivedCell() {
26061
- var _this7 = this;
26089
+ var _this8 = this;
26062
26090
  var tableColumn = this.tableColumn,
26063
26091
  editStore = this.editStore,
26064
26092
  editOpts = this.editOpts;
@@ -26068,7 +26096,7 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
26068
26096
  if (row || column) {
26069
26097
  if (editOpts.mode === 'row') {
26070
26098
  tableColumn.forEach(function (column) {
26071
- return _this7._setColumnModel(row, column);
26099
+ return _this8._setColumnModel(row, column);
26072
26100
  });
26073
26101
  } else {
26074
26102
  this._setColumnModel(row, column);
@@ -26213,22 +26241,22 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
26213
26241
  * 激活单元格编辑
26214
26242
  */
26215
26243
  _setEditCell: function _setEditCell(row, fieldOrColumn) {
26216
- var _this8 = this;
26244
+ var _this9 = this;
26217
26245
  var editConfig = this.editConfig;
26218
26246
  var column = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(fieldOrColumn) ? this.getColumnByField(fieldOrColumn) : fieldOrColumn;
26219
26247
  if (row && column && isEnableConf(editConfig) && isEnableConf(column.editRender)) {
26220
26248
  return this.scrollToRow(row, true).then(function () {
26221
- var cell = _this8.getCellElement(row, column);
26249
+ var cell = _this9.getCellElement(row, column);
26222
26250
  if (cell) {
26223
- _this8.handleActived({
26251
+ _this9.handleActived({
26224
26252
  row: row,
26225
- rowIndex: _this8.getRowIndex(row),
26253
+ rowIndex: _this9.getRowIndex(row),
26226
26254
  column: column,
26227
- columnIndex: _this8.getColumnIndex(column),
26255
+ columnIndex: _this9.getColumnIndex(column),
26228
26256
  cell: cell,
26229
- $table: _this8
26257
+ $table: _this9
26230
26258
  });
26231
- _this8.lastCallTime = Date.now();
26259
+ _this9.lastCallTime = Date.now();
26232
26260
  }
26233
26261
  });
26234
26262
  }
@@ -26262,7 +26290,7 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
26262
26290
  * 处理选中源
26263
26291
  */
26264
26292
  handleSelected: function handleSelected(params, evnt) {
26265
- var _this9 = this;
26293
+ var _this10 = this;
26266
26294
  var mouseConfig = this.mouseConfig,
26267
26295
  mouseOpts = this.mouseOpts,
26268
26296
  editOpts = this.editOpts,
@@ -26275,23 +26303,23 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
26275
26303
  var selectMethod = function selectMethod() {
26276
26304
  if (isMouseSelected && (selected.row !== row || selected.column !== column)) {
26277
26305
  if (actived.row !== row || (editOpts.mode === 'cell' ? actived.column !== column : false)) {
26278
- _this9.clearEdit(evnt);
26279
- _this9.clearSelected(evnt);
26280
- _this9.clearCellAreas(evnt);
26281
- _this9.clearCopyCellArea(evnt);
26306
+ _this10.clearEdit(evnt);
26307
+ _this10.clearSelected(evnt);
26308
+ _this10.clearCellAreas(evnt);
26309
+ _this10.clearCopyCellArea(evnt);
26282
26310
  selected.args = params;
26283
26311
  selected.row = row;
26284
26312
  selected.column = column;
26285
26313
  if (isMouseSelected) {
26286
- _this9.addColSdCls();
26314
+ _this10.addColSdCls();
26287
26315
  }
26288
- _this9.focus();
26316
+ _this10.focus();
26289
26317
  if (evnt) {
26290
- _this9.emitEvent('cell-selected', params, evnt);
26318
+ _this10.emitEvent('cell-selected', params, evnt);
26291
26319
  }
26292
26320
  }
26293
26321
  }
26294
- return _this9.$nextTick();
26322
+ return _this10.$nextTick();
26295
26323
  };
26296
26324
  return selectMethod();
26297
26325
  },
@@ -28230,8 +28258,8 @@ function renderExtraSuffixIcon(h, _vm) {
28230
28258
  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;
28231
28259
  }
28232
28260
  },
28233
- maxlength: [String, Number],
28234
- autocomplete: {
28261
+ maxLength: [String, Number],
28262
+ autoComplete: {
28235
28263
  type: String,
28236
28264
  default: 'off'
28237
28265
  },
@@ -28345,7 +28373,11 @@ function renderExtraSuffixIcon(h, _vm) {
28345
28373
  default: function _default() {
28346
28374
  return conf.input.transfer;
28347
28375
  }
28348
- }
28376
+ },
28377
+ // 已废弃
28378
+ maxlength: [String, Number],
28379
+ // 已废弃
28380
+ autocomplete: String
28349
28381
  },
28350
28382
  inject: {
28351
28383
  $xeform: {
@@ -28394,7 +28426,9 @@ function renderExtraSuffixIcon(h, _vm) {
28394
28426
  return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getSize(this.inputValue);
28395
28427
  },
28396
28428
  isCountError: function isCountError() {
28397
- return this.maxlength && this.inputCount > external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(this.maxlength);
28429
+ var maxLength = this.maxLength,
28430
+ maxlength = this.maxlength;
28431
+ return (maxLength || maxlength) && this.inputCount > external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(maxLength || maxlength);
28398
28432
  },
28399
28433
  stepValue: function stepValue() {
28400
28434
  var type = this.type,
@@ -28752,9 +28786,10 @@ function renderExtraSuffixIcon(h, _vm) {
28752
28786
  },
28753
28787
  inpMaxlength: function inpMaxlength() {
28754
28788
  var isNumType = this.isNumType,
28789
+ maxLength = this.maxLength,
28755
28790
  maxlength = this.maxlength;
28756
28791
  // 数值最大长度限制 16 位,包含小数
28757
- return isNumType && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(maxlength) ? 16 : maxlength;
28792
+ return isNumType && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(maxLength || maxlength) ? 16 : maxLength || maxlength;
28758
28793
  },
28759
28794
  inpReadonly: function inpReadonly() {
28760
28795
  var type = this.type,
@@ -28870,6 +28905,7 @@ function renderExtraSuffixIcon(h, _vm) {
28870
28905
  align = this.align,
28871
28906
  readonly = this.readonly,
28872
28907
  disabled = this.disabled,
28908
+ autoComplete = this.autoComplete,
28873
28909
  autocomplete = this.autocomplete;
28874
28910
  var childs = [];
28875
28911
  var prefix = rendePrefixIcon(h, this);
@@ -28893,7 +28929,7 @@ function renderExtraSuffixIcon(h, _vm) {
28893
28929
  maxlength: inpMaxlength,
28894
28930
  readonly: inpReadonly,
28895
28931
  disabled: disabled,
28896
- autocomplete: autocomplete
28932
+ autocomplete: autoComplete || autocomplete
28897
28933
  },
28898
28934
  on: {
28899
28935
  keydown: this.keydownEvent,
@@ -32120,6 +32156,7 @@ var web_url_search_params_size = __webpack_require__(8721);
32120
32156
 
32121
32157
 
32122
32158
 
32159
+
32123
32160
 
32124
32161
 
32125
32162
  var formatText = utils.formatText;
@@ -33016,6 +33053,9 @@ function handleImport($xetable, content, opts) {
33016
33053
  $xetable.createData(rows).then(function (data) {
33017
33054
  var loadRest;
33018
33055
  if (opts.mode === 'insert' || opts.mode === 'insertBottom') {
33056
+ loadRest = $xetable.insertAt(data, -1);
33057
+ }
33058
+ if (opts.mode === 'insertTop') {
33019
33059
  loadRest = $xetable.insert(data);
33020
33060
  } else {
33021
33061
  loadRest = $xetable.reloadData(data);
@@ -33088,7 +33128,7 @@ function handleFileImport($xetable, file, opts) {
33088
33128
  $xetable._importReject = _importReject;
33089
33129
  if (window.FileReader) {
33090
33130
  var options = Object.assign({
33091
- mode: 'insertBottom'
33131
+ mode: 'insertTop'
33092
33132
  }, opts, {
33093
33133
  type: type,
33094
33134
  filename: filename
@@ -33606,6 +33646,8 @@ var convertToRows = function convertToRows(originColumns) {
33606
33646
  _$xegrid$proxyOpts$pr = _$xegrid$proxyOpts.props,
33607
33647
  props = _$xegrid$proxyOpts$pr === void 0 ? {} : _$xegrid$proxyOpts$pr;
33608
33648
  var ajaxMethods = ajax.queryAll;
33649
+ var queryAllSuccessMethods = ajax.queryAllSuccess;
33650
+ var queryAllErrorMethods = ajax.queryAllError;
33609
33651
  if (false) {}
33610
33652
  if (ajaxMethods) {
33611
33653
  var _params = {
@@ -33617,14 +33659,23 @@ var convertToRows = function convertToRows(originColumns) {
33617
33659
  target: ajaxMethods,
33618
33660
  options: opts
33619
33661
  };
33620
- return Promise.resolve((beforeQueryAll || ajaxMethods)(_params)).catch(function (e) {
33621
- return e;
33622
- }).then(function (rest) {
33662
+ return Promise.resolve((beforeQueryAll || ajaxMethods)(_params)).then(function (rest) {
33623
33663
  opts.data = (props.list ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(rest, props.list) : rest) || [];
33624
33664
  if (afterQueryAll) {
33625
33665
  afterQueryAll(_params);
33626
33666
  }
33667
+ if (queryAllSuccessMethods) {
33668
+ queryAllSuccessMethods(_objectSpread2(_objectSpread2({}, _params), {}, {
33669
+ response: rest
33670
+ }));
33671
+ }
33627
33672
  return handleExport(_this, opts);
33673
+ }).catch(function (rest) {
33674
+ if (queryAllErrorMethods) {
33675
+ queryAllErrorMethods(_objectSpread2(_objectSpread2({}, _params), {}, {
33676
+ response: rest
33677
+ }));
33678
+ }
33628
33679
  });
33629
33680
  }
33630
33681
  }
@@ -33728,10 +33779,10 @@ var convertToRows = function convertToRows(originColumns) {
33728
33779
  var _this4 = this;
33729
33780
  var importOpts = this.importOpts;
33730
33781
  var defOpts = Object.assign({
33731
- mode: 'insertBottom',
33782
+ mode: 'insertTop',
33732
33783
  message: true,
33733
33784
  types: external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(importOpts._typeMaps),
33734
- modes: ['insertBottom', 'covering']
33785
+ modes: ['insertTop', 'covering']
33735
33786
  }, options, importOpts);
33736
33787
  var types = defOpts.types || [];
33737
33788
  var modes = defOpts.modes || [];
@@ -35925,7 +35976,7 @@ Object.keys(column_props).forEach(function (name) {
35925
35976
  this.columnConfig = this.createColumn(this.$xetable, this);
35926
35977
  },
35927
35978
  mounted: function mounted() {
35928
- utils.assemColumn(this);
35979
+ utils.assembleColumn(this);
35929
35980
  },
35930
35981
  destroyed: function destroyed() {
35931
35982
  utils.destroyColumn(this);
@@ -36360,11 +36411,15 @@ Object.keys(packages_table.methods).forEach(function (name) {
36360
36411
  };
36361
36412
  },
36362
36413
  computed: {
36363
- isMsg: function isMsg() {
36364
- return this.proxyOpts.message !== false;
36414
+ isRespMsg: function isRespMsg() {
36415
+ var proxyOpts = this.proxyOpts;
36416
+ return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(proxyOpts.message) ? proxyOpts.message : proxyOpts.showResponseMsg;
36417
+ },
36418
+ isActiveMsg: function isActiveMsg() {
36419
+ return this.proxyOpts.showActiveMsg;
36365
36420
  },
36366
36421
  proxyOpts: function proxyOpts() {
36367
- return Object.assign({}, conf.grid.proxyConfig, this.proxyConfig);
36422
+ return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().merge({}, conf.grid.proxyConfig, this.proxyConfig);
36368
36423
  },
36369
36424
  pagerOpts: function pagerOpts() {
36370
36425
  return Object.assign({}, conf.grid.pagerConfig, this.pagerConfig);
@@ -36605,7 +36660,8 @@ Object.keys(packages_table.methods).forEach(function (name) {
36605
36660
  pagerConfig = this.pagerConfig,
36606
36661
  editRules = this.editRules,
36607
36662
  formData = this.formData,
36608
- isMsg = this.isMsg,
36663
+ isRespMsg = this.isRespMsg,
36664
+ isActiveMsg = this.isActiveMsg,
36609
36665
  validConfig = this.validConfig,
36610
36666
  pagerOpts = this.pagerOpts;
36611
36667
  var beforeQuery = proxyOpts.beforeQuery,
@@ -36680,6 +36736,8 @@ Object.keys(packages_table.methods).forEach(function (name) {
36680
36736
  case 'query':
36681
36737
  {
36682
36738
  var ajaxMethods = ajax.query;
36739
+ var querySuccessMethods = ajax.querySuccess;
36740
+ var queryErrorMethods = ajax.queryError;
36683
36741
  if (ajaxMethods) {
36684
36742
  var isInited = code === '_init';
36685
36743
  var isReload = code === 'reload';
@@ -36719,7 +36777,7 @@ Object.keys(packages_table.methods).forEach(function (name) {
36719
36777
  filterList = $xetable.getCheckedFilters();
36720
36778
  }
36721
36779
  }
36722
- var params = {
36780
+ var commitParams = {
36723
36781
  code: code,
36724
36782
  button: button,
36725
36783
  isInited: isInited,
@@ -36735,7 +36793,7 @@ Object.keys(packages_table.methods).forEach(function (name) {
36735
36793
  this.sortData = sortList;
36736
36794
  this.filterData = filterList;
36737
36795
  this.tableLoading = true;
36738
- var applyArgs = [params].concat(args);
36796
+ var applyArgs = [commitParams].concat(args);
36739
36797
  return Promise.resolve((beforeQuery || ajaxMethods).apply(void 0, _toConsumableArray(applyArgs))).then(function (rest) {
36740
36798
  _this5.tableLoading = false;
36741
36799
  if (rest) {
@@ -36769,11 +36827,21 @@ Object.keys(packages_table.methods).forEach(function (name) {
36769
36827
  if (afterQuery) {
36770
36828
  afterQuery.apply(void 0, _toConsumableArray(applyArgs));
36771
36829
  }
36830
+ if (querySuccessMethods) {
36831
+ querySuccessMethods(_objectSpread2(_objectSpread2({}, commitParams), {}, {
36832
+ response: rest
36833
+ }));
36834
+ }
36772
36835
  return {
36773
36836
  status: true
36774
36837
  };
36775
- }).catch(function () {
36838
+ }).catch(function (rest) {
36776
36839
  _this5.tableLoading = false;
36840
+ if (queryErrorMethods) {
36841
+ queryErrorMethods(_objectSpread2(_objectSpread2({}, commitParams), {}, {
36842
+ response: rest
36843
+ }));
36844
+ }
36777
36845
  return {
36778
36846
  status: false
36779
36847
  };
@@ -36786,6 +36854,8 @@ Object.keys(packages_table.methods).forEach(function (name) {
36786
36854
  case 'delete':
36787
36855
  {
36788
36856
  var _ajaxMethods = ajax.delete;
36857
+ var deleteSuccessMethods = ajax.deleteSuccess;
36858
+ var deleteErrorMethods = ajax.deleteError;
36789
36859
  if (_ajaxMethods) {
36790
36860
  var selectRecords = $xetable.getCheckboxRecords();
36791
36861
  var removeRecords = selectRecords.filter(function (row) {
@@ -36794,14 +36864,15 @@ Object.keys(packages_table.methods).forEach(function (name) {
36794
36864
  var body = {
36795
36865
  removeRecords: removeRecords
36796
36866
  };
36797
- var _applyArgs = [{
36867
+ var _commitParams = {
36798
36868
  $grid: this,
36799
36869
  code: code,
36800
36870
  button: button,
36801
36871
  body: body,
36802
36872
  form: formData,
36803
36873
  options: _ajaxMethods
36804
- }].concat(args);
36874
+ };
36875
+ var _applyArgs = [_commitParams].concat(args);
36805
36876
  if (selectRecords.length) {
36806
36877
  return this.handleDeleteRow(code, 'vxe.grid.deleteSelectRecord', function () {
36807
36878
  if (!removeRecords.length) {
@@ -36811,7 +36882,7 @@ Object.keys(packages_table.methods).forEach(function (name) {
36811
36882
  return Promise.resolve((beforeDelete || _ajaxMethods).apply(void 0, _toConsumableArray(_applyArgs))).then(function (rest) {
36812
36883
  _this5.tableLoading = false;
36813
36884
  $xetable.setPendingRow(removeRecords, false);
36814
- if (isMsg) {
36885
+ if (isRespMsg) {
36815
36886
  // 检测弹窗模块
36816
36887
  if (false) {}
36817
36888
  v_x_e_table.modal.message({
@@ -36824,12 +36895,17 @@ Object.keys(packages_table.methods).forEach(function (name) {
36824
36895
  } else {
36825
36896
  _this5.commitProxy('query');
36826
36897
  }
36898
+ if (deleteSuccessMethods) {
36899
+ deleteSuccessMethods(_objectSpread2(_objectSpread2({}, _commitParams), {}, {
36900
+ response: rest
36901
+ }));
36902
+ }
36827
36903
  return {
36828
36904
  status: true
36829
36905
  };
36830
36906
  }).catch(function (rest) {
36831
36907
  _this5.tableLoading = false;
36832
- if (isMsg) {
36908
+ if (isRespMsg) {
36833
36909
  // 检测弹窗模块
36834
36910
  if (false) {}
36835
36911
  v_x_e_table.modal.message({
@@ -36838,13 +36914,18 @@ Object.keys(packages_table.methods).forEach(function (name) {
36838
36914
  status: 'error'
36839
36915
  });
36840
36916
  }
36917
+ if (deleteErrorMethods) {
36918
+ deleteErrorMethods(_objectSpread2(_objectSpread2({}, _commitParams), {}, {
36919
+ response: rest
36920
+ }));
36921
+ }
36841
36922
  return {
36842
36923
  status: false
36843
36924
  };
36844
36925
  });
36845
36926
  });
36846
36927
  } else {
36847
- if (isMsg) {
36928
+ if (isActiveMsg) {
36848
36929
  // 检测弹窗模块
36849
36930
  if (false) {}
36850
36931
  v_x_e_table.modal.message({
@@ -36862,20 +36943,23 @@ Object.keys(packages_table.methods).forEach(function (name) {
36862
36943
  case 'save':
36863
36944
  {
36864
36945
  var _ajaxMethods2 = ajax.save;
36946
+ var saveSuccessMethods = ajax.saveSuccess;
36947
+ var saveErrorMethods = ajax.saveError;
36865
36948
  if (_ajaxMethods2) {
36866
36949
  var _body = this.getRecordset();
36867
36950
  var insertRecords = _body.insertRecords,
36868
36951
  _removeRecords = _body.removeRecords,
36869
36952
  updateRecords = _body.updateRecords,
36870
36953
  pendingRecords = _body.pendingRecords;
36871
- var _applyArgs2 = [{
36954
+ var _commitParams2 = {
36872
36955
  $grid: this,
36873
36956
  code: code,
36874
36957
  button: button,
36875
36958
  body: _body,
36876
36959
  form: formData,
36877
36960
  options: _ajaxMethods2
36878
- }].concat(args);
36961
+ };
36962
+ var _applyArgs2 = [_commitParams2].concat(args);
36879
36963
  // 排除掉新增且标记为删除的数据
36880
36964
  if (insertRecords.length) {
36881
36965
  _body.pendingRecords = pendingRecords.filter(function (row) {
@@ -36903,7 +36987,7 @@ Object.keys(packages_table.methods).forEach(function (name) {
36903
36987
  return Promise.resolve((beforeSave || _ajaxMethods2).apply(void 0, _toConsumableArray(_applyArgs2))).then(function (rest) {
36904
36988
  _this5.tableLoading = false;
36905
36989
  $xetable.clearPendingRow();
36906
- if (isMsg) {
36990
+ if (isRespMsg) {
36907
36991
  // 检测弹窗模块
36908
36992
  if (false) {}
36909
36993
  v_x_e_table.modal.message({
@@ -36916,12 +37000,17 @@ Object.keys(packages_table.methods).forEach(function (name) {
36916
37000
  } else {
36917
37001
  _this5.commitProxy('query');
36918
37002
  }
37003
+ if (saveSuccessMethods) {
37004
+ saveSuccessMethods(_objectSpread2(_objectSpread2({}, _commitParams2), {}, {
37005
+ response: rest
37006
+ }));
37007
+ }
36919
37008
  return {
36920
37009
  status: true
36921
37010
  };
36922
37011
  }).catch(function (rest) {
36923
37012
  _this5.tableLoading = false;
36924
- if (isMsg) {
37013
+ if (isRespMsg) {
36925
37014
  // 检测弹窗模块
36926
37015
  if (false) {}
36927
37016
  v_x_e_table.modal.message({
@@ -36930,12 +37019,17 @@ Object.keys(packages_table.methods).forEach(function (name) {
36930
37019
  status: 'error'
36931
37020
  });
36932
37021
  }
37022
+ if (saveErrorMethods) {
37023
+ saveErrorMethods(_objectSpread2(_objectSpread2({}, _commitParams2), {}, {
37024
+ response: rest
37025
+ }));
37026
+ }
36933
37027
  return {
36934
37028
  status: false
36935
37029
  };
36936
37030
  });
36937
37031
  } else {
36938
- if (isMsg) {
37032
+ if (isActiveMsg) {
36939
37033
  // 检测弹窗模块
36940
37034
  if (false) {}
36941
37035
  v_x_e_table.modal.message({
@@ -36981,7 +37075,7 @@ Object.keys(packages_table.methods).forEach(function (name) {
36981
37075
  },
36982
37076
  handleDeleteRow: function handleDeleteRow(code, alertKey, callback) {
36983
37077
  var selectRecords = this.getCheckboxRecords();
36984
- if (this.isMsg) {
37078
+ if (this.isActiveMsg) {
36985
37079
  if (selectRecords.length) {
36986
37080
  return v_x_e_table.modal.confirm({
36987
37081
  id: "cfm_".concat(code),
@@ -37051,13 +37145,13 @@ Object.keys(packages_table.methods).forEach(function (name) {
37051
37145
  });
37052
37146
  },
37053
37147
  triggerPendingEvent: function triggerPendingEvent(code) {
37054
- var isMsg = this.isMsg;
37148
+ var isActiveMsg = this.isActiveMsg;
37055
37149
  var selectRecords = this.getCheckboxRecords();
37056
37150
  if (selectRecords.length) {
37057
37151
  this.togglePendingRow(selectRecords);
37058
37152
  this.clearCheckboxRow();
37059
37153
  } else {
37060
- if (isMsg) {
37154
+ if (isActiveMsg) {
37061
37155
  // 检测弹窗模块
37062
37156
  if (false) {}
37063
37157
  v_x_e_table.modal.message({
@@ -37281,6 +37375,7 @@ var renderDropdowns = function renderDropdowns(h, _vm, item, isBtn) {
37281
37375
  disabled: child.disabled,
37282
37376
  loading: child.loading,
37283
37377
  type: child.type,
37378
+ mode: child.mode,
37284
37379
  icon: child.icon,
37285
37380
  circle: child.circle,
37286
37381
  round: child.round,
@@ -37341,6 +37436,7 @@ function renderBtns(h, _vm) {
37341
37436
  disabled: item.disabled,
37342
37437
  loading: item.loading,
37343
37438
  type: item.type,
37439
+ mode: item.mode,
37344
37440
  icon: item.icon,
37345
37441
  circle: item.circle,
37346
37442
  round: item.round,
@@ -37407,6 +37503,7 @@ function renderRightTools(h, _vm) {
37407
37503
  disabled: item.disabled,
37408
37504
  loading: item.loading,
37409
37505
  type: item.type,
37506
+ mode: item.mode,
37410
37507
  icon: item.icon,
37411
37508
  circle: item.circle,
37412
37509
  round: item.round,