@alipay/ams-checkout 0.0.1783663570-dev.6 → 0.0.1783663570-dev.8

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

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

@@ -6,13 +6,12 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 import { EventCallbackCode } from "../type";
 export function adaptSubmitResult(result) {
-  var _result$error;
   return {
     status: result.status || 'FAIL',
     error: result.error ? {
       code: result.error.code,
       message: result.error.message,
-      needChangeSessionForRetry: (_result$error = result.error) === null || _result$error === void 0 ? void 0 : _result$error.needChangeSessionForRetry
+      needChangeSessionForRetry: result.error.needChangeSessionForRetry
     } : undefined,
     userCanceled3D: result.userCanceled3D,
     session: result.paymentSession ? {
@@ -41,8 +40,16 @@ export function adaptErrorToEventCallback(error) {
  * 4. layout: 直接透传
  */
 export function adaptAppearance(appearance, merchantAppointParam) {
-  var _appearance$card, _merchantAppointParam, _appearance$accordion;
-  if (!appearance) return undefined;
+  var _merchantAppointParam, _appearance$card, _appearance$accordion;
+  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'
+  };
+  if (!appearance) {
+    return merchantAppointParam ? {
+      displaySetting: merchantDisplaySetting
+    } : undefined;
+  }
   var result = {};
 
   // Theme mapping: kebab-case → camelCase
@@ -57,17 +64,16 @@ export function adaptAppearance(appearance, merchantAppointParam) {
       result.variables = filtered;
     }
   }
-  result.displaySetting = {
-    showCardBrandIcon: !!((_appearance$card = appearance.card) !== null && _appearance$card !== void 0 && _appearance$card.showBrandIcon),
-    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',
+  result.displaySetting = _objectSpread(_objectSpread({
+    showCardBrandIcon: !!((_appearance$card = appearance.card) !== null && _appearance$card !== void 0 && _appearance$card.showBrandIcon)
+  }, merchantDisplaySetting), {}, {
     showRadioWhenAccordionLayout: !!((_appearance$accordion = appearance.accordion) !== null && _appearance$accordion !== void 0 && _appearance$accordion.showRadio)
-  };
+  });
 
   // Layout: 直接透传
   if (appearance.layout) {
     var _appearance$layout$ty;
     result.layout = ((_appearance$layout$ty = appearance.layout.type) === null || _appearance$layout$ty === void 0 ? void 0 : _appearance$layout$ty.toLowerCase()) || 'accordion';
   }
-  return Object.keys(result).length > 0 ? result : undefined;
+  return result;
 }

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

@@ -31,12 +31,15 @@ export declare class ModernElementController implements IElementController {
     private notRedirectAfterComplete;
     private _sdkInitTime;
     private _mountStartTime;
+    private destroyCallbacks;
     /** 商户传入的金额覆盖（Apple Pay 弹窗展示用，实际扣款由服务端控制） */
     private _merchantAmount;
     /** 商户传入的币种覆盖（Apple Pay 弹窗展示用） */
     private _merchantCurrency;
     /** 当前选中的支付方式类型（如 'APPLEPAY', 'CARD'），通过 paymentMethodChanged 事件更新 */
     private currentPaymentMethodType;
+    /** 提交进行中标志：submitPayment 执行期间为 true，用于拒绝并发重入，避免旧闭包串扰/重复拉起钱包 */
+    private isSubmitting;
     constructor({ onStatusChange, ...options }: ModernElementControllerOptions);
     mount(renderOptions: PaymentMountOptions, sdkSelector: string): Promise<ICommonApiResponse>;
     /**
@@ -120,6 +123,8 @@ export declare class ModernElementController implements IElementController {
     destroy(): void;
     private cleanup;
     private setStatus;
+    private onDestroy;
+    private runDestroyCallbacks;
     /**
      * 带缓存的消息发送：当 status 不是 ready 时，缓存消息；ready 后由 flushCachedMessages 批量发送
      */