xctc-utils 1.6.3 → 1.6.5

package/README.md

@@ -39,12 +39,14 @@ useUtils.params.set( options:SetOptions )
 ```
 #### 获取参数
 ```
-/**
- * @param keys 需要截取地址栏参数键数组值，如： ['code','state']
- * @param cache 是否需要缓存地址栏数据： 不传或传空，则不做处理，session 临时缓存 local永久缓存
- * @param cacheKey 缓存数据的键 默认值 urlParamsData
- */
-useUtils.params.get( keys:string[],cache?:string,cacheKey?:string )
+interface GetOptions {
+    keys:string[],
+    cache?:string, // 是否需要缓存地址栏数据： 不传或传空，则不做处理，session 临时缓存 local永久缓存
+    cacheKey?:string, // 缓存数据的键 默认值 urlParamsData
+    key:string, // 参数加密 key
+    iv:string  // 参数加密 iv
+}
+useUtils.params.get( options:GetOptions )
 ```
 
 ###  AES 加密、解密处理函数集合

package/dist/params/index.d.ts

@@ -2,8 +2,8 @@ interface SetOptions {
     url: string;
     data: string;
     keyword: string;
-    key: string;
-    iv: string;
+    key?: string;
+    iv?: string;
 }
 export declare const set: (options: SetOptions) => string | undefined;
 /**
@@ -12,5 +12,12 @@ export declare const set: (options: SetOptions) => string | undefined;
  * @param cache 是否需要缓存地址栏数据： 不传或传空，则不做处理，session 临时缓存 local永久缓存
  * @param cacheKey 缓存数据的键 默认值 urlParamsData
  */
-export declare const get: (keys: string[], cache?: string, cacheKey?: string) => void;
+interface GetOptions {
+    keys: string[];
+    cache?: string;
+    cacheKey?: string;
+    key?: string;
+    iv?: string;
+}
+export declare const get: (options: GetOptions) => any;
 export {};

package/dist/params/index.js

@@ -25,13 +25,8 @@ var set = function (options) {
     return urlData;
 };
 exports.set = set;
-/**
- *
- * @param keys 需要截取地址栏参数键数组值
- * @param cache 是否需要缓存地址栏数据： 不传或传空，则不做处理，session 临时缓存 local永久缓存
- * @param cacheKey 缓存数据的键 默认值 urlParamsData
- */
-var get = function (keys, cache, cacheKey) {
+var get = function (options) {
+    var _a = options || {}, _b = _a.keys, keys = _b === void 0 ? [] : _b, _c = _a.cache, cache = _c === void 0 ? "" : _c, _d = _a.cacheKey, cacheKey = _d === void 0 ? "urlParamsData" : _d, _e = _a.key, key = _e === void 0 ? defaultKey : _e, _f = _a.iv, iv = _f === void 0 ? defaultIv : _f;
     var win = window;
     var loc = win.location;
     var search = loc.search;
@@ -55,7 +50,7 @@ var get = function (keys, cache, cacheKey) {
             urlItem = urlArr[i];
             if (urlItem === null || urlItem === void 0 ? void 0 : urlItem.includes(keyItem)) {
                 var dataStr = urlItem.substring(urlItem.indexOf(keyItem) + keyItem.length + 1);
-                var decryptStr = (0, crypto_1.decrypt)(dataStr);
+                var decryptStr = (0, crypto_1.decrypt)(dataStr, key, iv);
                 paramsData[keyItem] = {
                     data: getParamsObj(decryptStr),
                     str: dataStr
@@ -63,14 +58,13 @@ var get = function (keys, cache, cacheKey) {
             }
         }
     }
-    if (!cacheKey)
-        cacheKey = "urlParamsData";
     if (cache == "session") {
         (0, storage_1.useSessionStorage)(cacheKey, paramsData);
     }
     if (cache == "local") {
         (0, storage_1.useLocalStorage)(cacheKey, paramsData);
     }
+    return paramsData;
 };
 exports.get = get;
 var getParamsObj = function (objStr) {

package/dist/weixin/index.js

@@ -229,7 +229,7 @@ function envSDK() {
 exports.envSDK = envSDK;
 // 前往微信授权登录页面
 function getCode(appId, scope) {
-    params.get(['code', 'state'], "session");
+    params.get({ keys: ['code', 'state'], cache: "session" });
     if ((0, utils_1.weixinBrowser)()) {
         var id = "";
         if (weixinConfig['appId']) {

package/package.json

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