zmdms-utils 0.0.38 → 0.0.40

package/dist/es/auth.d.ts

@@ -4,5 +4,6 @@
 declare function getToken(): string | null;
 declare function setToken(token: string): void;
 declare function removeToken(): void;
+declare function parseToken(token?: string): unknown;
 
-export { getToken, removeToken, setToken };
+export { getToken, parseToken, removeToken, setToken };

package/dist/es/auth.js

@@ -1,3 +1,5 @@
+import o from './node_modules/jwt-decode/build/jwt-decode.esm.js';
+
 /**
  * 权限相关
  */
@@ -26,5 +28,22 @@ function removeToken() {
         console.error("设置token失败", err);
     }
 }
+function parseToken(token) {
+    var t = token;
+    if (!t) {
+        t = getToken();
+    }
+    if (t) {
+        try {
+            return o(t);
+        }
+        catch (err) {
+            console.log("解析失败", err);
+            return null;
+        }
+    }
+    // 没有token
+    return null;
+}
 
-export { getToken, removeToken, setToken };
+export { getToken, parseToken, removeToken, setToken };

package/dist/es/node_modules/jwt-decode/build/jwt-decode.esm.js

@@ -0,0 +1,3 @@
+function e(e){this.message=e;}e.prototype=new Error,e.prototype.name="InvalidCharacterError";var r="undefined"!=typeof window&&window.atob&&window.atob.bind(window)||function(r){var t=String(r).replace(/=+$/,"");if(t.length%4==1)throw new e("'atob' failed: The string to be decoded is not correctly encoded.");for(var n,o,a=0,i=0,c="";o=t.charAt(i++);~o&&(n=a%4?64*n+o:o,a++%4)?c+=String.fromCharCode(255&n>>(-2*a&6)):0)o="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=".indexOf(o);return c};function t(e){var t=e.replace(/-/g,"+").replace(/_/g,"/");switch(t.length%4){case 0:break;case 2:t+="==";break;case 3:t+="=";break;default:throw "Illegal base64url string!"}try{return function(e){return decodeURIComponent(r(e).replace(/(.)/g,(function(e,r){var t=r.charCodeAt(0).toString(16).toUpperCase();return t.length<2&&(t="0"+t),"%"+t})))}(t)}catch(e){return r(t)}}function n(e){this.message=e;}function o(e,r){if("string"!=typeof e)throw new n("Invalid token specified");var o=!0===(r=r||{}).header?0:1;try{return JSON.parse(t(e.split(".")[o]))}catch(e){throw new n("Invalid token specified: "+e.message)}}n.prototype=new Error,n.prototype.name="InvalidTokenError";
+
+export { n as InvalidTokenError, o as default };

package/dist/es/water.d.ts

