zmdms-utils 0.0.43 → 0.0.45

package/dist/es/common.d.ts

@@ -73,5 +73,9 @@ declare function parseJoin(params?: any): any;
  * @returns
  */
 declare function isChinese(char?: string): boolean;
+/**
+ * 往地址后面追加参数
+ */
+declare function appendQueryParamsToUrl(url: string, params: any): string;
 
-export { addThousedSeparator, copyToClipboard, dangerouslyXss, delay, emitter, getFileExtension, isChinese, isImageExtension, isNonEmpty, parseJoin, parseQueryParams, specialString, unescapeString };
+export { addThousedSeparator, appendQueryParamsToUrl, copyToClipboard, dangerouslyXss, delay, emitter, getFileExtension, isChinese, isImageExtension, isNonEmpty, parseJoin, parseQueryParams, specialString, unescapeString };

package/dist/es/common.js

@@ -253,5 +253,22 @@ function isChinese(char) {
     }
     return isChineseValidate.regex.test(char);
 }
+/**
+ * 往地址后面追加参数
+ */
+function appendQueryParamsToUrl(url, params) {
+    // 检查 URL 中是否已经有查询字符串
+    var hasQuery = url.indexOf("?") !== -1;
+    var newUrl = url;
+    // 遍历参数并追加到 URL
+    Object.keys(params).forEach(function (key, index) {
+        // 对于第一个参数，如果 URL 已经有查询字符串，则追加 '&'
+        // 如果没有，则追加 '?'
+        var prefix = hasQuery || index > 0 ? "&" : "?";
+        newUrl +=
+            prefix + encodeURIComponent(key) + "=" + encodeURIComponent(params[key]);
+    });
+    return newUrl;
+}
 
-export { addThousedSeparator, copyToClipboard, dangerouslyXss, delay, emitter, getFileExtension, isChinese, isImageExtension, isNonEmpty, parseJoin, parseQueryParams, specialString, unescapeString };
+export { addThousedSeparator, appendQueryParamsToUrl, copyToClipboard, dangerouslyXss, delay, emitter, getFileExtension, isChinese, isImageExtension, isNonEmpty, parseJoin, parseQueryParams, specialString, unescapeString };

package/dist/es/qiankunUtils.d.ts

@@ -5,5 +5,9 @@
  * @description 环境判断
  */
 declare function isQiankun(): any;
+/**
+ * @description 取微应用地址
+ */
+declare function getMicroUrl(appKey: string, apps?: any): any;
 
-export { isQiankun };
+export { getMicroUrl, isQiankun };

package/dist/es/qiankunUtils.js

@@ -7,5 +7,26 @@
 function isQiankun() {
     return window.__POWERED_BY_QIANKUN__;
 }
+/**
+ * @description 取微应用地址
+ */
+function getMicroUrl(appKey, apps) {
+    var _a;
+    if (apps === void 0) { apps = []; }
+    var result = (_a = apps === null || apps === void 0 ? void 0 : apps.find) === null || _a === void 0 ? void 0 : _a.call(apps, function (app) { return (app === null || app === void 0 ? void 0 : app.appCode) === appKey; });
+    if (result && result.appUrl) {
+        try {
+            return result.appUrl.endsWith("/")
+                ? result.appUrl.slice(result.appUrl.length - 1)
+                : result.appUrl;
+        }
+        catch (err) {
+            console.log("未取到对应的微应用地址!");
+            return "";
+        }
+    }
+    console.log("未取到对应的微应用地址!");
+    return "";
+}
 
-export { isQiankun };
+export { getMicroUrl, isQiankun };

package/dist/es/water.js

