vxe-table 3.23.0-beta.7 → 3.23.0
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/style.css +1 -1
- package/es/table/module/export/mixin.js +10 -9
- package/es/ui/index.js +1 -1
- package/es/ui/src/log.js +1 -1
- package/lib/index.umd.js +21 -11
- package/lib/index.umd.min.js +1 -1
- package/lib/style.css +1 -1
- package/lib/table/module/export/mixin.js +19 -9
- package/lib/table/module/export/mixin.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/table/module/export/mixin.ts +10 -9
- /package/es/{iconfont.1787383485465.ttf → iconfont.1787473155426.ttf} +0 -0
- /package/es/{iconfont.1787383485465.woff → iconfont.1787473155426.woff} +0 -0
- /package/es/{iconfont.1787383485465.woff2 → iconfont.1787473155426.woff2} +0 -0
- /package/lib/{iconfont.1787383485465.ttf → iconfont.1787473155426.ttf} +0 -0
- /package/lib/{iconfont.1787383485465.woff → iconfont.1787473155426.woff} +0 -0
- /package/lib/{iconfont.1787383485465.woff2 → iconfont.1787473155426.woff2} +0 -0
|
@@ -1040,7 +1040,7 @@ function handleImport($xeTable, content, opts) {
|
|
|
1040
1040
|
}
|
|
1041
1041
|
VxeUI.modal.message({ content: getI18n('vxe.error.impFields'), status: 'error' });
|
|
1042
1042
|
if (_importReject) {
|
|
1043
|
-
_importReject({ status: false });
|
|
1043
|
+
_importReject({ status: false, msg: 'field mismatching' });
|
|
1044
1044
|
}
|
|
1045
1045
|
}
|
|
1046
1046
|
}
|
|
@@ -1058,7 +1058,7 @@ function handleFileImport($xeTable, file, opts) {
|
|
|
1058
1058
|
}
|
|
1059
1059
|
VxeUI.modal.message({ content: getI18n('vxe.error.notType', [type]), status: 'error' });
|
|
1060
1060
|
}
|
|
1061
|
-
const params = { status: false };
|
|
1061
|
+
const params = { status: false, msg: 'type error' };
|
|
1062
1062
|
return Promise.reject(params);
|
|
1063
1063
|
}
|
|
1064
1064
|
const rest = new Promise((resolve, reject) => {
|
|
@@ -1094,7 +1094,7 @@ function handleFileImport($xeTable, file, opts) {
|
|
|
1094
1094
|
const reader = new FileReader();
|
|
1095
1095
|
reader.onerror = () => {
|
|
1096
1096
|
errLog('vxe.error.notType', [type]);
|
|
1097
|
-
_importReject({ status: false });
|
|
1097
|
+
_importReject({ status: false, msg: 'reading file error' });
|
|
1098
1098
|
};
|
|
1099
1099
|
reader.onload = (e) => {
|
|
1100
1100
|
handleImport($xeTable, e.target.result, options);
|
|
@@ -1106,7 +1106,7 @@ function handleFileImport($xeTable, file, opts) {
|
|
|
1106
1106
|
else {
|
|
1107
1107
|
// 不支持的浏览器
|
|
1108
1108
|
errLog('vxe.error.notExp');
|
|
1109
|
-
_importResolve({ status:
|
|
1109
|
+
_importResolve({ status: false, msg: 'unsupported browser' });
|
|
1110
1110
|
}
|
|
1111
1111
|
});
|
|
1112
1112
|
return rest.then(() => {
|
|
@@ -1581,7 +1581,7 @@ export default {
|
|
|
1581
1581
|
if (['xlsx', 'pdf'].includes(type)) {
|
|
1582
1582
|
warnLog('vxe.error.reqPlugin', [3, 'plugin-export-xlsx']);
|
|
1583
1583
|
}
|
|
1584
|
-
const params = { status: false };
|
|
1584
|
+
const params = { status: false, msg: 'type error' };
|
|
1585
1585
|
return Promise.reject(params);
|
|
1586
1586
|
}
|
|
1587
1587
|
if (!handleOptions.print) {
|
|
@@ -1589,7 +1589,7 @@ export default {
|
|
|
1589
1589
|
const beRest = beforeExportMethod({ options: handleOptions, $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt });
|
|
1590
1590
|
if (XEUtils.isBoolean(beRest)) {
|
|
1591
1591
|
if (!beRest) {
|
|
1592
|
-
const params = { status: false };
|
|
1592
|
+
const params = { status: false, msg: 'before prevent' };
|
|
1593
1593
|
return Promise.reject(params);
|
|
1594
1594
|
}
|
|
1595
1595
|
}
|
|
@@ -1706,7 +1706,7 @@ export default {
|
|
|
1706
1706
|
const biRest = beforeImportMethod({ options: opts, $table: $xeTable });
|
|
1707
1707
|
if (XEUtils.isBoolean(biRest)) {
|
|
1708
1708
|
if (!biRest) {
|
|
1709
|
-
const params = { status: false };
|
|
1709
|
+
const params = { status: false, mas: 'before prevent' };
|
|
1710
1710
|
return Promise.reject(params);
|
|
1711
1711
|
}
|
|
1712
1712
|
}
|
|
@@ -1729,7 +1729,7 @@ export default {
|
|
|
1729
1729
|
const biRest = beforeImportMethod({ options: opts, $table: $xeTable });
|
|
1730
1730
|
if (XEUtils.isBoolean(biRest)) {
|
|
1731
1731
|
if (!biRest) {
|
|
1732
|
-
const params = { status: false };
|
|
1732
|
+
const params = { status: false, mas: 'before prevent' };
|
|
1733
1733
|
return Promise.reject(params);
|
|
1734
1734
|
}
|
|
1735
1735
|
}
|
|
@@ -1880,7 +1880,8 @@ export default {
|
|
|
1880
1880
|
}
|
|
1881
1881
|
}
|
|
1882
1882
|
else {
|
|
1883
|
-
|
|
1883
|
+
errLog('vxe.error.reqComp', ['vxe-print']);
|
|
1884
|
+
const e = { status: false, msg: 'print not exist' };
|
|
1884
1885
|
reject(e);
|
|
1885
1886
|
}
|
|
1886
1887
|
});
|
package/es/ui/index.js
CHANGED
package/es/ui/src/log.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { VxeUI } from '@vxe-ui/core';
|
|
2
2
|
const { log } = VxeUI;
|
|
3
|
-
const tableVersion = `table v${"3.23.0
|
|
3
|
+
const tableVersion = `table v${"3.23.0"}`;
|
|
4
4
|
export function createComponentLog(name) {
|
|
5
5
|
const uiVersion = VxeUI.uiVersion ? `ui v${VxeUI.uiVersion}` : '';
|
|
6
6
|
const ganttVersion = VxeUI.ganttVersion ? `gantt v${VxeUI.ganttVersion}` : '';
|
package/lib/index.umd.js
CHANGED
|
@@ -3314,7 +3314,7 @@ function getDefaultConfig(val1, def1) {
|
|
|
3314
3314
|
/* unused harmony import specifier */ var VxeUI;
|
|
3315
3315
|
|
|
3316
3316
|
|
|
3317
|
-
const version = "3.23.0
|
|
3317
|
+
const version = "3.23.0";
|
|
3318
3318
|
core_.VxeUI.version = version;
|
|
3319
3319
|
core_.VxeUI.tableVersion = version;
|
|
3320
3320
|
core_.VxeUI.setConfig({
|
|
@@ -4112,7 +4112,7 @@ function getPopupAppendElement(appendTo) {
|
|
|
4112
4112
|
const {
|
|
4113
4113
|
log: log_log
|
|
4114
4114
|
} = core_.VxeUI;
|
|
4115
|
-
const tableVersion = `table v${"3.23.0
|
|
4115
|
+
const tableVersion = `table v${"3.23.0"}`;
|
|
4116
4116
|
function createComponentLog(name) {
|
|
4117
4117
|
const uiVersion = core_.VxeUI.uiVersion ? `ui v${core_.VxeUI.uiVersion}` : '';
|
|
4118
4118
|
const ganttVersion = core_.VxeUI.ganttVersion ? `gantt v${core_.VxeUI.ganttVersion}` : '';
|
|
@@ -17814,7 +17814,8 @@ function handleImport($xeTable, content, opts) {
|
|
|
17814
17814
|
});
|
|
17815
17815
|
if (_importReject) {
|
|
17816
17816
|
_importReject({
|
|
17817
|
-
status: false
|
|
17817
|
+
status: false,
|
|
17818
|
+
msg: 'field mismatching'
|
|
17818
17819
|
});
|
|
17819
17820
|
}
|
|
17820
17821
|
}
|
|
@@ -17843,7 +17844,8 @@ function handleFileImport($xeTable, file, opts) {
|
|
|
17843
17844
|
});
|
|
17844
17845
|
}
|
|
17845
17846
|
const params = {
|
|
17846
|
-
status: false
|
|
17847
|
+
status: false,
|
|
17848
|
+
msg: 'type error'
|
|
17847
17849
|
};
|
|
17848
17850
|
return Promise.reject(params);
|
|
17849
17851
|
}
|
|
@@ -17900,7 +17902,8 @@ function handleFileImport($xeTable, file, opts) {
|
|
|
17900
17902
|
reader.onerror = () => {
|
|
17901
17903
|
export_mixin_errLog('vxe.error.notType', [type]);
|
|
17902
17904
|
_importReject({
|
|
17903
|
-
status: false
|
|
17905
|
+
status: false,
|
|
17906
|
+
msg: 'reading file error'
|
|
17904
17907
|
});
|
|
17905
17908
|
};
|
|
17906
17909
|
reader.onload = e => {
|
|
@@ -17913,7 +17916,8 @@ function handleFileImport($xeTable, file, opts) {
|
|
|
17913
17916
|
// 不支持的浏览器
|
|
17914
17917
|
export_mixin_errLog('vxe.error.notExp');
|
|
17915
17918
|
_importResolve({
|
|
17916
|
-
status:
|
|
17919
|
+
status: false,
|
|
17920
|
+
msg: 'unsupported browser'
|
|
17917
17921
|
});
|
|
17918
17922
|
}
|
|
17919
17923
|
});
|
|
@@ -18459,7 +18463,8 @@ const convertToRows = originColumns => {
|
|
|
18459
18463
|
export_mixin_warnLog('vxe.error.reqPlugin', [3, 'plugin-export-xlsx']);
|
|
18460
18464
|
}
|
|
18461
18465
|
const params = {
|
|
18462
|
-
status: false
|
|
18466
|
+
status: false,
|
|
18467
|
+
msg: 'type error'
|
|
18463
18468
|
};
|
|
18464
18469
|
return Promise.reject(params);
|
|
18465
18470
|
}
|
|
@@ -18474,7 +18479,8 @@ const convertToRows = originColumns => {
|
|
|
18474
18479
|
if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(beRest)) {
|
|
18475
18480
|
if (!beRest) {
|
|
18476
18481
|
const params = {
|
|
18477
|
-
status: false
|
|
18482
|
+
status: false,
|
|
18483
|
+
msg: 'before prevent'
|
|
18478
18484
|
};
|
|
18479
18485
|
return Promise.reject(params);
|
|
18480
18486
|
}
|
|
@@ -18618,7 +18624,8 @@ const convertToRows = originColumns => {
|
|
|
18618
18624
|
if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(biRest)) {
|
|
18619
18625
|
if (!biRest) {
|
|
18620
18626
|
const params = {
|
|
18621
|
-
status: false
|
|
18627
|
+
status: false,
|
|
18628
|
+
mas: 'before prevent'
|
|
18622
18629
|
};
|
|
18623
18630
|
return Promise.reject(params);
|
|
18624
18631
|
}
|
|
@@ -18648,7 +18655,8 @@ const convertToRows = originColumns => {
|
|
|
18648
18655
|
if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(biRest)) {
|
|
18649
18656
|
if (!biRest) {
|
|
18650
18657
|
const params = {
|
|
18651
|
-
status: false
|
|
18658
|
+
status: false,
|
|
18659
|
+
mas: 'before prevent'
|
|
18652
18660
|
};
|
|
18653
18661
|
return Promise.reject(params);
|
|
18654
18662
|
}
|
|
@@ -18806,8 +18814,10 @@ const convertToRows = originColumns => {
|
|
|
18806
18814
|
}));
|
|
18807
18815
|
}
|
|
18808
18816
|
} else {
|
|
18817
|
+
export_mixin_errLog('vxe.error.reqComp', ['vxe-print']);
|
|
18809
18818
|
const e = {
|
|
18810
|
-
status: false
|
|
18819
|
+
status: false,
|
|
18820
|
+
msg: 'print not exist'
|
|
18811
18821
|
};
|
|
18812
18822
|
reject(e);
|
|
18813
18823
|
}
|