xctc-utils 1.6.29 → 1.6.30

package/dist/iframe/index.d.ts

@@ -0,0 +1,5 @@
+export declare const $iframe: (id: string) => any;
+export declare const initParentDataToIframe: (id: string, keys?: string) => void;
+export declare const updateIframeReceiveData: (cb: any) => void;
+export declare const updateWeiXinShareReady: () => void;
+export declare const sendParentMessage: (data: any, url: string) => void;

package/dist/iframe/index.js

@@ -0,0 +1,79 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.sendParentMessage = exports.updateWeiXinShareReady = exports.updateIframeReceiveData = exports.initParentDataToIframe = exports.$iframe = void 0;
+var is_1 = require("../is");
+var weixin_1 = require("../weixin");
+var utils_1 = require("../utils");
+var storage_1 = require("../storage");
+/**
+ *
+ * @param id
+ * @returns
+ */
+var win = window;
+var $iframe = function (id) {
+    if (!id) {
+        console.error("请传入 iframe id属性值！");
+        return;
+    }
+    var iframe = (0, utils_1.$id)(id) || {};
+    if ((iframe === null || iframe === void 0 ? void 0 : iframe.tagName) === 'IFRAME') {
+        return iframe;
+    }
+    else {
+        console.error("\u672A\u67E5\u8BE2\u5230id=".concat(id, "\u7684iframe\u6807\u7B7E"));
+    }
+    return;
+};
+exports.$iframe = $iframe;
+var initParentDataToIframe = function (id, keys) {
+    var _a;
+    if (!id) {
+        console.error("请传入 iframe id属性值！");
+        return;
+    }
+    if (!keys) {
+        keys = "urlParamsData";
+    }
+    var iframe = (0, exports.$iframe)(id);
+    var stateData = (0, storage_1.getSessionStorage)(keys) || {};
+    var data = {};
+    if ((_a = stateData === null || stateData === void 0 ? void 0 : stateData.state) === null || _a === void 0 ? void 0 : _a.data) {
+        data = stateData.state.data || {};
+    }
+    data = JSON.stringify(data);
+    iframe.addEventListener('load', function () {
+        // iFrame加载完成后的操作
+        iframe.contentWindow.postMessage(data, iframe.src);
+    });
+};
+exports.initParentDataToIframe = initParentDataToIframe;
+var updateIframeReceiveData = function (cb) {
+    win.addEventListener('updateIframeData', function (event) {
+        var data = (event === null || event === void 0 ? void 0 : event.data) || {};
+        if (typeof cb === "function") {
+            cb((0, utils_1.isJson)(data));
+        }
+    });
+};
+exports.updateIframeReceiveData = updateIframeReceiveData;
+var updateWeiXinShareReady = function () {
+    win.addEventListener('updateWeiXinShareReady', function (event) {
+        var data = event.data;
+        var shareData = (0, utils_1.isJson)(data) || "";
+        if (shareData) {
+            alert("已获取到iframe触发的微信分享新配置数据");
+            (0, weixin_1.shareReady)(shareData);
+        }
+    });
+};
+exports.updateWeiXinShareReady = updateWeiXinShareReady;
+var sendParentMessage = function (data, url) {
+    if (!url) {
+        url = "*";
+    }
+    if ((0, is_1.isObject)(data)) {
+        win.parent.postMessage(JSON.stringify(data), url);
+    }
+};
+exports.sendParentMessage = sendParentMessage;

package/dist/index.js

@@ -43,5 +43,6 @@ var format = __importStar(require("./format"));
 var isType = __importStar(require("./is"));
 var modal = __importStar(require("./modal"));
 var params = __importStar(require("./params"));
-var obj = __assign(__assign(__assign({}, storage), utils), { weixin: __assign({}, weixin), crypto: __assign({}, crypto), date: __assign({}, time), format: __assign({}, format), type: __assign({}, isType), modal: __assign({}, modal), params: __assign({}, params) });
+var iframe = __importStar(require("./iframe"));
+var obj = __assign(__assign(__assign({}, storage), utils), { weixin: __assign({}, weixin), crypto: __assign({}, crypto), date: __assign({}, time), format: __assign({}, format), type: __assign({}, isType), modal: __assign({}, modal), params: __assign({}, params), iframe: __assign({}, iframe) });
 exports.default = obj;

package/dist/utils.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleCopyValue = exports.weixinBrowser = exports.deviceEnvironment = exports.getIframeContentHeight = exports.checkIframeContentHeight = exports.$id = exports.isJson = exports.isMobile = void 0;
+var is_1 = require("./is");
 var win = window;
 // 是否是手机端环境
 function isMobile() {
@@ -15,8 +16,14 @@ exports.isMobile = isMobile;
  * @returns
  */
 function isJson(str) {
-    if (!str)
+    if (!str) {
+        console.error("isJson函数接收参数为json对象字符串！");
         return false;
+    }
+    if ((0, is_1.isObject)(str)) {
+        // 如果传入的参数为对象，则直接返回
+        return str;
+    }
     try {
         var obj = JSON.parse(str);
         if (obj && typeof obj == "object") {

package/dist/weixin/index.js

@@ -321,7 +321,8 @@ var isContinue = function () {
     if (search) {
         codeIndex = search.indexOf("code=");
     }
-    if (localCodeData && localCodeData.hasOwnProperty("code")) {
+    // 必须是已经存储微信授权 code ，并且链接中已无 code 字段，已完成刷新状态
+    if (localCodeData && localCodeData.hasOwnProperty("code") && codeIndex == -1) {
         return true;
     }
     else {

package/package.json

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