zmdms-utils 0.0.41 → 0.0.43
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
|
@@ -75,7 +75,7 @@ function getDefaultContent() {
|
|
|
75
75
|
var time = dayjs().format("YYMMDD");
|
|
76
76
|
return ["".concat(username, " ").concat(phone), time];
|
|
77
77
|
}
|
|
78
|
-
return "
|
|
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,7 +74,7 @@ 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
79
|
if (typeof jwtInfo === "object" && jwtInfo != null) {
|
|
80
80
|
const username = jwtInfo.real_name || jwtInfo.realName || "";
|
|
@@ -82,7 +82,7 @@ function getDefaultContent() {
|
|
|
82
82
|
const time = dayjs().format("YYMMDD");
|
|
83
83
|
return [`${username} ${phone}`, time];
|
|
84
84
|
}
|
|
85
|
-
return "
|
|
85
|
+
return "浙江交通集团";
|
|
86
86
|
}
|
|
87
87
|
|
|
88
88
|
// 生成水印相关配置
|