xctc-utils 1.6.5 → 1.6.7

package/README.md

@@ -25,15 +25,15 @@ all:boolean 为true时删除调用方法的所有缓存，否则只删除当前
 删除永久缓存： useUtils.removeLocalStorage(key,all)
 ```
 
-### 地址栏参数处理
+### 地址栏参数处理 
 #### 设置参数
 ```
 interface SetOptions {
     url:string, // 完整的 url 地址
     data:string, // 具体需要拼接在地址参数
     keyword:string, // 地址栏参数 key 值
-    key:string, // 参数加密 key
-    iv:string  // 参数加密 iv
+    key?:string, // 参数加密 key
+    iv?:string  // 参数加密 iv
 }
 useUtils.params.set( options:SetOptions )
 ```
@@ -43,8 +43,8 @@ interface GetOptions {
     keys:string[],
     cache?:string, // 是否需要缓存地址栏数据： 不传或传空，则不做处理，session 临时缓存 local永久缓存
     cacheKey?:string, // 缓存数据的键 默认值 urlParamsData
-    key:string, // 参数加密 key
-    iv:string  // 参数加密 iv
+    key?:string, // 参数解密 key 必须与设置参数 key 一致
+    iv?:string  // 参数解密 iv 必须与设置参数 iv 一致
 }
 useUtils.params.get( options:GetOptions )
 ```
@@ -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,8 @@ interface configOption {
     cryptokey?: string;
     isPassLogin?: boolean;
     redirectUri?: string;
+    appIdKey?: string;
+    jsCodeKey?: string;
 }
 export declare function getUrlCode(config: configOption): void;
 export declare function envSDK(): any;
@@ -19,6 +21,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

@@ -103,7 +103,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 +113,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;
@@ -123,7 +124,7 @@ function login(code) {
     (0, index_1.useSessionStorage)("loginParams", JSON.stringify(obj));
     // 调试字段 isPassLogin ，为true 时不继续执行微信登录，前端可拿到 code 给后端测试
     // if(weixinConfig['isPassLogin']) return
-    weixinConfig.http(obj).then(function (res) {
+    weixinConfig === null || weixinConfig === void 0 ? void 0 : weixinConfig.http(obj).then(function (res) {
         var _a;
         (0, index_1.useSessionStorage)("loginRes", res);
         if (res.code == 40163) {
@@ -229,7 +230,8 @@ function envSDK() {
 exports.envSDK = envSDK;
 // 前往微信授权登录页面
 function getCode(appId, scope) {
-    params.get({ keys: ['code', 'state'], cache: "session" });
+    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']) {
@@ -274,23 +276,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) {
@@ -302,8 +306,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.5",
+  "version": "1.6.7",
   "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",