xctc-utils 1.6.6 → 1.6.8

package/README.md

@@ -175,7 +175,7 @@ useUtils.date.formatStrTime(str) // 返回时间戳 秒
 #### 计算当前富文本内容高度
 ```
 var option = {
-    id:"ueditor" , // 富文本DOM容器 id
+    id:"ueditor" , // 富文本DOM容器 id 默认不传
     content:"" , // ueditor  富文本内容
 }
 // 返回的富文本内容包含input dom元素，input元素的content-data-height属性计算富文本高度

package/dist/weixin/index.d.ts

@@ -8,6 +8,9 @@ interface configOption {
     cryptokey?: string;
     isPassLogin?: boolean;
     redirectUri?: string;
+    appIdKey?: string;
+    jsCodeKey?: string;
+    debuggerStatus?: boolean;
 }
 export declare function getUrlCode(config: configOption): void;
 export declare function envSDK(): any;
@@ -19,6 +22,8 @@ interface ShareConfig {
     jsApiList?: string[];
     openTagList?: string[];
     url?: string;
+    urlKey?: string;
+    appIdKey?: string;
 }
 export declare function configReady(config: ShareConfig): void;
 interface ShareOptions {

package/dist/weixin/index.js

@@ -49,7 +49,7 @@ function getUrlCode(config) {
     weixinConfig['codeKey'] = codeKey;
     weixinConfig['stateKey'] = stateKey;
     (0, index_1.useSessionStorage)("weixinConfig", weixinConfig);
-    var _b = weixinConfig.cryptoiv, cryptoiv = _b === void 0 ? "" : _b, _c = weixinConfig.cryptokey, cryptokey = _c === void 0 ? "" : _c;
+    var _b = weixinConfig.cryptoiv, cryptoiv = _b === void 0 ? defaultIv : _b, _c = weixinConfig.cryptokey, cryptokey = _c === void 0 ? defaultKey : _c, _d = weixinConfig.debuggerStatus, debuggerStatus = _d === void 0 ? false : _d;
     var search = loc.search; // ?code=0916SzFa1KH9TA0Ke7Ha1AQx6446SzFr&state=123
     initSdk(); // 加载微信sdk环境
     // 获取地址栏返回 code 参数值
@@ -57,18 +57,29 @@ function getUrlCode(config) {
     // 默认第一次通过链接进入系统，没有code和state
     var searchIndex = -1;
     var stateIndex = -1;
+    var msgStr = "";
     if (search) {
         searchIndex = search.indexOf("code=");
         stateIndex = search.indexOf("state=");
     }
+    // 本地未存储微信授权 code 值， 并且地址栏携带有 code 值 ，则先存储该值
+    if (!localCode && searchIndex != -1) {
+        params.get({ keys: ['code', 'state'], cache: "session", key: cryptokey, iv: cryptoiv });
+    }
     // 如果本地已经存储 微信授权返回的 code 值，证明用户在执行刷新操作，不再执行微信授权逻辑
     if (localCode && stateIndex == -1 && searchIndex == -1) {
+        if (debuggerStatus) {
+            alert("本地已经存储 code ，不再执行微信授权逻辑");
+        }
         return;
     }
     // 如果链接地址中带有code，证明执行微信授权登录，并返回授权所需的 code 参数
     if (searchIndex >= 0) {
         if (localCode) {
             // localCode 存在，用户已执行微信跳转链接，用户可能执行当前网页的刷新操作
+            if (debuggerStatus) {
+                alert("searchIndex 》 0 ，本地已经存储 code ，不再执行微信授权逻辑");
+            }
             return;
         }
         else {
@@ -76,6 +87,9 @@ function getUrlCode(config) {
             var urlParamsData = (0, index_1.getSessionStorage)("urlParamsData") || "";
             var codeData = ((_a = urlParamsData === null || urlParamsData === void 0 ? void 0 : urlParamsData.code) === null || _a === void 0 ? void 0 : _a.str) || ""; // 第一次进入系统为空
             if (codeData) {
+                if (debuggerStatus) {
+                    alert("地址栏携带code已完成本地存储 ，执行微信授权逻辑");
+                }
                 login(codeData);
             }
         }
@@ -84,9 +98,16 @@ function getUrlCode(config) {
     //  用户通过分享链接进入系统，此时含有 state 参数 ， 无code参数
     if (stateIndex >= 0) {
         // 将 state进行本地存储，存储完成后跳转到微信授权页面
+        if (debuggerStatus) {
+            alert("用户通过分享链接进入系统，无code参数 ，跳转到code授权页面");
+        }
         return getCode(); // 微信授权页面获取CODE
     }
-    if (!localCode && stateIndex == -1 && searchIndex == -1) {
+    //  && stateIndex == -1 && searchIndex == -1
+    if (!localCode && searchIndex == -1) {
+        if (debuggerStatus) {
+            alert("无本地code参数 ，跳转到code授权页面");
+        }
         return getCode();
     }
 }
@@ -103,7 +124,8 @@ function cryptoConfig(key, iv) {
 }
 // 执行微信登录
 function login(code) {
-    var appId = weixinConfig.appId, http = weixinConfig.http, stateKey = weixinConfig.stateKey, redirectUri = weixinConfig.redirectUri;
+    var _a;
+    var appId = weixinConfig.appId, http = weixinConfig.http, redirectUri = weixinConfig.redirectUri, _b = weixinConfig.appIdKey, appIdKey = _b === void 0 ? "app_id" : _b, _c = weixinConfig.jsCodeKey, jsCodeKey = _c === void 0 ? "js_code" : _c;
     if (!appId) {
         console.error("未正常传入微信公众号appId");
         return;
@@ -112,10 +134,10 @@ function login(code) {
         console.error("未获取到微信授权的code参数");
         return;
     }
-    var obj = {
-        "app_id": appId,
-        "js_code": code
-    };
+    var obj = (_a = {},
+        _a[appIdKey] = appId,
+        _a[jsCodeKey] = code,
+        _a);
     if (!http) {
         console.error("未正常传入微信授权登录http函数");
         return;
@@ -229,8 +251,6 @@ function envSDK() {
 exports.envSDK = envSDK;
 // 前往微信授权登录页面
 function getCode(appId, scope) {
-    var _a = weixinConfig.cryptoiv, cryptoiv = _a === void 0 ? defaultIv : _a, _b = weixinConfig.cryptokey, cryptokey = _b === void 0 ? defaultKey : _b;
-    params.get({ keys: ['code', 'state'], cache: "session", key: cryptokey, iv: cryptoiv });
     if ((0, utils_1.weixinBrowser)()) {
         var id = "";
         if (weixinConfig['appId']) {
@@ -275,23 +295,25 @@ var defaultOpenTagList = [
     "wx-open-audio"
 ];
 function configReady(config) {
-    if (!config['http'])
+    var _a;
+    var _b = config || {}, appId = _b.appId, url = _b.url, _c = _b.urlKey, urlKey = _c === void 0 ? "url" : _c, _d = _b.appIdKey, appIdKey = _d === void 0 ? "appId" : _d, cb = _b.cb, _e = _b.jsApiList, jsApiList = _e === void 0 ? [] : _e, _f = _b.openTagList, openTagList = _f === void 0 ? [] : _f, _g = _b.http, http = _g === void 0 ? "" : _g;
+    if (!http)
         return;
-    var url = loc.origin;
-    if (config['url']) {
-        url = config['url'];
+    var currentUrl = loc.origin;
+    if (url) {
+        currentUrl = url;
     }
-    var param = {
-        url: url,
-        appId: config.appId,
-    };
-    var jsApiList = defaultJsApiList;
-    var openTagList = defaultOpenTagList;
-    if (config && config['jsApiList'] && config.jsApiList.length) {
-        jsApiList = config.jsApiList;
+    var param = (_a = {},
+        _a[urlKey] = currentUrl,
+        _a[appIdKey] = appId,
+        _a);
+    var jsApiListData = defaultJsApiList;
+    var openTagListData = defaultOpenTagList;
+    if (jsApiList === null || jsApiList === void 0 ? void 0 : jsApiList.length) {
+        jsApiListData = jsApiListData;
     }
-    if (config && config['openTagList'] && config.openTagList.length) {
-        openTagList = config.openTagList;
+    if (openTagList === null || openTagList === void 0 ? void 0 : openTagList.length) {
+        openTagListData = openTagList;
     }
     config.http(param).then(function (res) {
         if (res.code == 0) {
@@ -303,8 +325,8 @@ function configReady(config) {
                 timestamp: data.timestamp,
                 nonceStr: data.noncestr,
                 signature: data.signature,
-                jsApiList: jsApiList,
-                openTagList: openTagList,
+                jsApiList: jsApiListData,
+                openTagList: openTagListData,
             });
             wx.ready(function (res) {
                 console.log("加载微信分享配置完成：", res);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xctc-utils",
-  "version": "1.6.6",
+  "version": "1.6.8",
   "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",