xctc-utils 1.1.7 → 1.2.0

package/README.md

@@ -3,6 +3,7 @@
 #### 安装 npm i xctc-utils
 #### 项目中引入 import utils from "xctc-utils"
 
+
 #### LocalStorage使用，存取值时数据已经过处理
 ```
 

package/dist/crypto/index.js

@@ -1,36 +1,16 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.decrypt = exports.encrypt = void 0;
-var CryptoJS = __importStar(require("crypto-js"));
+var crypto_js_1 = __importDefault(require("crypto-js"));
 var utils_1 = require("../utils");
 function formatVal(val) {
     var key = "5uMz4R8r0926DkC8";
     if (val)
         key = val;
-    return CryptoJS.enc.Utf8.parse(key);
+    return crypto_js_1.default.enc.Utf8.parse(key);
 }
 // 加密
 function encrypt(word, key, iv) {
@@ -39,10 +19,10 @@ function encrypt(word, key, iv) {
     }
     // key  //十六位十六进制数作为密钥
     // iv 十六位十六进制数作为密钥偏移量
-    var src = CryptoJS.enc.Utf8.parse(word);
+    var src = crypto_js_1.default.enc.Utf8.parse(word);
     key = formatVal(key);
     iv = formatVal(iv);
-    var encrypted = CryptoJS.AES.encrypt(src, key, { iv: iv, mode: CryptoJS.mode.CBC, padding: CryptoJS.pad.Pkcs7 });
+    var encrypted = crypto_js_1.default.AES.encrypt(src, key, { iv: iv, mode: crypto_js_1.default.mode.CBC, padding: crypto_js_1.default.pad.Pkcs7 });
     return encrypted.ciphertext.toString().toUpperCase();
 }
 exports.encrypt = encrypt;
@@ -51,10 +31,10 @@ exports.encrypt = encrypt;
 function decrypt(word, key, iv) {
     key = formatVal(key);
     iv = formatVal(iv);
-    var encryptedHexStr = CryptoJS.enc.Hex.parse(word);
-    var src = CryptoJS.enc.Base64.stringify(encryptedHexStr);
-    var decrypt = CryptoJS.AES.decrypt(src, key, { iv: iv, mode: CryptoJS.mode.CBC, padding: CryptoJS.pad.Pkcs7 });
-    var decryptedStr = decrypt.toString(CryptoJS.enc.Utf8);
+    var encryptedHexStr = crypto_js_1.default.enc.Hex.parse(word);
+    var src = crypto_js_1.default.enc.Base64.stringify(encryptedHexStr);
+    var decrypt = crypto_js_1.default.AES.decrypt(src, key, { iv: iv, mode: crypto_js_1.default.mode.CBC, padding: crypto_js_1.default.pad.Pkcs7 });
+    var decryptedStr = decrypt.toString(crypto_js_1.default.enc.Utf8);
     var data = decryptedStr.toString();
     if ((0, utils_1.isJson)(data)) {
         return JSON.parse(data);

package/dist/time/index.d.ts

@@ -11,4 +11,4 @@ export declare function formatTimeStamp(num?: number, format?: string): string;
  * @param str 字符串格式必须为： 2017/03/03 12:23:55 格式，避免兼容性，不能传 “ - ” 分割的时间字符串 2017-03-03
  * @returns
  */
-export declare function formatStrTime(str: string): number;
+export declare function formatStrTime(str: string): number | undefined;

package/dist/time/index.js

@@ -68,6 +68,8 @@ function isExist(str, key) {
  * @returns
  */
 function formatStrTime(str) {
+    if (!str)
+        return;
     var timestamp = new Date(str).getTime();
     timestamp = timestamp / 1000;
     return parseInt(timestamp);

package/dist/weixin/index.js

@@ -13,15 +13,19 @@ var defaultIv = "5uMz4Rsd0926DkC8";
 var weixinConfig = {};
 function weixinUrlCode(config) {
     weixinConfig = config || {};
+    (0, index_1.useSessionStorage)("weixinConfig", weixinConfig);
     var cryptoiv = weixinConfig.cryptoiv, cryptokey = weixinConfig.cryptokey;
     var search = loc.search; // ?code=0916SzFa1KH9TA0Ke7Ha1AQx6446SzFr&state=123
     // 获取地址栏返回 code 参数
     var codeKey = weixinConfig['codeKey'];
+    if (!codeKey)
+        codeKey = "weixinCode";
     var localCode = "";
     if (codeKey)
         localCode = (0, index_1.getSessionStorage)(codeKey);
     if (!localCode && search && search.indexOf("code=") != -1) {
         // localCode 不存在， 微信链接中存在 code 用户初次登录系统，
+        // 用户从微信授权页面跳转回来，地址中携带code参数
         var urlArr = formatSearch(search, "code=");
         var code = "";
         for (var k = 0; k < urlArr.length; k++) {
@@ -32,7 +36,9 @@ function weixinUrlCode(config) {
                     (0, index_1.useSessionStorage)(codeKey, code);
             }
         }
-        weixinLogin(code);
+        if (code) {
+            weixinLogin(code);
+        }
     }
     else if (localCode) {
         // localCode 存在，用户已执行微信跳转链接，执行刷新操作
@@ -55,7 +61,7 @@ function weixinUrlCode(config) {
                 }
             }
         }
-        // 将进入系统所携带的state参数传到微信登录链接，微信跳转登录后原样返回
+        // 将 state进行本地存储，存储完成后跳转到微信授权页面
         weixinCode(); // 微信授权页面获取CODE
     }
 }
@@ -72,7 +78,7 @@ function cryptoConfig(key, iv) {
 }
 // 执行微信登录
 function weixinLogin(code) {
-    var cryptoiv = weixinConfig.cryptoiv, cryptokey = weixinConfig.cryptokey, appId = weixinConfig.appId, http = weixinConfig.http, stateKey = weixinConfig.stateKey;
+    var appId = weixinConfig.appId, http = weixinConfig.http, stateKey = weixinConfig.stateKey;
     if (!appId)
         return;
     var obj = {
@@ -86,7 +92,13 @@ function weixinLogin(code) {
             // 未登录则先执行登录
             return weixinCode();
         }
-        var data = res.data;
+        var data = res === null || res === void 0 ? void 0 : res.data;
+        if (data instanceof Object) {
+            (0, index_1.useSessionStorage)("weixinLoginData", JSON.stringify(data));
+        }
+        else {
+            (0, index_1.useSessionStorage)("weixinLoginStatus", "\u5FAE\u4FE1\u767B\u5F55\u5931\u8D25\uFF1A".concat(res.code, "\uFF1B").concat(res.msg));
+        }
         for (var key in data) {
             var item = data[key];
             if (item instanceof Object) {
@@ -95,8 +107,10 @@ function weixinLogin(code) {
             (0, index_1.useSessionStorage)(key, item);
         }
         var url = loc.origin;
+        var hashVal = loc.hash;
         var state = (0, index_1.getSessionStorage)(stateKey);
         var str = "";
+        (0, index_1.useSessionStorage)("getWeixinSessionState", state);
         if (state) {
             var stateObj = (0, index_1.getSessionStorage)("".concat(stateKey, "Obj"));
             for (var key in stateObj) {
@@ -120,6 +134,7 @@ function weixinLogin(code) {
             loc.replace(url);
         }
         else {
+            url = "".concat(url, "/").concat(hashVal);
             loc.replace(url);
         }
     });
@@ -167,6 +182,11 @@ function weixinCode() {
         console.log("非微信内核浏览器执行其他业务");
     }
 }
+var defaultJsApiList = [
+    'updateAppMessageShareData', 'updateTimelineShareData', "onMenuShareWeibo", "onMenuShareQZone", "startRecord", "stopRecord", "closeWindow", "scanQRCode", "chooseWXPay", "chooseCard", "openCard",
+    "onVoiceRecordEnd", "playVoice", "pauseVoice", "stopVoice", "onVoicePlayEnd", "uploadVoice", "downloadVoice", "chooseImage", "previewImage", "uploadImage", "openProductSpecificView", "addCard",
+    "downloadImage", "translateVoice", "getNetworkType", "openLocation", "getLocation", "hideOptionMenu", "showOptionMenu", "hideMenuItems", "showMenuItems", "hideAllNonBaseMenuItem", "showAllNonBaseMenuItem",
+];
 function weixinShareConfig(config) {
     var _a;
     if (!(config === null || config === void 0 ? void 0 : config.http))
@@ -177,11 +197,12 @@ function weixinShareConfig(config) {
         appId: config.appId,
     };
     var jsApiList = defaultJsApiList;
-    if ((_a = config.jsApiList) === null || _a === void 0 ? void 0 : _a.length)
+    if ((_a = config === null || config === void 0 ? void 0 : config.jsApiList) === null || _a === void 0 ? void 0 : _a.length)
         jsApiList = config.jsApiList;
     config.http(param).then(function (res) {
+        var _a;
         if (res.code == 0) {
-            var data = res.data;
+            var data = (_a = res === null || res === void 0 ? void 0 : res.data) !== null && _a !== void 0 ? _a : {};
             var wx = weixinInit();
             wx.config({
                 debug: false,
@@ -193,21 +214,17 @@ function weixinShareConfig(config) {
             });
             wx.ready(function (res) {
                 console.log("加载微信分享配置完成：", res);
+                (0, index_1.useSessionStorage)("weixinShareConfigSuccess", "\u52A0\u8F7D\u5FAE\u4FE1\u5206\u4EAB\u914D\u7F6E\u5B8C\u6210\uFF1A".concat(res));
                 if ((config === null || config === void 0 ? void 0 : config.cb) && typeof config.cb === "function")
                     config.cb();
             });
             wx.error(function (err) {
-                console.log("加载微信分享配置错误：", err);
+                (0, index_1.useSessionStorage)("weixinShareConfigError", "\u52A0\u8F7D\u5FAE\u4FE1\u5206\u4EAB\u914D\u7F6E\u9519\u8BEF\uFF1A".concat(err));
             });
         }
     });
 }
 exports.weixinShareConfig = weixinShareConfig;
-var defaultJsApiList = [
-    'updateAppMessageShareData', 'updateTimelineShareData', "onMenuShareWeibo", "onMenuShareQZone", "startRecord", "stopRecord", "closeWindow", "scanQRCode", "chooseWXPay", "chooseCard", "openCard",
-    "onVoiceRecordEnd", "playVoice", "pauseVoice", "stopVoice", "onVoicePlayEnd", "uploadVoice", "downloadVoice", "chooseImage", "previewImage", "uploadImage", "openProductSpecificView", "addCard",
-    "downloadImage", "translateVoice", "getNetworkType", "openLocation", "getLocation", "hideOptionMenu", "showOptionMenu", "hideMenuItems", "showMenuItems", "hideAllNonBaseMenuItem", "showAllNonBaseMenuItem",
-];
 function weixinShareInit(options) {
     var title = "微信分享";
     if (options === null || options === void 0 ? void 0 : options.title)
@@ -230,9 +247,9 @@ function weixinShareInit(options) {
         }
     }
     var wx = weixinInit();
-    // console.log("shareUrl===",link)
-    (0, index_1.useSessionStorage)("shareUrl", link);
+    (0, index_1.useSessionStorage)("weixinShareUrl", link);
     wx.ready(function () {
+        (0, index_1.useSessionStorage)("weixinShareInit", "success");
         //需在用户可能点击分享按钮前就先调用
         wx.updateAppMessageShareData({
             title: title,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xctc-utils",
-  "version": "1.1.7",
+  "version": "1.2.0",
   "description": "localStorage存储\r ```\r sessionStorage存储\r ```\r crypto-js加密、解密\r ```\r 微信授权登录、微信分享\r ```\r 设备环境获取\r ```\r 是否是微信浏览器\r ```\r 时间戳转时间，字符串转时间戳",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -12,6 +12,7 @@
   "author": "",
   "license": "ISC",
   "devDependencies": {
+    "@types/crypto-js": "^4.1.1",
     "@types/node": "^18.11.19",
     "ts-node": "^10.9.1",
     "typescript": "^4.9.5"
@@ -24,5 +25,13 @@
     "type": "git",
     "url": "git@gitee.com:npm-management/xctc-utils.git"
   },
-  "keywords": [ "localStorage","sessionStorage","crypto-js","微信授权登录","weixin-js-sdk","微信H5","时间戳时间字符串互转" ]
+  "keywords": [
+    "localStorage",
+    "sessionStorage",
+    "crypto-js",
+    "微信授权登录",
+    "weixin-js-sdk",
+    "微信H5",
+    "时间戳时间字符串互转"
+  ]
 }