zmdms-utils 0.0.40 → 0.0.42
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/dist/es/water.d.ts +2 -1
- package/dist/es/water.js +2 -2
- package/dist/index.d.ts +1 -1
- package/dist/index.js +1 -1
- package/package.json +1 -1
- package/src/index.ts +1 -1
- package/src/water.ts +2 -2
package/dist/es/water.d.ts
CHANGED
|
@@ -26,6 +26,7 @@ declare function mergeWaterConfig(waterConfig?: IWaterConfig): {
|
|
|
26
26
|
};
|
|
27
27
|
image: string | undefined;
|
|
28
28
|
};
|
|
29
|
+
declare function getDefaultContent(): string[] | "交投集团";
|
|
29
30
|
interface IWaterConfig {
|
|
30
31
|
width?: number;
|
|
31
32
|
height?: number;
|
|
@@ -49,4 +50,4 @@ interface IWaterResult {
|
|
|
49
50
|
height: number;
|
|
50
51
|
}
|
|
51
52
|
|
|
52
|
-
export { IWaterConfig, IWaterResult, createWater, mergeWaterConfig };
|
|
53
|
+
export { IWaterConfig, IWaterResult, createWater, getDefaultContent, mergeWaterConfig };
|
package/dist/es/water.js
CHANGED
|
@@ -69,7 +69,7 @@ function mergeWaterConfig(waterConfig) {
|
|
|
69
69
|
}
|
|
70
70
|
function getDefaultContent() {
|
|
71
71
|
var jwtInfo = parseToken();
|
|
72
|
-
if (typeof jwtInfo === "object") {
|
|
72
|
+
if (typeof jwtInfo === "object" && jwtInfo != null) {
|
|
73
73
|
var username = jwtInfo.real_name || jwtInfo.realName || "";
|
|
74
74
|
var phone = jwtInfo.phone || "";
|
|
75
75
|
var time = dayjs().format("YYMMDD");
|
|
@@ -78,4 +78,4 @@ function getDefaultContent() {
|
|
|
78
78
|
return "交投集团";
|
|
79
79
|
}
|
|
80
80
|
|
|
81
|
-
export { createWater, mergeWaterConfig };
|
|
81
|
+
export { createWater, getDefaultContent, mergeWaterConfig };
|
package/dist/index.d.ts
CHANGED
|
@@ -16,4 +16,4 @@ export { convert, html, match, pinyin } from 'pinyin-pro';
|
|
|
16
16
|
export { domToCanvas } from './es/canvas.js';
|
|
17
17
|
export { imgToPdf } from './es/pdf.js';
|
|
18
18
|
export { htmlPrint, imgPrint, pdfPrint, windowPrint } from './es/print.js';
|
|
19
|
-
export { createWater, mergeWaterConfig } from './es/water.js';
|
|
19
|
+
export { createWater, getDefaultContent, mergeWaterConfig } from './es/water.js';
|
package/dist/index.js
CHANGED
|
@@ -16,4 +16,4 @@ export { convert, html, match, pinyin } from './es/node_modules/pinyin-pro/dist/
|
|
|
16
16
|
export { domToCanvas } from './es/canvas.js';
|
|
17
17
|
export { imgToPdf } from './es/pdf.js';
|
|
18
18
|
export { htmlPrint, imgPrint, pdfPrint, windowPrint } from './es/print.js';
|
|
19
|
-
export { createWater, mergeWaterConfig } from './es/water.js';
|
|
19
|
+
export { createWater, getDefaultContent, mergeWaterConfig } from './es/water.js';
|
package/package.json
CHANGED
package/src/index.ts
CHANGED
package/src/water.ts
CHANGED
|
@@ -74,9 +74,9 @@ export function mergeWaterConfig(waterConfig?: IWaterConfig) {
|
|
|
74
74
|
};
|
|
75
75
|
}
|
|
76
76
|
|
|
77
|
-
function getDefaultContent() {
|
|
77
|
+
export function getDefaultContent() {
|
|
78
78
|
const jwtInfo: any = parseToken();
|
|
79
|
-
if (typeof jwtInfo === "object") {
|
|
79
|
+
if (typeof jwtInfo === "object" && jwtInfo != null) {
|
|
80
80
|
const username = jwtInfo.real_name || jwtInfo.realName || "";
|
|
81
81
|
const phone = jwtInfo.phone || "";
|
|
82
82
|
const time = dayjs().format("YYMMDD");
|