@@ -72,6 +72,13 @@ function getDefaultContent() {
     if (typeof jwtInfo === "object" && jwtInfo != null) {
         var username = jwtInfo.real_name || jwtInfo.realName || "";
         var phone = jwtInfo.phone || "";
+        var phoneLen = phone.length;
+        if (phoneLen <= 4) {
+            phone = phone;
+        }
+        else {
+            phone = phone.slice(phoneLen - 4);
+        }
         var time = dayjs().format("YYMMDD");
         return ["".concat(username, " ").concat(phone), time];
     }

package/dist/index.d.ts

@@ -1,11 +1,11 @@
 export { initMicroApp } from './es/microAppCreator.js';
-export { isQiankun } from './es/qiankunUtils.js';
+export { getMicroUrl, isQiankun } from './es/qiankunUtils.js';
 export { initGlobalError, initMainApp } from './es/mainApp.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';
-export { addThousedSeparator, copyToClipboard, dangerouslyXss, delay, emitter, getFileExtension, isChinese, isImageExtension, isNonEmpty, parseJoin, parseQueryParams, specialString, unescapeString } from './es/common.js';
+export { addThousedSeparator, appendQueryParamsToUrl, copyToClipboard, dangerouslyXss, delay, emitter, getFileExtension, isChinese, isImageExtension, isNonEmpty, parseJoin, parseQueryParams, specialString, unescapeString } from './es/common.js';
 export { divide, exactRound, formatUnit, minus, plus, times } from './es/math.js';
 export { validatePassword } from './es/passwordValidate.js';
 export { emailValidate, idCardValidate, isChineseValidate, morePhoneValidate, phoneValidate, strLenValidate } from './es/validate.js';

package/dist/index.js

@@ -1,11 +1,11 @@
 export { initMicroApp } from './es/microAppCreator.js';
-export { isQiankun } from './es/qiankunUtils.js';
+export { getMicroUrl, isQiankun } from './es/qiankunUtils.js';
 export { initGlobalError, initMainApp } from './es/mainApp.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';
-export { addThousedSeparator, copyToClipboard, dangerouslyXss, delay, emitter, getFileExtension, isChinese, isImageExtension, isNonEmpty, parseJoin, parseQueryParams, specialString, unescapeString } from './es/common.js';
+export { addThousedSeparator, appendQueryParamsToUrl, copyToClipboard, dangerouslyXss, delay, emitter, getFileExtension, isChinese, isImageExtension, isNonEmpty, parseJoin, parseQueryParams, specialString, unescapeString } from './es/common.js';
 export { divide, exactRound, formatUnit, minus, plus, times } from './es/math.js';
 export { validatePassword } from './es/passwordValidate.js';
 export { emailValidate, idCardValidate, isChineseValidate, morePhoneValidate, phoneValidate, strLenValidate } from './es/validate.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zmdms-utils",
-  "version": "0.0.43",
+  "version": "0.0.45",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.js",

package/src/common.ts

@@ -263,3 +263,23 @@ export function isChinese(char?: string) {
   }
   return isChineseValidate.regex.test(char);
 }
+
+/**
+ * 往地址后面追加参数
+ */
+export function appendQueryParamsToUrl(url: string, params: any) {
+  // 检查 URL 中是否已经有查询字符串
+  const hasQuery = url.indexOf("?") !== -1;
+  let newUrl = url;
+
+  // 遍历参数并追加到 URL
+  Object.keys(params).forEach((key, index) => {
+    // 对于第一个参数，如果 URL 已经有查询字符串，则追加 '&'
+    // 如果没有，则追加 '?'
+    const prefix = hasQuery || index > 0 ? "&" : "?";
+    newUrl +=
+      prefix + encodeURIComponent(key) + "=" + encodeURIComponent(params[key]);
+  });
+
+  return newUrl;
+}

package/src/index.ts

@@ -1,5 +1,5 @@
 export { initMicroApp } from "./microAppCreator";
-export { isQiankun } from "./qiankunUtils";
+export { isQiankun, getMicroUrl } from "./qiankunUtils";
 export { initMainApp, initGlobalError } from "./mainApp";
 export { getToken, setToken, removeToken, parseToken } from "./auth";
 export { AxiosRequest, type IOtherOptions, type IOptions } from "./request";
@@ -10,6 +10,7 @@ export {
   emitter,
   addThousedSeparator,
   parseQueryParams,
+  appendQueryParamsToUrl,
   unescapeString,
   copyToClipboard,
   getFileExtension,

package/src/qiankunUtils.ts

@@ -8,3 +8,22 @@
 export function isQiankun() {
   return (window as any).__POWERED_BY_QIANKUN__;
 }
+
+/**
+ * @description 取微应用地址
+ */
+export function getMicroUrl(appKey: string, apps: any = []) {
+  const result = apps?.find?.((app: any) => app?.appCode === appKey);
+  if (result && result.appUrl) {
+    try {
+      return result.appUrl.endsWith("/")
+        ? result.appUrl.slice(result.appUrl.length - 1)
+        : result.appUrl;
+    } catch (err) {
+      console.log("未取到对应的微应用地址!");
+      return "";
+    }
+  }
+  console.log("未取到对应的微应用地址!");
+  return "";
+}

package/src/water.ts

@@ -78,7 +78,13 @@ export function getDefaultContent() {
   const jwtInfo: any = parseToken();
   if (typeof jwtInfo === "object" && jwtInfo != null) {
     const username = jwtInfo.real_name || jwtInfo.realName || "";
-    const phone = jwtInfo.phone || "";
+    let phone = jwtInfo.phone || "";
+    const phoneLen = phone.length;
+    if (phoneLen <= 4) {
+      phone = phone;
+    } else {
+      phone = phone.slice(phoneLen - 4);
+    }
     const time = dayjs().format("YYMMDD");
     return [`${username} ${phone}`, time];
   }