vxe-table 3.14.3 → 3.14.5
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/locale/lang/ar-EG.js +4 -1
- package/es/locale/lang/de-DE.js +4 -1
- package/es/locale/lang/en-US.js +8 -5
- package/es/locale/lang/es-ES.js +4 -1
- package/es/locale/lang/fr-FR.js +4 -1
- package/es/locale/lang/hu-HU.js +4 -1
- package/es/locale/lang/hy-AM.js +4 -1
- package/es/locale/lang/id-ID.js +4 -1
- package/es/locale/lang/it-IT.js +4 -1
- package/es/locale/lang/ja-JP.js +4 -1
- package/es/locale/lang/ko-KR.js +4 -1
- package/es/locale/lang/nb-NO.js +4 -1
- package/es/locale/lang/pt-BR.js +4 -1
- package/es/locale/lang/ru-RU.js +4 -1
- package/es/locale/lang/th-TH.js +4 -1
- package/es/locale/lang/ug-CN.js +4 -1
- package/es/locale/lang/uk-UA.js +4 -1
- package/es/locale/lang/vi-VN.js +4 -1
- package/es/locale/lang/zh-CHT.js +4 -1
- package/es/locale/lang/zh-CN.js +4 -1
- package/es/style.css +1 -1
- package/es/table/module/export/export-panel.js +32 -17
- package/es/table/module/export/mixin.js +3 -1
- package/es/table/module/keyboard/mixin.js +27 -9
- package/es/table/src/methods.js +44 -42
- package/es/table/src/table.js +50 -17
- package/es/ui/index.js +1 -1
- package/es/ui/src/log.js +1 -1
- package/lib/index.umd.js +165 -90
- package/lib/index.umd.min.js +1 -1
- package/lib/locale/lang/ar-EG.js +4 -1
- package/lib/locale/lang/ar-EG.min.js +1 -1
- package/lib/locale/lang/de-DE.js +4 -1
- package/lib/locale/lang/de-DE.min.js +1 -1
- package/lib/locale/lang/en-US.js +8 -5
- package/lib/locale/lang/en-US.min.js +1 -1
- package/lib/locale/lang/en-US.umd.js +8 -5
- package/lib/locale/lang/es-ES.js +4 -1
- package/lib/locale/lang/es-ES.min.js +1 -1
- package/lib/locale/lang/es-ES.umd.js +4 -1
- package/lib/locale/lang/fr-FR.js +4 -1
- package/lib/locale/lang/fr-FR.min.js +1 -1
- package/lib/locale/lang/hu-HU.js +4 -1
- package/lib/locale/lang/hu-HU.min.js +1 -1
- package/lib/locale/lang/hu-HU.umd.js +4 -1
- package/lib/locale/lang/hy-AM.js +4 -1
- package/lib/locale/lang/hy-AM.min.js +1 -1
- package/lib/locale/lang/id-ID.js +4 -1
- package/lib/locale/lang/id-ID.min.js +1 -1
- package/lib/locale/lang/it-IT.js +4 -1
- package/lib/locale/lang/it-IT.min.js +1 -1
- package/lib/locale/lang/ja-JP.js +4 -1
- package/lib/locale/lang/ja-JP.min.js +1 -1
- package/lib/locale/lang/ja-JP.umd.js +4 -1
- package/lib/locale/lang/ko-KR.js +4 -1
- package/lib/locale/lang/ko-KR.min.js +1 -1
- package/lib/locale/lang/ko-KR.umd.js +4 -1
- package/lib/locale/lang/nb-NO.js +4 -1
- package/lib/locale/lang/nb-NO.min.js +1 -1
- package/lib/locale/lang/pt-BR.js +4 -1
- package/lib/locale/lang/pt-BR.min.js +1 -1
- package/lib/locale/lang/pt-BR.umd.js +4 -1
- package/lib/locale/lang/ru-RU.js +4 -1
- package/lib/locale/lang/ru-RU.min.js +1 -1
- package/lib/locale/lang/ru-RU.umd.js +4 -1
- package/lib/locale/lang/th-TH.js +4 -1
- package/lib/locale/lang/th-TH.min.js +1 -1
- package/lib/locale/lang/ug-CN.js +4 -1
- package/lib/locale/lang/ug-CN.min.js +1 -1
- package/lib/locale/lang/uk-UA.js +4 -1
- package/lib/locale/lang/uk-UA.min.js +1 -1
- package/lib/locale/lang/uk-UA.umd.js +4 -1
- package/lib/locale/lang/vi-VN.js +4 -1
- package/lib/locale/lang/vi-VN.min.js +1 -1
- package/lib/locale/lang/zh-CHT.js +4 -1
- package/lib/locale/lang/zh-CHT.min.js +1 -1
- package/lib/locale/lang/zh-CHT.umd.js +4 -1
- package/lib/locale/lang/zh-CN.js +4 -1
- package/lib/locale/lang/zh-CN.min.js +1 -1
- package/lib/locale/lang/zh-CN.umd.js +4 -1
- package/lib/style.css +1 -1
- package/lib/table/module/export/export-panel.js +29 -17
- package/lib/table/module/export/export-panel.min.js +1 -1
- package/lib/table/module/export/mixin.js +3 -1
- package/lib/table/module/export/mixin.min.js +1 -1
- package/lib/table/module/keyboard/mixin.js +28 -9
- package/lib/table/module/keyboard/mixin.min.js +1 -1
- package/lib/table/src/methods.js +47 -43
- package/lib/table/src/methods.min.js +1 -1
- package/lib/table/src/table.js +52 -17
- package/lib/table/src/table.min.js +1 -1
- package/lib/ui/index.js +1 -1
- 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/locale/lang/ar-EG.ts +4 -1
- package/packages/locale/lang/de-DE.ts +4 -1
- package/packages/locale/lang/en-US.ts +8 -5
- package/packages/locale/lang/es-ES.ts +4 -1
- package/packages/locale/lang/fr-FR.ts +4 -1
- package/packages/locale/lang/hu-HU.ts +4 -1
- package/packages/locale/lang/hy-AM.ts +4 -1
- package/packages/locale/lang/id-ID.ts +4 -1
- package/packages/locale/lang/it-IT.ts +4 -1
- package/packages/locale/lang/ja-JP.ts +4 -1
- package/packages/locale/lang/ko-KR.ts +4 -1
- package/packages/locale/lang/nb-NO.ts +4 -1
- package/packages/locale/lang/pt-BR.ts +4 -1
- package/packages/locale/lang/ru-RU.ts +4 -1
- package/packages/locale/lang/th-TH.ts +4 -1
- package/packages/locale/lang/ug-CN.ts +4 -1
- package/packages/locale/lang/uk-UA.ts +4 -1
- package/packages/locale/lang/vi-VN.ts +4 -1
- package/packages/locale/lang/zh-CHT.ts +4 -1
- package/packages/locale/lang/zh-CN.ts +4 -1
- package/packages/table/module/export/export-panel.ts +33 -17
- package/packages/table/module/export/mixin.ts +3 -1
- package/packages/table/module/keyboard/mixin.ts +25 -9
- package/packages/table/src/methods.ts +43 -41
- package/packages/table/src/table.ts +52 -17
- /package/es/{iconfont.1743389110592.ttf → iconfont.1743479120369.ttf} +0 -0
- /package/es/{iconfont.1743389110592.woff → iconfont.1743479120369.woff} +0 -0
- /package/es/{iconfont.1743389110592.woff2 → iconfont.1743479120369.woff2} +0 -0
- /package/lib/{iconfont.1743389110592.ttf → iconfont.1743479120369.ttf} +0 -0
- /package/lib/{iconfont.1743389110592.woff → iconfont.1743479120369.woff} +0 -0
- /package/lib/{iconfont.1743389110592.woff2 → iconfont.1743479120369.woff2} +0 -0
package/lib/index.umd.js
CHANGED
|
@@ -2220,7 +2220,7 @@ function getClass(property, params) {
|
|
|
2220
2220
|
;// CONCATENATED MODULE: ./packages/ui/index.ts
|
|
2221
2221
|
|
|
2222
2222
|
|
|
2223
|
-
const version = "3.14.
|
|
2223
|
+
const version = "3.14.5";
|
|
2224
2224
|
core_.VxeUI.version = version;
|
|
2225
2225
|
core_.VxeUI.tableVersion = version;
|
|
2226
2226
|
core_.VxeUI.setConfig({
|
|
@@ -2843,7 +2843,7 @@ function isNodeElement(elem) {
|
|
|
2843
2843
|
const {
|
|
2844
2844
|
log: log_log
|
|
2845
2845
|
} = core_.VxeUI;
|
|
2846
|
-
const log_version = `table v${"3.14.
|
|
2846
|
+
const log_version = `table v${"3.14.5"}`;
|
|
2847
2847
|
const warnLog = log_log.create('warn', log_version);
|
|
2848
2848
|
const errLog = log_log.create('error', log_version);
|
|
2849
2849
|
;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
|
|
@@ -5451,39 +5451,33 @@ function cacheColumnMap($xeTable) {
|
|
|
5451
5451
|
htmlColumn = column;
|
|
5452
5452
|
}
|
|
5453
5453
|
if (treeNode) {
|
|
5454
|
-
if (
|
|
5455
|
-
|
|
5456
|
-
warnLog('vxe.error.colRepet', ['tree-node', treeNode]);
|
|
5457
|
-
}
|
|
5454
|
+
if (treeNodeColumn) {
|
|
5455
|
+
warnLog('vxe.error.colRepet', ['tree-node', treeNode]);
|
|
5458
5456
|
}
|
|
5459
5457
|
if (!treeNodeColumn) {
|
|
5460
5458
|
treeNodeColumn = column;
|
|
5461
5459
|
}
|
|
5462
5460
|
} else if (type === 'expand') {
|
|
5463
|
-
if (
|
|
5464
|
-
|
|
5465
|
-
warnLog('vxe.error.colRepet', ['type', type]);
|
|
5466
|
-
}
|
|
5461
|
+
if (expandColumn) {
|
|
5462
|
+
warnLog('vxe.error.colRepet', ['type', type]);
|
|
5467
5463
|
}
|
|
5468
5464
|
if (!expandColumn) {
|
|
5469
5465
|
expandColumn = column;
|
|
5470
5466
|
}
|
|
5471
5467
|
}
|
|
5472
|
-
if (
|
|
5473
|
-
if (
|
|
5474
|
-
|
|
5475
|
-
|
|
5476
|
-
|
|
5477
|
-
|
|
5478
|
-
|
|
5479
|
-
|
|
5480
|
-
|
|
5481
|
-
|
|
5482
|
-
|
|
5483
|
-
|
|
5484
|
-
|
|
5485
|
-
radioColumn = column;
|
|
5486
|
-
}
|
|
5468
|
+
if (type === 'checkbox') {
|
|
5469
|
+
if (checkboxColumn) {
|
|
5470
|
+
warnLog('vxe.error.colRepet', ['type', type]);
|
|
5471
|
+
}
|
|
5472
|
+
if (!checkboxColumn) {
|
|
5473
|
+
checkboxColumn = column;
|
|
5474
|
+
}
|
|
5475
|
+
} else if (type === 'radio') {
|
|
5476
|
+
if (radioColumn) {
|
|
5477
|
+
warnLog('vxe.error.colRepet', ['type', type]);
|
|
5478
|
+
}
|
|
5479
|
+
if (!radioColumn) {
|
|
5480
|
+
radioColumn = column;
|
|
5487
5481
|
}
|
|
5488
5482
|
}
|
|
5489
5483
|
if (isAllOverflow && column.showOverflow === false) {
|
|
@@ -8259,6 +8253,7 @@ const Methods = {
|
|
|
8259
8253
|
lastScrollTop
|
|
8260
8254
|
} = internalData;
|
|
8261
8255
|
const treeOpts = $xeTable.computeTreeOpts;
|
|
8256
|
+
const expandOpts = $xeTable.computeExpandOpts;
|
|
8262
8257
|
const {
|
|
8263
8258
|
transform
|
|
8264
8259
|
} = treeOpts;
|
|
@@ -8346,6 +8341,9 @@ const Methods = {
|
|
|
8346
8341
|
scrollYStore.endIndex = scrollYStore.visibleSize;
|
|
8347
8342
|
}
|
|
8348
8343
|
if (sYLoad) {
|
|
8344
|
+
if (reactData.expandColumn && expandOpts.mode !== 'fixed') {
|
|
8345
|
+
errLog('vxe.error.notConflictProp', ['column.type="expand', 'expand-config.mode="fixed"']);
|
|
8346
|
+
}
|
|
8349
8347
|
// if (showOverflow) {
|
|
8350
8348
|
// if (!rowOpts.height) {
|
|
8351
8349
|
// const errColumn = internalData.tableFullColumn.find((column: any) => column.showOverflow === false)
|
|
@@ -9384,10 +9382,14 @@ const Methods = {
|
|
|
9384
9382
|
getCheckboxRecords(isFull) {
|
|
9385
9383
|
const $xeTable = this;
|
|
9386
9384
|
const props = $xeTable;
|
|
9385
|
+
const reactData = $xeTable;
|
|
9387
9386
|
const internalData = $xeTable;
|
|
9388
9387
|
const {
|
|
9389
9388
|
treeConfig
|
|
9390
9389
|
} = props;
|
|
9390
|
+
const {
|
|
9391
|
+
updateCheckboxFlag
|
|
9392
|
+
} = reactData;
|
|
9391
9393
|
const {
|
|
9392
9394
|
tableFullData,
|
|
9393
9395
|
afterFullData,
|
|
@@ -9408,28 +9410,30 @@ const Methods = {
|
|
|
9408
9410
|
} = checkboxOpts;
|
|
9409
9411
|
const childrenField = treeOpts.children || treeOpts.childrenField;
|
|
9410
9412
|
let rowList = [];
|
|
9411
|
-
if (
|
|
9412
|
-
if (
|
|
9413
|
-
|
|
9414
|
-
|
|
9415
|
-
|
|
9416
|
-
|
|
9417
|
-
|
|
9418
|
-
const currTableData = isFull ? tableFullData : afterFullData;
|
|
9419
|
-
rowList = currTableData.filter(row => external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField));
|
|
9420
|
-
}
|
|
9421
|
-
} else {
|
|
9422
|
-
external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(selectCheckboxMaps, (row, rowid) => {
|
|
9423
|
-
if (isFull) {
|
|
9424
|
-
if (fullDataRowIdData[rowid]) {
|
|
9425
|
-
rowList.push(fullDataRowIdData[rowid].row);
|
|
9426
|
-
}
|
|
9413
|
+
if (updateCheckboxFlag) {
|
|
9414
|
+
if (checkField) {
|
|
9415
|
+
if (treeConfig) {
|
|
9416
|
+
const currTableData = isFull ? transform ? tableFullTreeData : tableFullData : transform ? afterTreeFullData : afterFullData;
|
|
9417
|
+
rowList = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().filterTree(currTableData, row => external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField), {
|
|
9418
|
+
children: transform ? mapChildrenField : childrenField
|
|
9419
|
+
});
|
|
9427
9420
|
} else {
|
|
9428
|
-
|
|
9429
|
-
|
|
9430
|
-
}
|
|
9421
|
+
const currTableData = isFull ? tableFullData : afterFullData;
|
|
9422
|
+
rowList = currTableData.filter(row => external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField));
|
|
9431
9423
|
}
|
|
9432
|
-
}
|
|
9424
|
+
} else {
|
|
9425
|
+
external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(selectCheckboxMaps, (row, rowid) => {
|
|
9426
|
+
if (isFull) {
|
|
9427
|
+
if (fullDataRowIdData[rowid]) {
|
|
9428
|
+
rowList.push(fullDataRowIdData[rowid].row);
|
|
9429
|
+
}
|
|
9430
|
+
} else {
|
|
9431
|
+
if (afterFullRowMaps[rowid]) {
|
|
9432
|
+
rowList.push(afterFullRowMaps[rowid]);
|
|
9433
|
+
}
|
|
9434
|
+
}
|
|
9435
|
+
});
|
|
9436
|
+
}
|
|
9433
9437
|
}
|
|
9434
9438
|
return rowList;
|
|
9435
9439
|
},
|
|
@@ -20078,42 +20082,40 @@ const {
|
|
|
20078
20082
|
}
|
|
20079
20083
|
}), h('vxe-checkbox', {
|
|
20080
20084
|
props: {
|
|
20081
|
-
value: defaultOptions.
|
|
20082
|
-
disabled: !
|
|
20083
|
-
title: export_panel_getI18n('vxe.export.
|
|
20084
|
-
content: export_panel_getI18n('vxe.export.
|
|
20085
|
+
value: isHeader ? defaultOptions.isTitle : false,
|
|
20086
|
+
disabled: !isHeader,
|
|
20087
|
+
title: export_panel_getI18n('vxe.export.expTitleTitle'),
|
|
20088
|
+
content: export_panel_getI18n('vxe.export.expOptTitle')
|
|
20085
20089
|
},
|
|
20086
20090
|
on: {
|
|
20087
20091
|
input(value) {
|
|
20088
|
-
defaultOptions.
|
|
20092
|
+
defaultOptions.isTitle = value;
|
|
20089
20093
|
}
|
|
20090
20094
|
}
|
|
20091
20095
|
}), h('vxe-checkbox', {
|
|
20092
20096
|
props: {
|
|
20093
|
-
value:
|
|
20094
|
-
disabled:
|
|
20095
|
-
title: export_panel_getI18n('vxe.export.
|
|
20096
|
-
content: export_panel_getI18n('vxe.export.
|
|
20097
|
+
value: isHeader && hasColgroup && supportMerge ? defaultOptions.isColgroup : false,
|
|
20098
|
+
disabled: !isHeader || !hasColgroup || !supportMerge,
|
|
20099
|
+
title: export_panel_getI18n('vxe.export.expColgroupTitle'),
|
|
20100
|
+
content: export_panel_getI18n('vxe.export.expOptColgroup')
|
|
20097
20101
|
},
|
|
20098
20102
|
on: {
|
|
20099
20103
|
input(value) {
|
|
20100
|
-
defaultOptions.
|
|
20104
|
+
defaultOptions.isColgroup = value;
|
|
20101
20105
|
}
|
|
20102
20106
|
}
|
|
20103
20107
|
})]), h('div', {
|
|
20104
20108
|
class: 'vxe-table-export--panel-option-row'
|
|
20105
20109
|
}, [h('vxe-checkbox', {
|
|
20106
20110
|
props: {
|
|
20107
|
-
|
|
20108
|
-
|
|
20109
|
-
|
|
20110
|
-
|
|
20111
|
-
title: export_panel_getI18n('vxe.export.expColgroupTitle'),
|
|
20112
|
-
content: export_panel_getI18n('vxe.export.expOptColgroup')
|
|
20111
|
+
value: hasEmptyData ? false : defaultOptions.original,
|
|
20112
|
+
disabled: hasEmptyData,
|
|
20113
|
+
title: export_panel_getI18n('vxe.export.expOriginalTitle'),
|
|
20114
|
+
content: export_panel_getI18n('vxe.export.expOptOriginal')
|
|
20113
20115
|
},
|
|
20114
20116
|
on: {
|
|
20115
20117
|
input(value) {
|
|
20116
|
-
defaultOptions.
|
|
20118
|
+
defaultOptions.original = value;
|
|
20117
20119
|
}
|
|
20118
20120
|
}
|
|
20119
20121
|
}), h('vxe-checkbox', {
|
|
@@ -20152,6 +20154,20 @@ const {
|
|
|
20152
20154
|
defaultOptions.isAllExpand = value;
|
|
20153
20155
|
}
|
|
20154
20156
|
}
|
|
20157
|
+
})]), h('div', {
|
|
20158
|
+
class: 'vxe-table-export--panel-option-row'
|
|
20159
|
+
}, [h('vxe-checkbox', {
|
|
20160
|
+
props: {
|
|
20161
|
+
value: defaultOptions.isFooter,
|
|
20162
|
+
disabled: !storeData.hasFooter,
|
|
20163
|
+
title: export_panel_getI18n('vxe.export.expFooterTitle'),
|
|
20164
|
+
content: export_panel_getI18n('vxe.export.expOptFooter')
|
|
20165
|
+
},
|
|
20166
|
+
on: {
|
|
20167
|
+
input(value) {
|
|
20168
|
+
defaultOptions.isFooter = value;
|
|
20169
|
+
}
|
|
20170
|
+
}
|
|
20155
20171
|
})])])])]])])]), bottomSlot ? h('div', {
|
|
20156
20172
|
class: 'vxe-table-export--panel-bottom'
|
|
20157
20173
|
}, $xeTable.callSlot(bottomSlot, params, h)) : export_panel_renderEmptyElement(this)]);
|
|
@@ -22670,7 +22686,7 @@ function getHeaderTitle($xeTable, opts, column) {
|
|
|
22670
22686
|
column,
|
|
22671
22687
|
options: opts,
|
|
22672
22688
|
$table: $xeTable
|
|
22673
|
-
}) : (opts.
|
|
22689
|
+
}) : (opts.isTitle ? column.getTitle() : column.field) || '';
|
|
22674
22690
|
}
|
|
22675
22691
|
function getFooterCellValue($xeTable, opts, row, column) {
|
|
22676
22692
|
const columnOpts = $xeTable.computeColumnOpts;
|
|
@@ -23636,6 +23652,7 @@ function handleExportAndPrint($xeTable, options, isPrint) {
|
|
|
23636
23652
|
const defOpts = Object.assign({
|
|
23637
23653
|
message: true,
|
|
23638
23654
|
isHeader: showHeader,
|
|
23655
|
+
isTitle: showHeader,
|
|
23639
23656
|
isFooter: showFooter,
|
|
23640
23657
|
isColgroup: isGroup,
|
|
23641
23658
|
isMerge: hasMerge,
|
|
@@ -23828,6 +23845,7 @@ const convertToRows = originColumns => {
|
|
|
23828
23845
|
const opts = Object.assign({
|
|
23829
23846
|
message: true,
|
|
23830
23847
|
isHeader: showHeader,
|
|
23848
|
+
isTitle: showHeader,
|
|
23831
23849
|
isFooter: showFooter,
|
|
23832
23850
|
isColgroup: isGroup,
|
|
23833
23851
|
isMerge: hasMerge,
|
|
@@ -24652,28 +24670,47 @@ function handleMoveSelected($xeTable, evnt, args, isLeftArrow, isUpArrow, isRigh
|
|
|
24652
24670
|
highlightCurrentColumn
|
|
24653
24671
|
} = props;
|
|
24654
24672
|
const rowOpts = $xeTable.computeRowOpts;
|
|
24673
|
+
const currentRowOpts = $xeTable.computeCurrentRowOpts;
|
|
24655
24674
|
const columnOpts = $xeTable.computeColumnOpts;
|
|
24656
|
-
|
|
24657
|
-
|
|
24658
|
-
if (
|
|
24659
|
-
|
|
24675
|
+
const currentColumnOpts = $xeTable.computeCurrentColumnOpts;
|
|
24676
|
+
const params = handleMoveSelected($xeTable, evnt, args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow);
|
|
24677
|
+
if (rowOpts.isCurrent || highlightCurrentRow) {
|
|
24678
|
+
if (currentRowOpts.isFollowSelected) {
|
|
24679
|
+
$xeTable.triggerCurrentRowEvent(evnt, params);
|
|
24680
|
+
} else {
|
|
24681
|
+
// 当前行按键上下移动
|
|
24682
|
+
if ((isUpArrow || isDwArrow) && (rowOpts.isCurrent || highlightCurrentRow)) {
|
|
24683
|
+
$xeTable.moveCurrentRow(isUpArrow, isDwArrow, evnt);
|
|
24684
|
+
}
|
|
24685
|
+
}
|
|
24660
24686
|
}
|
|
24661
|
-
|
|
24662
|
-
|
|
24663
|
-
|
|
24687
|
+
if (columnOpts.isCurrent || highlightCurrentColumn) {
|
|
24688
|
+
if (currentColumnOpts.isFollowSelected) {
|
|
24689
|
+
$xeTable.triggerCurrentColumnEvent(evnt, params);
|
|
24690
|
+
} else {
|
|
24691
|
+
// 当前行按键左右移动
|
|
24692
|
+
if ((isLeftArrow || isRightArrow) && (columnOpts.isCurrent || highlightCurrentColumn)) {
|
|
24693
|
+
$xeTable.moveCurrentColumn(isLeftArrow, isRightArrow, evnt);
|
|
24694
|
+
}
|
|
24695
|
+
}
|
|
24664
24696
|
}
|
|
24665
24697
|
},
|
|
24666
24698
|
moveEnterSelected(args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt) {
|
|
24667
24699
|
const $xeTable = this;
|
|
24700
|
+
const props = $xeTable;
|
|
24701
|
+
const {
|
|
24702
|
+
highlightCurrentRow,
|
|
24703
|
+
highlightCurrentColumn
|
|
24704
|
+
} = props;
|
|
24668
24705
|
const rowOpts = $xeTable.computeRowOpts;
|
|
24669
24706
|
const currentRowOpts = $xeTable.computeCurrentRowOpts;
|
|
24670
24707
|
const columnOpts = $xeTable.computeColumnOpts;
|
|
24671
24708
|
const currentColumnOpts = $xeTable.computeCurrentColumnOpts;
|
|
24672
24709
|
const params = handleMoveSelected($xeTable, evnt, args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow);
|
|
24673
|
-
if (rowOpts.isCurrent && currentRowOpts.isFollowSelected) {
|
|
24710
|
+
if ((rowOpts.isCurrent || highlightCurrentRow) && currentRowOpts.isFollowSelected) {
|
|
24674
24711
|
$xeTable.triggerCurrentRowEvent(evnt, params);
|
|
24675
24712
|
}
|
|
24676
|
-
if (columnOpts.isCurrent && currentColumnOpts.isFollowSelected) {
|
|
24713
|
+
if ((columnOpts.isCurrent || highlightCurrentColumn) && currentColumnOpts.isFollowSelected) {
|
|
24677
24714
|
$xeTable.triggerCurrentColumnEvent(evnt, params);
|
|
24678
24715
|
}
|
|
24679
24716
|
},
|
|
@@ -26438,6 +26475,7 @@ function renderBody(h, $xeTable) {
|
|
|
26438
26475
|
original: false,
|
|
26439
26476
|
message: true,
|
|
26440
26477
|
isHeader: false,
|
|
26478
|
+
isTitle: false,
|
|
26441
26479
|
isFooter: false
|
|
26442
26480
|
},
|
|
26443
26481
|
rowExpandedFlag: 1,
|
|
@@ -27245,12 +27283,15 @@ function renderBody(h, $xeTable) {
|
|
|
27245
27283
|
exportConfig,
|
|
27246
27284
|
importConfig,
|
|
27247
27285
|
treeConfig,
|
|
27248
|
-
showOverflow
|
|
27286
|
+
showOverflow,
|
|
27287
|
+
highlightCurrentRow,
|
|
27288
|
+
highlightCurrentColumn
|
|
27249
27289
|
} = props;
|
|
27250
27290
|
const {
|
|
27251
27291
|
scrollXStore,
|
|
27252
27292
|
scrollYStore
|
|
27253
27293
|
} = internalData;
|
|
27294
|
+
const columnOpts = $xeTable.computeColumnOpts;
|
|
27254
27295
|
const editOpts = $xeTable.computeEditOpts;
|
|
27255
27296
|
const treeOpts = $xeTable.computeTreeOpts;
|
|
27256
27297
|
const radioOpts = $xeTable.computeRadioOpts;
|
|
@@ -27261,6 +27302,11 @@ function renderBody(h, $xeTable) {
|
|
|
27261
27302
|
const mouseOpts = $xeTable.computeMouseOpts;
|
|
27262
27303
|
const exportOpts = $xeTable.computeExportOpts;
|
|
27263
27304
|
const importOpts = $xeTable.computeImportOpts;
|
|
27305
|
+
const currentRowOpts = $xeTable.computeCurrentRowOpts;
|
|
27306
|
+
const currentColumnOpts = $xeTable.computeCurrentColumnOpts;
|
|
27307
|
+
const virtualXOpts = $xeTable.computeVirtualXOpts;
|
|
27308
|
+
const virtualYOpts = $xeTable.computeVirtualYOpts;
|
|
27309
|
+
const keyboardOpts = $xeTable.computeKeyboardOpts;
|
|
27264
27310
|
if (props.rowId) {
|
|
27265
27311
|
warnLog('vxe.error.delProp', ['row-id', 'row-config.keyField']);
|
|
27266
27312
|
}
|
|
@@ -27303,6 +27349,12 @@ function renderBody(h, $xeTable) {
|
|
|
27303
27349
|
if (this.highlightHoverColumn) {
|
|
27304
27350
|
warnLog('vxe.error.delProp', ['highlight-hover-column', 'column-config.isHover']);
|
|
27305
27351
|
}
|
|
27352
|
+
// if (props.scrollY) {
|
|
27353
|
+
// warnLog('vxe.error.delProp', ['scroll-y', 'virtual-y-config'])
|
|
27354
|
+
// }
|
|
27355
|
+
// if (props.scrollX) {
|
|
27356
|
+
// warnLog('vxe.error.delProp', ['scroll-x', 'virtual-x-config'])
|
|
27357
|
+
// }
|
|
27306
27358
|
// 检查导入导出类型,如果自定义导入导出方法,则不校验类型
|
|
27307
27359
|
if (importConfig && importOpts.types && !importOpts.importMethod && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includeArrays(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(importOpts._typeMaps), importOpts.types)) {
|
|
27308
27360
|
warnLog('vxe.error.errProp', [`export-config.types=${importOpts.types.join(',')}`, importOpts.types.filter(type => external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includes(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(importOpts._typeMaps), type)).join(',') || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(importOpts._typeMaps).join(',')]);
|
|
@@ -27370,29 +27422,49 @@ function renderBody(h, $xeTable) {
|
|
|
27370
27422
|
warnLog('vxe.error.errProp', [`table.context-menu=${this.contextMenu}`, 'table.context-menu={}']);
|
|
27371
27423
|
}
|
|
27372
27424
|
}
|
|
27373
|
-
if (
|
|
27374
|
-
warnLog('vxe.error.errProp', [`table.menu-config=${
|
|
27425
|
+
if (props.menuConfig && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(props.menuConfig)) {
|
|
27426
|
+
warnLog('vxe.error.errProp', [`table.menu-config=${props.menuConfig}`, 'table.menu-config={}']);
|
|
27427
|
+
}
|
|
27428
|
+
if (props.exportConfig && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(props.exportConfig)) {
|
|
27429
|
+
warnLog('vxe.error.errProp', [`table.export-config=${props.exportConfig}`, 'table.export-config={}']);
|
|
27430
|
+
}
|
|
27431
|
+
if (props.importConfig && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(props.importConfig)) {
|
|
27432
|
+
warnLog('vxe.error.errProp', [`table.import-config=${props.importConfig}`, 'table.import-config={}']);
|
|
27375
27433
|
}
|
|
27376
|
-
if (
|
|
27377
|
-
warnLog('vxe.error.errProp', [`table.
|
|
27434
|
+
if (props.printConfig && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(props.printConfig)) {
|
|
27435
|
+
warnLog('vxe.error.errProp', [`table.print-config=${props.printConfig}`, 'table.print-config={}']);
|
|
27378
27436
|
}
|
|
27379
|
-
if (
|
|
27380
|
-
warnLog('vxe.error.errProp', [`table.
|
|
27437
|
+
if (props.treeConfig && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(props.treeConfig)) {
|
|
27438
|
+
warnLog('vxe.error.errProp', [`table.tree-config=${props.treeConfig}`, 'table.tree-config={}']);
|
|
27381
27439
|
}
|
|
27382
|
-
if (
|
|
27383
|
-
warnLog('vxe.error.errProp', [`table.
|
|
27440
|
+
if (props.customConfig && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(props.customConfig)) {
|
|
27441
|
+
warnLog('vxe.error.errProp', [`table.custom-config=${props.customConfig}`, 'table.custom-config={}']);
|
|
27384
27442
|
}
|
|
27385
|
-
if (
|
|
27386
|
-
warnLog('vxe.error.errProp', [`table.
|
|
27443
|
+
if (props.editConfig && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(props.editConfig)) {
|
|
27444
|
+
warnLog('vxe.error.errProp', [`table.edit-config=${props.editConfig}`, 'table.edit-config={}']);
|
|
27387
27445
|
}
|
|
27388
|
-
if (
|
|
27389
|
-
warnLog('vxe.error.errProp', [`table.
|
|
27446
|
+
if (props.emptyRender && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(props.emptyRender)) {
|
|
27447
|
+
warnLog('vxe.error.errProp', [`table.empty-render=${props.emptyRender}`, 'table.empty-render={}']);
|
|
27390
27448
|
}
|
|
27391
|
-
if (
|
|
27392
|
-
warnLog('vxe.error.
|
|
27449
|
+
if ((rowOpts.isCurrent || highlightCurrentRow) && props.keyboardConfig && keyboardOpts.isArrow && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(currentRowOpts.isFollowSelected)) {
|
|
27450
|
+
warnLog('vxe.error.notConflictProp', ['row-config.isCurrent', 'current-row-config.isFollowSelected']);
|
|
27393
27451
|
}
|
|
27394
|
-
if (
|
|
27395
|
-
warnLog('vxe.error.
|
|
27452
|
+
if ((columnOpts.isCurrent || highlightCurrentColumn) && props.keyboardConfig && keyboardOpts.isArrow && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(currentColumnOpts.isFollowSelected)) {
|
|
27453
|
+
warnLog('vxe.error.notConflictProp', ['column-config.isCurrent', 'current-column-config.isFollowSelected']);
|
|
27454
|
+
}
|
|
27455
|
+
// 如果不支持虚拟滚动
|
|
27456
|
+
if (props.spanMethod) {
|
|
27457
|
+
if (virtualXOpts.enabled) {
|
|
27458
|
+
warnLog('vxe.error.notConflictProp', ['span-method', 'virtual-x-config.enabled=false']);
|
|
27459
|
+
}
|
|
27460
|
+
if (virtualYOpts.enabled) {
|
|
27461
|
+
warnLog('vxe.error.notConflictProp', ['span-method', 'virtual-y-config.enabled=false']);
|
|
27462
|
+
}
|
|
27463
|
+
}
|
|
27464
|
+
if (props.footerSpanMethod) {
|
|
27465
|
+
if (virtualXOpts.enabled) {
|
|
27466
|
+
warnLog('vxe.error.notConflictProp', ['footer-span-method', 'virtual-x-config.enabled=false']);
|
|
27467
|
+
}
|
|
27396
27468
|
}
|
|
27397
27469
|
// 检查是否有安装需要的模块
|
|
27398
27470
|
if (props.editConfig && !$xeTable.insert) {
|
|
@@ -31523,6 +31595,7 @@ const Toolbar = VxeToolbar;
|
|
|
31523
31595
|
scrollErrProp: '启用虚拟滚动后不支持该参数 "{0}"',
|
|
31524
31596
|
errConflicts: '参数 "{0}" 与 "{1}" 有冲突',
|
|
31525
31597
|
notSupportProp: '当启用参数 "{0}" 时不支持 "{1}",应该为 "{2}",否则将会出现错误',
|
|
31598
|
+
notConflictProp: '当使用 "{0}" 时,应该设置 "{1}",否则可能会存在功能冲突',
|
|
31526
31599
|
unableInsert: '无法插入到指定位置,请检查参数是否正确',
|
|
31527
31600
|
useErr: '安装 "{0}" 模块时发生错误,可能顺序不正确,依赖的模块需要在 Table 之前安装',
|
|
31528
31601
|
barUnableLink: '工具栏无法关联表格',
|
|
@@ -31699,10 +31772,12 @@ const Toolbar = VxeToolbar;
|
|
|
31699
31772
|
expOptFooter: '表尾',
|
|
31700
31773
|
expFooterTitle: '是否需要表尾',
|
|
31701
31774
|
expOptColgroup: '分组表头',
|
|
31775
|
+
expOptTitle: '列标题',
|
|
31776
|
+
expTitleTitle: '是否为列标题,否则显示为列的字段名',
|
|
31702
31777
|
expColgroupTitle: '如果存在,则支持带有分组结构的表头',
|
|
31703
31778
|
expOptMerge: '合并',
|
|
31704
31779
|
expMergeTitle: '如果存在,则支持带有合并结构的单元格',
|
|
31705
|
-
expOptAllExpand: '
|
|
31780
|
+
expOptAllExpand: '展开树',
|
|
31706
31781
|
expAllExpandTitle: '如果存在,则支持将带有层级结构的数据全部展开',
|
|
31707
31782
|
expOptUseStyle: '样式',
|
|
31708
31783
|
expUseStyleTitle: '如果存在,则支持带样式的单元格',
|