@alipay/ams-checkout 0.0.1758607092-dev.0 → 0.0.1758783821-dev.1

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

@@ -20,9 +20,9 @@ function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) ===
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
-import { ProductSceneEnum } from "../../../../types";
 import { parseSessionData } from "../..";
 import PackageJson from "../../../../../package.json";
+import { ProductSceneEnum } from "../../../../types";
 import { generateIframeSrc as _generateIframeSrc } from "../util";
 import BaseElementProcessor from "./baseElementProcessor";
 var AddressProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
@@ -35,12 +35,12 @@ var AddressProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
   _createClass(AddressProcessor, [{
     key: "onReady",
     value: function onReady(extraParam) {
-      var _paymentSessionObj$pa, _extraParam$originOne;
+      var _paymentSessionObj$co, _paymentSessionObj$pa, _extraParam$originOne;
       var paymentContext = this.elementContainer.getPaymentContext();
       var paymentSessionObj = paymentContext.paymentSessionObj,
         paymentSessionId = paymentContext.paymentSessionId,
         displayInfo = paymentContext.displayInfo;
-      var isConnect = paymentSessionObj.connectFactor.enableConnect && ((_paymentSessionObj$pa = paymentSessionObj.paymentSessionConfig) === null || _paymentSessionObj$pa === void 0 ? void 0 : _paymentSessionObj$pa.productScene) === ProductSceneEnum.ELEMENT_PAYMENT;
+      var isConnect = ((_paymentSessionObj$co = paymentSessionObj.connectFactor) === null || _paymentSessionObj$co === void 0 ? void 0 : _paymentSessionObj$co.enableConnect) && ((_paymentSessionObj$pa = paymentSessionObj.paymentSessionConfig) === null || _paymentSessionObj$pa === void 0 ? void 0 : _paymentSessionObj$pa.productScene) === ProductSceneEnum.ELEMENT_PAYMENT;
       this.eventCenter.dispatchToApp({
         event: 'renderComponent',
         data: {

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

@@ -27,11 +27,11 @@ import PackageJson from "../../../../../package.json";
 import { EVENT } from "../../../../constant";
 import { ServiceProvider } from "../../../../foundation/service";
 import { ApplePaySdk, handleGooglePay, isSkipRenderPaymentMethod } from "../../../../plugin/component/channel";
-import { LogConfig, Logger } from "../../../../util/logger";
 import { queryParse } from "../../../../util";
+import { LogConfig, Logger } from "../../../../util/logger";
 import { parseSessionData } from "../../index";
 import { oneAccount, sdkAction } from "../mock";
-import { generateIframeSrc as _generateIframeSrc, isElementPC, isElementPad } from "../util";
+import { generateIframeSrc as _generateIframeSrc, isElementPad, isElementPC } from "../util";
 import BaseElementProcessor from "./baseElementProcessor";
 var logger = new Logger(LogConfig, true);
 var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
@@ -58,7 +58,8 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
         event: 'renderComponent',
         data: {
           heightOfVisible: Math.max(window.changingPageHeight, window.innerHeight),
-          paymentSessionData: paymentContext === null || paymentContext === void 0 ? void 0 : paymentContext.paymentSessionId,
+          // 极简架构需要全量sessionData, 服务端与谦评估没得影响
+          paymentSessionData: paymentContext === null || paymentContext === void 0 ? void 0 : paymentContext.paymentSession,
           queryResult: extraParam === null || extraParam === void 0 ? void 0 : extraParam.originActionQueryResult,
           envInfo: {
             screenHeight: screen.height,
@@ -242,18 +243,19 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
     value: function () {
       var _obtainData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
         var _paymentSessionObj$co;
-        var requestService, _this$elementContaine8, paymentSession, paymentSessionObj, displayInfo, merchantAppointParam, _this$options2, environment, locale, _ref4, paymentSessionConfig, hostSign, isConnect, LOCAL_MOCK, _queryParse, appType, terminalType, generateActionQueryPromise, generateOneAccountQueryPromise, _yield$Promise$all, _yield$Promise$all2, originActionQueryResult, originOneAccountQueryResult;
+        var requestService, _this$elementContaine8, paymentSession, paymentSessionObj, displayInfo, _displayInfo, debugProps, _this$options2, environment, locale, _ref4, paymentSessionConfig, hostSign, isConnect, LOCAL_MOCK, _queryParse, appType, terminalType, generateActionQueryPromise, generateOneAccountQueryPromise, _yield$Promise$all, _yield$Promise$all2, originActionQueryResult, originOneAccountQueryResult;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               requestService = ServiceProvider.getInstance(this.instanceId).getService('Requester');
               _this$elementContaine8 = this.elementContainer.getPaymentContext(), paymentSession = _this$elementContaine8.paymentSession, paymentSessionObj = _this$elementContaine8.paymentSessionObj, displayInfo = _this$elementContaine8.displayInfo;
-              merchantAppointParam = displayInfo.merchantAppointParam;
+              _displayInfo = displayInfo;
+              debugProps = _displayInfo.debugProps;
               _this$options2 = this.options, environment = _this$options2.env.environment, locale = _this$options2.locale;
               _ref4 = paymentSessionObj || {}, paymentSessionConfig = _ref4.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 = window.location.href.indexOf('LOCAL_MOCK=1') !== -1;
+              LOCAL_MOCK = (debugProps === null || debugProps === void 0 ? void 0 : debugProps.isDebug) && (debugProps === null || debugProps === void 0 ? void 0 : debugProps.local_mock);
               _queryParse = queryParse(this.getElementUrl()), appType = _queryParse.appType;
               terminalType = isElementPad() ? 'WEB' : appType ? 'APP' : isElementPC() ? 'WEB' : 'WAP';
               generateActionQueryPromise = function generateActionQueryPromise() {
@@ -267,7 +269,11 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
                   }
                   var sdkRequestData = {
                     paymentSessionConfig: paymentSessionConfig,
-                    paymentSessionData: paymentSession
+                    paymentSessionData: paymentSession,
+                    extParams: {
+                      // 必传，服务端用于根据前端传入locale判断是否使用用户偏好语言
+                      isUserPreferredLocale: true
+                    }
                   };
                   if (displayInfo !== null && displayInfo !== void 0 && (_displayInfo$merchant = displayInfo.merchantAppointParam) !== null && _displayInfo$merchant !== void 0 && _displayInfo$merchant.storedCard) {
                     sdkRequestData.merchantAppointParam = displayInfo.merchantAppointParam;
@@ -287,8 +293,8 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
                     'Operation-Type': 'com.ipay.iexpcashier.sdkAction.query'
                   }).then(function (result) {
                     resolve(result);
-                  }, function () {
-                    reject('sdk.action.query Request Error');
+                  }, function (e) {
+                    reject(e);
                   });
                 });
               };
@@ -317,14 +323,14 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
                     'Operation-Type': 'com.ipay.iexpfront.one.account.query'
                   }).then(function (result) {
                     resolve(result);
-                  }, function () {
-                    reject('one.account.query Request Error');
+                  }, function (e) {
+                    reject(e);
                   });
                 });
               };
-              _context2.next = 14;
+              _context2.next = 15;
               return Promise.all(isConnect ? [generateActionQueryPromise(), generateOneAccountQueryPromise()] : [generateActionQueryPromise()]);
-            case 14:
+            case 15:
               _yield$Promise$all = _context2.sent;
               _yield$Promise$all2 = _slicedToArray(_yield$Promise$all, 2);
               originActionQueryResult = _yield$Promise$all2[0];
@@ -337,7 +343,7 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
                 originActionQueryResult: originActionQueryResult,
                 originOneAccountQueryResult: originOneAccountQueryResult
               });
