xctc-utils 1.6.24 → 1.6.26

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.urlStateParams = exports.get = exports.set = void 0;
4
4
  var crypto_1 = require("../crypto");
5
5
  var storage_1 = require("../storage");
6
- var defaultKey = "5uMz4R8rop26DkC8";
7
- var defaultIv = "5uMz4Rsd0926DkC8";
6
+ var defaultKey = "5uMz4R8r0926DkC8";
7
+ var defaultIv = "5uMz4R8r0926DkC8";
8
8
  var is_1 = require("../is");
9
9
  var win = window;
10
10
  var loc = win.location;
@@ -83,7 +83,7 @@ var get = function (options) {
83
83
  exports.get = get;
84
84
  var getParamsObj = function (objStr) {
85
85
  var objData = {};
86
- if (objStr === null || objStr === void 0 ? void 0 : objStr.includes("=")) {
86
+ if ((0, is_1.isString)(objStr) && (objStr === null || objStr === void 0 ? void 0 : objStr.includes("="))) {
87
87
  var objArr = objStr.split("&");
88
88
  for (var k = 0; k < objArr.length; k++) {
89
89
  var item = objArr[k];
@@ -93,6 +93,9 @@ var getParamsObj = function (objStr) {
93
93
  }
94
94
  }
95
95
  }
96
+ else {
97
+ objData = objStr;
98
+ }
96
99
  return objData;
97
100
  };
98
101
  var urlStateParams = function (cacheKey, key, iv) {
@@ -116,9 +119,7 @@ var urlStateParams = function (cacheKey, key, iv) {
116
119
  var keys = item.substring(0, indexVal);
117
120
  keys = keys[0].toUpperCase() + keys.substring(1);
118
121
  var val = item.substring(indexVal + 1);
119
- console.log("urlStateParams-val=", val);
120
122
  var data = (0, crypto_1.decrypt)(val, key, iv);
121
- console.log("urlStateParams-item=", data);
122
123
  // data 格式为 "path=/user/user-login&id=1"
123
124
  (0, storage_1.useSessionStorage)(cacheKey, { state: { str: val, data: getParamsObj(data) } });
124
125
  }
@@ -33,8 +33,8 @@ var is_1 = require("../is");
33
33
  var index_1 = require("../storage/index");
34
34
  var w = window;
35
35
  var loc = w.location;
36
- var defaultKey = "5uMz4R8rop26DkC8";
37
- var defaultIv = "5uMz4Rsd0926DkC8";
36
+ var defaultKey = "5uMz4R8r0926DkC8";
37
+ var defaultIv = "5uMz4R8r0926DkC8";
38
38
  var weixinConfig = {};
39
39
  function getUrlCode(config) {
40
40
  var _a;
@@ -216,7 +216,7 @@ function login(code) {
216
216
  }
217
217
  }
218
218
  }
219
- else {
219
+ else if (hashVal) {
220
220
  url = "".concat(url, "/").concat(hashVal);
221
221
  }
222
222
  if (weixinConfig['isPassLogin']) {
@@ -321,7 +321,7 @@ var isContinue = function () {
321
321
  if (search) {
322
322
  codeIndex = search.indexOf("code=");
323
323
  }
324
- if (localCodeData && localCodeData.hasOwnProperty("code") && codeIndex == -1) {
324
+ if (localCodeData && localCodeData.hasOwnProperty("code")) {
325
325
  return true;
326
326
  }
327
327
  else {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "xctc-utils",
3
- "version": "1.6.24",
3
+ "version": "1.6.26",
4
4
  "description": "localStorage存储\r ```\r sessionStorage存储\r ```\r crypto-js加密、解密\r ```\r 微信授权登录、微信分享\r ```\r 设备环境获取\r ```\r 是否是微信浏览器\r ```\r 时间戳转时间,字符串转时间戳",
5
5
  "main": "./dist/index.js",
6
6
  "types": "./dist/index.d.ts",