@alipay/ams-checkout 2.0.26 → 2.0.28

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

package/esm/core/component/ckp/index.js

@@ -7,6 +7,7 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
 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 { isModernWeb } from "../../../modern/tools";
 import { redirect } from "../../../util/redirect";
 import { v4 as uuid } from 'uuid';
 import { EnvironmentEnum, MessageName } from "../../../types";
@@ -23,6 +24,8 @@ var CKP_PAYMENT_PAGE_HOST = {
 
 var CKP_PAGE_ADDRESS = '/page/antom-web-checkout-v2/checkout-page/pages/payment/index.html';
 var CKP_PAGE_NEW_ADDRESS = '/checkout-page/pages/payment/index.html';
+var CKP2_PAGE_ADDRESS = '/checkout-page2/pages/payment/index.html';
+var CKP2_FLOW_SWITCH_TAG = 'ckp2';
 export var getCKPPageAddress = function getCKPPageAddress(env) {
   switch (env) {
     case 'dev':
@@ -40,6 +43,23 @@ export var getCKPPageAddress = function getCKPPageAddress(env) {
       return env;
   }
 };
+var getCKP2PageAddress = function getCKP2PageAddress(env) {
+  switch (env) {
+    case 'dev':
+      return "".concat(CKP_PAYMENT_PAGE_HOST.DEV).concat(CKP2_PAGE_ADDRESS);
+    case 'sit':
+      return "".concat(CKP_PAYMENT_PAGE_HOST.TEST).concat(CKP2_PAGE_ADDRESS);
+    case 'pre':
+      return "".concat(CKP_PAYMENT_PAGE_HOST.PRE).concat(CKP2_PAGE_ADDRESS);
+    case 'prod':
+    case 'sandbox':
+    case 'light_sandbox':
+      return "".concat(CKP_PAYMENT_PAGE_HOST.PROD).concat(CKP2_PAGE_ADDRESS);
+    default:
+      // A caller-provided URL is already the explicit page selection authority.
+      return env;
+  }
+};
 export var AMSCheckoutPage = /*#__PURE__*/function () {
   function AMSCheckoutPage(options) {
     var _this = this;
@@ -54,7 +74,7 @@ export var AMSCheckoutPage = /*#__PURE__*/function () {
       var env = _this.originOptions.environment || 'prod';
       var session = sessionData || '';
       var lang = _this.originOptions.locale || 'en_US';
-      var ckpPageAddress = getCKPPageAddress(env);
+      var ckpPageAddress = isModernWeb(sessionData, CKP2_FLOW_SWITCH_TAG).modernWeb ? getCKP2PageAddress(env) : getCKPPageAddress(env);
       console.log('[antom-web-sdk] <antom-checkout-page>  generateIframeSrc', _this.originOptions, env, session, lang, ckpPageAddress);
 
       // 先获取去除的 query 参数的 url

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

@@ -42,7 +42,7 @@ import { ElementContainerService } from "../elementContainerService"; // 引入
 import { IContainerStatus } from "../elementContainerService/containerService";
 import { EventCenter as ElementEventCenter } from "../EventCenter/index";
 import { oneAccountUpdate, sdkActionUpdate } from "../mock";
-import { ElementPaymentEvent, ElementPaymentMethod, ElementType, EventCallbackCode, EVENTNAME, EXPOSURE_API_EVENT, MountElementType, PaymentStatus } from "../type";
+import { ElementPaymentEvent, ElementPaymentMethod, ElementType, EventCallbackCode, EVENTNAME, EXPOSURE_API_EVENT, MountElementType, PaymentStatus, ThemeType } from "../type";
 import { checkCanMount, checkCanUpdate, handleRedirect, isLoadErrorPage, safeParse, safeStringify, showToast } from "../util";
 var TIMEOUT_DURATION = 16000;
 var ElementController = /*#__PURE__*/function () {
@@ -233,7 +233,7 @@ var ElementController = /*#__PURE__*/function () {
   }, {
     key: "initializeAndMountProcessor",
     value: function initializeAndMountProcessor(type, selector, options) {
-      var _this$serviceMap$Log, _options$appearance;
+      var _this$serviceMap$Log, _options$appearance, _options$appearance2;
       this.initElementProcessors(type);
       // 创建 iframe，拉起应用页面，同时监听全局的数据更新和获取事件
       this.elementContainerService.mount({
@@ -253,7 +253,8 @@ var ElementController = /*#__PURE__*/function () {
         title: 'sdk_event_appearance'
       }, {
         variables: options !== null && options !== void 0 && (_options$appearance = options.appearance) !== null && _options$appearance !== void 0 && _options$appearance.variables ? true : false,
-        theme: options === null || options === void 0 ? void 0 : options.theme
+        // theme 挂在 appearance 下，商户未传时生效主题为 default，按生效值上报避免维度为空
+        theme: (options === null || options === void 0 || (_options$appearance2 = options.appearance) === null || _options$appearance2 === void 0 ? void 0 : _options$appearance2.theme) || ThemeType.Default
       });
       this.elementProcessors[type].beforeMount();
     }

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

@@ -41,7 +41,7 @@ export function adaptErrorToEventCallback(error) {
  * 4. layout: 直接透传
  */
 export function adaptAppearance(appearance, merchantAppointParam) {
-  var _merchantAppointParam, _appearance$card, _appearance$accordion;
+  var _merchantAppointParam, _appearance$card$show, _appearance$card, _appearance$accordion, _appearance$accordion2;
   var merchantDisplaySetting = {
     showCardCVV: !!(merchantAppointParam !== null && merchantAppointParam !== void 0 && (_merchantAppointParam = merchantAppointParam.storedCard) !== null && _merchantAppointParam !== void 0 && _merchantAppointParam.needCVV),
     showPaymentMethodListWhenSingleOption: (merchantAppointParam === null || merchantAppointParam === void 0 ? void 0 : merchantAppointParam.singleOption) === 'list'
@@ -66,9 +66,9 @@ export function adaptAppearance(appearance, merchantAppointParam) {
     }
   }
   result.displaySetting = _objectSpread(_objectSpread({
-    showCardBrandIcon: !!((_appearance$card = appearance.card) !== null && _appearance$card !== void 0 && _appearance$card.showBrandIcon)
+    showCardBrandIcon: (_appearance$card$show = (_appearance$card = appearance.card) === null || _appearance$card === void 0 ? void 0 : _appearance$card.showBrandIcon) !== null && _appearance$card$show !== void 0 ? _appearance$card$show : true
   }, merchantDisplaySetting), {}, {
-    showRadioWhenAccordionLayout: !!((_appearance$accordion = appearance.accordion) !== null && _appearance$accordion !== void 0 && _appearance$accordion.showRadio)
+    showRadioWhenAccordionLayout: (_appearance$accordion = (_appearance$accordion2 = appearance.accordion) === null || _appearance$accordion2 === void 0 ? void 0 : _appearance$accordion2.showRadio) !== null && _appearance$accordion !== void 0 ? _appearance$accordion : true
   });
 
   // Layout: 直接透传

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

@@ -1,4 +1,4 @@
-import type { IElementController, IElementOptions, ICommonApiResponse, IPaymentApiResponse, PaymentMountOptions, SubmitFuncParams, EventDataMap } from '../type';
+import type { EventDataMap, ICommonApiResponse, IElementController, IElementOptions, IPaymentApiResponse, PaymentMountOptions, SubmitFuncParams } from '../type';
 import { EVENTNAME } from '../type';
 type ModernElementStatus = 'initialized' | 'mounting' | 'mounted' | 'ready' | 'destroyed';
 interface ModernElementControllerOptions extends IElementOptions {
@@ -38,6 +38,8 @@ export declare class ModernElementController implements IElementController {
     private _merchantCurrency;
     /** 当前选中的支付方式类型（如 'APPLEPAY', 'CARD'），通过 paymentMethodChanged 事件更新 */
     private currentPaymentMethodType;
+    /** Removes the passive host-window modal monitor for this controller. */
+    private readonly stopModalMessageMonitor;
     /** 提交进行中标志：submitPayment 执行期间为 true，用于拒绝并发重入，避免旧闭包串扰/重复拉起钱包 */
     private isSubmitting;
     /**