-            case 20:
+            case 21:
             case "end":
               return _context2.stop();
           }

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

@@ -7,6 +7,14 @@ export declare class ElementComponent {
     mount(renderOptions: LinkAuthMountOptions, sdkSelector: string): LinkAuthMountResult;
     mount(renderOptions: AddressMountOptions, sdkSelector: string): AddressMountResult;
     mount(renderOptions: PaymentMountOptions, sdkSelector: string): PaymentMountResult;
-    submitPayment(): void;
+    validateFields(): Promise<{
+        isValid: boolean;
+    }>;
+    submitPayment(): Promise<import("./type").IMerchantResponse | {
+        error: {
+            code: string;
+            message: string;
+        };
+    }>;
     destroy(): void;
 }

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

@@ -11,6 +11,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 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 ElementController from "./elementController";
+import { InvalidElementConfigError } from "./type";
 import { formatElementOption, validateElementOption } from "./util";
 export var ElementComponent = /*#__PURE__*/function () {
   function ElementComponent(options) {
@@ -18,7 +19,9 @@ export var ElementComponent = /*#__PURE__*/function () {
     _defineProperty(this, "options", void 0);
     _defineProperty(this, "controller", void 0);
     var validate = validateElementOption(options);
-    if (!validate) return;
+    if (!validate.isValid) {
+      throw new InvalidElementConfigError(validate.errors);
+    }
     this.options = formatElementOption(options);
     this.controller = new ElementController(options);
   }
@@ -49,10 +52,15 @@ export var ElementComponent = /*#__PURE__*/function () {
         appearance: this === null || this === void 0 || (_this$options = this.options) === null || _this$options === void 0 ? void 0 : _this$options.appearance
       }, renderOptions), sdkSelector);
     }
