vxe-table 4.12.0-beta.1 → 4.12.0-beta.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/grid/src/grid.js +16 -32
- package/es/style.css +1 -1
- package/es/table/module/custom/panel.js +19 -21
- package/es/table/module/export/export-panel.js +17 -19
- package/es/table/module/export/hook.js +5 -11
- package/es/table/module/export/import-panel.js +11 -13
- package/es/table/module/validator/hook.js +1 -3
- package/es/table/render/index.js +81 -61
- package/es/table/src/columnInfo.js +26 -28
- package/es/table/src/table.js +115 -98
- package/es/toolbar/src/toolbar.js +16 -24
- package/es/ui/index.js +1 -1
- package/es/ui/src/log.js +1 -1
- package/lib/grid/src/grid.js +16 -32
- package/lib/grid/src/grid.min.js +1 -1
- package/lib/index.umd.js +332 -321
- package/lib/index.umd.min.js +1 -1
- package/lib/style.css +1 -1
- package/lib/table/module/custom/panel.js +21 -23
- package/lib/table/module/custom/panel.min.js +1 -1
- package/lib/table/module/export/export-panel.js +17 -19
- package/lib/table/module/export/export-panel.min.js +1 -1
- package/lib/table/module/export/hook.js +5 -11
- package/lib/table/module/export/hook.min.js +1 -1
- package/lib/table/module/export/import-panel.js +11 -13
- package/lib/table/module/export/import-panel.min.js +1 -1
- package/lib/table/module/validator/hook.js +1 -3
- package/lib/table/module/validator/hook.min.js +1 -1
- package/lib/table/render/index.js +87 -67
- package/lib/table/render/index.min.js +1 -1
- package/lib/table/src/columnInfo.js +30 -32
- package/lib/table/src/columnInfo.min.js +1 -1
- package/lib/table/src/table.js +122 -95
- package/lib/table/src/table.min.js +1 -1
- package/lib/toolbar/src/toolbar.js +16 -24
- package/lib/toolbar/src/toolbar.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/grid/src/grid.ts +17 -32
- package/packages/table/module/custom/panel.ts +19 -21
- package/packages/table/module/export/export-panel.ts +17 -19
- package/packages/table/module/export/hook.ts +5 -11
- package/packages/table/module/export/import-panel.ts +11 -13
- package/packages/table/module/validator/hook.ts +1 -3
- package/packages/table/render/index.ts +80 -59
- package/packages/table/src/columnInfo.ts +26 -28
- package/packages/table/src/table.ts +113 -95
- package/packages/toolbar/src/toolbar.ts +16 -24
- /package/es/{iconfont.1741051902838.ttf → iconfont.1741160677181.ttf} +0 -0
- /package/es/{iconfont.1741051902838.woff → iconfont.1741160677181.woff} +0 -0
- /package/es/{iconfont.1741051902838.woff2 → iconfont.1741160677181.woff2} +0 -0
- /package/lib/{iconfont.1741051902838.ttf → iconfont.1741160677181.ttf} +0 -0
- /package/lib/{iconfont.1741051902838.woff → iconfont.1741160677181.woff} +0 -0
- /package/lib/{iconfont.1741051902838.woff2 → iconfont.1741160677181.woff2} +0 -0
package/es/table/src/table.js
CHANGED
|
@@ -1265,14 +1265,12 @@ export default defineComponent({
|
|
|
1265
1265
|
if ((expandColumn && expandOpts.mode !== 'fixed') && mouseOpts.area) {
|
|
1266
1266
|
errLog('vxe.error.errConflicts', ['mouse-config.area', 'column.type=expand']);
|
|
1267
1267
|
}
|
|
1268
|
-
if (
|
|
1269
|
-
if (
|
|
1270
|
-
|
|
1271
|
-
|
|
1272
|
-
|
|
1273
|
-
|
|
1274
|
-
errLog('vxe.error.reqProp', ['row-config.useKey & column.type=html']);
|
|
1275
|
-
}
|
|
1268
|
+
if (htmlColumn) {
|
|
1269
|
+
if (!columnOpts.useKey) {
|
|
1270
|
+
errLog('vxe.error.reqProp', ['column-config.useKey & column.type=html']);
|
|
1271
|
+
}
|
|
1272
|
+
if (!rowOpts.useKey) {
|
|
1273
|
+
errLog('vxe.error.reqProp', ['row-config.useKey & column.type=html']);
|
|
1276
1274
|
}
|
|
1277
1275
|
}
|
|
1278
1276
|
reactData.isGroup = isGroup;
|
|
@@ -2505,12 +2503,12 @@ export default defineComponent({
|
|
|
2505
2503
|
rExpandLazyLoadedMaps[rowid] = row;
|
|
2506
2504
|
reactData.rowExpandLazyLoadedMaps = rExpandLazyLoadedMaps;
|
|
2507
2505
|
loadMethod({ $table: $xeTable, row, rowIndex: tableMethods.getRowIndex(row), $rowIndex: tableMethods.getVMRowIndex(row) }).then(() => {
|
|
2508
|
-
const
|
|
2506
|
+
const rowTempExpandedMaps = Object.assign({}, reactData.rowExpandedMaps);
|
|
2509
2507
|
if (rowRest) {
|
|
2510
2508
|
rowRest.expandLoaded = true;
|
|
2511
2509
|
}
|
|
2512
|
-
|
|
2513
|
-
reactData.rowExpandedMaps =
|
|
2510
|
+
rowTempExpandedMaps[rowid] = row;
|
|
2511
|
+
reactData.rowExpandedMaps = rowTempExpandedMaps;
|
|
2514
2512
|
}).catch(() => {
|
|
2515
2513
|
if (rowRest) {
|
|
2516
2514
|
rowRest.expandLoaded = false;
|
|
@@ -2657,28 +2655,26 @@ export default defineComponent({
|
|
|
2657
2655
|
if (treeConfig) {
|
|
2658
2656
|
if (transform) {
|
|
2659
2657
|
// 树结构自动转换
|
|
2660
|
-
if (
|
|
2661
|
-
|
|
2662
|
-
|
|
2663
|
-
|
|
2664
|
-
|
|
2665
|
-
|
|
2666
|
-
|
|
2667
|
-
|
|
2668
|
-
|
|
2669
|
-
|
|
2670
|
-
|
|
2671
|
-
errLog('vxe.error.reqProp', ['tree-config.mapChildrenField']);
|
|
2672
|
-
}
|
|
2673
|
-
if (childrenField === treeOpts.mapChildrenField) {
|
|
2674
|
-
errLog('vxe.error.errConflicts', ['tree-config.childrenField', 'tree-config.mapChildrenField']);
|
|
2675
|
-
}
|
|
2676
|
-
// fullData.forEach(row => {
|
|
2677
|
-
// if (row[treeOpts.children] && row[treeOpts.children].length) {
|
|
2678
|
-
// warnLog('vxe.error.errConflicts', ['tree-config.transform', `row.${treeOpts.children}`])
|
|
2679
|
-
// }
|
|
2680
|
-
// })
|
|
2658
|
+
if (!treeOpts.rowField) {
|
|
2659
|
+
errLog('vxe.error.reqProp', ['tree-config.rowField']);
|
|
2660
|
+
}
|
|
2661
|
+
if (!treeOpts.parentField) {
|
|
2662
|
+
errLog('vxe.error.reqProp', ['tree-config.parentField']);
|
|
2663
|
+
}
|
|
2664
|
+
if (!childrenField) {
|
|
2665
|
+
errLog('vxe.error.reqProp', ['tree-config.childrenField']);
|
|
2666
|
+
}
|
|
2667
|
+
if (!treeOpts.mapChildrenField) {
|
|
2668
|
+
errLog('vxe.error.reqProp', ['tree-config.mapChildrenField']);
|
|
2681
2669
|
}
|
|
2670
|
+
if (childrenField === treeOpts.mapChildrenField) {
|
|
2671
|
+
errLog('vxe.error.errConflicts', ['tree-config.childrenField', 'tree-config.mapChildrenField']);
|
|
2672
|
+
}
|
|
2673
|
+
// fullData.forEach(row => {
|
|
2674
|
+
// if (row[treeOpts.children] && row[treeOpts.children].length) {
|
|
2675
|
+
// warnLog('vxe.error.errConflicts', ['tree-config.transform', `row.${treeOpts.children}`])
|
|
2676
|
+
// }
|
|
2677
|
+
// })
|
|
2682
2678
|
treeData = XEUtils.toArrayTree(fullData, {
|
|
2683
2679
|
key: treeOpts.rowField,
|
|
2684
2680
|
parentKey: treeOpts.parentField,
|
|
@@ -2743,16 +2739,14 @@ export default defineComponent({
|
|
|
2743
2739
|
// }
|
|
2744
2740
|
// }
|
|
2745
2741
|
// }
|
|
2746
|
-
if (
|
|
2747
|
-
|
|
2748
|
-
|
|
2749
|
-
|
|
2750
|
-
|
|
2751
|
-
|
|
2752
|
-
|
|
2753
|
-
|
|
2754
|
-
warnLog('vxe.error.scrollErrProp', ['table.span-method']);
|
|
2755
|
-
}
|
|
2742
|
+
if (!(props.height || props.maxHeight)) {
|
|
2743
|
+
errLog('vxe.error.reqProp', ['table.height | table.max-height | table.scroll-y={enabled: false}']);
|
|
2744
|
+
}
|
|
2745
|
+
// if (!props.showOverflow) {
|
|
2746
|
+
// warnLog('vxe.error.reqProp', ['table.show-overflow'])
|
|
2747
|
+
// }
|
|
2748
|
+
if (props.spanMethod) {
|
|
2749
|
+
errLog('vxe.error.scrollErrProp', ['table.span-method']);
|
|
2756
2750
|
}
|
|
2757
2751
|
}
|
|
2758
2752
|
handleReserveStatus();
|
|
@@ -3737,23 +3731,6 @@ export default defineComponent({
|
|
|
3737
3731
|
}
|
|
3738
3732
|
return tableMethods.createData(records).then((rows) => isArr ? rows : rows[0]);
|
|
3739
3733
|
},
|
|
3740
|
-
// toOriginalRecords (rows: any[]) {
|
|
3741
|
-
// const { treeConfig } = props
|
|
3742
|
-
// const treeOpts = computeTreeOpts.value
|
|
3743
|
-
// const { transform, mapChildrenField } = treeOpts
|
|
3744
|
-
// const rowkey = getRowkey($xeTable)
|
|
3745
|
-
// if (treeConfig) {
|
|
3746
|
-
// if (transform) {
|
|
3747
|
-
// return []
|
|
3748
|
-
// }
|
|
3749
|
-
// return []
|
|
3750
|
-
// }
|
|
3751
|
-
// return rows.map(item => {
|
|
3752
|
-
// const obj = Object.assign({}, item)
|
|
3753
|
-
// delete obj.rowkey
|
|
3754
|
-
// return obj
|
|
3755
|
-
// })
|
|
3756
|
-
// },
|
|
3757
3734
|
/**
|
|
3758
3735
|
* 还原数据
|
|
3759
3736
|
* 如果不传任何参数,则还原整个表格
|
|
@@ -3762,8 +3739,10 @@ export default defineComponent({
|
|
|
3762
3739
|
* 如果还额外传了 field 则还原指定的单元格数据
|
|
3763
3740
|
*/
|
|
3764
3741
|
revertData(rows, field) {
|
|
3765
|
-
const { keepSource } = props;
|
|
3766
|
-
const { tableSourceData, sourceDataRowIdData } = internalData;
|
|
3742
|
+
const { keepSource, treeConfig } = props;
|
|
3743
|
+
const { fullAllDataRowIdData, tableSourceData, sourceDataRowIdData, tableFullData, afterFullData } = internalData;
|
|
3744
|
+
const treeOpts = computeTreeOpts.value;
|
|
3745
|
+
const { transform } = treeOpts;
|
|
3767
3746
|
if (!keepSource) {
|
|
3768
3747
|
if (process.env.NODE_ENV === 'development') {
|
|
3769
3748
|
warnLog('vxe.error.reqProp', ['keep-source']);
|
|
@@ -3779,9 +3758,10 @@ export default defineComponent({
|
|
|
3779
3758
|
else {
|
|
3780
3759
|
targetRows = XEUtils.toArray($xeTable.getUpdateRecords());
|
|
3781
3760
|
}
|
|
3761
|
+
let reDelFlag = false;
|
|
3782
3762
|
if (targetRows.length) {
|
|
3783
3763
|
targetRows.forEach((row) => {
|
|
3784
|
-
if (
|
|
3764
|
+
if (!$xeTable.isInsertByRow(row)) {
|
|
3785
3765
|
const rowid = getRowid($xeTable, row);
|
|
3786
3766
|
const oRow = sourceDataRowIdData[rowid];
|
|
3787
3767
|
if (oRow && row) {
|
|
@@ -3791,14 +3771,38 @@ export default defineComponent({
|
|
|
3791
3771
|
else {
|
|
3792
3772
|
XEUtils.destructuring(row, XEUtils.clone(oRow, true));
|
|
3793
3773
|
}
|
|
3774
|
+
if ($xeTable.isRemoveByRow(row)) {
|
|
3775
|
+
const rowRest = fullAllDataRowIdData[rowid];
|
|
3776
|
+
if (rowRest) {
|
|
3777
|
+
const reRow = rowRest.row;
|
|
3778
|
+
tableFullData.unshift(reRow);
|
|
3779
|
+
afterFullData.unshift(reRow);
|
|
3780
|
+
reDelFlag = true;
|
|
3781
|
+
}
|
|
3782
|
+
}
|
|
3794
3783
|
}
|
|
3795
3784
|
}
|
|
3796
3785
|
});
|
|
3797
3786
|
}
|
|
3798
3787
|
if (rows) {
|
|
3799
|
-
|
|
3788
|
+
if (reDelFlag) {
|
|
3789
|
+
$xeTable.updateFooter();
|
|
3790
|
+
$xeTable.cacheRowMap(false);
|
|
3791
|
+
$xeTable.handleTableData(treeConfig && transform);
|
|
3792
|
+
if (!(treeConfig && transform)) {
|
|
3793
|
+
$xeTable.updateAfterDataIndex();
|
|
3794
|
+
}
|
|
3795
|
+
$xeTable.checkSelectionStatus();
|
|
3796
|
+
if (reactData.scrollYLoad) {
|
|
3797
|
+
$xeTable.updateScrollYSpace();
|
|
3798
|
+
}
|
|
3799
|
+
}
|
|
3800
|
+
return nextTick().then(() => {
|
|
3801
|
+
$xeTable.updateCellAreas();
|
|
3802
|
+
return $xeTable.recalculate();
|
|
3803
|
+
});
|
|
3800
3804
|
}
|
|
3801
|
-
return
|
|
3805
|
+
return $xeTable.reloadData(tableSourceData);
|
|
3802
3806
|
},
|
|
3803
3807
|
/**
|
|
3804
3808
|
* 清空单元格内容
|
|
@@ -3918,6 +3922,11 @@ export default defineComponent({
|
|
|
3918
3922
|
const rowid = getRowid($xeTable, row);
|
|
3919
3923
|
return !!editStore.insertMaps[rowid];
|
|
3920
3924
|
},
|
|
3925
|
+
isRemoveByRow(row) {
|
|
3926
|
+
const { editStore } = reactData;
|
|
3927
|
+
const rowid = getRowid($xeTable, row);
|
|
3928
|
+
return !!editStore.removeMaps[rowid];
|
|
3929
|
+
},
|
|
3921
3930
|
/**
|
|
3922
3931
|
* 删除所有新增的临时数据
|
|
3923
3932
|
* @returns
|
|
@@ -6727,14 +6736,15 @@ export default defineComponent({
|
|
|
6727
6736
|
*/
|
|
6728
6737
|
cacheRowMap() {
|
|
6729
6738
|
const { treeConfig } = props;
|
|
6730
|
-
const
|
|
6739
|
+
const { treeExpandedMaps } = reactData;
|
|
6731
6740
|
const { fullAllDataRowIdData, tableFullData, tableFullTreeData } = internalData;
|
|
6741
|
+
const treeOpts = computeTreeOpts.value;
|
|
6732
6742
|
const childrenField = treeOpts.children || treeOpts.childrenField;
|
|
6733
6743
|
const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
|
|
6734
6744
|
const rowkey = getRowkey($xeTable);
|
|
6735
|
-
const
|
|
6736
|
-
const fullAllDataRowIdMaps = {};
|
|
6745
|
+
const fullAllDataRowIdMaps = Object.assign({}, fullAllDataRowIdData); // 存在已删除数据
|
|
6737
6746
|
const fullDataRowIdMaps = {};
|
|
6747
|
+
const treeTempExpandedMaps = Object.assign({}, treeExpandedMaps);
|
|
6738
6748
|
const handleRow = (row, index, items, path, parentRow, nodes) => {
|
|
6739
6749
|
let rowid = getRowid($xeTable, row);
|
|
6740
6750
|
const seq = treeConfig && path ? toTreePathSeq(path) : index + 1;
|
|
@@ -6743,13 +6753,23 @@ export default defineComponent({
|
|
|
6743
6753
|
rowid = getRowUniqueId();
|
|
6744
6754
|
XEUtils.set(row, rowkey, rowid);
|
|
6745
6755
|
}
|
|
6746
|
-
if (
|
|
6747
|
-
|
|
6756
|
+
if (treeConfig && treeOpts.lazy) {
|
|
6757
|
+
const treeExpRest = treeExpandedMaps[rowid];
|
|
6758
|
+
if (row[hasChildField] && XEUtils.isUndefined(row[childrenField])) {
|
|
6759
|
+
row[childrenField] = null;
|
|
6760
|
+
}
|
|
6761
|
+
if (treeExpRest) {
|
|
6762
|
+
if (!row[childrenField] || !row[childrenField].length) {
|
|
6763
|
+
delete treeTempExpandedMaps[rowid];
|
|
6764
|
+
}
|
|
6765
|
+
}
|
|
6748
6766
|
}
|
|
6749
6767
|
let rowRest = fullAllDataRowIdData[rowid];
|
|
6750
6768
|
if (!rowRest) {
|
|
6751
6769
|
rowRest = { row, rowid, seq, index: -1, _index: -1, $index: -1, treeIndex: index, items, parent: parentRow, level, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
|
|
6752
6770
|
}
|
|
6771
|
+
rowRest.treeLoaded = false;
|
|
6772
|
+
rowRest.expandLoaded = false;
|
|
6753
6773
|
rowRest.row = row;
|
|
6754
6774
|
rowRest.items = items;
|
|
6755
6775
|
rowRest.parent = parentRow;
|
|
@@ -6758,14 +6778,15 @@ export default defineComponent({
|
|
|
6758
6778
|
fullDataRowIdMaps[rowid] = rowRest;
|
|
6759
6779
|
fullAllDataRowIdMaps[rowid] = rowRest;
|
|
6760
6780
|
};
|
|
6761
|
-
internalData.fullDataRowIdData = fullDataRowIdMaps;
|
|
6762
|
-
internalData.fullAllDataRowIdData = fullAllDataRowIdMaps;
|
|
6763
6781
|
if (treeConfig) {
|
|
6764
6782
|
XEUtils.eachTree(tableFullTreeData, handleRow, { children: childrenField });
|
|
6765
6783
|
}
|
|
6766
6784
|
else {
|
|
6767
6785
|
tableFullData.forEach(handleRow);
|
|
6768
6786
|
}
|
|
6787
|
+
internalData.fullDataRowIdData = fullDataRowIdMaps;
|
|
6788
|
+
internalData.fullAllDataRowIdData = fullAllDataRowIdMaps;
|
|
6789
|
+
reactData.treeExpandedMaps = treeTempExpandedMaps;
|
|
6769
6790
|
},
|
|
6770
6791
|
cacheSourceMap(fullData) {
|
|
6771
6792
|
const { treeConfig } = props;
|
|
@@ -9335,18 +9356,16 @@ export default defineComponent({
|
|
|
9335
9356
|
}
|
|
9336
9357
|
};
|
|
9337
9358
|
// 检测对应模块是否安装
|
|
9338
|
-
|
|
9339
|
-
|
|
9340
|
-
|
|
9341
|
-
|
|
9342
|
-
|
|
9343
|
-
|
|
9344
|
-
|
|
9345
|
-
|
|
9346
|
-
|
|
9347
|
-
|
|
9348
|
-
});
|
|
9349
|
-
}
|
|
9359
|
+
'openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',').forEach(name => {
|
|
9360
|
+
$xeTable[name] = function () {
|
|
9361
|
+
errLog('vxe.error.reqModule', ['VxeTableExportModule']);
|
|
9362
|
+
};
|
|
9363
|
+
});
|
|
9364
|
+
'clearValidate,fullValidate,validate'.split(',').forEach(name => {
|
|
9365
|
+
$xeTable[name] = function () {
|
|
9366
|
+
errLog('vxe.error.reqModule', ['VxeTableValidatorModule']);
|
|
9367
|
+
};
|
|
9368
|
+
});
|
|
9350
9369
|
Object.assign($xeTable, tableMethods, tablePrivateMethods);
|
|
9351
9370
|
/**
|
|
9352
9371
|
* 渲染浮固定列
|
|
@@ -10307,23 +10326,21 @@ export default defineComponent({
|
|
|
10307
10326
|
globalEvents.off($xeTable, 'contextmenu');
|
|
10308
10327
|
tablePrivateMethods.preventEvent(null, 'unmounted', { $table: $xeTable });
|
|
10309
10328
|
});
|
|
10310
|
-
|
|
10311
|
-
|
|
10312
|
-
if (
|
|
10313
|
-
|
|
10314
|
-
errLog('vxe.error.reqComp', ['vxe-loading']);
|
|
10315
|
-
}
|
|
10329
|
+
nextTick(() => {
|
|
10330
|
+
if (props.loading) {
|
|
10331
|
+
if (!VxeUILoadingComponent && !slots.loading) {
|
|
10332
|
+
errLog('vxe.error.reqComp', ['vxe-loading']);
|
|
10316
10333
|
}
|
|
10317
|
-
|
|
10318
|
-
|
|
10319
|
-
|
|
10320
|
-
|
|
10321
|
-
|
|
10322
|
-
|
|
10323
|
-
|
|
10334
|
+
}
|
|
10335
|
+
if ((props.showOverflow === true || props.showOverflow === 'tooltip') ||
|
|
10336
|
+
(props.showHeaderOverflow === true || props.showHeaderOverflow === 'tooltip') ||
|
|
10337
|
+
(props.showFooterOverflow === true || props.showFooterOverflow === 'tooltip') ||
|
|
10338
|
+
props.tooltipConfig || props.editRules) {
|
|
10339
|
+
if (!VxeUITooltipComponent) {
|
|
10340
|
+
errLog('vxe.error.reqComp', ['vxe-tooltip']);
|
|
10324
10341
|
}
|
|
10325
|
-
}
|
|
10326
|
-
}
|
|
10342
|
+
}
|
|
10343
|
+
});
|
|
10327
10344
|
provide('$xeColgroup', null);
|
|
10328
10345
|
provide('$xeTable', $xeTable);
|
|
10329
10346
|
$xeTable.renderVN = renderVN;
|
|
@@ -186,9 +186,7 @@ export default defineComponent({
|
|
|
186
186
|
tCommandMethod(params);
|
|
187
187
|
}
|
|
188
188
|
else {
|
|
189
|
-
|
|
190
|
-
errLog('vxe.error.notCommands', [code]);
|
|
191
|
-
}
|
|
189
|
+
errLog('vxe.error.notCommands', [code]);
|
|
192
190
|
}
|
|
193
191
|
}
|
|
194
192
|
$xeToolbar.dispatchEvent('button-click', params, evnt);
|
|
@@ -212,9 +210,7 @@ export default defineComponent({
|
|
|
212
210
|
tCommandMethod(params);
|
|
213
211
|
}
|
|
214
212
|
else {
|
|
215
|
-
|
|
216
|
-
errLog('vxe.error.notCommands', [code]);
|
|
217
|
-
}
|
|
213
|
+
errLog('vxe.error.notCommands', [code]);
|
|
218
214
|
}
|
|
219
215
|
}
|
|
220
216
|
$xeToolbar.dispatchEvent('tool-click', params, evnt);
|
|
@@ -541,25 +537,21 @@ export default defineComponent({
|
|
|
541
537
|
warnLog('vxe.error.notFunc', ['queryMethod']);
|
|
542
538
|
}
|
|
543
539
|
const customOpts = computeCustomOpts.value;
|
|
544
|
-
if (
|
|
545
|
-
|
|
546
|
-
warnLog('vxe.error.delProp', ['toolbar.custom.isFooter', 'table.custom-config.showFooter']);
|
|
547
|
-
}
|
|
548
|
-
if (customOpts.showFooter) {
|
|
549
|
-
warnLog('vxe.error.delProp', ['toolbar.custom.showFooter', 'table.custom-config.showFooter']);
|
|
550
|
-
}
|
|
551
|
-
if (customOpts.immediate) {
|
|
552
|
-
warnLog('vxe.error.delProp', ['toolbar.custom.immediate', 'table.custom-config.immediate']);
|
|
553
|
-
}
|
|
554
|
-
if (customOpts.trigger) {
|
|
555
|
-
warnLog('vxe.error.delProp', ['toolbar.custom.trigger', 'table.custom-config.trigger']);
|
|
556
|
-
}
|
|
540
|
+
if (customOpts.isFooter) {
|
|
541
|
+
warnLog('vxe.error.delProp', ['toolbar.custom.isFooter', 'table.custom-config.showFooter']);
|
|
557
542
|
}
|
|
558
|
-
if (
|
|
559
|
-
|
|
560
|
-
|
|
561
|
-
|
|
562
|
-
|
|
543
|
+
if (customOpts.showFooter) {
|
|
544
|
+
warnLog('vxe.error.delProp', ['toolbar.custom.showFooter', 'table.custom-config.showFooter']);
|
|
545
|
+
}
|
|
546
|
+
if (customOpts.immediate) {
|
|
547
|
+
warnLog('vxe.error.delProp', ['toolbar.custom.immediate', 'table.custom-config.immediate']);
|
|
548
|
+
}
|
|
549
|
+
if (customOpts.trigger) {
|
|
550
|
+
warnLog('vxe.error.delProp', ['toolbar.custom.trigger', 'table.custom-config.trigger']);
|
|
551
|
+
}
|
|
552
|
+
if (props.refresh || props.import || props.export || props.print || props.zoom) {
|
|
553
|
+
if (!VxeUIButtonComponent) {
|
|
554
|
+
errLog('vxe.error.reqComp', ['vxe-button']);
|
|
563
555
|
}
|
|
564
556
|
}
|
|
565
557
|
});
|
package/es/ui/index.js
CHANGED
package/es/ui/src/log.js
CHANGED
package/lib/grid/src/grid.js
CHANGED
|
@@ -28,7 +28,7 @@ const {
|
|
|
28
28
|
renderEmptyElement
|
|
29
29
|
} = _ui.VxeUI;
|
|
30
30
|
const tableComponentPropKeys = Object.keys(_props.default);
|
|
31
|
-
const tableComponentMethodKeys = ['clearAll', 'syncData', 'updateData', 'loadData', 'reloadData', 'reloadRow', 'loadColumn', 'reloadColumn', 'getRowNode', 'getColumnNode', 'getRowIndex', 'getVTRowIndex', 'getVMRowIndex', 'getColumnIndex', 'getVTColumnIndex', 'getVMColumnIndex', 'setRow', 'createData', 'createRow', 'revertData', 'clearData', 'isInsertByRow', 'isUpdateByRow', 'getColumns', 'getColumnById', 'getColumnByField', 'getTableColumn', 'getFullColumns', 'getData', 'getCheckboxRecords', 'getParentRow', 'getTreeParentRow', 'getRowSeq', 'getRowById', 'getRowid', 'getTableData', 'getFullData', 'setColumnFixed', 'clearColumnFixed', 'setColumnWidth', 'getColumnWidth', 'setRowHeightConf', 'getRowHeightConf', 'setRowHeight', 'getRowHeight', 'hideColumn', 'showColumn', 'resetColumn', 'refreshColumn', 'refreshScroll', 'recalculate', 'closeTooltip', 'isAllCheckboxChecked', 'isAllCheckboxIndeterminate', 'getCheckboxIndeterminateRecords', 'setCheckboxRow', 'setCheckboxRowKey', 'isCheckedByCheckboxRow', 'isCheckedByCheckboxRowKey', 'isIndeterminateByCheckboxRow', 'isIndeterminateByCheckboxRowKey', 'toggleCheckboxRow', 'setAllCheckboxRow', 'getRadioReserveRecord', 'clearRadioReserve', 'getCheckboxReserveRecords', 'clearCheckboxReserve', 'toggleAllCheckboxRow', 'clearCheckboxRow', 'setCurrentRow', 'isCheckedByRadioRow', 'isCheckedByRadioRowKey', 'setRadioRow', 'setRadioRowKey', 'clearCurrentRow', 'clearRadioRow', 'getCurrentRecord', 'getRadioRecord', 'getCurrentColumn', 'setCurrentColumn', 'clearCurrentColumn', 'setPendingRow', 'togglePendingRow', 'getPendingRecords', 'clearPendingRow', 'sort', 'setSort', 'clearSort', 'isSort', 'getSortColumns', 'closeFilter', 'isFilter', 'isActiveFilterByColumn', 'isRowExpandLoaded', 'clearRowExpandLoaded', 'reloadRowExpand', 'reloadRowExpand', 'toggleRowExpand', 'setAllRowExpand', 'setRowExpand', 'isExpandByRow', 'isRowExpandByRow', 'clearRowExpand', 'clearRowExpandReserve', 'getRowExpandRecords', 'getTreeExpandRecords', 'isTreeExpandLoaded', 'clearTreeExpandLoaded', 'reloadTreeExpand', 'reloadTreeChilds', 'toggleTreeExpand', 'setAllTreeExpand', 'setTreeExpand', 'isTreeExpandByRow', 'clearTreeExpand', 'clearTreeExpandReserve', 'getScroll', 'scrollTo', 'scrollToRow', 'scrollToColumn', 'clearScroll', 'updateFooter', 'updateStatus', 'setMergeCells', 'removeInsertRow', 'removeMergeCells', 'getMergeCells', 'clearMergeCells', 'setMergeFooterItems', 'removeMergeFooterItems', 'getMergeFooterItems', 'clearMergeFooterItems', 'getCustomStoreData', 'openTooltip', 'getCellLabel', 'getCellElement', 'focus', 'blur', 'connect'];
|
|
31
|
+
const tableComponentMethodKeys = ['clearAll', 'syncData', 'updateData', 'loadData', 'reloadData', 'reloadRow', 'loadColumn', 'reloadColumn', 'getRowNode', 'getColumnNode', 'getRowIndex', 'getVTRowIndex', 'getVMRowIndex', 'getColumnIndex', 'getVTColumnIndex', 'getVMColumnIndex', 'setRow', 'createData', 'createRow', 'revertData', 'clearData', 'isRemoveByRow', 'isInsertByRow', 'isUpdateByRow', 'getColumns', 'getColumnById', 'getColumnByField', 'getTableColumn', 'getFullColumns', 'getData', 'getCheckboxRecords', 'getParentRow', 'getTreeParentRow', 'getRowSeq', 'getRowById', 'getRowid', 'getTableData', 'getFullData', 'setColumnFixed', 'clearColumnFixed', 'setColumnWidth', 'getColumnWidth', 'setRowHeightConf', 'getRowHeightConf', 'setRowHeight', 'getRowHeight', 'hideColumn', 'showColumn', 'resetColumn', 'refreshColumn', 'refreshScroll', 'recalculate', 'closeTooltip', 'isAllCheckboxChecked', 'isAllCheckboxIndeterminate', 'getCheckboxIndeterminateRecords', 'setCheckboxRow', 'setCheckboxRowKey', 'isCheckedByCheckboxRow', 'isCheckedByCheckboxRowKey', 'isIndeterminateByCheckboxRow', 'isIndeterminateByCheckboxRowKey', 'toggleCheckboxRow', 'setAllCheckboxRow', 'getRadioReserveRecord', 'clearRadioReserve', 'getCheckboxReserveRecords', 'clearCheckboxReserve', 'toggleAllCheckboxRow', 'clearCheckboxRow', 'setCurrentRow', 'isCheckedByRadioRow', 'isCheckedByRadioRowKey', 'setRadioRow', 'setRadioRowKey', 'clearCurrentRow', 'clearRadioRow', 'getCurrentRecord', 'getRadioRecord', 'getCurrentColumn', 'setCurrentColumn', 'clearCurrentColumn', 'setPendingRow', 'togglePendingRow', 'getPendingRecords', 'clearPendingRow', 'sort', 'setSort', 'clearSort', 'isSort', 'getSortColumns', 'closeFilter', 'isFilter', 'isActiveFilterByColumn', 'isRowExpandLoaded', 'clearRowExpandLoaded', 'reloadRowExpand', 'reloadRowExpand', 'toggleRowExpand', 'setAllRowExpand', 'setRowExpand', 'isExpandByRow', 'isRowExpandByRow', 'clearRowExpand', 'clearRowExpandReserve', 'getRowExpandRecords', 'getTreeExpandRecords', 'isTreeExpandLoaded', 'clearTreeExpandLoaded', 'reloadTreeExpand', 'reloadTreeChilds', 'toggleTreeExpand', 'setAllTreeExpand', 'setTreeExpand', 'isTreeExpandByRow', 'clearTreeExpand', 'clearTreeExpandReserve', 'getScroll', 'scrollTo', 'scrollToRow', 'scrollToColumn', 'clearScroll', 'updateFooter', 'updateStatus', 'setMergeCells', 'removeInsertRow', 'removeMergeCells', 'getMergeCells', 'clearMergeCells', 'setMergeFooterItems', 'removeMergeFooterItems', 'getMergeFooterItems', 'clearMergeFooterItems', 'getCustomStoreData', 'openTooltip', 'getCellLabel', 'getCellElement', 'focus', 'blur', 'connect'];
|
|
32
32
|
const gridComponentEmits = [..._emits.default, 'page-change', 'form-submit', 'form-submit-invalid', 'form-reset', 'form-collapse', 'form-toggle-collapse', 'proxy-query', 'proxy-delete', 'proxy-save', 'toolbar-button-click', 'toolbar-tool-click', 'zoom'];
|
|
33
33
|
var _default = exports.default = (0, _vue.defineComponent)({
|
|
34
34
|
name: 'VxeGrid',
|
|
@@ -490,9 +490,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
|
|
|
490
490
|
if (slots[funcSlot]) {
|
|
491
491
|
return slots[funcSlot];
|
|
492
492
|
} else {
|
|
493
|
-
|
|
494
|
-
(0, _log.errLog)('vxe.error.notSlot', [funcSlot]);
|
|
495
|
-
}
|
|
493
|
+
(0, _log.errLog)('vxe.error.notSlot', [funcSlot]);
|
|
496
494
|
}
|
|
497
495
|
} else {
|
|
498
496
|
return funcSlot;
|
|
@@ -1082,9 +1080,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
|
|
|
1082
1080
|
};
|
|
1083
1081
|
});
|
|
1084
1082
|
} else {
|
|
1085
|
-
|
|
1086
|
-
(0, _log.errLog)('vxe.error.notFunc', ['proxy-config.ajax.query']);
|
|
1087
|
-
}
|
|
1083
|
+
(0, _log.errLog)('vxe.error.notFunc', ['proxy-config.ajax.query']);
|
|
1088
1084
|
}
|
|
1089
1085
|
break;
|
|
1090
1086
|
}
|
|
@@ -1170,9 +1166,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
|
|
|
1170
1166
|
}
|
|
1171
1167
|
}
|
|
1172
1168
|
} else {
|
|
1173
|
-
|
|
1174
|
-
(0, _log.errLog)('vxe.error.notFunc', ['proxy-config.ajax.delete']);
|
|
1175
|
-
}
|
|
1169
|
+
(0, _log.errLog)('vxe.error.notFunc', ['proxy-config.ajax.delete']);
|
|
1176
1170
|
}
|
|
1177
1171
|
break;
|
|
1178
1172
|
}
|
|
@@ -1274,9 +1268,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
|
|
|
1274
1268
|
}
|
|
1275
1269
|
});
|
|
1276
1270
|
} else {
|
|
1277
|
-
|
|
1278
|
-
(0, _log.errLog)('vxe.error.notFunc', ['proxy-config.ajax.save']);
|
|
1279
|
-
}
|
|
1271
|
+
(0, _log.errLog)('vxe.error.notFunc', ['proxy-config.ajax.save']);
|
|
1280
1272
|
}
|
|
1281
1273
|
break;
|
|
1282
1274
|
}
|
|
@@ -1293,9 +1285,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
|
|
|
1293
1285
|
$table: $xeTable
|
|
1294
1286
|
}, ...args);
|
|
1295
1287
|
} else {
|
|
1296
|
-
|
|
1297
|
-
(0, _log.errLog)('vxe.error.notCommands', [code]);
|
|
1298
|
-
}
|
|
1288
|
+
(0, _log.errLog)('vxe.error.notCommands', [code]);
|
|
1299
1289
|
}
|
|
1300
1290
|
}
|
|
1301
1291
|
}
|
|
@@ -1498,35 +1488,29 @@ var _default = exports.default = (0, _vue.defineComponent)({
|
|
|
1498
1488
|
});
|
|
1499
1489
|
initPages();
|
|
1500
1490
|
(0, _vue.onMounted)(() => {
|
|
1501
|
-
if (process.env.NODE_ENV === 'development') {
|
|
1502
|
-
(0, _vue.nextTick)(() => {
|
|
1503
|
-
if (props.formConfig) {
|
|
1504
|
-
if (!VxeUIFormComponent) {
|
|
1505
|
-
(0, _log.errLog)('vxe.error.reqComp', ['vxe-form']);
|
|
1506
|
-
}
|
|
1507
|
-
}
|
|
1508
|
-
if (props.pagerConfig) {
|
|
1509
|
-
if (!VxeUIPagerComponent) {
|
|
1510
|
-
(0, _log.errLog)('vxe.error.reqComp', ['vxe-pager']);
|
|
1511
|
-
}
|
|
1512
|
-
}
|
|
1513
|
-
});
|
|
1514
|
-
}
|
|
1515
1491
|
(0, _vue.nextTick)(() => {
|
|
1516
1492
|
const {
|
|
1517
1493
|
columns
|
|
1518
1494
|
} = props;
|
|
1495
|
+
if (props.formConfig) {
|
|
1496
|
+
if (!VxeUIFormComponent) {
|
|
1497
|
+
(0, _log.errLog)('vxe.error.reqComp', ['vxe-form']);
|
|
1498
|
+
}
|
|
1499
|
+
}
|
|
1500
|
+
if (props.pagerConfig) {
|
|
1501
|
+
if (!VxeUIPagerComponent) {
|
|
1502
|
+
(0, _log.errLog)('vxe.error.reqComp', ['vxe-pager']);
|
|
1503
|
+
}
|
|
1504
|
+
}
|
|
1519
1505
|
// const { data, columns, proxyConfig } = props
|
|
1520
1506
|
// const proxyOpts = computeProxyOpts.value
|
|
1521
1507
|
// const formOpts = computeFormOpts.value
|
|
1522
1508
|
// if (isEnableConf(proxyConfig) && (data || (proxyOpts.form && formOpts.data))) {
|
|
1523
1509
|
// errLog('vxe.error.errConflicts', ['grid.data', 'grid.proxy-config'])
|
|
1524
1510
|
// }
|
|
1525
|
-
// if (process.env.NODE_ENV === 'development') {
|
|
1526
1511
|
// if (proxyOpts.props) {
|
|
1527
1512
|
// warnLog('vxe.error.delProp', ['proxy-config.props', 'proxy-config.response'])
|
|
1528
1513
|
// }
|
|
1529
|
-
// }
|
|
1530
1514
|
if (columns && columns.length) {
|
|
1531
1515
|
$xeGrid.loadColumn(columns);
|
|
1532
1516
|
}
|