@@ -15,6 +15,7 @@ declare function mergeWaterConfig(waterConfig?: IWaterConfig): {
     rotate: number;
     zIndex: number;
     content: string | string[];
+    lineSpacing: number;
     font: {
         color: string | CanvasGradient | CanvasPattern;
         fontSize: number;
@@ -32,6 +33,7 @@ interface IWaterConfig {
     zIndex?: number;
     image?: string;
     content?: string | string[];
+    lineSpacing?: number;
     font?: {
         color?: CanvasFillStrokeStyles["fillStyle"];
         fontSize?: number;

package/dist/es/water.js

@@ -1,8 +1,11 @@
+import dayjs from 'dayjs';
+import { parseToken } from './auth.js';
+
 /**
  * 创建水印
  */
 function createWater(config) {
-    var _a = mergeWaterConfig(config), width = _a.width, height = _a.height, rotate = _a.rotate, content = _a.content, font = _a.font;
+    var _a = mergeWaterConfig(config), width = _a.width, height = _a.height, rotate = _a.rotate, content = _a.content, font = _a.font, lineSpacing = _a.lineSpacing;
     // 创建canvas元素
     var canvas = document.createElement("canvas");
     canvas.width = width * 2;
@@ -21,7 +24,7 @@ function createWater(config) {
             if (Array.isArray(textLines)) {
                 // 多行文本
                 textLines.forEach(function (line, index) {
-                    ctx.fillText(line, 0, index * font.fontSize);
+                    ctx.fillText(line, 0, index * (font.fontSize + lineSpacing));
                 });
             }
             else {
@@ -45,15 +48,17 @@ function createWater(config) {
  */
 function mergeWaterConfig(waterConfig) {
     var _a, _b, _c, _d, _e, _f;
+    var defaultContent = getDefaultContent();
     return {
         width: (waterConfig === null || waterConfig === void 0 ? void 0 : waterConfig.width) || 200,
-        height: (waterConfig === null || waterConfig === void 0 ? void 0 : waterConfig.height) || 60,
-        rotate: (waterConfig === null || waterConfig === void 0 ? void 0 : waterConfig.rotate) || -22,
+        height: (waterConfig === null || waterConfig === void 0 ? void 0 : waterConfig.height) || 200,
+        rotate: (waterConfig === null || waterConfig === void 0 ? void 0 : waterConfig.rotate) || -20,
         zIndex: (waterConfig === null || waterConfig === void 0 ? void 0 : waterConfig.zIndex) || 10,
-        content: (waterConfig === null || waterConfig === void 0 ? void 0 : waterConfig.content) || "交投集团",
+        content: (waterConfig === null || waterConfig === void 0 ? void 0 : waterConfig.content) || defaultContent,
+        lineSpacing: 4,
         font: {
-            color: ((_a = waterConfig === null || waterConfig === void 0 ? void 0 : waterConfig.font) === null || _a === void 0 ? void 0 : _a.color) || "rgba(0, 0, 0, 0.1)",
-            fontSize: ((_b = waterConfig === null || waterConfig === void 0 ? void 0 : waterConfig.font) === null || _b === void 0 ? void 0 : _b.fontSize) || 18,
+            color: ((_a = waterConfig === null || waterConfig === void 0 ? void 0 : waterConfig.font) === null || _a === void 0 ? void 0 : _a.color) || "rgba(0, 0, 0, 0.2)",
+            fontSize: ((_b = waterConfig === null || waterConfig === void 0 ? void 0 : waterConfig.font) === null || _b === void 0 ? void 0 : _b.fontSize) || 14,
             fontWeight: ((_c = waterConfig === null || waterConfig === void 0 ? void 0 : waterConfig.font) === null || _c === void 0 ? void 0 : _c.fontWeight) || "normal",
             fontStyle: ((_d = waterConfig === null || waterConfig === void 0 ? void 0 : waterConfig.font) === null || _d === void 0 ? void 0 : _d.fontStyle) || "normal",
             fontFamily: ((_e = waterConfig === null || waterConfig === void 0 ? void 0 : waterConfig.font) === null || _e === void 0 ? void 0 : _e.fontFamily) || "微软雅黑",
@@ -62,5 +67,15 @@ function mergeWaterConfig(waterConfig) {
         image: waterConfig === null || waterConfig === void 0 ? void 0 : waterConfig.image,
     };
 }
+function getDefaultContent() {
+    var jwtInfo = parseToken();
+    if (typeof jwtInfo === "object") {
+        var username = jwtInfo.real_name || jwtInfo.realName || "";
+        var phone = jwtInfo.phone || "";
+        var time = dayjs().format("YYMMDD");
+        return ["".concat(username, " ").concat(phone), time];
+    }
+    return "交投集团";
+}
 
 export { createWater, mergeWaterConfig };

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 export { initMicroApp } from './es/microAppCreator.js';
 export { isQiankun } from './es/qiankunUtils.js';
 export { initGlobalError, initMainApp } from './es/mainApp.js';
-export { getToken, removeToken, setToken } from './es/auth.js';
+export { getToken, parseToken, removeToken, setToken } from './es/auth.js';
 export { AxiosRequest, IOptions, IOtherOptions } from './es/request.js';
 export { getBaseUrl } from './es/baseUrl.js';
 export { Crypto, md5 } from './es/crypto.js';

package/dist/index.js

@@ -1,7 +1,7 @@
 export { initMicroApp } from './es/microAppCreator.js';
 export { isQiankun } from './es/qiankunUtils.js';
 export { initGlobalError, initMainApp } from './es/mainApp.js';
-export { getToken, removeToken, setToken } from './es/auth.js';
+export { getToken, parseToken, removeToken, setToken } from './es/auth.js';
 export { AxiosRequest } from './es/request.js';
 export { getBaseUrl } from './es/baseUrl.js';
 export { Crypto, md5 } from './es/crypto.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zmdms-utils",
-  "version": "0.0.38",
+  "version": "0.0.40",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -16,13 +16,14 @@
     "axios": "^1.4.0",
     "crypto-js": "^4.1.1",
     "dayjs": "^1.11.7",
-    "qiankun": "^2.10.8",
     "html2canvas": "^1.4.1",
     "jspdf": "^2.5.1",
-    "print-js": "^1.6.0"
+    "print-js": "^1.6.0",
+    "qiankun": "^2.10.8"
   },
   "dependencies": {
     "decimal.js": "^10.4.3",
+    "jwt-decode": "3.1.2",
     "mitt": "^3.0.0",
     "pinyin-pro": "^3.18.2"
   },

package/src/auth.ts

@@ -1,3 +1,5 @@
+import jwtDecode from "jwt-decode";
+
 /**
  * 权限相关
  */
@@ -25,3 +27,21 @@ export function removeToken() {
     console.error("设置token失败", err);
   }
 }
+
+export function parseToken(token?: string) {
+  let t: string | undefined | null = token;
+  if (!t) {
+    t = getToken();
+  }
+
+  if (t) {
+    try {
+      return jwtDecode(t);
+    } catch (err) {
+      console.log("解析失败", err);
+      return null;
+    }
+  }
+  // 没有token
+  return null;
+}

package/src/index.ts

@@ -1,7 +1,7 @@
 export { initMicroApp } from "./microAppCreator";
 export { isQiankun } from "./qiankunUtils";
 export { initMainApp, initGlobalError } from "./mainApp";
-export { getToken, setToken, removeToken } from "./auth";
+export { getToken, setToken, removeToken, parseToken } from "./auth";
 export { AxiosRequest, type IOtherOptions, type IOptions } from "./request";
 export { getBaseUrl } from "./baseUrl";
 export { Crypto, md5 } from "./crypto";

package/src/water.ts

@@ -1,8 +1,12 @@
+import dayjs from "dayjs";
+import { parseToken } from "./auth";
+
 /**
  * 创建水印
  */
 export function createWater(config: IWaterConfig) {
-  const { width, height, rotate, content, font } = mergeWaterConfig(config);
+  const { width, height, rotate, content, font, lineSpacing } =
+    mergeWaterConfig(config);
 
   // 创建canvas元素
   const canvas = document.createElement("canvas");
@@ -24,7 +28,7 @@ export function createWater(config: IWaterConfig) {
       if (Array.isArray(textLines)) {
         // 多行文本
         textLines.forEach((line, index) => {
-          ctx.fillText(line, 0, index * font.fontSize);
+          ctx.fillText(line, 0, index * (font.fontSize + lineSpacing));
         });
       } else {
         // 单行文本
@@ -50,15 +54,17 @@ export function createWater(config: IWaterConfig) {
  * 默认配置
  */
 export function mergeWaterConfig(waterConfig?: IWaterConfig) {
+  const defaultContent = getDefaultContent();
   return {
     width: waterConfig?.width || 200,
-    height: waterConfig?.height || 60,
-    rotate: waterConfig?.rotate || -22,
+    height: waterConfig?.height || 200,
+    rotate: waterConfig?.rotate || -20,
     zIndex: waterConfig?.zIndex || 10,
-    content: waterConfig?.content || "交投集团",
+    content: waterConfig?.content || defaultContent,
+    lineSpacing: 4,
     font: {
-      color: waterConfig?.font?.color || "rgba(0, 0, 0, 0.1)",
-      fontSize: waterConfig?.font?.fontSize || 18,
+      color: waterConfig?.font?.color || "rgba(0, 0, 0, 0.2)",
+      fontSize: waterConfig?.font?.fontSize || 14,
       fontWeight: waterConfig?.font?.fontWeight || "normal",
       fontStyle: waterConfig?.font?.fontStyle || "normal",
       fontFamily: waterConfig?.font?.fontFamily || "微软雅黑",
@@ -68,6 +74,17 @@ export function mergeWaterConfig(waterConfig?: IWaterConfig) {
   };
 }
 
+function getDefaultContent() {
+  const jwtInfo: any = parseToken();
+  if (typeof jwtInfo === "object") {
+    const username = jwtInfo.real_name || jwtInfo.realName || "";
+    const phone = jwtInfo.phone || "";
+    const time = dayjs().format("YYMMDD");
+    return [`${username} ${phone}`, time];
+  }
+  return "交投集团";
+}
+
 // 生成水印相关配置
 export interface IWaterConfig {
   // 水印宽度 120
@@ -82,6 +99,8 @@ export interface IWaterConfig {
   image?: string;
   // 文本水印内容
   content?: string | string[];
+  // 多行文本时，每行文本的间距
+  lineSpacing?: number;
   // 水印字体大小
   font?: {
     color?: CanvasFillStrokeStyles["fillStyle"];