vxe-table 3.8.3 → 3.8.4
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/README.md +1 -0
- package/lib/button/src/button.js +44 -5
- package/lib/button/src/button.min.js +1 -1
- package/lib/button/src/group.js +10 -1
- package/lib/button/src/group.min.js +1 -1
- package/lib/custom/src/panel.js +18 -3
- package/lib/custom/src/panel.min.js +1 -1
- package/lib/custom/style/style.css +15 -9
- package/lib/custom/style/style.min.css +1 -1
- package/lib/edit/src/mixin.js +10 -7
- package/lib/edit/src/mixin.min.js +1 -1
- package/lib/grid/src/grid.js +3 -2
- package/lib/grid/src/grid.min.js +1 -1
- package/lib/icon/style/style.css +1 -1
- package/lib/icon/style/style.min.css +1 -1
- package/lib/index.css +1 -1
- package/lib/index.umd.js +189 -94
- package/lib/index.umd.min.js +1 -1
- package/lib/locale/lang/en-US.js +75 -74
- package/lib/locale/lang/en-US.min.js +1 -1
- package/lib/locale/lang/en-US.umd.js +75 -74
- package/lib/locale/lang/es-ES.js +11 -2
- package/lib/locale/lang/es-ES.min.js +1 -1
- package/lib/locale/lang/es-ES.umd.js +11 -2
- package/lib/locale/lang/ja-JP.js +157 -156
- package/lib/locale/lang/ja-JP.min.js +1 -1
- package/lib/locale/lang/ja-JP.umd.js +157 -156
- package/lib/locale/lang/pt-BR.js +199 -190
- package/lib/locale/lang/pt-BR.min.js +1 -1
- package/lib/locale/lang/pt-BR.umd.js +199 -190
- package/lib/locale/lang/zh-CN.js +53 -52
- package/lib/locale/lang/zh-CN.min.js +1 -1
- package/lib/locale/lang/zh-CN.umd.js +53 -52
- package/lib/locale/lang/zh-HK.min.js +1 -1
- package/lib/locale/lang/zh-HK.umd.js +60 -59
- package/lib/locale/lang/zh-MO.min.js +1 -1
- package/lib/locale/lang/zh-MO.umd.js +60 -59
- package/lib/locale/lang/zh-TC.js +60 -59
- package/lib/locale/lang/zh-TC.min.js +1 -1
- package/lib/locale/lang/zh-TC.umd.js +60 -59
- package/lib/locale/lang/zh-TW.min.js +1 -1
- package/lib/locale/lang/zh-TW.umd.js +60 -59
- package/lib/menu/src/mixin.js +5 -5
- package/lib/menu/src/mixin.min.js +1 -1
- package/lib/style.css +1 -1
- package/lib/style.min.css +1 -1
- package/lib/table/src/methods.js +32 -13
- package/lib/table/src/methods.min.js +1 -1
- package/lib/table/src/table.js +5 -0
- package/lib/table/src/table.min.js +1 -1
- package/lib/table/src/util.js +2 -2
- package/lib/table/src/util.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/interceptor.js +1 -1
- package/lib/v-x-e-table/src/interceptor.min.js +1 -1
- package/lib/vxe-table-custom-module/style/style.css +15 -9
- package/lib/vxe-table-custom-module/style/style.min.css +1 -1
- package/package.json +1 -1
- package/packages/button/src/button.js +42 -9
- package/packages/button/src/group.js +8 -2
- package/packages/custom/src/panel.js +22 -5
- package/packages/edit/src/mixin.js +9 -7
- package/packages/grid/src/grid.js +2 -2
- package/packages/locale/lang/en-US.js +75 -74
- package/packages/locale/lang/es-ES.js +11 -2
- package/packages/locale/lang/ja-JP.js +157 -156
- package/packages/locale/lang/pt-BR.js +200 -191
- package/packages/locale/lang/zh-CN.js +53 -52
- package/packages/locale/lang/zh-TC.js +60 -59
- package/packages/menu/src/mixin.js +5 -5
- package/packages/table/src/methods.js +33 -14
- package/packages/table/src/table.js +5 -0
- package/packages/table/src/util.js +2 -2
- package/packages/v-x-e-table/src/interceptor.js +1 -1
- package/styles/custom.scss +14 -2
- package/types/checkbox-group.d.ts +1 -1
- package/types/colgroup.d.ts +2 -4
- package/types/column.d.ts +7 -9
- package/types/table.d.ts +3 -4
- package/types/v-x-e-table/renderer.d.ts +1 -2
- /package/lib/icon/style/{iconfont.1714353062133.ttf → iconfont.1714486550546.ttf} +0 -0
- /package/lib/icon/style/{iconfont.1714353062133.woff → iconfont.1714486550546.woff} +0 -0
- /package/lib/icon/style/{iconfont.1714353062133.woff2 → iconfont.1714486550546.woff2} +0 -0
- /package/lib/{iconfont.1714353062133.ttf → iconfont.1714486550546.ttf} +0 -0
- /package/lib/{iconfont.1714353062133.woff → iconfont.1714486550546.woff} +0 -0
- /package/lib/{iconfont.1714353062133.woff2 → iconfont.1714486550546.woff2} +0 -0
package/lib/index.umd.js
CHANGED
|
@@ -11346,7 +11346,7 @@ var es_array_concat = __webpack_require__(8706);
|
|
|
11346
11346
|
|
|
11347
11347
|
|
|
11348
11348
|
function getLog(message, params) {
|
|
11349
|
-
return "[vxe-table v".concat("3.8.
|
|
11349
|
+
return "[vxe-table v".concat("3.8.4", "] ").concat(conf.i18n(message, params));
|
|
11350
11350
|
}
|
|
11351
11351
|
function outLog(type) {
|
|
11352
11352
|
return function (message, params) {
|
|
@@ -11368,7 +11368,7 @@ var errLog = outLog('error');
|
|
|
11368
11368
|
function toType(type) {
|
|
11369
11369
|
return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toValueString(type).replace('_', '').toLowerCase();
|
|
11370
11370
|
}
|
|
11371
|
-
var eventTypes = 'created,mounted,activated,beforeDestroy,destroyed,event.clearActived,event.clearFilter,event.clearAreas,event.showMenu,event.keydown,event.export,event.import'.split(',').map(toType);
|
|
11371
|
+
var eventTypes = 'created,mounted,activated,beforeDestroy,destroyed,event.clearEdit,event.clearActived,event.clearFilter,event.clearAreas,event.showMenu,event.keydown,event.export,event.import'.split(',').map(toType);
|
|
11372
11372
|
var storeMap = {};
|
|
11373
11373
|
var interceptor = {
|
|
11374
11374
|
mixin: function mixin(map) {
|
|
@@ -13067,7 +13067,7 @@ var setup = config;
|
|
|
13067
13067
|
var globalStore = {};
|
|
13068
13068
|
var VXETable = {
|
|
13069
13069
|
v: v,
|
|
13070
|
-
version: "3.8.
|
|
13070
|
+
version: "3.8.4",
|
|
13071
13071
|
reg: reg,
|
|
13072
13072
|
use: use,
|
|
13073
13073
|
setup: setup,
|
|
@@ -13099,6 +13099,8 @@ var es_map = __webpack_require__(6033);
|
|
|
13099
13099
|
var es_object_assign = __webpack_require__(9085);
|
|
13100
13100
|
// EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.fixed.js
|
|
13101
13101
|
var es_string_fixed = __webpack_require__(4298);
|
|
13102
|
+
// EXTERNAL MODULE: ./node_modules/core-js/modules/es.promise.js
|
|
13103
|
+
var es_promise = __webpack_require__(3362);
|
|
13102
13104
|
;// CONCATENATED MODULE: ./packages/table/src/columnInfo.js
|
|
13103
13105
|
|
|
13104
13106
|
|
|
@@ -13458,6 +13460,7 @@ var DomTools = {
|
|
|
13458
13460
|
|
|
13459
13461
|
|
|
13460
13462
|
|
|
13463
|
+
|
|
13461
13464
|
var getAllConvertColumns = function getAllConvertColumns(columns, parentColumn) {
|
|
13462
13465
|
var result = [];
|
|
13463
13466
|
columns.forEach(function (column) {
|
|
@@ -13737,8 +13740,8 @@ function clearTableDefaultStatus(_vm) {
|
|
|
13737
13740
|
_vm.clearRowExpand();
|
|
13738
13741
|
_vm.clearTreeExpand();
|
|
13739
13742
|
_vm.clearTreeExpandReserve();
|
|
13740
|
-
if (_vm.
|
|
13741
|
-
_vm.
|
|
13743
|
+
if (_vm.clearEdit && v_x_e_table._edit) {
|
|
13744
|
+
_vm.clearEdit();
|
|
13742
13745
|
}
|
|
13743
13746
|
if (_vm.clearSelected && (_vm.keyboardConfig || _vm.mouseConfig)) {
|
|
13744
13747
|
_vm.clearSelected();
|
|
@@ -15650,8 +15653,6 @@ function _slicedToArray(arr, i) {
|
|
|
15650
15653
|
}
|
|
15651
15654
|
// EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.sort.js
|
|
15652
15655
|
var es_array_sort = __webpack_require__(6910);
|
|
15653
|
-
// EXTERNAL MODULE: ./node_modules/core-js/modules/es.promise.js
|
|
15654
|
-
var es_promise = __webpack_require__(3362);
|
|
15655
15656
|
// EXTERNAL MODULE: ./node_modules/core-js/modules/es.promise.finally.js
|
|
15656
15657
|
var es_promise_finally = __webpack_require__(9391);
|
|
15657
15658
|
// EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.trim.js
|
|
@@ -18339,6 +18340,16 @@ var Methods = {
|
|
|
18339
18340
|
return this.handleCustom();
|
|
18340
18341
|
},
|
|
18341
18342
|
handleCustom: function handleCustom() {
|
|
18343
|
+
var mouseConfig = this.mouseConfig;
|
|
18344
|
+
if (mouseConfig) {
|
|
18345
|
+
if (this.clearSelected) {
|
|
18346
|
+
this.clearSelected();
|
|
18347
|
+
}
|
|
18348
|
+
if (this.clearCellAreas) {
|
|
18349
|
+
this.clearCellAreas();
|
|
18350
|
+
this.clearCopyCellArea();
|
|
18351
|
+
}
|
|
18352
|
+
}
|
|
18342
18353
|
this.saveCustomVisible();
|
|
18343
18354
|
this.analyColumnWidth();
|
|
18344
18355
|
return this.refreshColumn(true);
|
|
@@ -19233,6 +19244,13 @@ var Methods = {
|
|
|
19233
19244
|
preventEvent: function preventEvent(evnt, type, args, next, end) {
|
|
19234
19245
|
var _this26 = this;
|
|
19235
19246
|
var evntList = v_x_e_table.interceptor.get(type);
|
|
19247
|
+
|
|
19248
|
+
// 兼容老版本
|
|
19249
|
+
if (!evntList.length && type === 'event.clearEdit') {
|
|
19250
|
+
evntList = v_x_e_table.interceptor.get('event.clearActived');
|
|
19251
|
+
}
|
|
19252
|
+
// 兼容老版本
|
|
19253
|
+
|
|
19236
19254
|
var rest;
|
|
19237
19255
|
if (!evntList.some(function (func) {
|
|
19238
19256
|
return func(Object.assign({
|
|
@@ -19311,32 +19329,32 @@ var Methods = {
|
|
|
19311
19329
|
} else if (!this.lastCallTime || this.lastCallTime + 50 < Date.now()) {
|
|
19312
19330
|
if (!getEventTargetNode(evnt, document.body, 'vxe-table--ignore-clear').flag) {
|
|
19313
19331
|
// 如果手动调用了激活单元格,避免触发源被移除后导致重复关闭
|
|
19314
|
-
this.preventEvent(evnt, 'event.
|
|
19315
|
-
var
|
|
19332
|
+
this.preventEvent(evnt, 'event.clearEdit', actived.args, function () {
|
|
19333
|
+
var isClear;
|
|
19316
19334
|
if (editOpts.mode === 'row') {
|
|
19317
19335
|
var rowNode = getEventTargetNode(evnt, $el, 'vxe-body--row');
|
|
19318
19336
|
// row 方式,如果点击了不同行
|
|
19319
|
-
|
|
19337
|
+
isClear = rowNode.flag ? getRowNode(rowNode.targetElem).item !== actived.args.row : false;
|
|
19320
19338
|
} else {
|
|
19321
19339
|
// cell 方式,如果是非编辑列
|
|
19322
|
-
|
|
19340
|
+
isClear = !getEventTargetNode(evnt, $el, 'col--edit').flag;
|
|
19323
19341
|
}
|
|
19324
19342
|
// 如果点击表头行,则清除激活状态
|
|
19325
|
-
if (!
|
|
19326
|
-
|
|
19343
|
+
if (!isClear) {
|
|
19344
|
+
isClear = getEventTargetNode(evnt, $el, 'vxe-header--row').flag;
|
|
19327
19345
|
}
|
|
19328
19346
|
// 如果点击表尾行,则清除激活状态
|
|
19329
|
-
if (!
|
|
19330
|
-
|
|
19347
|
+
if (!isClear) {
|
|
19348
|
+
isClear = getEventTargetNode(evnt, $el, 'vxe-footer--row').flag;
|
|
19331
19349
|
}
|
|
19332
19350
|
// 如果固定了高度且点击了行之外的空白处,则清除激活状态
|
|
19333
|
-
if (!
|
|
19351
|
+
if (!isClear && _this27.height && !_this27.overflowY) {
|
|
19334
19352
|
var bodyWrapperElem = evnt.target;
|
|
19335
19353
|
if (methods_hasClass(bodyWrapperElem, 'vxe-table--body-wrapper')) {
|
|
19336
|
-
|
|
19354
|
+
isClear = evnt.offsetY < bodyWrapperElem.clientHeight;
|
|
19337
19355
|
}
|
|
19338
19356
|
}
|
|
19339
|
-
if (
|
|
19357
|
+
if (isClear ||
|
|
19340
19358
|
// 如果点击了当前表格之外
|
|
19341
19359
|
!getEventTargetNode(evnt, $el).flag) {
|
|
19342
19360
|
setTimeout(function () {
|
|
@@ -19350,7 +19368,9 @@ var Methods = {
|
|
|
19350
19368
|
}
|
|
19351
19369
|
} else if (mouseConfig) {
|
|
19352
19370
|
if (!getEventTargetNode(evnt, $el).flag && !($xegrid && getEventTargetNode(evnt, $xegrid.$el).flag) && !(ctxWrapper && getEventTargetNode(evnt, ctxWrapper.$el).flag) && !($toolbar && getEventTargetNode(evnt, $toolbar.$el).flag)) {
|
|
19353
|
-
this.clearSelected
|
|
19371
|
+
if (this.clearSelected) {
|
|
19372
|
+
this.clearSelected();
|
|
19373
|
+
}
|
|
19354
19374
|
if (!getEventTargetNode(evnt, document.body, 'vxe-table--ignore-areas-clear').flag) {
|
|
19355
19375
|
this.preventEvent(evnt, 'event.clearAreas', {}, function () {
|
|
19356
19376
|
_this27.clearCellAreas();
|
|
@@ -23329,6 +23349,11 @@ function handleUupdateResize(_vm) {
|
|
|
23329
23349
|
row: null,
|
|
23330
23350
|
column: null
|
|
23331
23351
|
},
|
|
23352
|
+
// 当前被强制聚焦单元格,只会在鼠标点击后算聚焦
|
|
23353
|
+
focused: {
|
|
23354
|
+
row: null,
|
|
23355
|
+
column: null
|
|
23356
|
+
},
|
|
23332
23357
|
insertList: [],
|
|
23333
23358
|
insertMaps: {},
|
|
23334
23359
|
removeList: [],
|
|
@@ -24742,6 +24767,7 @@ var Filter = VxeTableFilterModule;
|
|
|
24742
24767
|
|
|
24743
24768
|
|
|
24744
24769
|
|
|
24770
|
+
|
|
24745
24771
|
/* harmony default export */ var src_mixin = ({
|
|
24746
24772
|
methods: {
|
|
24747
24773
|
/**
|
|
@@ -24825,7 +24851,7 @@ var Filter = VxeTableFilterModule;
|
|
|
24825
24851
|
if (activeArea && activeArea.row && activeArea.column) {
|
|
24826
24852
|
params.row = activeArea.row;
|
|
24827
24853
|
params.column = activeArea.column;
|
|
24828
|
-
this.
|
|
24854
|
+
this.handleOpenMenuEvent(evnt, type, params);
|
|
24829
24855
|
return;
|
|
24830
24856
|
}
|
|
24831
24857
|
} else if (mouseConfig && mouseOpts.selected) {
|
|
@@ -24833,7 +24859,7 @@ var Filter = VxeTableFilterModule;
|
|
|
24833
24859
|
if (selected.row && selected.column) {
|
|
24834
24860
|
params.row = selected.row;
|
|
24835
24861
|
params.column = selected.column;
|
|
24836
|
-
this.
|
|
24862
|
+
this.handleOpenMenuEvent(evnt, type, params);
|
|
24837
24863
|
return;
|
|
24838
24864
|
}
|
|
24839
24865
|
}
|
|
@@ -24867,7 +24893,7 @@ var Filter = VxeTableFilterModule;
|
|
|
24867
24893
|
_params.row = row;
|
|
24868
24894
|
_params.rowIndex = this.getRowIndex(row);
|
|
24869
24895
|
}
|
|
24870
|
-
this.
|
|
24896
|
+
this.handleOpenMenuEvent(evnt, layout, _params);
|
|
24871
24897
|
// 在 v4 中废弃事件 cell-context-menu、header-cell-context-menu、footer-cell-context-menu
|
|
24872
24898
|
if (this.$listeners["".concat(typePrefix, "cell-context-menu")]) {
|
|
24873
24899
|
if (false) {}
|
|
@@ -24882,7 +24908,7 @@ var Filter = VxeTableFilterModule;
|
|
|
24882
24908
|
if (ctxMenuOpts.trigger === 'cell') {
|
|
24883
24909
|
evnt.preventDefault();
|
|
24884
24910
|
} else {
|
|
24885
|
-
this.
|
|
24911
|
+
this.handleOpenMenuEvent(evnt, layout, _params);
|
|
24886
24912
|
}
|
|
24887
24913
|
return;
|
|
24888
24914
|
}
|
|
@@ -24896,7 +24922,7 @@ var Filter = VxeTableFilterModule;
|
|
|
24896
24922
|
/**
|
|
24897
24923
|
* 显示快捷菜单
|
|
24898
24924
|
*/
|
|
24899
|
-
|
|
24925
|
+
handleOpenMenuEvent: function handleOpenMenuEvent(evnt, type, params) {
|
|
24900
24926
|
var _this = this;
|
|
24901
24927
|
var isCtxMenu = this.isCtxMenu,
|
|
24902
24928
|
ctxMenuStore = this.ctxMenuStore,
|
|
@@ -25091,6 +25117,7 @@ var Menu = VxeTableMenuModule;
|
|
|
25091
25117
|
|
|
25092
25118
|
|
|
25093
25119
|
|
|
25120
|
+
|
|
25094
25121
|
|
|
25095
25122
|
|
|
25096
25123
|
function insertTreeRow(_vm, newRecords, isAppend) {
|
|
@@ -25466,7 +25493,7 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
|
|
|
25466
25493
|
}
|
|
25467
25494
|
// 如果当前行被激活编辑,则清除激活状态
|
|
25468
25495
|
if (actived.row && this.findRowIndexOf(rows, actived.row) > -1) {
|
|
25469
|
-
this.
|
|
25496
|
+
this.clearEdit();
|
|
25470
25497
|
}
|
|
25471
25498
|
// 从新增中移除已删除的数据
|
|
25472
25499
|
rows.forEach(function (row) {
|
|
@@ -25624,7 +25651,7 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
|
|
|
25624
25651
|
}
|
|
25625
25652
|
this.closeTooltip();
|
|
25626
25653
|
if (actived.column) {
|
|
25627
|
-
this.
|
|
25654
|
+
this.clearEdit(evnt);
|
|
25628
25655
|
}
|
|
25629
25656
|
type = 'edit-activated';
|
|
25630
25657
|
column.renderHeight = cell.offsetHeight;
|
|
@@ -25730,9 +25757,7 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
|
|
|
25730
25757
|
}
|
|
25731
25758
|
},
|
|
25732
25759
|
_clearActived: function _clearActived(evnt) {
|
|
25733
|
-
|
|
25734
|
-
// warnLog('vxe.error.delFunc', ['clearActived', 'clearEdit'])
|
|
25735
|
-
// }
|
|
25760
|
+
if (false) {}
|
|
25736
25761
|
// 即将废弃
|
|
25737
25762
|
return this.clearEdit(evnt);
|
|
25738
25763
|
},
|
|
@@ -25741,7 +25766,8 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
|
|
|
25741
25766
|
*/
|
|
25742
25767
|
_clearEdit: function _clearEdit(evnt) {
|
|
25743
25768
|
var editStore = this.editStore;
|
|
25744
|
-
var actived = editStore.actived
|
|
25769
|
+
var actived = editStore.actived,
|
|
25770
|
+
focused = editStore.focused;
|
|
25745
25771
|
var row = actived.row,
|
|
25746
25772
|
column = actived.column;
|
|
25747
25773
|
if (row || column) {
|
|
@@ -25759,6 +25785,8 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
|
|
|
25759
25785
|
$columnIndex: this.getVMColumnIndex(column)
|
|
25760
25786
|
}, evnt);
|
|
25761
25787
|
}
|
|
25788
|
+
focused.row = null;
|
|
25789
|
+
focused.column = null;
|
|
25762
25790
|
if (conf.cellVaildMode === 'obsolete') {
|
|
25763
25791
|
if (this.clearValidate) {
|
|
25764
25792
|
return this.clearValidate();
|
|
@@ -25936,7 +25964,7 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
|
|
|
25936
25964
|
var selectMethod = function selectMethod() {
|
|
25937
25965
|
if (isMouseSelected && (selected.row !== row || selected.column !== column)) {
|
|
25938
25966
|
if (actived.row !== row || (editOpts.mode === 'cell' ? actived.column !== column : false)) {
|
|
25939
|
-
_this9.
|
|
25967
|
+
_this9.clearEdit(evnt);
|
|
25940
25968
|
_this9.clearSelected(evnt);
|
|
25941
25969
|
_this9.clearCellAreas(evnt);
|
|
25942
25970
|
_this9.clearCopyCellArea(evnt);
|
|
@@ -34615,6 +34643,7 @@ function renderPopupPanel(h, _vm) {
|
|
|
34615
34643
|
customStore = _vm.customStore;
|
|
34616
34644
|
var customOpts = $xetable.customOpts,
|
|
34617
34645
|
customColumnList = $xetable.customColumnList,
|
|
34646
|
+
columnOpts = $xetable.columnOpts,
|
|
34618
34647
|
isMaxFixedColumn = $xetable.isMaxFixedColumn;
|
|
34619
34648
|
var checkMethod = customOpts.checkMethod,
|
|
34620
34649
|
visibleMethod = customOpts.visibleMethod;
|
|
@@ -34716,7 +34745,7 @@ function renderPopupPanel(h, _vm) {
|
|
|
34716
34745
|
title: conf.i18n('vxe.custom.cstmTitle'),
|
|
34717
34746
|
className: 'vxe-table-custom-popup-wrapper vxe-table--ignore-clear',
|
|
34718
34747
|
width: '40vw',
|
|
34719
|
-
minWidth:
|
|
34748
|
+
minWidth: 520,
|
|
34720
34749
|
height: '50vh',
|
|
34721
34750
|
minHeight: 300,
|
|
34722
34751
|
mask: true,
|
|
@@ -34740,7 +34769,7 @@ function renderPopupPanel(h, _vm) {
|
|
|
34740
34769
|
class: 'vxe-table-custom-popup--table-wrapper'
|
|
34741
34770
|
}, [h('table', {}, [h('colgroup', {}, [h('col', {
|
|
34742
34771
|
style: {
|
|
34743
|
-
width: '
|
|
34772
|
+
width: '80px'
|
|
34744
34773
|
}
|
|
34745
34774
|
}), h('col'), h('col', {
|
|
34746
34775
|
style: {
|
|
@@ -34750,7 +34779,21 @@ function renderPopupPanel(h, _vm) {
|
|
|
34750
34779
|
style: {
|
|
34751
34780
|
width: '200px'
|
|
34752
34781
|
}
|
|
34753
|
-
})]), h('thead', {}, [h('tr', {}, [h('th', {},
|
|
34782
|
+
})]), h('thead', {}, [h('tr', {}, [h('th', {}, [h('span', {
|
|
34783
|
+
class: 'vxe-table-custom-popup--table-sort-help-title'
|
|
34784
|
+
}, conf.i18n('vxe.custom.setting.colSort')), h('vxe-tooltip', {
|
|
34785
|
+
props: {
|
|
34786
|
+
enterable: true,
|
|
34787
|
+
content: '点击并拖动图标可以调整列的排序'
|
|
34788
|
+
},
|
|
34789
|
+
scopedSlots: {
|
|
34790
|
+
default: function _default() {
|
|
34791
|
+
return h('i', {
|
|
34792
|
+
class: 'vxe-table-custom-popup--table-sort-help-icon vxe-icon-question-circle-fill'
|
|
34793
|
+
});
|
|
34794
|
+
}
|
|
34795
|
+
}
|
|
34796
|
+
})]), h('th', {}, conf.i18n('vxe.custom.setting.colTitle')), h('th', {}, conf.i18n('vxe.custom.setting.colVisible')), h('th', {}, conf.i18n('vxe.custom.setting.colFixed', [columnOpts.maxFixedSize || 0]))])]), h('transition-group', {
|
|
34754
34797
|
class: 'vxe-table-custom--body',
|
|
34755
34798
|
props: {
|
|
34756
34799
|
tag: 'tbody',
|
|
@@ -35301,6 +35344,8 @@ var Colgroup = VxeColgroup;
|
|
|
35301
35344
|
|
|
35302
35345
|
|
|
35303
35346
|
|
|
35347
|
+
|
|
35348
|
+
|
|
35304
35349
|
|
|
35305
35350
|
|
|
35306
35351
|
|
|
@@ -35867,7 +35912,8 @@ Object.keys(packages_table.methods).forEach(function (name) {
|
|
|
35867
35912
|
pagerConfig = this.pagerConfig,
|
|
35868
35913
|
editRules = this.editRules,
|
|
35869
35914
|
formData = this.formData,
|
|
35870
|
-
isMsg = this.isMsg
|
|
35915
|
+
isMsg = this.isMsg,
|
|
35916
|
+
validConfig = this.validConfig;
|
|
35871
35917
|
var beforeQuery = proxyOpts.beforeQuery,
|
|
35872
35918
|
afterQuery = proxyOpts.afterQuery,
|
|
35873
35919
|
beforeDelete = proxyOpts.beforeDelete,
|
|
@@ -36140,7 +36186,7 @@ Object.keys(packages_table.methods).forEach(function (name) {
|
|
|
36140
36186
|
var restPromise = Promise.resolve();
|
|
36141
36187
|
if (editRules) {
|
|
36142
36188
|
// 只校验新增和修改的数据
|
|
36143
|
-
restPromise = this.validate(_body.insertRecords.concat(updateRecords));
|
|
36189
|
+
restPromise = this[validConfig && validConfig.msgMode === 'full' ? 'fullValidate' : 'validate'](_body.insertRecords.concat(updateRecords));
|
|
36144
36190
|
}
|
|
36145
36191
|
return restPromise.then(function (errMap) {
|
|
36146
36192
|
if (errMap) {
|
|
@@ -38309,9 +38355,46 @@ var Textarea = VxeTextarea;
|
|
|
38309
38355
|
return false;
|
|
38310
38356
|
},
|
|
38311
38357
|
btnMode: function btnMode() {
|
|
38312
|
-
var
|
|
38358
|
+
var $xebuttonggroup = this.$xebuttonggroup,
|
|
38359
|
+
mode = this.mode,
|
|
38313
38360
|
type = this.type;
|
|
38314
|
-
|
|
38361
|
+
if (mode === 'text' || type === 'text' || $xebuttonggroup && $xebuttonggroup.mode === 'text') {
|
|
38362
|
+
return 'text';
|
|
38363
|
+
}
|
|
38364
|
+
return 'button';
|
|
38365
|
+
},
|
|
38366
|
+
btnStatus: function btnStatus() {
|
|
38367
|
+
var $xebuttonggroup = this.$xebuttonggroup,
|
|
38368
|
+
status = this.status;
|
|
38369
|
+
if (status) {
|
|
38370
|
+
return status;
|
|
38371
|
+
}
|
|
38372
|
+
if ($xebuttonggroup) {
|
|
38373
|
+
return $xebuttonggroup.status;
|
|
38374
|
+
}
|
|
38375
|
+
return '';
|
|
38376
|
+
},
|
|
38377
|
+
btnRound: function btnRound() {
|
|
38378
|
+
var $xebuttonggroup = this.$xebuttonggroup,
|
|
38379
|
+
round = this.round;
|
|
38380
|
+
if (round) {
|
|
38381
|
+
return round;
|
|
38382
|
+
}
|
|
38383
|
+
if ($xebuttonggroup) {
|
|
38384
|
+
return $xebuttonggroup.round;
|
|
38385
|
+
}
|
|
38386
|
+
return false;
|
|
38387
|
+
},
|
|
38388
|
+
btnCircle: function btnCircle() {
|
|
38389
|
+
var $xebuttonggroup = this.$xebuttonggroup,
|
|
38390
|
+
circle = this.circle;
|
|
38391
|
+
if (circle) {
|
|
38392
|
+
return circle;
|
|
38393
|
+
}
|
|
38394
|
+
if ($xebuttonggroup) {
|
|
38395
|
+
return $xebuttonggroup.circle;
|
|
38396
|
+
}
|
|
38397
|
+
return false;
|
|
38315
38398
|
}
|
|
38316
38399
|
},
|
|
38317
38400
|
created: function created() {
|
|
@@ -38341,8 +38424,10 @@ var Textarea = VxeTextarea;
|
|
|
38341
38424
|
type = this.type,
|
|
38342
38425
|
destroyOnClose = this.destroyOnClose,
|
|
38343
38426
|
isFormBtn = this.isFormBtn,
|
|
38344
|
-
status = this.status,
|
|
38345
38427
|
btnMode = this.btnMode,
|
|
38428
|
+
btnStatus = this.btnStatus,
|
|
38429
|
+
btnRound = this.btnRound,
|
|
38430
|
+
btnCircle = this.btnCircle,
|
|
38346
38431
|
vSize = this.vSize,
|
|
38347
38432
|
name = this.name,
|
|
38348
38433
|
disabled = this.disabled,
|
|
@@ -38357,7 +38442,7 @@ var Textarea = VxeTextarea;
|
|
|
38357
38442
|
}) : className : '', _defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), 'is--active', showPanel)]
|
|
38358
38443
|
}, [h('button', {
|
|
38359
38444
|
ref: 'xBtn',
|
|
38360
|
-
class: ['vxe-button', "type--".concat(btnMode), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), "theme--".concat(
|
|
38445
|
+
class: ['vxe-button', "type--".concat(btnMode), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), "theme--".concat(btnStatus), btnStatus), 'is--round', btnRound), 'is--circle', btnCircle), 'is--disabled', disabled || loading), 'is--loading', loading)],
|
|
38361
38446
|
attrs: {
|
|
38362
38447
|
name: name,
|
|
38363
38448
|
title: title,
|
|
@@ -38392,7 +38477,7 @@ var Textarea = VxeTextarea;
|
|
|
38392
38477
|
ref: 'xBtn',
|
|
38393
38478
|
class: ['vxe-button', "type--".concat(btnMode), className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(className) ? className({
|
|
38394
38479
|
$button: this
|
|
38395
|
-
}) : className : '', _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), "theme--".concat(
|
|
38480
|
+
}) : className : '', _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), "theme--".concat(btnStatus), btnStatus), 'is--round', btnRound), 'is--circle', btnCircle), 'is--disabled', disabled || loading), 'is--loading', loading)],
|
|
38396
38481
|
attrs: {
|
|
38397
38482
|
name: name,
|
|
38398
38483
|
title: title,
|
|
@@ -38670,10 +38755,16 @@ var Button = VxeButton;
|
|
|
38670
38755
|
|
|
38671
38756
|
|
|
38672
38757
|
|
|
38758
|
+
|
|
38673
38759
|
/* harmony default export */ var button_src_group = ({
|
|
38674
38760
|
name: 'VxeButtonGroup',
|
|
38675
38761
|
props: {
|
|
38676
38762
|
options: Array,
|
|
38763
|
+
mode: String,
|
|
38764
|
+
status: String,
|
|
38765
|
+
round: Boolean,
|
|
38766
|
+
circle: Boolean,
|
|
38767
|
+
className: [String, Function],
|
|
38677
38768
|
disabled: Boolean,
|
|
38678
38769
|
size: {
|
|
38679
38770
|
type: String,
|
|
@@ -38694,10 +38785,13 @@ var Button = VxeButton;
|
|
|
38694
38785
|
},
|
|
38695
38786
|
render: function render(h) {
|
|
38696
38787
|
var $scopedSlots = this.$scopedSlots,
|
|
38788
|
+
className = this.className,
|
|
38697
38789
|
options = this.options;
|
|
38698
38790
|
var defaultSlot = $scopedSlots.default;
|
|
38699
38791
|
return h('div', {
|
|
38700
|
-
class: 'vxe-button-group'
|
|
38792
|
+
class: ['vxe-button-group', className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(className) ? className({
|
|
38793
|
+
$buttonGroup: this
|
|
38794
|
+
}) : className : '']
|
|
38701
38795
|
}, defaultSlot ? defaultSlot.cell(this, {}) : options ? options.map(function (item) {
|
|
38702
38796
|
return h('vxe-button', {
|
|
38703
38797
|
props: item
|
|
@@ -41655,9 +41749,10 @@ var Pulldown = VxePulldown;
|
|
|
41655
41749
|
cstmDragTarget: '移动目标:{0}',
|
|
41656
41750
|
setting: {
|
|
41657
41751
|
colSort: '排序',
|
|
41752
|
+
sortHelpTip: '点击并拖动图标可以调整列的排序',
|
|
41658
41753
|
colTitle: '标题',
|
|
41659
41754
|
colVisible: '是否显示',
|
|
41660
|
-
colFixed: '
|
|
41755
|
+
colFixed: '冻结列(最多 {0} 列)',
|
|
41661
41756
|
fixedLeft: '左侧',
|
|
41662
41757
|
fixedUnset: '不设置',
|
|
41663
41758
|
fixedRight: '右侧'
|
|
@@ -41850,11 +41945,11 @@ var Pulldown = VxePulldown;
|
|
|
41850
41945
|
},
|
|
41851
41946
|
filterComplexInput: {
|
|
41852
41947
|
menus: {
|
|
41853
|
-
fixedColumn: '
|
|
41854
|
-
fixedGroup: '
|
|
41855
|
-
cancelFixed: '
|
|
41856
|
-
fixedLeft: '
|
|
41857
|
-
fixedRight: '
|
|
41948
|
+
fixedColumn: '冻结列',
|
|
41949
|
+
fixedGroup: '冻结分组',
|
|
41950
|
+
cancelFixed: '取消冻结',
|
|
41951
|
+
fixedLeft: '冻结左侧',
|
|
41952
|
+
fixedRight: '冻结右侧'
|
|
41858
41953
|
},
|
|
41859
41954
|
cases: {
|
|
41860
41955
|
equal: '等于',
|
|
@@ -41871,11 +41966,11 @@ var Pulldown = VxePulldown;
|
|
|
41871
41966
|
clearSort: '清除排序',
|
|
41872
41967
|
sortAsc: '升序',
|
|
41873
41968
|
sortDesc: '降序',
|
|
41874
|
-
fixedColumn: '
|
|
41875
|
-
fixedGroup: '
|
|
41876
|
-
cancelFixed: '
|
|
41877
|
-
fixedLeft: '
|
|
41878
|
-
fixedRight: '
|
|
41969
|
+
fixedColumn: '冻结列',
|
|
41970
|
+
fixedGroup: '冻结分组',
|
|
41971
|
+
cancelFixed: '取消冻结',
|
|
41972
|
+
fixedLeft: '冻结左侧',
|
|
41973
|
+
fixedRight: '冻结右侧',
|
|
41879
41974
|
clearFilter: '清除筛选',
|
|
41880
41975
|
textOption: '文本筛选',
|
|
41881
41976
|
numberOption: '数值筛选'
|
|
@@ -41913,6 +42008,47 @@ var Pulldown = VxePulldown;
|
|
|
41913
42008
|
* 以下废弃
|
|
41914
42009
|
* @deprecated
|
|
41915
42010
|
*/
|
|
42011
|
+
pro: {
|
|
42012
|
+
area: {
|
|
42013
|
+
mergeErr: '无法对合并单元格进行该操作',
|
|
42014
|
+
multiErr: '无法对多重选择区域进行该操作',
|
|
42015
|
+
extendErr: '如果延伸的区域包含被合并的单元格,所有合并的单元格需大小相同',
|
|
42016
|
+
pasteMultiErr: '无法粘贴,需要相同大小的复制的区域和粘贴的区域才能执行此操作'
|
|
42017
|
+
},
|
|
42018
|
+
fnr: {
|
|
42019
|
+
title: '查找和替换',
|
|
42020
|
+
findLabel: '查找',
|
|
42021
|
+
replaceLabel: '替换',
|
|
42022
|
+
findTitle: '查找内容:',
|
|
42023
|
+
replaceTitle: '替换为:',
|
|
42024
|
+
tabs: {
|
|
42025
|
+
find: '查找',
|
|
42026
|
+
replace: '替换'
|
|
42027
|
+
},
|
|
42028
|
+
filter: {
|
|
42029
|
+
re: '正则表达式',
|
|
42030
|
+
whole: '全词匹配',
|
|
42031
|
+
sensitive: '区分大小写'
|
|
42032
|
+
},
|
|
42033
|
+
btns: {
|
|
42034
|
+
findNext: '查找下一个',
|
|
42035
|
+
findAll: '查找全部',
|
|
42036
|
+
replace: '替换',
|
|
42037
|
+
replaceAll: '替换全部',
|
|
42038
|
+
cancel: '取消'
|
|
42039
|
+
},
|
|
42040
|
+
header: {
|
|
42041
|
+
seq: '#',
|
|
42042
|
+
cell: '单元格',
|
|
42043
|
+
value: '值'
|
|
42044
|
+
},
|
|
42045
|
+
empty: '(空值)',
|
|
42046
|
+
reError: '无效的正则表达式',
|
|
42047
|
+
recordCount: '已找到 {0} 个单元格',
|
|
42048
|
+
notCell: '找不到匹配的单元格',
|
|
42049
|
+
replaceSuccess: '成功替换 {0} 个单元格'
|
|
42050
|
+
}
|
|
42051
|
+
},
|
|
41916
42052
|
renderer: {
|
|
41917
42053
|
search: '搜索',
|
|
41918
42054
|
cases: {
|
|
@@ -41957,47 +42093,6 @@ var Pulldown = VxePulldown;
|
|
|
41957
42093
|
empty: '(空白)',
|
|
41958
42094
|
notData: '无匹配项'
|
|
41959
42095
|
}
|
|
41960
|
-
},
|
|
41961
|
-
pro: {
|
|
41962
|
-
area: {
|
|
41963
|
-
mergeErr: '无法对合并单元格进行该操作',
|
|
41964
|
-
multiErr: '无法对多重选择区域进行该操作',
|
|
41965
|
-
extendErr: '如果延伸的区域包含被合并的单元格,所有合并的单元格需大小相同',
|
|
41966
|
-
pasteMultiErr: '无法粘贴,需要相同大小的复制的区域和粘贴的区域才能执行此操作'
|
|
41967
|
-
},
|
|
41968
|
-
fnr: {
|
|
41969
|
-
title: '查找和替换',
|
|
41970
|
-
findLabel: '查找',
|
|
41971
|
-
replaceLabel: '替换',
|
|
41972
|
-
findTitle: '查找内容:',
|
|
41973
|
-
replaceTitle: '替换为:',
|
|
41974
|
-
tabs: {
|
|
41975
|
-
find: '查找',
|
|
41976
|
-
replace: '替换'
|
|
41977
|
-
},
|
|
41978
|
-
filter: {
|
|
41979
|
-
re: '正则表达式',
|
|
41980
|
-
whole: '全词匹配',
|
|
41981
|
-
sensitive: '区分大小写'
|
|
41982
|
-
},
|
|
41983
|
-
btns: {
|
|
41984
|
-
findNext: '查找下一个',
|
|
41985
|
-
findAll: '查找全部',
|
|
41986
|
-
replace: '替换',
|
|
41987
|
-
replaceAll: '替换全部',
|
|
41988
|
-
cancel: '取消'
|
|
41989
|
-
},
|
|
41990
|
-
header: {
|
|
41991
|
-
seq: '#',
|
|
41992
|
-
cell: '单元格',
|
|
41993
|
-
value: '值'
|
|
41994
|
-
},
|
|
41995
|
-
empty: '(空值)',
|
|
41996
|
-
reError: '无效的正则表达式',
|
|
41997
|
-
recordCount: '已找到 {0} 个单元格',
|
|
41998
|
-
notCell: '找不到匹配的单元格',
|
|
41999
|
-
replaceSuccess: '成功替换 {0} 个单元格'
|
|
42000
|
-
}
|
|
42001
42096
|
}
|
|
42002
42097
|
}
|
|
42003
42098
|
});
|