vxe-table 3.13.13 → 3.13.15
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 +1 -0
- package/es/locale/lang/de-DE.js +1 -0
- package/es/locale/lang/en-US.js +11 -10
- package/es/locale/lang/es-ES.js +1 -0
- package/es/locale/lang/fr-FR.js +1 -0
- package/es/locale/lang/hu-HU.js +1 -0
- package/es/locale/lang/hy-AM.js +1 -0
- package/es/locale/lang/id-ID.js +1 -0
- package/es/locale/lang/it-IT.js +1 -0
- package/es/locale/lang/ja-JP.js +1 -0
- package/es/locale/lang/ko-KR.js +1 -0
- package/es/locale/lang/nb-NO.js +1 -0
- package/es/locale/lang/pt-BR.js +1 -0
- package/es/locale/lang/ru-RU.js +1 -0
- package/es/locale/lang/th-TH.js +1 -0
- package/es/locale/lang/ug-CN.js +1 -0
- package/es/locale/lang/uk-UA.js +1 -0
- package/es/locale/lang/vi-VN.js +1 -0
- package/es/locale/lang/zh-CHT.js +1 -0
- package/es/locale/lang/zh-CN.js +1 -0
- package/es/style.css +1 -1
- package/es/table/module/custom/panel.js +18 -16
- package/es/table/src/cell.js +3 -2
- package/es/table/src/columnInfo.js +0 -3
- package/es/table/src/methods.js +23 -19
- package/es/table/src/table.js +157 -147
- package/es/ui/index.js +1 -1
- package/es/ui/src/log.js +1 -1
- package/lib/index.umd.js +215 -204
- package/lib/index.umd.min.js +1 -1
- package/lib/locale/lang/ar-EG.js +1 -0
- package/lib/locale/lang/ar-EG.min.js +1 -1
- package/lib/locale/lang/de-DE.js +1 -0
- package/lib/locale/lang/de-DE.min.js +1 -1
- package/lib/locale/lang/en-US.js +11 -10
- package/lib/locale/lang/en-US.min.js +1 -1
- package/lib/locale/lang/en-US.umd.js +11 -10
- package/lib/locale/lang/es-ES.js +1 -0
- package/lib/locale/lang/es-ES.min.js +1 -1
- package/lib/locale/lang/es-ES.umd.js +1 -0
- package/lib/locale/lang/fr-FR.js +1 -0
- package/lib/locale/lang/fr-FR.min.js +1 -1
- package/lib/locale/lang/hu-HU.js +1 -0
- package/lib/locale/lang/hu-HU.min.js +1 -1
- package/lib/locale/lang/hu-HU.umd.js +1 -0
- package/lib/locale/lang/hy-AM.js +1 -0
- package/lib/locale/lang/hy-AM.min.js +1 -1
- package/lib/locale/lang/id-ID.js +1 -0
- package/lib/locale/lang/id-ID.min.js +1 -1
- package/lib/locale/lang/it-IT.js +1 -0
- package/lib/locale/lang/it-IT.min.js +1 -1
- package/lib/locale/lang/ja-JP.js +1 -0
- package/lib/locale/lang/ja-JP.min.js +1 -1
- package/lib/locale/lang/ja-JP.umd.js +1 -0
- package/lib/locale/lang/ko-KR.js +1 -0
- package/lib/locale/lang/ko-KR.min.js +1 -1
- package/lib/locale/lang/ko-KR.umd.js +1 -0
- package/lib/locale/lang/nb-NO.js +1 -0
- package/lib/locale/lang/nb-NO.min.js +1 -1
- package/lib/locale/lang/pt-BR.js +1 -0
- package/lib/locale/lang/pt-BR.min.js +1 -1
- package/lib/locale/lang/pt-BR.umd.js +1 -0
- package/lib/locale/lang/ru-RU.js +1 -0
- package/lib/locale/lang/ru-RU.min.js +1 -1
- package/lib/locale/lang/ru-RU.umd.js +1 -0
- package/lib/locale/lang/th-TH.js +1 -0
- package/lib/locale/lang/th-TH.min.js +1 -1
- package/lib/locale/lang/ug-CN.js +1 -0
- package/lib/locale/lang/ug-CN.min.js +1 -1
- package/lib/locale/lang/uk-UA.js +1 -0
- package/lib/locale/lang/uk-UA.min.js +1 -1
- package/lib/locale/lang/uk-UA.umd.js +1 -0
- package/lib/locale/lang/vi-VN.js +1 -0
- package/lib/locale/lang/vi-VN.min.js +1 -1
- package/lib/locale/lang/zh-CHT.js +1 -0
- package/lib/locale/lang/zh-CHT.min.js +1 -1
- package/lib/locale/lang/zh-CHT.umd.js +1 -0
- package/lib/locale/lang/zh-CN.js +1 -0
- package/lib/locale/lang/zh-CN.min.js +1 -1
- package/lib/locale/lang/zh-CN.umd.js +1 -0
- package/lib/style.css +1 -1
- package/lib/table/module/custom/panel.js +18 -16
- package/lib/table/module/custom/panel.min.js +1 -1
- package/lib/table/src/cell.js +3 -2
- package/lib/table/src/cell.min.js +1 -1
- package/lib/table/src/columnInfo.js +0 -3
- package/lib/table/src/columnInfo.min.js +1 -1
- package/lib/table/src/methods.js +25 -19
- package/lib/table/src/methods.min.js +1 -1
- package/lib/table/src/table.js +166 -162
- 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 +1 -0
- package/packages/locale/lang/de-DE.ts +1 -0
- package/packages/locale/lang/en-US.ts +11 -10
- package/packages/locale/lang/es-ES.ts +1 -0
- package/packages/locale/lang/fr-FR.ts +1 -0
- package/packages/locale/lang/hu-HU.ts +1 -0
- package/packages/locale/lang/hy-AM.ts +1 -0
- package/packages/locale/lang/id-ID.ts +1 -0
- package/packages/locale/lang/it-IT.ts +1 -0
- package/packages/locale/lang/ja-JP.ts +1 -0
- package/packages/locale/lang/ko-KR.ts +1 -0
- package/packages/locale/lang/nb-NO.ts +1 -0
- package/packages/locale/lang/pt-BR.ts +1 -0
- package/packages/locale/lang/ru-RU.ts +1 -0
- package/packages/locale/lang/th-TH.ts +1 -0
- package/packages/locale/lang/ug-CN.ts +1 -0
- package/packages/locale/lang/uk-UA.ts +1 -0
- package/packages/locale/lang/vi-VN.ts +1 -0
- package/packages/locale/lang/zh-CHT.ts +1 -0
- package/packages/locale/lang/zh-CN.ts +1 -0
- package/packages/table/module/custom/panel.ts +22 -20
- package/packages/table/src/cell.ts +3 -2
- package/packages/table/src/columnInfo.ts +0 -3
- package/packages/table/src/methods.ts +23 -19
- package/packages/table/src/table.ts +158 -147
- /package/es/{iconfont.1740561118542.ttf → iconfont.1740723810366.ttf} +0 -0
- /package/es/{iconfont.1740561118542.woff → iconfont.1740723810366.woff} +0 -0
- /package/es/{iconfont.1740561118542.woff2 → iconfont.1740723810366.woff2} +0 -0
- /package/lib/{iconfont.1740561118542.ttf → iconfont.1740723810366.ttf} +0 -0
- /package/lib/{iconfont.1740561118542.woff → iconfont.1740723810366.woff} +0 -0
- /package/lib/{iconfont.1740561118542.woff2 → iconfont.1740723810366.woff2} +0 -0
package/lib/index.umd.js
CHANGED
|
@@ -3201,7 +3201,7 @@ function getClass(property, params) {
|
|
|
3201
3201
|
;// ./packages/ui/index.ts
|
|
3202
3202
|
|
|
3203
3203
|
|
|
3204
|
-
const version = "3.13.
|
|
3204
|
+
const version = "3.13.15";
|
|
3205
3205
|
core_.VxeUI.version = version;
|
|
3206
3206
|
core_.VxeUI.tableVersion = version;
|
|
3207
3207
|
core_.VxeUI.setConfig({
|
|
@@ -3828,7 +3828,7 @@ var es_iterator_map = __webpack_require__(1701);
|
|
|
3828
3828
|
const {
|
|
3829
3829
|
log: log_log
|
|
3830
3830
|
} = core_.VxeUI;
|
|
3831
|
-
const log_version = `table v${"3.13.
|
|
3831
|
+
const log_version = `table v${"3.13.15"}`;
|
|
3832
3832
|
const warnLog = log_log.create('warn', log_version);
|
|
3833
3833
|
const errLog = log_log.create('error', log_version);
|
|
3834
3834
|
;// ./packages/table/src/columnInfo.ts
|
|
@@ -3865,9 +3865,6 @@ class ColumnInfo {
|
|
|
3865
3865
|
if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(_vm.editRender) || _vm.editRender && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(_vm.editRender)) {
|
|
3866
3866
|
warnLog('vxe.error.errProp', [`column.edit-render=${_vm.editRender}`, 'column.edit-render={}']);
|
|
3867
3867
|
}
|
|
3868
|
-
if (_vm.cellRender && _vm.editRender) {
|
|
3869
|
-
warnLog('vxe.error.errConflicts', ['column.cell-render', 'column.edit-render']);
|
|
3870
|
-
}
|
|
3871
3868
|
if (_vm.type === 'expand') {
|
|
3872
3869
|
const {
|
|
3873
3870
|
treeConfig
|
|
@@ -4695,6 +4692,7 @@ function renderCellBaseVNs(h, params, content) {
|
|
|
4695
4692
|
} = tableProps;
|
|
4696
4693
|
const rowOpts = $table.computeRowOpts;
|
|
4697
4694
|
const rowDragOpts = $table.computeRowDragOpts;
|
|
4695
|
+
const treeOpts = $table.computeTreeOpts;
|
|
4698
4696
|
const {
|
|
4699
4697
|
showIcon,
|
|
4700
4698
|
isPeerDrag,
|
|
@@ -4705,7 +4703,7 @@ function renderCellBaseVNs(h, params, content) {
|
|
|
4705
4703
|
const vns = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(content) ? content : [content];
|
|
4706
4704
|
if (dragSort && rowOpts.drag && (showIcon || (dragConfig ? dragConfig.showRowIcon : false)) && (!rVisibleMethod || rVisibleMethod(params))) {
|
|
4707
4705
|
if (treeConfig) {
|
|
4708
|
-
if (isPeerDrag || isCrossDrag || !level) {
|
|
4706
|
+
if (treeOpts.transform && (isPeerDrag || isCrossDrag || !level)) {
|
|
4709
4707
|
vns.unshift(renderCellDragIcon(h, params));
|
|
4710
4708
|
}
|
|
4711
4709
|
} else {
|
|
@@ -4902,7 +4900,7 @@ function renderCellHandle(h, params) {
|
|
|
4902
4900
|
case 'html':
|
|
4903
4901
|
return treeNode ? Cell.renderTreeHTMLCell(h, params) : Cell.renderHTMLCell(h, params);
|
|
4904
4902
|
}
|
|
4905
|
-
if (editConfig && editRender) {
|
|
4903
|
+
if (isEnableConf(editConfig) && editRender) {
|
|
4906
4904
|
return editOpts.mode === 'cell' ? treeNode ? Cell.renderTreeCellEdit(h, params) : Cell.renderCellEdit(h, params) : treeNode ? Cell.renderTreeRowEdit(h, params) : Cell.renderRowEdit(h, params);
|
|
4907
4905
|
}
|
|
4908
4906
|
return treeNode ? Cell.renderTreeCell(h, params) : Cell.renderDefaultCell(h, params);
|
|
@@ -6341,7 +6339,8 @@ function cacheColumnMap($xeTable) {
|
|
|
6341
6339
|
index,
|
|
6342
6340
|
items,
|
|
6343
6341
|
parent: parentColumn || null,
|
|
6344
|
-
width: 0
|
|
6342
|
+
width: 0,
|
|
6343
|
+
oLeft: 0
|
|
6345
6344
|
};
|
|
6346
6345
|
if (field) {
|
|
6347
6346
|
if (fullColumnFieldData[field]) {
|
|
@@ -13558,6 +13557,7 @@ const Methods = {
|
|
|
13558
13557
|
const dragParams = {
|
|
13559
13558
|
oldRow: dragRow,
|
|
13560
13559
|
newRow: prevDragRow,
|
|
13560
|
+
dragRow,
|
|
13561
13561
|
dragPos: prevDragPos,
|
|
13562
13562
|
dragToChild: !!prevDragToChild,
|
|
13563
13563
|
offsetIndex: dragOffsetIndex
|
|
@@ -13699,6 +13699,7 @@ const Methods = {
|
|
|
13699
13699
|
$xeTable.dispatchEvent('row-dragend', {
|
|
13700
13700
|
oldRow: dragRow,
|
|
13701
13701
|
newRow: prevDragRow,
|
|
13702
|
+
dragRow,
|
|
13702
13703
|
dragPos: prevDragPos,
|
|
13703
13704
|
dragToChild: isDragToChildFlag,
|
|
13704
13705
|
offsetIndex: dragOffsetIndex,
|
|
@@ -13899,11 +13900,12 @@ const Methods = {
|
|
|
13899
13900
|
if (prevDragCol && dragCol) {
|
|
13900
13901
|
// 判断是否有拖动
|
|
13901
13902
|
if (prevDragCol !== dragCol) {
|
|
13902
|
-
const
|
|
13903
|
+
const dragColumn = dragCol;
|
|
13903
13904
|
const newColumn = prevDragCol;
|
|
13904
13905
|
const dragParams = {
|
|
13905
|
-
oldColumn,
|
|
13906
|
+
oldColumn: dragColumn,
|
|
13906
13907
|
newColumn,
|
|
13908
|
+
dragColumn,
|
|
13907
13909
|
dragPos: prevDragPos,
|
|
13908
13910
|
dragToChild: !!prevDragToChild,
|
|
13909
13911
|
offsetIndex: dragOffsetIndex
|
|
@@ -13916,14 +13918,14 @@ const Methods = {
|
|
|
13916
13918
|
let oafIndex = -1;
|
|
13917
13919
|
let nafIndex = -1;
|
|
13918
13920
|
const oldAllMaps = {};
|
|
13919
|
-
external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([
|
|
13921
|
+
external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([dragColumn], column => {
|
|
13920
13922
|
oldAllMaps[column.id] = column;
|
|
13921
13923
|
});
|
|
13922
13924
|
let isSelfToChildStatus = false;
|
|
13923
|
-
if (
|
|
13925
|
+
if (dragColumn.parentId && newColumn.parentId) {
|
|
13924
13926
|
// 子到子
|
|
13925
13927
|
if (isPeerDrag && !isCrossDrag) {
|
|
13926
|
-
if (
|
|
13928
|
+
if (dragColumn.parentId !== newColumn.parentId) {
|
|
13927
13929
|
// 非同级
|
|
13928
13930
|
return;
|
|
13929
13931
|
}
|
|
@@ -13944,7 +13946,7 @@ const Methods = {
|
|
|
13944
13946
|
}
|
|
13945
13947
|
}
|
|
13946
13948
|
}
|
|
13947
|
-
} else if (
|
|
13949
|
+
} else if (dragColumn.parentId) {
|
|
13948
13950
|
// 子到根
|
|
13949
13951
|
if (!isCrossDrag) {
|
|
13950
13952
|
return;
|
|
@@ -13969,7 +13971,7 @@ const Methods = {
|
|
|
13969
13971
|
} else {
|
|
13970
13972
|
// 根到根
|
|
13971
13973
|
}
|
|
13972
|
-
const oldewMatchRest = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(collectColumn, item => item.id ===
|
|
13974
|
+
const oldewMatchRest = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(collectColumn, item => item.id === dragColumn.id);
|
|
13973
13975
|
// 改变层级
|
|
13974
13976
|
if (isSelfToChildStatus && isCrossDrag && isSelfToChildDrag) {
|
|
13975
13977
|
if (oldewMatchRest) {
|
|
@@ -13977,12 +13979,12 @@ const Methods = {
|
|
|
13977
13979
|
items: oCols,
|
|
13978
13980
|
index: oIndex
|
|
13979
13981
|
} = oldewMatchRest;
|
|
13980
|
-
const childList =
|
|
13982
|
+
const childList = dragColumn.children || [];
|
|
13981
13983
|
childList.forEach(column => {
|
|
13982
|
-
column.parentId =
|
|
13984
|
+
column.parentId = dragColumn.parentId;
|
|
13983
13985
|
});
|
|
13984
13986
|
oCols.splice(oIndex, 1, ...childList);
|
|
13985
|
-
|
|
13987
|
+
dragColumn.children = [];
|
|
13986
13988
|
}
|
|
13987
13989
|
} else {
|
|
13988
13990
|
if (oldewMatchRest) {
|
|
@@ -14006,11 +14008,11 @@ const Methods = {
|
|
|
14006
14008
|
} = newMatchRest;
|
|
14007
14009
|
// 转子级
|
|
14008
14010
|
if (isCrossDrag && isToChildDrag && isDragToChildFlag) {
|
|
14009
|
-
|
|
14010
|
-
newColumn.children = (newColumn.children || []).concat([
|
|
14011
|
+
dragColumn.parentId = newColumn.id;
|
|
14012
|
+
newColumn.children = (newColumn.children || []).concat([dragColumn]);
|
|
14011
14013
|
} else {
|
|
14012
|
-
|
|
14013
|
-
nCols.splice(nIndex + dragOffsetIndex, 0,
|
|
14014
|
+
dragColumn.parentId = newColumn.parentId;
|
|
14015
|
+
nCols.splice(nIndex + dragOffsetIndex, 0, dragColumn);
|
|
14014
14016
|
}
|
|
14015
14017
|
if (!nParent) {
|
|
14016
14018
|
nafIndex = nIndex;
|
|
@@ -14033,8 +14035,9 @@ const Methods = {
|
|
|
14033
14035
|
}
|
|
14034
14036
|
}
|
|
14035
14037
|
$xeTable.dispatchEvent('column-dragend', {
|
|
14036
|
-
oldColumn,
|
|
14038
|
+
oldColumn: dragColumn,
|
|
14037
14039
|
newColumn,
|
|
14040
|
+
dragColumn,
|
|
14038
14041
|
dragPos: prevDragPos,
|
|
14039
14042
|
dragToChild: isDragToChildFlag,
|
|
14040
14043
|
offsetIndex: dragOffsetIndex,
|
|
@@ -15670,7 +15673,8 @@ const Methods = {
|
|
|
15670
15673
|
const {
|
|
15671
15674
|
target,
|
|
15672
15675
|
deltaY,
|
|
15673
|
-
deltaX
|
|
15676
|
+
deltaX,
|
|
15677
|
+
shiftKey
|
|
15674
15678
|
} = evnt;
|
|
15675
15679
|
if (target && /^textarea$/i.test(target.tagName)) {
|
|
15676
15680
|
return;
|
|
@@ -15711,8 +15715,8 @@ const Methods = {
|
|
|
15711
15715
|
return;
|
|
15712
15716
|
}
|
|
15713
15717
|
const wheelSpeed = getWheelSpeed(reactData.lastScrollTime);
|
|
15714
|
-
const deltaTop = Math.ceil(deltaY * wheelSpeed);
|
|
15715
|
-
const deltaLeft = Math.ceil(deltaX * wheelSpeed);
|
|
15718
|
+
const deltaTop = Math.ceil((shiftKey ? deltaX : deltaY) * wheelSpeed);
|
|
15719
|
+
const deltaLeft = Math.ceil((shiftKey ? deltaY : deltaX) * wheelSpeed);
|
|
15716
15720
|
const isTopWheel = deltaTop < 0;
|
|
15717
15721
|
const currScrollTop = bodyScrollElem.scrollTop;
|
|
15718
15722
|
// 如果滚动位置已经是顶部或底部,则不需要触发
|
|
@@ -19573,11 +19577,12 @@ const renderPopupPanel = (h, _vm) => {
|
|
|
19573
19577
|
if (prevDragCol && dragCol) {
|
|
19574
19578
|
// 判断是否有拖动
|
|
19575
19579
|
if (prevDragCol !== dragCol) {
|
|
19576
|
-
const
|
|
19580
|
+
const dragColumn = dragCol;
|
|
19577
19581
|
const newColumn = prevDragCol;
|
|
19578
19582
|
Promise.resolve(dragEndMethod ? dragEndMethod({
|
|
19579
|
-
oldColumn,
|
|
19583
|
+
oldColumn: dragColumn,
|
|
19580
19584
|
newColumn,
|
|
19585
|
+
dragColumn,
|
|
19581
19586
|
dragPos: prevDragPos,
|
|
19582
19587
|
dragToChild: !!prevDragToChild,
|
|
19583
19588
|
offsetIndex: dragOffsetIndex
|
|
@@ -19588,13 +19593,13 @@ const renderPopupPanel = (h, _vm) => {
|
|
|
19588
19593
|
let oafIndex = -1;
|
|
19589
19594
|
let nafIndex = -1;
|
|
19590
19595
|
const oldAllMaps = {};
|
|
19591
|
-
external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([
|
|
19596
|
+
external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([dragColumn], column => {
|
|
19592
19597
|
oldAllMaps[column.id] = column;
|
|
19593
19598
|
});
|
|
19594
19599
|
let isSelfToChildStatus = false;
|
|
19595
19600
|
// 只有实时拖拽支持跨层级
|
|
19596
19601
|
if (immediate) {
|
|
19597
|
-
if (
|
|
19602
|
+
if (dragColumn.parentId && newColumn.parentId) {
|
|
19598
19603
|
// 子到子
|
|
19599
19604
|
if (!isCrossDrag) {
|
|
19600
19605
|
return;
|
|
@@ -19611,7 +19616,7 @@ const renderPopupPanel = (h, _vm) => {
|
|
|
19611
19616
|
return;
|
|
19612
19617
|
}
|
|
19613
19618
|
}
|
|
19614
|
-
} else if (
|
|
19619
|
+
} else if (dragColumn.parentId) {
|
|
19615
19620
|
// 子到根
|
|
19616
19621
|
if (!isCrossDrag) {
|
|
19617
19622
|
return;
|
|
@@ -19636,7 +19641,7 @@ const renderPopupPanel = (h, _vm) => {
|
|
|
19636
19641
|
} else {
|
|
19637
19642
|
// 根到根
|
|
19638
19643
|
}
|
|
19639
|
-
const oldewMatchRest = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(collectColumn, item => item.id ===
|
|
19644
|
+
const oldewMatchRest = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(collectColumn, item => item.id === dragColumn.id);
|
|
19640
19645
|
// 改变层级
|
|
19641
19646
|
if (isSelfToChildStatus && isCrossDrag && isSelfToChildDrag) {
|
|
19642
19647
|
if (oldewMatchRest) {
|
|
@@ -19644,12 +19649,12 @@ const renderPopupPanel = (h, _vm) => {
|
|
|
19644
19649
|
items: oCols,
|
|
19645
19650
|
index: oIndex
|
|
19646
19651
|
} = oldewMatchRest;
|
|
19647
|
-
const childList =
|
|
19652
|
+
const childList = dragColumn.children || [];
|
|
19648
19653
|
childList.forEach(column => {
|
|
19649
|
-
column.parentId =
|
|
19654
|
+
column.parentId = dragColumn.parentId;
|
|
19650
19655
|
});
|
|
19651
19656
|
oCols.splice(oIndex, 1, ...childList);
|
|
19652
|
-
|
|
19657
|
+
dragColumn.children = [];
|
|
19653
19658
|
}
|
|
19654
19659
|
} else {
|
|
19655
19660
|
if (oldewMatchRest) {
|
|
@@ -19673,11 +19678,11 @@ const renderPopupPanel = (h, _vm) => {
|
|
|
19673
19678
|
} = newMatchRest;
|
|
19674
19679
|
// 转子级
|
|
19675
19680
|
if (isCrossDrag && isToChildDrag && prevDragToChild) {
|
|
19676
|
-
|
|
19677
|
-
newColumn.children = (newColumn.children || []).concat([
|
|
19681
|
+
dragColumn.parentId = newColumn.id;
|
|
19682
|
+
newColumn.children = (newColumn.children || []).concat([dragColumn]);
|
|
19678
19683
|
} else {
|
|
19679
|
-
|
|
19680
|
-
nCols.splice(nIndex + dragOffsetIndex, 0,
|
|
19684
|
+
dragColumn.parentId = newColumn.parentId;
|
|
19685
|
+
nCols.splice(nIndex + dragOffsetIndex, 0, dragColumn);
|
|
19681
19686
|
}
|
|
19682
19687
|
if (!nParent) {
|
|
19683
19688
|
nafIndex = nIndex;
|
|
@@ -19690,10 +19695,10 @@ const renderPopupPanel = (h, _vm) => {
|
|
|
19690
19695
|
}
|
|
19691
19696
|
});
|
|
19692
19697
|
} else {
|
|
19693
|
-
oafIndex = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findIndexOf(customColumnList, item => item.id ===
|
|
19698
|
+
oafIndex = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findIndexOf(customColumnList, item => item.id === dragColumn.id);
|
|
19694
19699
|
customColumnList.splice(oafIndex, 1);
|
|
19695
19700
|
nafIndex = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findIndexOf(customColumnList, item => item.id === newColumn.id);
|
|
19696
|
-
customColumnList.splice(nafIndex + dragOffsetIndex, 0,
|
|
19701
|
+
customColumnList.splice(nafIndex + dragOffsetIndex, 0, dragColumn);
|
|
19697
19702
|
}
|
|
19698
19703
|
reactData.isDragColMove = true;
|
|
19699
19704
|
if (mouseConfig) {
|
|
@@ -19706,8 +19711,9 @@ const renderPopupPanel = (h, _vm) => {
|
|
|
19706
19711
|
}
|
|
19707
19712
|
}
|
|
19708
19713
|
$xeTable.dispatchEvent('column-dragend', {
|
|
19709
|
-
oldColumn,
|
|
19714
|
+
oldColumn: dragColumn,
|
|
19710
19715
|
newColumn,
|
|
19716
|
+
dragColumn,
|
|
19711
19717
|
dragPos: prevDragPos,
|
|
19712
19718
|
offsetIndex: dragOffsetIndex,
|
|
19713
19719
|
_index: {
|
|
@@ -26854,6 +26860,12 @@ function renderBody(h, $xeTable) {
|
|
|
26854
26860
|
mini: 36
|
|
26855
26861
|
},
|
|
26856
26862
|
scrollVMLoading: false,
|
|
26863
|
+
scrollYHeight: 0,
|
|
26864
|
+
scrollYTop: 0,
|
|
26865
|
+
isScrollYBig: false,
|
|
26866
|
+
scrollXLeft: 0,
|
|
26867
|
+
scrollXWidth: 0,
|
|
26868
|
+
isScrollXBig: false,
|
|
26857
26869
|
rowExpandHeightFlag: 1,
|
|
26858
26870
|
calcCellHeightFlag: 1,
|
|
26859
26871
|
resizeHeightFlag: 1,
|
|
@@ -27503,17 +27515,9 @@ function renderBody(h, $xeTable) {
|
|
|
27503
27515
|
},
|
|
27504
27516
|
created() {
|
|
27505
27517
|
const $xeTable = this;
|
|
27506
|
-
const
|
|
27507
|
-
|
|
27508
|
-
|
|
27509
|
-
scrollYStore,
|
|
27510
|
-
data,
|
|
27511
|
-
editOpts,
|
|
27512
|
-
treeOpts,
|
|
27513
|
-
treeConfig,
|
|
27514
|
-
showOverflow,
|
|
27515
|
-
rowOpts
|
|
27516
|
-
} = Object.assign(this, {
|
|
27518
|
+
const props = $xeTable;
|
|
27519
|
+
const internalData = $xeTable;
|
|
27520
|
+
Object.assign($xeTable, {
|
|
27517
27521
|
tZindex: 0,
|
|
27518
27522
|
elemStore: {},
|
|
27519
27523
|
// 存放横向 X 虚拟滚动相关的信息
|
|
@@ -27579,167 +27583,173 @@ function renderBody(h, $xeTable) {
|
|
|
27579
27583
|
swYInterval: 0,
|
|
27580
27584
|
swYTotal: 0
|
|
27581
27585
|
});
|
|
27582
|
-
|
|
27583
|
-
|
|
27584
|
-
|
|
27585
|
-
|
|
27586
|
-
|
|
27587
|
-
|
|
27588
|
-
|
|
27589
|
-
|
|
27590
|
-
|
|
27591
|
-
|
|
27592
|
-
|
|
27593
|
-
|
|
27594
|
-
|
|
27595
|
-
|
|
27596
|
-
|
|
27597
|
-
|
|
27598
|
-
|
|
27599
|
-
|
|
27600
|
-
|
|
27601
|
-
|
|
27602
|
-
|
|
27603
|
-
|
|
27604
|
-
|
|
27605
|
-
|
|
27606
|
-
}
|
|
27607
|
-
if (rowOpts.height) {
|
|
27608
|
-
warnLog('vxe.error.delProp', ['row-config.height', 'cell-config.height']);
|
|
27609
|
-
}
|
|
27610
|
-
if (this.tooltipOpts.enabled) {
|
|
27611
|
-
warnLog('vxe.error.delProp', ['tooltip-config.enabled', 'tooltip-config.showAll']);
|
|
27612
|
-
}
|
|
27613
|
-
// if (this.highlightCurrentRow) {
|
|
27614
|
-
// warnLog('vxe.error.delProp', ['highlight-current-row', 'row-config.isCurrent'])
|
|
27615
|
-
// }
|
|
27616
|
-
// if (this.highlightHoverRow) {
|
|
27617
|
-
// warnLog('vxe.error.delProp', ['highlight-hover-row', 'row-config.isHover'])
|
|
27618
|
-
// }
|
|
27619
|
-
// if (this.highlightCurrentColumn) {
|
|
27620
|
-
// warnLog('vxe.error.delProp', ['highlight-current-column', 'column-config.isCurrent'])
|
|
27621
|
-
// }
|
|
27622
|
-
// if (this.highlightHoverColumn) {
|
|
27623
|
-
// warnLog('vxe.error.delProp', ['highlight-hover-column', 'column-config.isHover'])
|
|
27624
|
-
// }
|
|
27625
|
-
// 检查导入导出类型,如果自定义导入导出方法,则不校验类型
|
|
27626
|
-
const {
|
|
27627
|
-
exportConfig,
|
|
27628
|
-
exportOpts,
|
|
27629
|
-
importConfig,
|
|
27630
|
-
importOpts
|
|
27631
|
-
} = this;
|
|
27632
|
-
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)) {
|
|
27633
|
-
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(',')]);
|
|
27634
|
-
}
|
|
27635
|
-
if (exportConfig && exportOpts.types && !exportOpts.exportMethod && !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(exportOpts._typeMaps), exportOpts.types)) {
|
|
27636
|
-
warnLog('vxe.error.errProp', [`export-config.types=${exportOpts.types.join(',')}`, exportOpts.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(exportOpts._typeMaps), type)).join(',') || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(exportOpts._typeMaps).join(',')]);
|
|
27637
|
-
}
|
|
27586
|
+
const {
|
|
27587
|
+
data,
|
|
27588
|
+
exportConfig,
|
|
27589
|
+
importConfig,
|
|
27590
|
+
treeConfig,
|
|
27591
|
+
showOverflow
|
|
27592
|
+
} = props;
|
|
27593
|
+
const {
|
|
27594
|
+
scrollXStore,
|
|
27595
|
+
scrollYStore
|
|
27596
|
+
} = internalData;
|
|
27597
|
+
const sYOpts = $xeTable.computeSYOpts;
|
|
27598
|
+
const editOpts = $xeTable.computeEditOpts;
|
|
27599
|
+
const treeOpts = $xeTable.computeTreeOpts;
|
|
27600
|
+
const radioOpts = $xeTable.computeRadioOpts;
|
|
27601
|
+
const checkboxOpts = $xeTable.computeCheckboxOpts;
|
|
27602
|
+
const expandOpts = $xeTable.computeExpandOpts;
|
|
27603
|
+
const rowOpts = $xeTable.computeRowOpts;
|
|
27604
|
+
const customOpts = $xeTable.computeCustomOpts;
|
|
27605
|
+
const mouseOpts = $xeTable.computeMouseOpts;
|
|
27606
|
+
const exportOpts = $xeTable.computeExportOpts;
|
|
27607
|
+
const importOpts = $xeTable.computeImportOpts;
|
|
27608
|
+
if (this.rowId) {
|
|
27609
|
+
warnLog('vxe.error.delProp', ['row-id', 'row-config.keyField']);
|
|
27638
27610
|
}
|
|
27639
|
-
if (
|
|
27640
|
-
|
|
27641
|
-
if (!this.id) {
|
|
27642
|
-
if ((this.customConfig ? isEnableConf(customOpts) : customOpts.enabled) && customOpts.storage) {
|
|
27643
|
-
errLog('vxe.error.reqProp', ['id']);
|
|
27644
|
-
}
|
|
27645
|
-
}
|
|
27646
|
-
if (this.treeConfig && this.checkboxOpts.range) {
|
|
27647
|
-
errLog('vxe.error.noTree', ['checkbox-config.range']);
|
|
27648
|
-
}
|
|
27649
|
-
if (this.rowOpts.height && !this.showOverflow) {
|
|
27650
|
-
warnLog('vxe.error.notProp', ['table.show-overflow']);
|
|
27651
|
-
}
|
|
27652
|
-
if (!this.handleMousedownCellAreaEvent) {
|
|
27653
|
-
if (this.areaConfig) {
|
|
27654
|
-
warnLog('vxe.error.notProp', ['area-config']);
|
|
27655
|
-
}
|
|
27656
|
-
if (this.clipConfig) {
|
|
27657
|
-
warnLog('vxe.error.notProp', ['clip-config']);
|
|
27658
|
-
}
|
|
27659
|
-
if (this.fnrConfig) {
|
|
27660
|
-
warnLog('vxe.error.notProp', ['fnr-config']);
|
|
27661
|
-
}
|
|
27662
|
-
if (this.mouseOpts.area) {
|
|
27663
|
-
errLog('vxe.error.notProp', ['mouse-config.area']);
|
|
27664
|
-
return;
|
|
27665
|
-
}
|
|
27666
|
-
}
|
|
27667
|
-
if (this.dragConfig) {
|
|
27668
|
-
warnLog('vxe.error.delProp', ['drag-config', 'row-drag-config']);
|
|
27669
|
-
}
|
|
27670
|
-
if (this.treeConfig && treeOpts.children) {
|
|
27671
|
-
warnLog('vxe.error.delProp', ['tree-config.children', 'tree-config.childrenField']);
|
|
27672
|
-
}
|
|
27673
|
-
if (this.treeConfig && treeOpts.line) {
|
|
27674
|
-
warnLog('vxe.error.delProp', ['tree-config.line', 'tree-config.showLine']);
|
|
27675
|
-
}
|
|
27676
|
-
if (this.mouseOpts.area && this.mouseOpts.selected) {
|
|
27677
|
-
warnLog('vxe.error.errConflicts', ['mouse-config.area', 'mouse-config.selected']);
|
|
27678
|
-
}
|
|
27679
|
-
// if (this.mouseOpts.area && this.checkboxOpts.range) {
|
|
27680
|
-
// warnLog('vxe.error.errConflicts', ['mouse-config.area', 'checkbox-config.range'])
|
|
27681
|
-
// }
|
|
27682
|
-
if (this.mouseOpts.area && this.treeConfig && !treeOpts.transform) {
|
|
27683
|
-
errLog('vxe.error.noTree', ['mouse-config.area']);
|
|
27684
|
-
}
|
|
27611
|
+
if (this.rowKey) {
|
|
27612
|
+
warnLog('vxe.error.delProp', ['row-key', 'row-config.useKey']);
|
|
27685
27613
|
}
|
|
27686
|
-
|
|
27687
|
-
|
|
27688
|
-
|
|
27689
|
-
|
|
27690
|
-
|
|
27691
|
-
|
|
27692
|
-
|
|
27693
|
-
|
|
27694
|
-
|
|
27695
|
-
|
|
27696
|
-
|
|
27697
|
-
|
|
27698
|
-
|
|
27699
|
-
|
|
27700
|
-
|
|
27701
|
-
|
|
27702
|
-
|
|
27703
|
-
|
|
27704
|
-
|
|
27705
|
-
|
|
27706
|
-
|
|
27707
|
-
|
|
27708
|
-
|
|
27709
|
-
|
|
27710
|
-
|
|
27711
|
-
|
|
27614
|
+
if (this.columnKey) {
|
|
27615
|
+
warnLog('vxe.error.delProp', ['column-id', 'column-config.useKey']);
|
|
27616
|
+
}
|
|
27617
|
+
if (!(this.rowId || rowOpts.keyField) && (checkboxOpts.reserve || checkboxOpts.checkRowKeys || radioOpts.reserve || radioOpts.checkRowKey || expandOpts.expandRowKeys || this.treeOpts.expandRowKeys)) {
|
|
27618
|
+
warnLog('vxe.error.reqProp', ['row-config.keyField']);
|
|
27619
|
+
}
|
|
27620
|
+
if (this.editConfig && editOpts.showStatus && !this.keepSource) {
|
|
27621
|
+
warnLog('vxe.error.reqProp', ['keep-source']);
|
|
27622
|
+
}
|
|
27623
|
+
if (treeConfig && (treeOpts.showLine || treeOpts.line) && (!(this.rowKey || rowOpts.useKey) || !showOverflow)) {
|
|
27624
|
+
warnLog('vxe.error.reqProp', ['row-config.useKey | show-overflow']);
|
|
27625
|
+
}
|
|
27626
|
+
if (treeConfig && !treeOpts.transform && this.stripe) {
|
|
27627
|
+
warnLog('vxe.error.noTree', ['stripe']);
|
|
27628
|
+
}
|
|
27629
|
+
if (this.showFooter && !(this.footerMethod || this.footerData)) {
|
|
27630
|
+
warnLog('vxe.error.reqProp', ['footer-data | footer-method']);
|
|
27631
|
+
}
|
|
27632
|
+
if (rowOpts.height) {
|
|
27633
|
+
warnLog('vxe.error.delProp', ['row-config.height', 'cell-config.height']);
|
|
27634
|
+
}
|
|
27635
|
+
if (this.tooltipOpts.enabled) {
|
|
27636
|
+
warnLog('vxe.error.delProp', ['tooltip-config.enabled', 'tooltip-config.showAll']);
|
|
27637
|
+
}
|
|
27638
|
+
if (this.highlightCurrentRow) {
|
|
27639
|
+
warnLog('vxe.error.delProp', ['highlight-current-row', 'row-config.isCurrent']);
|
|
27640
|
+
}
|
|
27641
|
+
if (this.highlightHoverRow) {
|
|
27642
|
+
warnLog('vxe.error.delProp', ['highlight-hover-row', 'row-config.isHover']);
|
|
27643
|
+
}
|
|
27644
|
+
if (this.highlightCurrentColumn) {
|
|
27645
|
+
warnLog('vxe.error.delProp', ['highlight-current-column', 'column-config.isCurrent']);
|
|
27646
|
+
}
|
|
27647
|
+
if (this.highlightHoverColumn) {
|
|
27648
|
+
warnLog('vxe.error.delProp', ['highlight-hover-column', 'column-config.isHover']);
|
|
27649
|
+
}
|
|
27650
|
+
// 检查导入导出类型,如果自定义导入导出方法,则不校验类型
|
|
27651
|
+
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)) {
|
|
27652
|
+
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(',')]);
|
|
27653
|
+
}
|
|
27654
|
+
if (exportConfig && exportOpts.types && !exportOpts.exportMethod && !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(exportOpts._typeMaps), exportOpts.types)) {
|
|
27655
|
+
warnLog('vxe.error.errProp', [`export-config.types=${exportOpts.types.join(',')}`, exportOpts.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(exportOpts._typeMaps), type)).join(',') || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(exportOpts._typeMaps).join(',')]);
|
|
27656
|
+
}
|
|
27657
|
+
if (!this.id) {
|
|
27658
|
+
if ((this.customConfig ? isEnableConf(customOpts) : customOpts.enabled) && customOpts.storage) {
|
|
27659
|
+
errLog('vxe.error.reqProp', ['id']);
|
|
27712
27660
|
}
|
|
27713
|
-
|
|
27714
|
-
|
|
27661
|
+
}
|
|
27662
|
+
if (this.treeConfig && this.checkboxOpts.range) {
|
|
27663
|
+
errLog('vxe.error.noTree', ['checkbox-config.range']);
|
|
27664
|
+
}
|
|
27665
|
+
if (this.rowOpts.height && !this.showOverflow) {
|
|
27666
|
+
warnLog('vxe.error.notProp', ['table.show-overflow']);
|
|
27667
|
+
}
|
|
27668
|
+
if (!this.handleMousedownCellAreaEvent) {
|
|
27669
|
+
if (this.areaConfig) {
|
|
27670
|
+
warnLog('vxe.error.notProp', ['area-config']);
|
|
27715
27671
|
}
|
|
27716
|
-
if (this.
|
|
27717
|
-
warnLog('vxe.error.
|
|
27672
|
+
if (this.clipConfig) {
|
|
27673
|
+
warnLog('vxe.error.notProp', ['clip-config']);
|
|
27718
27674
|
}
|
|
27719
|
-
if (this.
|
|
27720
|
-
warnLog('vxe.error.
|
|
27675
|
+
if (this.fnrConfig) {
|
|
27676
|
+
warnLog('vxe.error.notProp', ['fnr-config']);
|
|
27721
27677
|
}
|
|
27722
|
-
if (
|
|
27723
|
-
errLog('vxe.error.
|
|
27678
|
+
if (mouseOpts.area) {
|
|
27679
|
+
errLog('vxe.error.notProp', ['mouse-config.area']);
|
|
27680
|
+
return;
|
|
27724
27681
|
}
|
|
27725
|
-
|
|
27726
|
-
|
|
27682
|
+
}
|
|
27683
|
+
if (treeConfig && rowOpts.drag && !treeOpts.transform) {
|
|
27684
|
+
warnLog('vxe.error.notSupportProp', ['column-config.drag', 'tree-config.transform=false', 'tree-config.transform=true']);
|
|
27685
|
+
}
|
|
27686
|
+
if (this.dragConfig) {
|
|
27687
|
+
warnLog('vxe.error.delProp', ['drag-config', 'row-drag-config']);
|
|
27688
|
+
}
|
|
27689
|
+
if (this.treeConfig && treeOpts.children) {
|
|
27690
|
+
warnLog('vxe.error.delProp', ['tree-config.children', 'tree-config.childrenField']);
|
|
27691
|
+
}
|
|
27692
|
+
if (this.treeConfig && treeOpts.line) {
|
|
27693
|
+
warnLog('vxe.error.delProp', ['tree-config.line', 'tree-config.showLine']);
|
|
27694
|
+
}
|
|
27695
|
+
if (mouseOpts.area && mouseOpts.selected) {
|
|
27696
|
+
warnLog('vxe.error.errConflicts', ['mouse-config.area', 'mouse-config.selected']);
|
|
27697
|
+
}
|
|
27698
|
+
if (mouseOpts.area && this.treeConfig && !treeOpts.transform) {
|
|
27699
|
+
errLog('vxe.error.noTree', ['mouse-config.area']);
|
|
27700
|
+
}
|
|
27701
|
+
// 在 v3.0 中废弃 context-menu
|
|
27702
|
+
if (this.contextMenu) {
|
|
27703
|
+
warnLog('vxe.error.delProp', ['context-menu', 'menu-config']);
|
|
27704
|
+
if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(this.contextMenu)) {
|
|
27705
|
+
warnLog('vxe.error.errProp', [`table.context-menu=${this.contextMenu}`, 'table.context-menu={}']);
|
|
27727
27706
|
}
|
|
27728
27707
|
}
|
|
27708
|
+
if (this.menuConfig && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(this.menuConfig)) {
|
|
27709
|
+
warnLog('vxe.error.errProp', [`table.menu-config=${this.menuConfig}`, 'table.menu-config={}']);
|
|
27710
|
+
}
|
|
27711
|
+
if (this.exportConfig && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(this.exportConfig)) {
|
|
27712
|
+
warnLog('vxe.error.errProp', [`table.export-config=${this.exportConfig}`, 'table.export-config={}']);
|
|
27713
|
+
}
|
|
27714
|
+
if (this.importConfig && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(this.importConfig)) {
|
|
27715
|
+
warnLog('vxe.error.errProp', [`table.import-config=${this.importConfig}`, 'table.import-config={}']);
|
|
27716
|
+
}
|
|
27717
|
+
if (this.printConfig && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(this.printConfig)) {
|
|
27718
|
+
warnLog('vxe.error.errProp', [`table.print-config=${this.printConfig}`, 'table.print-config={}']);
|
|
27719
|
+
}
|
|
27720
|
+
if (this.treeConfig && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(this.treeConfig)) {
|
|
27721
|
+
warnLog('vxe.error.errProp', [`table.tree-config=${this.treeConfig}`, 'table.tree-config={}']);
|
|
27722
|
+
}
|
|
27723
|
+
if (this.customConfig && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(this.customConfig)) {
|
|
27724
|
+
warnLog('vxe.error.errProp', [`table.custom-config=${this.customConfig}`, 'table.custom-config={}']);
|
|
27725
|
+
}
|
|
27726
|
+
if (this.editConfig && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(this.editConfig)) {
|
|
27727
|
+
warnLog('vxe.error.errProp', [`table.edit-config=${this.editConfig}`, 'table.edit-config={}']);
|
|
27728
|
+
}
|
|
27729
|
+
if (this.emptyRender && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(this.emptyRender)) {
|
|
27730
|
+
warnLog('vxe.error.errProp', [`table.empty-render=${this.emptyRender}`, 'table.empty-render={}']);
|
|
27731
|
+
}
|
|
27732
|
+
if (this.editConfig && this.editOpts.activeMethod) {
|
|
27733
|
+
warnLog('vxe.error.delProp', ['table.edit-config.activeMethod', 'table.edit-config.beforeEditMethod']);
|
|
27734
|
+
}
|
|
27735
|
+
if (this.treeConfig && this.checkboxOpts.isShiftKey) {
|
|
27736
|
+
errLog('vxe.error.errConflicts', ['tree-config', 'checkbox-config.isShiftKey']);
|
|
27737
|
+
}
|
|
27738
|
+
if (this.checkboxOpts.halfField) {
|
|
27739
|
+
warnLog('vxe.error.delProp', ['checkbox-config.halfField', 'checkbox-config.indeterminateField']);
|
|
27740
|
+
}
|
|
27729
27741
|
// 检查是否有安装需要的模块
|
|
27730
|
-
if (
|
|
27731
|
-
|
|
27732
|
-
|
|
27733
|
-
|
|
27734
|
-
|
|
27735
|
-
|
|
27736
|
-
|
|
27737
|
-
|
|
27738
|
-
|
|
27739
|
-
|
|
27740
|
-
|
|
27741
|
-
errLog('vxe.error.reqModule', ['Export']);
|
|
27742
|
-
}
|
|
27742
|
+
if (this.editConfig && !this._insert) {
|
|
27743
|
+
errLog('vxe.error.reqModule', ['Edit']);
|
|
27744
|
+
}
|
|
27745
|
+
if (this.editRules && !this._validate) {
|
|
27746
|
+
errLog('vxe.error.reqModule', ['Validator']);
|
|
27747
|
+
}
|
|
27748
|
+
if ((this.checkboxOpts.range || this.keyboardConfig || this.mouseConfig) && !this.handleCellMousedownEvent) {
|
|
27749
|
+
errLog('vxe.error.reqModule', ['Keyboard']);
|
|
27750
|
+
}
|
|
27751
|
+
if ((this.printConfig || this.importConfig || this.exportConfig) && !this._exportData) {
|
|
27752
|
+
errLog('vxe.error.reqModule', ['Export']);
|
|
27743
27753
|
}
|
|
27744
27754
|
Object.assign(scrollYStore, {
|
|
27745
27755
|
startIndex: 0,
|
|
@@ -31844,6 +31854,7 @@ const Toolbar = VxeToolbar;
|
|
|
31844
31854
|
groupTag: '分组列头应该使用 "{0}" 而不是 "{1}",这可能会出现错误',
|
|
31845
31855
|
scrollErrProp: '启用虚拟滚动后不支持该参数 "{0}"',
|
|
31846
31856
|
errConflicts: '参数 "{0}" 与 "{1}" 有冲突',
|
|
31857
|
+
notSupportProp: '当启用参数 "{0}" 时不支持 "{1}",应该为 "{2}",否则将会出现错误',
|
|
31847
31858
|
unableInsert: '无法插入到指定位置,请检查参数是否正确',
|
|
31848
31859
|
useErr: '安装 "{0}" 模块时发生错误,可能顺序不正确,依赖的模块需要在 Table 之前安装',
|
|
31849
31860
|
barUnableLink: '工具栏无法关联表格',
|