@alipay/ams-checkout 2.0.19 → 2.0.21

package/esm/core/component/element/elementProcessor/paymentProcessor.js

@@ -27,11 +27,13 @@ import { ELEMENT_PAGE_URL } from "../../../../constant/element";
 import { EVENT } from "../../../../constant";
 import { ServiceProvider } from "../../../../foundation/service";
 import { ApplePaySdk, handleGooglePay, isSkipRenderPaymentMethod } from "../../../../plugin/component/channel";
+import { DisplayTypeEnum } from "../../../../types";
 import { queryParse } from "../../../../util";
 import { LogConfig, Logger } from "../../../../util/logger";
 import { parseSessionData } from "../../index";
 import { oneAccount, sdkAction } from "../mock";
-import { generateIframeSrc as _generateIframeSrc, isElementPad, isElementPC, safeStringify } from "../util";
+import { convertPaymentMethods } from "../elementProcessor/convertPaymentMethods";
+import { generateIframeSrc as _generateIframeSrc, isElementPad, isElementPC, safeParse, safeStringify } from "../util";
 import BaseElementProcessor from "./baseElementProcessor";
 import { executeWithTimeout, BEFORE_CONFIRM_TIMEOUT_MS } from "../../../../util/beforeConfirm";
 var logger = new Logger(LogConfig, true);
