vxe-table 3.14.0-beta.0 → 3.14.0-beta.2
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 +60 -75
- package/es/style.css +1 -1
- package/es/table/module/custom/panel.js +25 -27
- package/es/table/module/edit/mixin.js +1 -1
- package/es/table/module/export/export-panel.js +22 -24
- package/es/table/module/export/import-panel.js +14 -16
- package/es/table/module/export/mixin.js +15 -31
- package/es/table/module/keyboard/mixin.js +3 -2
- package/es/table/module/validator/mixin.js +1 -3
- package/es/table/render/index.js +2 -4
- package/es/table/src/body.js +2 -2
- package/es/table/src/column.js +2 -2
- package/es/table/src/columnInfo.js +30 -32
- package/es/table/src/group.js +2 -2
- package/es/table/src/methods.js +128 -97
- package/es/table/src/table.js +17 -19
- package/es/table/src/util.js +5 -7
- package/es/toolbar/src/toolbar.js +20 -28
- package/es/ui/index.js +1 -1
- package/es/ui/src/log.js +1 -1
- package/lib/grid/src/grid.js +61 -88
- package/lib/grid/src/grid.min.js +1 -1
- package/lib/index.umd.js +372 -380
- package/lib/index.umd.min.js +1 -1
- package/lib/style.css +1 -1
- package/lib/table/module/custom/panel.js +31 -33
- package/lib/table/module/custom/panel.min.js +1 -1
- package/lib/table/module/edit/mixin.js +1 -1
- package/lib/table/module/edit/mixin.min.js +1 -1
- package/lib/table/module/export/export-panel.js +22 -24
- package/lib/table/module/export/export-panel.min.js +1 -1
- package/lib/table/module/export/import-panel.js +14 -16
- package/lib/table/module/export/import-panel.min.js +1 -1
- package/lib/table/module/export/mixin.js +15 -31
- package/lib/table/module/export/mixin.min.js +1 -1
- package/lib/table/module/keyboard/mixin.js +3 -2
- package/lib/table/module/keyboard/mixin.min.js +1 -1
- package/lib/table/module/validator/mixin.js +1 -3
- package/lib/table/module/validator/mixin.min.js +1 -1
- package/lib/table/render/index.js +2 -4
- package/lib/table/render/index.min.js +1 -1
- package/lib/table/src/body.js +2 -1
- package/lib/table/src/body.min.js +1 -1
- package/lib/table/src/column.js +3 -2
- package/lib/table/src/columnInfo.js +32 -34
- package/lib/table/src/columnInfo.min.js +1 -1
- package/lib/table/src/group.js +3 -2
- package/lib/table/src/methods.js +138 -94
- package/lib/table/src/methods.min.js +1 -1
- package/lib/table/src/table.js +14 -16
- package/lib/table/src/table.min.js +1 -1
- package/lib/table/src/util.js +4 -6
- package/lib/table/src/util.min.js +1 -1
- package/lib/toolbar/src/toolbar.js +21 -28
- 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 +62 -75
- package/packages/table/module/custom/panel.ts +25 -27
- package/packages/table/module/edit/mixin.ts +1 -1
- package/packages/table/module/export/export-panel.ts +22 -24
- package/packages/table/module/export/import-panel.ts +14 -16
- package/packages/table/module/export/mixin.ts +15 -31
- package/packages/table/module/keyboard/mixin.ts +6 -2
- package/packages/table/module/validator/mixin.ts +1 -3
- package/packages/table/render/index.ts +2 -4
- package/packages/table/src/body.ts +2 -2
- package/packages/table/src/column.ts +2 -2
- package/packages/table/src/columnInfo.ts +30 -32
- package/packages/table/src/group.ts +2 -2
- package/packages/table/src/methods.ts +140 -104
- package/packages/table/src/table.ts +14 -16
- package/packages/table/src/util.ts +4 -6
- package/packages/toolbar/src/toolbar.ts +20 -28
- /package/es/{iconfont.1740732119954.ttf → iconfont.1741079977180.ttf} +0 -0
- /package/es/{iconfont.1740732119954.woff → iconfont.1741079977180.woff} +0 -0
- /package/es/{iconfont.1740732119954.woff2 → iconfont.1741079977180.woff2} +0 -0
- /package/lib/{iconfont.1740732119954.ttf → iconfont.1741079977180.ttf} +0 -0
- /package/lib/{iconfont.1740732119954.woff → iconfont.1741079977180.woff} +0 -0
- /package/lib/{iconfont.1740732119954.woff2 → iconfont.1741079977180.woff2} +0 -0
package/lib/index.umd.js
CHANGED
|
@@ -2220,7 +2220,7 @@ function getClass(property, params) {
|
|
|
2220
2220
|
;// CONCATENATED MODULE: ./packages/ui/index.ts
|
|
2221
2221
|
|
|
2222
2222
|
|
|
2223
|
-
const version = "3.14.0-beta.
|
|
2223
|
+
const version = "3.14.0-beta.2";
|
|
2224
2224
|
core_.VxeUI.version = version;
|
|
2225
2225
|
core_.VxeUI.tableVersion = version;
|
|
2226
2226
|
core_.VxeUI.setConfig({
|
|
@@ -2843,7 +2843,7 @@ function isNodeElement(elem) {
|
|
|
2843
2843
|
const {
|
|
2844
2844
|
log: log_log
|
|
2845
2845
|
} = core_.VxeUI;
|
|
2846
|
-
const log_version = `table v${"3.14.0-beta.
|
|
2846
|
+
const log_version = `table v${"3.14.0-beta.2"}`;
|
|
2847
2847
|
const warnLog = log_log.create('warn', log_version);
|
|
2848
2848
|
const errLog = log_log.create('error', log_version);
|
|
2849
2849
|
;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
|
|
@@ -2869,42 +2869,40 @@ class ColumnInfo {
|
|
|
2869
2869
|
const formatter = _vm.formatter;
|
|
2870
2870
|
const visible = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(_vm.visible) ? _vm.visible : true;
|
|
2871
2871
|
const tableProps = $xetable;
|
|
2872
|
-
|
|
2873
|
-
|
|
2874
|
-
|
|
2875
|
-
|
|
2876
|
-
|
|
2877
|
-
|
|
2878
|
-
|
|
2879
|
-
|
|
2880
|
-
|
|
2881
|
-
|
|
2872
|
+
const types = ['seq', 'checkbox', 'radio', 'expand', 'html'];
|
|
2873
|
+
if (_vm.type && types.indexOf(_vm.type) === -1) {
|
|
2874
|
+
warnLog('vxe.error.errProp', [`type=${_vm.type}`, types.join(', ')]);
|
|
2875
|
+
}
|
|
2876
|
+
if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(_vm.cellRender) || _vm.cellRender && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(_vm.cellRender)) {
|
|
2877
|
+
warnLog('vxe.error.errProp', [`column.cell-render=${_vm.cellRender}`, 'column.cell-render={}']);
|
|
2878
|
+
}
|
|
2879
|
+
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)) {
|
|
2880
|
+
warnLog('vxe.error.errProp', [`column.edit-render=${_vm.editRender}`, 'column.edit-render={}']);
|
|
2881
|
+
}
|
|
2882
|
+
if (_vm.type === 'expand') {
|
|
2883
|
+
const {
|
|
2884
|
+
treeConfig
|
|
2885
|
+
} = tableProps;
|
|
2886
|
+
if (treeConfig && ($xetable.treeOpts.showLine || $xetable.treeOpts.line)) {
|
|
2887
|
+
errLog('vxe.error.errConflicts', ['tree-config.line', 'column.type=expand']);
|
|
2882
2888
|
}
|
|
2883
|
-
|
|
2884
|
-
|
|
2885
|
-
|
|
2886
|
-
|
|
2887
|
-
|
|
2888
|
-
|
|
2889
|
+
}
|
|
2890
|
+
if (_vm.remoteSort) {
|
|
2891
|
+
warnLog('vxe.error.delProp', ['column.remote-sort', 'sort-config.remote']);
|
|
2892
|
+
}
|
|
2893
|
+
if (_vm.sortMethod) {
|
|
2894
|
+
warnLog('vxe.error.delProp', ['column.sort-method', 'sort-config.sortMethod']);
|
|
2895
|
+
}
|
|
2896
|
+
if (formatter) {
|
|
2897
|
+
if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(formatter)) {
|
|
2898
|
+
const gFormatOpts = columnInfo_formats.get(formatter) || (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default())[formatter];
|
|
2899
|
+
if (!gFormatOpts || !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod)) {
|
|
2900
|
+
errLog('vxe.error.notFormats', [formatter]);
|
|
2889
2901
|
}
|
|
2890
|
-
}
|
|
2891
|
-
|
|
2892
|
-
|
|
2893
|
-
|
|
2894
|
-
if (_vm.sortMethod) {
|
|
2895
|
-
warnLog('vxe.error.delProp', ['column.sort-method', 'sort-config.sortMethod']);
|
|
2896
|
-
}
|
|
2897
|
-
if (formatter) {
|
|
2898
|
-
if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(formatter)) {
|
|
2899
|
-
const gFormatOpts = columnInfo_formats.get(formatter) || (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default())[formatter];
|
|
2900
|
-
if (!gFormatOpts || !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod)) {
|
|
2901
|
-
errLog('vxe.error.notFormats', [formatter]);
|
|
2902
|
-
}
|
|
2903
|
-
} else if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(formatter)) {
|
|
2904
|
-
const gFormatOpts = columnInfo_formats.get(formatter[0]) || (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default())[formatter[0]];
|
|
2905
|
-
if (!gFormatOpts || !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod)) {
|
|
2906
|
-
errLog('vxe.error.notFormats', [formatter[0]]);
|
|
2907
|
-
}
|
|
2902
|
+
} else if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(formatter)) {
|
|
2903
|
+
const gFormatOpts = columnInfo_formats.get(formatter[0]) || (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default())[formatter[0]];
|
|
2904
|
+
if (!gFormatOpts || !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod)) {
|
|
2905
|
+
errLog('vxe.error.notFormats', [formatter[0]]);
|
|
2908
2906
|
}
|
|
2909
2907
|
}
|
|
2910
2908
|
}
|
|
@@ -3161,12 +3159,10 @@ function assembleColumn(_vm) {
|
|
|
3161
3159
|
} = _vm;
|
|
3162
3160
|
const groupConfig = $xecolumn ? $xecolumn.columnConfig : null;
|
|
3163
3161
|
if (groupConfig) {
|
|
3164
|
-
if (
|
|
3165
|
-
|
|
3166
|
-
|
|
3167
|
-
|
|
3168
|
-
warnLog('vxe.error.groupTag', [`<vxe-colgroup title=${$xecolumn.title} ...>`, `<vxe-column title=${$xecolumn.title} ...>`]);
|
|
3169
|
-
}
|
|
3162
|
+
if ($xecolumn.$options._componentTag === 'vxe-table-column') {
|
|
3163
|
+
errLog('vxe.error.groupTag', [`<vxe-table-colgroup title=${$xecolumn.title} ...>`, `<vxe-table-column title=${$xecolumn.title} ...>`]);
|
|
3164
|
+
} else if ($xecolumn.$options._componentTag === 'vxe-column') {
|
|
3165
|
+
warnLog('vxe.error.groupTag', [`<vxe-colgroup title=${$xecolumn.title} ...>`, `<vxe-column title=${$xecolumn.title} ...>`]);
|
|
3170
3166
|
}
|
|
3171
3167
|
if (!groupConfig.children) {
|
|
3172
3168
|
groupConfig.children = [];
|
|
@@ -4957,7 +4953,7 @@ Object.keys(columnProps).forEach(name => {
|
|
|
4957
4953
|
}
|
|
4958
4954
|
};
|
|
4959
4955
|
});
|
|
4960
|
-
/* harmony default export */ var column = (defineVxeComponent({
|
|
4956
|
+
/* harmony default export */ var column = (/* define-vxe-component start */defineVxeComponent({
|
|
4961
4957
|
name: 'VxeColumn',
|
|
4962
4958
|
props: columnProps,
|
|
4963
4959
|
provide() {
|
|
@@ -4989,7 +4985,7 @@ Object.keys(columnProps).forEach(name => {
|
|
|
4989
4985
|
return h('div', this.$slots.default);
|
|
4990
4986
|
},
|
|
4991
4987
|
methods: cell
|
|
4992
|
-
}));
|
|
4988
|
+
})); /* define-vxe-component end */
|
|
4993
4989
|
;// CONCATENATED MODULE: ./packages/column/index.ts
|
|
4994
4990
|
|
|
4995
4991
|
|
|
@@ -5013,7 +5009,7 @@ const Column = VxeColumn;
|
|
|
5013
5009
|
|
|
5014
5010
|
|
|
5015
5011
|
|
|
5016
|
-
/* harmony default export */ var group = (defineVxeComponent({
|
|
5012
|
+
/* harmony default export */ var group = (/* define-vxe-component start */defineVxeComponent({
|
|
5017
5013
|
name: 'VxeColgroup',
|
|
5018
5014
|
props: columnProps,
|
|
5019
5015
|
provide() {
|
|
@@ -5052,7 +5048,7 @@ const Column = VxeColumn;
|
|
|
5052
5048
|
return h('div', this.$slots.default);
|
|
5053
5049
|
},
|
|
5054
5050
|
methods: cell
|
|
5055
|
-
}));
|
|
5051
|
+
})); /* define-vxe-component end */
|
|
5056
5052
|
;// CONCATENATED MODULE: ./packages/colgroup/index.ts
|
|
5057
5053
|
|
|
5058
5054
|
|
|
@@ -5419,7 +5415,14 @@ function cacheColumnMap($xeTable) {
|
|
|
5419
5415
|
if (expandColumn && expandOpts.mode !== 'fixed' && mouseOpts.area) {
|
|
5420
5416
|
errLog('vxe.error.errConflicts', ['mouse-config.area', 'column.type=expand']);
|
|
5421
5417
|
}
|
|
5422
|
-
if (
|
|
5418
|
+
if (htmlColumn) {
|
|
5419
|
+
if (!columnOpts.useKey) {
|
|
5420
|
+
errLog('vxe.error.reqProp', ['column-config.useKey & column.type=html']);
|
|
5421
|
+
}
|
|
5422
|
+
if (!rowOpts.useKey) {
|
|
5423
|
+
errLog('vxe.error.reqProp', ['row-config.useKey & column.type=html']);
|
|
5424
|
+
}
|
|
5425
|
+
}
|
|
5423
5426
|
reactData.isGroup = isGroup;
|
|
5424
5427
|
reactData.treeNodeColumn = treeNodeColumn;
|
|
5425
5428
|
reactData.expandColumn = expandColumn;
|
|
@@ -7826,28 +7829,26 @@ const Methods = {
|
|
|
7826
7829
|
if (treeConfig) {
|
|
7827
7830
|
// 树结构自动转换
|
|
7828
7831
|
if (treeOpts.transform) {
|
|
7829
|
-
if (
|
|
7830
|
-
|
|
7831
|
-
|
|
7832
|
-
|
|
7833
|
-
|
|
7834
|
-
|
|
7835
|
-
|
|
7836
|
-
|
|
7837
|
-
|
|
7838
|
-
|
|
7839
|
-
|
|
7840
|
-
errLog('vxe.error.reqProp', ['tree-config.mapChildrenField']);
|
|
7841
|
-
}
|
|
7842
|
-
if (childrenField === treeOpts.mapChildrenField) {
|
|
7843
|
-
errLog('vxe.error.errConflicts', ['tree-config.childrenField', 'tree-config.mapChildrenField']);
|
|
7844
|
-
}
|
|
7845
|
-
// fullData.forEach(row => {
|
|
7846
|
-
// if (row[childrenField] && row[childrenField].length) {
|
|
7847
|
-
// warnLog('vxe.error.errConflicts', ['tree-config.transform', `row.${childrenField}`])
|
|
7848
|
-
// }
|
|
7849
|
-
// })
|
|
7832
|
+
if (!treeOpts.rowField) {
|
|
7833
|
+
errLog('vxe.error.reqProp', ['table.tree-config.rowField']);
|
|
7834
|
+
}
|
|
7835
|
+
if (!treeOpts.parentField) {
|
|
7836
|
+
errLog('vxe.error.reqProp', ['table.tree-config.parentField']);
|
|
7837
|
+
}
|
|
7838
|
+
if (!childrenField) {
|
|
7839
|
+
errLog('vxe.error.reqProp', ['tree-config.childrenField']);
|
|
7840
|
+
}
|
|
7841
|
+
if (!treeOpts.mapChildrenField) {
|
|
7842
|
+
errLog('vxe.error.reqProp', ['tree-config.mapChildrenField']);
|
|
7850
7843
|
}
|
|
7844
|
+
if (childrenField === treeOpts.mapChildrenField) {
|
|
7845
|
+
errLog('vxe.error.errConflicts', ['tree-config.childrenField', 'tree-config.mapChildrenField']);
|
|
7846
|
+
}
|
|
7847
|
+
// fullData.forEach(row => {
|
|
7848
|
+
// if (row[childrenField] && row[childrenField].length) {
|
|
7849
|
+
// warnLog('vxe.error.errConflicts', ['tree-config.transform', `row.${childrenField}`])
|
|
7850
|
+
// }
|
|
7851
|
+
// })
|
|
7851
7852
|
treeData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toArrayTree(fullData, {
|
|
7852
7853
|
key: treeOpts.rowField,
|
|
7853
7854
|
parentKey: treeOpts.parentField,
|
|
@@ -7911,16 +7912,14 @@ const Methods = {
|
|
|
7911
7912
|
// }
|
|
7912
7913
|
// }
|
|
7913
7914
|
// }
|
|
7914
|
-
if (
|
|
7915
|
-
|
|
7916
|
-
|
|
7917
|
-
|
|
7918
|
-
|
|
7919
|
-
|
|
7920
|
-
|
|
7921
|
-
|
|
7922
|
-
warnLog('vxe.error.scrollErrProp', ['table.span-method']);
|
|
7923
|
-
}
|
|
7915
|
+
if (!(this.height || this.maxHeight)) {
|
|
7916
|
+
errLog('vxe.error.reqProp', ['table.height | table.max-height | table.scroll-y={enabled: false}']);
|
|
7917
|
+
}
|
|
7918
|
+
// if (!this.showOverflow) {
|
|
7919
|
+
// warnLog('vxe.error.reqProp', ['table.show-overflow'])
|
|
7920
|
+
// }
|
|
7921
|
+
if (this.spanMethod) {
|
|
7922
|
+
warnLog('vxe.error.scrollErrProp', ['table.span-method']);
|
|
7924
7923
|
}
|
|
7925
7924
|
}
|
|
7926
7925
|
handleReserveStatus($xeTable);
|
|
@@ -8066,22 +8065,30 @@ const Methods = {
|
|
|
8066
8065
|
cacheRowMap() {
|
|
8067
8066
|
const $xeTable = this;
|
|
8068
8067
|
const props = $xeTable;
|
|
8068
|
+
const reactData = $xeTable;
|
|
8069
8069
|
const internalData = $xeTable;
|
|
8070
8070
|
const {
|
|
8071
8071
|
treeConfig
|
|
8072
8072
|
} = props;
|
|
8073
|
-
const
|
|
8073
|
+
const {
|
|
8074
|
+
treeExpandedMaps
|
|
8075
|
+
} = reactData;
|
|
8074
8076
|
const {
|
|
8075
8077
|
fullAllDataRowIdData,
|
|
8076
8078
|
tableFullData,
|
|
8077
8079
|
tableFullTreeData
|
|
8078
8080
|
} = internalData;
|
|
8081
|
+
const treeOpts = $xeTable.computeTreeOpts;
|
|
8079
8082
|
const childrenField = treeOpts.children || treeOpts.childrenField;
|
|
8080
8083
|
const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
|
|
8081
8084
|
const rowkey = getRowkey($xeTable);
|
|
8082
|
-
const
|
|
8083
|
-
|
|
8085
|
+
const fullAllDataRowIdMaps = {
|
|
8086
|
+
...fullAllDataRowIdData
|
|
8087
|
+
}; // 存在已删除数据
|
|
8084
8088
|
const fullDataRowIdMaps = {};
|
|
8089
|
+
const treeTempExpandedMaps = {
|
|
8090
|
+
...treeExpandedMaps
|
|
8091
|
+
};
|
|
8085
8092
|
const handleRow = (row, index, items, path, parentRow, nodes) => {
|
|
8086
8093
|
let rowid = getRowid($xeTable, row);
|
|
8087
8094
|
const seq = treeConfig && path ? toTreePathSeq(path) : index + 1;
|
|
@@ -8090,8 +8097,16 @@ const Methods = {
|
|
|
8090
8097
|
rowid = getRowUniqueId();
|
|
8091
8098
|
external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, rowkey, rowid);
|
|
8092
8099
|
}
|
|
8093
|
-
if (
|
|
8094
|
-
|
|
8100
|
+
if (treeConfig && treeOpts.lazy) {
|
|
8101
|
+
const treeExpRest = treeExpandedMaps[rowid];
|
|
8102
|
+
if (row[hasChildField] && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(row[childrenField])) {
|
|
8103
|
+
row[childrenField] = null;
|
|
8104
|
+
}
|
|
8105
|
+
if (treeExpRest) {
|
|
8106
|
+
if (!row[childrenField] || !row[childrenField].length) {
|
|
8107
|
+
delete treeTempExpandedMaps[rowid];
|
|
8108
|
+
}
|
|
8109
|
+
}
|
|
8095
8110
|
}
|
|
8096
8111
|
let rowRest = fullAllDataRowIdData[rowid];
|
|
8097
8112
|
if (!rowRest) {
|
|
@@ -8112,6 +8127,8 @@ const Methods = {
|
|
|
8112
8127
|
expandHeight: 0
|
|
8113
8128
|
};
|
|
8114
8129
|
}
|
|
8130
|
+
rowRest.treeLoaded = false;
|
|
8131
|
+
rowRest.expandLoaded = false;
|
|
8115
8132
|
rowRest.row = row;
|
|
8116
8133
|
rowRest.items = items;
|
|
8117
8134
|
rowRest.parent = parentRow;
|
|
@@ -8120,8 +8137,6 @@ const Methods = {
|
|
|
8120
8137
|
fullDataRowIdMaps[rowid] = rowRest;
|
|
8121
8138
|
fullAllDataRowIdMaps[rowid] = rowRest;
|
|
8122
8139
|
};
|
|
8123
|
-
internalData.fullDataRowIdData = fullDataRowIdMaps;
|
|
8124
|
-
internalData.fullAllDataRowIdData = fullAllDataRowIdMaps;
|
|
8125
8140
|
if (treeConfig) {
|
|
8126
8141
|
external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(tableFullTreeData, handleRow, {
|
|
8127
8142
|
children: childrenField
|
|
@@ -8129,6 +8144,9 @@ const Methods = {
|
|
|
8129
8144
|
} else {
|
|
8130
8145
|
tableFullData.forEach(handleRow);
|
|
8131
8146
|
}
|
|
8147
|
+
internalData.fullDataRowIdData = fullDataRowIdMaps;
|
|
8148
|
+
internalData.fullAllDataRowIdData = fullAllDataRowIdMaps;
|
|
8149
|
+
reactData.treeExpandedMaps = treeTempExpandedMaps;
|
|
8132
8150
|
},
|
|
8133
8151
|
cacheSourceMap(fullData) {
|
|
8134
8152
|
let {
|
|
@@ -8504,23 +8522,6 @@ const Methods = {
|
|
|
8504
8522
|
}
|
|
8505
8523
|
return this.createData(records).then(rows => isArr ? rows : rows[0]);
|
|
8506
8524
|
},
|
|
8507
|
-
// toOriginalRecords (rows: any[]) {
|
|
8508
|
-
// const { treeConfig } = props
|
|
8509
|
-
// const treeOpts = computeTreeOpts.value
|
|
8510
|
-
// const { transform, mapChildrenField } = treeOpts
|
|
8511
|
-
// const rowkey = getRowkey($xeTable)
|
|
8512
|
-
// if (treeConfig) {
|
|
8513
|
-
// if (transform) {
|
|
8514
|
-
// return []
|
|
8515
|
-
// }
|
|
8516
|
-
// return []
|
|
8517
|
-
// }
|
|
8518
|
-
// return rows.map(item => {
|
|
8519
|
-
// const obj = Object.assign({}, item)
|
|
8520
|
-
// delete obj.rowkey
|
|
8521
|
-
// return obj
|
|
8522
|
-
// })
|
|
8523
|
-
// },
|
|
8524
8525
|
/**
|
|
8525
8526
|
* 还原数据
|
|
8526
8527
|
* 如果不传任何参数,则还原整个表格
|
|
@@ -8529,16 +8530,30 @@ const Methods = {
|
|
|
8529
8530
|
* 如果还额外传了 field 则还原指定的单元格数据
|
|
8530
8531
|
*/
|
|
8531
8532
|
revertData(rows, field) {
|
|
8533
|
+
const $xeTable = this;
|
|
8534
|
+
const props = $xeTable;
|
|
8535
|
+
const reactData = $xeTable;
|
|
8536
|
+
const internalData = $xeTable;
|
|
8532
8537
|
const {
|
|
8533
8538
|
keepSource,
|
|
8534
|
-
tableSourceData,
|
|
8535
8539
|
treeConfig
|
|
8536
|
-
} =
|
|
8540
|
+
} = props;
|
|
8541
|
+
const {
|
|
8542
|
+
fullAllDataRowIdData,
|
|
8543
|
+
tableSourceData,
|
|
8544
|
+
sourceDataRowIdData,
|
|
8545
|
+
tableFullData,
|
|
8546
|
+
afterFullData
|
|
8547
|
+
} = internalData;
|
|
8548
|
+
const treeOpts = $xeTable.computeTreeOpts;
|
|
8549
|
+
const {
|
|
8550
|
+
transform
|
|
8551
|
+
} = treeOpts;
|
|
8537
8552
|
if (!keepSource) {
|
|
8538
8553
|
if (true) {
|
|
8539
8554
|
warnLog('vxe.error.reqProp', ['keep-source']);
|
|
8540
8555
|
}
|
|
8541
|
-
return
|
|
8556
|
+
return $xeTable.$nextTick();
|
|
8542
8557
|
}
|
|
8543
8558
|
let targetRows = rows;
|
|
8544
8559
|
if (rows) {
|
|
@@ -8546,30 +8561,52 @@ const Methods = {
|
|
|
8546
8561
|
targetRows = [rows];
|
|
8547
8562
|
}
|
|
8548
8563
|
} else {
|
|
8549
|
-
targetRows = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toArray(
|
|
8564
|
+
targetRows = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toArray($xeTable.getUpdateRecords());
|
|
8550
8565
|
}
|
|
8566
|
+
let reDelFlag = false;
|
|
8551
8567
|
if (targetRows.length) {
|
|
8552
8568
|
targetRows.forEach(row => {
|
|
8553
|
-
if (
|
|
8554
|
-
const
|
|
8555
|
-
|
|
8556
|
-
errLog('vxe.error.noTree', ['revertData']);
|
|
8557
|
-
}
|
|
8558
|
-
const oRow = tableSourceData[rowIndex];
|
|
8569
|
+
if (!$xeTable.isInsertByRow(row)) {
|
|
8570
|
+
const rowid = getRowid($xeTable, row);
|
|
8571
|
+
const oRow = sourceDataRowIdData[rowid];
|
|
8559
8572
|
if (oRow && row) {
|
|
8560
8573
|
if (field) {
|
|
8561
8574
|
external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, field, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(oRow, field), true));
|
|
8562
8575
|
} else {
|
|
8563
8576
|
external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().destructuring(row, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(oRow, true));
|
|
8564
8577
|
}
|
|
8578
|
+
if ($xeTable.isRemoveByRow(row)) {
|
|
8579
|
+
const rowRest = fullAllDataRowIdData[rowid];
|
|
8580
|
+
if (rowRest) {
|
|
8581
|
+
const reRow = rowRest.row;
|
|
8582
|
+
tableFullData.unshift(reRow);
|
|
8583
|
+
afterFullData.unshift(reRow);
|
|
8584
|
+
reDelFlag = true;
|
|
8585
|
+
}
|
|
8586
|
+
}
|
|
8565
8587
|
}
|
|
8566
8588
|
}
|
|
8567
8589
|
});
|
|
8568
8590
|
}
|
|
8569
8591
|
if (rows) {
|
|
8570
|
-
|
|
8592
|
+
if (reDelFlag) {
|
|
8593
|
+
$xeTable.updateFooter();
|
|
8594
|
+
$xeTable.cacheRowMap(false);
|
|
8595
|
+
$xeTable.handleTableData(treeConfig && transform);
|
|
8596
|
+
if (!(treeConfig && transform)) {
|
|
8597
|
+
$xeTable.updateAfterDataIndex();
|
|
8598
|
+
}
|
|
8599
|
+
$xeTable.checkSelectionStatus();
|
|
8600
|
+
if (reactData.scrollYLoad) {
|
|
8601
|
+
$xeTable.updateScrollYSpace();
|
|
8602
|
+
}
|
|
8603
|
+
}
|
|
8604
|
+
return $xeTable.$nextTick().then(() => {
|
|
8605
|
+
$xeTable.updateCellAreas();
|
|
8606
|
+
return $xeTable.recalculate();
|
|
8607
|
+
});
|
|
8571
8608
|
}
|
|
8572
|
-
return
|
|
8609
|
+
return $xeTable.reloadData(tableSourceData);
|
|
8573
8610
|
},
|
|
8574
8611
|
/**
|
|
8575
8612
|
* 清空单元格内容
|
|
@@ -8641,6 +8678,7 @@ const Methods = {
|
|
|
8641
8678
|
},
|
|
8642
8679
|
getCellLabel(row, fieldOrColumn) {
|
|
8643
8680
|
const $xeTable = this;
|
|
8681
|
+
const internalData = $xeTable;
|
|
8644
8682
|
const column = handleFieldOrColumn(this, fieldOrColumn);
|
|
8645
8683
|
if (!column) {
|
|
8646
8684
|
return null;
|
|
@@ -8652,7 +8690,7 @@ const Methods = {
|
|
|
8652
8690
|
let formatData;
|
|
8653
8691
|
const {
|
|
8654
8692
|
fullAllDataRowIdData
|
|
8655
|
-
} =
|
|
8693
|
+
} = internalData;
|
|
8656
8694
|
const rowid = getRowid($xeTable, row);
|
|
8657
8695
|
const colid = column.id;
|
|
8658
8696
|
const rowRest = fullAllDataRowIdData[rowid];
|
|
@@ -8699,12 +8737,23 @@ const Methods = {
|
|
|
8699
8737
|
* @param {Row} row 行对象
|
|
8700
8738
|
*/
|
|
8701
8739
|
isInsertByRow(row) {
|
|
8740
|
+
const $xeTable = this;
|
|
8741
|
+
const reactData = $xeTable;
|
|
8702
8742
|
const {
|
|
8703
8743
|
editStore
|
|
8704
|
-
} =
|
|
8705
|
-
const rowid = getRowid(
|
|
8744
|
+
} = reactData;
|
|
8745
|
+
const rowid = getRowid($xeTable, row);
|
|
8706
8746
|
return !!editStore.insertMaps[rowid];
|
|
8707
8747
|
},
|
|
8748
|
+
isRemoveByRow(row) {
|
|
8749
|
+
const $xeTable = this;
|
|
8750
|
+
const reactData = $xeTable;
|
|
8751
|
+
const {
|
|
8752
|
+
editStore
|
|
8753
|
+
} = reactData;
|
|
8754
|
+
const rowid = getRowid($xeTable, row);
|
|
8755
|
+
return !!editStore.removeMaps[rowid];
|
|
8756
|
+
},
|
|
8708
8757
|
/**
|
|
8709
8758
|
* 删除所有新增的临时数据
|
|
8710
8759
|
* @returns
|
|
@@ -11649,11 +11698,13 @@ const Methods = {
|
|
|
11649
11698
|
const checkboxOpts = $xeTable.computeCheckboxOpts;
|
|
11650
11699
|
const {
|
|
11651
11700
|
checkField,
|
|
11652
|
-
checkMethod
|
|
11701
|
+
checkMethod,
|
|
11702
|
+
showReserveStatus
|
|
11653
11703
|
} = checkboxOpts;
|
|
11654
11704
|
const {
|
|
11655
11705
|
afterFullData,
|
|
11656
|
-
afterTreeFullData
|
|
11706
|
+
afterTreeFullData,
|
|
11707
|
+
checkboxReserveRowMap
|
|
11657
11708
|
} = internalData;
|
|
11658
11709
|
let sLen = 0; // 已选
|
|
11659
11710
|
let hLen = 0; // 半选
|
|
@@ -11689,7 +11740,11 @@ const Methods = {
|
|
|
11689
11740
|
vLen++;
|
|
11690
11741
|
});
|
|
11691
11742
|
const isSelected = rootList.length > 0 ? vLen > 0 ? sLen >= vLen : sLen >= rootList.length : false;
|
|
11692
|
-
|
|
11743
|
+
let halfSelect = !isSelected && (sLen >= 1 || hLen >= 1);
|
|
11744
|
+
// 如果复选框启用保留记录,当保留数据存在时显示半选
|
|
11745
|
+
if (!isSelected && !halfSelect && showReserveStatus) {
|
|
11746
|
+
halfSelect = !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isEmpty(checkboxReserveRowMap);
|
|
11747
|
+
}
|
|
11693
11748
|
reactData.isAllSelected = isSelected;
|
|
11694
11749
|
reactData.isIndeterminate = halfSelect;
|
|
11695
11750
|
},
|
|
@@ -15535,19 +15590,17 @@ const Methods = {
|
|
|
15535
15590
|
const funcs = 'setFilter,openFilter,clearFilter,saveFilterPanel,resetFilterPanel,getCheckedFilters,updateFilterOptionStatus,closeMenu,setActiveCellArea,getActiveCellArea,getCellAreas,clearCellAreas,copyCellArea,cutCellArea,pasteCellArea,getCopyCellArea,getCopyCellAreas,clearCopyCellArea,setCellAreas,openFNR,openFind,openReplace,closeFNR,getSelectedCell,clearSelected,insert,insertAt,insertNextAt,insertChild,insertChildAt,insertChildNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearEdit,clearActived,getEditRecord,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell,setSelectCell,clearValidate,fullValidate,validate,fullValidateField,validateField,openExport,closeExport,openPrint,closePrint,getPrintHtml,exportData,openImport,closeImport,importData,saveFile,readFile,importByFile,print,openCustom,closeCustom,saveCustom,cancelCustom,resetCustom,toggleCustomAllCheckbox,setCustomAllCheckbox'.split(',');
|
|
15536
15591
|
funcs.forEach(name => {
|
|
15537
15592
|
Methods[name] = function (...args) {
|
|
15538
|
-
if (
|
|
15539
|
-
if (
|
|
15540
|
-
|
|
15541
|
-
|
|
15542
|
-
|
|
15543
|
-
|
|
15544
|
-
|
|
15545
|
-
|
|
15546
|
-
|
|
15547
|
-
|
|
15548
|
-
|
|
15549
|
-
errLog('vxe.error.reqModule', ['VxeTableCustomModule']);
|
|
15550
|
-
}
|
|
15593
|
+
if (!this[`_${name}`]) {
|
|
15594
|
+
if ('openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',').includes(name)) {
|
|
15595
|
+
errLog('vxe.error.reqModule', ['VxeTableExportModule']);
|
|
15596
|
+
} else if ('fullValidate,validate'.split(',').includes(name)) {
|
|
15597
|
+
errLog('vxe.error.reqModule', ['VxeTableValidatorModule']);
|
|
15598
|
+
} else if ('setFilter,openFilter,clearFilter,getCheckedFilters'.split(',').includes(name)) {
|
|
15599
|
+
errLog('vxe.error.reqModule', ['VxeTableFilterModule']);
|
|
15600
|
+
} else if ('insert,insertAt,insertNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,getEditRecord,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell'.split(',').includes(name)) {
|
|
15601
|
+
errLog('vxe.error.reqModule', ['VxeTableEditModule']);
|
|
15602
|
+
} else if ('openCustom'.split(',').includes(name)) {
|
|
15603
|
+
errLog('vxe.error.reqModule', ['VxeTableCustomModule']);
|
|
15551
15604
|
}
|
|
15552
15605
|
}
|
|
15553
15606
|
return this[`_${name}`] ? this[`_${name}`](...args) : null;
|
|
@@ -15644,6 +15697,7 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
|
|
|
15644
15697
|
const {
|
|
15645
15698
|
columnKey,
|
|
15646
15699
|
resizable: allResizable,
|
|
15700
|
+
showOverflow: allShowOverflow,
|
|
15647
15701
|
border,
|
|
15648
15702
|
height,
|
|
15649
15703
|
cellClassName: allCellClassName,
|
|
@@ -15731,7 +15785,7 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
|
|
|
15731
15785
|
const resizeHeight = resizeHeightFlag ? rowRest.resizeHeight : 0;
|
|
15732
15786
|
let fixedHiddenColumn = fixedType ? column.fixed !== fixedType : column.fixed && overflowX;
|
|
15733
15787
|
const isCellPadding = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(padding) ? allPadding === null ? cellOpts.padding : allPadding : padding;
|
|
15734
|
-
const cellOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(showOverflow) ?
|
|
15788
|
+
const cellOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(showOverflow) ? allShowOverflow : showOverflow;
|
|
15735
15789
|
const showEllipsis = cellOverflow === 'ellipsis';
|
|
15736
15790
|
const showTitle = cellOverflow === 'title';
|
|
15737
15791
|
const showTooltip = cellOverflow === true || cellOverflow === 'tooltip';
|
|
@@ -18387,39 +18441,37 @@ const renderPopupPanel = (h, _vm) => {
|
|
|
18387
18441
|
},
|
|
18388
18442
|
computed: {},
|
|
18389
18443
|
created() {
|
|
18390
|
-
|
|
18391
|
-
|
|
18392
|
-
|
|
18393
|
-
|
|
18394
|
-
|
|
18395
|
-
|
|
18396
|
-
|
|
18397
|
-
|
|
18398
|
-
|
|
18399
|
-
|
|
18400
|
-
|
|
18401
|
-
|
|
18402
|
-
|
|
18403
|
-
|
|
18404
|
-
|
|
18405
|
-
|
|
18406
|
-
|
|
18407
|
-
|
|
18408
|
-
|
|
18409
|
-
|
|
18410
|
-
|
|
18411
|
-
|
|
18412
|
-
|
|
18413
|
-
|
|
18414
|
-
|
|
18415
|
-
|
|
18416
|
-
|
|
18417
|
-
|
|
18418
|
-
|
|
18419
|
-
|
|
18420
|
-
|
|
18421
|
-
});
|
|
18422
|
-
}
|
|
18444
|
+
const VxeUIModalComponent = core_.VxeUI.getComponent('VxeModal');
|
|
18445
|
+
const VxeUIDrawerComponent = core_.VxeUI.getComponent('VxeDrawer');
|
|
18446
|
+
const VxeUIButtonComponent = core_.VxeUI.getComponent('VxeButton');
|
|
18447
|
+
const VxeUINumberInputComponent = core_.VxeUI.getComponent('VxeNumberInput');
|
|
18448
|
+
const VxeUIRadioGroupComponent = core_.VxeUI.getComponent('VxeRadioGroup');
|
|
18449
|
+
this.$nextTick(() => {
|
|
18450
|
+
const {
|
|
18451
|
+
$xetable
|
|
18452
|
+
} = this;
|
|
18453
|
+
const {
|
|
18454
|
+
customOpts
|
|
18455
|
+
} = $xetable;
|
|
18456
|
+
const {
|
|
18457
|
+
mode
|
|
18458
|
+
} = customOpts;
|
|
18459
|
+
if (!VxeUIModalComponent) {
|
|
18460
|
+
errLog('vxe.error.reqComp', ['vxe-modal']);
|
|
18461
|
+
}
|
|
18462
|
+
if (!VxeUIDrawerComponent && mode === 'drawer') {
|
|
18463
|
+
errLog('vxe.error.reqComp', ['vxe-drawer']);
|
|
18464
|
+
}
|
|
18465
|
+
if (!VxeUIButtonComponent) {
|
|
18466
|
+
errLog('vxe.error.reqComp', ['vxe-button']);
|
|
18467
|
+
}
|
|
18468
|
+
if (!VxeUINumberInputComponent) {
|
|
18469
|
+
errLog('vxe.error.reqComp', ['vxe-input']);
|
|
18470
|
+
}
|
|
18471
|
+
if (!VxeUIRadioGroupComponent) {
|
|
18472
|
+
errLog('vxe.error.reqComp', ['vxe-radio-group']);
|
|
18473
|
+
}
|
|
18474
|
+
});
|
|
18423
18475
|
},
|
|
18424
18476
|
render(h) {
|
|
18425
18477
|
const $xeTable = this.$xeTable;
|
|
@@ -19156,22 +19208,20 @@ const {
|
|
|
19156
19208
|
},
|
|
19157
19209
|
created() {
|
|
19158
19210
|
const $xeTableImportPanel = this;
|
|
19159
|
-
|
|
19160
|
-
|
|
19161
|
-
|
|
19162
|
-
|
|
19163
|
-
|
|
19164
|
-
|
|
19165
|
-
|
|
19166
|
-
|
|
19167
|
-
|
|
19168
|
-
|
|
19169
|
-
|
|
19170
|
-
|
|
19171
|
-
|
|
19172
|
-
|
|
19173
|
-
});
|
|
19174
|
-
}
|
|
19211
|
+
const VxeUIModalComponent = core_.VxeUI.getComponent('VxeModal');
|
|
19212
|
+
const VxeUIButtonComponent = core_.VxeUI.getComponent('VxeButton');
|
|
19213
|
+
const VxeUISelectComponent = core_.VxeUI.getComponent('VxeSelect');
|
|
19214
|
+
$xeTableImportPanel.$nextTick(() => {
|
|
19215
|
+
if (!VxeUIModalComponent) {
|
|
19216
|
+
errLog('vxe.error.reqComp', ['vxe-modal']);
|
|
19217
|
+
}
|
|
19218
|
+
if (!VxeUIButtonComponent) {
|
|
19219
|
+
errLog('vxe.error.reqComp', ['vxe-button']);
|
|
19220
|
+
}
|
|
19221
|
+
if (!VxeUISelectComponent) {
|
|
19222
|
+
errLog('vxe.error.reqComp', ['vxe-select']);
|
|
19223
|
+
}
|
|
19224
|
+
});
|
|
19175
19225
|
},
|
|
19176
19226
|
render(h) {
|
|
19177
19227
|
const $xeTable = this.$xeTable;
|
|
@@ -19404,30 +19454,28 @@ const {
|
|
|
19404
19454
|
},
|
|
19405
19455
|
created() {
|
|
19406
19456
|
const $xeTableExportPanel = this;
|
|
19407
|
-
|
|
19408
|
-
|
|
19409
|
-
|
|
19410
|
-
|
|
19411
|
-
|
|
19412
|
-
|
|
19413
|
-
|
|
19414
|
-
|
|
19415
|
-
|
|
19416
|
-
|
|
19417
|
-
|
|
19418
|
-
|
|
19419
|
-
|
|
19420
|
-
|
|
19421
|
-
|
|
19422
|
-
|
|
19423
|
-
|
|
19424
|
-
|
|
19425
|
-
|
|
19426
|
-
|
|
19427
|
-
|
|
19428
|
-
|
|
19429
|
-
});
|
|
19430
|
-
}
|
|
19457
|
+
const VxeUIModalComponent = core_.VxeUI.getComponent('VxeModal');
|
|
19458
|
+
const VxeUIButtonComponent = core_.VxeUI.getComponent('VxeButton');
|
|
19459
|
+
const VxeUISelectComponent = core_.VxeUI.getComponent('VxeSelect');
|
|
19460
|
+
const VxeUIInputComponent = core_.VxeUI.getComponent('VxeInput');
|
|
19461
|
+
const VxeUICheckboxComponent = core_.VxeUI.getComponent('VxeCheckbox');
|
|
19462
|
+
$xeTableExportPanel.$nextTick(() => {
|
|
19463
|
+
if (!VxeUIModalComponent) {
|
|
19464
|
+
errLog('vxe.error.reqComp', ['vxe-modal']);
|
|
19465
|
+
}
|
|
19466
|
+
if (!VxeUIButtonComponent) {
|
|
19467
|
+
errLog('vxe.error.reqComp', ['vxe-button']);
|
|
19468
|
+
}
|
|
19469
|
+
if (!VxeUISelectComponent) {
|
|
19470
|
+
errLog('vxe.error.reqComp', ['vxe-select']);
|
|
19471
|
+
}
|
|
19472
|
+
if (!VxeUIInputComponent) {
|
|
19473
|
+
errLog('vxe.error.reqComp', ['vxe-input']);
|
|
19474
|
+
}
|
|
19475
|
+
if (!VxeUICheckboxComponent) {
|
|
19476
|
+
errLog('vxe.error.reqComp', ['vxe-checkbox']);
|
|
19477
|
+
}
|
|
19478
|
+
});
|
|
19431
19479
|
},
|
|
19432
19480
|
render(h) {
|
|
19433
19481
|
const $xeTable = this.$xeTable;
|
|
@@ -21107,7 +21155,7 @@ function handleInsertChildRowAt($xeTable, records, parentRow, targetRow, isInser
|
|
|
21107
21155
|
[parentField]: parentRow[rowField]
|
|
21108
21156
|
})), targetRow, isInsertNextRow);
|
|
21109
21157
|
} else {
|
|
21110
|
-
errLog('vxe.error.errProp', ['tree-config.
|
|
21158
|
+
errLog('vxe.error.errProp', ['tree-config.transform=false', 'tree-config.transform=true']);
|
|
21111
21159
|
}
|
|
21112
21160
|
return Promise.resolve({
|
|
21113
21161
|
row: null,
|
|
@@ -22596,10 +22644,8 @@ function downloadFile($xetable, opts, content) {
|
|
|
22596
22644
|
}).then(() => {
|
|
22597
22645
|
if (opts.message !== false) {
|
|
22598
22646
|
// 检测弹窗模块
|
|
22599
|
-
if (
|
|
22600
|
-
|
|
22601
|
-
errLog('vxe.error.reqModule', ['Modal']);
|
|
22602
|
-
}
|
|
22647
|
+
if (!core_.VxeUI.modal) {
|
|
22648
|
+
errLog('vxe.error.reqModule', ['Modal']);
|
|
22603
22649
|
}
|
|
22604
22650
|
core_.VxeUI.modal.message({
|
|
22605
22651
|
content: export_mixin_getI18n('vxe.table.expSuccess'),
|
|
@@ -22880,10 +22926,8 @@ function handleImport($xeTable, content, opts) {
|
|
|
22880
22926
|
}
|
|
22881
22927
|
if (opts.message !== false) {
|
|
22882
22928
|
// 检测弹窗模块
|
|
22883
|
-
if (
|
|
22884
|
-
|
|
22885
|
-
errLog('vxe.error.reqModule', ['Modal']);
|
|
22886
|
-
}
|
|
22929
|
+
if (!core_.VxeUI.modal) {
|
|
22930
|
+
errLog('vxe.error.reqModule', ['Modal']);
|
|
22887
22931
|
}
|
|
22888
22932
|
core_.VxeUI.modal.message({
|
|
22889
22933
|
content: export_mixin_getI18n('vxe.table.impSuccess', [rows.length]),
|
|
@@ -22900,10 +22944,8 @@ function handleImport($xeTable, content, opts) {
|
|
|
22900
22944
|
});
|
|
22901
22945
|
} else if (opts.message !== false) {
|
|
22902
22946
|
// 检测弹窗模块
|
|
22903
|
-
if (
|
|
22904
|
-
|
|
22905
|
-
errLog('vxe.error.reqModule', ['Modal']);
|
|
22906
|
-
}
|
|
22947
|
+
if (!core_.VxeUI.modal) {
|
|
22948
|
+
errLog('vxe.error.reqModule', ['Modal']);
|
|
22907
22949
|
}
|
|
22908
22950
|
core_.VxeUI.modal.message({
|
|
22909
22951
|
content: export_mixin_getI18n('vxe.error.impFields'),
|
|
@@ -22932,10 +22974,8 @@ function handleFileImport($xetable, file, opts) {
|
|
|
22932
22974
|
if (!importMethod && !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)) {
|
|
22933
22975
|
if (opts.message !== false) {
|
|
22934
22976
|
// 检测弹窗模块
|
|
22935
|
-
if (
|
|
22936
|
-
|
|
22937
|
-
errLog('vxe.error.reqModule', ['Modal']);
|
|
22938
|
-
}
|
|
22977
|
+
if (!core_.VxeUI.modal) {
|
|
22978
|
+
errLog('vxe.error.reqModule', ['Modal']);
|
|
22939
22979
|
}
|
|
22940
22980
|
core_.VxeUI.modal.message({
|
|
22941
22981
|
content: export_mixin_getI18n('vxe.error.notType', [type]),
|
|
@@ -23008,9 +23048,7 @@ function handleFileImport($xetable, file, opts) {
|
|
|
23008
23048
|
}
|
|
23009
23049
|
} else {
|
|
23010
23050
|
// 不支持的浏览器
|
|
23011
|
-
|
|
23012
|
-
errLog('vxe.error.notExp');
|
|
23013
|
-
}
|
|
23051
|
+
errLog('vxe.error.notExp');
|
|
23014
23052
|
_importResolve({
|
|
23015
23053
|
status: true
|
|
23016
23054
|
});
|
|
@@ -23087,10 +23125,8 @@ function readLocalFile(options = {}) {
|
|
|
23087
23125
|
} else {
|
|
23088
23126
|
if (options.message !== false) {
|
|
23089
23127
|
// 检测弹窗模块
|
|
23090
|
-
if (
|
|
23091
|
-
|
|
23092
|
-
errLog('vxe.error.reqModule', ['Modal']);
|
|
23093
|
-
}
|
|
23128
|
+
if (!core_.VxeUI.modal) {
|
|
23129
|
+
errLog('vxe.error.reqModule', ['Modal']);
|
|
23094
23130
|
}
|
|
23095
23131
|
core_.VxeUI.modal.message({
|
|
23096
23132
|
content: export_mixin_getI18n('vxe.error.notType', [errType]),
|
|
@@ -23856,10 +23892,8 @@ const convertToRows = originColumns => {
|
|
|
23856
23892
|
const {
|
|
23857
23893
|
exportOpts
|
|
23858
23894
|
} = this;
|
|
23859
|
-
if (
|
|
23860
|
-
|
|
23861
|
-
errLog('vxe.error.reqProp', ['export-config']);
|
|
23862
|
-
}
|
|
23895
|
+
if (!this.exportConfig) {
|
|
23896
|
+
errLog('vxe.error.reqProp', ['export-config']);
|
|
23863
23897
|
}
|
|
23864
23898
|
return handleExportAndPrint(this, Object.assign({}, exportOpts, options));
|
|
23865
23899
|
},
|
|
@@ -23868,10 +23902,8 @@ const convertToRows = originColumns => {
|
|
|
23868
23902
|
const {
|
|
23869
23903
|
printOpts
|
|
23870
23904
|
} = this;
|
|
23871
|
-
if (
|
|
23872
|
-
|
|
23873
|
-
errLog('vxe.error.reqProp', ['print-config']);
|
|
23874
|
-
}
|
|
23905
|
+
if (!this.printConfig) {
|
|
23906
|
+
errLog('vxe.error.reqProp', ['print-config']);
|
|
23875
23907
|
}
|
|
23876
23908
|
return handleExportAndPrint(this, Object.assign({}, printOpts, options), true);
|
|
23877
23909
|
}
|
|
@@ -24126,6 +24158,7 @@ function getCheckboxRangeRows($xeTable, evnt, params, targetTrElem, trRect, offs
|
|
|
24126
24158
|
});
|
|
24127
24159
|
},
|
|
24128
24160
|
handleCellMousedownEvent(evnt, params) {
|
|
24161
|
+
const $xeTable = this;
|
|
24129
24162
|
const {
|
|
24130
24163
|
editConfig,
|
|
24131
24164
|
editOpts,
|
|
@@ -24135,8 +24168,8 @@ function getCheckboxRangeRows($xeTable, evnt, params, targetTrElem, trRect, offs
|
|
|
24135
24168
|
mouseConfig,
|
|
24136
24169
|
mouseOpts
|
|
24137
24170
|
} = this;
|
|
24138
|
-
if (mouseConfig && mouseOpts.area &&
|
|
24139
|
-
return
|
|
24171
|
+
if (mouseConfig && mouseOpts.area && $xeTable.handleCellAreaMousedownEvent) {
|
|
24172
|
+
return $xeTable.handleCellAreaMousedownEvent(evnt, params);
|
|
24140
24173
|
} else {
|
|
24141
24174
|
if (checkboxConfig && checkboxOpts.range) {
|
|
24142
24175
|
this.handleCheckboxRangeEvent(evnt, params);
|
|
@@ -24756,9 +24789,7 @@ function validErrorRuleValue(rule, val) {
|
|
|
24756
24789
|
}
|
|
24757
24790
|
}
|
|
24758
24791
|
} else {
|
|
24759
|
-
|
|
24760
|
-
errLog('vxe.error.notValidators', [validator]);
|
|
24761
|
-
}
|
|
24792
|
+
errLog('vxe.error.notValidators', [validator]);
|
|
24762
24793
|
}
|
|
24763
24794
|
} else {
|
|
24764
24795
|
customValid = validator(validParams);
|
|
@@ -26721,7 +26752,7 @@ function renderBody(h, $xeTable) {
|
|
|
26721
26752
|
if (rowOpts.height && !this.showOverflow) {
|
|
26722
26753
|
warnLog('vxe.error.notProp', ['table.show-overflow']);
|
|
26723
26754
|
}
|
|
26724
|
-
if (!$xeTable.
|
|
26755
|
+
if (!$xeTable.handleCellAreaMousedownEvent) {
|
|
26725
26756
|
if (props.areaConfig) {
|
|
26726
26757
|
warnLog('vxe.error.notProp', ['area-config']);
|
|
26727
26758
|
}
|
|
@@ -26858,23 +26889,21 @@ function renderBody(h, $xeTable) {
|
|
|
26858
26889
|
warnLog('vxe.error.reqProp', ['tooltip-config']);
|
|
26859
26890
|
}
|
|
26860
26891
|
}
|
|
26861
|
-
|
|
26862
|
-
|
|
26863
|
-
|
|
26864
|
-
|
|
26865
|
-
|
|
26866
|
-
if (
|
|
26867
|
-
|
|
26868
|
-
errLog('vxe.error.reqComp', ['vxe-loading']);
|
|
26869
|
-
}
|
|
26892
|
+
// 使用已安装的组件,如果未安装则不渲染
|
|
26893
|
+
const VxeUILoadingComponent = core_.VxeUI.getComponent('VxeLoading');
|
|
26894
|
+
const VxeUITooltipComponent = core_.VxeUI.getComponent('VxeTooltip');
|
|
26895
|
+
$xeTable.$nextTick(() => {
|
|
26896
|
+
if (props.loading) {
|
|
26897
|
+
if (!VxeUILoadingComponent && !this.$scopedSlots.loading) {
|
|
26898
|
+
errLog('vxe.error.reqComp', ['vxe-loading']);
|
|
26870
26899
|
}
|
|
26871
|
-
|
|
26872
|
-
|
|
26873
|
-
|
|
26874
|
-
|
|
26900
|
+
}
|
|
26901
|
+
if (props.showOverflow === true || props.showOverflow === 'tooltip' || props.showHeaderOverflow === true || props.showHeaderOverflow === 'tooltip' || props.showFooterOverflow === true || props.showFooterOverflow === 'tooltip' || props.tooltipConfig || props.editRules) {
|
|
26902
|
+
if (!VxeUITooltipComponent) {
|
|
26903
|
+
errLog('vxe.error.reqComp', ['vxe-tooltip']);
|
|
26875
26904
|
}
|
|
26876
|
-
}
|
|
26877
|
-
}
|
|
26905
|
+
}
|
|
26906
|
+
});
|
|
26878
26907
|
if (this.autoResize) {
|
|
26879
26908
|
const resizeObserver = table_globalResize.create(() => {
|
|
26880
26909
|
if (this.autoResize) {
|
|
@@ -27228,7 +27257,7 @@ const {
|
|
|
27228
27257
|
globalMixins: toolbar_globalMixins,
|
|
27229
27258
|
renderEmptyElement: toolbar_renderEmptyElement
|
|
27230
27259
|
} = core_.VxeUI;
|
|
27231
|
-
/* harmony default export */ var src_toolbar = (defineVxeComponent({
|
|
27260
|
+
/* harmony default export */ var src_toolbar = (/* define-vxe-component start */defineVxeComponent({
|
|
27232
27261
|
name: 'VxeToolbar',
|
|
27233
27262
|
mixins: [toolbar_globalMixins.sizeMixin],
|
|
27234
27263
|
props: {
|
|
@@ -27491,9 +27520,7 @@ const {
|
|
|
27491
27520
|
if (tCommandMethod) {
|
|
27492
27521
|
tCommandMethod(params);
|
|
27493
27522
|
} else {
|
|
27494
|
-
|
|
27495
|
-
errLog('vxe.error.notCommands', [code]);
|
|
27496
|
-
}
|
|
27523
|
+
errLog('vxe.error.notCommands', [code]);
|
|
27497
27524
|
}
|
|
27498
27525
|
}
|
|
27499
27526
|
$xeToolbar.dispatchEvent('button-click', params, evnt);
|
|
@@ -27528,9 +27555,7 @@ const {
|
|
|
27528
27555
|
if (tCommandMethod) {
|
|
27529
27556
|
tCommandMethod(params);
|
|
27530
27557
|
} else {
|
|
27531
|
-
|
|
27532
|
-
errLog('vxe.error.notCommands', [code]);
|
|
27533
|
-
}
|
|
27558
|
+
errLog('vxe.error.notCommands', [code]);
|
|
27534
27559
|
}
|
|
27535
27560
|
}
|
|
27536
27561
|
$xeToolbar.dispatchEvent('tool-click', params, evnt);
|
|
@@ -27983,35 +28008,31 @@ const {
|
|
|
27983
28008
|
$xetable.connect(this);
|
|
27984
28009
|
}
|
|
27985
28010
|
const customOpts = $xeToolbar.computeCustomOpts;
|
|
27986
|
-
if (
|
|
27987
|
-
|
|
27988
|
-
|
|
27989
|
-
|
|
27990
|
-
|
|
27991
|
-
|
|
27992
|
-
|
|
27993
|
-
|
|
27994
|
-
|
|
27995
|
-
|
|
27996
|
-
|
|
27997
|
-
warnLog('vxe.error.delProp', ['toolbar.custom.trigger', 'table.custom-config.trigger']);
|
|
27998
|
-
}
|
|
28011
|
+
if (customOpts.isFooter) {
|
|
28012
|
+
warnLog('vxe.error.delProp', ['toolbar.custom.isFooter', 'table.custom-config.showFooter']);
|
|
28013
|
+
}
|
|
28014
|
+
if (customOpts.showFooter) {
|
|
28015
|
+
warnLog('vxe.error.delProp', ['toolbar.custom.showFooter', 'table.custom-config.showFooter']);
|
|
28016
|
+
}
|
|
28017
|
+
if (customOpts.immediate) {
|
|
28018
|
+
warnLog('vxe.error.delProp', ['toolbar.custom.immediate', 'table.custom-config.immediate']);
|
|
28019
|
+
}
|
|
28020
|
+
if (customOpts.trigger) {
|
|
28021
|
+
warnLog('vxe.error.delProp', ['toolbar.custom.trigger', 'table.custom-config.trigger']);
|
|
27999
28022
|
}
|
|
28000
28023
|
});
|
|
28001
|
-
|
|
28002
|
-
|
|
28003
|
-
|
|
28004
|
-
if (
|
|
28005
|
-
|
|
28006
|
-
errLog('vxe.error.reqComp', ['vxe-button']);
|
|
28007
|
-
}
|
|
28024
|
+
// 使用已安装的组件,如果未安装则不渲染
|
|
28025
|
+
const VxeUIButtonComponent = core_.VxeUI.getComponent('VxeButton');
|
|
28026
|
+
if (props.refresh || props.import || props.export || props.print || props.zoom) {
|
|
28027
|
+
if (!VxeUIButtonComponent) {
|
|
28028
|
+
errLog('vxe.error.reqComp', ['vxe-button']);
|
|
28008
28029
|
}
|
|
28009
28030
|
}
|
|
28010
28031
|
},
|
|
28011
28032
|
render(h) {
|
|
28012
28033
|
return this.renderVN(h);
|
|
28013
28034
|
}
|
|
28014
|
-
}));
|
|
28035
|
+
})); /* define-vxe-component end */
|
|
28015
28036
|
;// CONCATENATED MODULE: ./packages/grid/src/grid.ts
|
|
28016
28037
|
|
|
28017
28038
|
|
|
@@ -28094,9 +28115,7 @@ function getFuncSlot($xeGrid, optSlots, slotKey) {
|
|
|
28094
28115
|
if (slots[funcSlot]) {
|
|
28095
28116
|
return slots[funcSlot];
|
|
28096
28117
|
} else {
|
|
28097
|
-
|
|
28098
|
-
errLog('vxe.error.notSlot', [funcSlot]);
|
|
28099
|
-
}
|
|
28118
|
+
errLog('vxe.error.notSlot', [funcSlot]);
|
|
28100
28119
|
}
|
|
28101
28120
|
} else {
|
|
28102
28121
|
return funcSlot;
|
|
@@ -28189,7 +28208,7 @@ function renderForm(h, _vm) {
|
|
|
28189
28208
|
if (hasForm) {
|
|
28190
28209
|
return h('div', {
|
|
28191
28210
|
key: 'form',
|
|
28192
|
-
ref: '
|
|
28211
|
+
ref: 'refFormWrapper',
|
|
28193
28212
|
class: 'vxe-grid--form-wrapper'
|
|
28194
28213
|
}, formSlot ? formSlot.call(_vm, {
|
|
28195
28214
|
$grid: _vm
|
|
@@ -28212,7 +28231,7 @@ function renderToolbar(h, _vm) {
|
|
|
28212
28231
|
if (hasToolbar) {
|
|
28213
28232
|
return h('div', {
|
|
28214
28233
|
key: 'toolbar',
|
|
28215
|
-
ref: '
|
|
28234
|
+
ref: 'refToolbarWrapper',
|
|
28216
28235
|
class: 'vxe-grid--toolbar-wrapper'
|
|
28217
28236
|
}, toolbarSlot ? toolbarSlot.call(_vm, {
|
|
28218
28237
|
$grid: _vm
|
|
@@ -28235,7 +28254,7 @@ function renderTop(h, _vm) {
|
|
|
28235
28254
|
const topSlot = $scopedSlots.top;
|
|
28236
28255
|
return topSlot ? h('div', {
|
|
28237
28256
|
key: 'top',
|
|
28238
|
-
ref: '
|
|
28257
|
+
ref: 'refTopWrapper',
|
|
28239
28258
|
class: 'vxe-grid--top-wrapper'
|
|
28240
28259
|
}, topSlot.call(_vm, {
|
|
28241
28260
|
$grid: _vm
|
|
@@ -28300,7 +28319,7 @@ function renderBottom(h, _vm) {
|
|
|
28300
28319
|
const bottomSlot = $scopedSlots.bottom;
|
|
28301
28320
|
return bottomSlot ? h('div', {
|
|
28302
28321
|
key: 'bottom',
|
|
28303
|
-
ref: '
|
|
28322
|
+
ref: 'refBottomWrapper',
|
|
28304
28323
|
class: 'vxe-grid--bottom-wrapper'
|
|
28305
28324
|
}, bottomSlot.call(_vm, {
|
|
28306
28325
|
$grid: _vm
|
|
@@ -28325,7 +28344,7 @@ function renderPager(h, $xeGrid) {
|
|
|
28325
28344
|
if (hasPager) {
|
|
28326
28345
|
return h('div', {
|
|
28327
28346
|
key: 'pager',
|
|
28328
|
-
ref: '
|
|
28347
|
+
ref: 'refPagerWrapper',
|
|
28329
28348
|
class: 'vxe-grid--pager-wrapper'
|
|
28330
28349
|
}, pagerSlot ? pagerSlot.call($xeGrid, {
|
|
28331
28350
|
$grid: $xeGrid
|
|
@@ -28627,23 +28646,21 @@ Object.keys(table.methods).forEach(name => {
|
|
|
28627
28646
|
// warnLog('vxe.error.delProp', ['proxy-config.props', 'proxy-config.response'])
|
|
28628
28647
|
// }
|
|
28629
28648
|
}
|
|
28630
|
-
|
|
28631
|
-
|
|
28632
|
-
|
|
28633
|
-
|
|
28634
|
-
|
|
28635
|
-
if (
|
|
28636
|
-
|
|
28637
|
-
errLog('vxe.error.reqComp', ['vxe-form']);
|
|
28638
|
-
}
|
|
28649
|
+
// 使用已安装的组件,如果未安装则不渲染
|
|
28650
|
+
const VxeUIFormComponent = core_.VxeUI.getComponent('VxeForm');
|
|
28651
|
+
const VxeUIPagerComponent = core_.VxeUI.getComponent('VxePager');
|
|
28652
|
+
$xeGrid.$nextTick(() => {
|
|
28653
|
+
if (props.formConfig) {
|
|
28654
|
+
if (!VxeUIFormComponent) {
|
|
28655
|
+
errLog('vxe.error.reqComp', ['vxe-form']);
|
|
28639
28656
|
}
|
|
28640
|
-
|
|
28641
|
-
|
|
28642
|
-
|
|
28643
|
-
|
|
28657
|
+
}
|
|
28658
|
+
if (props.pagerConfig) {
|
|
28659
|
+
if (!VxeUIPagerComponent) {
|
|
28660
|
+
errLog('vxe.error.reqComp', ['vxe-pager']);
|
|
28644
28661
|
}
|
|
28645
|
-
}
|
|
28646
|
-
}
|
|
28662
|
+
}
|
|
28663
|
+
});
|
|
28647
28664
|
this.initPages();
|
|
28648
28665
|
grid_globalEvents.on(this, 'keydown', this.handleGlobalKeydownEvent);
|
|
28649
28666
|
},
|
|
@@ -28664,6 +28681,7 @@ Object.keys(table.methods).forEach(name => {
|
|
|
28664
28681
|
const vSize = $xeGrid.computeSize;
|
|
28665
28682
|
const styles = $xeGrid.computeStyles;
|
|
28666
28683
|
return h('div', {
|
|
28684
|
+
ref: 'refElem',
|
|
28667
28685
|
class: ['vxe-grid', {
|
|
28668
28686
|
[`size--${vSize}`]: vSize,
|
|
28669
28687
|
'is--animat': !!this.animat,
|
|
@@ -28690,32 +28708,32 @@ Object.keys(table.methods).forEach(name => {
|
|
|
28690
28708
|
}
|
|
28691
28709
|
return [];
|
|
28692
28710
|
},
|
|
28693
|
-
getParentHeight() {
|
|
28694
|
-
const {
|
|
28695
|
-
$el,
|
|
28696
|
-
isZMax
|
|
28697
|
-
} = this;
|
|
28698
|
-
return (isZMax ? getDomNode().visibleHeight : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(getComputedStyle($el.parentNode).height)) - this.getExcludeHeight();
|
|
28699
|
-
},
|
|
28700
28711
|
/**
|
|
28701
28712
|
* 获取需要排除的高度
|
|
28702
28713
|
*/
|
|
28703
28714
|
getExcludeHeight() {
|
|
28715
|
+
const $xeGrid = this;
|
|
28716
|
+
const reactData = $xeGrid;
|
|
28704
28717
|
const {
|
|
28705
|
-
|
|
28706
|
-
|
|
28707
|
-
|
|
28708
|
-
|
|
28709
|
-
|
|
28710
|
-
const
|
|
28711
|
-
|
|
28712
|
-
|
|
28713
|
-
|
|
28714
|
-
|
|
28715
|
-
|
|
28716
|
-
|
|
28717
|
-
const
|
|
28718
|
-
|
|
28718
|
+
isZMax
|
|
28719
|
+
} = reactData;
|
|
28720
|
+
const el = $xeGrid.$refs.refElem;
|
|
28721
|
+
const formWrapper = $xeGrid.$refs.refFormWrapper;
|
|
28722
|
+
const toolbarWrapper = $xeGrid.$refs.refToolbarWrapper;
|
|
28723
|
+
const topWrapper = $xeGrid.$refs.refTopWrapper;
|
|
28724
|
+
const bottomWrapper = $xeGrid.$refs.refBottomWrapper;
|
|
28725
|
+
const pagerWrapper = $xeGrid.$refs.refPagerWrapper;
|
|
28726
|
+
const parentPaddingSize = isZMax ? 0 : getPaddingTopBottomSize(el.parentNode);
|
|
28727
|
+
return parentPaddingSize + getPaddingTopBottomSize(el) + getOffsetHeight(formWrapper) + getOffsetHeight(toolbarWrapper) + getOffsetHeight(topWrapper) + getOffsetHeight(bottomWrapper) + getOffsetHeight(pagerWrapper);
|
|
28728
|
+
},
|
|
28729
|
+
getParentHeight() {
|
|
28730
|
+
const $xeGrid = this;
|
|
28731
|
+
const reactData = $xeGrid;
|
|
28732
|
+
const el = $xeGrid.$refs.refElem;
|
|
28733
|
+
if (el) {
|
|
28734
|
+
return (reactData.isZMax ? getDomNode().visibleHeight : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(getComputedStyle(el.parentNode).height)) - $xeGrid.getExcludeHeight();
|
|
28735
|
+
}
|
|
28736
|
+
return 0;
|
|
28719
28737
|
},
|
|
28720
28738
|
initToolbar() {
|
|
28721
28739
|
this.$nextTick(() => {
|
|
@@ -29015,9 +29033,7 @@ Object.keys(table.methods).forEach(name => {
|
|
|
29015
29033
|
};
|
|
29016
29034
|
});
|
|
29017
29035
|
} else {
|
|
29018
|
-
|
|
29019
|
-
errLog('vxe.error.notFunc', ['proxy-config.ajax.query']);
|
|
29020
|
-
}
|
|
29036
|
+
errLog('vxe.error.notFunc', ['proxy-config.ajax.query']);
|
|
29021
29037
|
}
|
|
29022
29038
|
break;
|
|
29023
29039
|
}
|
|
@@ -29052,10 +29068,8 @@ Object.keys(table.methods).forEach(name => {
|
|
|
29052
29068
|
$xeTable.setPendingRow(removeRecords, false);
|
|
29053
29069
|
if (isRespMsg) {
|
|
29054
29070
|
// 检测弹窗模块
|
|
29055
|
-
if (
|
|
29056
|
-
|
|
29057
|
-
errLog('vxe.error.reqModule', ['Modal']);
|
|
29058
|
-
}
|
|
29071
|
+
if (!core_.VxeUI.modal) {
|
|
29072
|
+
errLog('vxe.error.reqModule', ['Modal']);
|
|
29059
29073
|
}
|
|
29060
29074
|
core_.VxeUI.modal.message({
|
|
29061
29075
|
content: this.getRespMsg(rest, 'vxe.grid.delSuccess'),
|
|
@@ -29080,10 +29094,8 @@ Object.keys(table.methods).forEach(name => {
|
|
|
29080
29094
|
this.tableLoading = false;
|
|
29081
29095
|
if (isRespMsg) {
|
|
29082
29096
|
// 检测弹窗模块
|
|
29083
|
-
if (
|
|
29084
|
-
|
|
29085
|
-
errLog('vxe.error.reqModule', ['Modal']);
|
|
29086
|
-
}
|
|
29097
|
+
if (!core_.VxeUI.modal) {
|
|
29098
|
+
errLog('vxe.error.reqModule', ['Modal']);
|
|
29087
29099
|
}
|
|
29088
29100
|
core_.VxeUI.modal.message({
|
|
29089
29101
|
id: code,
|
|
@@ -29105,10 +29117,8 @@ Object.keys(table.methods).forEach(name => {
|
|
|
29105
29117
|
} else {
|
|
29106
29118
|
if (isActiveMsg) {
|
|
29107
29119
|
// 检测弹窗模块
|
|
29108
|
-
if (
|
|
29109
|
-
|
|
29110
|
-
errLog('vxe.error.reqModule', ['Modal']);
|
|
29111
|
-
}
|
|
29120
|
+
if (!core_.VxeUI.modal) {
|
|
29121
|
+
errLog('vxe.error.reqModule', ['Modal']);
|
|
29112
29122
|
}
|
|
29113
29123
|
core_.VxeUI.modal.message({
|
|
29114
29124
|
id: code,
|
|
@@ -29118,9 +29128,7 @@ Object.keys(table.methods).forEach(name => {
|
|
|
29118
29128
|
}
|
|
29119
29129
|
}
|
|
29120
29130
|
} else {
|
|
29121
|
-
|
|
29122
|
-
errLog('vxe.error.notFunc', ['proxy-config.ajax.delete']);
|
|
29123
|
-
}
|
|
29131
|
+
errLog('vxe.error.notFunc', ['proxy-config.ajax.delete']);
|
|
29124
29132
|
}
|
|
29125
29133
|
break;
|
|
29126
29134
|
}
|
|
@@ -29171,10 +29179,8 @@ Object.keys(table.methods).forEach(name => {
|
|
|
29171
29179
|
$xeTable.clearPendingRow();
|
|
29172
29180
|
if (isRespMsg) {
|
|
29173
29181
|
// 检测弹窗模块
|
|
29174
|
-
if (
|
|
29175
|
-
|
|
29176
|
-
errLog('vxe.error.reqModule', ['Modal']);
|
|
29177
|
-
}
|
|
29182
|
+
if (!core_.VxeUI.modal) {
|
|
29183
|
+
errLog('vxe.error.reqModule', ['Modal']);
|
|
29178
29184
|
}
|
|
29179
29185
|
core_.VxeUI.modal.message({
|
|
29180
29186
|
content: this.getRespMsg(rest, 'vxe.grid.saveSuccess'),
|
|
@@ -29199,10 +29205,8 @@ Object.keys(table.methods).forEach(name => {
|
|
|
29199
29205
|
this.tableLoading = false;
|
|
29200
29206
|
if (isRespMsg) {
|
|
29201
29207
|
// 检测弹窗模块
|
|
29202
|
-
if (
|
|
29203
|
-
|
|
29204
|
-
errLog('vxe.error.reqModule', ['Modal']);
|
|
29205
|
-
}
|
|
29208
|
+
if (!core_.VxeUI.modal) {
|
|
29209
|
+
errLog('vxe.error.reqModule', ['Modal']);
|
|
29206
29210
|
}
|
|
29207
29211
|
core_.VxeUI.modal.message({
|
|
29208
29212
|
id: code,
|
|
@@ -29223,10 +29227,8 @@ Object.keys(table.methods).forEach(name => {
|
|
|
29223
29227
|
} else {
|
|
29224
29228
|
if (isActiveMsg) {
|
|
29225
29229
|
// 检测弹窗模块
|
|
29226
|
-
if (
|
|
29227
|
-
|
|
29228
|
-
errLog('vxe.error.reqModule', ['Modal']);
|
|
29229
|
-
}
|
|
29230
|
+
if (!core_.VxeUI.modal) {
|
|
29231
|
+
errLog('vxe.error.reqModule', ['Modal']);
|
|
29230
29232
|
}
|
|
29231
29233
|
core_.VxeUI.modal.message({
|
|
29232
29234
|
id: code,
|
|
@@ -29237,9 +29239,7 @@ Object.keys(table.methods).forEach(name => {
|
|
|
29237
29239
|
}
|
|
29238
29240
|
});
|
|
29239
29241
|
} else {
|
|
29240
|
-
|
|
29241
|
-
errLog('vxe.error.notFunc', ['proxy-config.ajax.save']);
|
|
29242
|
-
}
|
|
29242
|
+
errLog('vxe.error.notFunc', ['proxy-config.ajax.save']);
|
|
29243
29243
|
}
|
|
29244
29244
|
break;
|
|
29245
29245
|
}
|
|
@@ -29255,9 +29255,7 @@ Object.keys(table.methods).forEach(name => {
|
|
|
29255
29255
|
$table: $xeTable
|
|
29256
29256
|
}, ...args);
|
|
29257
29257
|
} else {
|
|
29258
|
-
|
|
29259
|
-
errLog('vxe.error.notCommands', [code]);
|
|
29260
|
-
}
|
|
29258
|
+
errLog('vxe.error.notCommands', [code]);
|
|
29261
29259
|
}
|
|
29262
29260
|
}
|
|
29263
29261
|
}
|
|
@@ -29290,10 +29288,8 @@ Object.keys(table.methods).forEach(name => {
|
|
|
29290
29288
|
});
|
|
29291
29289
|
} else {
|
|
29292
29290
|
// 检测弹窗模块
|
|
29293
|
-
if (
|
|
29294
|
-
|
|
29295
|
-
errLog('vxe.error.reqModule', ['Modal']);
|
|
29296
|
-
}
|
|
29291
|
+
if (!core_.VxeUI.modal) {
|
|
29292
|
+
errLog('vxe.error.reqModule', ['Modal']);
|
|
29297
29293
|
}
|
|
29298
29294
|
core_.VxeUI.modal.message({
|
|
29299
29295
|
id: `msg_${code}`,
|
|
@@ -29374,10 +29370,8 @@ Object.keys(table.methods).forEach(name => {
|
|
|
29374
29370
|
} else {
|
|
29375
29371
|
if (isActiveMsg) {
|
|
29376
29372
|
// 检测弹窗模块
|
|
29377
|
-
if (
|
|
29378
|
-
|
|
29379
|
-
errLog('vxe.error.reqModule', ['Modal']);
|
|
29380
|
-
}
|
|
29373
|
+
if (!core_.VxeUI.modal) {
|
|
29374
|
+
errLog('vxe.error.reqModule', ['Modal']);
|
|
29381
29375
|
}
|
|
29382
29376
|
core_.VxeUI.modal.message({
|
|
29383
29377
|
id: code,
|
|
@@ -29800,10 +29794,8 @@ function getComponentOns(renderOpts, params, eFns) {
|
|
|
29800
29794
|
const ons = {};
|
|
29801
29795
|
external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().objectEach(events, (func, key) => {
|
|
29802
29796
|
ons[getOnName(key)] = function (...args) {
|
|
29803
|
-
if (
|
|
29804
|
-
|
|
29805
|
-
errLog('vxe.error.errFunc', [func]);
|
|
29806
|
-
}
|
|
29797
|
+
if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(func)) {
|
|
29798
|
+
errLog('vxe.error.errFunc', [func]);
|
|
29807
29799
|
}
|
|
29808
29800
|
func(params, ...args);
|
|
29809
29801
|
};
|