+  }, {
+    key: "validateFields",
+    value: function validateFields() {
+      return this.controller.validateFields();
+    }
   }, {
     key: "submitPayment",
     value: function submitPayment() {
-      this.controller.submitPayment();
+      return this.controller.submitPayment();
     }
   }, {
     key: "destroy",

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

@@ -10,7 +10,8 @@ export declare enum ElementPaymentEvent {
     CAPTURE_ASSET = "onCaptureAsset",
     SIGN_OUT = "onSignout",
     BLUR = "onBlur",
-    VALIDATE = "submitPay",
+    SUBMIT_PAY = "submitPay",
+    VALIDATE = "onValidate",
     SUBMIT_RISK = "onSubmitRisk",
     AFTER_SUBMIT = "onAfterSubmit",
     SIZE_CHANGE = "onSizeChange",
@@ -126,6 +127,10 @@ export interface LinkAuthMountOptions extends BaseMountOptions {
         theme?: ThemeType;
     };
 }
+type ToCamelCase<S extends string> = S extends `${infer First}-${infer Rest}` ? `${First}${Capitalize<ToCamelCase<Rest>>}` : S;
+type CompatibleVariables<T extends Record<string, string>> = {
+    [K in keyof T as K | ToCamelCase<K & string>]: string;
+};
 export interface PaymentMountOptions extends BaseMountOptions {
     type: ElementType.payment;
     appearance?: {
@@ -133,7 +138,7 @@ export interface PaymentMountOptions extends BaseMountOptions {
         layout?: {
             type: PaymentElementLayout;
         };
-        variables?: {
+        variables?: Partial<CompatibleVariables<{
             'content-primary': string;
             'content-secondary': string;
             'content-tertiary': string;
@@ -158,7 +163,8 @@ export interface PaymentMountOptions extends BaseMountOptions {
             'radius-module': string;
             'radius-component': string;
             'radius-button': string;
-        };
+            'warpper-padding': string;
+        }>>;
     };
     notRedirectAfterComplete?: boolean;
     merchantAppointParam?: IMerchantAppointParam;
@@ -359,7 +365,7 @@ export interface IElementOptions {
     appearance?: {
         theme: ThemeType.Default | ThemeType.Night;
     };
-    onEventCallback?: ({ code, message, result }: {
+    onEventCallback?: ({ code, message, result, }: {
         code: EventCallbackCode;
         message: string;
         result?: any;
@@ -387,4 +393,31 @@ export interface IToastOptions {
     icon?: 'SUCCESS' | 'FAIL';
     spin?: boolean;
 }
+export interface IMerchantResponse {
+    success?: boolean;
+    error?: {
+        code: string;
+        message?: string;
+        traceId?: string;
+        context?: any;
+    };
+    status?: string;
+}
+export declare class InvalidElementConfigError extends Error {
+    errors: Array<{
+        field: keyof IElementOptions;
+        message: string;
+    }>;
+    constructor(errors: Array<{
+        field: keyof IElementOptions;
+        message: string;
+    }>);
+}
+export declare enum EXPOSURE_API_EVENT {
+    DESTORY = "destroy",
+    MOUNT = "mount",
+    SUBMITPAYMENT = "submitPayment",
+    VALIDATAFIELDS = "validateFields",
+    UPDATEPAYMENT = "updatePayment"
+}
 export {};

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

@@ -1,4 +1,17 @@
 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 _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 _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
+function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
+function _wrapNativeSuper(Class) { var _cache = typeof Map === "function" ? new Map() : undefined; _wrapNativeSuper = function _wrapNativeSuper(Class) { if (Class === null || !_isNativeFunction(Class)) return Class; if (typeof Class !== "function") { throw new TypeError("Super expression must either be null or a function"); } if (typeof _cache !== "undefined") { if (_cache.has(Class)) return _cache.get(Class); _cache.set(Class, Wrapper); } function Wrapper() { return _construct(Class, arguments, _getPrototypeOf(this).constructor); } Wrapper.prototype = Object.create(Class.prototype, { constructor: { value: Wrapper, enumerable: false, writable: true, configurable: true } }); return _setPrototypeOf(Wrapper, Class); }; return _wrapNativeSuper(Class); }
+function _construct(Parent, args, Class) { if (_isNativeReflectConstruct()) { _construct = Reflect.construct.bind(); } else { _construct = function _construct(Parent, args, Class) { var a = [null]; a.push.apply(a, args); var Constructor = Function.bind.apply(Parent, a); var instance = new Constructor(); if (Class) _setPrototypeOf(instance, Class.prototype); return instance; }; } return _construct.apply(null, arguments); }
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+function _isNativeFunction(fn) { try { return Function.toString.call(fn).indexOf("[native code]") !== -1; } catch (e) { return typeof fn === "function"; } }
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 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); }
@@ -10,7 +23,8 @@ export var ElementPaymentEvent = /*#__PURE__*/function (ElementPaymentEvent) {
   ElementPaymentEvent["CAPTURE_ASSET"] = "onCaptureAsset";
   ElementPaymentEvent["SIGN_OUT"] = "onSignout";
   ElementPaymentEvent["BLUR"] = "onBlur";
-  ElementPaymentEvent["VALIDATE"] = "submitPay";
+  ElementPaymentEvent["SUBMIT_PAY"] = "submitPay";
+  ElementPaymentEvent["VALIDATE"] = "onValidate";
   ElementPaymentEvent["SUBMIT_RISK"] = "onSubmitRisk";
   ElementPaymentEvent["AFTER_SUBMIT"] = "onAfterSubmit";
   ElementPaymentEvent["SIZE_CHANGE"] = "onSizeChange";
@@ -70,6 +84,11 @@ export var ELEMENT_ENVIRONMENT = /*#__PURE__*/function (ELEMENT_ENVIRONMENT) {
   ELEMENT_ENVIRONMENT["SANDBOX"] = "SANDBOX";
   return ELEMENT_ENVIRONMENT;
 }({});
+
+// 将短横线命名转为小驼峰
+
+// 同时兼容短横线和小驼峰两种键名
+
 // export type IMountOptions = AddressMountOptions | LinkAuthMountOptions | PaymentMountOptions;
 
 export var AddressEventCallbackName = /*#__PURE__*/function (AddressEventCallbackName) {
@@ -86,4 +105,28 @@ var AccountStatusEnum = /*#__PURE__*/function (AccountStatusEnum) {
   AccountStatusEnum["EFFECTIVE"] = "EFFECTIVE";
   AccountStatusEnum["UNREGISTERED"] = "UNREGISTERED";
   return AccountStatusEnum;
-}(AccountStatusEnum || {}); // element 接口start
+}(AccountStatusEnum || {}); // element 接口start
+export var InvalidElementConfigError = /*#__PURE__*/function (_Error) {
+  _inherits(InvalidElementConfigError, _Error);
+  var _super = _createSuper(InvalidElementConfigError);
+  function InvalidElementConfigError(errors) {
+    var _this;
+    _classCallCheck(this, InvalidElementConfigError);
+    var errorMessages = errors.map(function (e) {
+      return "".concat(e.field, ": ").concat(e.message);
+    });
+    _this = _super.call(this, "Invalid config:\n".concat(errorMessages.join('\n')));
+    _this.errors = errors;
+    _this.name = 'InvalidElementConfigError';
+    return _this;
+  }
+  return _createClass(InvalidElementConfigError);
+}( /*#__PURE__*/_wrapNativeSuper(Error));
+export var EXPOSURE_API_EVENT = /*#__PURE__*/function (EXPOSURE_API_EVENT) {
+  EXPOSURE_API_EVENT["DESTORY"] = "destroy";
+  EXPOSURE_API_EVENT["MOUNT"] = "mount";
+  EXPOSURE_API_EVENT["SUBMITPAYMENT"] = "submitPayment";
+  EXPOSURE_API_EVENT["VALIDATAFIELDS"] = "validateFields";
+  EXPOSURE_API_EVENT["UPDATEPAYMENT"] = "updatePayment";
+  return EXPOSURE_API_EVENT;
+}({});

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

@@ -1,7 +1,7 @@
 import { IElementStatus } from '../../../foundation';
-import { Ianalytics, IPaymentSessionMetaData } from '../../../types';
+import { CashierSdkActionQueryResult, Ianalytics, IPaymentSessionMetaData } from '../../../types';
 import { ContainerController } from './elementContainerService/containerService';
-import { ELEMENT_ENVIRONMENT_TYPE, IElementOptions, IToastOptions, EventCallbackCode } from './type';
+import { ELEMENT_ENVIRONMENT_TYPE, EventCallbackCode, IElementOptions, IToastOptions } from './type';
 export declare const formatElementOption: (options: IElementOptions) => {
     environment: ELEMENT_ENVIRONMENT_TYPE;
     sessionData: string;
@@ -10,7 +10,7 @@ export declare const formatElementOption: (options: IElementOptions) => {
     appearance?: {
         theme: import("./type").ThemeType.Default | import("./type").ThemeType.Night;
     };
-    onEventCallback?: ({ code, message, result }: {
+    onEventCallback?: ({ code, message, result, }: {
         code: EventCallbackCode;
         message: string;
         result?: any;
@@ -20,7 +20,10 @@ export declare const formatElementOption: (options: IElementOptions) => {
         onEndLoading: () => void;
     };
 };
-export declare const validateElementOption: (options: IElementOptions) => boolean;
+export declare const validateElementOption: (options: IElementOptions) => {
+    isValid: boolean;
+    errors: any[];
+};
 /**
  * 校验渲染条件
  * 校验当前sdkSelector结点是否存在
@@ -32,6 +35,10 @@ export declare function checkCanMount({ sdkSelector, containerService, status, }
 }): {
     success: boolean;
     errorMsg?: string;
+    error?: {
+        code: string;
+        message?: string;
+    };
 };
 export declare function checkCanUpdate({ status, paymentContainerService, newPaymentSessionData, oldPaymentSessionData, }: {
     status: IElementStatus;
@@ -67,3 +74,9 @@ export declare const isElementMobile: () => boolean;
  */
 export declare const isElementPad: () => boolean;
 export declare const isElementPC: () => boolean;
+/**
+ * 判断是否需要加载错误页
+ * @param {CashierSdkActionQueryResult} params
+ * @returns {boolean} - 是否需要加载错误页
+ */
+export declare const isLoadErrorPage: (params: CashierSdkActionQueryResult) => boolean;

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

@@ -25,15 +25,24 @@ export var formatElementOption = function formatElementOption(options) {
   });
 };
 export var validateElementOption = function validateElementOption(options) {
+  var errors = [];
   if (!options.sessionData) {
+    errors.push({
+      field: 'sessionData',
+      message: 'sessionData is empty'
+    });
+  }
+  if (errors.length > 0) {
     var _options$onEventCallb;
     options === null || options === void 0 || (_options$onEventCallb = options.onEventCallback) === null || _options$onEventCallb === void 0 || _options$onEventCallb.call(options, {
       code: EventCallbackCode.SDK_CREATE_COMPONENT_ERROR,
       message: 'sessionData is empty'
     });
-    return false;
   }
-  return true;
+  return {
+    isValid: errors.length === 0,
+    errors: errors
+  };
 };
 
 /**
@@ -50,13 +59,15 @@ export function checkCanMount(_ref) {
     console.error("Element with selector ".concat(sdkSelector, " not found."));
     return {
       success: false,
-      errorMsg: "Element with selector ".concat(sdkSelector, " not found.")
+      errorMsg: "Element with selector ".concat(sdkSelector, " not found."),
+      error: ERRORMESSAGE.PARAM_INVALID
     };
   }
   if (status === IElementStatus.DESTROYED) {
     return {
       success: false,
-      errorMsg: "Creating components in the destroyed state is forbidden."
+      errorMsg: "Creating components in the destroyed state is forbidden.",
+      error: ERRORMESSAGE.UI_STATE_ERROR
     };
   }
   if (status === IElementStatus.READY) {
@@ -67,7 +78,8 @@ export function checkCanMount(_ref) {
   if (containerService) {
     return {
       success: false,
-      errorMsg: "SDK status error."
+      errorMsg: "SDK status error.",
+      error: ERRORMESSAGE.UI_STATE_ERROR
     };
   }
   return {
@@ -429,7 +441,7 @@ export function showToast() {
       textAlign: 'center',
       marginTop: '12px',
       lineHeight: '20px',
-      fontFamily: "Noto Sans",
+      fontFamily: 'Noto Sans',
       fontWeight: 400,
       fontSize: '14px'
     }
@@ -474,4 +486,31 @@ export var isElementPad = function isElementPad() {
 };
 export var isElementPC = function isElementPC() {
   return !isElementMobile();
+};
+
+/**
+ * 判断是否需要加载错误页
+ * @param {CashierSdkActionQueryResult} params
+ * @returns {boolean} - 是否需要加载错误页
+ */
+export var isLoadErrorPage = function isLoadErrorPage(params) {
+  var success = params.success,
+    paymentMethods = params.paymentMethods,
+    savedPaymentMethods = params.savedPaymentMethods,
+    orderAmountView = params.orderAmountView,
+    paymentAmountView = params.paymentAmountView;
+
+  // 校验是否存在支付方式
+  var hasValidPaymentMethods = paymentMethods && Array.isArray(paymentMethods) && paymentMethods.length > 0 || savedPaymentMethods && Array.isArray(savedPaymentMethods) && savedPaymentMethods.length > 0;
+
+  // 金额存在性校验
+  var hasAmountViews = !!orderAmountView && !!paymentAmountView;
+
+  // 错误条件判断（满足任意条件即需要展示错误页）
+  return !success ||
+  // 接口请求失败
+  !hasValidPaymentMethods ||
+  // 无有效支付方式
+  !hasAmountViews // 缺少金额展示
+  ;
 };

package/esm/foundation/service/container/index.js

@@ -240,41 +240,16 @@ export var ContainerService = /*#__PURE__*/function () {
   }, {
     key: "updateMaskCloseBtn",
     value: function updateMaskCloseBtn(data) {
-      var CLOSE_BUTTON_OFFSET_Y = 40;
-      var amsComponentContainer = document.getElementById(COMPONENT_CONTAINER_ID);
-      var maskCloseBtn = document.getElementById(COMPONENT_CLOSE_MASK_BLOCK_ID);
-      if (!maskCloseBtn) return;
-
-      // Position relative to container, more accurate
-      var updateRelativeToContainer = function updateRelativeToContainer() {
-        if (!amsComponentContainer || !maskCloseBtn) return;
-        var rect = amsComponentContainer.getBoundingClientRect();
-        var top = rect.top - CLOSE_BUTTON_OFFSET_Y;
-        var left = rect.left + rect.width - maskCloseBtn.offsetWidth;
-        maskCloseBtn.style.top = "".concat(top, "px");
-        maskCloseBtn.style.left = "".concat(left, "px");
-      };
-
-      // Position relative to window (Old logic)
-      var updateRelativeToWindow = function updateRelativeToWindow() {
-        if (!maskCloseBtn) return;
-        var windowHeight = window.innerHeight || document.documentElement.clientHeight || document.body.clientHeight;
-        var windowWidth = window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth;
-        maskCloseBtn.style.top = "".concat((windowHeight - data.height) / 2 - 42, "px");
-        maskCloseBtn.style.right = "".concat((windowWidth - data.width) / 2 + 18, "px");
-      };
-      if (amsComponentContainer) {
-        updateRelativeToContainer();
-        var events = ['animationend'];
-        events.forEach(function (event) {
-          var handler = function handler() {
-            updateRelativeToContainer();
-            amsComponentContainer.removeEventListener(event, handler);
-          };
-          amsComponentContainer.addEventListener(event, handler);
-        });
-      } else {
-        updateRelativeToWindow();
+      var maskCloseBtn = document.getElementById("".concat(COMPONENT_CLOSE_MASK_BLOCK_ID));
+      if (maskCloseBtn) {
+        if (this.displayInfo.platform === 'desktop') {
+          var windowHeight = window.innerHeight || document.documentElement.clientHeight || document.body.clientHeight;
+          var windowWidth = window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth;
+          maskCloseBtn.style.top = "".concat((windowHeight - data.height) / 2 - 42, "px");
+          maskCloseBtn.style.right = "".concat((windowWidth - data.width) / 2 + 18, "px");
+        } else {
+          maskCloseBtn.style.bottom = "".concat(data.height + 2, "px");
+        }
       }
     }
   }, {

package/esm/foundation/service/container/popup.d.ts

@@ -6,6 +6,11 @@ export type IPopUpParams = {
     platform: PlatformEnum;
     showCloseOnLoading: boolean;
     onCloseOnLoading: () => void;
+    textDirection?: 'ltr' | 'rtl';
+    loadingConfig?: {
+        theme?: string;
+        backgroundPrimary?: string;
+    };
 };
 /**
  * @author 谦彧 <zhangmian.zm@alipay.com>
@@ -15,6 +20,12 @@ export declare class PopupManager {
     private popupUrlQuery;
     popupApp: HTMLIFrameElement;
     setPopupUrlQuery(queryParams: string): void;
+    /**
+     * 合并URL参数, 优先加载弹窗参数作为基准, 用baseUrl参数覆盖弹窗参数
+     * @param baseUrl 基础URL
+     * @returns 合并后的URL
+     */
+    private mergeUrlParams;
     popup(data: IPopUpParams): Promise<void>;
     pop(): void;
 }

package/esm/foundation/service/container/popup.js

@@ -25,6 +25,26 @@ export var PopupManager = /*#__PURE__*/function () {
     value: function setPopupUrlQuery(queryParams) {
       this.popupUrlQuery = queryParams;
     }
+    /**
+     * 合并URL参数, 优先加载弹窗参数作为基准, 用baseUrl参数覆盖弹窗参数
+     * @param baseUrl 基础URL
+     * @returns 合并后的URL
+     */
+  }, {
+    key: "mergeUrlParams",
+    value: function mergeUrlParams(baseUrl) {
+      var urlObj = new URL(baseUrl);
+      // 优先加载弹窗参数作为基准
+      var mergedParams = new URLSearchParams(this.popupUrlQuery.replace(/^(?:\?|%3F)/i, ''));
+      // 用baseUrl参数覆盖弹窗参数（set方法自动覆盖）
+      urlObj.searchParams.forEach(function (value, key) {
+        mergedParams.set(key, value);
+      });
+      // 将合并后的参数设置到URL对象中
+      urlObj.search = mergedParams.toString();
+      // 返回合并后的URL
+      return urlObj.toString();
+    }
   }, {
     key: "popup",
     value: function () {
@@ -45,7 +65,7 @@ export var PopupManager = /*#__PURE__*/function () {
               pageUrl = data.url;
               _context.prev = 6;
               if (this.popupUrlQuery) {
-                pageUrl = data.url.includes('?') ? "".concat(data.url, "&").concat(this.popupUrlQuery) : "".concat(data.url, "?").concat(this.popupUrlQuery);
+                pageUrl = this.mergeUrlParams(data.url);
               }
               isLoad = false;
               _context.next = 11;
@@ -55,7 +75,8 @@ export var PopupManager = /*#__PURE__*/function () {
                 url: pageUrl,
                 loadingConfig: undefined,
                 showCloseOnLoading: data.showCloseOnLoading,
-                onCloseOnLoading: data.onCloseOnLoading
+                onCloseOnLoading: data.onCloseOnLoading,
+                textDirection: data === null || data === void 0 ? void 0 : data.textDirection
               });
             case 11:
               this.popupApp = _context.sent;

package/esm/foundation/service/log/keys.js

@@ -86,6 +86,8 @@ _defineProperty(LogComplianceExtendKeys, "complianceExtParams", {
   // 用来标记事件别名
   success: 'D',
   // 用来标记行为是否成功
+  startTime: 'D',
+  endTime: 'D',
   // M 数字类型
   timeCost: 'M',
   pageLoadProgress: 'M',

package/esm/foundation/service/requester/requester.js

@@ -12,8 +12,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 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 axios from 'axios';
 import { ServiceProvider } from '..';
-import { errorEnum } from "./deps";
-import { appId, device, fomatGetwayError, get, hostSignMap, lightSandboxMap, queryParse, requestHost, safeJson, sdkVersion, sofaId, tntInstId } from "./deps";
+import { appId, device, errorEnum, fomatGetwayError, get, hostSignMap, lightSandboxMap, queryParse, requestHost, safeJson, sdkVersion, sofaId, tntInstId } from "./deps";
 
 /**
  * @author congle.zzq <congle.zzq@alipay.com>
@@ -116,7 +115,7 @@ export var RequesterService = /*#__PURE__*/function () {
                 errorMessage: _context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.message
               });
               timeoutCode = _context.t0 !== null && _context.t0 !== void 0 && (_error$message = _context.t0.message) !== null && _error$message !== void 0 && _error$message.includes('timeout') ? errorEnum.TIMEOUT : '';
-              _errorCode = (_error === null || _error === void 0 ? void 0 : _error.errorCode) || timeoutCode;
+              _errorCode = timeoutCode || (_error === null || _error === void 0 ? void 0 : _error.errorCode);
               this.reportRequestTimeCost({
                 title: 'a3753.b101271.c388193.d521387',
                 name: options === null || options === void 0 ? void 0 : options['Operation-Type'],