@fecp/designer 5.4.108 → 5.4.110
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/designer/package.json.mjs +1 -1
- package/es/designer/src/packages/dialog/useDialogDialog.mjs +1 -1
- package/es/designer/src/packages/dialogGlobal/useDialogGlobalDialog.mjs +1 -1
- package/es/designer/src/packages/form/property/widgets.vue.mjs +2 -2
- package/es/designer.css +5 -5
- package/es/node_modules/vxe-table/es/grid/src/grid.mjs +1 -1
- package/es/node_modules/vxe-table/es/table/module/custom/hook.mjs +1 -1
- package/es/node_modules/vxe-table/es/table/module/custom/panel.mjs +1 -1
- package/es/node_modules/vxe-table/es/table/module/edit/hook.mjs +1 -1
- package/es/node_modules/vxe-table/es/table/module/export/export-panel.mjs +1 -1
- package/es/node_modules/vxe-table/es/table/module/export/hook.mjs +1 -1
- package/es/node_modules/vxe-table/es/table/module/export/import-panel.mjs +1 -1
- package/es/node_modules/vxe-table/es/table/module/filter/hook.mjs +1 -1
- package/es/node_modules/vxe-table/es/table/module/filter/panel.mjs +1 -1
- package/es/node_modules/vxe-table/es/table/module/keyboard/hook.mjs +1 -1
- package/es/node_modules/vxe-table/es/table/module/menu/hook.mjs +1 -1
- package/es/node_modules/vxe-table/es/table/module/menu/panel.mjs +1 -1
- package/es/node_modules/vxe-table/es/table/module/validator/hook.mjs +1 -1
- package/es/node_modules/vxe-table/es/table/render/index.mjs +1 -1
- package/es/node_modules/vxe-table/es/table/src/body.mjs +1 -1
- package/es/node_modules/vxe-table/es/table/src/cell.mjs +1 -1
- package/es/node_modules/vxe-table/es/table/src/columnInfo.mjs +1 -1
- package/es/node_modules/vxe-table/es/table/src/footer.mjs +1 -1
- package/es/node_modules/vxe-table/es/table/src/header.mjs +1 -1
- package/es/node_modules/vxe-table/es/table/src/table.mjs +1 -1
- package/es/node_modules/vxe-table/es/table/src/use/cell-view.mjs +1 -1
- package/es/node_modules/vxe-table/es/table/src/util.mjs +1 -1
- package/es/node_modules/vxe-table/es/toolbar/src/toolbar.mjs +1 -1
- package/es/node_modules/vxe-table/es/ui/src/anime.mjs +1 -1
- package/es/node_modules/vxe-table/es/ui/src/dom.mjs +1 -1
- package/es/node_modules/vxe-table/es/ui/src/utils.mjs +1 -1
- package/es/node_modules/vxe-table/es/ui/src/vn.mjs +1 -1
- package/es/packages/mobile/src/components/base/card/Card.vue.mjs +2 -2
- package/es/packages/mobile/src/components/dataDisplay/table/Table.vue.mjs +2 -1
- package/es/packages/mobile/src/components/form/field/Field.vue.mjs +0 -1
- package/es/packages/mobile/src/utils/optionUtil.mjs +2 -3
- package/es/packages/vue/src/components/forms/form/FormProxy.vue.mjs +13 -0
- package/es/packages/vue/src/components/forms/subForm/SubForm.vue.mjs +2 -2
- package/es/packages/vue/src/components/table/CustomButtons.vue.mjs +2 -1
- package/es/packages/vue/src/components/table/DynamicQuery.vue.mjs +2 -1
- package/es/packages/vue/src/components/table/Table.vue.mjs +2 -1
- package/es/packages/vue/src/components/table/TableColumn.vue.mjs +2 -1
- package/lib/designer/package.json.js +1 -1
- package/lib/designer/src/packages/dialog/useDialogDialog.js +1 -1
- package/lib/designer/src/packages/dialogGlobal/useDialogGlobalDialog.js +1 -1
- package/lib/designer/src/packages/form/property/widgets.vue.js +2 -2
- package/lib/designer.css +5 -5
- package/lib/node_modules/vxe-table/es/grid/src/grid.js +41 -41
- package/lib/node_modules/vxe-table/es/table/module/custom/hook.js +9 -9
- package/lib/node_modules/vxe-table/es/table/module/custom/panel.js +23 -23
- package/lib/node_modules/vxe-table/es/table/module/edit/hook.js +28 -28
- package/lib/node_modules/vxe-table/es/table/module/export/export-panel.js +6 -6
- package/lib/node_modules/vxe-table/es/table/module/export/hook.js +50 -50
- package/lib/node_modules/vxe-table/es/table/module/export/import-panel.js +2 -2
- package/lib/node_modules/vxe-table/es/table/module/filter/hook.js +2 -2
- package/lib/node_modules/vxe-table/es/table/module/filter/panel.js +3 -3
- package/lib/node_modules/vxe-table/es/table/module/keyboard/hook.js +6 -6
- package/lib/node_modules/vxe-table/es/table/module/menu/hook.js +7 -7
- package/lib/node_modules/vxe-table/es/table/module/menu/panel.js +9 -9
- package/lib/node_modules/vxe-table/es/table/module/validator/hook.js +26 -26
- package/lib/node_modules/vxe-table/es/table/render/index.js +65 -65
- package/lib/node_modules/vxe-table/es/table/src/body.js +10 -10
- package/lib/node_modules/vxe-table/es/table/src/cell.js +15 -15
- package/lib/node_modules/vxe-table/es/table/src/columnInfo.js +12 -12
- package/lib/node_modules/vxe-table/es/table/src/footer.js +7 -7
- package/lib/node_modules/vxe-table/es/table/src/header.js +12 -12
- package/lib/node_modules/vxe-table/es/table/src/table.js +342 -342
- package/lib/node_modules/vxe-table/es/table/src/use/cell-view.js +3 -3
- package/lib/node_modules/vxe-table/es/table/src/util.js +24 -24
- package/lib/node_modules/vxe-table/es/toolbar/src/toolbar.js +23 -23
- package/lib/node_modules/vxe-table/es/ui/src/anime.js +7 -7
- package/lib/node_modules/vxe-table/es/ui/src/dom.js +5 -5
- package/lib/node_modules/vxe-table/es/ui/src/utils.js +4 -4
- package/lib/node_modules/vxe-table/es/ui/src/vn.js +2 -2
- package/lib/packages/mobile/src/components/base/card/Card.vue.js +2 -2
- package/lib/packages/mobile/src/components/dataDisplay/table/Table.vue.js +3 -2
- package/lib/packages/mobile/src/components/form/field/Field.vue.js +0 -1
- package/lib/packages/mobile/src/utils/optionUtil.js +2 -3
- package/lib/packages/vue/src/components/forms/form/FormProxy.vue.js +13 -0
- package/lib/packages/vue/src/components/forms/subForm/SubForm.vue.js +2 -2
- package/lib/packages/vue/src/components/table/CustomButtons.vue.js +5 -4
- package/lib/packages/vue/src/components/table/DynamicQuery.vue.js +27 -26
- package/lib/packages/vue/src/components/table/Table.vue.js +5 -4
- package/lib/packages/vue/src/components/table/TableColumn.vue.js +17 -16
- package/package.json +1 -1
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
const vue = require("vue");
|
|
3
|
-
const
|
|
3
|
+
const XEUtils = require("xe-utils");
|
|
4
4
|
require("../../../ui/index.js");
|
|
5
5
|
const utils = require("../../../ui/src/utils.js");
|
|
6
6
|
const util = require("../../src/util.js");
|
|
@@ -14,7 +14,7 @@ hooks.add("tableEditModule", {
|
|
|
14
14
|
const { props, reactData, internalData } = $xeTable;
|
|
15
15
|
const { refElem } = $xeTable.getRefMaps();
|
|
16
16
|
const { computeMouseOpts, computeEditOpts, computeCheckboxOpts, computeTreeOpts, computeValidOpts } = $xeTable.getComputeMaps();
|
|
17
|
-
const browseObj =
|
|
17
|
+
const browseObj = XEUtils.browse();
|
|
18
18
|
let editMethods = {};
|
|
19
19
|
let editPrivateMethods = {};
|
|
20
20
|
const getEditColumnModel = (row, column) => {
|
|
@@ -63,17 +63,17 @@ hooks.add("tableEditModule", {
|
|
|
63
63
|
newRecords.forEach((item) => {
|
|
64
64
|
const parentRowId = item[parentField];
|
|
65
65
|
const rowid = util.getRowid($xeTable, item);
|
|
66
|
-
const matchObj = parentRowId ?
|
|
66
|
+
const matchObj = parentRowId ? XEUtils.findTree(tableFullTreeData, (item2) => parentRowId === item2[rowField], { children: mapChildrenField }) : null;
|
|
67
67
|
if (matchObj) {
|
|
68
68
|
const { item: parentRow } = matchObj;
|
|
69
69
|
const parentRest = fullAllDataRowIdData[util.getRowid($xeTable, parentRow)];
|
|
70
70
|
const parentLevel = parentRest ? parentRest.level : 0;
|
|
71
71
|
let pChilds = parentRow[childrenField];
|
|
72
72
|
let pMapChilds = parentRow[mapChildrenField];
|
|
73
|
-
if (!
|
|
73
|
+
if (!XEUtils.isArray(pChilds)) {
|
|
74
74
|
pChilds = parentRow[childrenField] = [];
|
|
75
75
|
}
|
|
76
|
-
if (!
|
|
76
|
+
if (!XEUtils.isArray(pMapChilds)) {
|
|
77
77
|
pMapChilds = parentRow[mapChildrenField] = [];
|
|
78
78
|
}
|
|
79
79
|
pChilds[funcName](item);
|
|
@@ -100,11 +100,11 @@ hooks.add("tableEditModule", {
|
|
|
100
100
|
const treeOpts = computeTreeOpts.value;
|
|
101
101
|
const { transform, parentField, rowField, mapChildrenField } = treeOpts;
|
|
102
102
|
const childrenField = treeOpts.children || treeOpts.childrenField;
|
|
103
|
-
if (!
|
|
103
|
+
if (!XEUtils.isArray(records)) {
|
|
104
104
|
records = [records];
|
|
105
105
|
}
|
|
106
106
|
let targetRow = targetRowOrRowid;
|
|
107
|
-
if (
|
|
107
|
+
if (XEUtils.isString(targetRowOrRowid) || XEUtils.isNumber(targetRowOrRowid)) {
|
|
108
108
|
const rowRest = fullAllDataRowIdData[targetRowOrRowid];
|
|
109
109
|
if (rowRest) {
|
|
110
110
|
targetRow = rowRest.row;
|
|
@@ -113,9 +113,9 @@ hooks.add("tableEditModule", {
|
|
|
113
113
|
const newRecords = vue.reactive($xeTable.defineField(records.map((record) => Object.assign(treeConfig && transform ? { [mapChildrenField]: [], [childrenField]: [] } : {}, record))));
|
|
114
114
|
let treeRecords = [];
|
|
115
115
|
if (treeConfig && transform) {
|
|
116
|
-
treeRecords =
|
|
116
|
+
treeRecords = XEUtils.toArrayTree(newRecords, { key: rowField, parentKey: parentField, children: childrenField });
|
|
117
117
|
}
|
|
118
|
-
if (
|
|
118
|
+
if (XEUtils.eqNull(targetRow)) {
|
|
119
119
|
if (treeConfig && transform) {
|
|
120
120
|
insertTreeRow(newRecords, false);
|
|
121
121
|
} else if (isRowGroupStatus) {
|
|
@@ -160,7 +160,7 @@ hooks.add("tableEditModule", {
|
|
|
160
160
|
}
|
|
161
161
|
} else {
|
|
162
162
|
if (treeConfig && transform) {
|
|
163
|
-
const matchMapObj =
|
|
163
|
+
const matchMapObj = XEUtils.findTree(tableFullTreeData, (item) => targetRow[rowField] === item[rowField], { children: mapChildrenField });
|
|
164
164
|
if (matchMapObj) {
|
|
165
165
|
const { parent: parentRow } = matchMapObj;
|
|
166
166
|
const parentMapChilds = parentRow ? parentRow[mapChildrenField] : tableFullTreeData;
|
|
@@ -174,7 +174,7 @@ hooks.add("tableEditModule", {
|
|
|
174
174
|
}
|
|
175
175
|
} else {
|
|
176
176
|
if (row[parentField] !== null) {
|
|
177
|
-
if (!
|
|
177
|
+
if (!XEUtils.eqNull(row[parentField])) {
|
|
178
178
|
log.errLog("vxe.error.errProp", [`${parentField}=${row[parentField]}`, "null"]);
|
|
179
179
|
}
|
|
180
180
|
row[parentField] = null;
|
|
@@ -186,7 +186,7 @@ hooks.add("tableEditModule", {
|
|
|
186
186
|
}
|
|
187
187
|
parentMapChilds.splice(targetIndex, 0, row);
|
|
188
188
|
});
|
|
189
|
-
|
|
189
|
+
XEUtils.eachTree(treeRecords, (item) => {
|
|
190
190
|
const rowid = util.getRowid($xeTable, item);
|
|
191
191
|
const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, $index: -1, treeIndex: -1, _tIndex: -1, items: parentMapChilds, parent: parentRow, level: parentLevel + 1, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
|
|
192
192
|
if (item[childrenField]) {
|
|
@@ -196,7 +196,7 @@ hooks.add("tableEditModule", {
|
|
|
196
196
|
fullAllDataRowIdData[rowid] = rest;
|
|
197
197
|
}, { children: childrenField });
|
|
198
198
|
if (parentRow) {
|
|
199
|
-
const matchObj =
|
|
199
|
+
const matchObj = XEUtils.findTree(tableFullTreeData, (item) => targetRow[rowField] === item[rowField], { children: childrenField });
|
|
200
200
|
if (matchObj) {
|
|
201
201
|
const parentChilds = matchObj.items;
|
|
202
202
|
let targetIndex = matchObj.index;
|
|
@@ -220,7 +220,7 @@ hooks.add("tableEditModule", {
|
|
|
220
220
|
throw new Error(getI18n("vxe.error.noTree", ["insert"]));
|
|
221
221
|
}
|
|
222
222
|
let afIndex = -1;
|
|
223
|
-
if (
|
|
223
|
+
if (XEUtils.isNumber(targetRow)) {
|
|
224
224
|
if (targetRow < afterFullData.length) {
|
|
225
225
|
afIndex = targetRow;
|
|
226
226
|
}
|
|
@@ -263,7 +263,7 @@ hooks.add("tableEditModule", {
|
|
|
263
263
|
}
|
|
264
264
|
};
|
|
265
265
|
if (treeConfig && transform) {
|
|
266
|
-
|
|
266
|
+
XEUtils.eachTree(treeRecords, handleStatus, { children: mapChildrenField });
|
|
267
267
|
} else {
|
|
268
268
|
newRecords.forEach(handleStatus);
|
|
269
269
|
}
|
|
@@ -297,11 +297,11 @@ hooks.add("tableEditModule", {
|
|
|
297
297
|
const treeOpts = computeTreeOpts.value;
|
|
298
298
|
const { transform, rowField, parentField } = treeOpts;
|
|
299
299
|
if (treeConfig && transform) {
|
|
300
|
-
if (!
|
|
300
|
+
if (!XEUtils.isArray(records)) {
|
|
301
301
|
records = [records];
|
|
302
302
|
}
|
|
303
303
|
let parentRow = parentRowOrParentId;
|
|
304
|
-
if (
|
|
304
|
+
if (XEUtils.isString(parentRowOrParentId) || XEUtils.isNumber(parentRowOrParentId)) {
|
|
305
305
|
const rowRest = fullAllDataRowIdData[parentRowOrParentId];
|
|
306
306
|
if (rowRest) {
|
|
307
307
|
parentRow = rowRest.row;
|
|
@@ -450,7 +450,7 @@ hooks.add("tableEditModule", {
|
|
|
450
450
|
};
|
|
451
451
|
const handleEditCell = (row, fieldOrColumn, isPos) => {
|
|
452
452
|
const { editConfig } = props;
|
|
453
|
-
const column =
|
|
453
|
+
const column = XEUtils.isString(fieldOrColumn) ? $xeTable.getColumnByField(fieldOrColumn) : fieldOrColumn;
|
|
454
454
|
if (row && column && utils.isEnableConf(editConfig) && utils.isEnableConf(column.editRender) && !$xeTable.isAggregateRecord(row)) {
|
|
455
455
|
return Promise.resolve(isPos ? $xeTable.scrollToRow(row, column) : null).then(() => {
|
|
456
456
|
const cell = $xeTable.getCellElement(row, column);
|
|
@@ -520,7 +520,7 @@ hooks.add("tableEditModule", {
|
|
|
520
520
|
let delList = [];
|
|
521
521
|
if (!rows) {
|
|
522
522
|
rows = tableFullData;
|
|
523
|
-
} else if (!
|
|
523
|
+
} else if (!XEUtils.isArray(rows)) {
|
|
524
524
|
rows = [rows];
|
|
525
525
|
}
|
|
526
526
|
rows.forEach((row) => {
|
|
@@ -547,12 +547,12 @@ hooks.add("tableEditModule", {
|
|
|
547
547
|
if (treeConfig && transform) {
|
|
548
548
|
rows.forEach((row) => {
|
|
549
549
|
const rowid = util.getRowid($xeTable, row);
|
|
550
|
-
const matchMapObj =
|
|
550
|
+
const matchMapObj = XEUtils.findTree(tableFullTreeData, (item) => rowid === util.getRowid($xeTable, item), { children: mapChildrenField });
|
|
551
551
|
if (matchMapObj) {
|
|
552
552
|
const rItems = matchMapObj.items.splice(matchMapObj.index, 1);
|
|
553
553
|
delList.push(rItems[0]);
|
|
554
554
|
}
|
|
555
|
-
const matchObj =
|
|
555
|
+
const matchObj = XEUtils.findTree(tableFullTreeData, (item) => rowid === util.getRowid($xeTable, item), { children: childrenField });
|
|
556
556
|
if (matchObj) {
|
|
557
557
|
matchObj.items.splice(matchObj.index, 1);
|
|
558
558
|
}
|
|
@@ -670,7 +670,7 @@ hooks.add("tableEditModule", {
|
|
|
670
670
|
getInsertRecords() {
|
|
671
671
|
const { fullAllDataRowIdData, insertRowMaps } = internalData;
|
|
672
672
|
const insertRecords = [];
|
|
673
|
-
|
|
673
|
+
XEUtils.each(insertRowMaps, (row, rowid) => {
|
|
674
674
|
if (fullAllDataRowIdData[rowid]) {
|
|
675
675
|
insertRecords.push(row);
|
|
676
676
|
}
|
|
@@ -683,7 +683,7 @@ hooks.add("tableEditModule", {
|
|
|
683
683
|
getRemoveRecords() {
|
|
684
684
|
const { removeRowMaps } = internalData;
|
|
685
685
|
const removeRecords = [];
|
|
686
|
-
|
|
686
|
+
XEUtils.each(removeRowMaps, (row) => {
|
|
687
687
|
removeRecords.push(row);
|
|
688
688
|
});
|
|
689
689
|
return removeRecords;
|
|
@@ -700,7 +700,7 @@ hooks.add("tableEditModule", {
|
|
|
700
700
|
if (keepSource) {
|
|
701
701
|
syncActivedCell();
|
|
702
702
|
if (treeConfig) {
|
|
703
|
-
return
|
|
703
|
+
return XEUtils.filterTree(tableFullData, (row) => $xeTable.isUpdateByRow(row), treeOpts);
|
|
704
704
|
}
|
|
705
705
|
return tableFullData.filter((row) => $xeTable.isUpdateByRow(row));
|
|
706
706
|
}
|
|
@@ -795,12 +795,12 @@ hooks.add("tableEditModule", {
|
|
|
795
795
|
*/
|
|
796
796
|
setEditRow(row, fieldOrColumn) {
|
|
797
797
|
const { visibleColumn } = internalData;
|
|
798
|
-
let column =
|
|
798
|
+
let column = XEUtils.find(visibleColumn, (column2) => utils.isEnableConf(column2.editRender));
|
|
799
799
|
let isPos = false;
|
|
800
800
|
if (fieldOrColumn) {
|
|
801
801
|
isPos = true;
|
|
802
802
|
if (fieldOrColumn !== true) {
|
|
803
|
-
column =
|
|
803
|
+
column = XEUtils.isString(fieldOrColumn) ? $xeTable.getColumnByField(fieldOrColumn) : fieldOrColumn;
|
|
804
804
|
}
|
|
805
805
|
}
|
|
806
806
|
return handleEditCell(row, column, isPos);
|
|
@@ -821,7 +821,7 @@ hooks.add("tableEditModule", {
|
|
|
821
821
|
setSelectCell(row, fieldOrColumn) {
|
|
822
822
|
const { tableData } = reactData;
|
|
823
823
|
const editOpts = computeEditOpts.value;
|
|
824
|
-
const column =
|
|
824
|
+
const column = XEUtils.isString(fieldOrColumn) ? $xeTable.getColumnByField(fieldOrColumn) : fieldOrColumn;
|
|
825
825
|
if (row && column && editOpts.trigger !== "manual") {
|
|
826
826
|
const rowIndex = $xeTable.findRowIndexOf(tableData, row);
|
|
827
827
|
if (rowIndex > -1 && column) {
|
|
@@ -877,7 +877,7 @@ hooks.add("tableEditModule", {
|
|
|
877
877
|
if (!autoSelect && compRender) {
|
|
878
878
|
autoSelect = compRender.tableAutoSelect || compRender.autoselect;
|
|
879
879
|
}
|
|
880
|
-
if (
|
|
880
|
+
if (XEUtils.isFunction(autoFocus)) {
|
|
881
881
|
inputElem = autoFocus(params);
|
|
882
882
|
} else if (autoFocus) {
|
|
883
883
|
if (autoFocus === true) {
|
|
@@ -3,7 +3,7 @@ Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toString
|
|
|
3
3
|
const vue = require("vue");
|
|
4
4
|
const comp = require("../../../ui/src/comp.js");
|
|
5
5
|
require("../../../ui/index.js");
|
|
6
|
-
const
|
|
6
|
+
const XEUtils = require("xe-utils");
|
|
7
7
|
const utils = require("../../../ui/src/utils.js");
|
|
8
8
|
const log = require("../../../ui/src/log.js");
|
|
9
9
|
const index_esm = require("../../../../../@vxe-ui/core/es/index.esm.js");
|
|
@@ -48,7 +48,7 @@ const TableExportPanelComponent = comp.defineVxeComponent({
|
|
|
48
48
|
});
|
|
49
49
|
const handleOptionCheck = (column) => {
|
|
50
50
|
const { storeData } = props;
|
|
51
|
-
const matchObj =
|
|
51
|
+
const matchObj = XEUtils.findTree(storeData.columns, (item) => item === column);
|
|
52
52
|
if (matchObj && matchObj.parent) {
|
|
53
53
|
const { parent } = matchObj;
|
|
54
54
|
if (parent.children && parent.children.length) {
|
|
@@ -66,7 +66,7 @@ const TableExportPanelComponent = comp.defineVxeComponent({
|
|
|
66
66
|
};
|
|
67
67
|
const changeOption = (column) => {
|
|
68
68
|
const isChecked = !column.checked;
|
|
69
|
-
|
|
69
|
+
XEUtils.eachTree([column], (item) => {
|
|
70
70
|
item.checked = isChecked;
|
|
71
71
|
item.halfChecked = false;
|
|
72
72
|
});
|
|
@@ -76,7 +76,7 @@ const TableExportPanelComponent = comp.defineVxeComponent({
|
|
|
76
76
|
const allColumnEvent = () => {
|
|
77
77
|
const { storeData } = props;
|
|
78
78
|
const isAll = !reactData.isAll;
|
|
79
|
-
|
|
79
|
+
XEUtils.eachTree(storeData.columns, (column) => {
|
|
80
80
|
if (!column.disabled) {
|
|
81
81
|
column.checked = isAll;
|
|
82
82
|
column.halfChecked = false;
|
|
@@ -102,7 +102,7 @@ const TableExportPanelComponent = comp.defineVxeComponent({
|
|
|
102
102
|
const { hasMerge, columns } = storeData;
|
|
103
103
|
const checkedAll = computeCheckedAll.value;
|
|
104
104
|
const supportMerge = computeSupportMerge.value;
|
|
105
|
-
const expColumns =
|
|
105
|
+
const expColumns = XEUtils.searchTree(columns, (column) => column.checked, { children: "children", mapChildren: "childNodes", original: true });
|
|
106
106
|
return Object.assign({}, defaultOptions, {
|
|
107
107
|
columns: expColumns,
|
|
108
108
|
isMerge: hasMerge && supportMerge && checkedAll ? defaultOptions.isMerge : false
|
|
@@ -155,7 +155,7 @@ const TableExportPanelComponent = comp.defineVxeComponent({
|
|
|
155
155
|
const defaultSlot = slots.default;
|
|
156
156
|
const footerSlot = slots.footer;
|
|
157
157
|
const parameterSlot = slots.parameter;
|
|
158
|
-
|
|
158
|
+
XEUtils.eachTree(columns, (column) => {
|
|
159
159
|
const colTitle = utils.formatText(column.getTitle(), 1);
|
|
160
160
|
const isColGroup = column.children && column.children.length;
|
|
161
161
|
const isChecked = column.checked;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
const vue = require("vue");
|
|
3
|
-
const
|
|
3
|
+
const XEUtils = require("xe-utils");
|
|
4
4
|
require("../../../ui/index.js");
|
|
5
5
|
const util = require("../../src/util.js");
|
|
6
6
|
const utils = require("../../../ui/src/utils.js");
|
|
@@ -82,7 +82,7 @@ function getFooterData($xeTable, opts, footerTableData) {
|
|
|
82
82
|
const $xeGrid = $xeTable.xeGrid;
|
|
83
83
|
const $xeGantt = $xeTable.xeGantt;
|
|
84
84
|
const { footerFilterMethod } = opts;
|
|
85
|
-
return footerFilterMethod ? footerTableData.filter((items,
|
|
85
|
+
return footerFilterMethod ? footerTableData.filter((items, index) => footerFilterMethod({ $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt, items, $rowIndex: index })) : footerTableData;
|
|
86
86
|
}
|
|
87
87
|
function getCsvCellTypeLabel(column, cellValue) {
|
|
88
88
|
if (cellValue) {
|
|
@@ -116,10 +116,10 @@ function getElementsByTagName(elem, qualifiedName) {
|
|
|
116
116
|
return elem.getElementsByTagName(qualifiedName);
|
|
117
117
|
}
|
|
118
118
|
function getTxtCellKey(now) {
|
|
119
|
-
return `#${now}@${
|
|
119
|
+
return `#${now}@${XEUtils.uniqueId()}`;
|
|
120
120
|
}
|
|
121
121
|
function replaceTxtCell(cell, vMaps) {
|
|
122
|
-
return cell.replace(/#\d+@\d+/g, (key) =>
|
|
122
|
+
return cell.replace(/#\d+@\d+/g, (key) => XEUtils.hasOwnProp(vMaps, key) ? vMaps[key] : key);
|
|
123
123
|
}
|
|
124
124
|
function getTxtCellValue(val, vMaps) {
|
|
125
125
|
const rest = replaceTxtCell(val, vMaps);
|
|
@@ -187,16 +187,16 @@ function parseHTML(tableConf, content) {
|
|
|
187
187
|
if (tableNodes.length) {
|
|
188
188
|
const theadNodes = getElementsByTagName(tableNodes[0], "thead");
|
|
189
189
|
if (theadNodes.length) {
|
|
190
|
-
|
|
191
|
-
|
|
190
|
+
XEUtils.arrayEach(getElementsByTagName(theadNodes[0], "tr"), (rowNode) => {
|
|
191
|
+
XEUtils.arrayEach(getElementsByTagName(rowNode, "th"), (cellNode) => {
|
|
192
192
|
fields.push(toExportField(tableConf, cellNode.textContent || ""));
|
|
193
193
|
});
|
|
194
194
|
});
|
|
195
195
|
const tbodyNodes = getElementsByTagName(tableNodes[0], "tbody");
|
|
196
196
|
if (tbodyNodes.length) {
|
|
197
|
-
|
|
197
|
+
XEUtils.arrayEach(getElementsByTagName(tbodyNodes[0], "tr"), (rowNode) => {
|
|
198
198
|
const item = {};
|
|
199
|
-
|
|
199
|
+
XEUtils.arrayEach(getElementsByTagName(rowNode, "td"), (cellNode, colIndex) => {
|
|
200
200
|
if (fields[colIndex]) {
|
|
201
201
|
item[fields[colIndex]] = cellNode.textContent || "";
|
|
202
202
|
}
|
|
@@ -220,14 +220,14 @@ function parseXML(tableConf, content) {
|
|
|
220
220
|
if (tableNodes.length) {
|
|
221
221
|
const rowNodes = getElementsByTagName(tableNodes[0], "Row");
|
|
222
222
|
if (rowNodes.length) {
|
|
223
|
-
|
|
223
|
+
XEUtils.arrayEach(getElementsByTagName(rowNodes[0], "Cell"), (cellNode) => {
|
|
224
224
|
fields.push(toExportField(tableConf, cellNode.textContent || ""));
|
|
225
225
|
});
|
|
226
|
-
|
|
227
|
-
if (index
|
|
226
|
+
XEUtils.arrayEach(rowNodes, (rowNode, index) => {
|
|
227
|
+
if (index) {
|
|
228
228
|
const item = {};
|
|
229
229
|
const cellNodes = getElementsByTagName(rowNode, "Cell");
|
|
230
|
-
|
|
230
|
+
XEUtils.arrayEach(cellNodes, (cellNode, colIndex) => {
|
|
231
231
|
if (fields[colIndex]) {
|
|
232
232
|
item[fields[colIndex]] = cellNode.textContent;
|
|
233
233
|
}
|
|
@@ -241,7 +241,7 @@ function parseXML(tableConf, content) {
|
|
|
241
241
|
return { fields, rows };
|
|
242
242
|
}
|
|
243
243
|
function clearColumnConvert(columns) {
|
|
244
|
-
|
|
244
|
+
XEUtils.eachTree(columns, (column) => {
|
|
245
245
|
delete column._level;
|
|
246
246
|
delete column._colSpan;
|
|
247
247
|
delete column._rowSpan;
|
|
@@ -283,7 +283,7 @@ hooks.add("tableExportModule", {
|
|
|
283
283
|
return headExportMethod ? headExportMethod({ column, options: opts, $table: $xeTable }) : (opts.isTitle ? column.getTitle() : column.field) || "";
|
|
284
284
|
}
|
|
285
285
|
const toBooleanValue = (cellValue) => {
|
|
286
|
-
return
|
|
286
|
+
return XEUtils.isBoolean(cellValue) ? cellValue ? "TRUE" : "FALSE" : cellValue;
|
|
287
287
|
};
|
|
288
288
|
const toStringValue = (cellValue) => {
|
|
289
289
|
return utils.eqEmptyValue(cellValue) ? "" : `${cellValue}`;
|
|
@@ -304,7 +304,7 @@ hooks.add("tableExportModule", {
|
|
|
304
304
|
const expandMaps = {};
|
|
305
305
|
const useMaps = {};
|
|
306
306
|
const { handleGetRowId } = util.createHandleGetRowId($xeTable);
|
|
307
|
-
|
|
307
|
+
XEUtils.eachTree(datas, (item, $rowIndex, items, path, parent, nodes) => {
|
|
308
308
|
const row = item._row || item;
|
|
309
309
|
const rowid = handleGetRowId(row);
|
|
310
310
|
if (useMaps[rowid]) {
|
|
@@ -344,12 +344,12 @@ hooks.add("tableExportModule", {
|
|
|
344
344
|
}
|
|
345
345
|
case "checkbox":
|
|
346
346
|
cellValue = toBooleanValue($xeTable.isCheckedByCheckboxRow(row));
|
|
347
|
-
item2._checkboxLabel = checkboxOpts.labelField ?
|
|
347
|
+
item2._checkboxLabel = checkboxOpts.labelField ? XEUtils.get(row, checkboxOpts.labelField) : "";
|
|
348
348
|
item2._checkboxDisabled = checkboxOpts.checkMethod && !checkboxOpts.checkMethod({ $table: $xeTable, row });
|
|
349
349
|
break;
|
|
350
350
|
case "radio":
|
|
351
351
|
cellValue = toBooleanValue($xeTable.isCheckedByRadioRow(row));
|
|
352
|
-
item2._radioLabel = radioOpts.labelField ?
|
|
352
|
+
item2._radioLabel = radioOpts.labelField ? XEUtils.get(row, radioOpts.labelField) : "";
|
|
353
353
|
item2._radioDisabled = radioOpts.checkMethod && !radioOpts.checkMethod({ $table: $xeTable, row });
|
|
354
354
|
break;
|
|
355
355
|
default:
|
|
@@ -405,12 +405,12 @@ hooks.add("tableExportModule", {
|
|
|
405
405
|
}
|
|
406
406
|
case "checkbox":
|
|
407
407
|
cellValue = toBooleanValue($xeTable.isCheckedByCheckboxRow(row));
|
|
408
|
-
item._checkboxLabel = checkboxOpts.labelField ?
|
|
408
|
+
item._checkboxLabel = checkboxOpts.labelField ? XEUtils.get(row, checkboxOpts.labelField) : "";
|
|
409
409
|
item._checkboxDisabled = checkboxOpts.checkMethod && !checkboxOpts.checkMethod({ $table: $xeTable, row });
|
|
410
410
|
break;
|
|
411
411
|
case "radio":
|
|
412
412
|
cellValue = toBooleanValue($xeTable.isCheckedByRadioRow(row));
|
|
413
|
-
item._radioLabel = radioOpts.labelField ?
|
|
413
|
+
item._radioLabel = radioOpts.labelField ? XEUtils.get(row, radioOpts.labelField) : "";
|
|
414
414
|
item._radioDisabled = radioOpts.checkMethod && !radioOpts.checkMethod({ $table: $xeTable, row });
|
|
415
415
|
break;
|
|
416
416
|
default:
|
|
@@ -441,7 +441,7 @@ hooks.add("tableExportModule", {
|
|
|
441
441
|
const { columns, dataFilterMethod } = opts;
|
|
442
442
|
let datas = opts.data;
|
|
443
443
|
if (dataFilterMethod) {
|
|
444
|
-
datas = datas.filter((row,
|
|
444
|
+
datas = datas.filter((row, index) => dataFilterMethod({ $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt, row, $rowIndex: index }));
|
|
445
445
|
}
|
|
446
446
|
return getBodyLabelData(opts, columns, datas);
|
|
447
447
|
};
|
|
@@ -501,7 +501,7 @@ hooks.add("tableExportModule", {
|
|
|
501
501
|
};
|
|
502
502
|
const hasEllipsis = (column, property, allColumnOverflow) => {
|
|
503
503
|
const columnOverflow = column[property];
|
|
504
|
-
const headOverflow =
|
|
504
|
+
const headOverflow = XEUtils.isUndefined(columnOverflow) || XEUtils.isNull(columnOverflow) ? allColumnOverflow : columnOverflow;
|
|
505
505
|
const showEllipsis = headOverflow === "ellipsis";
|
|
506
506
|
const showTitle = headOverflow === "title";
|
|
507
507
|
const showTooltip = headOverflow === true || headOverflow === "tooltip";
|
|
@@ -539,7 +539,7 @@ hooks.add("tableExportModule", {
|
|
|
539
539
|
const cellTitle = getHeaderTitle(opts, column);
|
|
540
540
|
let childWidth = 0;
|
|
541
541
|
let countChild = 0;
|
|
542
|
-
|
|
542
|
+
XEUtils.eachTree([column], (item) => {
|
|
543
543
|
if (!item.childNodes || !column.childNodes.length) {
|
|
544
544
|
countChild++;
|
|
545
545
|
}
|
|
@@ -834,7 +834,7 @@ hooks.add("tableExportModule", {
|
|
|
834
834
|
const { importMethod, afterImportMethod } = opts;
|
|
835
835
|
const { type, filename } = utils.parseFile(file);
|
|
836
836
|
const importOpts = computeImportOpts.value;
|
|
837
|
-
if (!importMethod && !
|
|
837
|
+
if (!importMethod && !XEUtils.includes(XEUtils.keys(importOpts._typeMaps), type)) {
|
|
838
838
|
if (opts.message !== false) {
|
|
839
839
|
if (index_esm.VxeUI.modal) {
|
|
840
840
|
index_esm.VxeUI.modal.message({ content: getI18n("vxe.error.notType", [type]), status: "error" });
|
|
@@ -902,7 +902,7 @@ hooks.add("tableExportModule", {
|
|
|
902
902
|
return columns.some((item) => {
|
|
903
903
|
if (util.isColumnInfo(item)) {
|
|
904
904
|
return column.id === item.id;
|
|
905
|
-
} else if (
|
|
905
|
+
} else if (XEUtils.isString(item)) {
|
|
906
906
|
return column.field === item;
|
|
907
907
|
} else {
|
|
908
908
|
const colid = item.id || item.colId;
|
|
@@ -923,12 +923,12 @@ hooks.add("tableExportModule", {
|
|
|
923
923
|
};
|
|
924
924
|
const handleFilterFields = (exportOpts, column, includeFields, excludeFields) => {
|
|
925
925
|
if (excludeFields) {
|
|
926
|
-
if (
|
|
926
|
+
if (XEUtils.includes(excludeFields, column.field)) {
|
|
927
927
|
return false;
|
|
928
928
|
}
|
|
929
929
|
}
|
|
930
930
|
if (includeFields) {
|
|
931
|
-
if (
|
|
931
|
+
if (XEUtils.includes(includeFields, column.field)) {
|
|
932
932
|
return true;
|
|
933
933
|
}
|
|
934
934
|
return false;
|
|
@@ -960,7 +960,7 @@ hooks.add("tableExportModule", {
|
|
|
960
960
|
current: "current",
|
|
961
961
|
modes: (proxyOpts.ajax && proxyOpts.ajax.queryAll ? ["all"] : []).concat(["current", "selected", "empty"])
|
|
962
962
|
}, options);
|
|
963
|
-
const types = defOpts.types ||
|
|
963
|
+
const types = defOpts.types || XEUtils.keys(exportOpts._typeMaps);
|
|
964
964
|
const modes = defOpts.modes || [];
|
|
965
965
|
const checkMethod = customOpts.checkMethod;
|
|
966
966
|
const exportColumns = collectColumn.slice(0);
|
|
@@ -983,7 +983,7 @@ hooks.add("tableExportModule", {
|
|
|
983
983
|
label: getI18n(`vxe.export.modes.${item}`)
|
|
984
984
|
};
|
|
985
985
|
});
|
|
986
|
-
|
|
986
|
+
XEUtils.eachTree(exportColumns, (column, index, items, path, parent) => {
|
|
987
987
|
const isColGroup = column.children && column.children.length > 0;
|
|
988
988
|
let isChecked = false;
|
|
989
989
|
if (columns && columns.length) {
|
|
@@ -1013,7 +1013,7 @@ hooks.add("tableExportModule", {
|
|
|
1013
1013
|
}, defOpts);
|
|
1014
1014
|
const { filename, sheetName, mode, type } = exportParams;
|
|
1015
1015
|
if (filename) {
|
|
1016
|
-
if (
|
|
1016
|
+
if (XEUtils.isFunction(filename)) {
|
|
1017
1017
|
exportParams.filename = filename({
|
|
1018
1018
|
options: defOpts,
|
|
1019
1019
|
$table: $xeTable,
|
|
@@ -1025,7 +1025,7 @@ hooks.add("tableExportModule", {
|
|
|
1025
1025
|
}
|
|
1026
1026
|
}
|
|
1027
1027
|
if (sheetName) {
|
|
1028
|
-
if (
|
|
1028
|
+
if (XEUtils.isFunction(sheetName)) {
|
|
1029
1029
|
exportParams.sheetName = sheetName({
|
|
1030
1030
|
options: defOpts,
|
|
1031
1031
|
$table: $xeTable,
|
|
@@ -1106,7 +1106,7 @@ hooks.add("tableExportModule", {
|
|
|
1106
1106
|
isCustomCol = true;
|
|
1107
1107
|
customCols = columns;
|
|
1108
1108
|
} else {
|
|
1109
|
-
customCols =
|
|
1109
|
+
customCols = XEUtils.searchTree(collectColumn, (column) => {
|
|
1110
1110
|
const isColGroup = column.children && column.children.length > 0;
|
|
1111
1111
|
let isChecked = false;
|
|
1112
1112
|
if (columns && columns.length) {
|
|
@@ -1123,12 +1123,12 @@ hooks.add("tableExportModule", {
|
|
|
1123
1123
|
if (!isCustomCol && !columnFilterMethod) {
|
|
1124
1124
|
columnFilterMethod = ({ column }) => {
|
|
1125
1125
|
if (excludeFields) {
|
|
1126
|
-
if (
|
|
1126
|
+
if (XEUtils.includes(excludeFields, column.field)) {
|
|
1127
1127
|
return false;
|
|
1128
1128
|
}
|
|
1129
1129
|
}
|
|
1130
1130
|
if (includeFields) {
|
|
1131
|
-
if (
|
|
1131
|
+
if (XEUtils.includes(includeFields, column.field)) {
|
|
1132
1132
|
return true;
|
|
1133
1133
|
}
|
|
1134
1134
|
return false;
|
|
@@ -1139,12 +1139,12 @@ hooks.add("tableExportModule", {
|
|
|
1139
1139
|
}
|
|
1140
1140
|
if (customCols) {
|
|
1141
1141
|
handleOptions._isCustomColumn = true;
|
|
1142
|
-
groups =
|
|
1142
|
+
groups = XEUtils.searchTree(XEUtils.mapTree(customCols, (item) => {
|
|
1143
1143
|
let targetColumn;
|
|
1144
1144
|
if (item) {
|
|
1145
1145
|
if (util.isColumnInfo(item)) {
|
|
1146
1146
|
targetColumn = item;
|
|
1147
|
-
} else if (
|
|
1147
|
+
} else if (XEUtils.isString(item)) {
|
|
1148
1148
|
targetColumn = $xeTable.getColumnByField(item);
|
|
1149
1149
|
} else {
|
|
1150
1150
|
const colid = item.id || item.colId;
|
|
@@ -1165,16 +1165,16 @@ hooks.add("tableExportModule", {
|
|
|
1165
1165
|
}, {
|
|
1166
1166
|
children: "childNodes",
|
|
1167
1167
|
mapChildren: "_children"
|
|
1168
|
-
}), (column,
|
|
1168
|
+
}), (column, index) => util.isColumnInfo(column) && (!columnFilterMethod || columnFilterMethod({ $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt, column, $columnIndex: index })), {
|
|
1169
1169
|
children: "_children",
|
|
1170
1170
|
mapChildren: "childNodes",
|
|
1171
1171
|
original: true
|
|
1172
1172
|
});
|
|
1173
1173
|
} else {
|
|
1174
|
-
groups =
|
|
1174
|
+
groups = XEUtils.searchTree(isGroup ? collectColumn : tableFullColumn, (column, index) => column.visible && (!columnFilterMethod || columnFilterMethod({ $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt, column, $columnIndex: index })), { children: "children", mapChildren: "childNodes", original: true });
|
|
1175
1175
|
}
|
|
1176
1176
|
const cols = [];
|
|
1177
|
-
|
|
1177
|
+
XEUtils.eachTree(groups, (column) => {
|
|
1178
1178
|
const isColGroup = column.children && column.children.length;
|
|
1179
1179
|
if (!isColGroup) {
|
|
1180
1180
|
cols.push(column);
|
|
@@ -1183,7 +1183,7 @@ hooks.add("tableExportModule", {
|
|
|
1183
1183
|
handleOptions.columns = cols;
|
|
1184
1184
|
handleOptions.colgroups = convertToRows(groups);
|
|
1185
1185
|
if (filename) {
|
|
1186
|
-
if (
|
|
1186
|
+
if (XEUtils.isFunction(filename)) {
|
|
1187
1187
|
handleOptions.filename = filename({
|
|
1188
1188
|
options: opts,
|
|
1189
1189
|
$table: $xeTable,
|
|
@@ -1195,10 +1195,10 @@ hooks.add("tableExportModule", {
|
|
|
1195
1195
|
}
|
|
1196
1196
|
}
|
|
1197
1197
|
if (!handleOptions.filename) {
|
|
1198
|
-
handleOptions.filename = getI18n(handleOptions.original ? "vxe.table.expOriginFilename" : "vxe.table.expFilename", [
|
|
1198
|
+
handleOptions.filename = getI18n(handleOptions.original ? "vxe.table.expOriginFilename" : "vxe.table.expFilename", [XEUtils.toDateString(Date.now(), "yyyyMMddHHmmss")]);
|
|
1199
1199
|
}
|
|
1200
1200
|
if (sheetName) {
|
|
1201
|
-
if (
|
|
1201
|
+
if (XEUtils.isFunction(sheetName)) {
|
|
1202
1202
|
handleOptions.sheetName = sheetName({
|
|
1203
1203
|
options: opts,
|
|
1204
1204
|
$table: $xeTable,
|
|
@@ -1212,7 +1212,7 @@ hooks.add("tableExportModule", {
|
|
|
1212
1212
|
if (!handleOptions.sheetName) {
|
|
1213
1213
|
handleOptions.sheetName = document.title || "";
|
|
1214
1214
|
}
|
|
1215
|
-
if (!handleOptions.exportMethod && !
|
|
1215
|
+
if (!handleOptions.exportMethod && !XEUtils.includes(XEUtils.keys(exportOpts._typeMaps), type)) {
|
|
1216
1216
|
log.errLog("vxe.error.notType", [type]);
|
|
1217
1217
|
if (["xlsx", "pdf"].includes(type)) {
|
|
1218
1218
|
log.warnLog("vxe.error.reqPlugin", [4, "plugin-export-xlsx"]);
|
|
@@ -1229,7 +1229,7 @@ hooks.add("tableExportModule", {
|
|
|
1229
1229
|
handleOptions.data = [];
|
|
1230
1230
|
if (mode === "selected") {
|
|
1231
1231
|
if (["html", "pdf"].indexOf(type) > -1 && treeConfig) {
|
|
1232
|
-
handleOptions.data =
|
|
1232
|
+
handleOptions.data = XEUtils.searchTree($xeTable.getTableData().fullData, (item) => $xeTable.findRowIndexOf(selectRecords, item) > -1, Object.assign({}, treeOpts, { data: "_row" }));
|
|
1233
1233
|
} else {
|
|
1234
1234
|
handleOptions.data = selectRecords;
|
|
1235
1235
|
}
|
|
@@ -1265,13 +1265,13 @@ hooks.add("tableExportModule", {
|
|
|
1265
1265
|
const listProp = resConfigs.list;
|
|
1266
1266
|
let tdData = [];
|
|
1267
1267
|
if (listProp) {
|
|
1268
|
-
if (
|
|
1268
|
+
if (XEUtils.isFunction(listProp)) {
|
|
1269
1269
|
tdData = listProp({ data: rest, $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt });
|
|
1270
1270
|
} else {
|
|
1271
|
-
tdData =
|
|
1271
|
+
tdData = XEUtils.isArray(rest) ? rest : XEUtils.get(rest, listProp);
|
|
1272
1272
|
}
|
|
1273
1273
|
} else {
|
|
1274
|
-
if (
|
|
1274
|
+
if (XEUtils.isArray(rest)) {
|
|
1275
1275
|
tdData = rest;
|
|
1276
1276
|
}
|
|
1277
1277
|
}
|
|
@@ -1310,7 +1310,7 @@ hooks.add("tableExportModule", {
|
|
|
1310
1310
|
importData(options) {
|
|
1311
1311
|
const importOpts = computeImportOpts.value;
|
|
1312
1312
|
const opts = Object.assign({
|
|
1313
|
-
types:
|
|
1313
|
+
types: XEUtils.keys(importOpts._typeMaps)
|
|
1314
1314
|
// beforeImportMethod: null,
|
|
1315
1315
|
// afterImportMethod: null
|
|
1316
1316
|
}, importOpts, options);
|
|
@@ -1350,7 +1350,7 @@ hooks.add("tableExportModule", {
|
|
|
1350
1350
|
const { sheetName } = opts;
|
|
1351
1351
|
let printTitle = "";
|
|
1352
1352
|
if (sheetName) {
|
|
1353
|
-
if (
|
|
1353
|
+
if (XEUtils.isFunction(sheetName)) {
|
|
1354
1354
|
printTitle = sheetName({
|
|
1355
1355
|
options: opts,
|
|
1356
1356
|
$table: $xeTable,
|
|
@@ -1439,7 +1439,7 @@ hooks.add("tableExportModule", {
|
|
|
1439
1439
|
const defOpts = Object.assign({
|
|
1440
1440
|
mode: "insertTop",
|
|
1441
1441
|
message: true,
|
|
1442
|
-
types:
|
|
1442
|
+
types: XEUtils.keys(importOpts._typeMaps),
|
|
1443
1443
|
modes: ["insertTop", "covering"]
|
|
1444
1444
|
}, importOpts, options);
|
|
1445
1445
|
const types = defOpts.types || [];
|
|
@@ -1493,7 +1493,7 @@ hooks.add("tableExportModule", {
|
|
|
1493
1493
|
const exportOpts = computeExportOpts.value;
|
|
1494
1494
|
const defOpts = Object.assign({
|
|
1495
1495
|
message: true,
|
|
1496
|
-
types:
|
|
1496
|
+
types: XEUtils.keys(exportOpts._typeMaps)
|
|
1497
1497
|
}, exportOpts, options);
|
|
1498
1498
|
if (!props.exportConfig) {
|
|
1499
1499
|
log.errLog("vxe.error.reqProp", ["export-config"]);
|