vxe-table 3.9.0 → 3.9.1
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 +80 -9
- package/es/grid/src/grid.js +4 -4
- package/es/locale/lang/en-US.js +4 -1
- package/es/locale/lang/es-ES.js +3 -0
- package/es/locale/lang/hu-HU.js +3 -0
- package/es/locale/lang/ja-JP.js +3 -0
- package/es/locale/lang/ko-KR.js +3 -0
- package/es/locale/lang/pt-BR.js +3 -0
- package/es/locale/lang/ru-RU.js +3 -0
- package/es/locale/lang/uk-UA.js +3 -0
- package/es/locale/lang/vi-VN.js +3 -0
- package/es/locale/lang/zh-CHT.js +3 -0
- package/es/locale/lang/zh-CN.js +3 -0
- package/es/style.css +1 -1
- package/es/table/module/edit/mixin.js +2 -16
- package/es/table/src/methods.js +15 -13
- package/es/table/src/table.js +28 -28
- package/es/ui/index.js +2 -2
- package/es/ui/src/log.js +1 -1
- package/lib/grid/src/grid.js +4 -4
- package/lib/grid/src/grid.min.js +1 -1
- package/lib/index.umd.js +65 -77
- package/lib/index.umd.min.js +1 -1
- package/lib/locale/lang/en-US.js +4 -1
- package/lib/locale/lang/en-US.min.js +1 -1
- package/lib/locale/lang/en-US.umd.js +4 -1
- package/lib/locale/lang/es-ES.js +3 -0
- package/lib/locale/lang/es-ES.min.js +1 -1
- package/lib/locale/lang/es-ES.umd.js +3 -0
- package/lib/locale/lang/hu-HU.js +3 -0
- package/lib/locale/lang/hu-HU.min.js +1 -1
- package/lib/locale/lang/hu-HU.umd.js +3 -0
- package/lib/locale/lang/ja-JP.js +3 -0
- package/lib/locale/lang/ja-JP.min.js +1 -1
- package/lib/locale/lang/ja-JP.umd.js +3 -0
- package/lib/locale/lang/ko-KR.js +3 -0
- package/lib/locale/lang/ko-KR.min.js +1 -1
- package/lib/locale/lang/ko-KR.umd.js +3 -0
- package/lib/locale/lang/pt-BR.js +3 -0
- package/lib/locale/lang/pt-BR.min.js +1 -1
- package/lib/locale/lang/pt-BR.umd.js +3 -0
- package/lib/locale/lang/ru-RU.js +3 -0
- package/lib/locale/lang/ru-RU.min.js +1 -1
- package/lib/locale/lang/ru-RU.umd.js +3 -0
- package/lib/locale/lang/uk-UA.js +3 -0
- package/lib/locale/lang/uk-UA.min.js +1 -1
- package/lib/locale/lang/uk-UA.umd.js +3 -0
- package/lib/locale/lang/vi-VN.js +3 -0
- package/lib/locale/lang/vi-VN.min.js +1 -1
- package/lib/locale/lang/zh-CHT.js +3 -0
- package/lib/locale/lang/zh-CHT.min.js +1 -1
- package/lib/locale/lang/zh-CHT.umd.js +3 -0
- package/lib/locale/lang/zh-CN.js +3 -0
- package/lib/locale/lang/zh-CN.min.js +1 -1
- package/lib/locale/lang/zh-CN.umd.js +3 -0
- package/lib/style.css +1 -1
- package/lib/table/module/edit/mixin.js +2 -16
- package/lib/table/module/edit/mixin.min.js +1 -1
- package/lib/table/src/methods.js +25 -26
- package/lib/table/src/methods.min.js +1 -1
- package/lib/table/src/table.js +28 -28
- package/lib/table/src/table.min.js +1 -1
- package/lib/ui/index.js +2 -2
- package/lib/ui/index.min.js +1 -1
- package/lib/ui/src/log.js +1 -1
- package/lib/ui/src/log.min.js +1 -1
- package/package.json +2 -2
- package/packages/grid/src/grid.ts +4 -4
- package/packages/locale/lang/en-US.ts +4 -1
- package/packages/locale/lang/es-ES.ts +3 -0
- package/packages/locale/lang/hu-HU.ts +3 -0
- package/packages/locale/lang/ja-JP.ts +3 -0
- package/packages/locale/lang/ko-KR.ts +3 -0
- package/packages/locale/lang/pt-BR.ts +3 -0
- package/packages/locale/lang/ru-RU.ts +3 -0
- package/packages/locale/lang/uk-UA.ts +3 -0
- package/packages/locale/lang/vi-VN.ts +3 -0
- package/packages/locale/lang/zh-CHT.ts +3 -0
- package/packages/locale/lang/zh-CN.ts +3 -0
- package/packages/table/module/edit/mixin.ts +2 -16
- package/packages/table/src/methods.ts +17 -13
- package/packages/table/src/table.ts +28 -28
- /package/es/{iconfont.1728348263835.ttf → iconfont.1728483486168.ttf} +0 -0
- /package/es/{iconfont.1728348263835.woff → iconfont.1728483486168.woff} +0 -0
- /package/es/{iconfont.1728348263835.woff2 → iconfont.1728483486168.woff2} +0 -0
- /package/lib/{iconfont.1728348263835.ttf → iconfont.1728483486168.ttf} +0 -0
- /package/lib/{iconfont.1728348263835.woff → iconfont.1728483486168.woff} +0 -0
- /package/lib/{iconfont.1728348263835.woff2 → iconfont.1728483486168.woff2} +0 -0
package/lib/index.umd.js
CHANGED
|
@@ -2220,9 +2220,9 @@ function getClass(property, params) {
|
|
|
2220
2220
|
;// CONCATENATED MODULE: ./packages/ui/index.ts
|
|
2221
2221
|
|
|
2222
2222
|
|
|
2223
|
-
const version = "3.9.
|
|
2223
|
+
const version = "3.9.1";
|
|
2224
2224
|
core_.VxeUI.version = version;
|
|
2225
|
-
core_.VxeUI.tableVersion = "3.9.
|
|
2225
|
+
core_.VxeUI.tableVersion = "3.9.1";
|
|
2226
2226
|
core_.VxeUI.setConfig({
|
|
2227
2227
|
emptyCell: ' ',
|
|
2228
2228
|
table: {
|
|
@@ -2764,7 +2764,7 @@ function isNodeElement(elem) {
|
|
|
2764
2764
|
const {
|
|
2765
2765
|
log: log_log
|
|
2766
2766
|
} = core_.VxeUI;
|
|
2767
|
-
const log_version = `table v${"3.9.
|
|
2767
|
+
const log_version = `table v${"3.9.1"}`;
|
|
2768
2768
|
const warnLog = log_log.create('warn', log_version);
|
|
2769
2769
|
const errLog = log_log.create('error', log_version);
|
|
2770
2770
|
;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
|
|
@@ -5389,23 +5389,21 @@ const Methods = {
|
|
|
5389
5389
|
* 更新数据行的 Map
|
|
5390
5390
|
* 牺牲数据组装的耗时,用来换取使用过程中的流畅
|
|
5391
5391
|
*/
|
|
5392
|
-
cacheRowMap(
|
|
5392
|
+
cacheRowMap(isSource) {
|
|
5393
5393
|
const {
|
|
5394
5394
|
treeConfig,
|
|
5395
5395
|
treeOpts,
|
|
5396
5396
|
tableFullData,
|
|
5397
|
-
|
|
5397
|
+
fullAllDataRowIdData,
|
|
5398
5398
|
fullAllDataRowMap,
|
|
5399
5399
|
tableFullTreeData
|
|
5400
5400
|
} = this;
|
|
5401
|
-
let {
|
|
5402
|
-
fullDataRowIdData,
|
|
5403
|
-
fullAllDataRowIdData
|
|
5404
|
-
} = this;
|
|
5405
5401
|
const childrenField = treeOpts.children || treeOpts.childrenField;
|
|
5406
5402
|
const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
|
|
5407
5403
|
const rowkey = getRowkey(this);
|
|
5408
5404
|
const isLazy = treeConfig && treeOpts.lazy;
|
|
5405
|
+
const fullAllDataRowIdMaps = {};
|
|
5406
|
+
const fullDataRowIdMaps = {};
|
|
5409
5407
|
const handleCache = (row, index, items, path, parent, nodes) => {
|
|
5410
5408
|
let rowid = getRowid(this, row);
|
|
5411
5409
|
const seq = treeConfig && path ? toTreePathSeq(path) : index + 1;
|
|
@@ -5417,29 +5415,30 @@ const Methods = {
|
|
|
5417
5415
|
if (isLazy && row[hasChildField] && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(row[childrenField])) {
|
|
5418
5416
|
row[childrenField] = null;
|
|
5419
5417
|
}
|
|
5420
|
-
|
|
5421
|
-
|
|
5422
|
-
|
|
5423
|
-
|
|
5424
|
-
|
|
5425
|
-
|
|
5426
|
-
|
|
5427
|
-
|
|
5428
|
-
|
|
5429
|
-
|
|
5430
|
-
|
|
5431
|
-
|
|
5432
|
-
|
|
5433
|
-
fullDataRowMap.set(row, rest);
|
|
5418
|
+
let cacheItem = fullAllDataRowIdData[rowid];
|
|
5419
|
+
if (!cacheItem) {
|
|
5420
|
+
cacheItem = {
|
|
5421
|
+
row,
|
|
5422
|
+
rowid,
|
|
5423
|
+
seq,
|
|
5424
|
+
index: -1,
|
|
5425
|
+
_index: -1,
|
|
5426
|
+
$index: -1,
|
|
5427
|
+
items,
|
|
5428
|
+
parent,
|
|
5429
|
+
level
|
|
5430
|
+
};
|
|
5434
5431
|
}
|
|
5435
|
-
|
|
5436
|
-
|
|
5432
|
+
if (isSource) {
|
|
5433
|
+
cacheItem.index = treeConfig && parent ? -1 : index;
|
|
5434
|
+
fullDataRowIdMaps[rowid] = cacheItem;
|
|
5435
|
+
}
|
|
5436
|
+
fullAllDataRowIdMaps[rowid] = cacheItem;
|
|
5437
5437
|
};
|
|
5438
|
-
if (
|
|
5439
|
-
|
|
5440
|
-
fullDataRowMap.clear();
|
|
5438
|
+
if (isSource) {
|
|
5439
|
+
this.fullDataRowIdData = fullDataRowIdMaps;
|
|
5441
5440
|
}
|
|
5442
|
-
|
|
5441
|
+
this.fullAllDataRowIdData = fullAllDataRowIdMaps;
|
|
5443
5442
|
fullAllDataRowMap.clear();
|
|
5444
5443
|
if (treeConfig) {
|
|
5445
5444
|
external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(tableFullTreeData, handleCache, {
|
|
@@ -16654,24 +16653,10 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
|
|
|
16654
16653
|
}
|
|
16655
16654
|
});
|
|
16656
16655
|
}
|
|
16657
|
-
this.emitEvent(type,
|
|
16658
|
-
row,
|
|
16659
|
-
rowIndex: this.getRowIndex(row),
|
|
16660
|
-
$rowIndex: this.getVMRowIndex(row),
|
|
16661
|
-
column,
|
|
16662
|
-
columnIndex: this.getColumnIndex(column),
|
|
16663
|
-
$columnIndex: this.getVMColumnIndex(column)
|
|
16664
|
-
}, evnt);
|
|
16656
|
+
this.emitEvent(type, params, evnt);
|
|
16665
16657
|
// v4已废弃
|
|
16666
16658
|
if (type === 'edit-activated') {
|
|
16667
|
-
this.emitEvent('edit-actived',
|
|
16668
|
-
row,
|
|
16669
|
-
rowIndex: this.getRowIndex(row),
|
|
16670
|
-
$rowIndex: this.getVMRowIndex(row),
|
|
16671
|
-
column,
|
|
16672
|
-
columnIndex: this.getColumnIndex(column),
|
|
16673
|
-
$columnIndex: this.getVMColumnIndex(column)
|
|
16674
|
-
}, evnt);
|
|
16659
|
+
this.emitEvent('edit-actived', params, evnt);
|
|
16675
16660
|
}
|
|
16676
16661
|
} else {
|
|
16677
16662
|
const {
|
|
@@ -20330,19 +20315,19 @@ function handleUupdateResize(_vm) {
|
|
|
20330
20315
|
computeValidOpts() {
|
|
20331
20316
|
return Object.assign({
|
|
20332
20317
|
message: 'default'
|
|
20333
|
-
},
|
|
20318
|
+
}, table_getConfig().table.validConfig, this.validConfig);
|
|
20334
20319
|
},
|
|
20335
20320
|
sXOpts() {
|
|
20336
20321
|
return this.computeSXOpts;
|
|
20337
20322
|
},
|
|
20338
20323
|
computeSXOpts() {
|
|
20339
|
-
return Object.assign({},
|
|
20324
|
+
return Object.assign({}, table_getConfig().table.scrollX, this.scrollX);
|
|
20340
20325
|
},
|
|
20341
20326
|
sYOpts() {
|
|
20342
20327
|
return this.computeSYOpts;
|
|
20343
20328
|
},
|
|
20344
20329
|
computeSYOpts() {
|
|
20345
|
-
return Object.assign({},
|
|
20330
|
+
return Object.assign({}, table_getConfig().table.scrollY, this.scrollY);
|
|
20346
20331
|
},
|
|
20347
20332
|
rowHeightMaps() {
|
|
20348
20333
|
return {
|
|
@@ -20356,25 +20341,25 @@ function handleUupdateResize(_vm) {
|
|
|
20356
20341
|
return this.computeColumnOpts;
|
|
20357
20342
|
},
|
|
20358
20343
|
computeColumnOpts() {
|
|
20359
|
-
return Object.assign({},
|
|
20344
|
+
return Object.assign({}, table_getConfig().table.columnConfig, this.columnConfig);
|
|
20360
20345
|
},
|
|
20361
20346
|
rowOpts() {
|
|
20362
20347
|
return this.computeRowOpts;
|
|
20363
20348
|
},
|
|
20364
20349
|
computeRowOpts() {
|
|
20365
|
-
return Object.assign({},
|
|
20350
|
+
return Object.assign({}, table_getConfig().table.rowConfig, this.rowConfig);
|
|
20366
20351
|
},
|
|
20367
20352
|
resizeOpts() {
|
|
20368
20353
|
return this.computeResizeOpts;
|
|
20369
20354
|
},
|
|
20370
20355
|
computeResizeOpts() {
|
|
20371
|
-
return Object.assign({},
|
|
20356
|
+
return Object.assign({}, table_getConfig().table.resizeConfig, this.resizeConfig);
|
|
20372
20357
|
},
|
|
20373
20358
|
resizableOpts() {
|
|
20374
20359
|
return this.computeResizableOpts;
|
|
20375
20360
|
},
|
|
20376
20361
|
computeResizableOpts() {
|
|
20377
|
-
return Object.assign({},
|
|
20362
|
+
return Object.assign({}, table_getConfig().table.resizableConfig, this.resizableConfig);
|
|
20378
20363
|
},
|
|
20379
20364
|
seqOpts() {
|
|
20380
20365
|
return this.computeSeqOpts;
|
|
@@ -20382,25 +20367,25 @@ function handleUupdateResize(_vm) {
|
|
|
20382
20367
|
computeSeqOpts() {
|
|
20383
20368
|
return Object.assign({
|
|
20384
20369
|
startIndex: 0
|
|
20385
|
-
},
|
|
20370
|
+
}, table_getConfig().table.seqConfig, this.seqConfig);
|
|
20386
20371
|
},
|
|
20387
20372
|
radioOpts() {
|
|
20388
20373
|
return this.computeRadioOpts;
|
|
20389
20374
|
},
|
|
20390
20375
|
computeRadioOpts() {
|
|
20391
|
-
return Object.assign({},
|
|
20376
|
+
return Object.assign({}, table_getConfig().table.radioConfig, this.radioConfig);
|
|
20392
20377
|
},
|
|
20393
20378
|
checkboxOpts() {
|
|
20394
20379
|
return this.computeCheckboxOpts;
|
|
20395
20380
|
},
|
|
20396
20381
|
computeCheckboxOpts() {
|
|
20397
|
-
return Object.assign({},
|
|
20382
|
+
return Object.assign({}, table_getConfig().table.checkboxConfig, this.checkboxConfig);
|
|
20398
20383
|
},
|
|
20399
20384
|
tooltipOpts() {
|
|
20400
20385
|
return this.computeTooltipOpts;
|
|
20401
20386
|
},
|
|
20402
20387
|
computeTooltipOpts() {
|
|
20403
|
-
return Object.assign({},
|
|
20388
|
+
return Object.assign({}, table_getConfig().tooltip, table_getConfig().table.tooltipConfig, this.tooltipConfig);
|
|
20404
20389
|
},
|
|
20405
20390
|
tipConfig() {
|
|
20406
20391
|
return {
|
|
@@ -20416,7 +20401,7 @@ function handleUupdateResize(_vm) {
|
|
|
20416
20401
|
return this.computeEditOpts;
|
|
20417
20402
|
},
|
|
20418
20403
|
computeEditOpts() {
|
|
20419
|
-
return Object.assign({},
|
|
20404
|
+
return Object.assign({}, table_getConfig().table.editConfig, this.editConfig);
|
|
20420
20405
|
},
|
|
20421
20406
|
sortOpts() {
|
|
20422
20407
|
return this.computeSortOpts;
|
|
@@ -20424,43 +20409,43 @@ function handleUupdateResize(_vm) {
|
|
|
20424
20409
|
computeSortOpts() {
|
|
20425
20410
|
return Object.assign({
|
|
20426
20411
|
orders: ['asc', 'desc', null]
|
|
20427
|
-
},
|
|
20412
|
+
}, table_getConfig().table.sortConfig, this.sortConfig);
|
|
20428
20413
|
},
|
|
20429
20414
|
filterOpts() {
|
|
20430
20415
|
return this.computeFilterOpts;
|
|
20431
20416
|
},
|
|
20432
20417
|
computeFilterOpts() {
|
|
20433
|
-
return Object.assign({},
|
|
20418
|
+
return Object.assign({}, table_getConfig().table.filterConfig, this.filterConfig);
|
|
20434
20419
|
},
|
|
20435
20420
|
mouseOpts() {
|
|
20436
20421
|
return this.computeMouseOpts;
|
|
20437
20422
|
},
|
|
20438
20423
|
computeMouseOpts() {
|
|
20439
|
-
return Object.assign({},
|
|
20424
|
+
return Object.assign({}, table_getConfig().table.mouseConfig, this.mouseConfig);
|
|
20440
20425
|
},
|
|
20441
20426
|
areaOpts() {
|
|
20442
20427
|
return this.computeAreaOpts;
|
|
20443
20428
|
},
|
|
20444
20429
|
computeAreaOpts() {
|
|
20445
|
-
return Object.assign({},
|
|
20430
|
+
return Object.assign({}, table_getConfig().table.areaConfig, this.areaConfig);
|
|
20446
20431
|
},
|
|
20447
20432
|
keyboardOpts() {
|
|
20448
20433
|
return this.computeKeyboardOpts;
|
|
20449
20434
|
},
|
|
20450
20435
|
computeKeyboardOpts() {
|
|
20451
|
-
return Object.assign({},
|
|
20436
|
+
return Object.assign({}, table_getConfig().table.keyboardConfig, this.keyboardConfig);
|
|
20452
20437
|
},
|
|
20453
20438
|
clipOpts() {
|
|
20454
20439
|
return this.computeClipOpts;
|
|
20455
20440
|
},
|
|
20456
20441
|
computeClipOpts() {
|
|
20457
|
-
return Object.assign({},
|
|
20442
|
+
return Object.assign({}, table_getConfig().table.clipConfig, this.clipConfig);
|
|
20458
20443
|
},
|
|
20459
20444
|
fnrOpts() {
|
|
20460
20445
|
return this.computeFNROpts;
|
|
20461
20446
|
},
|
|
20462
20447
|
computeFNROpts() {
|
|
20463
|
-
return Object.assign({},
|
|
20448
|
+
return Object.assign({}, table_getConfig().table.fnrConfig, this.fnrConfig);
|
|
20464
20449
|
},
|
|
20465
20450
|
headerCtxMenu() {
|
|
20466
20451
|
const headerOpts = this.ctxMenuOpts.header;
|
|
@@ -20490,49 +20475,49 @@ function handleUupdateResize(_vm) {
|
|
|
20490
20475
|
return this.computeMenuOpts;
|
|
20491
20476
|
},
|
|
20492
20477
|
computeMenuOpts() {
|
|
20493
|
-
return Object.assign({},
|
|
20478
|
+
return Object.assign({}, table_getConfig().table.menuConfig, this.contextMenu, this.menuConfig);
|
|
20494
20479
|
},
|
|
20495
20480
|
exportOpts() {
|
|
20496
20481
|
return this.computeExportOpts;
|
|
20497
20482
|
},
|
|
20498
20483
|
computeExportOpts() {
|
|
20499
|
-
return Object.assign({},
|
|
20484
|
+
return Object.assign({}, table_getConfig().table.exportConfig, this.exportConfig);
|
|
20500
20485
|
},
|
|
20501
20486
|
importOpts() {
|
|
20502
20487
|
return this.computeImportOpts;
|
|
20503
20488
|
},
|
|
20504
20489
|
computeImportOpts() {
|
|
20505
|
-
return Object.assign({},
|
|
20490
|
+
return Object.assign({}, table_getConfig().table.importConfig, this.importConfig);
|
|
20506
20491
|
},
|
|
20507
20492
|
printOpts() {
|
|
20508
20493
|
return this.computePrintOpts;
|
|
20509
20494
|
},
|
|
20510
20495
|
computePrintOpts() {
|
|
20511
|
-
return Object.assign({},
|
|
20496
|
+
return Object.assign({}, table_getConfig().table.printConfig, this.printConfig);
|
|
20512
20497
|
},
|
|
20513
20498
|
expandOpts() {
|
|
20514
20499
|
return this.computeExpandOpts;
|
|
20515
20500
|
},
|
|
20516
20501
|
computeExpandOpts() {
|
|
20517
|
-
return Object.assign({},
|
|
20502
|
+
return Object.assign({}, table_getConfig().table.expandConfig, this.expandConfig);
|
|
20518
20503
|
},
|
|
20519
20504
|
treeOpts() {
|
|
20520
20505
|
return this.computeTreeOpts;
|
|
20521
20506
|
},
|
|
20522
20507
|
computeTreeOpts() {
|
|
20523
|
-
return Object.assign({},
|
|
20508
|
+
return Object.assign({}, table_getConfig().table.treeConfig, this.treeConfig);
|
|
20524
20509
|
},
|
|
20525
20510
|
emptyOpts() {
|
|
20526
20511
|
return this.computeEmptyOpts;
|
|
20527
20512
|
},
|
|
20528
20513
|
computeEmptyOpts() {
|
|
20529
|
-
return Object.assign({},
|
|
20514
|
+
return Object.assign({}, table_getConfig().table.emptyRender, this.emptyRender);
|
|
20530
20515
|
},
|
|
20531
20516
|
loadingOpts() {
|
|
20532
20517
|
return this.computeLoadingOpts;
|
|
20533
20518
|
},
|
|
20534
20519
|
computeLoadingOpts() {
|
|
20535
|
-
return Object.assign({},
|
|
20520
|
+
return Object.assign({}, table_getConfig().table.loadingConfig, this.loadingConfig);
|
|
20536
20521
|
},
|
|
20537
20522
|
cellOffsetWidth() {
|
|
20538
20523
|
return this.border ? Math.max(2, Math.ceil(this.scrollbarWidth / this.tableColumn.length)) : 1;
|
|
@@ -20541,7 +20526,7 @@ function handleUupdateResize(_vm) {
|
|
|
20541
20526
|
return this.computeCustomOpts;
|
|
20542
20527
|
},
|
|
20543
20528
|
computeCustomOpts() {
|
|
20544
|
-
return Object.assign({},
|
|
20529
|
+
return Object.assign({}, table_getConfig().table.customConfig, this.customConfig);
|
|
20545
20530
|
},
|
|
20546
20531
|
autoWidthColumnList() {
|
|
20547
20532
|
const {
|
|
@@ -22472,25 +22457,25 @@ Object.keys(table.methods).forEach(name => {
|
|
|
22472
22457
|
return this.computePagerOpts;
|
|
22473
22458
|
},
|
|
22474
22459
|
computePagerOpts() {
|
|
22475
|
-
return Object.assign({},
|
|
22460
|
+
return Object.assign({}, grid_getConfig().grid.pagerConfig, this.pagerConfig);
|
|
22476
22461
|
},
|
|
22477
22462
|
formOpts() {
|
|
22478
22463
|
return this.computeFormOpts;
|
|
22479
22464
|
},
|
|
22480
22465
|
computeFormOpts() {
|
|
22481
|
-
return Object.assign({},
|
|
22466
|
+
return Object.assign({}, grid_getConfig().grid.formConfig, this.formConfig);
|
|
22482
22467
|
},
|
|
22483
22468
|
toolbarOpts() {
|
|
22484
22469
|
return this.computeToolbarOpts;
|
|
22485
22470
|
},
|
|
22486
22471
|
computeToolbarOpts() {
|
|
22487
|
-
return Object.assign({},
|
|
22472
|
+
return Object.assign({}, grid_getConfig().grid.toolbarConfig, this.toolbarConfig || this.toolbar);
|
|
22488
22473
|
},
|
|
22489
22474
|
zoomOpts() {
|
|
22490
22475
|
return this.computeZoomOpts;
|
|
22491
22476
|
},
|
|
22492
22477
|
computeZoomOpts() {
|
|
22493
|
-
return Object.assign({},
|
|
22478
|
+
return Object.assign({}, grid_getConfig().grid.zoomConfig, this.zoomConfig);
|
|
22494
22479
|
},
|
|
22495
22480
|
renderStyle() {
|
|
22496
22481
|
return this.isZMax ? {
|
|
@@ -24909,6 +24894,9 @@ const Toolbar = VxeToolbar;
|
|
|
24909
24894
|
fileTitle: '上传文件'
|
|
24910
24895
|
}
|
|
24911
24896
|
},
|
|
24897
|
+
empty: {
|
|
24898
|
+
defText: '暂无数据'
|
|
24899
|
+
},
|
|
24912
24900
|
formDesign: {
|
|
24913
24901
|
formName: '表单名称',
|
|
24914
24902
|
defFormTitle: '未命名的表单',
|