@alipay/ams-checkout 0.0.1783663570-dev.12 → 0.0.1783663570-dev.13

package/esm/config/index.js

@@ -30,7 +30,7 @@ export var v2AppMarmotMap = {
   light_sandbox: 'https://checkout.antom.com',
   prod: 'https://checkout.antom.com'
 };
-export var sdkVersion = "0.0.1783663570-dev.12";
+export var sdkVersion = "0.0.1783663570-dev.13";
 
 /**
  * @description: 目前应用层分为v1和v2，会存在两个应用版本号不是同步发布的情况。所以需要把默认的应用版本号配置抽离出来。

package/esm/core/component/element/modernElementController/index.d.ts

@@ -27,6 +27,7 @@ export declare class ModernElementController implements IElementController {
     private cachedSend;
     private modalBridge;
     private modalDestroy;
+    private modalIframe;
     private _closeConfirmResolve;
     private notRedirectAfterComplete;
     private _sdkInitTime;

package/esm/core/component/element/modernElementController/index.js

@@ -185,6 +185,7 @@ export var ModernElementController = /*#__PURE__*/function () {
     // Modal 相关资源
     _defineProperty(this, "modalBridge", null);
     _defineProperty(this, "modalDestroy", null);
+    _defineProperty(this, "modalIframe", null);
     _defineProperty(this, "_closeConfirmResolve", null);
     _defineProperty(this, "notRedirectAfterComplete", false);
     _defineProperty(this, "_sdkInitTime", Date.now());
@@ -400,7 +401,7 @@ export var ModernElementController = /*#__PURE__*/function () {
               request.setGlobalOptions({
                 hostSign: parseHostSign(sessionData),
                 env: this.options.environment,
-                sdkVersion: "0.0.1783663570-dev.12" || '',
+                sdkVersion: "0.0.1783663570-dev.13" || '',
                 tracker: sdkTracker
               });
               isConnect = !!(parseData !== null && parseData !== void 0 && (_parseData$connectFac = parseData.connectFactor) !== null && _parseData$connectFac !== void 0 && _parseData$connectFac.enableConnect);
@@ -496,7 +497,7 @@ export var ModernElementController = /*#__PURE__*/function () {
                 // 新sdk字段
                 locale: locale,
                 // 新sdk字段
-                sdkVersion: "0.0.1783663570-dev.12" || '',
+                sdkVersion: "0.0.1783663570-dev.13" || '',
                 // 新sdk字段
                 merchantId: (sdkQueryResult === null || sdkQueryResult === void 0 || (_sdkQueryResult$data = sdkQueryResult.data) === null || _sdkQueryResult$data === void 0 ? void 0 : _sdkQueryResult$data.merchantId) || '',
                 // 新sdk字段
@@ -614,8 +615,8 @@ export var ModernElementController = /*#__PURE__*/function () {
         if (_this2.iframe) _this2.iframe.style.height = "".concat(height, "px");
       });
       this.bridge.on(MessageType.REDIRECT, function (payload, _ports, meta) {
-        var _this2$iframe;
-        if (meta && meta.source !== ((_this2$iframe = _this2.iframe) === null || _this2$iframe === void 0 ? void 0 : _this2$iframe.contentWindow)) {
+        var _this2$iframe, _this2$modalIframe;
+        if (meta && meta.source !== ((_this2$iframe = _this2.iframe) === null || _this2$iframe === void 0 ? void 0 : _this2$iframe.contentWindow) && meta.source !== ((_this2$modalIframe = _this2.modalIframe) === null || _this2$modalIframe === void 0 ? void 0 : _this2$modalIframe.contentWindow)) {
           return;
         }
         var url = payload.url,
@@ -1728,9 +1729,11 @@ export var ModernElementController = /*#__PURE__*/function () {
           modalBridge.send(MessageType.TRANSFER_MODAL_PORT, payload.modalId, [messageChannel.port2]);
         }
       };
+      this.modalIframe = iframe;
       this.modalDestroy = function () {
         destroy();
         iframe.removeEventListener('load', handler);
+        _this12.modalIframe = null;
       };
 
       // 监听 modal 的 iframe load 事件