vxe-table 4.7.26 → 4.7.27-beta.1
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/table/module/export/hook.js +17 -3
- package/es/ui/index.js +2 -2
- package/es/ui/src/log.js +1 -1
- package/lib/index.umd.js +30 -6
- package/lib/index.umd.min.js +1 -1
- package/lib/table/module/export/hook.js +27 -3
- package/lib/table/module/export/hook.min.js +1 -1
- package/lib/ui/index.js +2 -2
- 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 +1 -1
- package/packages/table/module/export/hook.ts +17 -3
|
@@ -1196,19 +1196,33 @@ hooks.add('tableExportModule', {
|
|
|
1196
1196
|
if (!opts.sheetName) {
|
|
1197
1197
|
opts.sheetName = document.title;
|
|
1198
1198
|
}
|
|
1199
|
+
const beforePrintMethod = opts.beforePrintMethod;
|
|
1200
|
+
const tableHtml = opts.html || opts.content;
|
|
1199
1201
|
return new Promise((resolve, reject) => {
|
|
1200
1202
|
if (VxeUI.print) {
|
|
1201
|
-
if (
|
|
1203
|
+
if (tableHtml) {
|
|
1202
1204
|
resolve(VxeUI.print({
|
|
1203
1205
|
title: opts.sheetName,
|
|
1204
|
-
html:
|
|
1206
|
+
html: tableHtml,
|
|
1207
|
+
customStyle: opts.style,
|
|
1208
|
+
beforeMethod: beforePrintMethod
|
|
1209
|
+
? ({ html }) => {
|
|
1210
|
+
return beforePrintMethod({ html, content: html, options: opts, $table: $xeTable });
|
|
1211
|
+
}
|
|
1212
|
+
: undefined
|
|
1205
1213
|
}));
|
|
1206
1214
|
}
|
|
1207
1215
|
else {
|
|
1208
1216
|
resolve(exportMethods.exportData(opts).then(({ content }) => {
|
|
1209
1217
|
return VxeUI.print({
|
|
1210
1218
|
title: opts.sheetName,
|
|
1211
|
-
html: content
|
|
1219
|
+
html: content,
|
|
1220
|
+
customStyle: opts.style,
|
|
1221
|
+
beforeMethod: beforePrintMethod
|
|
1222
|
+
? ({ html }) => {
|
|
1223
|
+
return beforePrintMethod({ html, content: html, options: opts, $table: $xeTable });
|
|
1224
|
+
}
|
|
1225
|
+
: undefined
|
|
1212
1226
|
});
|
|
1213
1227
|
}));
|
|
1214
1228
|
}
|
package/es/ui/index.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { VxeUI } from '@vxe-ui/core';
|
|
2
2
|
import { getFuncText } from './src/utils';
|
|
3
|
-
export const version = "4.7.
|
|
3
|
+
export const version = "4.7.27-beta.0";
|
|
4
4
|
VxeUI.version = version;
|
|
5
|
-
VxeUI.tableVersion = "4.7.
|
|
5
|
+
VxeUI.tableVersion = "4.7.27-beta.0";
|
|
6
6
|
VxeUI.setConfig({
|
|
7
7
|
emptyCell: ' ',
|
|
8
8
|
table: {
|
package/es/ui/src/log.js
CHANGED
package/lib/index.umd.js
CHANGED
|
@@ -1951,9 +1951,9 @@ function eqEmptyValue(cellValue) {
|
|
|
1951
1951
|
;// CONCATENATED MODULE: ./packages/ui/index.ts
|
|
1952
1952
|
|
|
1953
1953
|
|
|
1954
|
-
const version = "4.7.
|
|
1954
|
+
const version = "4.7.27-beta.0";
|
|
1955
1955
|
core_.VxeUI.version = version;
|
|
1956
|
-
core_.VxeUI.tableVersion = "4.7.
|
|
1956
|
+
core_.VxeUI.tableVersion = "4.7.27-beta.0";
|
|
1957
1957
|
core_.VxeUI.setConfig({
|
|
1958
1958
|
emptyCell: ' ',
|
|
1959
1959
|
table: {
|
|
@@ -2258,7 +2258,7 @@ var es_array_push = __webpack_require__(4114);
|
|
|
2258
2258
|
const {
|
|
2259
2259
|
log: log_log
|
|
2260
2260
|
} = core_.VxeUI;
|
|
2261
|
-
const log_version = `table v${"4.7.
|
|
2261
|
+
const log_version = `table v${"4.7.27-beta.0"}`;
|
|
2262
2262
|
const warnLog = log_log.create('warn', log_version);
|
|
2263
2263
|
const errLog = log_log.create('error', log_version);
|
|
2264
2264
|
;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
|
|
@@ -19403,12 +19403,25 @@ export_hook_hooks.add('tableExportModule', {
|
|
|
19403
19403
|
if (!opts.sheetName) {
|
|
19404
19404
|
opts.sheetName = document.title;
|
|
19405
19405
|
}
|
|
19406
|
+
const beforePrintMethod = opts.beforePrintMethod;
|
|
19407
|
+
const tableHtml = opts.html || opts.content;
|
|
19406
19408
|
return new Promise((resolve, reject) => {
|
|
19407
19409
|
if (core_.VxeUI.print) {
|
|
19408
|
-
if (
|
|
19410
|
+
if (tableHtml) {
|
|
19409
19411
|
resolve(core_.VxeUI.print({
|
|
19410
19412
|
title: opts.sheetName,
|
|
19411
|
-
html:
|
|
19413
|
+
html: tableHtml,
|
|
19414
|
+
customStyle: opts.style,
|
|
19415
|
+
beforeMethod: beforePrintMethod ? ({
|
|
19416
|
+
html
|
|
19417
|
+
}) => {
|
|
19418
|
+
return beforePrintMethod({
|
|
19419
|
+
html,
|
|
19420
|
+
content: html,
|
|
19421
|
+
options: opts,
|
|
19422
|
+
$table: $xeTable
|
|
19423
|
+
});
|
|
19424
|
+
} : undefined
|
|
19412
19425
|
}));
|
|
19413
19426
|
} else {
|
|
19414
19427
|
resolve(exportMethods.exportData(opts).then(({
|
|
@@ -19416,7 +19429,18 @@ export_hook_hooks.add('tableExportModule', {
|
|
|
19416
19429
|
}) => {
|
|
19417
19430
|
return core_.VxeUI.print({
|
|
19418
19431
|
title: opts.sheetName,
|
|
19419
|
-
html: content
|
|
19432
|
+
html: content,
|
|
19433
|
+
customStyle: opts.style,
|
|
19434
|
+
beforeMethod: beforePrintMethod ? ({
|
|
19435
|
+
html
|
|
19436
|
+
}) => {
|
|
19437
|
+
return beforePrintMethod({
|
|
19438
|
+
html,
|
|
19439
|
+
content: html,
|
|
19440
|
+
options: opts,
|
|
19441
|
+
$table: $xeTable
|
|
19442
|
+
});
|
|
19443
|
+
} : undefined
|
|
19420
19444
|
});
|
|
19421
19445
|
}));
|
|
19422
19446
|
}
|