vxe-table 3.13.17 → 3.13.19
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 +42 -72
- package/es/style.css +1 -1
- package/es/table/module/custom/panel.js +25 -27
- package/es/table/module/edit/mixin.js +3 -5
- 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/validator/mixin.js +1 -3
- package/es/table/render/index.js +90 -61
- package/es/table/src/columnInfo.js +30 -32
- package/es/table/src/methods.js +141 -80
- package/es/table/src/table.js +16 -18
- package/es/table/src/util.js +5 -7
- package/es/toolbar/src/toolbar.js +18 -26
- package/es/ui/index.js +1 -1
- package/es/ui/src/log.js +1 -1
- package/lib/grid/src/grid.js +42 -72
- package/lib/grid/src/grid.min.js +1 -1
- package/lib/index.umd.js +447 -411
- 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 +3 -5
- 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/validator/mixin.js +1 -3
- package/lib/table/module/validator/mixin.min.js +1 -1
- package/lib/table/render/index.js +98 -66
- package/lib/table/render/index.min.js +1 -1
- package/lib/table/src/columnInfo.js +32 -34
- package/lib/table/src/columnInfo.min.js +1 -1
- package/lib/table/src/methods.js +148 -78
- package/lib/table/src/methods.min.js +1 -1
- package/lib/table/src/table.js +13 -15
- 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 +18 -26
- 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 +42 -72
- package/packages/table/module/custom/panel.ts +25 -27
- package/packages/table/module/edit/mixin.ts +3 -5
- 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/validator/mixin.ts +1 -3
- package/packages/table/render/index.ts +89 -59
- package/packages/table/src/columnInfo.ts +30 -32
- package/packages/table/src/methods.ts +143 -78
- package/packages/table/src/table.ts +13 -15
- package/packages/table/src/util.ts +4 -6
- package/packages/toolbar/src/toolbar.ts +18 -26
- /package/es/{iconfont.1741051533862.ttf → iconfont.1741224103306.ttf} +0 -0
- /package/es/{iconfont.1741051533862.woff → iconfont.1741224103306.woff} +0 -0
- /package/es/{iconfont.1741051533862.woff2 → iconfont.1741224103306.woff2} +0 -0
- /package/lib/{iconfont.1741051533862.ttf → iconfont.1741224103306.ttf} +0 -0
- /package/lib/{iconfont.1741051533862.woff → iconfont.1741224103306.woff} +0 -0
- /package/lib/{iconfont.1741051533862.woff2 → iconfont.1741224103306.woff2} +0 -0
package/lib/index.umd.js
CHANGED
|
@@ -3201,7 +3201,7 @@ function getClass(property, params) {
|
|
|
3201
3201
|
;// ./packages/ui/index.ts
|
|
3202
3202
|
|
|
3203
3203
|
|
|
3204
|
-
const version = "3.13.
|
|
3204
|
+
const version = "3.13.19";
|
|
3205
3205
|
core_.VxeUI.version = version;
|
|
3206
3206
|
core_.VxeUI.tableVersion = version;
|
|
3207
3207
|
core_.VxeUI.setConfig({
|
|
@@ -3828,7 +3828,7 @@ var es_iterator_map = __webpack_require__(1701);
|
|
|
3828
3828
|
const {
|
|
3829
3829
|
log: log_log
|
|
3830
3830
|
} = core_.VxeUI;
|
|
3831
|
-
const log_version = `table v${"3.13.
|
|
3831
|
+
const log_version = `table v${"3.13.19"}`;
|
|
3832
3832
|
const warnLog = log_log.create('warn', log_version);
|
|
3833
3833
|
const errLog = log_log.create('error', log_version);
|
|
3834
3834
|
;// ./packages/table/src/columnInfo.ts
|
|
@@ -3854,42 +3854,40 @@ class ColumnInfo {
|
|
|
3854
3854
|
const formatter = _vm.formatter;
|
|
3855
3855
|
const visible = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(_vm.visible) ? _vm.visible : true;
|
|
3856
3856
|
const tableProps = $xetable;
|
|
3857
|
-
|
|
3858
|
-
|
|
3859
|
-
|
|
3860
|
-
|
|
3861
|
-
|
|
3862
|
-
|
|
3863
|
-
|
|
3864
|
-
|
|
3865
|
-
|
|
3866
|
-
|
|
3857
|
+
const types = ['seq', 'checkbox', 'radio', 'expand', 'html'];
|
|
3858
|
+
if (_vm.type && types.indexOf(_vm.type) === -1) {
|
|
3859
|
+
warnLog('vxe.error.errProp', [`type=${_vm.type}`, types.join(', ')]);
|
|
3860
|
+
}
|
|
3861
|
+
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)) {
|
|
3862
|
+
warnLog('vxe.error.errProp', [`column.cell-render=${_vm.cellRender}`, 'column.cell-render={}']);
|
|
3863
|
+
}
|
|
3864
|
+
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)) {
|
|
3865
|
+
warnLog('vxe.error.errProp', [`column.edit-render=${_vm.editRender}`, 'column.edit-render={}']);
|
|
3866
|
+
}
|
|
3867
|
+
if (_vm.type === 'expand') {
|
|
3868
|
+
const {
|
|
3869
|
+
treeConfig
|
|
3870
|
+
} = tableProps;
|
|
3871
|
+
if (treeConfig && ($xetable.treeOpts.showLine || $xetable.treeOpts.line)) {
|
|
3872
|
+
errLog('vxe.error.errConflicts', ['tree-config.line', 'column.type=expand']);
|
|
3867
3873
|
}
|
|
3868
|
-
|
|
3869
|
-
|
|
3870
|
-
|
|
3871
|
-
|
|
3872
|
-
|
|
3873
|
-
|
|
3874
|
+
}
|
|
3875
|
+
if (_vm.remoteSort) {
|
|
3876
|
+
warnLog('vxe.error.delProp', ['column.remote-sort', 'sort-config.remote']);
|
|
3877
|
+
}
|
|
3878
|
+
if (_vm.sortMethod) {
|
|
3879
|
+
warnLog('vxe.error.delProp', ['column.sort-method', 'sort-config.sortMethod']);
|
|
3880
|
+
}
|
|
3881
|
+
if (formatter) {
|
|
3882
|
+
if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(formatter)) {
|
|
3883
|
+
const gFormatOpts = columnInfo_formats.get(formatter) || (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default())[formatter];
|
|
3884
|
+
if (!gFormatOpts || !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod)) {
|
|
3885
|
+
errLog('vxe.error.notFormats', [formatter]);
|
|
3874
3886
|
}
|
|
3875
|
-
}
|
|
3876
|
-
|
|
3877
|
-
|
|
3878
|
-
|
|
3879
|
-
if (_vm.sortMethod) {
|
|
3880
|
-
warnLog('vxe.error.delProp', ['column.sort-method', 'sort-config.sortMethod']);
|
|
3881
|
-
}
|
|
3882
|
-
if (formatter) {
|
|
3883
|
-
if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(formatter)) {
|
|
3884
|
-
const gFormatOpts = columnInfo_formats.get(formatter) || (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default())[formatter];
|
|
3885
|
-
if (!gFormatOpts || !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod)) {
|
|
3886
|
-
errLog('vxe.error.notFormats', [formatter]);
|
|
3887
|
-
}
|
|
3888
|
-
} else if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(formatter)) {
|
|
3889
|
-
const gFormatOpts = columnInfo_formats.get(formatter[0]) || (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default())[formatter[0]];
|
|
3890
|
-
if (!gFormatOpts || !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod)) {
|
|
3891
|
-
errLog('vxe.error.notFormats', [formatter[0]]);
|
|
3892
|
-
}
|
|
3887
|
+
} else if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(formatter)) {
|
|
3888
|
+
const gFormatOpts = columnInfo_formats.get(formatter[0]) || (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default())[formatter[0]];
|
|
3889
|
+
if (!gFormatOpts || !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod)) {
|
|
3890
|
+
errLog('vxe.error.notFormats', [formatter[0]]);
|
|
3893
3891
|
}
|
|
3894
3892
|
}
|
|
3895
3893
|
}
|
|
@@ -4150,12 +4148,10 @@ function assembleColumn(_vm) {
|
|
|
4150
4148
|
} = _vm;
|
|
4151
4149
|
const groupConfig = $xecolumn ? $xecolumn.columnConfig : null;
|
|
4152
4150
|
if (groupConfig) {
|
|
4153
|
-
if (
|
|
4154
|
-
|
|
4155
|
-
|
|
4156
|
-
|
|
4157
|
-
warnLog('vxe.error.groupTag', [`<vxe-colgroup title=${$xecolumn.title} ...>`, `<vxe-column title=${$xecolumn.title} ...>`]);
|
|
4158
|
-
}
|
|
4151
|
+
if ($xecolumn.$options._componentTag === 'vxe-table-column') {
|
|
4152
|
+
errLog('vxe.error.groupTag', [`<vxe-table-colgroup title=${$xecolumn.title} ...>`, `<vxe-table-column title=${$xecolumn.title} ...>`]);
|
|
4153
|
+
} else if ($xecolumn.$options._componentTag === 'vxe-column') {
|
|
4154
|
+
warnLog('vxe.error.groupTag', [`<vxe-colgroup title=${$xecolumn.title} ...>`, `<vxe-column title=${$xecolumn.title} ...>`]);
|
|
4159
4155
|
}
|
|
4160
4156
|
if (!groupConfig.children) {
|
|
4161
4157
|
groupConfig.children = [];
|
|
@@ -8631,14 +8627,27 @@ const Methods = {
|
|
|
8631
8627
|
* 获取父容器的高度
|
|
8632
8628
|
*/
|
|
8633
8629
|
getParentHeight() {
|
|
8630
|
+
const $xeTable = this;
|
|
8631
|
+
const $xeGrid = $xeTable.$xeGrid;
|
|
8632
|
+
const props = $xeTable;
|
|
8634
8633
|
const {
|
|
8635
|
-
$el,
|
|
8636
|
-
$xegrid,
|
|
8637
8634
|
height
|
|
8638
|
-
} =
|
|
8639
|
-
const
|
|
8640
|
-
|
|
8641
|
-
|
|
8635
|
+
} = props;
|
|
8636
|
+
const el = $xeTable.$refs.refElem;
|
|
8637
|
+
if (el) {
|
|
8638
|
+
const parentElem = el.parentNode;
|
|
8639
|
+
const parentPaddingSize = height === '100%' || height === 'auto' ? getPaddingTopBottomSize(parentElem) : 0;
|
|
8640
|
+
let parentWrapperHeight = 0;
|
|
8641
|
+
if (parentElem) {
|
|
8642
|
+
if ($xeGrid && hasClass(parentElem, 'vxe-grid--table-wrapper')) {
|
|
8643
|
+
parentWrapperHeight = $xeGrid.getParentHeight();
|
|
8644
|
+
} else {
|
|
8645
|
+
parentWrapperHeight = parentElem.clientHeight;
|
|
8646
|
+
}
|
|
8647
|
+
}
|
|
8648
|
+
return Math.floor(parentWrapperHeight - parentPaddingSize);
|
|
8649
|
+
}
|
|
8650
|
+
return 0;
|
|
8642
8651
|
},
|
|
8643
8652
|
/**
|
|
8644
8653
|
* 获取需要排除的高度
|
|
@@ -8751,28 +8760,26 @@ const Methods = {
|
|
|
8751
8760
|
if (treeConfig) {
|
|
8752
8761
|
// 树结构自动转换
|
|
8753
8762
|
if (treeOpts.transform) {
|
|
8754
|
-
if (
|
|
8755
|
-
|
|
8756
|
-
|
|
8757
|
-
|
|
8758
|
-
|
|
8759
|
-
errLog('vxe.error.reqProp', ['table.tree-config.parentField']);
|
|
8760
|
-
}
|
|
8761
|
-
if (!childrenField) {
|
|
8762
|
-
errLog('vxe.error.reqProp', ['tree-config.childrenField']);
|
|
8763
|
-
}
|
|
8764
|
-
if (!treeOpts.mapChildrenField) {
|
|
8765
|
-
errLog('vxe.error.reqProp', ['tree-config.mapChildrenField']);
|
|
8766
|
-
}
|
|
8767
|
-
if (childrenField === treeOpts.mapChildrenField) {
|
|
8768
|
-
errLog('vxe.error.errConflicts', ['tree-config.childrenField', 'tree-config.mapChildrenField']);
|
|
8769
|
-
}
|
|
8770
|
-
// fullData.forEach(row => {
|
|
8771
|
-
// if (row[childrenField] && row[childrenField].length) {
|
|
8772
|
-
// warnLog('vxe.error.errConflicts', ['tree-config.transform', `row.${childrenField}`])
|
|
8773
|
-
// }
|
|
8774
|
-
// })
|
|
8763
|
+
if (!treeOpts.rowField) {
|
|
8764
|
+
errLog('vxe.error.reqProp', ['table.tree-config.rowField']);
|
|
8765
|
+
}
|
|
8766
|
+
if (!treeOpts.parentField) {
|
|
8767
|
+
errLog('vxe.error.reqProp', ['table.tree-config.parentField']);
|
|
8775
8768
|
}
|
|
8769
|
+
if (!childrenField) {
|
|
8770
|
+
errLog('vxe.error.reqProp', ['tree-config.childrenField']);
|
|
8771
|
+
}
|
|
8772
|
+
if (!treeOpts.mapChildrenField) {
|
|
8773
|
+
errLog('vxe.error.reqProp', ['tree-config.mapChildrenField']);
|
|
8774
|
+
}
|
|
8775
|
+
if (childrenField === treeOpts.mapChildrenField) {
|
|
8776
|
+
errLog('vxe.error.errConflicts', ['tree-config.childrenField', 'tree-config.mapChildrenField']);
|
|
8777
|
+
}
|
|
8778
|
+
// fullData.forEach(row => {
|
|
8779
|
+
// if (row[childrenField] && row[childrenField].length) {
|
|
8780
|
+
// warnLog('vxe.error.errConflicts', ['tree-config.transform', `row.${childrenField}`])
|
|
8781
|
+
// }
|
|
8782
|
+
// })
|
|
8776
8783
|
treeData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toArrayTree(fullData, {
|
|
8777
8784
|
key: treeOpts.rowField,
|
|
8778
8785
|
parentKey: treeOpts.parentField,
|
|
@@ -8836,16 +8843,14 @@ const Methods = {
|
|
|
8836
8843
|
// }
|
|
8837
8844
|
// }
|
|
8838
8845
|
// }
|
|
8839
|
-
if (
|
|
8840
|
-
|
|
8841
|
-
|
|
8842
|
-
|
|
8843
|
-
|
|
8844
|
-
|
|
8845
|
-
|
|
8846
|
-
|
|
8847
|
-
warnLog('vxe.error.scrollErrProp', ['table.span-method']);
|
|
8848
|
-
}
|
|
8846
|
+
if (!(this.height || this.maxHeight)) {
|
|
8847
|
+
errLog('vxe.error.reqProp', ['table.height | table.max-height | table.scroll-y={enabled: false}']);
|
|
8848
|
+
}
|
|
8849
|
+
// if (!this.showOverflow) {
|
|
8850
|
+
// warnLog('vxe.error.reqProp', ['table.show-overflow'])
|
|
8851
|
+
// }
|
|
8852
|
+
if (this.spanMethod) {
|
|
8853
|
+
errLog('vxe.error.scrollErrProp', ['table.span-method']);
|
|
8849
8854
|
}
|
|
8850
8855
|
}
|
|
8851
8856
|
handleReserveStatus($xeTable);
|
|
@@ -8991,22 +8996,30 @@ const Methods = {
|
|
|
8991
8996
|
cacheRowMap() {
|
|
8992
8997
|
const $xeTable = this;
|
|
8993
8998
|
const props = $xeTable;
|
|
8999
|
+
const reactData = $xeTable;
|
|
8994
9000
|
const internalData = $xeTable;
|
|
8995
9001
|
const {
|
|
8996
9002
|
treeConfig
|
|
8997
9003
|
} = props;
|
|
8998
|
-
const
|
|
9004
|
+
const {
|
|
9005
|
+
treeExpandedMaps
|
|
9006
|
+
} = reactData;
|
|
8999
9007
|
const {
|
|
9000
9008
|
fullAllDataRowIdData,
|
|
9001
9009
|
tableFullData,
|
|
9002
9010
|
tableFullTreeData
|
|
9003
9011
|
} = internalData;
|
|
9012
|
+
const treeOpts = $xeTable.computeTreeOpts;
|
|
9004
9013
|
const childrenField = treeOpts.children || treeOpts.childrenField;
|
|
9005
9014
|
const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
|
|
9006
9015
|
const rowkey = getRowkey($xeTable);
|
|
9007
|
-
const
|
|
9008
|
-
|
|
9016
|
+
const fullAllDataRowIdMaps = {
|
|
9017
|
+
...fullAllDataRowIdData
|
|
9018
|
+
}; // 存在已删除数据
|
|
9009
9019
|
const fullDataRowIdMaps = {};
|
|
9020
|
+
const treeTempExpandedMaps = {
|
|
9021
|
+
...treeExpandedMaps
|
|
9022
|
+
};
|
|
9010
9023
|
const handleRow = (row, index, items, path, parentRow, nodes) => {
|
|
9011
9024
|
let rowid = getRowid($xeTable, row);
|
|
9012
9025
|
const seq = treeConfig && path ? toTreePathSeq(path) : index + 1;
|
|
@@ -9015,8 +9028,16 @@ const Methods = {
|
|
|
9015
9028
|
rowid = getRowUniqueId();
|
|
9016
9029
|
external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, rowkey, rowid);
|
|
9017
9030
|
}
|
|
9018
|
-
if (
|
|
9019
|
-
|
|
9031
|
+
if (treeConfig && treeOpts.lazy) {
|
|
9032
|
+
const treeExpRest = treeExpandedMaps[rowid];
|
|
9033
|
+
if (row[hasChildField] && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(row[childrenField])) {
|
|
9034
|
+
row[childrenField] = null;
|
|
9035
|
+
}
|
|
9036
|
+
if (treeExpRest) {
|
|
9037
|
+
if (!row[childrenField] || !row[childrenField].length) {
|
|
9038
|
+
delete treeTempExpandedMaps[rowid];
|
|
9039
|
+
}
|
|
9040
|
+
}
|
|
9020
9041
|
}
|
|
9021
9042
|
let rowRest = fullAllDataRowIdData[rowid];
|
|
9022
9043
|
if (!rowRest) {
|
|
@@ -9037,6 +9058,8 @@ const Methods = {
|
|
|
9037
9058
|
expandHeight: 0
|
|
9038
9059
|
};
|
|
9039
9060
|
}
|
|
9061
|
+
rowRest.treeLoaded = false;
|
|
9062
|
+
rowRest.expandLoaded = false;
|
|
9040
9063
|
rowRest.row = row;
|
|
9041
9064
|
rowRest.items = items;
|
|
9042
9065
|
rowRest.parent = parentRow;
|
|
@@ -9045,8 +9068,6 @@ const Methods = {
|
|
|
9045
9068
|
fullDataRowIdMaps[rowid] = rowRest;
|
|
9046
9069
|
fullAllDataRowIdMaps[rowid] = rowRest;
|
|
9047
9070
|
};
|
|
9048
|
-
internalData.fullDataRowIdData = fullDataRowIdMaps;
|
|
9049
|
-
internalData.fullAllDataRowIdData = fullAllDataRowIdMaps;
|
|
9050
9071
|
if (treeConfig) {
|
|
9051
9072
|
external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(tableFullTreeData, handleRow, {
|
|
9052
9073
|
children: childrenField
|
|
@@ -9054,6 +9075,9 @@ const Methods = {
|
|
|
9054
9075
|
} else {
|
|
9055
9076
|
tableFullData.forEach(handleRow);
|
|
9056
9077
|
}
|
|
9078
|
+
internalData.fullDataRowIdData = fullDataRowIdMaps;
|
|
9079
|
+
internalData.fullAllDataRowIdData = fullAllDataRowIdMaps;
|
|
9080
|
+
reactData.treeExpandedMaps = treeTempExpandedMaps;
|
|
9057
9081
|
},
|
|
9058
9082
|
cacheSourceMap(fullData) {
|
|
9059
9083
|
let {
|
|
@@ -9454,16 +9478,31 @@ const Methods = {
|
|
|
9454
9478
|
* 如果还额外传了 field 则还原指定的单元格数据
|
|
9455
9479
|
*/
|
|
9456
9480
|
revertData(rows, field) {
|
|
9481
|
+
const $xeTable = this;
|
|
9482
|
+
const props = $xeTable;
|
|
9483
|
+
const reactData = $xeTable;
|
|
9484
|
+
const internalData = $xeTable;
|
|
9457
9485
|
const {
|
|
9458
9486
|
keepSource,
|
|
9459
|
-
tableSourceData,
|
|
9460
9487
|
treeConfig
|
|
9461
|
-
} =
|
|
9488
|
+
} = props;
|
|
9489
|
+
const {
|
|
9490
|
+
fullAllDataRowIdData,
|
|
9491
|
+
fullDataRowIdData,
|
|
9492
|
+
tableSourceData,
|
|
9493
|
+
sourceDataRowIdData,
|
|
9494
|
+
tableFullData,
|
|
9495
|
+
afterFullData
|
|
9496
|
+
} = internalData;
|
|
9497
|
+
const treeOpts = $xeTable.computeTreeOpts;
|
|
9498
|
+
const {
|
|
9499
|
+
transform
|
|
9500
|
+
} = treeOpts;
|
|
9462
9501
|
if (!keepSource) {
|
|
9463
9502
|
if (true) {
|
|
9464
|
-
|
|
9503
|
+
errLog('vxe.error.reqProp', ['keep-source']);
|
|
9465
9504
|
}
|
|
9466
|
-
return
|
|
9505
|
+
return $xeTable.$nextTick();
|
|
9467
9506
|
}
|
|
9468
9507
|
let targetRows = rows;
|
|
9469
9508
|
if (rows) {
|
|
@@ -9471,30 +9510,52 @@ const Methods = {
|
|
|
9471
9510
|
targetRows = [rows];
|
|
9472
9511
|
}
|
|
9473
9512
|
} else {
|
|
9474
|
-
targetRows = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toArray(
|
|
9513
|
+
targetRows = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toArray($xeTable.getUpdateRecords());
|
|
9475
9514
|
}
|
|
9515
|
+
let reDelFlag = false;
|
|
9476
9516
|
if (targetRows.length) {
|
|
9477
|
-
targetRows.forEach(
|
|
9478
|
-
|
|
9479
|
-
|
|
9480
|
-
|
|
9481
|
-
|
|
9482
|
-
|
|
9483
|
-
|
|
9484
|
-
|
|
9485
|
-
|
|
9486
|
-
|
|
9487
|
-
|
|
9488
|
-
|
|
9517
|
+
targetRows.forEach(item => {
|
|
9518
|
+
const rowid = getRowid($xeTable, item);
|
|
9519
|
+
const rowRest = fullAllDataRowIdData[rowid];
|
|
9520
|
+
if (rowRest) {
|
|
9521
|
+
const row = rowRest.row;
|
|
9522
|
+
if (!$xeTable.isInsertByRow(row)) {
|
|
9523
|
+
const oRow = sourceDataRowIdData[rowid];
|
|
9524
|
+
if (oRow && row) {
|
|
9525
|
+
if (field) {
|
|
9526
|
+
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));
|
|
9527
|
+
} else {
|
|
9528
|
+
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));
|
|
9529
|
+
}
|
|
9530
|
+
if (!fullDataRowIdData[rowid] && $xeTable.isRemoveByRow(row)) {
|
|
9531
|
+
tableFullData.unshift(row);
|
|
9532
|
+
afterFullData.unshift(row);
|
|
9533
|
+
reDelFlag = true;
|
|
9534
|
+
}
|
|
9489
9535
|
}
|
|
9490
9536
|
}
|
|
9491
9537
|
}
|
|
9492
9538
|
});
|
|
9493
9539
|
}
|
|
9494
9540
|
if (rows) {
|
|
9495
|
-
|
|
9541
|
+
if (reDelFlag) {
|
|
9542
|
+
$xeTable.updateFooter();
|
|
9543
|
+
$xeTable.cacheRowMap(false);
|
|
9544
|
+
$xeTable.handleTableData(treeConfig && transform);
|
|
9545
|
+
if (!(treeConfig && transform)) {
|
|
9546
|
+
$xeTable.updateAfterDataIndex();
|
|
9547
|
+
}
|
|
9548
|
+
$xeTable.checkSelectionStatus();
|
|
9549
|
+
if (reactData.scrollYLoad) {
|
|
9550
|
+
$xeTable.updateScrollYSpace();
|
|
9551
|
+
}
|
|
9552
|
+
}
|
|
9553
|
+
return $xeTable.$nextTick().then(() => {
|
|
9554
|
+
$xeTable.updateCellAreas();
|
|
9555
|
+
return $xeTable.recalculate();
|
|
9556
|
+
});
|
|
9496
9557
|
}
|
|
9497
|
-
return
|
|
9558
|
+
return $xeTable.reloadData(tableSourceData);
|
|
9498
9559
|
},
|
|
9499
9560
|
/**
|
|
9500
9561
|
* 清空单元格内容
|
|
@@ -9624,12 +9685,23 @@ const Methods = {
|
|
|
9624
9685
|
* @param {Row} row 行对象
|
|
9625
9686
|
*/
|
|
9626
9687
|
isInsertByRow(row) {
|
|
9688
|
+
const $xeTable = this;
|
|
9689
|
+
const reactData = $xeTable;
|
|
9627
9690
|
const {
|
|
9628
9691
|
editStore
|
|
9629
|
-
} =
|
|
9630
|
-
const rowid = getRowid(
|
|
9692
|
+
} = reactData;
|
|
9693
|
+
const rowid = getRowid($xeTable, row);
|
|
9631
9694
|
return !!editStore.insertMaps[rowid];
|
|
9632
9695
|
},
|
|
9696
|
+
isRemoveByRow(row) {
|
|
9697
|
+
const $xeTable = this;
|
|
9698
|
+
const reactData = $xeTable;
|
|
9699
|
+
const {
|
|
9700
|
+
editStore
|
|
9701
|
+
} = reactData;
|
|
9702
|
+
const rowid = getRowid($xeTable, row);
|
|
9703
|
+
return !!editStore.removeMaps[rowid];
|
|
9704
|
+
},
|
|
9633
9705
|
/**
|
|
9634
9706
|
* 删除所有新增的临时数据
|
|
9635
9707
|
* @returns
|
|
@@ -16424,19 +16496,17 @@ const Methods = {
|
|
|
16424
16496
|
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(',');
|
|
16425
16497
|
funcs.forEach(name => {
|
|
16426
16498
|
Methods[name] = function (...args) {
|
|
16427
|
-
if (
|
|
16428
|
-
if (
|
|
16429
|
-
|
|
16430
|
-
|
|
16431
|
-
|
|
16432
|
-
|
|
16433
|
-
|
|
16434
|
-
|
|
16435
|
-
|
|
16436
|
-
|
|
16437
|
-
|
|
16438
|
-
errLog('vxe.error.reqModule', ['VxeTableCustomModule']);
|
|
16439
|
-
}
|
|
16499
|
+
if (!this[`_${name}`]) {
|
|
16500
|
+
if ('openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',').includes(name)) {
|
|
16501
|
+
errLog('vxe.error.reqModule', ['VxeTableExportModule']);
|
|
16502
|
+
} else if ('fullValidate,validate'.split(',').includes(name)) {
|
|
16503
|
+
errLog('vxe.error.reqModule', ['VxeTableValidatorModule']);
|
|
16504
|
+
} else if ('setFilter,openFilter,clearFilter,getCheckedFilters'.split(',').includes(name)) {
|
|
16505
|
+
errLog('vxe.error.reqModule', ['VxeTableFilterModule']);
|
|
16506
|
+
} else if ('insert,insertAt,insertNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,getEditRecord,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell'.split(',').includes(name)) {
|
|
16507
|
+
errLog('vxe.error.reqModule', ['VxeTableEditModule']);
|
|
16508
|
+
} else if ('openCustom'.split(',').includes(name)) {
|
|
16509
|
+
errLog('vxe.error.reqModule', ['VxeTableCustomModule']);
|
|
16440
16510
|
}
|
|
16441
16511
|
}
|
|
16442
16512
|
return this[`_${name}`] ? this[`_${name}`](...args) : null;
|
|
@@ -19289,39 +19359,37 @@ const renderPopupPanel = (h, _vm) => {
|
|
|
19289
19359
|
},
|
|
19290
19360
|
computed: {},
|
|
19291
19361
|
created() {
|
|
19292
|
-
|
|
19293
|
-
|
|
19294
|
-
|
|
19295
|
-
|
|
19296
|
-
|
|
19297
|
-
|
|
19298
|
-
|
|
19299
|
-
|
|
19300
|
-
|
|
19301
|
-
|
|
19302
|
-
|
|
19303
|
-
|
|
19304
|
-
|
|
19305
|
-
|
|
19306
|
-
|
|
19307
|
-
|
|
19308
|
-
|
|
19309
|
-
|
|
19310
|
-
|
|
19311
|
-
|
|
19312
|
-
|
|
19313
|
-
|
|
19314
|
-
|
|
19315
|
-
|
|
19316
|
-
|
|
19317
|
-
|
|
19318
|
-
|
|
19319
|
-
|
|
19320
|
-
|
|
19321
|
-
|
|
19322
|
-
|
|
19323
|
-
});
|
|
19324
|
-
}
|
|
19362
|
+
const VxeUIModalComponent = core_.VxeUI.getComponent('VxeModal');
|
|
19363
|
+
const VxeUIDrawerComponent = core_.VxeUI.getComponent('VxeDrawer');
|
|
19364
|
+
const VxeUIButtonComponent = core_.VxeUI.getComponent('VxeButton');
|
|
19365
|
+
const VxeUINumberInputComponent = core_.VxeUI.getComponent('VxeNumberInput');
|
|
19366
|
+
const VxeUIRadioGroupComponent = core_.VxeUI.getComponent('VxeRadioGroup');
|
|
19367
|
+
this.$nextTick(() => {
|
|
19368
|
+
const {
|
|
19369
|
+
$xetable
|
|
19370
|
+
} = this;
|
|
19371
|
+
const {
|
|
19372
|
+
customOpts
|
|
19373
|
+
} = $xetable;
|
|
19374
|
+
const {
|
|
19375
|
+
mode
|
|
19376
|
+
} = customOpts;
|
|
19377
|
+
if (!VxeUIModalComponent) {
|
|
19378
|
+
errLog('vxe.error.reqComp', ['vxe-modal']);
|
|
19379
|
+
}
|
|
19380
|
+
if (!VxeUIDrawerComponent && mode === 'drawer') {
|
|
19381
|
+
errLog('vxe.error.reqComp', ['vxe-drawer']);
|
|
19382
|
+
}
|
|
19383
|
+
if (!VxeUIButtonComponent) {
|
|
19384
|
+
errLog('vxe.error.reqComp', ['vxe-button']);
|
|
19385
|
+
}
|
|
19386
|
+
if (!VxeUINumberInputComponent) {
|
|
19387
|
+
errLog('vxe.error.reqComp', ['vxe-input']);
|
|
19388
|
+
}
|
|
19389
|
+
if (!VxeUIRadioGroupComponent) {
|
|
19390
|
+
errLog('vxe.error.reqComp', ['vxe-radio-group']);
|
|
19391
|
+
}
|
|
19392
|
+
});
|
|
19325
19393
|
},
|
|
19326
19394
|
render(h) {
|
|
19327
19395
|
const $xeTable = this.$xeTable;
|
|
@@ -20066,22 +20134,20 @@ const {
|
|
|
20066
20134
|
},
|
|
20067
20135
|
created() {
|
|
20068
20136
|
const $xeTableImportPanel = this;
|
|
20069
|
-
|
|
20070
|
-
|
|
20071
|
-
|
|
20072
|
-
|
|
20073
|
-
|
|
20074
|
-
|
|
20075
|
-
|
|
20076
|
-
|
|
20077
|
-
|
|
20078
|
-
|
|
20079
|
-
|
|
20080
|
-
|
|
20081
|
-
|
|
20082
|
-
|
|
20083
|
-
});
|
|
20084
|
-
}
|
|
20137
|
+
const VxeUIModalComponent = core_.VxeUI.getComponent('VxeModal');
|
|
20138
|
+
const VxeUIButtonComponent = core_.VxeUI.getComponent('VxeButton');
|
|
20139
|
+
const VxeUISelectComponent = core_.VxeUI.getComponent('VxeSelect');
|
|
20140
|
+
$xeTableImportPanel.$nextTick(() => {
|
|
20141
|
+
if (!VxeUIModalComponent) {
|
|
20142
|
+
errLog('vxe.error.reqComp', ['vxe-modal']);
|
|
20143
|
+
}
|
|
20144
|
+
if (!VxeUIButtonComponent) {
|
|
20145
|
+
errLog('vxe.error.reqComp', ['vxe-button']);
|
|
20146
|
+
}
|
|
20147
|
+
if (!VxeUISelectComponent) {
|
|
20148
|
+
errLog('vxe.error.reqComp', ['vxe-select']);
|
|
20149
|
+
}
|
|
20150
|
+
});
|
|
20085
20151
|
},
|
|
20086
20152
|
render(h) {
|
|
20087
20153
|
const $xeTable = this.$xeTable;
|
|
@@ -20317,30 +20383,28 @@ const {
|
|
|
20317
20383
|
},
|
|
20318
20384
|
created() {
|
|
20319
20385
|
const $xeTableExportPanel = this;
|
|
20320
|
-
|
|
20321
|
-
|
|
20322
|
-
|
|
20323
|
-
|
|
20324
|
-
|
|
20325
|
-
|
|
20326
|
-
|
|
20327
|
-
|
|
20328
|
-
|
|
20329
|
-
|
|
20330
|
-
|
|
20331
|
-
|
|
20332
|
-
|
|
20333
|
-
|
|
20334
|
-
|
|
20335
|
-
|
|
20336
|
-
|
|
20337
|
-
|
|
20338
|
-
|
|
20339
|
-
|
|
20340
|
-
|
|
20341
|
-
|
|
20342
|
-
});
|
|
20343
|
-
}
|
|
20386
|
+
const VxeUIModalComponent = core_.VxeUI.getComponent('VxeModal');
|
|
20387
|
+
const VxeUIButtonComponent = core_.VxeUI.getComponent('VxeButton');
|
|
20388
|
+
const VxeUISelectComponent = core_.VxeUI.getComponent('VxeSelect');
|
|
20389
|
+
const VxeUIInputComponent = core_.VxeUI.getComponent('VxeInput');
|
|
20390
|
+
const VxeUICheckboxComponent = core_.VxeUI.getComponent('VxeCheckbox');
|
|
20391
|
+
$xeTableExportPanel.$nextTick(() => {
|
|
20392
|
+
if (!VxeUIModalComponent) {
|
|
20393
|
+
errLog('vxe.error.reqComp', ['vxe-modal']);
|
|
20394
|
+
}
|
|
20395
|
+
if (!VxeUIButtonComponent) {
|
|
20396
|
+
errLog('vxe.error.reqComp', ['vxe-button']);
|
|
20397
|
+
}
|
|
20398
|
+
if (!VxeUISelectComponent) {
|
|
20399
|
+
errLog('vxe.error.reqComp', ['vxe-select']);
|
|
20400
|
+
}
|
|
20401
|
+
if (!VxeUIInputComponent) {
|
|
20402
|
+
errLog('vxe.error.reqComp', ['vxe-input']);
|
|
20403
|
+
}
|
|
20404
|
+
if (!VxeUICheckboxComponent) {
|
|
20405
|
+
errLog('vxe.error.reqComp', ['vxe-checkbox']);
|
|
20406
|
+
}
|
|
20407
|
+
});
|
|
20344
20408
|
},
|
|
20345
20409
|
render(h) {
|
|
20346
20410
|
const $xeTable = this.$xeTable;
|
|
@@ -21892,11 +21956,9 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
|
|
|
21892
21956
|
const parentLevel = parentRest ? parentRest.level : 0;
|
|
21893
21957
|
newRecords.forEach((item, i) => {
|
|
21894
21958
|
const rowid = getRowid($xeTable, item);
|
|
21895
|
-
if (
|
|
21896
|
-
if (item[treeOpts.parentField]) {
|
|
21897
|
-
|
|
21898
|
-
errLog('vxe.error.errProp', [`${treeOpts.parentField}=${item[treeOpts.parentField]}`, `${treeOpts.parentField}=${parentRow[rowField]}`]);
|
|
21899
|
-
}
|
|
21959
|
+
if (item[treeOpts.parentField]) {
|
|
21960
|
+
if (parentRow && item[treeOpts.parentField] !== parentRow[rowField]) {
|
|
21961
|
+
errLog('vxe.error.errProp', [`${treeOpts.parentField}=${item[treeOpts.parentField]}`, `${treeOpts.parentField}=${parentRow[rowField]}`]);
|
|
21900
21962
|
}
|
|
21901
21963
|
}
|
|
21902
21964
|
if (parentRow) {
|
|
@@ -23530,10 +23592,8 @@ function downloadFile($xetable, opts, content) {
|
|
|
23530
23592
|
}).then(() => {
|
|
23531
23593
|
if (opts.message !== false) {
|
|
23532
23594
|
// 检测弹窗模块
|
|
23533
|
-
if (
|
|
23534
|
-
|
|
23535
|
-
errLog('vxe.error.reqModule', ['Modal']);
|
|
23536
|
-
}
|
|
23595
|
+
if (!core_.VxeUI.modal) {
|
|
23596
|
+
errLog('vxe.error.reqModule', ['Modal']);
|
|
23537
23597
|
}
|
|
23538
23598
|
core_.VxeUI.modal.message({
|
|
23539
23599
|
content: export_mixin_getI18n('vxe.table.expSuccess'),
|
|
@@ -23814,10 +23874,8 @@ function handleImport($xeTable, content, opts) {
|
|
|
23814
23874
|
}
|
|
23815
23875
|
if (opts.message !== false) {
|
|
23816
23876
|
// 检测弹窗模块
|
|
23817
|
-
if (
|
|
23818
|
-
|
|
23819
|
-
errLog('vxe.error.reqModule', ['Modal']);
|
|
23820
|
-
}
|
|
23877
|
+
if (!core_.VxeUI.modal) {
|
|
23878
|
+
errLog('vxe.error.reqModule', ['Modal']);
|
|
23821
23879
|
}
|
|
23822
23880
|
core_.VxeUI.modal.message({
|
|
23823
23881
|
content: export_mixin_getI18n('vxe.table.impSuccess', [rows.length]),
|
|
@@ -23834,10 +23892,8 @@ function handleImport($xeTable, content, opts) {
|
|
|
23834
23892
|
});
|
|
23835
23893
|
} else if (opts.message !== false) {
|
|
23836
23894
|
// 检测弹窗模块
|
|
23837
|
-
if (
|
|
23838
|
-
|
|
23839
|
-
errLog('vxe.error.reqModule', ['Modal']);
|
|
23840
|
-
}
|
|
23895
|
+
if (!core_.VxeUI.modal) {
|
|
23896
|
+
errLog('vxe.error.reqModule', ['Modal']);
|
|
23841
23897
|
}
|
|
23842
23898
|
core_.VxeUI.modal.message({
|
|
23843
23899
|
content: export_mixin_getI18n('vxe.error.impFields'),
|
|
@@ -23866,10 +23922,8 @@ function handleFileImport($xetable, file, opts) {
|
|
|
23866
23922
|
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)) {
|
|
23867
23923
|
if (opts.message !== false) {
|
|
23868
23924
|
// 检测弹窗模块
|
|
23869
|
-
if (
|
|
23870
|
-
|
|
23871
|
-
errLog('vxe.error.reqModule', ['Modal']);
|
|
23872
|
-
}
|
|
23925
|
+
if (!core_.VxeUI.modal) {
|
|
23926
|
+
errLog('vxe.error.reqModule', ['Modal']);
|
|
23873
23927
|
}
|
|
23874
23928
|
core_.VxeUI.modal.message({
|
|
23875
23929
|
content: export_mixin_getI18n('vxe.error.notType', [type]),
|
|
@@ -23942,9 +23996,7 @@ function handleFileImport($xetable, file, opts) {
|
|
|
23942
23996
|
}
|
|
23943
23997
|
} else {
|
|
23944
23998
|
// 不支持的浏览器
|
|
23945
|
-
|
|
23946
|
-
errLog('vxe.error.notExp');
|
|
23947
|
-
}
|
|
23999
|
+
errLog('vxe.error.notExp');
|
|
23948
24000
|
_importResolve({
|
|
23949
24001
|
status: true
|
|
23950
24002
|
});
|
|
@@ -24021,10 +24073,8 @@ function readLocalFile(options = {}) {
|
|
|
24021
24073
|
} else {
|
|
24022
24074
|
if (options.message !== false) {
|
|
24023
24075
|
// 检测弹窗模块
|
|
24024
|
-
if (
|
|
24025
|
-
|
|
24026
|
-
errLog('vxe.error.reqModule', ['Modal']);
|
|
24027
|
-
}
|
|
24076
|
+
if (!core_.VxeUI.modal) {
|
|
24077
|
+
errLog('vxe.error.reqModule', ['Modal']);
|
|
24028
24078
|
}
|
|
24029
24079
|
core_.VxeUI.modal.message({
|
|
24030
24080
|
content: export_mixin_getI18n('vxe.error.notType', [errType]),
|
|
@@ -24790,10 +24840,8 @@ const convertToRows = originColumns => {
|
|
|
24790
24840
|
const {
|
|
24791
24841
|
exportOpts
|
|
24792
24842
|
} = this;
|
|
24793
|
-
if (
|
|
24794
|
-
|
|
24795
|
-
errLog('vxe.error.reqProp', ['export-config']);
|
|
24796
|
-
}
|
|
24843
|
+
if (!this.exportConfig) {
|
|
24844
|
+
errLog('vxe.error.reqProp', ['export-config']);
|
|
24797
24845
|
}
|
|
24798
24846
|
return handleExportAndPrint(this, Object.assign({}, exportOpts, options));
|
|
24799
24847
|
},
|
|
@@ -24802,10 +24850,8 @@ const convertToRows = originColumns => {
|
|
|
24802
24850
|
const {
|
|
24803
24851
|
printOpts
|
|
24804
24852
|
} = this;
|
|
24805
|
-
if (
|
|
24806
|
-
|
|
24807
|
-
errLog('vxe.error.reqProp', ['print-config']);
|
|
24808
|
-
}
|
|
24853
|
+
if (!this.printConfig) {
|
|
24854
|
+
errLog('vxe.error.reqProp', ['print-config']);
|
|
24809
24855
|
}
|
|
24810
24856
|
return handleExportAndPrint(this, Object.assign({}, printOpts, options), true);
|
|
24811
24857
|
}
|
|
@@ -25697,9 +25743,7 @@ function validErrorRuleValue(rule, val) {
|
|
|
25697
25743
|
}
|
|
25698
25744
|
}
|
|
25699
25745
|
} else {
|
|
25700
|
-
|
|
25701
|
-
errLog('vxe.error.notValidators', [validator]);
|
|
25702
|
-
}
|
|
25746
|
+
errLog('vxe.error.notValidators', [validator]);
|
|
25703
25747
|
}
|
|
25704
25748
|
} else {
|
|
25705
25749
|
customValid = validator(validParams);
|
|
@@ -27806,23 +27850,21 @@ function renderBody(h, $xeTable) {
|
|
|
27806
27850
|
warnLog('vxe.error.reqProp', ['tooltip-config']);
|
|
27807
27851
|
}
|
|
27808
27852
|
}
|
|
27809
|
-
|
|
27810
|
-
|
|
27811
|
-
|
|
27812
|
-
|
|
27813
|
-
|
|
27814
|
-
if (
|
|
27815
|
-
|
|
27816
|
-
errLog('vxe.error.reqComp', ['vxe-loading']);
|
|
27817
|
-
}
|
|
27853
|
+
// 使用已安装的组件,如果未安装则不渲染
|
|
27854
|
+
const VxeUILoadingComponent = core_.VxeUI.getComponent('VxeLoading');
|
|
27855
|
+
const VxeUITooltipComponent = core_.VxeUI.getComponent('VxeTooltip');
|
|
27856
|
+
$xeTable.$nextTick(() => {
|
|
27857
|
+
if (props.loading) {
|
|
27858
|
+
if (!VxeUILoadingComponent && !this.$scopedSlots.loading) {
|
|
27859
|
+
errLog('vxe.error.reqComp', ['vxe-loading']);
|
|
27818
27860
|
}
|
|
27819
|
-
|
|
27820
|
-
|
|
27821
|
-
|
|
27822
|
-
|
|
27861
|
+
}
|
|
27862
|
+
if (props.showOverflow === true || props.showOverflow === 'tooltip' || props.showHeaderOverflow === true || props.showHeaderOverflow === 'tooltip' || props.showFooterOverflow === true || props.showFooterOverflow === 'tooltip' || props.tooltipConfig || props.editRules) {
|
|
27863
|
+
if (!VxeUITooltipComponent) {
|
|
27864
|
+
errLog('vxe.error.reqComp', ['vxe-tooltip']);
|
|
27823
27865
|
}
|
|
27824
|
-
}
|
|
27825
|
-
}
|
|
27866
|
+
}
|
|
27867
|
+
});
|
|
27826
27868
|
if (this.autoResize) {
|
|
27827
27869
|
const resizeObserver = table_globalResize.create(() => {
|
|
27828
27870
|
if (this.autoResize) {
|
|
@@ -28442,9 +28484,7 @@ const {
|
|
|
28442
28484
|
if (tCommandMethod) {
|
|
28443
28485
|
tCommandMethod(params);
|
|
28444
28486
|
} else {
|
|
28445
|
-
|
|
28446
|
-
errLog('vxe.error.notCommands', [code]);
|
|
28447
|
-
}
|
|
28487
|
+
errLog('vxe.error.notCommands', [code]);
|
|
28448
28488
|
}
|
|
28449
28489
|
}
|
|
28450
28490
|
$xeToolbar.dispatchEvent('button-click', params, evnt);
|
|
@@ -28479,9 +28519,7 @@ const {
|
|
|
28479
28519
|
if (tCommandMethod) {
|
|
28480
28520
|
tCommandMethod(params);
|
|
28481
28521
|
} else {
|
|
28482
|
-
|
|
28483
|
-
errLog('vxe.error.notCommands', [code]);
|
|
28484
|
-
}
|
|
28522
|
+
errLog('vxe.error.notCommands', [code]);
|
|
28485
28523
|
}
|
|
28486
28524
|
}
|
|
28487
28525
|
$xeToolbar.dispatchEvent('tool-click', params, evnt);
|
|
@@ -28934,28 +28972,24 @@ const {
|
|
|
28934
28972
|
$xetable.connect(this);
|
|
28935
28973
|
}
|
|
28936
28974
|
const customOpts = $xeToolbar.computeCustomOpts;
|
|
28937
|
-
if (
|
|
28938
|
-
|
|
28939
|
-
|
|
28940
|
-
|
|
28941
|
-
|
|
28942
|
-
|
|
28943
|
-
|
|
28944
|
-
|
|
28945
|
-
|
|
28946
|
-
|
|
28947
|
-
|
|
28948
|
-
warnLog('vxe.error.delProp', ['toolbar.custom.trigger', 'table.custom-config.trigger']);
|
|
28949
|
-
}
|
|
28975
|
+
if (customOpts.isFooter) {
|
|
28976
|
+
warnLog('vxe.error.delProp', ['toolbar.custom.isFooter', 'table.custom-config.showFooter']);
|
|
28977
|
+
}
|
|
28978
|
+
if (customOpts.showFooter) {
|
|
28979
|
+
warnLog('vxe.error.delProp', ['toolbar.custom.showFooter', 'table.custom-config.showFooter']);
|
|
28980
|
+
}
|
|
28981
|
+
if (customOpts.immediate) {
|
|
28982
|
+
warnLog('vxe.error.delProp', ['toolbar.custom.immediate', 'table.custom-config.immediate']);
|
|
28983
|
+
}
|
|
28984
|
+
if (customOpts.trigger) {
|
|
28985
|
+
warnLog('vxe.error.delProp', ['toolbar.custom.trigger', 'table.custom-config.trigger']);
|
|
28950
28986
|
}
|
|
28951
28987
|
});
|
|
28952
|
-
|
|
28953
|
-
|
|
28954
|
-
|
|
28955
|
-
if (
|
|
28956
|
-
|
|
28957
|
-
errLog('vxe.error.reqComp', ['vxe-button']);
|
|
28958
|
-
}
|
|
28988
|
+
// 使用已安装的组件,如果未安装则不渲染
|
|
28989
|
+
const VxeUIButtonComponent = core_.VxeUI.getComponent('VxeButton');
|
|
28990
|
+
if (props.refresh || props.import || props.export || props.print || props.zoom) {
|
|
28991
|
+
if (!VxeUIButtonComponent) {
|
|
28992
|
+
errLog('vxe.error.reqComp', ['vxe-button']);
|
|
28959
28993
|
}
|
|
28960
28994
|
}
|
|
28961
28995
|
},
|
|
@@ -29049,9 +29083,7 @@ function getFuncSlot($xeGrid, optSlots, slotKey) {
|
|
|
29049
29083
|
if (slots[funcSlot]) {
|
|
29050
29084
|
return slots[funcSlot];
|
|
29051
29085
|
} else {
|
|
29052
|
-
|
|
29053
|
-
errLog('vxe.error.notSlot', [funcSlot]);
|
|
29054
|
-
}
|
|
29086
|
+
errLog('vxe.error.notSlot', [funcSlot]);
|
|
29055
29087
|
}
|
|
29056
29088
|
} else {
|
|
29057
29089
|
return funcSlot;
|
|
@@ -29570,34 +29602,30 @@ Object.keys(table.methods).forEach(name => {
|
|
|
29570
29602
|
// if (proxyConfig && (data || (proxyOpts.form && formOpts.data))) {
|
|
29571
29603
|
// errLog('vxe.error.errConflicts', ['grid.data', 'grid.proxy-config'])
|
|
29572
29604
|
// }
|
|
29573
|
-
if (
|
|
29574
|
-
|
|
29575
|
-
warnLog('vxe.error.delProp', ['grid.toolbar', 'grid.toolbar-config']);
|
|
29576
|
-
}
|
|
29577
|
-
if (this.toolbarConfig && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(this.toolbarConfig)) {
|
|
29578
|
-
warnLog('vxe.error.errProp', [`grid.toolbar-config=${this.toolbarConfig}`, 'grid.toolbar-config={}']);
|
|
29579
|
-
}
|
|
29580
|
-
// if (proxyOpts.props) {
|
|
29581
|
-
// warnLog('vxe.error.delProp', ['proxy-config.props', 'proxy-config.response'])
|
|
29582
|
-
// }
|
|
29605
|
+
if (this.toolbar) {
|
|
29606
|
+
warnLog('vxe.error.delProp', ['grid.toolbar', 'grid.toolbar-config']);
|
|
29583
29607
|
}
|
|
29584
|
-
if (
|
|
29585
|
-
|
|
29586
|
-
|
|
29587
|
-
|
|
29588
|
-
|
|
29589
|
-
|
|
29590
|
-
|
|
29591
|
-
|
|
29592
|
-
|
|
29608
|
+
if (this.toolbarConfig && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(this.toolbarConfig)) {
|
|
29609
|
+
warnLog('vxe.error.errProp', [`grid.toolbar-config=${this.toolbarConfig}`, 'grid.toolbar-config={}']);
|
|
29610
|
+
}
|
|
29611
|
+
// if (proxyOpts.props) {
|
|
29612
|
+
// warnLog('vxe.error.delProp', ['proxy-config.props', 'proxy-config.response'])
|
|
29613
|
+
// }
|
|
29614
|
+
// 使用已安装的组件,如果未安装则不渲染
|
|
29615
|
+
const VxeUIFormComponent = core_.VxeUI.getComponent('VxeForm');
|
|
29616
|
+
const VxeUIPagerComponent = core_.VxeUI.getComponent('VxePager');
|
|
29617
|
+
$xeGrid.$nextTick(() => {
|
|
29618
|
+
if (props.formConfig) {
|
|
29619
|
+
if (!VxeUIFormComponent) {
|
|
29620
|
+
errLog('vxe.error.reqComp', ['vxe-form']);
|
|
29593
29621
|
}
|
|
29594
|
-
|
|
29595
|
-
|
|
29596
|
-
|
|
29597
|
-
|
|
29622
|
+
}
|
|
29623
|
+
if (props.pagerConfig) {
|
|
29624
|
+
if (!VxeUIPagerComponent) {
|
|
29625
|
+
errLog('vxe.error.reqComp', ['vxe-pager']);
|
|
29598
29626
|
}
|
|
29599
|
-
}
|
|
29600
|
-
}
|
|
29627
|
+
}
|
|
29628
|
+
});
|
|
29601
29629
|
this.initPages();
|
|
29602
29630
|
grid_globalEvents.on(this, 'keydown', this.handleGlobalKeydownEvent);
|
|
29603
29631
|
},
|
|
@@ -29962,9 +29990,7 @@ Object.keys(table.methods).forEach(name => {
|
|
|
29962
29990
|
};
|
|
29963
29991
|
});
|
|
29964
29992
|
} else {
|
|
29965
|
-
|
|
29966
|
-
errLog('vxe.error.notFunc', ['proxy-config.ajax.query']);
|
|
29967
|
-
}
|
|
29993
|
+
errLog('vxe.error.notFunc', ['proxy-config.ajax.query']);
|
|
29968
29994
|
}
|
|
29969
29995
|
break;
|
|
29970
29996
|
}
|
|
@@ -29999,10 +30025,8 @@ Object.keys(table.methods).forEach(name => {
|
|
|
29999
30025
|
$xetable.setPendingRow(removeRecords, false);
|
|
30000
30026
|
if (isRespMsg) {
|
|
30001
30027
|
// 检测弹窗模块
|
|
30002
|
-
if (
|
|
30003
|
-
|
|
30004
|
-
errLog('vxe.error.reqModule', ['Modal']);
|
|
30005
|
-
}
|
|
30028
|
+
if (!core_.VxeUI.modal) {
|
|
30029
|
+
errLog('vxe.error.reqModule', ['Modal']);
|
|
30006
30030
|
}
|
|
30007
30031
|
core_.VxeUI.modal.message({
|
|
30008
30032
|
content: this.getRespMsg(rest, 'vxe.grid.delSuccess'),
|
|
@@ -30027,10 +30051,8 @@ Object.keys(table.methods).forEach(name => {
|
|
|
30027
30051
|
this.tableLoading = false;
|
|
30028
30052
|
if (isRespMsg) {
|
|
30029
30053
|
// 检测弹窗模块
|
|
30030
|
-
if (
|
|
30031
|
-
|
|
30032
|
-
errLog('vxe.error.reqModule', ['Modal']);
|
|
30033
|
-
}
|
|
30054
|
+
if (!core_.VxeUI.modal) {
|
|
30055
|
+
errLog('vxe.error.reqModule', ['Modal']);
|
|
30034
30056
|
}
|
|
30035
30057
|
core_.VxeUI.modal.message({
|
|
30036
30058
|
id: code,
|
|
@@ -30052,10 +30074,8 @@ Object.keys(table.methods).forEach(name => {
|
|
|
30052
30074
|
} else {
|
|
30053
30075
|
if (isActiveMsg) {
|
|
30054
30076
|
// 检测弹窗模块
|
|
30055
|
-
if (
|
|
30056
|
-
|
|
30057
|
-
errLog('vxe.error.reqModule', ['Modal']);
|
|
30058
|
-
}
|
|
30077
|
+
if (!core_.VxeUI.modal) {
|
|
30078
|
+
errLog('vxe.error.reqModule', ['Modal']);
|
|
30059
30079
|
}
|
|
30060
30080
|
core_.VxeUI.modal.message({
|
|
30061
30081
|
id: code,
|
|
@@ -30065,9 +30085,7 @@ Object.keys(table.methods).forEach(name => {
|
|
|
30065
30085
|
}
|
|
30066
30086
|
}
|
|
30067
30087
|
} else {
|
|
30068
|
-
|
|
30069
|
-
errLog('vxe.error.notFunc', ['proxy-config.ajax.delete']);
|
|
30070
|
-
}
|
|
30088
|
+
errLog('vxe.error.notFunc', ['proxy-config.ajax.delete']);
|
|
30071
30089
|
}
|
|
30072
30090
|
break;
|
|
30073
30091
|
}
|
|
@@ -30118,10 +30136,8 @@ Object.keys(table.methods).forEach(name => {
|
|
|
30118
30136
|
$xetable.clearPendingRow();
|
|
30119
30137
|
if (isRespMsg) {
|
|
30120
30138
|
// 检测弹窗模块
|
|
30121
|
-
if (
|
|
30122
|
-
|
|
30123
|
-
errLog('vxe.error.reqModule', ['Modal']);
|
|
30124
|
-
}
|
|
30139
|
+
if (!core_.VxeUI.modal) {
|
|
30140
|
+
errLog('vxe.error.reqModule', ['Modal']);
|
|
30125
30141
|
}
|
|
30126
30142
|
core_.VxeUI.modal.message({
|
|
30127
30143
|
content: this.getRespMsg(rest, 'vxe.grid.saveSuccess'),
|
|
@@ -30146,10 +30162,8 @@ Object.keys(table.methods).forEach(name => {
|
|
|
30146
30162
|
this.tableLoading = false;
|
|
30147
30163
|
if (isRespMsg) {
|
|
30148
30164
|
// 检测弹窗模块
|
|
30149
|
-
if (
|
|
30150
|
-
|
|
30151
|
-
errLog('vxe.error.reqModule', ['Modal']);
|
|
30152
|
-
}
|
|
30165
|
+
if (!core_.VxeUI.modal) {
|
|
30166
|
+
errLog('vxe.error.reqModule', ['Modal']);
|
|
30153
30167
|
}
|
|
30154
30168
|
core_.VxeUI.modal.message({
|
|
30155
30169
|
id: code,
|
|
@@ -30170,10 +30184,8 @@ Object.keys(table.methods).forEach(name => {
|
|
|
30170
30184
|
} else {
|
|
30171
30185
|
if (isActiveMsg) {
|
|
30172
30186
|
// 检测弹窗模块
|
|
30173
|
-
if (
|
|
30174
|
-
|
|
30175
|
-
errLog('vxe.error.reqModule', ['Modal']);
|
|
30176
|
-
}
|
|
30187
|
+
if (!core_.VxeUI.modal) {
|
|
30188
|
+
errLog('vxe.error.reqModule', ['Modal']);
|
|
30177
30189
|
}
|
|
30178
30190
|
core_.VxeUI.modal.message({
|
|
30179
30191
|
id: code,
|
|
@@ -30184,9 +30196,7 @@ Object.keys(table.methods).forEach(name => {
|
|
|
30184
30196
|
}
|
|
30185
30197
|
});
|
|
30186
30198
|
} else {
|
|
30187
|
-
|
|
30188
|
-
errLog('vxe.error.notFunc', ['proxy-config.ajax.save']);
|
|
30189
|
-
}
|
|
30199
|
+
errLog('vxe.error.notFunc', ['proxy-config.ajax.save']);
|
|
30190
30200
|
}
|
|
30191
30201
|
break;
|
|
30192
30202
|
}
|
|
@@ -30202,9 +30212,7 @@ Object.keys(table.methods).forEach(name => {
|
|
|
30202
30212
|
$table: $xetable
|
|
30203
30213
|
}, ...args);
|
|
30204
30214
|
} else {
|
|
30205
|
-
|
|
30206
|
-
errLog('vxe.error.notCommands', [code]);
|
|
30207
|
-
}
|
|
30215
|
+
errLog('vxe.error.notCommands', [code]);
|
|
30208
30216
|
}
|
|
30209
30217
|
}
|
|
30210
30218
|
}
|
|
@@ -30237,10 +30245,8 @@ Object.keys(table.methods).forEach(name => {
|
|
|
30237
30245
|
});
|
|
30238
30246
|
} else {
|
|
30239
30247
|
// 检测弹窗模块
|
|
30240
|
-
if (
|
|
30241
|
-
|
|
30242
|
-
errLog('vxe.error.reqModule', ['Modal']);
|
|
30243
|
-
}
|
|
30248
|
+
if (!core_.VxeUI.modal) {
|
|
30249
|
+
errLog('vxe.error.reqModule', ['Modal']);
|
|
30244
30250
|
}
|
|
30245
30251
|
core_.VxeUI.modal.message({
|
|
30246
30252
|
id: `msg_${code}`,
|
|
@@ -30321,10 +30327,8 @@ Object.keys(table.methods).forEach(name => {
|
|
|
30321
30327
|
} else {
|
|
30322
30328
|
if (isActiveMsg) {
|
|
30323
30329
|
// 检测弹窗模块
|
|
30324
|
-
if (
|
|
30325
|
-
|
|
30326
|
-
errLog('vxe.error.reqModule', ['Modal']);
|
|
30327
|
-
}
|
|
30330
|
+
if (!core_.VxeUI.modal) {
|
|
30331
|
+
errLog('vxe.error.reqModule', ['Modal']);
|
|
30328
30332
|
}
|
|
30329
30333
|
core_.VxeUI.modal.message({
|
|
30330
30334
|
id: code,
|
|
@@ -30750,10 +30754,8 @@ function getComponentOns(renderOpts, params, eFns) {
|
|
|
30750
30754
|
const ons = {};
|
|
30751
30755
|
external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().objectEach(events, (func, key) => {
|
|
30752
30756
|
ons[getOnName(key)] = function (...args) {
|
|
30753
|
-
if (
|
|
30754
|
-
|
|
30755
|
-
errLog('vxe.error.errFunc', [func]);
|
|
30756
|
-
}
|
|
30757
|
+
if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(func)) {
|
|
30758
|
+
errLog('vxe.error.errFunc', [func]);
|
|
30757
30759
|
}
|
|
30758
30760
|
func(params, ...args);
|
|
30759
30761
|
};
|
|
@@ -31252,6 +31254,69 @@ function handleExportTreeSelectMethod(params) {
|
|
|
31252
31254
|
} = params;
|
|
31253
31255
|
return options.original ? getCellValue(row, column) : getTreeSelectCellValue(column.editRender || column.cellRender, params);
|
|
31254
31256
|
}
|
|
31257
|
+
function handleNumberCell(h, renderOpts, params) {
|
|
31258
|
+
const {
|
|
31259
|
+
props = {},
|
|
31260
|
+
showNegativeStatus
|
|
31261
|
+
} = renderOpts;
|
|
31262
|
+
const {
|
|
31263
|
+
row,
|
|
31264
|
+
column
|
|
31265
|
+
} = params;
|
|
31266
|
+
const {
|
|
31267
|
+
type
|
|
31268
|
+
} = props;
|
|
31269
|
+
let cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field);
|
|
31270
|
+
let isNegative = false;
|
|
31271
|
+
if (!isEmptyValue(cellValue)) {
|
|
31272
|
+
const numberInputConfig = render_getConfig().numberInput || {};
|
|
31273
|
+
if (type === 'float') {
|
|
31274
|
+
const autoFill = handleDefaultValue(props.autoFill, numberInputConfig.autoFill, true);
|
|
31275
|
+
const digits = handleDefaultValue(props.digits, numberInputConfig.digits, 1);
|
|
31276
|
+
cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toFixed(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().floor(cellValue, digits), digits);
|
|
31277
|
+
if (!autoFill) {
|
|
31278
|
+
cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellValue);
|
|
31279
|
+
}
|
|
31280
|
+
if (showNegativeStatus) {
|
|
31281
|
+
if (cellValue < 0) {
|
|
31282
|
+
isNegative = true;
|
|
31283
|
+
}
|
|
31284
|
+
}
|
|
31285
|
+
} else if (type === 'amount') {
|
|
31286
|
+
const autoFill = handleDefaultValue(props.autoFill, numberInputConfig.autoFill, true);
|
|
31287
|
+
const digits = handleDefaultValue(props.digits, numberInputConfig.digits, 2);
|
|
31288
|
+
const showCurrency = handleDefaultValue(props.showCurrency, numberInputConfig.showCurrency, false);
|
|
31289
|
+
cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellValue);
|
|
31290
|
+
if (showNegativeStatus) {
|
|
31291
|
+
if (cellValue < 0) {
|
|
31292
|
+
isNegative = true;
|
|
31293
|
+
}
|
|
31294
|
+
}
|
|
31295
|
+
cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().commafy(cellValue, {
|
|
31296
|
+
digits
|
|
31297
|
+
});
|
|
31298
|
+
if (!autoFill) {
|
|
31299
|
+
const [iStr, dStr] = cellValue.split('.');
|
|
31300
|
+
if (dStr) {
|
|
31301
|
+
const dRest = dStr.replace(/0+$/, '');
|
|
31302
|
+
cellValue = dRest ? [iStr, '.', dRest].join('') : iStr;
|
|
31303
|
+
}
|
|
31304
|
+
}
|
|
31305
|
+
if (showCurrency) {
|
|
31306
|
+
cellValue = `${props.currencySymbol || numberInputConfig.currencySymbol || render_getI18n('vxe.numberInput.currencySymbol') || ''}${cellValue}`;
|
|
31307
|
+
}
|
|
31308
|
+
} else {
|
|
31309
|
+
if (showNegativeStatus) {
|
|
31310
|
+
if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellValue) < 0) {
|
|
31311
|
+
isNegative = true;
|
|
31312
|
+
}
|
|
31313
|
+
}
|
|
31314
|
+
}
|
|
31315
|
+
}
|
|
31316
|
+
return getCellLabelVNs(h, renderOpts, params, cellValue, isNegative ? {
|
|
31317
|
+
class: 'is--negative'
|
|
31318
|
+
} : {});
|
|
31319
|
+
}
|
|
31255
31320
|
/**
|
|
31256
31321
|
* 表格 - 渲染器
|
|
31257
31322
|
*/
|
|
@@ -31323,72 +31388,22 @@ render_renderer.mixin({
|
|
|
31323
31388
|
renderTableFilter: defaultFilterRender,
|
|
31324
31389
|
tableFilterDefaultMethod: handleInputFilterMethod
|
|
31325
31390
|
},
|
|
31326
|
-
|
|
31327
|
-
|
|
31328
|
-
|
|
31329
|
-
|
|
31330
|
-
const {
|
|
31331
|
-
props = {},
|
|
31332
|
-
showNegativeStatus
|
|
31333
|
-
} = renderOpts;
|
|
31391
|
+
FormatNumberInput: {
|
|
31392
|
+
renderTableDefault: handleNumberCell,
|
|
31393
|
+
tableFilterDefaultMethod: handleInputFilterMethod,
|
|
31394
|
+
tableExportMethod(params) {
|
|
31334
31395
|
const {
|
|
31335
31396
|
row,
|
|
31336
31397
|
column
|
|
31337
31398
|
} = params;
|
|
31338
|
-
const
|
|
31339
|
-
|
|
31340
|
-
|
|
31341
|
-
|
|
31342
|
-
|
|
31343
|
-
|
|
31344
|
-
|
|
31345
|
-
|
|
31346
|
-
const autoFill = handleDefaultValue(props.autoFill, numberInputConfig.autoFill, true);
|
|
31347
|
-
const digits = handleDefaultValue(props.digits, numberInputConfig.digits, 1);
|
|
31348
|
-
cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toFixed(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().floor(cellValue, digits), digits);
|
|
31349
|
-
if (!autoFill) {
|
|
31350
|
-
cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellValue);
|
|
31351
|
-
}
|
|
31352
|
-
if (showNegativeStatus) {
|
|
31353
|
-
if (cellValue < 0) {
|
|
31354
|
-
isNegative = true;
|
|
31355
|
-
}
|
|
31356
|
-
}
|
|
31357
|
-
} else if (type === 'amount') {
|
|
31358
|
-
const autoFill = handleDefaultValue(props.autoFill, numberInputConfig.autoFill, true);
|
|
31359
|
-
const digits = handleDefaultValue(props.digits, numberInputConfig.digits, 2);
|
|
31360
|
-
const showCurrency = handleDefaultValue(props.showCurrency, numberInputConfig.showCurrency, false);
|
|
31361
|
-
cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellValue);
|
|
31362
|
-
if (showNegativeStatus) {
|
|
31363
|
-
if (cellValue < 0) {
|
|
31364
|
-
isNegative = true;
|
|
31365
|
-
}
|
|
31366
|
-
}
|
|
31367
|
-
cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().commafy(cellValue, {
|
|
31368
|
-
digits
|
|
31369
|
-
});
|
|
31370
|
-
if (!autoFill) {
|
|
31371
|
-
const [iStr, dStr] = cellValue.split('.');
|
|
31372
|
-
if (dStr) {
|
|
31373
|
-
const dRest = dStr.replace(/0+$/, '');
|
|
31374
|
-
cellValue = dRest ? [iStr, '.', dRest].join('') : iStr;
|
|
31375
|
-
}
|
|
31376
|
-
}
|
|
31377
|
-
if (showCurrency) {
|
|
31378
|
-
cellValue = `${props.currencySymbol || numberInputConfig.currencySymbol || render_getI18n('vxe.numberInput.currencySymbol') || ''}${cellValue}`;
|
|
31379
|
-
}
|
|
31380
|
-
} else {
|
|
31381
|
-
if (showNegativeStatus) {
|
|
31382
|
-
if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellValue) < 0) {
|
|
31383
|
-
isNegative = true;
|
|
31384
|
-
}
|
|
31385
|
-
}
|
|
31386
|
-
}
|
|
31387
|
-
}
|
|
31388
|
-
return getCellLabelVNs(h, renderOpts, params, cellValue, isNegative ? {
|
|
31389
|
-
class: 'is--negative'
|
|
31390
|
-
} : {});
|
|
31391
|
-
},
|
|
31399
|
+
const cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field);
|
|
31400
|
+
return cellValue;
|
|
31401
|
+
}
|
|
31402
|
+
},
|
|
31403
|
+
VxeNumberInput: {
|
|
31404
|
+
tableAutoFocus: 'input',
|
|
31405
|
+
renderTableEdit: defaultEditRender,
|
|
31406
|
+
renderTableCell: handleNumberCell,
|
|
31392
31407
|
renderTableFooter(h, renderOpts, params) {
|
|
31393
31408
|
const {
|
|
31394
31409
|
props = {}
|
|
@@ -31525,11 +31540,22 @@ render_renderer.mixin({
|
|
|
31525
31540
|
tableFilterDefaultMethod: handleFilterMethod,
|
|
31526
31541
|
tableExportMethod: handleExportSelectMethod
|
|
31527
31542
|
},
|
|
31543
|
+
/**
|
|
31544
|
+
* 已废弃,被 FormatSelect 替换
|
|
31545
|
+
* @deprecated
|
|
31546
|
+
*/
|
|
31528
31547
|
formatOption: {
|
|
31529
31548
|
renderTableDefault(h, renderOpts, params) {
|
|
31530
31549
|
return getCellLabelVNs(h, renderOpts, params, getSelectCellValue(renderOpts, params));
|
|
31531
31550
|
}
|
|
31532
31551
|
},
|
|
31552
|
+
FormatSelect: {
|
|
31553
|
+
renderTableDefault(h, renderOpts, params) {
|
|
31554
|
+
return getCellLabelVNs(h, renderOpts, params, getSelectCellValue(renderOpts, params));
|
|
31555
|
+
},
|
|
31556
|
+
tableFilterDefaultMethod: handleFilterMethod,
|
|
31557
|
+
tableExportMethod: handleExportSelectMethod
|
|
31558
|
+
},
|
|
31533
31559
|
VxeTreeSelect: {
|
|
31534
31560
|
tableAutoFocus: 'input',
|
|
31535
31561
|
renderTableEdit: defaultTableOrTreeSelectEditRender,
|
|
@@ -31546,11 +31572,21 @@ render_renderer.mixin({
|
|
|
31546
31572
|
},
|
|
31547
31573
|
tableExportMethod: handleExportTreeSelectMethod
|
|
31548
31574
|
},
|
|
31575
|
+
/**
|
|
31576
|
+
* 已废弃,被 FormatTreeSelect 替换
|
|
31577
|
+
* @deprecated
|
|
31578
|
+
*/
|
|
31549
31579
|
formatTree: {
|
|
31550
31580
|
renderTableDefault(h, renderOpts, params) {
|
|
31551
31581
|
return getCellLabelVNs(h, renderOpts, params, getTreeSelectCellValue(renderOpts, params));
|
|
31552
31582
|
}
|
|
31553
31583
|
},
|
|
31584
|
+
FormatTreeSelect: {
|
|
31585
|
+
renderTableDefault(h, renderOpts, params) {
|
|
31586
|
+
return getCellLabelVNs(h, renderOpts, params, getTreeSelectCellValue(renderOpts, params));
|
|
31587
|
+
},
|
|
31588
|
+
tableExportMethod: handleExportTreeSelectMethod
|
|
31589
|
+
},
|
|
31554
31590
|
VxeColorPicker: {
|
|
31555
31591
|
tableAutoFocus: 'input',
|
|
31556
31592
|
renderTableEdit(h, renderOpts, params) {
|