@@ -85,11 +87,44 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
   }, {
     key: "onReady",
     value: function onReady(extraParam) {
-      var _this$elementContaine, _this$elementContaine2, _this$elementContaine3, _this$elementContaine4, _this$elementContaine5;
+      var _this$options, _paymentContext$displ, _this$elementContaine, _this$elementContaine2, _this$elementContaine3, _this$elementContaine4, _this$elementContaine5;
       var paymentContext = this.elementContainer.getPaymentContext();
       this.getLogger().logInfo({
         title: 'sdk_event_renderComponent'
       });
+
+      // preview mobile 模式下，单普通支付方式（无表单、非快捷支付）不发送 renderComponent，阻止自动提交
+      var previewMode = (_this$options = this.options) === null || _this$options === void 0 ? void 0 : _this$options.preview;
+      if (previewMode === 'mobile') {
+        var _extraParam$originAct, _extraParam$originAct2, _paymentMethods$, _paymentMethods$2;
+        var paymentMethods = (extraParam === null || extraParam === void 0 || (_extraParam$originAct = extraParam.originActionQueryResult) === null || _extraParam$originAct === void 0 ? void 0 : _extraParam$originAct.paymentMethods) || [];
+        var savedPaymentMethods = (extraParam === null || extraParam === void 0 || (_extraParam$originAct2 = extraParam.originActionQueryResult) === null || _extraParam$originAct2 === void 0 ? void 0 : _extraParam$originAct2.savedPaymentMethods) || [];
+        if (paymentMethods.length === 1 && savedPaymentMethods.length === 0 && !((_paymentMethods$ = paymentMethods[0]) !== null && _paymentMethods$ !== void 0 && (_paymentMethods$ = _paymentMethods$.paymentElements) !== null && _paymentMethods$ !== void 0 && _paymentMethods$.length) && !['APPLEPAY', 'GOOGLEPAY'].includes((_paymentMethods$2 = paymentMethods[0]) === null || _paymentMethods$2 === void 0 ? void 0 : _paymentMethods$2.paymentMethodType)) {
+          // 跳过 renderComponent，避免触发自动提交
+          return;
+        }
+      }
+
+      // ===== Element 自助化运营：appearance 二选一处理（不做 deepMerge）=====
+      // 根据 theme 值二选一：
+      // - 内置 6 大主题（非 APR_ 前缀）：完全使用 SDK mount 传入的 appearance
+      // - 自定义主题模版（APR_ 前缀 AppearanceID）：完全使用后端 sdkAction.query 返回的 appearance，
+      //   SDK mount 中传的 layout/variables/card 全部忽略
+      var mountAppearance = paymentContext === null || paymentContext === void 0 || (_paymentContext$displ = paymentContext.displayInfo) === null || _paymentContext$displ === void 0 ? void 0 : _paymentContext$displ.appearance;
+      var isAppearanceId = typeof (mountAppearance === null || mountAppearance === void 0 ? void 0 : mountAppearance.theme) === 'string' && mountAppearance.theme.startsWith('APR_');
+      var finalAppearance;
+      if (isAppearanceId) {
+        var _extraParam$originAct3, _safeParse;
+        // 分支 A：自定义主题模版（APR_xxxx）
+        // 完全使用后端返回的配置，忽略 SDK mount 中的 layout/variables/card
+        // elementSettings 可能是 JSON string，需统一解析为对象
+        var elementSettings = extraParam === null || extraParam === void 0 || (_extraParam$originAct3 = extraParam.originActionQueryResult) === null || _extraParam$originAct3 === void 0 || (_extraParam$originAct3 = _extraParam$originAct3.pageStyle) === null || _extraParam$originAct3 === void 0 ? void 0 : _extraParam$originAct3.elementSettings;
+        finalAppearance = typeof elementSettings === 'string' ? (_safeParse = safeParse(elementSettings)) === null || _safeParse === void 0 ? void 0 : _safeParse.appearance : elementSettings === null || elementSettings === void 0 ? void 0 : elementSettings.appearance;
+      } else {
+        // 分支 B：内置 6 大主题或未指定主题
+        // 完全使用 SDK mount 传入的配置；
+        finalAppearance = mountAppearance;
+      }
       this.eventCenter.dispatchToApp({
         event: 'renderComponent',
         data: {
@@ -108,7 +143,7 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
             merchantId: (_this$elementContaine4 = this.elementContainer) === null || _this$elementContaine4 === void 0 || (_this$elementContaine4 = _this$elementContaine4.getPaymentContext()) === null || _this$elementContaine4 === void 0 || (_this$elementContaine4 = _this$elementContaine4.paymentSessionObj) === null || _this$elementContaine4 === void 0 ? void 0 : _this$elementContaine4.clientId,
             paymentMethodType: (_this$elementContaine5 = this.elementContainer) === null || _this$elementContaine5 === void 0 || (_this$elementContaine5 = _this$elementContaine5.getPaymentContext()) === null || _this$elementContaine5 === void 0 || (_this$elementContaine5 = _this$elementContaine5.paymentSessionObj) === null || _this$elementContaine5 === void 0 || (_this$elementContaine5 = _this$elementContaine5.paymentMethodInfoView) === null || _this$elementContaine5 === void 0 ? void 0 : _this$elementContaine5.paymentMethodType
           },
-          appearance: paymentContext === null || paymentContext === void 0 ? void 0 : paymentContext.displayInfo.appearance,
+          appearance: finalAppearance,
           sessionResult: paymentContext === null || paymentContext === void 0 ? void 0 : paymentContext.paymentSessionObj,
           notRedirectAfterComplete: (extraParam === null || extraParam === void 0 ? void 0 : extraParam.notRedirectAfterComplete) === true,
           merchantAppointParam: extraParam === null || extraParam === void 0 ? void 0 : extraParam.merchantAppointParam,
@@ -195,7 +230,7 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
       // requests SDK layer to execute merchant's onBeforeConfirm callback via beforeConfirm event,
       // and returns the result (continue/abort) to iframe via dispatchToApp.
       this.eventCenter.listen(EVENT.beforeConfirm.name, /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-        var paymentMethodType, startTime, _yield$executeWithTim, rawResult, timedOut, shouldContinue;
+        var paymentMethodType, startTime, _yield$executeWithTim, rawResult, timedOut, shouldContinue, isTimeout;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -235,8 +270,9 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
               _yield$executeWithTim = _context.sent;
               rawResult = _yield$executeWithTim.result;
               timedOut = _yield$executeWithTim.timedOut;
-              shouldContinue = rawResult; // 双重校验：timedOut（Promise race） + startTime（实际时间差），防止竞态误判
-              if (timedOut || Date.now() - startTime >= BEFORE_CONFIRM_TIMEOUT_MS) {
+              shouldContinue = rawResult;
+              isTimeout = timedOut || Date.now() - startTime >= BEFORE_CONFIRM_TIMEOUT_MS; // 双重校验：timedOut（Promise race） + startTime（实际时间差），防止竞态误判
+              if (isTimeout) {
                 logger.logError({
                   title: 'sdk_before_confirm_timeout'
                 });
@@ -249,15 +285,17 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
               });
               _this2.eventCenter.dispatchToApp({
                 event: EVENT.beforeConfirm.name,
-                data: {
+                data: _objectSpread({
                   success: true,
                   result: !!shouldContinue
-                }
+                }, isTimeout ? {
+                  isTimeout: true
+                } : {})
               });
-              _context.next = 23;
+              _context.next = 24;
               break;
-            case 19:
-              _context.prev = 19;
+            case 20:
+              _context.prev = 20;
               _context.t0 = _context["catch"](6);
               logger.logError({
                 title: 'sdk_before_confirm_error'
@@ -273,11 +311,11 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
                   result: false
                 }
               });
-            case 23:
+            case 24:
             case "end":
               return _context.stop();
           }
-        }, _callee, null, [[6, 19]]);
+        }, _callee, null, [[6, 20]]);
       })));
     }
   }, {
@@ -344,6 +382,7 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
   }, {
     key: "generateIframeSrc",
     value: function generateIframeSrc(_ref3) {
+      var _this$options3;
       var link = _ref3.link,
         instanceId = _ref3.instanceId;
       this.instanceId = instanceId;
@@ -351,12 +390,15 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
         paymentSession = _ref4.paymentSession,
         paymentSessionObj = _ref4.paymentSessionObj,
         sdkMetaData = _ref4.sdkMetaData;
-      var _this$options = this.options,
-        environment = _this$options.env.environment,
-        analytics = _this$options.analytics,
-        locale = _this$options.locale;
+      var _this$options2 = this.options,
+        environment = _this$options2.env.environment,
+        analytics = _this$options2.analytics,
+        locale = _this$options2.locale;
       var _ref5 = paymentSessionObj || {},
         extendInfo = _ref5.extendInfo;
+      // 预览模式下，若为 'mobile' 需要让 iframe 以 popup（MobileElement）形态渲染
+      var previewMode = (_this$options3 = this.options) === null || _this$options3 === void 0 ? void 0 : _this$options3.preview;
+      var renderDisplayType = previewMode === 'mobile' ? DisplayTypeEnum.popup : DisplayTypeEnum.inline;
       var url = _generateIframeSrc({
         paymentSession: paymentSession,
         paymentSessionObj: paymentSessionObj,
@@ -366,7 +408,8 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
         link: link,
         appVersion: sdkMetaData === null || sdkMetaData === void 0 ? void 0 : sdkMetaData.webAppVersion,
         pageUrl: isExpressCheckout(extendInfo) ? ELEMENT_PAGE_URL.EXPRESS_CHECKOUT : ELEMENT_PAGE_URL.ELEMENT_PAYMENT,
-        instanceId: instanceId
+        instanceId: instanceId,
+        renderDisplayType: renderDisplayType
       });
       this.setElementUrl(url);
       return url;
@@ -376,8 +419,9 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
     value: function () {
       var _obtainData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
         var _paymentSessionObj$co,
+          _this$options5,
           _this3 = this;
-        var requestService, _this$elementContaine7, paymentSession, paymentSessionObj, displayInfo, _displayInfo, debugProps, _this$options2, environment, locale, _ref6, paymentSessionConfig, hostSign, isConnect, LOCAL_MOCK, _queryParse, appType, terminalType, generateActionQueryPromise, generateOneAccountQueryPromise, _yield$Promise$all, _yield$Promise$all2, originActionQueryResult, originOneAccountQueryResult;
+        var requestService, _this$elementContaine7, paymentSession, paymentSessionObj, displayInfo, _displayInfo, debugProps, _this$options4, environment, locale, _ref6, paymentSessionConfig, hostSign, isConnect, LOCAL_MOCK, previewMode, IS_PREVIEW, SHOULD_USE_MOCK, _queryParse, appType, terminalType, generateActionQueryPromise, generateOneAccountQueryPromise, _yield$Promise$all, _yield$Promise$all2, originActionQueryResult, originOneAccountQueryResult;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -385,11 +429,14 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
               _this$elementContaine7 = this.elementContainer.getPaymentContext(), paymentSession = _this$elementContaine7.paymentSession, paymentSessionObj = _this$elementContaine7.paymentSessionObj, displayInfo = _this$elementContaine7.displayInfo;
               _displayInfo = displayInfo;
               debugProps = _displayInfo.debugProps;
-              _this$options2 = this.options, environment = _this$options2.env.environment, locale = _this$options2.locale;
+              _this$options4 = this.options, environment = _this$options4.env.environment, locale = _this$options4.locale;
               _ref6 = paymentSessionObj || {}, paymentSessionConfig = _ref6.paymentSessionConfig;
               hostSign = paymentSession.split('&&')[1] || '';
               isConnect = paymentSessionObj === null || paymentSessionObj === void 0 || (_paymentSessionObj$co = paymentSessionObj.connectFactor) === null || _paymentSessionObj$co === void 0 ? void 0 : _paymentSessionObj$co.enableConnect;
-              LOCAL_MOCK = (debugProps === null || debugProps === void 0 ? void 0 : debugProps.isDebug) && (debugProps === null || debugProps === void 0 ? void 0 : debugProps.local_mock);
+              LOCAL_MOCK = (debugProps === null || debugProps === void 0 ? void 0 : debugProps.isDebug) && (debugProps === null || debugProps === void 0 ? void 0 : debugProps.local_mock); // 兼容三种预览开关取值：true / 'web' / 'mobile'
+              previewMode = (_this$options5 = this.options) === null || _this$options5 === void 0 ? void 0 : _this$options5.preview;
+              IS_PREVIEW = previewMode === true || previewMode === 'web' || previewMode === 'mobile';
+              SHOULD_USE_MOCK = LOCAL_MOCK || IS_PREVIEW;
               _queryParse = queryParse(this.getElementUrl()), appType = _queryParse.appType;
               terminalType = isElementPad() ? 'WEB' : appType ? 'APP' : isElementPC() ? 'WEB' : 'WAP';
               /**
@@ -401,10 +448,14 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
               generateActionQueryPromise = function generateActionQueryPromise() {
                 return new Promise(function (resolve, reject) {
                   var _displayInfo$merchant;
-                  // 本地mock模式：直接返回预设的sdkAction，用于开发调试
-                  if (LOCAL_MOCK) {
+                  if (SHOULD_USE_MOCK) {
                     setTimeout(function () {
-                      resolve(sdkAction);
+                      if (IS_PREVIEW) {
+                        var mockData = _this3.buildPreviewMockData(sdkAction);
+                        resolve(mockData);
+                      } else {
+                        resolve(sdkAction);
+                      }
                     }, 100);
                     return;
                   }
@@ -422,6 +473,12 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
                     }
                   };
 
+                  // 自定义主题模版（APR_ 前缀 AppearanceID）：额外传递 appearanceId
+                  var mountAppearance = displayInfo === null || displayInfo === void 0 ? void 0 : displayInfo.appearance;
+                  var isAppearanceId = typeof (mountAppearance === null || mountAppearance === void 0 ? void 0 : mountAppearance.theme) === 'string' && mountAppearance.theme.startsWith('APR_');
+                  if (isAppearanceId) {
+                    sdkRequestData.appearanceId = mountAppearance.theme;
+                  }
                   // 可选参数：商户指定的储值卡信息
                   if (displayInfo !== null && displayInfo !== void 0 && (_displayInfo$merchant = displayInfo.merchantAppointParam) !== null && _displayInfo$merchant !== void 0 && _displayInfo$merchant.storedCard) {
                     sdkRequestData.merchantAppointParam = displayInfo.merchantAppointParam;
@@ -486,8 +543,7 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
                */
               generateOneAccountQueryPromise = function generateOneAccountQueryPromise() {
                 return new Promise(function (resolve, reject) {
-                  // 本地mock模式：直接返回预设的oneAccount数据，用于开发调试
-                  if (LOCAL_MOCK) {
+                  if (SHOULD_USE_MOCK) {
                     setTimeout(function () {
                       resolve(oneAccount);
                     }, 100);
@@ -523,9 +579,9 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
                   });
                 });
               };
-              _context3.next = 15;
+              _context3.next = 18;
               return Promise.all(isConnect ? [generateActionQueryPromise(), generateOneAccountQueryPromise()] : [generateActionQueryPromise()]);
-            case 15:
+            case 18:
               _yield$Promise$all = _context3.sent;
               _yield$Promise$all2 = _slicedToArray(_yield$Promise$all, 2);
               originActionQueryResult = _yield$Promise$all2[0];
@@ -538,7 +594,7 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
                 originActionQueryResult: originActionQueryResult,
                 originOneAccountQueryResult: originOneAccountQueryResult
               });
-            case 21:
+            case 24:
             case "end":
               return _context3.stop();
           }
