@alipay/ams-checkout 0.0.1755258862-dev.0 → 0.0.1755681537-dev.0

package/esm/foundation/product-processor/element/index.js

@@ -0,0 +1,24 @@
+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 _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 _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); }
+var ElementProcessor = /*#__PURE__*/function () {
+  function ElementProcessor() {
+    _classCallCheck(this, ElementProcessor);
+  }
+  _createClass(ElementProcessor, [{
+    key: "init",
+    value: function init(config, instanceId) {
+      return null;
+    }
+  }, {
+    key: "startBizFlow",
+    value: function startBizFlow() {
+      return null;
+    }
+  }]);
+  return ElementProcessor;
+}();
+export { ElementProcessor };

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

@@ -1,30 +1,41 @@
-import { DisplayInfo, SDKMetaData, Service } from '../../index';
 import { IoptionsParams } from '../../../types';
+import { DisplayInfo, SDKMetaData, Service } from '../../index';
+import { PopupManager } from './popup';
 export declare class ContainerService implements Service {
     private instanceId;
     private sdkMetaData;
+    private initMessageEvent;
     private clearTimerIdMapping;
-    private popupManager;
+    popupManager: PopupManager;
     private eventCenter;
     private logService;
     private displayInfo;
     private webApp;
     private _webAppHeartBeatTimeoutFn;
+    private clientHeight;
+    private boundFocusResizeChange;
     private customizedLoadingListener;
     destroy(): void;
     init(initOptions: IoptionsParams, instanceId: string, sdkMetaData: SDKMetaData): void;
     update(): void;
-    load(displayInfo: DisplayInfo, url: string, closeBtnFunc: () => void): HTMLDivElement;
+    load(displayInfo: DisplayInfo, url: string, closeBtnFunc?: () => void): HTMLDivElement;
     cleanContainer(displayInfo: DisplayInfo): void;
     showLoading(container: HTMLDivElement, displayInfo: DisplayInfo): void;
     dismissLoading(isKeepMockup?: boolean): void;
     customizeLoading(listener: (event: 'SDK_START_OF_LOADING' | 'SDK_END_OF_LOADING') => void): void;
     startHideAnim(): void;
+    private handleAccountFocus;
     private addCapabilityToEventCenter;
     private addCapabilityToApiBusManager;
     private updateMaskCloseBtn;
     private handleSizeChanged;
+    private focusResizeChange;
+    private focusScrollFixed;
     private handleAppHeartBeat;
     private changeCloseBtnVisibility;
     private handleMaskCloseBtnShow;
+    private handleCloseButtonTheme;
+    private handlePopupWindow;
+    private handlePopWindow;
+    getWebApp(): HTMLIFrameElement;
 }

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

@@ -7,14 +7,16 @@ 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 { DisplayTypeEnum } from "../../../types";
-import { createIframe, startSizeChangeAnim } from "./utils";
+import { isEmpty } from "../../../util";
 import { addInlineLoading, createInlineBaseElement } from "../../../component/component.inline.style";
 import { addPopupLoading, createBaseElement } from "../../../component/component.popup.style";
-import { COMPONENT_CLOSE_BLOCK_ID, COMPONENT_CLOSE_MASK_BLOCK_ID, COMPONENT_CONTAINER_ID, ERRORMESSAGE, LOADING_ID, MOCKUP_ID } from "../../../constant";
+import { insertStyleSheet } from "../../../component/popupWindow.style";
+import { COMPONENT_CLOSE_BLOCK_ID, COMPONENT_CLOSE_MASK_BLOCK_ID, COMPONENT_CONTAINER_ID, ERRORMESSAGE, EVENT, LOADING_ID, MOCKUP_ID, TIMEOUT_WEB_APP_HEART_BEAT, TIME_DELAY_SEND_HEART_BEAT, closeImg, closeImgLight } from "../../../constant";
+import { DisplayTypeEnum, ProductSceneEnum } from "../../../types";
 import { ServiceProvider } from "../index";
-import { EVENT, TIMEOUT_WEB_APP_HEART_BEAT, TIME_DELAY_SEND_HEART_BEAT } from "../../../constant";
 import { PopupManager } from "./popup";
