xctc-utils 1.6.45 → 1.6.47

package/dist/iframe/index.d.ts

@@ -33,4 +33,3 @@ export declare const updateParentToIframeData: (cb: any) => void;
  * @returns
  */
 export declare const iframeSendToParentData: (data: any, url: string) => void;
-export declare const updateWeiXinShareReady: () => void;

package/dist/iframe/index.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateWeiXinShareReady = exports.iframeSendToParentData = exports.updateParentToIframeData = exports.updateIframeToParentData = exports.parentSendIframeData = exports.initParentDataToIframe = exports.$iframe = void 0;
+exports.iframeSendToParentData = exports.updateParentToIframeData = exports.updateIframeToParentData = exports.parentSendIframeData = 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");
 /**
@@ -117,7 +116,7 @@ var parentSendIframeData = function (id, data, url, duration) {
         return;
     }
     if (!duration)
-        duration = 200;
+        duration = 100;
     var iframe = (0, exports.$iframe)(id);
     if (!iframe['src']) {
         if (!url) {
@@ -180,13 +179,3 @@ var iframeSendToParentData = function (data, url) {
     window.parent.postMessage(sendData, url);
 };
 exports.iframeSendToParentData = iframeSendToParentData;
-var updateWeiXinShareReady = function () {
-    window.addEventListener('message', function (event) {
-        var data = event.data;
-        var messageData = (0, utils_1.isJson)(data) || "";
-        if ((messageData === null || messageData === void 0 ? void 0 : messageData.type) == "share" && (messageData === null || messageData === void 0 ? void 0 : messageData.data)) {
-            (0, weixin_1.shareReady)(messageData.data);
-        }
-    });
-};
-exports.updateWeiXinShareReady = updateWeiXinShareReady;

package/dist/weixin/index.d.ts

@@ -25,6 +25,7 @@ interface ShareConfig {
     url?: string;
     urlKey?: string;
     appIdKey?: string;
+    dataType?: string;
 }
 export declare function configReady(config: ShareConfig): void;
 interface ShareOptions {
@@ -37,6 +38,7 @@ interface ShareOptions {
     key?: string;
     shareUrl?: string;
     dbug?: boolean;
+    dataType?: string;
 }
 export declare function shareReady(options: ShareOptions): void;
 /**
@@ -51,6 +53,7 @@ interface ConfigPay {
     signType: string;
     paySign: string;
     cb?: any;
+    dataType?: string;
 }
 export declare function onlinePay(config: ConfigPay): void;
 export {};

package/dist/weixin/index.js

@@ -314,15 +314,24 @@ var defaultOpenTagList = [
     "wx-open-subscribe", "wx-open-launch-app", "wx-open-launch-weapp",
     "wx-open-audio"
 ];
-var isContinue = function () {
+var isContinue = function (dataType) {
     var localCodeData = (0, index_1.getSessionStorage)("urlParamsData") || "";
+    var wxInfo = (0, index_1.getLocalStorage)("WxInfo") || "";
     var search = loc.search; // ?code=0916SzFa1KH9TA0Ke7Ha1AQx6446SzFr&state=123
     var codeIndex = -1;
     if (search) {
         codeIndex = search.indexOf("code=");
     }
     // 必须是已经存储微信授权 code ，并且链接中已无 code 字段，已完成刷新状态
-    if (localCodeData && localCodeData.hasOwnProperty("code") && codeIndex == -1) {
+    if (!dataType || dataType == "session") {
+        if (localCodeData && localCodeData.hasOwnProperty("code") && codeIndex == -1) {
+            return true;
+        }
+        else {
+            return false;
+        }
+    }
+    else if (dataType == "local" && wxInfo && wxInfo['openid'] && codeIndex == -1) {
         return true;
     }
     else {
@@ -331,7 +340,7 @@ var isContinue = function () {
 };
 function configReady(config) {
     var _a;
-    if (!isContinue()) {
+    if (!isContinue(config === null || config === void 0 ? void 0 : config.dataType)) {
         console.error("还未执行微信登录流程");
         return;
     }
@@ -399,7 +408,7 @@ function configReady(config) {
 }
 exports.configReady = configReady;
 function shareReady(options) {
-    if (!isContinue()) {
+    if (!isContinue(options === null || options === void 0 ? void 0 : options.dataType)) {
         console.error("还未执行微信登录流程");
         return;
     }
@@ -468,7 +477,7 @@ function shareReady(options) {
 }
 exports.shareReady = shareReady;
 function onlinePay(config) {
-    if (!isContinue()) {
+    if (!isContinue(config === null || config === void 0 ? void 0 : config.dataType)) {
         console.error("还未执行微信登录流程");
         return;
     }

package/package.json

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