@@ -549,6 +605,28 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
       }
       return obtainData;
     }()
+    /**
+     * 构建预览模式的 mock 数据
+     * 合并 mock.ts 的硬编码数据和 mount 传入的 paymentMethods 配置
+     */
+  }, {
+    key: "buildPreviewMockData",
+    value: function buildPreviewMockData(baseMock) {
+      var _this$elementContaine8 = this.elementContainer.getPaymentContext(),
+        displayInfo = _this$elementContaine8.displayInfo;
+      var mountOptions = displayInfo;
+      var paymentMethodsConfig = mountOptions === null || mountOptions === void 0 ? void 0 : mountOptions.previewPaymentMethods;
+
+      // 深拷贝 mock 数据，避免修改原始对象
+      var result = JSON.parse(JSON.stringify(baseMock));
+
+      // 转换 paymentMethods 配置为内部格式
+      var convertedMethods = convertPaymentMethods(paymentMethodsConfig);
+
+      // 替换 paymentMethods
+      result.paymentMethods = convertedMethods;
+      return result;
+    }
   }, {
     key: "getValue",
     value: function getValue() {

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

@@ -3,7 +3,10 @@ export declare class ElementComponent {
     private options;
     private controller;
     constructor(options: IElementOptions);
-    updatePayment(paymentSessionData: any): Promise<unknown>;
+    /**
+     * @deprecated 不要使用，internal experiment方法
+     */
+    updatePayment(paymentSessionData: any): Promise<boolean>;
     mount(renderOptions: PaymentMountOptions, sdkSelector: string): Promise<import("./type").ICommonApiResponse>;
     validateFields(): Promise<{
         isValid: boolean;

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

@@ -1,16 +1,18 @@
 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); }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 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 { adjustSessionData, isElements2 } from "../../../modern/tools";
 import ElementController from "./elementController";
+import { ModernElementController } from "./modernElementController";
 import { InvalidElementConfigError } from "./type";
 import { formatElementOption, validateElementOption } from "./util";
 export var ElementComponent = /*#__PURE__*/function () {
@@ -23,11 +25,23 @@ export var ElementComponent = /*#__PURE__*/function () {
       throw new InvalidElementConfigError(validate.errors);
     }
     this.options = formatElementOption(options);
-    this.controller = new ElementController(options);
+
+    // 核心分流逻辑
+    if (isElements2(options.sessionData)) {
+      this.controller = new ModernElementController(_objectSpread(_objectSpread({}, this.options), {}, {
+        sessionData: adjustSessionData(this.options.sessionData)
+      }));
+    } else {
+      this.controller = new ElementController(this.options);
+    }
   }
+
+  /**
+   * @deprecated 不要使用，internal experiment方法
+   */
   _createClass(ElementComponent, [{
     key: "updatePayment",
-    value: function () {
+    value: (function () {
       var _updatePayment = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(paymentSessionData) {
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
@@ -47,6 +61,7 @@ export var ElementComponent = /*#__PURE__*/function () {
     // mount(renderOptions: LinkAuthMountOptions, sdkSelector: string): LinkAuthMountResult;
     // mount(renderOptions: AddressMountOptions, sdkSelector: string): AddressMountResult;
     // mount(renderOptions: PaymentMountOptions, sdkSelector: string);
+    )
   }, {
     key: "mount",
     value: function mount(renderOptions, sdkSelector) {

package/esm/core/component/element/mock.js

@@ -153,7 +153,7 @@ export var sdkAction1 = {
   }, {
     antomPage: 'paymentMetaPage',
     category: 'AC_WALLET',
-    expressCheckout: true,
+    expressCheckout: false,
     icon: 'https://cdn.marmot-cloud.com/storage/2024/05/15/5b829130-42d9-46e7-a23d-6774f7352900.svg',
     iconName: 'Alipay',
     interActionType: 'REDIRECT',
@@ -327,7 +327,7 @@ export var sdkAction1 = {
     recommend: false,
     webRedirectType: 'PAGE_REFRESH'
   }],
-  redirectUrl: 'https://www.baidu.com',
+  redirectUrl: '',
   savedPaymentMethods: [],
   shippingInfo: {
     shippingAddress: {

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

@@ -0,0 +1,19 @@
+import type { IMerchantAppointParam } from "../../../../types";
+import type { IPaymentApiResponse, PaymentMountOptions } from '../type';
+import { EventCallbackCode } from '../type';
+import type { PaymentSubmitResult, ErrorPayload } from "../../../../modern/tools";
+export declare function adaptSubmitResult(result: PaymentSubmitResult): IPaymentApiResponse;
+export declare function adaptErrorToEventCallback(error: ErrorPayload): {
+    code: EventCallbackCode;
+    message: string;
+};
+/**
+ * 将老架构的 appearance 格式转换为新架构格式
+ *
+ * 转换规则：
+ * 1. theme: kebab-case → camelCase（如 'nostalgic-gray' → 'nostalgicGray'），其余保持不变
+ * 2. variables: 直接透传（kebab-case CSS 变量 key-value）
+ * 3. card.showBrandIcon → displaySetting.showCardBrandIcon
+ * 4. layout: 直接透传
+ */
+export declare function adaptAppearance(appearance?: PaymentMountOptions['appearance'], merchantAppointParam?: IMerchantAppointParam): any;

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

@@ -0,0 +1,79 @@
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+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); }
+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) {
+  return {
+    status: result.status || 'FAIL',
+    error: result.error ? {
+      code: result.error.code,
+      message: result.error.message,
+      needChangeSessionForRetry: result.error.needChangeSessionForRetry
+    } : undefined,
+    userCanceled3D: result.userCanceled3D,
+    session: result.paymentSession ? {
+      nextAction: {
+        applinkUrl: result.paymentSession.returnAppUrl,
+        normalUrl: result.paymentSession.returnUrl,
+        schemeUrl: result.paymentSession.returnAppScheme
+      }
+    } : undefined
+  };
+}
+export function adaptErrorToEventCallback(error) {
+  return {
+    code: error.code || EventCallbackCode.SDK_PAYMENT_ERROR,
+    message: error.message || ''
+  };
+}
+
+/**
+ * 将老架构的 appearance 格式转换为新架构格式
+ *
+ * 转换规则：
+ * 1. theme: kebab-case → camelCase（如 'nostalgic-gray' → 'nostalgicGray'），其余保持不变
+ * 2. variables: 直接透传（kebab-case CSS 变量 key-value）
+ * 3. card.showBrandIcon → displaySetting.showCardBrandIcon
+ * 4. layout: 直接透传
+ */
+export function adaptAppearance(appearance, merchantAppointParam) {
+  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
+  if (appearance.theme) {
+    result.theme = appearance.theme;
+  }
+
+  // Variables: 直接透传
+  if (appearance.variables && _typeof(appearance.variables) === 'object') {
+    var filtered = _objectSpread({}, appearance.variables);
+    if (Object.keys(filtered).length > 0) {
+      result.variables = filtered;
+    }
+  }
+  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 result;
+}