+import { createIframe, startSizeChangeAnim } from "./utils";
+
 /**
  * @author 谦彧 <zhangmian.zm@alipay.com>
  * @date 2024/9/17
@@ -25,6 +27,7 @@ export var ContainerService = /*#__PURE__*/function () {
     _classCallCheck(this, ContainerService);
     _defineProperty(this, "instanceId", void 0);
     _defineProperty(this, "sdkMetaData", void 0);
+    _defineProperty(this, "initMessageEvent", void 0);
     _defineProperty(this, "clearTimerIdMapping", {});
     _defineProperty(this, "popupManager", void 0);
     _defineProperty(this, "eventCenter", void 0);
@@ -32,6 +35,8 @@ export var ContainerService = /*#__PURE__*/function () {
     _defineProperty(this, "displayInfo", void 0);
     _defineProperty(this, "webApp", void 0);
     _defineProperty(this, "_webAppHeartBeatTimeoutFn", void 0);
+    _defineProperty(this, "clientHeight", void 0);
+    _defineProperty(this, "boundFocusResizeChange", void 0);
     // if this variable is true, SDK will invoke listener instead of showing loading
     _defineProperty(this, "customizedLoadingListener", void 0);
   }
@@ -41,13 +46,21 @@ export var ContainerService = /*#__PURE__*/function () {
   }, {
     key: "init",
     value: function init(initOptions, instanceId, sdkMetaData) {
+      var _window;
       this.instanceId = instanceId;
       this.sdkMetaData = sdkMetaData;
+      this.clientHeight = Math.max(window.innerHeight, ((_window = window) === null || _window === void 0 || (_window = _window.visualViewport) === null || _window === void 0 ? void 0 : _window.height) || 0);
       this.eventCenter = ServiceProvider.getInstance(instanceId).getService('EventCenter');
       this.logService = ServiceProvider.getInstance(instanceId).getService('Log');
       this.popupManager = new PopupManager();
-      this.addCapabilityToEventCenter();
+      // element因涉及多组件联动，消息接受处理在产品层进行
+      var notAddEventCenter = Boolean(Object.keys(initOptions).length) && sdkMetaData.productScene === ProductSceneEnum.ELEMENT_PAYMENT;
+      if (!notAddEventCenter) {
+        this.addCapabilityToEventCenter();
+      }
       this.addCapabilityToApiBusManager();
+      // bind会返回一个新的方法，init时记录上这个focus，不然window.addEventListener时this指向会变成window
+      this.boundFocusResizeChange = this.focusResizeChange.bind(this);
     }
   }, {
     key: "update",
@@ -55,10 +68,21 @@ export var ContainerService = /*#__PURE__*/function () {
   }, {
     key: "load",
     value: function load(displayInfo, url, closeBtnFunc) {
-      var webApp = createIframe('antom-sdk-web-app' + (displayInfo.appendAliasContainerId ? "-".concat(displayInfo.selector) : ''));
+      var appendAliasContainerId = displayInfo.appendAliasContainerId,
+        selector = displayInfo.selector,
+        type = displayInfo.type,
+        platform = displayInfo.platform;
+      var webApp = createIframe('antom-sdk-web-app' + (displayInfo.appendAliasContainerId ? "-".concat(selector) : ''));
+      if (!isEmpty(displayInfo === null || displayInfo === void 0 ? void 0 : displayInfo.iframeStyle)) {
+        Object.keys(displayInfo === null || displayInfo === void 0 ? void 0 : displayInfo.iframeStyle).forEach(function (key) {
+          var _displayInfo$iframeSt;
+          webApp.style[key] = displayInfo === null || displayInfo === void 0 || (_displayInfo$iframeSt = displayInfo.iframeStyle) === null || _displayInfo$iframeSt === void 0 ? void 0 : _displayInfo$iframeSt[key];
+        });
+      }
       this.webApp = webApp;
       this.displayInfo = displayInfo;
       webApp.src = url;
+      webApp.allow = 'payment';
       this.eventCenter.addIFrame(webApp);
       if (webApp.src.includes('?')) {
         this.popupManager.setPopupUrlQuery(webApp.src.split('?')[1]);
@@ -66,7 +90,7 @@ export var ContainerService = /*#__PURE__*/function () {
       // TODO call ApiBusManager to add listener to iframe, componentApp line 979
 
       // create container and append web app
-      var container = displayInfo.type === DisplayTypeEnum.inline ? createInlineBaseElement(displayInfo.selector) : createBaseElement(displayInfo.platform, closeBtnFunc);
+      var container = type === DisplayTypeEnum.inline ? createInlineBaseElement(selector, appendAliasContainerId ? "".concat(COMPONENT_CONTAINER_ID, "-").concat((selector === null || selector === void 0 ? void 0 : selector.indexOf('#')) === -1 ? selector : selector.slice(1)) : '') : createBaseElement(platform, closeBtnFunc);
       container.appendChild(webApp);
       return container;
     }
@@ -75,7 +99,7 @@ export var ContainerService = /*#__PURE__*/function () {
     value: function cleanContainer(displayInfo) {
       var _document$getElementB;
       // selector and container
-      var selector = displayInfo.type === DisplayTypeEnum.inline ? displayInfo.selector : COMPONENT_CONTAINER_ID;
+      var selector = (displayInfo === null || displayInfo === void 0 ? void 0 : displayInfo.type) === DisplayTypeEnum.inline ? displayInfo.selector : COMPONENT_CONTAINER_ID;
       var selectorDom = document.querySelector(selector);
       if (selectorDom) {
         selectorDom.innerHTML = '';
@@ -86,7 +110,7 @@ export var ContainerService = /*#__PURE__*/function () {
       this.eventCenter.cleanIFrames();
 
       // animation
-      (_document$getElementB = document.getElementById("".concat(COMPONENT_CONTAINER_ID, "-").concat(displayInfo.platform, "-animation-style"))) === null || _document$getElementB === void 0 || _document$getElementB.remove();
+      (_document$getElementB = document.getElementById("".concat(COMPONENT_CONTAINER_ID, "-").concat(displayInfo === null || displayInfo === void 0 ? void 0 : displayInfo.platform, "-animation-style"))) === null || _document$getElementB === void 0 || _document$getElementB.remove();
     }
   }, {
     key: "showLoading",
@@ -138,6 +162,22 @@ export var ContainerService = /*#__PURE__*/function () {
         container === null || container === void 0 || container.classList.add("".concat(COMPONENT_CONTAINER_ID, "-hidden-").concat(this.displayInfo.platform));
       }
     }
+  }, {
+    key: "handleAccountFocus",
+    value: function handleAccountFocus(focus) {
+      var _window$visualViewpor, _window2;
+      // 失焦时v2会走默认的sizeChange还原高度，这里仅移除监听
+      (_window$visualViewpor = window.visualViewport) === null || _window$visualViewpor === void 0 || _window$visualViewpor.removeEventListener('resize', this.boundFocusResizeChange);
+      (_window2 = window) === null || _window2 === void 0 || _window2.removeEventListener('resize', this.boundFocusResizeChange);
+      // 只有聚焦才监听，失焦后移除，避免影响别的场景
+      if (focus) {
+        var _window$visualViewpor2;
+        // 监听页面visualViewport的高度变化，适用于主流机型更精准获取当前页面高度
+        (_window$visualViewpor2 = window.visualViewport) === null || _window$visualViewpor2 === void 0 || _window$visualViewpor2.addEventListener('resize', this.boundFocusResizeChange);
+        // 兼容visualViewport处理不到的场景，一般存在于老版本浏览器
+        window.addEventListener('resize', this.boundFocusResizeChange);
+      }
+    }
   }, {
     key: "addCapabilityToEventCenter",
     value: function addCapabilityToEventCenter() {
@@ -156,16 +196,7 @@ export var ContainerService = /*#__PURE__*/function () {
         });
       });
       this.eventCenter.listen(EVENT.popupWindow.name, function (data) {
-        var _this$displayInfo2;
-        if (data.paymentElementOldModel) return;
-        _this.popupManager.popup(_objectSpread({
-          platform: (_this$displayInfo2 = _this.displayInfo) === null || _this$displayInfo2 === void 0 ? void 0 : _this$displayInfo2.platform
-        }, data)).catch(function (error) {
-          _this.logService.logError({
-            title: (error === null || error === void 0 ? void 0 : error.title) || 'sdk_error_create_pop_up'
-          }, error);
-          _this.eventCenter.emit(EVENT.error.name, ERRORMESSAGE.CREATECOMPONENT_ERROR.LOAD_APP_TIMEOUT);
-        });
+        _this.handlePopupWindow(data);
       });
       this.eventCenter.listen(EVENT.popWindow.name, function () {
         _this.popupManager.pop();
@@ -173,7 +204,8 @@ export var ContainerService = /*#__PURE__*/function () {
       this.eventCenter.listen(EVENT.sizeChanged.name, function (data) {
         _this.handleSizeChanged(_objectSpread({}, data));
       });
-      this.eventCenter.listen(EVENT.showCloseButton.name, function () {
+      this.eventCenter.listen(EVENT.showCloseButton.name, function (data) {
+        _this.handleCloseButtonTheme(data.style);
         _this.changeCloseBtnVisibility(true);
       });
       this.eventCenter.listen(EVENT.hideCloseButton.name, function () {
@@ -185,6 +217,22 @@ export var ContainerService = /*#__PURE__*/function () {
       this.eventCenter.listen(EVENT.appHeartBeat.name, function () {
         _this.handleAppHeartBeat();
       });
+      /**
+       * 目前仅用于ESP V2的 web sdk
+       * 原因： 在账户输入页和OTP页面的h5场景下键盘弹起页面会有问题，iframe有固定高度，键盘弹起时应用层不会触发大小变化
+       *   account账号输入页需要在sdk监听键盘弹起后高度变化并修改iframe及iframe外层容器，account需要按钮置底的放在键盘上面，必须修改高度而不是让容器定位
+       *   otp页面需要在聚焦时给iframe及外层容器设置fixed定位，让页面不被弹起
+       * 目的： esp页面输入框聚焦/失焦后给sdk发送消息
+       */
+      this.eventCenter.listen(EVENT.inputFocus.name, function (data) {
+        // 账号输入页需要修改iframe高度
+        if (data.source === 'ESP_V2' && data.type === 'account') {
+          _this.handleAccountFocus(data.focus);
+          // otp页面需要定位元素
+        } else if (data.source === 'ESP_V2' && data.type === 'otp') {
+          _this.focusScrollFixed(data.focus);
+        }
+      });
     }
   }, {
     key: "addCapabilityToApiBusManager",
@@ -207,22 +255,26 @@ export var ContainerService = /*#__PURE__*/function () {
   }, {
     key: "handleSizeChanged",
     value: function handleSizeChanged(data) {
+      var _this$displayInfo2 = this.displayInfo,
+        appendAliasContainerId = _this$displayInfo2.appendAliasContainerId,
+        selector = _this$displayInfo2.selector;
+      var cashierId = appendAliasContainerId ? "".concat(COMPONENT_CONTAINER_ID, "-").concat((selector === null || selector === void 0 ? void 0 : selector.indexOf('#')) === -1 ? selector : selector.slice(1)) : COMPONENT_CONTAINER_ID;
       if (!this.webApp || !this.displayInfo) {
         return;
       }
-      var cashier = document.getElementById(COMPONENT_CONTAINER_ID);
-      if ((data === null || data === void 0 ? void 0 : data.height) <= 1 || data.height === parseInt(cashier.style.height)) return;
+      var cashier = document.getElementById(cashierId);
+      if (!cashier || (data === null || data === void 0 ? void 0 : data.height) <= 1 || data.height === parseInt(cashier.style.height)) return;
       cashier.style.height = "".concat(data.height, "px");
       this.webApp.style.opacity = '1';
       if (this.displayInfo.type === DisplayTypeEnum.popup) {
         if (this.displayInfo.platform === 'desktop') {
           if (data.width) cashier.style.width = "".concat(data.width, "px");
-          cashier.classList.add("".concat(COMPONENT_CONTAINER_ID, "-").concat(this.displayInfo.platform, "-animation"));
+          cashier.classList.add("".concat(cashierId, "-").concat(this.displayInfo.platform, "-animation"));
           this.webApp.style.height = "".concat(data.height, "px");
         }
         if (this.displayInfo.platform === 'mobile') {
-          cashier.classList.add("".concat(COMPONENT_CONTAINER_ID, "-").concat(this.displayInfo.platform, "-animation"));
-          var animationStyleId = "".concat(COMPONENT_CONTAINER_ID, "-").concat(this.displayInfo.platform, "-animation-style");
+          cashier.classList.add("".concat(cashierId, "-").concat(this.displayInfo.platform, "-animation"));
+          var animationStyleId = "".concat(cashierId, "-").concat(this.displayInfo.platform, "-animation-style");
           var animationStyle = document.getElementById(animationStyleId);
           if (animationStyle) animationStyle === null || animationStyle === void 0 || animationStyle.remove();
 
@@ -241,6 +293,50 @@ export var ContainerService = /*#__PURE__*/function () {
         this.webApp.style.height = "".concat(data.height, "px");
       }
     }
+
+    // 目前仅用于esp账号输入页聚焦
+  }, {
+    key: "focusResizeChange",
+    value: function focusResizeChange() {
+      var _window3;
+      // 计算出当前iframe应有的高度，需要和顶部留有距离
+      var webPageHeightRatio = 0.9;
+      var browserPageHeightFocusRatio = 0.9;
+      // sdk层才能拿到当前键盘弹起后页面的高度
+      var height = ((_window3 = window) === null || _window3 === void 0 || (_window3 = _window3.visualViewport) === null || _window3 === void 0 ? void 0 : _window3.height) || window.innerHeight;
+      height = height * webPageHeightRatio;
+      height = height * browserPageHeightFocusRatio;
+      // 调用handleSizeChanged修改iframe高度
+      this.handleSizeChanged({
+        width: 0,
+        height: height
+      });
+    }
+
+    // 目前仅用于esp otp页面账号聚焦
+  }, {
+    key: "focusScrollFixed",
+    value: function focusScrollFixed(focus) {
+      // 获取iframe dom元素
+      var _this$displayInfo3 = this.displayInfo,
+        appendAliasContainerId = _this$displayInfo3.appendAliasContainerId,
+        selector = _this$displayInfo3.selector;
+      var cashierId = appendAliasContainerId ? "".concat(COMPONENT_CONTAINER_ID, "-").concat((selector === null || selector === void 0 ? void 0 : selector.indexOf('#')) === -1 ? selector : selector.slice(1)) : COMPONENT_CONTAINER_ID;
+      if (!this.webApp || !this.displayInfo) {
+        return;
+      }
+      var cashier = document.getElementById(cashierId);
+      if (!cashier) return;
+      // 输入框聚焦时修改定位信息和top距离
+      if (focus) {
+        cashier.style.setProperty('position', 'fixed', 'important');
+        cashier.style.setProperty('top', "".concat(this.clientHeight - cashier.clientHeight, "px"), 'important');
+      } else {
+        // 失焦时移除定位信息
+        cashier.style.removeProperty('position');
+        cashier.style.removeProperty('top');
+      }
+    }
   }, {
     key: "handleAppHeartBeat",
     value: function handleAppHeartBeat() {
@@ -298,6 +394,63 @@ export var ContainerService = /*#__PURE__*/function () {
         closeBlock === null || closeBlock === void 0 || closeBlock.classList.add("".concat(COMPONENT_CLOSE_MASK_BLOCK_ID, "-hidden"));
       }
     }
+  }, {
+    key: "handleCloseButtonTheme",
+    value: function handleCloseButtonTheme(style) {
+      if (!style) return;
+      var closeBlock = document.getElementById(COMPONENT_CLOSE_BLOCK_ID);
+      var closeButtonImg = closeBlock === null || closeBlock === void 0 ? void 0 : closeBlock.querySelector('img');
+      var maskCloseBlock = document.getElementById(COMPONENT_CLOSE_MASK_BLOCK_ID);
+      if (style === 'light') {
+        closeButtonImg === null || closeButtonImg === void 0 || closeButtonImg.setAttribute('src', closeImgLight);
+        closeBlock === null || closeBlock === void 0 || closeBlock.classList.add("".concat(COMPONENT_CLOSE_BLOCK_ID, "-light"));
+        maskCloseBlock === null || maskCloseBlock === void 0 || maskCloseBlock.classList.add("".concat(COMPONENT_CLOSE_MASK_BLOCK_ID, "-light"));
+      } else {
+        closeButtonImg === null || closeButtonImg === void 0 || closeButtonImg.setAttribute('src', closeImg);
+        closeBlock === null || closeBlock === void 0 || closeBlock.classList.remove("".concat(COMPONENT_CLOSE_BLOCK_ID, "-light"));
+        maskCloseBlock === null || maskCloseBlock === void 0 || maskCloseBlock.classList.remove("".concat(COMPONENT_CLOSE_MASK_BLOCK_ID, "-light"));
+      }
+    }
+
+    // SDK主动打开弹框
+  }, {
+    key: "handlePopupWindow",
+    value: function handlePopupWindow(data) {
+      var _this$displayInfo4,
+        _this3 = this;
+      if (data.paymentElementOldModel) return;
+      insertStyleSheet();
+      this.popupManager.popup(_objectSpread({
+        platform: (_this$displayInfo4 = this.displayInfo) === null || _this$displayInfo4 === void 0 ? void 0 : _this$displayInfo4.platform,
+        showCloseOnLoading: data.showCloseOnLoading,
+        onCloseOnLoading: function onCloseOnLoading() {
+          return _this3.handlePopWindow(data);
+        }
+      }, data)).then(function () {
+        _this3.eventCenter.addIFrame(_this3.popupManager.popupApp);
+      }).catch(function (error) {
+        _this3.logService.logError({
+          title: (error === null || error === void 0 ? void 0 : error.title) || 'sdk_error_create_pop_up'
+        }, error);
+        _this3.eventCenter.emit(EVENT.error.name, ERRORMESSAGE.CREATECOMPONENT_ERROR.LOAD_APP_TIMEOUT);
+      });
+    }
+
+    // SDK主动关闭弹框
+  }, {
+    key: "handlePopWindow",
+    value: function handlePopWindow(data) {
+      this.popupManager.pop();
+      this.eventCenter.dispatchToApp({
+        event: EVENT.popWindow.name,
+        data: data
+      });
+    }
+  }, {
+    key: "getWebApp",
+    value: function getWebApp() {
+      return this.webApp;
+    }
   }]);
   return ContainerService;
 }();

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

@@ -1,17 +1,20 @@
 import { PlatformEnum } from '../../../types';
+export type IPopUpParams = {
+    url: string;
+    widthPadding: number;
+    heightPadding: number;
+    platform: PlatformEnum;
+    showCloseOnLoading: boolean;
+    onCloseOnLoading: () => void;
+};
 /**
  * @author 谦彧 <zhangmian.zm@alipay.com>
  * @date 2024/9/22
  */
 export declare class PopupManager {
     private popupUrlQuery;
-    private popupApp;
+    popupApp: HTMLIFrameElement;
     setPopupUrlQuery(queryParams: string): void;
-    popup(data: {
-        url: string;
-        widthPadding: number;
-        heightPadding: number;
-        platform: PlatformEnum;
-    }): Promise<void>;
+    popup(data: IPopUpParams): Promise<void>;
     pop(): void;
 }

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

@@ -53,7 +53,9 @@ export var PopupManager = /*#__PURE__*/function () {
                 widthPadding: data === null || data === void 0 ? void 0 : data.widthPadding,
                 device: data === null || data === void 0 ? void 0 : data.platform,
                 url: pageUrl,
-                loadingConfig: undefined
+                loadingConfig: undefined,
+                showCloseOnLoading: data.showCloseOnLoading,
+                onCloseOnLoading: data.onCloseOnLoading
               });
             case 11:
               this.popupApp = _context.sent;

package/esm/foundation/service/event-center.js

@@ -109,6 +109,7 @@ export var EventCenter = /*#__PURE__*/function () {
       var isJson = isJsonString(e.data);
       if (isJson) {
         var _eventPayload = JSON.parse(e.data);
+        if (_eventPayload.context.event && _eventPayload.context.event !== 'onLog') {}
         if (!this.checkEventCompliant(_eventPayload)) {
           return;
         }

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

@@ -89,7 +89,9 @@ _defineProperty(LogComplianceExtendKeys, "complianceExtParams", {
   // M 数字类型
   timeCost: 'M',
   pageLoadProgress: 'M',
-  fsDuration: 'M'
+  fsDuration: 'M',
+  // 由于部分logerror参数是msg
+  msg: 'C'
 });
 export var KEYS = {
   EVENT_SDK_ON_ABNORMAL_EVENT_NAME: {

package/esm/foundation/service/log/types.d.ts

@@ -5,6 +5,7 @@
 export interface LogPayload {
     title?: string;
     msg?: string;
+    errorMessage?: string;
     name?: string;
     label?: string;
     time?: number;

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

@@ -13,7 +13,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import axios from 'axios';
 import { ServiceProvider } from '..';
 import { errorEnum } from "./deps";
-import { appId, device, fomatGetwayError, get, hostSignMap, isPC, lightSandboxMap, queryParse, requestHost, safeJson, sdkVersion, sofaId, tntInstId } from "./deps";
+import { appId, device, fomatGetwayError, get, hostSignMap, lightSandboxMap, queryParse, requestHost, safeJson, sdkVersion, sofaId, tntInstId } from "./deps";
 
 /**
  * @author congle.zzq <congle.zzq@alipay.com>
@@ -50,7 +50,6 @@ export var RequesterService = /*#__PURE__*/function () {
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              console.log('[DEBUG] request start', requestData, options);
               envInfo = this.getEnvInfo(options);
               _data = [_objectSpread(_objectSpread({}, requestData), {}, {
                 envInfo: envInfo,
@@ -60,31 +59,24 @@ export var RequesterService = /*#__PURE__*/function () {
               })];
               startTime = Date.now();
               traceId = '';
-              _context.prev = 5;
-              console.log('[DEBUG] createRequestInstance start');
+              _context.prev = 4;
               myRequest = this.createRequestInstance(options);
-              console.log('[DEBUG] createRequestInstance completed', myRequest);
-              console.log('[DEBUG] myRequest start');
-              _context.next = 12;
+              _context.next = 8;
               return myRequest({
                 data: _data
               });
-            case 12:
+            case 8:
               _yield$myRequest = _context.sent;
               data = _yield$myRequest.data;
               headers = _yield$myRequest.headers;
-              console.log('[DEBUG] myRequest completed', data, headers);
               resData = data || {};
               traceId = get(headers, 'Mgw-TraceId') || get(headers, 'mgw-traceid', '');
               resData.traceId = traceId || '';
-              console.log('[DEBUG] handleGetWayError start');
               handleGetWayError = fomatGetwayError(headers, traceId);
-              console.log('[DEBUG] handleGetWayError completed', handleGetWayError);
               if (!(handleGetWayError !== null && handleGetWayError !== void 0 && handleGetWayError.errorCode)) {
-                _context.next = 29;
+                _context.next = 20;
                 break;
               }
-              console.log('[DEBUG] handleGetWayError errorCode', handleGetWayError === null || handleGetWayError === void 0 ? void 0 : handleGetWayError.errorCode);
               errorMessage = (resData === null || resData === void 0 ? void 0 : resData.errorMessage) || (handleGetWayError === null || handleGetWayError === void 0 ? void 0 : handleGetWayError.errorMessage);
               errorCode = handleGetWayError === null || handleGetWayError === void 0 ? void 0 : handleGetWayError.errorCode;
               this.reportRequestTimeCost({
@@ -94,20 +86,15 @@ export var RequesterService = /*#__PURE__*/function () {
                 time: Date.now() - startTime,
                 success: false,
                 code: errorCode,
-                msg: errorMessage,
-                traceId: traceId
-              });
-              console.log('[DEBUG] handleGetWayError error', {
                 errorMessage: errorMessage,
-                errorCode: errorCode,
-                success: false
+                traceId: traceId
               });
               throw new Error(JSON.stringify({
                 errorMessage: errorMessage,
                 errorCode: errorCode,
                 success: false
               }));
-            case 29:
+            case 20:
               this.reportRequestTimeCost({
                 title: 'a3753.b101271.c388193.d521387',
                 name: options === null || options === void 0 ? void 0 : options['Operation-Type'],
@@ -115,21 +102,19 @@ export var RequesterService = /*#__PURE__*/function () {
                 time: Date.now() - startTime,
                 success: true,
                 code: 'SUCCESS',
-                msg: '',
+                errorMessage: '',
                 traceId: traceId
               });
-              console.log('[DEBUG] request completed', resData);
               return _context.abrupt("return", resData);
-            case 34:
-              _context.prev = 34;
-              _context.t0 = _context["catch"](5);
+            case 24:
+              _context.prev = 24;
+              _context.t0 = _context["catch"](4);
               _error = safeJson(_context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.message, {
                 success: false,
                 errorCode: errorEnum.SYSTEM,
                 traceId: traceId,
                 errorMessage: _context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.message
               });
-              console.log('[DEBUG] request error 1', _error);
               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;
               this.reportRequestTimeCost({
@@ -139,25 +124,20 @@ export var RequesterService = /*#__PURE__*/function () {
                 time: Date.now() - startTime,
                 success: false,
                 code: _errorCode,
-                msg: JSON.stringify((_error === null || _error === void 0 ? void 0 : _error.message) || _context.t0)
-              });
-              console.log('[DEBUG] request error 2', {
-                success: false,
-                errorCode: _errorCode,
-                traceId: traceId,
-                errorMessage: _error === null || _error === void 0 ? void 0 : _error.message
+                errorMessage: JSON.stringify((_error === null || _error === void 0 ? void 0 : _error.errorMessage) || _context.t0)
               });
               return _context.abrupt("return", Promise.reject({
                 success: false,
                 errorCode: _errorCode,
                 traceId: traceId,
-                errorMessage: _error === null || _error === void 0 ? void 0 : _error.message
+                stack: _context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.stack,
+                errorMessage: _error === null || _error === void 0 ? void 0 : _error.errorMessage
               }));
-            case 43:
+            case 31:
             case "end":
               return _context.stop();
           }
-        }, _callee, this, [[5, 34]]);
+        }, _callee, this, [[4, 24]]);
       }));
       function request(_x, _x2) {
         return _request.apply(this, arguments);
@@ -169,7 +149,7 @@ export var RequesterService = /*#__PURE__*/function () {
     value: function getEnvInfo(options) {
       var _options$envInfo;
       var envInfo = _objectSpread(_objectSpread({
-        terminalType: isPC() ? 'WEB' : 'WAP',
+        terminalType: device.isMobile ? 'WAP' : 'WEB',
         browserInfo: {
           browserJavaScriptEnabled: true,
           browserLanguage: navigator.language,

package/esm/foundation/utils/preload_helper.d.ts

@@ -4,10 +4,10 @@ export default class PreloadHelper {
     static isWebAppPreloaded: boolean;
     static isSecuritySDKPreloaded: boolean;
     private static securitySdkMap;
-    static preloadWebApp(productScene: ProductSceneEnum, paymentMethodCategoryType: PaymentMethodCategoryTypeEnum, environment?: string): void;
+    static preloadWebApp(productScene: ProductSceneEnum, paymentMethodCategoryType: PaymentMethodCategoryTypeEnum, environment?: string, useV2?: boolean): void;
     static preloadSecuritySDK(product: ProductSceneEnum, securityRegion?: string): void;
     static getSecuritySdk(scene: any): Security;
-    static buildWebAppPreloadUrl(productScene: ProductSceneEnum, paymentMethodCategoryType: PaymentMethodCategoryTypeEnum, environment: string): {
+    static buildWebAppPreloadUrl(productScene: ProductSceneEnum, paymentMethodCategoryType: PaymentMethodCategoryTypeEnum, environment: string, useV2?: boolean): {
         preloadUrl: string;
         containerId: string;
     };