vxe-table 3.8.16 → 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.
- package/lib/edit/src/mixin.js +39 -29
- package/lib/edit/src/mixin.min.js +1 -1
- package/lib/export/src/mixin.js +26 -6
- package/lib/export/src/mixin.min.js +1 -1
- package/lib/grid/src/grid.js +63 -20
- package/lib/grid/src/grid.min.js +1 -1
- package/lib/icon/style/{iconfont.1721369585843.ttf → iconfont.1723002262597.ttf} +0 -0
- package/lib/icon/style/iconfont.1723002262597.woff +0 -0
- package/lib/icon/style/iconfont.1723002262597.woff2 +0 -0
- package/lib/icon/style/style.css +81 -3
- package/lib/icon/style/style.min.css +81 -3
- package/lib/{iconfont.1721369585843.ttf → iconfont.1723002262597.ttf} +0 -0
- package/lib/iconfont.1723002262597.woff +0 -0
- package/lib/iconfont.1723002262597.woff2 +0 -0
- package/lib/index.css +1 -1
- package/lib/index.umd.js +156 -74
- package/lib/index.umd.min.js +1 -1
- package/lib/input/src/input.js +14 -6
- package/lib/input/src/input.min.js +1 -1
- package/lib/style.css +1 -1
- package/lib/style.min.css +1 -1
- package/lib/table/src/methods.js +16 -14
- package/lib/table/src/methods.min.js +1 -1
- package/lib/table/style/style.css +70 -46
- package/lib/table/style/style.min.css +1 -1
- package/lib/toolbar/src/toolbar.js +3 -0
- package/lib/toolbar/src/toolbar.min.js +1 -1
- package/lib/tools/log.js +1 -1
- package/lib/tools/log.min.js +1 -1
- package/lib/v-x-e-table/index.js +1 -1
- package/lib/v-x-e-table/index.min.js +1 -1
- package/lib/v-x-e-table/src/conf.js +2 -1
- package/lib/v-x-e-table/src/conf.min.js +1 -1
- package/lib/v-x-e-table/src/renderer.js +1 -1
- package/lib/v-x-e-table/src/renderer.min.js +1 -1
- package/lib/v-x-e-table/style/style.css +57 -3
- package/lib/v-x-e-table/style/style.min.css +1 -1
- package/lib/vxe-icon/style/style.css +81 -3
- package/lib/vxe-icon/style/style.min.css +1 -1
- package/lib/vxe-table/style/style.css +70 -46
- package/lib/vxe-table/style/style.min.css +1 -1
- package/package.json +2 -2
- package/packages/edit/src/mixin.js +10 -3
- package/packages/export/src/mixin.js +15 -4
- package/packages/grid/src/grid.js +48 -18
- package/packages/input/src/input.js +14 -8
- package/packages/table/src/methods.js +14 -12
- package/packages/toolbar/src/toolbar.js +3 -0
- package/packages/v-x-e-table/src/conf.js +2 -1
- package/packages/v-x-e-table/src/renderer.js +1 -1
- package/styles/icon/iconfont.ttf +0 -0
- package/styles/icon/iconfont.woff +0 -0
- package/styles/icon/iconfont.woff2 +0 -0
- package/styles/icon.scss +53 -4
- package/styles/old-icon.scss +4 -0
- package/styles/table.scss +37 -17
- package/lib/icon/style/iconfont.1721369585843.woff +0 -0
- package/lib/icon/style/iconfont.1721369585843.woff2 +0 -0
- package/lib/iconfont.1721369585843.woff +0 -0
- 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
|
-
|
|
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.
|
|
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) {
|
|
@@ -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 (!
|
|
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.
|
|
13220
|
+
var version = "3.8.17";
|
|
13220
13221
|
var tableVersion = version;
|
|
13221
13222
|
var VxeUI = {
|
|
13222
13223
|
v: v,
|
|
@@ -19652,15 +19653,17 @@ var Methods = {
|
|
|
19652
19653
|
this.clearSelected();
|
|
19653
19654
|
}
|
|
19654
19655
|
if (areaOpts.autoClear) {
|
|
19655
|
-
|
|
19656
|
-
|
|
19657
|
-
|
|
19658
|
-
|
|
19659
|
-
|
|
19660
|
-
|
|
19661
|
-
|
|
19662
|
-
|
|
19663
|
-
|
|
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
|
+
}
|
|
19664
19667
|
}
|
|
19665
19668
|
}
|
|
19666
19669
|
}
|
|
@@ -25888,23 +25891,33 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
|
|
|
25888
25891
|
* 获取表格数据集,包含新增、删除、修改
|
|
25889
25892
|
*/
|
|
25890
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
|
+
});
|
|
25891
25904
|
return {
|
|
25892
25905
|
insertRecords: this.getInsertRecords(),
|
|
25893
|
-
removeRecords:
|
|
25894
|
-
updateRecords:
|
|
25895
|
-
pendingRecords:
|
|
25906
|
+
removeRecords: removeRecords,
|
|
25907
|
+
updateRecords: updateRecords,
|
|
25908
|
+
pendingRecords: pendingRecords
|
|
25896
25909
|
};
|
|
25897
25910
|
},
|
|
25898
25911
|
/**
|
|
25899
25912
|
* 获取新增的临时数据
|
|
25900
25913
|
*/
|
|
25901
25914
|
_getInsertRecords: function _getInsertRecords() {
|
|
25902
|
-
var
|
|
25915
|
+
var _this6 = this;
|
|
25903
25916
|
var fullAllDataRowIdData = this.fullAllDataRowIdData;
|
|
25904
25917
|
var insertList = this.editStore.insertList;
|
|
25905
25918
|
var insertRecords = [];
|
|
25906
25919
|
insertList.forEach(function (row) {
|
|
25907
|
-
var rowid = getRowid(
|
|
25920
|
+
var rowid = getRowid(_this6, row);
|
|
25908
25921
|
if (fullAllDataRowIdData[rowid]) {
|
|
25909
25922
|
insertRecords.push(row);
|
|
25910
25923
|
}
|
|
@@ -25951,7 +25964,7 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
|
|
|
25951
25964
|
* 处理激活编辑
|
|
25952
25965
|
*/
|
|
25953
25966
|
handleActived: function handleActived(params, evnt) {
|
|
25954
|
-
var
|
|
25967
|
+
var _this7 = this;
|
|
25955
25968
|
var editStore = this.editStore,
|
|
25956
25969
|
editOpts = this.editOpts,
|
|
25957
25970
|
tableColumn = this.tableColumn,
|
|
@@ -25991,18 +26004,18 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
|
|
|
25991
26004
|
actived.column = column;
|
|
25992
26005
|
if (mode === 'row') {
|
|
25993
26006
|
tableColumn.forEach(function (column) {
|
|
25994
|
-
return
|
|
26007
|
+
return _this7._getColumnModel(row, column);
|
|
25995
26008
|
});
|
|
25996
26009
|
} else {
|
|
25997
26010
|
this._getColumnModel(row, column);
|
|
25998
26011
|
}
|
|
25999
26012
|
var afterEditMethod = editOpts.afterEditMethod;
|
|
26000
26013
|
this.$nextTick(function () {
|
|
26001
|
-
|
|
26014
|
+
_this7.handleFocus(params, evnt);
|
|
26002
26015
|
if (afterEditMethod) {
|
|
26003
26016
|
afterEditMethod(_objectSpread2(_objectSpread2({}, params), {}, {
|
|
26004
|
-
$table:
|
|
26005
|
-
$grid:
|
|
26017
|
+
$table: _this7,
|
|
26018
|
+
$grid: _this7.$xegrid
|
|
26006
26019
|
}));
|
|
26007
26020
|
}
|
|
26008
26021
|
});
|
|
@@ -26045,7 +26058,7 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
|
|
|
26045
26058
|
actived.args = params;
|
|
26046
26059
|
actived.column = column;
|
|
26047
26060
|
setTimeout(function () {
|
|
26048
|
-
|
|
26061
|
+
_this7.handleFocus(params, evnt);
|
|
26049
26062
|
});
|
|
26050
26063
|
}
|
|
26051
26064
|
focused.column = null;
|
|
@@ -26073,7 +26086,7 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
|
|
|
26073
26086
|
}
|
|
26074
26087
|
},
|
|
26075
26088
|
_syncActivedCell: function _syncActivedCell() {
|
|
26076
|
-
var
|
|
26089
|
+
var _this8 = this;
|
|
26077
26090
|
var tableColumn = this.tableColumn,
|
|
26078
26091
|
editStore = this.editStore,
|
|
26079
26092
|
editOpts = this.editOpts;
|
|
@@ -26083,7 +26096,7 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
|
|
|
26083
26096
|
if (row || column) {
|
|
26084
26097
|
if (editOpts.mode === 'row') {
|
|
26085
26098
|
tableColumn.forEach(function (column) {
|
|
26086
|
-
return
|
|
26099
|
+
return _this8._setColumnModel(row, column);
|
|
26087
26100
|
});
|
|
26088
26101
|
} else {
|
|
26089
26102
|
this._setColumnModel(row, column);
|
|
@@ -26228,22 +26241,22 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
|
|
|
26228
26241
|
* 激活单元格编辑
|
|
26229
26242
|
*/
|
|
26230
26243
|
_setEditCell: function _setEditCell(row, fieldOrColumn) {
|
|
26231
|
-
var
|
|
26244
|
+
var _this9 = this;
|
|
26232
26245
|
var editConfig = this.editConfig;
|
|
26233
26246
|
var column = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(fieldOrColumn) ? this.getColumnByField(fieldOrColumn) : fieldOrColumn;
|
|
26234
26247
|
if (row && column && isEnableConf(editConfig) && isEnableConf(column.editRender)) {
|
|
26235
26248
|
return this.scrollToRow(row, true).then(function () {
|
|
26236
|
-
var cell =
|
|
26249
|
+
var cell = _this9.getCellElement(row, column);
|
|
26237
26250
|
if (cell) {
|
|
26238
|
-
|
|
26251
|
+
_this9.handleActived({
|
|
26239
26252
|
row: row,
|
|
26240
|
-
rowIndex:
|
|
26253
|
+
rowIndex: _this9.getRowIndex(row),
|
|
26241
26254
|
column: column,
|
|
26242
|
-
columnIndex:
|
|
26255
|
+
columnIndex: _this9.getColumnIndex(column),
|
|
26243
26256
|
cell: cell,
|
|
26244
|
-
$table:
|
|
26257
|
+
$table: _this9
|
|
26245
26258
|
});
|
|
26246
|
-
|
|
26259
|
+
_this9.lastCallTime = Date.now();
|
|
26247
26260
|
}
|
|
26248
26261
|
});
|
|
26249
26262
|
}
|
|
@@ -26277,7 +26290,7 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
|
|
|
26277
26290
|
* 处理选中源
|
|
26278
26291
|
*/
|
|
26279
26292
|
handleSelected: function handleSelected(params, evnt) {
|
|
26280
|
-
var
|
|
26293
|
+
var _this10 = this;
|
|
26281
26294
|
var mouseConfig = this.mouseConfig,
|
|
26282
26295
|
mouseOpts = this.mouseOpts,
|
|
26283
26296
|
editOpts = this.editOpts,
|
|
@@ -26290,23 +26303,23 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
|
|
|
26290
26303
|
var selectMethod = function selectMethod() {
|
|
26291
26304
|
if (isMouseSelected && (selected.row !== row || selected.column !== column)) {
|
|
26292
26305
|
if (actived.row !== row || (editOpts.mode === 'cell' ? actived.column !== column : false)) {
|
|
26293
|
-
|
|
26294
|
-
|
|
26295
|
-
|
|
26296
|
-
|
|
26306
|
+
_this10.clearEdit(evnt);
|
|
26307
|
+
_this10.clearSelected(evnt);
|
|
26308
|
+
_this10.clearCellAreas(evnt);
|
|
26309
|
+
_this10.clearCopyCellArea(evnt);
|
|
26297
26310
|
selected.args = params;
|
|
26298
26311
|
selected.row = row;
|
|
26299
26312
|
selected.column = column;
|
|
26300
26313
|
if (isMouseSelected) {
|
|
26301
|
-
|
|
26314
|
+
_this10.addColSdCls();
|
|
26302
26315
|
}
|
|
26303
|
-
|
|
26316
|
+
_this10.focus();
|
|
26304
26317
|
if (evnt) {
|
|
26305
|
-
|
|
26318
|
+
_this10.emitEvent('cell-selected', params, evnt);
|
|
26306
26319
|
}
|
|
26307
26320
|
}
|
|
26308
26321
|
}
|
|
26309
|
-
return
|
|
26322
|
+
return _this10.$nextTick();
|
|
26310
26323
|
};
|
|
26311
26324
|
return selectMethod();
|
|
26312
26325
|
},
|
|
@@ -28245,8 +28258,8 @@ function renderExtraSuffixIcon(h, _vm) {
|
|
|
28245
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;
|
|
28246
28259
|
}
|
|
28247
28260
|
},
|
|
28248
|
-
|
|
28249
|
-
|
|
28261
|
+
maxLength: [String, Number],
|
|
28262
|
+
autoComplete: {
|
|
28250
28263
|
type: String,
|
|
28251
28264
|
default: 'off'
|
|
28252
28265
|
},
|
|
@@ -28360,7 +28373,11 @@ function renderExtraSuffixIcon(h, _vm) {
|
|
|
28360
28373
|
default: function _default() {
|
|
28361
28374
|
return conf.input.transfer;
|
|
28362
28375
|
}
|
|
28363
|
-
}
|
|
28376
|
+
},
|
|
28377
|
+
// 已废弃
|
|
28378
|
+
maxlength: [String, Number],
|
|
28379
|
+
// 已废弃
|
|
28380
|
+
autocomplete: String
|
|
28364
28381
|
},
|
|
28365
28382
|
inject: {
|
|
28366
28383
|
$xeform: {
|
|
@@ -28409,7 +28426,9 @@ function renderExtraSuffixIcon(h, _vm) {
|
|
|
28409
28426
|
return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getSize(this.inputValue);
|
|
28410
28427
|
},
|
|
28411
28428
|
isCountError: function isCountError() {
|
|
28412
|
-
|
|
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);
|
|
28413
28432
|
},
|
|
28414
28433
|
stepValue: function stepValue() {
|
|
28415
28434
|
var type = this.type,
|
|
@@ -28767,9 +28786,10 @@ function renderExtraSuffixIcon(h, _vm) {
|
|
|
28767
28786
|
},
|
|
28768
28787
|
inpMaxlength: function inpMaxlength() {
|
|
28769
28788
|
var isNumType = this.isNumType,
|
|
28789
|
+
maxLength = this.maxLength,
|
|
28770
28790
|
maxlength = this.maxlength;
|
|
28771
28791
|
// 数值最大长度限制 16 位,包含小数
|
|
28772
|
-
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;
|
|
28773
28793
|
},
|
|
28774
28794
|
inpReadonly: function inpReadonly() {
|
|
28775
28795
|
var type = this.type,
|
|
@@ -28885,6 +28905,7 @@ function renderExtraSuffixIcon(h, _vm) {
|
|
|
28885
28905
|
align = this.align,
|
|
28886
28906
|
readonly = this.readonly,
|
|
28887
28907
|
disabled = this.disabled,
|
|
28908
|
+
autoComplete = this.autoComplete,
|
|
28888
28909
|
autocomplete = this.autocomplete;
|
|
28889
28910
|
var childs = [];
|
|
28890
28911
|
var prefix = rendePrefixIcon(h, this);
|
|
@@ -28908,7 +28929,7 @@ function renderExtraSuffixIcon(h, _vm) {
|
|
|
28908
28929
|
maxlength: inpMaxlength,
|
|
28909
28930
|
readonly: inpReadonly,
|
|
28910
28931
|
disabled: disabled,
|
|
28911
|
-
autocomplete: autocomplete
|
|
28932
|
+
autocomplete: autoComplete || autocomplete
|
|
28912
28933
|
},
|
|
28913
28934
|
on: {
|
|
28914
28935
|
keydown: this.keydownEvent,
|
|
@@ -32135,6 +32156,7 @@ var web_url_search_params_size = __webpack_require__(8721);
|
|
|
32135
32156
|
|
|
32136
32157
|
|
|
32137
32158
|
|
|
32159
|
+
|
|
32138
32160
|
|
|
32139
32161
|
|
|
32140
32162
|
var formatText = utils.formatText;
|
|
@@ -33031,6 +33053,9 @@ function handleImport($xetable, content, opts) {
|
|
|
33031
33053
|
$xetable.createData(rows).then(function (data) {
|
|
33032
33054
|
var loadRest;
|
|
33033
33055
|
if (opts.mode === 'insert' || opts.mode === 'insertBottom') {
|
|
33056
|
+
loadRest = $xetable.insertAt(data, -1);
|
|
33057
|
+
}
|
|
33058
|
+
if (opts.mode === 'insertTop') {
|
|
33034
33059
|
loadRest = $xetable.insert(data);
|
|
33035
33060
|
} else {
|
|
33036
33061
|
loadRest = $xetable.reloadData(data);
|
|
@@ -33103,7 +33128,7 @@ function handleFileImport($xetable, file, opts) {
|
|
|
33103
33128
|
$xetable._importReject = _importReject;
|
|
33104
33129
|
if (window.FileReader) {
|
|
33105
33130
|
var options = Object.assign({
|
|
33106
|
-
mode: '
|
|
33131
|
+
mode: 'insertTop'
|
|
33107
33132
|
}, opts, {
|
|
33108
33133
|
type: type,
|
|
33109
33134
|
filename: filename
|
|
@@ -33621,6 +33646,8 @@ var convertToRows = function convertToRows(originColumns) {
|
|
|
33621
33646
|
_$xegrid$proxyOpts$pr = _$xegrid$proxyOpts.props,
|
|
33622
33647
|
props = _$xegrid$proxyOpts$pr === void 0 ? {} : _$xegrid$proxyOpts$pr;
|
|
33623
33648
|
var ajaxMethods = ajax.queryAll;
|
|
33649
|
+
var queryAllSuccessMethods = ajax.queryAllSuccess;
|
|
33650
|
+
var queryAllErrorMethods = ajax.queryAllError;
|
|
33624
33651
|
if (false) {}
|
|
33625
33652
|
if (ajaxMethods) {
|
|
33626
33653
|
var _params = {
|
|
@@ -33632,14 +33659,23 @@ var convertToRows = function convertToRows(originColumns) {
|
|
|
33632
33659
|
target: ajaxMethods,
|
|
33633
33660
|
options: opts
|
|
33634
33661
|
};
|
|
33635
|
-
return Promise.resolve((beforeQueryAll || ajaxMethods)(_params)).
|
|
33636
|
-
return e;
|
|
33637
|
-
}).then(function (rest) {
|
|
33662
|
+
return Promise.resolve((beforeQueryAll || ajaxMethods)(_params)).then(function (rest) {
|
|
33638
33663
|
opts.data = (props.list ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(rest, props.list) : rest) || [];
|
|
33639
33664
|
if (afterQueryAll) {
|
|
33640
33665
|
afterQueryAll(_params);
|
|
33641
33666
|
}
|
|
33667
|
+
if (queryAllSuccessMethods) {
|
|
33668
|
+
queryAllSuccessMethods(_objectSpread2(_objectSpread2({}, _params), {}, {
|
|
33669
|
+
response: rest
|
|
33670
|
+
}));
|
|
33671
|
+
}
|
|
33642
33672
|
return handleExport(_this, opts);
|
|
33673
|
+
}).catch(function (rest) {
|
|
33674
|
+
if (queryAllErrorMethods) {
|
|
33675
|
+
queryAllErrorMethods(_objectSpread2(_objectSpread2({}, _params), {}, {
|
|
33676
|
+
response: rest
|
|
33677
|
+
}));
|
|
33678
|
+
}
|
|
33643
33679
|
});
|
|
33644
33680
|
}
|
|
33645
33681
|
}
|
|
@@ -33743,10 +33779,10 @@ var convertToRows = function convertToRows(originColumns) {
|
|
|
33743
33779
|
var _this4 = this;
|
|
33744
33780
|
var importOpts = this.importOpts;
|
|
33745
33781
|
var defOpts = Object.assign({
|
|
33746
|
-
mode: '
|
|
33782
|
+
mode: 'insertTop',
|
|
33747
33783
|
message: true,
|
|
33748
33784
|
types: external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(importOpts._typeMaps),
|
|
33749
|
-
modes: ['
|
|
33785
|
+
modes: ['insertTop', 'covering']
|
|
33750
33786
|
}, options, importOpts);
|
|
33751
33787
|
var types = defOpts.types || [];
|
|
33752
33788
|
var modes = defOpts.modes || [];
|
|
@@ -36375,11 +36411,15 @@ Object.keys(packages_table.methods).forEach(function (name) {
|
|
|
36375
36411
|
};
|
|
36376
36412
|
},
|
|
36377
36413
|
computed: {
|
|
36378
|
-
|
|
36379
|
-
|
|
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;
|
|
36380
36420
|
},
|
|
36381
36421
|
proxyOpts: function proxyOpts() {
|
|
36382
|
-
return
|
|
36422
|
+
return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().merge({}, conf.grid.proxyConfig, this.proxyConfig);
|
|
36383
36423
|
},
|
|
36384
36424
|
pagerOpts: function pagerOpts() {
|
|
36385
36425
|
return Object.assign({}, conf.grid.pagerConfig, this.pagerConfig);
|
|
@@ -36620,7 +36660,8 @@ Object.keys(packages_table.methods).forEach(function (name) {
|
|
|
36620
36660
|
pagerConfig = this.pagerConfig,
|
|
36621
36661
|
editRules = this.editRules,
|
|
36622
36662
|
formData = this.formData,
|
|
36623
|
-
|
|
36663
|
+
isRespMsg = this.isRespMsg,
|
|
36664
|
+
isActiveMsg = this.isActiveMsg,
|
|
36624
36665
|
validConfig = this.validConfig,
|
|
36625
36666
|
pagerOpts = this.pagerOpts;
|
|
36626
36667
|
var beforeQuery = proxyOpts.beforeQuery,
|
|
@@ -36695,6 +36736,8 @@ Object.keys(packages_table.methods).forEach(function (name) {
|
|
|
36695
36736
|
case 'query':
|
|
36696
36737
|
{
|
|
36697
36738
|
var ajaxMethods = ajax.query;
|
|
36739
|
+
var querySuccessMethods = ajax.querySuccess;
|
|
36740
|
+
var queryErrorMethods = ajax.queryError;
|
|
36698
36741
|
if (ajaxMethods) {
|
|
36699
36742
|
var isInited = code === '_init';
|
|
36700
36743
|
var isReload = code === 'reload';
|
|
@@ -36734,7 +36777,7 @@ Object.keys(packages_table.methods).forEach(function (name) {
|
|
|
36734
36777
|
filterList = $xetable.getCheckedFilters();
|
|
36735
36778
|
}
|
|
36736
36779
|
}
|
|
36737
|
-
var
|
|
36780
|
+
var commitParams = {
|
|
36738
36781
|
code: code,
|
|
36739
36782
|
button: button,
|
|
36740
36783
|
isInited: isInited,
|
|
@@ -36750,7 +36793,7 @@ Object.keys(packages_table.methods).forEach(function (name) {
|
|
|
36750
36793
|
this.sortData = sortList;
|
|
36751
36794
|
this.filterData = filterList;
|
|
36752
36795
|
this.tableLoading = true;
|
|
36753
|
-
var applyArgs = [
|
|
36796
|
+
var applyArgs = [commitParams].concat(args);
|
|
36754
36797
|
return Promise.resolve((beforeQuery || ajaxMethods).apply(void 0, _toConsumableArray(applyArgs))).then(function (rest) {
|
|
36755
36798
|
_this5.tableLoading = false;
|
|
36756
36799
|
if (rest) {
|
|
@@ -36784,11 +36827,21 @@ Object.keys(packages_table.methods).forEach(function (name) {
|
|
|
36784
36827
|
if (afterQuery) {
|
|
36785
36828
|
afterQuery.apply(void 0, _toConsumableArray(applyArgs));
|
|
36786
36829
|
}
|
|
36830
|
+
if (querySuccessMethods) {
|
|
36831
|
+
querySuccessMethods(_objectSpread2(_objectSpread2({}, commitParams), {}, {
|
|
36832
|
+
response: rest
|
|
36833
|
+
}));
|
|
36834
|
+
}
|
|
36787
36835
|
return {
|
|
36788
36836
|
status: true
|
|
36789
36837
|
};
|
|
36790
|
-
}).catch(function () {
|
|
36838
|
+
}).catch(function (rest) {
|
|
36791
36839
|
_this5.tableLoading = false;
|
|
36840
|
+
if (queryErrorMethods) {
|
|
36841
|
+
queryErrorMethods(_objectSpread2(_objectSpread2({}, commitParams), {}, {
|
|
36842
|
+
response: rest
|
|
36843
|
+
}));
|
|
36844
|
+
}
|
|
36792
36845
|
return {
|
|
36793
36846
|
status: false
|
|
36794
36847
|
};
|
|
@@ -36801,6 +36854,8 @@ Object.keys(packages_table.methods).forEach(function (name) {
|
|
|
36801
36854
|
case 'delete':
|
|
36802
36855
|
{
|
|
36803
36856
|
var _ajaxMethods = ajax.delete;
|
|
36857
|
+
var deleteSuccessMethods = ajax.deleteSuccess;
|
|
36858
|
+
var deleteErrorMethods = ajax.deleteError;
|
|
36804
36859
|
if (_ajaxMethods) {
|
|
36805
36860
|
var selectRecords = $xetable.getCheckboxRecords();
|
|
36806
36861
|
var removeRecords = selectRecords.filter(function (row) {
|
|
@@ -36809,14 +36864,15 @@ Object.keys(packages_table.methods).forEach(function (name) {
|
|
|
36809
36864
|
var body = {
|
|
36810
36865
|
removeRecords: removeRecords
|
|
36811
36866
|
};
|
|
36812
|
-
var
|
|
36867
|
+
var _commitParams = {
|
|
36813
36868
|
$grid: this,
|
|
36814
36869
|
code: code,
|
|
36815
36870
|
button: button,
|
|
36816
36871
|
body: body,
|
|
36817
36872
|
form: formData,
|
|
36818
36873
|
options: _ajaxMethods
|
|
36819
|
-
}
|
|
36874
|
+
};
|
|
36875
|
+
var _applyArgs = [_commitParams].concat(args);
|
|
36820
36876
|
if (selectRecords.length) {
|
|
36821
36877
|
return this.handleDeleteRow(code, 'vxe.grid.deleteSelectRecord', function () {
|
|
36822
36878
|
if (!removeRecords.length) {
|
|
@@ -36826,7 +36882,7 @@ Object.keys(packages_table.methods).forEach(function (name) {
|
|
|
36826
36882
|
return Promise.resolve((beforeDelete || _ajaxMethods).apply(void 0, _toConsumableArray(_applyArgs))).then(function (rest) {
|
|
36827
36883
|
_this5.tableLoading = false;
|
|
36828
36884
|
$xetable.setPendingRow(removeRecords, false);
|
|
36829
|
-
if (
|
|
36885
|
+
if (isRespMsg) {
|
|
36830
36886
|
// 检测弹窗模块
|
|
36831
36887
|
if (false) {}
|
|
36832
36888
|
v_x_e_table.modal.message({
|
|
@@ -36839,12 +36895,17 @@ Object.keys(packages_table.methods).forEach(function (name) {
|
|
|
36839
36895
|
} else {
|
|
36840
36896
|
_this5.commitProxy('query');
|
|
36841
36897
|
}
|
|
36898
|
+
if (deleteSuccessMethods) {
|
|
36899
|
+
deleteSuccessMethods(_objectSpread2(_objectSpread2({}, _commitParams), {}, {
|
|
36900
|
+
response: rest
|
|
36901
|
+
}));
|
|
36902
|
+
}
|
|
36842
36903
|
return {
|
|
36843
36904
|
status: true
|
|
36844
36905
|
};
|
|
36845
36906
|
}).catch(function (rest) {
|
|
36846
36907
|
_this5.tableLoading = false;
|
|
36847
|
-
if (
|
|
36908
|
+
if (isRespMsg) {
|
|
36848
36909
|
// 检测弹窗模块
|
|
36849
36910
|
if (false) {}
|
|
36850
36911
|
v_x_e_table.modal.message({
|
|
@@ -36853,13 +36914,18 @@ Object.keys(packages_table.methods).forEach(function (name) {
|
|
|
36853
36914
|
status: 'error'
|
|
36854
36915
|
});
|
|
36855
36916
|
}
|
|
36917
|
+
if (deleteErrorMethods) {
|
|
36918
|
+
deleteErrorMethods(_objectSpread2(_objectSpread2({}, _commitParams), {}, {
|
|
36919
|
+
response: rest
|
|
36920
|
+
}));
|
|
36921
|
+
}
|
|
36856
36922
|
return {
|
|
36857
36923
|
status: false
|
|
36858
36924
|
};
|
|
36859
36925
|
});
|
|
36860
36926
|
});
|
|
36861
36927
|
} else {
|
|
36862
|
-
if (
|
|
36928
|
+
if (isActiveMsg) {
|
|
36863
36929
|
// 检测弹窗模块
|
|
36864
36930
|
if (false) {}
|
|
36865
36931
|
v_x_e_table.modal.message({
|
|
@@ -36877,20 +36943,23 @@ Object.keys(packages_table.methods).forEach(function (name) {
|
|
|
36877
36943
|
case 'save':
|
|
36878
36944
|
{
|
|
36879
36945
|
var _ajaxMethods2 = ajax.save;
|
|
36946
|
+
var saveSuccessMethods = ajax.saveSuccess;
|
|
36947
|
+
var saveErrorMethods = ajax.saveError;
|
|
36880
36948
|
if (_ajaxMethods2) {
|
|
36881
36949
|
var _body = this.getRecordset();
|
|
36882
36950
|
var insertRecords = _body.insertRecords,
|
|
36883
36951
|
_removeRecords = _body.removeRecords,
|
|
36884
36952
|
updateRecords = _body.updateRecords,
|
|
36885
36953
|
pendingRecords = _body.pendingRecords;
|
|
36886
|
-
var
|
|
36954
|
+
var _commitParams2 = {
|
|
36887
36955
|
$grid: this,
|
|
36888
36956
|
code: code,
|
|
36889
36957
|
button: button,
|
|
36890
36958
|
body: _body,
|
|
36891
36959
|
form: formData,
|
|
36892
36960
|
options: _ajaxMethods2
|
|
36893
|
-
}
|
|
36961
|
+
};
|
|
36962
|
+
var _applyArgs2 = [_commitParams2].concat(args);
|
|
36894
36963
|
// 排除掉新增且标记为删除的数据
|
|
36895
36964
|
if (insertRecords.length) {
|
|
36896
36965
|
_body.pendingRecords = pendingRecords.filter(function (row) {
|
|
@@ -36918,7 +36987,7 @@ Object.keys(packages_table.methods).forEach(function (name) {
|
|
|
36918
36987
|
return Promise.resolve((beforeSave || _ajaxMethods2).apply(void 0, _toConsumableArray(_applyArgs2))).then(function (rest) {
|
|
36919
36988
|
_this5.tableLoading = false;
|
|
36920
36989
|
$xetable.clearPendingRow();
|
|
36921
|
-
if (
|
|
36990
|
+
if (isRespMsg) {
|
|
36922
36991
|
// 检测弹窗模块
|
|
36923
36992
|
if (false) {}
|
|
36924
36993
|
v_x_e_table.modal.message({
|
|
@@ -36931,12 +37000,17 @@ Object.keys(packages_table.methods).forEach(function (name) {
|
|
|
36931
37000
|
} else {
|
|
36932
37001
|
_this5.commitProxy('query');
|
|
36933
37002
|
}
|
|
37003
|
+
if (saveSuccessMethods) {
|
|
37004
|
+
saveSuccessMethods(_objectSpread2(_objectSpread2({}, _commitParams2), {}, {
|
|
37005
|
+
response: rest
|
|
37006
|
+
}));
|
|
37007
|
+
}
|
|
36934
37008
|
return {
|
|
36935
37009
|
status: true
|
|
36936
37010
|
};
|
|
36937
37011
|
}).catch(function (rest) {
|
|
36938
37012
|
_this5.tableLoading = false;
|
|
36939
|
-
if (
|
|
37013
|
+
if (isRespMsg) {
|
|
36940
37014
|
// 检测弹窗模块
|
|
36941
37015
|
if (false) {}
|
|
36942
37016
|
v_x_e_table.modal.message({
|
|
@@ -36945,12 +37019,17 @@ Object.keys(packages_table.methods).forEach(function (name) {
|
|
|
36945
37019
|
status: 'error'
|
|
36946
37020
|
});
|
|
36947
37021
|
}
|
|
37022
|
+
if (saveErrorMethods) {
|
|
37023
|
+
saveErrorMethods(_objectSpread2(_objectSpread2({}, _commitParams2), {}, {
|
|
37024
|
+
response: rest
|
|
37025
|
+
}));
|
|
37026
|
+
}
|
|
36948
37027
|
return {
|
|
36949
37028
|
status: false
|
|
36950
37029
|
};
|
|
36951
37030
|
});
|
|
36952
37031
|
} else {
|
|
36953
|
-
if (
|
|
37032
|
+
if (isActiveMsg) {
|
|
36954
37033
|
// 检测弹窗模块
|
|
36955
37034
|
if (false) {}
|
|
36956
37035
|
v_x_e_table.modal.message({
|
|
@@ -36996,7 +37075,7 @@ Object.keys(packages_table.methods).forEach(function (name) {
|
|
|
36996
37075
|
},
|
|
36997
37076
|
handleDeleteRow: function handleDeleteRow(code, alertKey, callback) {
|
|
36998
37077
|
var selectRecords = this.getCheckboxRecords();
|
|
36999
|
-
if (this.
|
|
37078
|
+
if (this.isActiveMsg) {
|
|
37000
37079
|
if (selectRecords.length) {
|
|
37001
37080
|
return v_x_e_table.modal.confirm({
|
|
37002
37081
|
id: "cfm_".concat(code),
|
|
@@ -37066,13 +37145,13 @@ Object.keys(packages_table.methods).forEach(function (name) {
|
|
|
37066
37145
|
});
|
|
37067
37146
|
},
|
|
37068
37147
|
triggerPendingEvent: function triggerPendingEvent(code) {
|
|
37069
|
-
var
|
|
37148
|
+
var isActiveMsg = this.isActiveMsg;
|
|
37070
37149
|
var selectRecords = this.getCheckboxRecords();
|
|
37071
37150
|
if (selectRecords.length) {
|
|
37072
37151
|
this.togglePendingRow(selectRecords);
|
|
37073
37152
|
this.clearCheckboxRow();
|
|
37074
37153
|
} else {
|
|
37075
|
-
if (
|
|
37154
|
+
if (isActiveMsg) {
|
|
37076
37155
|
// 检测弹窗模块
|
|
37077
37156
|
if (false) {}
|
|
37078
37157
|
v_x_e_table.modal.message({
|
|
@@ -37296,6 +37375,7 @@ var renderDropdowns = function renderDropdowns(h, _vm, item, isBtn) {
|
|
|
37296
37375
|
disabled: child.disabled,
|
|
37297
37376
|
loading: child.loading,
|
|
37298
37377
|
type: child.type,
|
|
37378
|
+
mode: child.mode,
|
|
37299
37379
|
icon: child.icon,
|
|
37300
37380
|
circle: child.circle,
|
|
37301
37381
|
round: child.round,
|
|
@@ -37356,6 +37436,7 @@ function renderBtns(h, _vm) {
|
|
|
37356
37436
|
disabled: item.disabled,
|
|
37357
37437
|
loading: item.loading,
|
|
37358
37438
|
type: item.type,
|
|
37439
|
+
mode: item.mode,
|
|
37359
37440
|
icon: item.icon,
|
|
37360
37441
|
circle: item.circle,
|
|
37361
37442
|
round: item.round,
|
|
@@ -37422,6 +37503,7 @@ function renderRightTools(h, _vm) {
|
|
|
37422
37503
|
disabled: item.disabled,
|
|
37423
37504
|
loading: item.loading,
|
|
37424
37505
|
type: item.type,
|
|
37506
|
+
mode: item.mode,
|
|
37425
37507
|
icon: item.icon,
|
|
37426
37508
|
circle: item.circle,
|
|
37427
37509
|
round: item.round,
|