@alipay/ams-checkout 0.0.1784542444-dev.7 → 0.0.1784542444-dev.9

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.1784542444-dev.7";
+export var sdkVersion = "0.0.1784542444-dev.9";
 
 /**
  * @description: 目前应用层分为v1和v2，会存在两个应用版本号不是同步发布的情况。所以需要把默认的应用版本号配置抽离出来。

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

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

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

@@ -29,7 +29,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import { openModal, showToast, sdkQuery, getLocaleFromRenderData, getDevReqConfig, getMetaData, buildPageUrl, debugError, debug, MessageType, request, parseHostSign, SDKBridge, parseTrackerId, oneAccountQuery, OpenSDKError, awaitWrap, themeColorMap, ApplePayHostService, buildRecurringPaymentRequest, checkSessionData, sdkTracker } from "../../../../modern/tools";
+import { openModal, showToast, sdkQuery, getLocaleFromRenderData, getDevReqConfig, getMetaData, buildPageUrl, debugError, debug, MessageType, request, parseHostSign, SDKBridge, parseTrackerId, oneAccountQuery, OpenSDKError, awaitWrap, themeColorMap, ApplePayHostService, buildRecurringPaymentRequest, checkSessionData, sdkTracker, ModalPort } from "../../../../modern/tools";
 import { device } from "../../../../util";
 import { EventCallbackCode } from "../type";
 import { adaptSubmitResult, adaptAppearance } from "./adapter";
@@ -218,7 +218,6 @@ export var ModernElementController = /*#__PURE__*/function () {
     _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());
     _defineProperty(this, "_mountStartTime", 0);
@@ -441,7 +440,7 @@ export var ModernElementController = /*#__PURE__*/function () {
                 hostSign: parseHostSign(sessionData),
                 env: lastEnv
               }, getDevReqConfig()), {}, {
-                sdkVersion: "0.0.1784542444-dev.7" || '',
+                sdkVersion: "0.0.1784542444-dev.9" || '',
                 tracker: sdkTracker
               }));
               isConnect = !!(parseData !== null && parseData !== void 0 && (_parseData$connectFac = parseData.connectFactor) !== null && _parseData$connectFac !== void 0 && _parseData$connectFac.enableConnect);
@@ -545,7 +544,7 @@ export var ModernElementController = /*#__PURE__*/function () {
                 // 新sdk字段
                 locale: locale,
                 // 新sdk字段
-                sdkVersion: "0.0.1784542444-dev.7" || '',
+                sdkVersion: "0.0.1784542444-dev.9" || '',
                 // 新sdk字段
                 merchantId: (sdkQueryResult === null || sdkQueryResult === void 0 || (_sdkQueryResult$data = sdkQueryResult.data) === null || _sdkQueryResult$data === void 0 ? void 0 : _sdkQueryResult$data.merchantId) || '',
                 // 新sdk字段
@@ -1769,12 +1768,16 @@ export var ModernElementController = /*#__PURE__*/function () {
       var _openModal = openModal(_objectSpread(_objectSpread({}, payload), {}, {
           mode: mode,
           loadingConfig: loadingConfig,
-          onClose: payload.closeConfirm ? function () {
-            return new Promise(function (resolve) {
-              // closeConfirm 时等待确认关闭（由 CLOSE_MODAL 消息触发 resolve）
-              _this12._closeConfirmResolve = resolve;
-            });
-          } : undefined
+          onClose: function onClose() {
+            if (payload.closeConfirm) {
+              trackElement('modal_close_confirm', {
+                d1: 'confirm_resolved'
+              });
+              // 这里提前关闭了
+              var modalPort = new ModalPort(payload.modalId, messageChannel.port2);
+              return modalPort.close(true);
+            }
+          }
         })),
         iframe = _openModal.iframe,
         destroy = _openModal.destroy;
@@ -1824,13 +1827,6 @@ export var ModernElementController = /*#__PURE__*/function () {
     key: "handleCloseModal",
     value: function handleCloseModal() {
       // 如果有等待中的 closeConfirm，resolve 它
-      if (this._closeConfirmResolve) {
-        trackElement('modal_close_confirm', {
-          d1: 'confirm_resolved'
-        });
-        this._closeConfirmResolve();
-        this._closeConfirmResolve = null;
-      }
       trackElement('modal_closed', {
         d1: this.modalBridge ? 'with_bridge' : 'no_bridge'
       });