vxe-table 4.7.0 → 4.7.3
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/es/components.js +3 -1
- package/es/grid/src/grid.js +3 -2
- package/es/index.esm.js +2 -2
- package/es/style.css +1 -1
- package/es/style.min.css +1 -1
- package/es/table/module/custom/hook.js +2 -2
- package/es/table/module/custom/panel.js +2 -1
- package/es/table/module/edit/hook.js +2 -1
- package/es/table/module/export/export-panel.js +2 -1
- package/es/table/module/export/hook.js +2 -1
- package/es/table/module/export/import-panel.js +2 -1
- package/es/table/module/filter/hook.js +2 -1
- package/es/table/module/filter/panel.js +2 -1
- package/es/table/module/keyboard/hook.js +2 -1
- package/es/table/module/menu/hook.js +2 -1
- package/es/table/module/validator/hook.js +2 -1
- package/es/table/render/index.js +2 -1
- package/es/table/src/body.js +2 -1
- package/es/table/src/cell.js +2 -1
- package/es/table/src/columnInfo.js +2 -1
- package/es/table/src/props.js +2 -1
- package/es/table/src/table.js +16 -2
- package/es/table/style.css +4 -2
- package/es/table/style.min.css +1 -1
- package/es/toolbar/src/toolbar.js +3 -2
- package/es/ui/index.js +4 -2
- package/es/ui/src/utils.js +3 -3
- package/es/v-x-e-table/index.js +3 -0
- package/es/v-x-e-table/style.css +0 -0
- package/es/v-x-e-table/style.min.css +0 -0
- package/es/vxe-table/style.css +4 -2
- package/es/vxe-table/style.min.css +1 -1
- package/es/vxe-v-x-e-table/index.js +3 -0
- package/es/vxe-v-x-e-table/style.css +0 -0
- package/es/vxe-v-x-e-table/style.min.css +0 -0
- package/lib/components.js +10 -2
- package/lib/components.min.js +1 -1
- package/lib/grid/src/grid.js +40 -29
- package/lib/grid/src/grid.min.js +1 -1
- package/lib/index.common.js +5 -5
- package/lib/index.umd.js +570 -437
- package/lib/index.umd.min.js +1 -1
- package/lib/style.css +1 -1
- package/lib/style.min.css +1 -1
- package/lib/table/module/custom/hook.js +1 -1
- package/lib/table/module/custom/hook.min.js +1 -1
- package/lib/table/module/custom/panel.js +27 -23
- package/lib/table/module/custom/panel.min.js +1 -1
- package/lib/table/module/edit/hook.js +20 -13
- package/lib/table/module/edit/hook.min.js +1 -1
- package/lib/table/module/export/export-panel.js +35 -31
- package/lib/table/module/export/export-panel.min.js +1 -1
- package/lib/table/module/export/hook.js +24 -18
- package/lib/table/module/export/hook.min.js +1 -1
- package/lib/table/module/export/import-panel.js +12 -8
- package/lib/table/module/export/import-panel.min.js +1 -1
- package/lib/table/module/filter/hook.js +7 -3
- package/lib/table/module/filter/hook.min.js +1 -1
- package/lib/table/module/filter/panel.js +13 -8
- package/lib/table/module/filter/panel.min.js +1 -1
- package/lib/table/module/keyboard/hook.js +4 -1
- package/lib/table/module/keyboard/hook.min.js +1 -1
- package/lib/table/module/menu/hook.js +11 -5
- package/lib/table/module/menu/hook.min.js +1 -1
- package/lib/table/module/validator/hook.js +13 -7
- package/lib/table/module/validator/hook.min.js +1 -1
- package/lib/table/render/index.js +11 -5
- package/lib/table/render/index.min.js +1 -1
- package/lib/table/src/body.js +7 -3
- package/lib/table/src/body.min.js +1 -1
- package/lib/table/src/cell.js +26 -21
- package/lib/table/src/cell.min.js +1 -1
- package/lib/table/src/columnInfo.js +15 -10
- package/lib/table/src/columnInfo.min.js +1 -1
- package/lib/table/src/props.js +27 -24
- package/lib/table/src/props.min.js +1 -1
- package/lib/table/src/table.js +173 -146
- package/lib/table/src/table.min.js +1 -1
- package/lib/table/style/style.css +4 -2
- package/lib/table/style/style.min.css +1 -1
- package/lib/toolbar/src/toolbar.js +48 -38
- package/lib/toolbar/src/toolbar.min.js +1 -1
- package/lib/ui/index.js +5 -3
- package/lib/ui/index.min.js +1 -1
- package/lib/ui/src/utils.js +2 -2
- package/lib/ui/src/utils.min.js +1 -1
- package/lib/v-x-e-table/index.js +22 -0
- package/lib/v-x-e-table/index.min.js +1 -0
- package/lib/v-x-e-table/style/index.js +1 -0
- package/lib/v-x-e-table/style/style.css +0 -0
- package/lib/v-x-e-table/style/style.min.css +0 -0
- package/lib/vxe-table/style/style.css +4 -2
- package/lib/vxe-table/style/style.min.css +1 -1
- package/lib/vxe-v-x-e-table/index.js +22 -0
- package/lib/vxe-v-x-e-table/index.min.js +1 -0
- package/lib/vxe-v-x-e-table/style/index.js +1 -0
- package/lib/vxe-v-x-e-table/style/style.css +0 -0
- package/lib/vxe-v-x-e-table/style/style.min.css +0 -0
- package/package.json +2 -2
- package/packages/components.ts +4 -1
- package/packages/grid/src/grid.ts +5 -4
- package/packages/index.ts +2 -2
- package/packages/table/module/custom/hook.ts +2 -2
- package/packages/table/module/custom/panel.ts +4 -3
- package/packages/table/module/edit/hook.ts +3 -1
- package/packages/table/module/export/export-panel.ts +4 -3
- package/packages/table/module/export/hook.ts +3 -1
- package/packages/table/module/export/import-panel.ts +4 -3
- package/packages/table/module/filter/hook.ts +3 -1
- package/packages/table/module/filter/panel.ts +3 -1
- package/packages/table/module/keyboard/hook.ts +3 -1
- package/packages/table/module/menu/hook.ts +3 -1
- package/packages/table/module/validator/hook.ts +3 -1
- package/packages/table/render/index.ts +4 -3
- package/packages/table/src/body.ts +4 -2
- package/packages/table/src/cell.ts +4 -2
- package/packages/table/src/columnInfo.ts +2 -1
- package/packages/table/src/props.ts +3 -1
- package/packages/table/src/table.ts +18 -4
- package/packages/toolbar/src/toolbar.ts +5 -4
- package/packages/ui/index.ts +3 -0
- package/packages/ui/src/utils.ts +3 -3
- package/packages/ui/src/vn.ts +2 -1
- package/packages/v-x-e-table/index.d.ts +4 -0
- package/packages/v-x-e-table/index.ts +4 -0
- package/styles/components/table.scss +5 -2
- package/styles/components/v-x-e-table.scss +0 -0
- package/styles/theme/base.scss +1 -0
- package/types/all.d.ts +0 -22
package/lib/table/src/table.js
CHANGED
|
@@ -23,6 +23,20 @@ var _importPanel = _interopRequireDefault(require("../module/export/import-panel
|
|
|
23
23
|
var _exportPanel = _interopRequireDefault(require("../module/export/export-panel"));
|
|
24
24
|
var _panel3 = _interopRequireDefault(require("../module/menu/panel"));
|
|
25
25
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
26
|
+
const {
|
|
27
|
+
getConfig,
|
|
28
|
+
getI18n,
|
|
29
|
+
renderer,
|
|
30
|
+
formats,
|
|
31
|
+
createEvent,
|
|
32
|
+
globalResize,
|
|
33
|
+
interceptor,
|
|
34
|
+
hooks,
|
|
35
|
+
globalEvents,
|
|
36
|
+
GLOBAL_EVENT_KEYS,
|
|
37
|
+
log,
|
|
38
|
+
useFns
|
|
39
|
+
} = _vxePcUi.VxeUI;
|
|
26
40
|
const isWebkit = _dom.browse['-webkit'] && !_dom.browse.edge;
|
|
27
41
|
const resizableStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_WIDTH';
|
|
28
42
|
const visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
|
|
@@ -40,7 +54,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
|
|
|
40
54
|
const xID = _xeUtils.default.uniqueId();
|
|
41
55
|
const {
|
|
42
56
|
computeSize
|
|
43
|
-
} =
|
|
57
|
+
} = useFns.useSize(props);
|
|
44
58
|
const reactData = (0, _vue.reactive)({
|
|
45
59
|
// 低性能的静态列
|
|
46
60
|
staticColumns: [],
|
|
@@ -349,13 +363,13 @@ var _default = exports.default = (0, _vue.defineComponent)({
|
|
|
349
363
|
const $xeGrid = (0, _vue.inject)('$xeGrid', null);
|
|
350
364
|
let $xeToolbar;
|
|
351
365
|
const computeValidOpts = (0, _vue.computed)(() => {
|
|
352
|
-
return Object.assign({},
|
|
366
|
+
return Object.assign({}, getConfig().table.validConfig, props.validConfig);
|
|
353
367
|
});
|
|
354
368
|
const computeSXOpts = (0, _vue.computed)(() => {
|
|
355
|
-
return Object.assign({},
|
|
369
|
+
return Object.assign({}, getConfig().table.scrollX, props.scrollX);
|
|
356
370
|
});
|
|
357
371
|
const computeSYOpts = (0, _vue.computed)(() => {
|
|
358
|
-
return Object.assign({},
|
|
372
|
+
return Object.assign({}, getConfig().table.scrollY, props.scrollY);
|
|
359
373
|
});
|
|
360
374
|
const computeRowHeightMaps = (0, _vue.computed)(() => {
|
|
361
375
|
return {
|
|
@@ -366,31 +380,31 @@ var _default = exports.default = (0, _vue.defineComponent)({
|
|
|
366
380
|
};
|
|
367
381
|
});
|
|
368
382
|
const computeColumnOpts = (0, _vue.computed)(() => {
|
|
369
|
-
return Object.assign({},
|
|
383
|
+
return Object.assign({}, getConfig().table.columnConfig, props.columnConfig);
|
|
370
384
|
});
|
|
371
385
|
const computeRowOpts = (0, _vue.computed)(() => {
|
|
372
|
-
return Object.assign({},
|
|
386
|
+
return Object.assign({}, getConfig().table.rowConfig, props.rowConfig);
|
|
373
387
|
});
|
|
374
388
|
const computeResizeleOpts = (0, _vue.computed)(() => {
|
|
375
|
-
return Object.assign({},
|
|
389
|
+
return Object.assign({}, getConfig().table.resizeConfig, props.resizeConfig);
|
|
376
390
|
});
|
|
377
391
|
const computeResizableOpts = (0, _vue.computed)(() => {
|
|
378
|
-
return Object.assign({},
|
|
392
|
+
return Object.assign({}, getConfig().table.resizableConfig, props.resizableConfig);
|
|
379
393
|
});
|
|
380
394
|
const computeSeqOpts = (0, _vue.computed)(() => {
|
|
381
395
|
return Object.assign({
|
|
382
396
|
startIndex: 0
|
|
383
|
-
},
|
|
397
|
+
}, getConfig().table.seqConfig, props.seqConfig);
|
|
384
398
|
});
|
|
385
399
|
const computeRadioOpts = (0, _vue.computed)(() => {
|
|
386
|
-
return Object.assign({},
|
|
400
|
+
return Object.assign({}, getConfig().table.radioConfig, props.radioConfig);
|
|
387
401
|
});
|
|
388
402
|
const computeCheckboxOpts = (0, _vue.computed)(() => {
|
|
389
|
-
return Object.assign({},
|
|
403
|
+
return Object.assign({}, getConfig().table.checkboxConfig, props.checkboxConfig);
|
|
390
404
|
});
|
|
391
405
|
let computeTooltipOpts = (0, _vue.ref)();
|
|
392
406
|
computeTooltipOpts = (0, _vue.computed)(() => {
|
|
393
|
-
return Object.assign({},
|
|
407
|
+
return Object.assign({}, getConfig().tooltip, getConfig().table.tooltipConfig, props.tooltipConfig);
|
|
394
408
|
});
|
|
395
409
|
const computeTipConfig = (0, _vue.computed)(() => {
|
|
396
410
|
const tooltipOpts = computeTooltipOpts.value;
|
|
@@ -403,33 +417,33 @@ var _default = exports.default = (0, _vue.defineComponent)({
|
|
|
403
417
|
}, tooltipOpts);
|
|
404
418
|
});
|
|
405
419
|
const computeEditOpts = (0, _vue.computed)(() => {
|
|
406
|
-
return Object.assign({},
|
|
420
|
+
return Object.assign({}, getConfig().table.editConfig, props.editConfig);
|
|
407
421
|
});
|
|
408
422
|
const computeSortOpts = (0, _vue.computed)(() => {
|
|
409
423
|
return Object.assign({
|
|
410
424
|
orders: ['asc', 'desc', null]
|
|
411
|
-
},
|
|
425
|
+
}, getConfig().table.sortConfig, props.sortConfig);
|
|
412
426
|
});
|
|
413
427
|
const computeFilterOpts = (0, _vue.computed)(() => {
|
|
414
|
-
return Object.assign({},
|
|
428
|
+
return Object.assign({}, getConfig().table.filterConfig, props.filterConfig);
|
|
415
429
|
});
|
|
416
430
|
const computeMouseOpts = (0, _vue.computed)(() => {
|
|
417
|
-
return Object.assign({},
|
|
431
|
+
return Object.assign({}, getConfig().table.mouseConfig, props.mouseConfig);
|
|
418
432
|
});
|
|
419
433
|
const computeAreaOpts = (0, _vue.computed)(() => {
|
|
420
|
-
return Object.assign({},
|
|
434
|
+
return Object.assign({}, getConfig().table.areaConfig, props.areaConfig);
|
|
421
435
|
});
|
|
422
436
|
const computeKeyboardOpts = (0, _vue.computed)(() => {
|
|
423
|
-
return Object.assign({},
|
|
437
|
+
return Object.assign({}, getConfig().table.keyboardConfig, props.keyboardConfig);
|
|
424
438
|
});
|
|
425
439
|
const computeClipOpts = (0, _vue.computed)(() => {
|
|
426
|
-
return Object.assign({},
|
|
440
|
+
return Object.assign({}, getConfig().table.clipConfig, props.clipConfig);
|
|
427
441
|
});
|
|
428
442
|
const computeFNROpts = (0, _vue.computed)(() => {
|
|
429
|
-
return Object.assign({},
|
|
443
|
+
return Object.assign({}, getConfig().table.fnrConfig, props.fnrConfig);
|
|
430
444
|
});
|
|
431
445
|
const computeMenuOpts = (0, _vue.computed)(() => {
|
|
432
|
-
return Object.assign({},
|
|
446
|
+
return Object.assign({}, getConfig().table.menuConfig, props.menuConfig);
|
|
433
447
|
});
|
|
434
448
|
const computeHeaderMenu = (0, _vue.computed)(() => {
|
|
435
449
|
const menuOpts = computeMenuOpts.value;
|
|
@@ -466,31 +480,31 @@ var _default = exports.default = (0, _vue.defineComponent)({
|
|
|
466
480
|
return rest;
|
|
467
481
|
});
|
|
468
482
|
const computeExportOpts = (0, _vue.computed)(() => {
|
|
469
|
-
return Object.assign({},
|
|
483
|
+
return Object.assign({}, getConfig().table.exportConfig, props.exportConfig);
|
|
470
484
|
});
|
|
471
485
|
const computeImportOpts = (0, _vue.computed)(() => {
|
|
472
|
-
return Object.assign({},
|
|
486
|
+
return Object.assign({}, getConfig().table.importConfig, props.importConfig);
|
|
473
487
|
});
|
|
474
488
|
const computePrintOpts = (0, _vue.computed)(() => {
|
|
475
|
-
return Object.assign({},
|
|
489
|
+
return Object.assign({}, getConfig().table.printConfig, props.printConfig);
|
|
476
490
|
});
|
|
477
491
|
const computeExpandOpts = (0, _vue.computed)(() => {
|
|
478
|
-
return Object.assign({},
|
|
492
|
+
return Object.assign({}, getConfig().table.expandConfig, props.expandConfig);
|
|
479
493
|
});
|
|
480
494
|
const computeTreeOpts = (0, _vue.computed)(() => {
|
|
481
|
-
return Object.assign({},
|
|
495
|
+
return Object.assign({}, getConfig().table.treeConfig, props.treeConfig);
|
|
482
496
|
});
|
|
483
497
|
const computeEmptyOpts = (0, _vue.computed)(() => {
|
|
484
|
-
return Object.assign({},
|
|
498
|
+
return Object.assign({}, getConfig().table.emptyRender, props.emptyRender);
|
|
485
499
|
});
|
|
486
500
|
const computeLoadingOpts = (0, _vue.computed)(() => {
|
|
487
|
-
return Object.assign({},
|
|
501
|
+
return Object.assign({}, getConfig().table.loadingConfig, props.loadingConfig);
|
|
488
502
|
});
|
|
489
503
|
const computeCellOffsetWidth = (0, _vue.computed)(() => {
|
|
490
504
|
return props.border ? Math.max(2, Math.ceil(reactData.scrollbarWidth / reactData.tableColumn.length)) : 1;
|
|
491
505
|
});
|
|
492
506
|
const computeCustomOpts = (0, _vue.computed)(() => {
|
|
493
|
-
return Object.assign({},
|
|
507
|
+
return Object.assign({}, getConfig().table.customConfig, props.customConfig);
|
|
494
508
|
});
|
|
495
509
|
const computeFixedColumnSize = (0, _vue.computed)(() => {
|
|
496
510
|
const {
|
|
@@ -649,7 +663,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
|
|
|
649
663
|
return orders[oIndex < orders.length ? oIndex : 0];
|
|
650
664
|
};
|
|
651
665
|
const getCustomStorageMap = key => {
|
|
652
|
-
const version =
|
|
666
|
+
const version = getConfig().version;
|
|
653
667
|
const rest = _xeUtils.default.toStringJSON(localStorage.getItem(key) || '');
|
|
654
668
|
return rest && rest._v === version ? rest : {
|
|
655
669
|
_v: version
|
|
@@ -780,7 +794,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
|
|
|
780
794
|
merges = [merges];
|
|
781
795
|
}
|
|
782
796
|
if (treeConfig && merges.length) {
|
|
783
|
-
|
|
797
|
+
log.err('vxe.error.noTree', ['merge-cells | merge-footer-items']);
|
|
784
798
|
}
|
|
785
799
|
merges.forEach(item => {
|
|
786
800
|
let {
|
|
@@ -838,7 +852,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
|
|
|
838
852
|
merges = [merges];
|
|
839
853
|
}
|
|
840
854
|
if (treeConfig && merges.length) {
|
|
841
|
-
|
|
855
|
+
log.err('vxe.error.noTree', ['merge-cells | merge-footer-items']);
|
|
842
856
|
}
|
|
843
857
|
merges.forEach(item => {
|
|
844
858
|
let {
|
|
@@ -910,7 +924,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
|
|
|
910
924
|
if (customConfig && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
|
|
911
925
|
const customMap = {};
|
|
912
926
|
if (!id) {
|
|
913
|
-
|
|
927
|
+
log.err('vxe.error.reqProp', ['id']);
|
|
914
928
|
return;
|
|
915
929
|
}
|
|
916
930
|
// 自定义列宽
|
|
@@ -1067,7 +1081,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
|
|
|
1067
1081
|
if (field) {
|
|
1068
1082
|
if (process.env.NODE_ENV === 'development') {
|
|
1069
1083
|
if (fullColumnFieldData[field]) {
|
|
1070
|
-
|
|
1084
|
+
log.warn('vxe.error.colRepet', ['field', field]);
|
|
1071
1085
|
}
|
|
1072
1086
|
}
|
|
1073
1087
|
fullColumnFieldData[field] = rest;
|
|
@@ -1081,7 +1095,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
|
|
|
1081
1095
|
if (treeNode) {
|
|
1082
1096
|
if (process.env.NODE_ENV === 'development') {
|
|
1083
1097
|
if (treeNodeColumn) {
|
|
1084
|
-
|
|
1098
|
+
log.warn('vxe.error.colRepet', ['tree-node', treeNode]);
|
|
1085
1099
|
}
|
|
1086
1100
|
}
|
|
1087
1101
|
if (!treeNodeColumn) {
|
|
@@ -1090,7 +1104,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
|
|
|
1090
1104
|
} else if (type === 'expand') {
|
|
1091
1105
|
if (process.env.NODE_ENV === 'development') {
|
|
1092
1106
|
if (expandColumn) {
|
|
1093
|
-
|
|
1107
|
+
log.warn('vxe.error.colRepet', ['type', type]);
|
|
1094
1108
|
}
|
|
1095
1109
|
}
|
|
1096
1110
|
if (!expandColumn) {
|
|
@@ -1100,14 +1114,14 @@ var _default = exports.default = (0, _vue.defineComponent)({
|
|
|
1100
1114
|
if (process.env.NODE_ENV === 'development') {
|
|
1101
1115
|
if (type === 'checkbox') {
|
|
1102
1116
|
if (checkboxColumn) {
|
|
1103
|
-
|
|
1117
|
+
log.warn('vxe.error.colRepet', ['type', type]);
|
|
1104
1118
|
}
|
|
1105
1119
|
if (!checkboxColumn) {
|
|
1106
1120
|
checkboxColumn = column;
|
|
1107
1121
|
}
|
|
1108
1122
|
} else if (type === 'radio') {
|
|
1109
1123
|
if (radioColumn) {
|
|
1110
|
-
|
|
1124
|
+
log.warn('vxe.error.colRepet', ['type', type]);
|
|
1111
1125
|
}
|
|
1112
1126
|
if (!radioColumn) {
|
|
1113
1127
|
radioColumn = column;
|
|
@@ -1118,7 +1132,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
|
|
|
1118
1132
|
isAllOverflow = false;
|
|
1119
1133
|
}
|
|
1120
1134
|
if (fullColumnIdData[colid]) {
|
|
1121
|
-
|
|
1135
|
+
log.err('vxe.error.colRepet', ['colId', colid]);
|
|
1122
1136
|
}
|
|
1123
1137
|
fullColumnIdData[colid] = rest;
|
|
1124
1138
|
};
|
|
@@ -1132,16 +1146,16 @@ var _default = exports.default = (0, _vue.defineComponent)({
|
|
|
1132
1146
|
}
|
|
1133
1147
|
if (process.env.NODE_ENV === 'development') {
|
|
1134
1148
|
if (expandColumn && mouseOpts.area) {
|
|
1135
|
-
|
|
1149
|
+
log.err('vxe.error.errConflicts', ['mouse-config.area', 'column.type=expand']);
|
|
1136
1150
|
}
|
|
1137
1151
|
}
|
|
1138
1152
|
if (process.env.NODE_ENV === 'development') {
|
|
1139
1153
|
if (htmlColumn) {
|
|
1140
1154
|
if (!columnOpts.useKey) {
|
|
1141
|
-
|
|
1155
|
+
log.err('vxe.error.reqProp', ['column-config.useKey', 'column.type=html']);
|
|
1142
1156
|
}
|
|
1143
1157
|
if (!rowOpts.useKey) {
|
|
1144
|
-
|
|
1158
|
+
log.err('vxe.error.reqProp', ['row-config.useKey', 'column.type=html']);
|
|
1145
1159
|
}
|
|
1146
1160
|
}
|
|
1147
1161
|
}
|
|
@@ -1516,7 +1530,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
|
|
|
1516
1530
|
filterMethod,
|
|
1517
1531
|
filterRender
|
|
1518
1532
|
} = column;
|
|
1519
|
-
const compConf = filterRender ?
|
|
1533
|
+
const compConf = filterRender ? renderer.get(filterRender.name) : null;
|
|
1520
1534
|
const compFilterMethod = compConf ? compConf.filterMethod : null;
|
|
1521
1535
|
const defaultFilterMethod = compConf ? compConf.defaultFilterMethod : null;
|
|
1522
1536
|
const cellValue = (0, _util.getCellValue)(row, column);
|
|
@@ -2565,19 +2579,19 @@ var _default = exports.default = (0, _vue.defineComponent)({
|
|
|
2565
2579
|
// 树结构自动转换
|
|
2566
2580
|
if (process.env.NODE_ENV === 'development') {
|
|
2567
2581
|
if (!treeOpts.rowField) {
|
|
2568
|
-
|
|
2582
|
+
log.err('vxe.error.reqProp', ['tree-config.rowField']);
|
|
2569
2583
|
}
|
|
2570
2584
|
if (!treeOpts.parentField) {
|
|
2571
|
-
|
|
2585
|
+
log.err('vxe.error.reqProp', ['tree-config.parentField']);
|
|
2572
2586
|
}
|
|
2573
2587
|
if (!childrenField) {
|
|
2574
|
-
|
|
2588
|
+
log.err('vxe.error.reqProp', ['tree-config.childrenField']);
|
|
2575
2589
|
}
|
|
2576
2590
|
if (!treeOpts.mapChildrenField) {
|
|
2577
|
-
|
|
2591
|
+
log.err('vxe.error.reqProp', ['tree-config.mapChildrenField']);
|
|
2578
2592
|
}
|
|
2579
2593
|
if (childrenField === treeOpts.mapChildrenField) {
|
|
2580
|
-
|
|
2594
|
+
log.err('vxe.error.errConflicts', ['tree-config.childrenField', 'tree-config.mapChildrenField']);
|
|
2581
2595
|
}
|
|
2582
2596
|
// fullData.forEach(row => {
|
|
2583
2597
|
// if (row[treeOpts.children] && row[treeOpts.children].length) {
|
|
@@ -2619,13 +2633,13 @@ var _default = exports.default = (0, _vue.defineComponent)({
|
|
|
2619
2633
|
if (process.env.NODE_ENV === 'development') {
|
|
2620
2634
|
if (sYLoad) {
|
|
2621
2635
|
if (!(props.height || props.maxHeight)) {
|
|
2622
|
-
|
|
2636
|
+
log.err('vxe.error.reqProp', ['table.height | table.max-height | table.scroll-y={enabled: false}']);
|
|
2623
2637
|
}
|
|
2624
2638
|
if (!props.showOverflow) {
|
|
2625
|
-
|
|
2639
|
+
log.warn('vxe.error.reqProp', ['table.show-overflow']);
|
|
2626
2640
|
}
|
|
2627
2641
|
if (props.spanMethod) {
|
|
2628
|
-
|
|
2642
|
+
log.warn('vxe.error.scrollErrProp', ['table.span-method']);
|
|
2629
2643
|
}
|
|
2630
2644
|
}
|
|
2631
2645
|
}
|
|
@@ -2781,7 +2795,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
|
|
|
2781
2795
|
column.fixed = parent.fixed;
|
|
2782
2796
|
}
|
|
2783
2797
|
if (parent && column.fixed !== parent.fixed) {
|
|
2784
|
-
|
|
2798
|
+
log.err('vxe.error.groupFixed');
|
|
2785
2799
|
}
|
|
2786
2800
|
if (isColGroup) {
|
|
2787
2801
|
column.visible = !!_xeUtils.default.findTree(column.children, subColumn => (0, _utils.hasChildrenList)(subColumn) ? false : subColumn.visible);
|
|
@@ -2839,10 +2853,10 @@ var _default = exports.default = (0, _vue.defineComponent)({
|
|
|
2839
2853
|
// log.warn('vxe.error.reqProp', ['show-footer-overflow'])
|
|
2840
2854
|
// }
|
|
2841
2855
|
if (props.spanMethod) {
|
|
2842
|
-
|
|
2856
|
+
log.warn('vxe.error.scrollErrProp', ['span-method']);
|
|
2843
2857
|
}
|
|
2844
2858
|
if (props.footerSpanMethod) {
|
|
2845
|
-
|
|
2859
|
+
log.warn('vxe.error.scrollErrProp', ['footer-span-method']);
|
|
2846
2860
|
}
|
|
2847
2861
|
}
|
|
2848
2862
|
const {
|
|
@@ -2902,7 +2916,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
|
|
|
2902
2916
|
tablePrivateMethods.handleTableData(true);
|
|
2903
2917
|
if (process.env.NODE_ENV === 'development') {
|
|
2904
2918
|
if ((reactData.scrollXLoad || reactData.scrollYLoad) && reactData.expandColumn) {
|
|
2905
|
-
|
|
2919
|
+
log.warn('vxe.error.scrollErrProp', ['column.type=expand']);
|
|
2906
2920
|
}
|
|
2907
2921
|
}
|
|
2908
2922
|
return (0, _vue.nextTick)().then(() => {
|
|
@@ -3103,7 +3117,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
|
|
|
3103
3117
|
let keyCtxTimeout;
|
|
3104
3118
|
tableMethods = {
|
|
3105
3119
|
dispatchEvent(type, params, evnt) {
|
|
3106
|
-
emit(type,
|
|
3120
|
+
emit(type, createEvent(evnt, {
|
|
3107
3121
|
$table: $xeTable,
|
|
3108
3122
|
$grid: $xeGrid
|
|
3109
3123
|
}, params));
|
|
@@ -3120,7 +3134,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
|
|
|
3120
3134
|
* 对于某些特殊的场景,比如深层树节点元素发生变动时可能会用到
|
|
3121
3135
|
*/
|
|
3122
3136
|
syncData() {
|
|
3123
|
-
|
|
3137
|
+
log.warn('vxe.error.delFunc', ['syncData', 'getData']);
|
|
3124
3138
|
return (0, _vue.nextTick)().then(() => {
|
|
3125
3139
|
reactData.tableData = [];
|
|
3126
3140
|
emit('update:data', internalData.tableFullData);
|
|
@@ -3196,6 +3210,19 @@ var _default = exports.default = (0, _vue.defineComponent)({
|
|
|
3196
3210
|
return tableMethods.recalculate();
|
|
3197
3211
|
});
|
|
3198
3212
|
},
|
|
3213
|
+
/**
|
|
3214
|
+
* 修改行数据
|
|
3215
|
+
*/
|
|
3216
|
+
setRow(rows, record) {
|
|
3217
|
+
if (rows && record) {
|
|
3218
|
+
let rest = rows;
|
|
3219
|
+
if (!_xeUtils.default.isArray(rows)) {
|
|
3220
|
+
rest = [rows];
|
|
3221
|
+
}
|
|
3222
|
+
rest.forEach(item => Object.assign(item, record));
|
|
3223
|
+
}
|
|
3224
|
+
return (0, _vue.nextTick)();
|
|
3225
|
+
},
|
|
3199
3226
|
/**
|
|
3200
3227
|
* 局部加载行数据并恢复到初始状态
|
|
3201
3228
|
* 对于行数据需要局部更改的场景中可能会用到
|
|
@@ -3229,7 +3256,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
|
|
|
3229
3256
|
reactData.tableData = tableData.slice(0);
|
|
3230
3257
|
} else {
|
|
3231
3258
|
if (process.env.NODE_ENV === 'development') {
|
|
3232
|
-
|
|
3259
|
+
log.warn('vxe.error.reqProp', ['keep-source']);
|
|
3233
3260
|
}
|
|
3234
3261
|
}
|
|
3235
3262
|
return (0, _vue.nextTick)();
|
|
@@ -3439,7 +3466,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
|
|
|
3439
3466
|
} = internalData;
|
|
3440
3467
|
if (!keepSource) {
|
|
3441
3468
|
if (process.env.NODE_ENV === 'development') {
|
|
3442
|
-
|
|
3469
|
+
log.warn('vxe.error.reqProp', ['keep-source']);
|
|
3443
3470
|
}
|
|
3444
3471
|
return (0, _vue.nextTick)();
|
|
3445
3472
|
}
|
|
@@ -3737,7 +3764,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
|
|
|
3737
3764
|
if (_vxePcUi.VxeUI.modal) {
|
|
3738
3765
|
_vxePcUi.VxeUI.modal.message({
|
|
3739
3766
|
status: 'error',
|
|
3740
|
-
content:
|
|
3767
|
+
content: getI18n('vxe.table.maxFixedCol', [maxFixedSize])
|
|
3741
3768
|
});
|
|
3742
3769
|
}
|
|
3743
3770
|
return (0, _vue.nextTick)();
|
|
@@ -4566,7 +4593,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
|
|
|
4566
4593
|
},
|
|
4567
4594
|
reloadExpandContent(row) {
|
|
4568
4595
|
if (process.env.NODE_ENV === 'development') {
|
|
4569
|
-
|
|
4596
|
+
log.warn('vxe.error.delFunc', ['reloadExpandContent', 'reloadRowExpand']);
|
|
4570
4597
|
}
|
|
4571
4598
|
// 即将废弃
|
|
4572
4599
|
return tableMethods.reloadRowExpand(row);
|
|
@@ -4688,7 +4715,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
|
|
|
4688
4715
|
isExpandByRow(row) {
|
|
4689
4716
|
// 已废弃
|
|
4690
4717
|
if (process.env.NODE_ENV === 'development') {
|
|
4691
|
-
|
|
4718
|
+
log.warn('vxe.error.delFunc', ['isExpandByRow', 'isRowExpandByRow']);
|
|
4692
4719
|
}
|
|
4693
4720
|
return tableMethods.isRowExpandByRow(row);
|
|
4694
4721
|
},
|
|
@@ -4804,7 +4831,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
|
|
|
4804
4831
|
},
|
|
4805
4832
|
reloadTreeChilds(row) {
|
|
4806
4833
|
if (process.env.NODE_ENV === 'development') {
|
|
4807
|
-
|
|
4834
|
+
log.warn('vxe.error.delFunc', ['reloadTreeChilds', 'reloadTreeExpand']);
|
|
4808
4835
|
}
|
|
4809
4836
|
// 即将废弃
|
|
4810
4837
|
return tableMethods.reloadTreeExpand(row);
|
|
@@ -5107,7 +5134,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
|
|
|
5107
5134
|
*/
|
|
5108
5135
|
setMergeCells(merges) {
|
|
5109
5136
|
if (props.spanMethod) {
|
|
5110
|
-
|
|
5137
|
+
log.err('vxe.error.errConflicts', ['merge-cells', 'span-method']);
|
|
5111
5138
|
}
|
|
5112
5139
|
setMerges(merges, reactData.mergeList, internalData.afterFullData);
|
|
5113
5140
|
return (0, _vue.nextTick)().then(() => {
|
|
@@ -5121,7 +5148,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
|
|
|
5121
5148
|
*/
|
|
5122
5149
|
removeMergeCells(merges) {
|
|
5123
5150
|
if (props.spanMethod) {
|
|
5124
|
-
|
|
5151
|
+
log.err('vxe.error.errConflicts', ['merge-cells', 'span-method']);
|
|
5125
5152
|
}
|
|
5126
5153
|
const rest = removeMerges(merges, reactData.mergeList, internalData.afterFullData);
|
|
5127
5154
|
return (0, _vue.nextTick)().then(() => {
|
|
@@ -5147,7 +5174,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
|
|
|
5147
5174
|
},
|
|
5148
5175
|
setMergeFooterItems(merges) {
|
|
5149
5176
|
if (props.footerSpanMethod) {
|
|
5150
|
-
|
|
5177
|
+
log.err('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
|
|
5151
5178
|
}
|
|
5152
5179
|
setMerges(merges, reactData.mergeFooterList);
|
|
5153
5180
|
return (0, _vue.nextTick)().then(() => {
|
|
@@ -5157,7 +5184,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
|
|
|
5157
5184
|
},
|
|
5158
5185
|
removeMergeFooterItems(merges) {
|
|
5159
5186
|
if (props.footerSpanMethod) {
|
|
5160
|
-
|
|
5187
|
+
log.err('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
|
|
5161
5188
|
}
|
|
5162
5189
|
const rest = removeMerges(merges, reactData.mergeFooterList);
|
|
5163
5190
|
return (0, _vue.nextTick)().then(() => {
|
|
@@ -5211,7 +5238,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
|
|
|
5211
5238
|
$table: $xeTable
|
|
5212
5239
|
});
|
|
5213
5240
|
} else {
|
|
5214
|
-
|
|
5241
|
+
log.err('vxe.error.barUnableLink');
|
|
5215
5242
|
}
|
|
5216
5243
|
return (0, _vue.nextTick)();
|
|
5217
5244
|
}
|
|
@@ -5384,7 +5411,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
|
|
|
5384
5411
|
const {
|
|
5385
5412
|
actived
|
|
5386
5413
|
} = editStore;
|
|
5387
|
-
const isEsc =
|
|
5414
|
+
const isEsc = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ESCAPE);
|
|
5388
5415
|
if (isEsc) {
|
|
5389
5416
|
tablePrivateMethods.preventEvent(evnt, 'event.keydown', null, () => {
|
|
5390
5417
|
tableMethods.dispatchEvent('keydown-start', {}, evnt);
|
|
@@ -5447,18 +5474,18 @@ var _default = exports.default = (0, _vue.defineComponent)({
|
|
|
5447
5474
|
} = editStore;
|
|
5448
5475
|
const childrenField = treeOpts.children || treeOpts.childrenField;
|
|
5449
5476
|
const keyCode = evnt.keyCode;
|
|
5450
|
-
const isEsc =
|
|
5451
|
-
const isBack =
|
|
5452
|
-
const isTab =
|
|
5453
|
-
const isEnter =
|
|
5454
|
-
const isSpacebar =
|
|
5455
|
-
const isLeftArrow =
|
|
5456
|
-
const isUpArrow =
|
|
5457
|
-
const isRightArrow =
|
|
5458
|
-
const isDwArrow =
|
|
5459
|
-
const isDel =
|
|
5460
|
-
const isF2 =
|
|
5461
|
-
const isContextMenu =
|
|
5477
|
+
const isEsc = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ESCAPE);
|
|
5478
|
+
const isBack = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.BACKSPACE);
|
|
5479
|
+
const isTab = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.TAB);
|
|
5480
|
+
const isEnter = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ENTER);
|
|
5481
|
+
const isSpacebar = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.SPACEBAR);
|
|
5482
|
+
const isLeftArrow = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ARROW_LEFT);
|
|
5483
|
+
const isUpArrow = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ARROW_UP);
|
|
5484
|
+
const isRightArrow = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ARROW_RIGHT);
|
|
5485
|
+
const isDwArrow = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ARROW_DOWN);
|
|
5486
|
+
const isDel = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.DELETE);
|
|
5487
|
+
const isF2 = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.F2);
|
|
5488
|
+
const isContextMenu = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.CONTEXT_MENU);
|
|
5462
5489
|
const hasMetaKey = evnt.metaKey;
|
|
5463
5490
|
const hasCtrlKey = evnt.ctrlKey;
|
|
5464
5491
|
const hasShiftKey = evnt.shiftKey;
|
|
@@ -5823,7 +5850,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
|
|
|
5823
5850
|
*/
|
|
5824
5851
|
tablePrivateMethods = {
|
|
5825
5852
|
getSetupOptions() {
|
|
5826
|
-
return
|
|
5853
|
+
return getConfig();
|
|
5827
5854
|
},
|
|
5828
5855
|
updateAfterDataIndex,
|
|
5829
5856
|
callSlot(slotFunc, params) {
|
|
@@ -6111,7 +6138,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
|
|
|
6111
6138
|
const columnWidthStorageMap = getCustomStorageMap(resizableStorageKey);
|
|
6112
6139
|
let columnWidthStorage;
|
|
6113
6140
|
if (!id) {
|
|
6114
|
-
|
|
6141
|
+
log.err('vxe.error.reqProp', ['id']);
|
|
6115
6142
|
return;
|
|
6116
6143
|
}
|
|
6117
6144
|
if (!isReset) {
|
|
@@ -6148,7 +6175,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
|
|
|
6148
6175
|
const columnSortStorageMap = getCustomStorageMap(sortStorageKey);
|
|
6149
6176
|
let columnWidthStorage;
|
|
6150
6177
|
if (!id) {
|
|
6151
|
-
|
|
6178
|
+
log.err('vxe.error.reqProp', ['id']);
|
|
6152
6179
|
return;
|
|
6153
6180
|
}
|
|
6154
6181
|
if (!isReset) {
|
|
@@ -6186,7 +6213,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
|
|
|
6186
6213
|
const columnFixedStorageMap = getCustomStorageMap(fixedStorageKey);
|
|
6187
6214
|
const colFixeds = [];
|
|
6188
6215
|
if (!id) {
|
|
6189
|
-
|
|
6216
|
+
log.err('vxe.error.reqProp', ['id']);
|
|
6190
6217
|
return;
|
|
6191
6218
|
}
|
|
6192
6219
|
_xeUtils.default.eachTree(collectColumn, column => {
|
|
@@ -6222,7 +6249,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
|
|
|
6222
6249
|
const colHides = [];
|
|
6223
6250
|
const colShows = [];
|
|
6224
6251
|
if (!id) {
|
|
6225
|
-
|
|
6252
|
+
log.err('vxe.error.reqProp', ['id']);
|
|
6226
6253
|
return;
|
|
6227
6254
|
}
|
|
6228
6255
|
_xeUtils.default.eachTree(collectColumn, column => {
|
|
@@ -6271,13 +6298,13 @@ var _default = exports.default = (0, _vue.defineComponent)({
|
|
|
6271
6298
|
reactData.reColumnFlag++;
|
|
6272
6299
|
},
|
|
6273
6300
|
preventEvent(evnt, type, args, next, end) {
|
|
6274
|
-
let evntList =
|
|
6301
|
+
let evntList = interceptor.get(type);
|
|
6275
6302
|
// 兼容老版本
|
|
6276
6303
|
if (!evntList.length && type === 'event.clearEdit') {
|
|
6277
|
-
evntList =
|
|
6304
|
+
evntList = interceptor.get('event.clearActived');
|
|
6278
6305
|
if (process.env.NODE_ENV === 'development') {
|
|
6279
6306
|
if (evntList.length) {
|
|
6280
|
-
|
|
6307
|
+
log.warn('vxe.error.delEvent', ['event.clearActived', 'event.clearEdit']);
|
|
6281
6308
|
}
|
|
6282
6309
|
}
|
|
6283
6310
|
}
|
|
@@ -7359,10 +7386,10 @@ var _default = exports.default = (0, _vue.defineComponent)({
|
|
|
7359
7386
|
columnIndex: tableMethods.getColumnIndex(column)
|
|
7360
7387
|
};
|
|
7361
7388
|
if (_xeUtils.default.isString(formatter)) {
|
|
7362
|
-
const gFormatOpts =
|
|
7389
|
+
const gFormatOpts = formats.get(formatter);
|
|
7363
7390
|
cellLabel = gFormatOpts && gFormatOpts.cellFormatMethod ? gFormatOpts.cellFormatMethod(formatParams) : '';
|
|
7364
7391
|
} else if (_xeUtils.default.isArray(formatter)) {
|
|
7365
|
-
const gFormatOpts =
|
|
7392
|
+
const gFormatOpts = formats.get(formatter[0]);
|
|
7366
7393
|
cellLabel = gFormatOpts && gFormatOpts.cellFormatMethod ? gFormatOpts.cellFormatMethod(formatParams, ...formatter.slice(1)) : '';
|
|
7367
7394
|
} else {
|
|
7368
7395
|
cellLabel = formatter(formatParams);
|
|
@@ -7393,12 +7420,12 @@ var _default = exports.default = (0, _vue.defineComponent)({
|
|
|
7393
7420
|
if (process.env.NODE_ENV === 'development') {
|
|
7394
7421
|
'openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',').forEach(name => {
|
|
7395
7422
|
$xeTable[name] = function () {
|
|
7396
|
-
|
|
7423
|
+
log.err('vxe.error.reqModule', ['VxeTableExportModule']);
|
|
7397
7424
|
};
|
|
7398
7425
|
});
|
|
7399
7426
|
'clearValidate,fullValidate,validate'.split(',').forEach(name => {
|
|
7400
7427
|
$xeTable[name] = function () {
|
|
7401
|
-
|
|
7428
|
+
log.err('vxe.error.reqModule', ['VxeTableValidatorModule']);
|
|
7402
7429
|
};
|
|
7403
7430
|
});
|
|
7404
7431
|
}
|
|
@@ -7455,13 +7482,13 @@ var _default = exports.default = (0, _vue.defineComponent)({
|
|
|
7455
7482
|
if (slots.empty) {
|
|
7456
7483
|
return slots.empty(params);
|
|
7457
7484
|
} else {
|
|
7458
|
-
const compConf = emptyOpts.name ?
|
|
7485
|
+
const compConf = emptyOpts.name ? renderer.get(emptyOpts.name) : null;
|
|
7459
7486
|
const renderTableEmptyView = compConf ? compConf.renderTableEmptyView || compConf.renderEmpty : null;
|
|
7460
7487
|
if (renderTableEmptyView) {
|
|
7461
7488
|
return (0, _vn.getSlotVNs)(renderTableEmptyView(emptyOpts, params));
|
|
7462
7489
|
}
|
|
7463
7490
|
}
|
|
7464
|
-
return (0, _utils.getFuncText)(props.emptyText) ||
|
|
7491
|
+
return (0, _utils.getFuncText)(props.emptyText) || getI18n('vxe.table.emptyText');
|
|
7465
7492
|
};
|
|
7466
7493
|
function handleUupdateResize() {
|
|
7467
7494
|
const el = refElem.value;
|
|
@@ -7502,7 +7529,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
|
|
|
7502
7529
|
// log.warn('vxe.error.checkProp', ['checkbox-config.checkField'])
|
|
7503
7530
|
// }
|
|
7504
7531
|
if ((scrollXLoad || scrollYLoad) && expandColumn) {
|
|
7505
|
-
|
|
7532
|
+
log.warn('vxe.error.scrollErrProp', ['column.type=expand']);
|
|
7506
7533
|
}
|
|
7507
7534
|
}
|
|
7508
7535
|
tableMethods.recalculate();
|
|
@@ -7603,7 +7630,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
|
|
|
7603
7630
|
}
|
|
7604
7631
|
});
|
|
7605
7632
|
});
|
|
7606
|
-
|
|
7633
|
+
hooks.forEach(options => {
|
|
7607
7634
|
const {
|
|
7608
7635
|
setupTable
|
|
7609
7636
|
} = options;
|
|
@@ -7650,28 +7677,28 @@ var _default = exports.default = (0, _vue.defineComponent)({
|
|
|
7650
7677
|
const rowOpts = computeRowOpts.value;
|
|
7651
7678
|
if (process.env.NODE_ENV === 'development') {
|
|
7652
7679
|
if (props.rowId) {
|
|
7653
|
-
|
|
7680
|
+
log.warn('vxe.error.delProp', ['row-id', 'row-config.keyField']);
|
|
7654
7681
|
}
|
|
7655
7682
|
if (props.rowKey) {
|
|
7656
|
-
|
|
7683
|
+
log.warn('vxe.error.delProp', ['row-key', 'row-config.useKey']);
|
|
7657
7684
|
}
|
|
7658
7685
|
if (props.columnKey) {
|
|
7659
|
-
|
|
7686
|
+
log.warn('vxe.error.delProp', ['column-id', 'column-config.useKey']);
|
|
7660
7687
|
}
|
|
7661
7688
|
if (!(props.rowId || rowOpts.keyField) && (checkboxOpts.reserve || checkboxOpts.checkRowKeys || radioOpts.reserve || radioOpts.checkRowKey || expandOpts.expandRowKeys || treeOpts.expandRowKeys)) {
|
|
7662
|
-
|
|
7689
|
+
log.warn('vxe.error.reqProp', ['row-config.keyField']);
|
|
7663
7690
|
}
|
|
7664
7691
|
if (props.editConfig && (editOpts.showStatus || editOpts.showUpdateStatus || editOpts.showInsertStatus) && !props.keepSource) {
|
|
7665
|
-
|
|
7692
|
+
log.warn('vxe.error.reqProp', ['keep-source']);
|
|
7666
7693
|
}
|
|
7667
7694
|
if (treeConfig && (treeOpts.showLine || treeOpts.line) && (!(props.rowKey || rowOpts.useKey) || !showOverflow)) {
|
|
7668
|
-
|
|
7695
|
+
log.warn('vxe.error.reqProp', ['row-config.useKey | show-overflow']);
|
|
7669
7696
|
}
|
|
7670
7697
|
if (treeConfig && props.stripe) {
|
|
7671
|
-
|
|
7698
|
+
log.warn('vxe.error.noTree', ['stripe']);
|
|
7672
7699
|
}
|
|
7673
7700
|
if (props.showFooter && !(props.footerMethod || props.footerData)) {
|
|
7674
|
-
|
|
7701
|
+
log.warn('vxe.error.reqProp', ['footer-data | footer-method']);
|
|
7675
7702
|
}
|
|
7676
7703
|
// if (props.highlightCurrentRow) {
|
|
7677
7704
|
// log.warn('vxe.error.delProp', ['highlight-current-row', 'row-config.isCurrent'])
|
|
@@ -7693,10 +7720,10 @@ var _default = exports.default = (0, _vue.defineComponent)({
|
|
|
7693
7720
|
const exportOpts = computeExportOpts.value;
|
|
7694
7721
|
const importOpts = computeImportOpts.value;
|
|
7695
7722
|
if (importConfig && importOpts.types && !importOpts.importMethod && !_xeUtils.default.includeArrays(_xeUtils.default.keys(importOpts._typeMaps), importOpts.types)) {
|
|
7696
|
-
|
|
7723
|
+
log.warn('vxe.error.errProp', [`export-config.types=${importOpts.types.join(',')}`, importOpts.types.filter(type => _xeUtils.default.includes(_xeUtils.default.keys(importOpts._typeMaps), type)).join(',') || _xeUtils.default.keys(importOpts._typeMaps).join(',')]);
|
|
7697
7724
|
}
|
|
7698
7725
|
if (exportConfig && exportOpts.types && !exportOpts.exportMethod && !_xeUtils.default.includeArrays(_xeUtils.default.keys(exportOpts._typeMaps), exportOpts.types)) {
|
|
7699
|
-
|
|
7726
|
+
log.warn('vxe.error.errProp', [`export-config.types=${exportOpts.types.join(',')}`, exportOpts.types.filter(type => _xeUtils.default.includes(_xeUtils.default.keys(exportOpts._typeMaps), type)).join(',') || _xeUtils.default.keys(exportOpts._typeMaps).join(',')]);
|
|
7700
7727
|
}
|
|
7701
7728
|
}
|
|
7702
7729
|
if (process.env.NODE_ENV === 'development') {
|
|
@@ -7704,64 +7731,64 @@ var _default = exports.default = (0, _vue.defineComponent)({
|
|
|
7704
7731
|
const mouseOpts = computeMouseOpts.value;
|
|
7705
7732
|
const rowOpts = computeRowOpts.value;
|
|
7706
7733
|
if (!props.id && props.customConfig && (customOpts.storage === true || customOpts.storage && customOpts.storage.resizable || customOpts.storage && customOpts.storage.visible)) {
|
|
7707
|
-
|
|
7734
|
+
log.err('vxe.error.reqProp', ['id']);
|
|
7708
7735
|
}
|
|
7709
7736
|
if (props.treeConfig && checkboxOpts.range) {
|
|
7710
|
-
|
|
7737
|
+
log.err('vxe.error.noTree', ['checkbox-config.range']);
|
|
7711
7738
|
}
|
|
7712
7739
|
if (rowOpts.height && !props.showOverflow) {
|
|
7713
|
-
|
|
7740
|
+
log.warn('vxe.error.notProp', ['table.show-overflow']);
|
|
7714
7741
|
}
|
|
7715
7742
|
if (!$xeTable.handleUpdateCellAreas) {
|
|
7716
7743
|
if (props.clipConfig) {
|
|
7717
|
-
|
|
7744
|
+
log.warn('vxe.error.notProp', ['clip-config']);
|
|
7718
7745
|
}
|
|
7719
7746
|
if (props.fnrConfig) {
|
|
7720
|
-
|
|
7747
|
+
log.warn('vxe.error.notProp', ['fnr-config']);
|
|
7721
7748
|
}
|
|
7722
7749
|
if (mouseOpts.area) {
|
|
7723
|
-
|
|
7750
|
+
log.err('vxe.error.notProp', ['mouse-config.area']);
|
|
7724
7751
|
return;
|
|
7725
7752
|
}
|
|
7726
7753
|
}
|
|
7727
7754
|
if (props.treeConfig && treeOpts.children) {
|
|
7728
|
-
|
|
7755
|
+
log.warn('vxe.error.delProp', ['tree-config.children', 'tree-config.childrenField']);
|
|
7729
7756
|
}
|
|
7730
7757
|
if (props.treeConfig && treeOpts.line) {
|
|
7731
|
-
|
|
7758
|
+
log.warn('vxe.error.delProp', ['tree-config.line', 'tree-config.showLine']);
|
|
7732
7759
|
}
|
|
7733
7760
|
if (mouseOpts.area && mouseOpts.selected) {
|
|
7734
|
-
|
|
7761
|
+
log.warn('vxe.error.errConflicts', ['mouse-config.area', 'mouse-config.selected']);
|
|
7735
7762
|
}
|
|
7736
7763
|
if (mouseOpts.area && checkboxOpts.range) {
|
|
7737
|
-
|
|
7764
|
+
log.warn('vxe.error.errConflicts', ['mouse-config.area', 'checkbox-config.range']);
|
|
7738
7765
|
}
|
|
7739
7766
|
if (props.treeConfig && mouseOpts.area) {
|
|
7740
|
-
|
|
7767
|
+
log.err('vxe.error.noTree', ['mouse-config.area']);
|
|
7741
7768
|
}
|
|
7742
7769
|
if (props.editConfig && editOpts.activeMethod) {
|
|
7743
|
-
|
|
7770
|
+
log.warn('vxe.error.delProp', ['edit-config.activeMethod', 'edit-config.beforeEditMethod']);
|
|
7744
7771
|
}
|
|
7745
7772
|
if (props.treeConfig && checkboxOpts.isShiftKey) {
|
|
7746
|
-
|
|
7773
|
+
log.err('vxe.error.errConflicts', ['tree-config', 'checkbox-config.isShiftKey']);
|
|
7747
7774
|
}
|
|
7748
7775
|
if (checkboxOpts.halfField) {
|
|
7749
|
-
|
|
7776
|
+
log.warn('vxe.error.delProp', ['checkbox-config.halfField', 'checkbox-config.indeterminateField']);
|
|
7750
7777
|
}
|
|
7751
7778
|
}
|
|
7752
7779
|
// 检查是否有安装需要的模块
|
|
7753
7780
|
if (process.env.NODE_ENV === 'development') {
|
|
7754
7781
|
if (props.editConfig && !$xeTable.insert) {
|
|
7755
|
-
|
|
7782
|
+
log.err('vxe.error.reqModule', ['Edit']);
|
|
7756
7783
|
}
|
|
7757
7784
|
if (props.editRules && !$xeTable.validate) {
|
|
7758
|
-
|
|
7785
|
+
log.err('vxe.error.reqModule', ['Validator']);
|
|
7759
7786
|
}
|
|
7760
7787
|
if ((checkboxOpts.range || props.keyboardConfig || props.mouseConfig) && !$xeTable.triggerCellMousedownEvent) {
|
|
7761
|
-
|
|
7788
|
+
log.err('vxe.error.reqModule', ['Keyboard']);
|
|
7762
7789
|
}
|
|
7763
7790
|
if ((props.printConfig || props.importConfig || props.exportConfig) && !$xeTable.exportData) {
|
|
7764
|
-
|
|
7791
|
+
log.err('vxe.error.reqModule', ['Export']);
|
|
7765
7792
|
}
|
|
7766
7793
|
}
|
|
7767
7794
|
Object.assign(scrollYStore, {
|
|
@@ -7795,7 +7822,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
|
|
|
7795
7822
|
leading: true,
|
|
7796
7823
|
trailing: true
|
|
7797
7824
|
}) : null;
|
|
7798
|
-
resizeObserver =
|
|
7825
|
+
resizeObserver = globalResize.create(handleOptimizeResize ? () => {
|
|
7799
7826
|
if (props.autoResize) {
|
|
7800
7827
|
requestAnimationFrame(handleOptimizeResize);
|
|
7801
7828
|
}
|
|
@@ -7812,16 +7839,16 @@ var _default = exports.default = (0, _vue.defineComponent)({
|
|
|
7812
7839
|
}
|
|
7813
7840
|
}
|
|
7814
7841
|
});
|
|
7815
|
-
|
|
7816
|
-
|
|
7817
|
-
|
|
7818
|
-
|
|
7819
|
-
|
|
7820
|
-
|
|
7821
|
-
|
|
7822
|
-
|
|
7842
|
+
globalEvents.on($xeTable, 'paste', handleGlobalPasteEvent);
|
|
7843
|
+
globalEvents.on($xeTable, 'copy', handleGlobalCopyEvent);
|
|
7844
|
+
globalEvents.on($xeTable, 'cut', handleGlobalCutEvent);
|
|
7845
|
+
globalEvents.on($xeTable, 'mousedown', handleGlobalMousedownEvent);
|
|
7846
|
+
globalEvents.on($xeTable, 'blur', handleGlobalBlurEvent);
|
|
7847
|
+
globalEvents.on($xeTable, 'mousewheel', handleGlobalMousewheelEvent);
|
|
7848
|
+
globalEvents.on($xeTable, 'keydown', handleGlobalKeydownEvent);
|
|
7849
|
+
globalEvents.on($xeTable, 'resize', handleGlobalResizeEvent);
|
|
7823
7850
|
if ($xeTable.handleGlobalContextmenuEvent) {
|
|
7824
|
-
|
|
7851
|
+
globalEvents.on($xeTable, 'contextmenu', $xeTable.handleGlobalContextmenuEvent);
|
|
7825
7852
|
}
|
|
7826
7853
|
tablePrivateMethods.preventEvent(null, 'mounted', {
|
|
7827
7854
|
$table: $xeTable
|
|
@@ -7840,15 +7867,15 @@ var _default = exports.default = (0, _vue.defineComponent)({
|
|
|
7840
7867
|
});
|
|
7841
7868
|
});
|
|
7842
7869
|
(0, _vue.onUnmounted)(() => {
|
|
7843
|
-
|
|
7844
|
-
|
|
7845
|
-
|
|
7846
|
-
|
|
7847
|
-
|
|
7848
|
-
|
|
7849
|
-
|
|
7850
|
-
|
|
7851
|
-
|
|
7870
|
+
globalEvents.off($xeTable, 'paste');
|
|
7871
|
+
globalEvents.off($xeTable, 'copy');
|
|
7872
|
+
globalEvents.off($xeTable, 'cut');
|
|
7873
|
+
globalEvents.off($xeTable, 'mousedown');
|
|
7874
|
+
globalEvents.off($xeTable, 'blur');
|
|
7875
|
+
globalEvents.off($xeTable, 'mousewheel');
|
|
7876
|
+
globalEvents.off($xeTable, 'keydown');
|
|
7877
|
+
globalEvents.off($xeTable, 'resize');
|
|
7878
|
+
globalEvents.off($xeTable, 'contextmenu');
|
|
7852
7879
|
tablePrivateMethods.preventEvent(null, 'unmounted', {
|
|
7853
7880
|
$table: $xeTable
|
|
7854
7881
|
});
|
|
@@ -7906,7 +7933,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
|
|
|
7906
7933
|
[`size--${vSize}`]: vSize,
|
|
7907
7934
|
[`valid-msg--${validOpts.msgMode}`]: !!editRules,
|
|
7908
7935
|
'vxe-editable': !!editConfig,
|
|
7909
|
-
'old-cell-valid': editRules &&
|
|
7936
|
+
'old-cell-valid': editRules && getConfig().cellVaildMode === 'obsolete',
|
|
7910
7937
|
'cell--highlight': highlightCell,
|
|
7911
7938
|
'cell--selected': mouseConfig && mouseOpts.selected,
|
|
7912
7939
|
'cell--area': mouseConfig && mouseOpts.area,
|
|
@@ -8068,7 +8095,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
|
|
|
8068
8095
|
props.editRules && validOpts.showMessage && (validOpts.message === 'default' ? !height : validOpts.message === 'tooltip') ? (0, _vue.h)((0, _vue.resolveComponent)('vxe-tooltip'), Object.assign({
|
|
8069
8096
|
ref: refValidTooltip,
|
|
8070
8097
|
class: [{
|
|
8071
|
-
'old-cell-valid': editRules &&
|
|
8098
|
+
'old-cell-valid': editRules && getConfig().cellVaildMode === 'obsolete'
|
|
8072
8099
|
}, 'vxe-table--valid-error']
|
|
8073
8100
|
}, validOpts.message === 'tooltip' || tableData.length === 1 ? validTipOpts : {})) : (0, _vue.createCommentVNode)()]);
|
|
8074
8101
|
};
|