@alipay/ams-checkout 0.0.1732700846-dev.1 → 0.0.1732700846-dev.11

package/esm/core/component/index.js

@@ -40,7 +40,7 @@ import { ApplePayBusSubscriber } from "../../plugin/applepay";
 import ComponentApp from "../../plugin/component";
 import { ExtendPlugin } from "../../plugin/const";
 import { PaypalBusSubscriber } from "../../plugin/paypal";
-import { ComponentSignEnum, ComponentSignEnumV2, EnvironmentEnum, modeEnum, networkModeEnum, ProductSceneEnum, DisplayTypeEnum } from "../../types";
+import { ComponentSignEnum, ComponentSignEnumV2, DisplayTypeEnum, EnvironmentEnum, modeEnum, networkModeEnum, ProductSceneEnum } from "../../types";
 import { getOrSetStorageId, isPC, parseBase64ToString } from "../../util";
 import { createIframeNode, createPreloadIframeNode } from "../../util/createIframeNode";
 import { getSecurityConfigStorageKey } from "../../util/security";
@@ -101,7 +101,7 @@ var handleParams = function handleParams(params, _this) {
     parseData = _handleSessionData2[0],
     sessionData = _handleSessionData2[1];
   var componentSign = getComponentSign(parseData);
-  if (_toConsumableArray(Object.values(ComponentSignEnumV2)).includes(componentSign) && _params.renderDisplayType === DisplayTypeEnum.popup) {
+  if (_toConsumableArray(Object.values(ComponentSignEnumV2)).includes(componentSign) && _params.renderDisplayType === DisplayTypeEnum.popup && window.location.href.indexOf('popup=true') === -1) {
     return Promise.reject({
       code: ERRORMESSAGE.CREATEPAYMENT_PARAMETER_ERROR.code,
       message: "unsupported payment method"
@@ -219,19 +219,15 @@ export var AMSComponent = /*#__PURE__*/function (_CoreInstance) {
           this.logger.logInfo({
             title: 'preload_match'
           }, {
-            preloadChannel: this.channelType,
-            preloadVersion: this.productSceneVersion,
-            sessionDataChannel: channelType,
-            sessionDataVersion: productSceneVersion
+            eventMessage: channelType,
+            productSceneVersion: productSceneVersion
           });
         } else {
           this.logger.logInfo({
             title: 'preload_no_match'
           }, {
-            preloadChannel: this.channelType,
-            preloadVersion: this.productSceneVersion,
-            sessionDataChannel: channelType,
-            sessionDataVersion: productSceneVersion
+            eventMessage: channelType,
+            productSceneVersion: productSceneVersion
           });
         }
         var previousChannel = {
@@ -332,7 +328,7 @@ export var AMSComponent = /*#__PURE__*/function (_CoreInstance) {
             _this4.logger.logInfo({
               title: 'canMakePayments_error'
             }, {
-              params: JSON.stringify(e)
+              errorMessage: JSON.stringify(e)
             });
             resolve(false);
           });
@@ -403,7 +399,7 @@ export var AMSComponent = /*#__PURE__*/function (_CoreInstance) {
         this.logger.logError({
           title: 'performance_optimization_channelType_error'
         }, {
-          channelType: channelType
+          eventMessage: channelType
         });
       }
       this.timer = setTimeout(function () {

package/esm/core/instance/index.js

@@ -163,7 +163,7 @@ var AMSSDK = /*#__PURE__*/function () {
       this.logger.logInfo({
         title: 'sdk_event_securitySdkPreInit'
       }, {
-        product: product
+        productScene: product
       }).send();
       var sdk = this._getSecuritySDKByProductScene({
         product: product || scene
@@ -176,14 +176,14 @@ var AMSSDK = /*#__PURE__*/function () {
         _this.logger.logInfo({
           title: 'sdk_event_securitySdkPreInitSuccess'
         }, {
-          product: product
+          productScene: product
         }).send();
       }, function (msg) {
         _this.logger.logError({
           title: 'sdk_error_securitySdkInitFailed',
           msg: msg
         }, {
-          product: product,
+          productScene: product,
           sign: 'Active initialization'
         }).send();
       });

package/esm/foundation/core/index.d.ts

@@ -12,6 +12,7 @@ export declare class AntomSDKCore {
     private instanceId;
     private sdkMetaData;
     private productProcessors;
+    private enablePopWindowEventCallback;
     constructor();
     registerProcessor(productScene: string, paymentMethod: string, processor: ProductProcessor): void;
     init(options: IoptionsParams, productScene: ProductSceneEnum): void;
@@ -22,5 +23,6 @@ export declare class AntomSDKCore {
     getPaymentContext(): PaymentContext;
     destroy(): void;
     private handleBehaviorRender;
+    private handleClose;
     private cleanRender;
 }

package/esm/foundation/core/index.js

@@ -10,7 +10,7 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import { DisplayTypeEnum } from "../../types";
+import { DisplayTypeEnum, eventCodeEnum } from "../../types";
 import { DisplayInfo } from "../index";
 import { v4 as uuid } from 'uuid';
 import { ServiceProvider } from "../service";
@@ -21,7 +21,7 @@ import { parseWebAppMatchConfig } from "../utils/web_app_url_utils";
 import { redirect } from "../utils/redirect_utils";
 import { insertStyleSheet } from "../../component/popupWindow.style";
 import { hideMockup, createMockup, createRetentionPopup, hideRetentionPopup, showRetentionPopup, cleanMockup, removeRetentionPopup, handleDeclareInfo } from "../../component/component.popup.style";
-import { EVENT, LOADING_ID } from "../../constant";
+import { COMPONENT_CLOSE_MASK_BLOCK_ID, EVENT, LOADING_ID } from "../../constant";
 /**
  * @author 谦彧 <zhangmian.zm@alipay.com>
  * @date 2024/9/17
@@ -35,6 +35,7 @@ export var AntomSDKCore = /*#__PURE__*/function () {
     _defineProperty(this, "instanceId", void 0);
     _defineProperty(this, "sdkMetaData", void 0);
     _defineProperty(this, "productProcessors", {});
+    _defineProperty(this, "enablePopWindowEventCallback", false);
   }
   _createClass(AntomSDKCore, [{
     key: "registerProcessor",
@@ -150,6 +151,23 @@ export var AntomSDKCore = /*#__PURE__*/function () {
           return _ref2.apply(this, arguments);
         };
       }());
+      eventCenter.listen(EVENT.closeCallback.name, function () {
+        var _options$onClose;
+        (_options$onClose = options.onClose) === null || _options$onClose === void 0 || _options$onClose.call(options);
+      });
+      eventCenter.listen(EVENT.eventCallback.name, function (data) {
+        var _options$onEventCallb;
+        (_options$onEventCallb = options.onEventCallback) === null || _options$onEventCallb === void 0 || _options$onEventCallb.call(options, data);
+      });
+      eventCenter.listen(EVENT.error.name, function (data) {
+        var _options$onError;
+        (_options$onError = options.onError) === null || _options$onError === void 0 || _options$onError.call(options, data);
+      });
+      eventCenter.listen(EVENT.declareEventCallbackInfo.name, function (data) {
+        if (data !== null && data !== void 0 && data.popWindowEventInfo) {
+          _this.enablePopWindowEventCallback = data.popWindowEventInfo.enableCallback;
+        }
+      });
 
       // execute additional logic from specified product
       if (this.productProcessors[sdkMetaData.productScene]) {
@@ -160,7 +178,7 @@ export var AntomSDKCore = /*#__PURE__*/function () {
     key: "startBizFlow",
     value: function () {
       var _startBizFlow = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(options) {
-        var _this$paymentContext$, _this$paymentContext$2;
+        var _this$paymentContext$, _this$paymentContext$2, _this$paymentContext$3;
         var paymentSession, displayInfo, _convertPaymentSessio, paymentSessionId, paymentSessionMetaData, mid, webAppMatchConfig, webAppVersion, productScene, paymentMethod, _this$bizFlowStartBeh, payload;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
@@ -183,7 +201,7 @@ export var AntomSDKCore = /*#__PURE__*/function () {
                 sdkMetaData: this.sdkMetaData
               };
               // upgrade WebApp version
-              mid = this.paymentContext.paymentSessionObj.clientId;
+              mid = (_this$paymentContext$ = this.paymentContext.paymentSessionObj) === null || _this$paymentContext$ === void 0 ? void 0 : _this$paymentContext$.clientId;
               webAppMatchConfig = parseWebAppMatchConfig(this.paymentContext.paymentSessionObj.extendInfo);
               webAppVersion = getWebAppVersion(this.sdkMetaData, mid, webAppMatchConfig);
               this.sdkMetaData.webAppVersion = webAppVersion;
@@ -193,8 +211,8 @@ export var AntomSDKCore = /*#__PURE__*/function () {
               ServiceProvider.getInstance(this.instanceId).update(this.paymentContext);
 
               // Invoke processor
-              productScene = (_this$paymentContext$ = this.paymentContext.paymentSessionObj) === null || _this$paymentContext$ === void 0 || (_this$paymentContext$ = _this$paymentContext$.paymentSessionConfig) === null || _this$paymentContext$ === void 0 ? void 0 : _this$paymentContext$.productScene;
-              paymentMethod = (_this$paymentContext$2 = this.paymentContext.paymentSessionObj) === null || _this$paymentContext$2 === void 0 || (_this$paymentContext$2 = _this$paymentContext$2.paymentMethodInfoView) === null || _this$paymentContext$2 === void 0 ? void 0 : _this$paymentContext$2.paymentMethodType;
+              productScene = (_this$paymentContext$2 = this.paymentContext.paymentSessionObj) === null || _this$paymentContext$2 === void 0 || (_this$paymentContext$2 = _this$paymentContext$2.paymentSessionConfig) === null || _this$paymentContext$2 === void 0 ? void 0 : _this$paymentContext$2.productScene;
+              paymentMethod = (_this$paymentContext$3 = this.paymentContext.paymentSessionObj) === null || _this$paymentContext$3 === void 0 || (_this$paymentContext$3 = _this$paymentContext$3.paymentMethodInfoView) === null || _this$paymentContext$3 === void 0 ? void 0 : _this$paymentContext$3.paymentMethodType;
               _context3.prev = 13;
               if (!this.productProcessors["".concat(productScene, "|").concat(paymentMethod)]) {
                 _context3.next = 20;
@@ -284,6 +302,7 @@ export var AntomSDKCore = /*#__PURE__*/function () {
       var platform = this.paymentContext.displayInfo.platform;
       var payload = this.bizFlowStartBehavior.payload;
       var closeBtnCallbackForPopup = function closeBtnCallbackForPopup() {
+        var isOnCloseEvent = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
         if (displayType === DisplayTypeEnum.inline) {
           return;
         }
@@ -291,17 +310,13 @@ export var AntomSDKCore = /*#__PURE__*/function () {
           showRetentionPopup();
           return;
         } else {
-          _this2.cleanRender();
-          eventCenter.dispatchToApp({
-            event: EVENT.close.name,
-            data: {}
-          });
+          _this2.handleClose(isOnCloseEvent);
         }
       };
 
       // TODO 感觉有死循环
       eventCenter.listen(EVENT.close.name, function () {
-        closeBtnCallbackForPopup();
+        closeBtnCallbackForPopup(true);
       });
       eventCenter.listen(EVENT.setAllowRetention.name, function (data) {
         if (data === undefined || typeof data !== 'boolean') {
@@ -322,26 +337,40 @@ export var AntomSDKCore = /*#__PURE__*/function () {
         createRetentionPopup(platform, function () {
           hideRetentionPopup();
         }, function () {
-          eventCenter.dispatchToApp({
-            event: EVENT.close.name,
-            data: {}
-          });
           hideRetentionPopup();
-          _this2.cleanRender();
+          _this2.handleClose();
         });
         createMockup({
           platform: platform,
-          onClickOutside: payload.allowClickPopupOutsideClose ? closeBtnCallbackForPopup : undefined
+          onClickOutside: payload.allowClickPopupOutsideClose ? closeBtnCallbackForPopup : undefined,
+          closeBtnFunc: closeBtnCallbackForPopup
         });
         containerService.showLoading(container, this.paymentContext.displayInfo);
         return;
       }
     }
+  }, {
+    key: "handleClose",
+    value: function handleClose() {
+      var isOnCloseEvent = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+      var eventCenter = ServiceProvider.getInstance(this.instanceId).getService('EventCenter');
+      eventCenter.emit(EVENT.closeCallback.name, {});
+      if (this.enablePopWindowEventCallback && !isOnCloseEvent) {
+        eventCenter.emit(EVENT.eventCallback.name, {
+          code: eventCodeEnum.SDK_PAYMENT_CANCEL,
+          result: {
+            result: {}
+          }
+        });
+      }
+      this.cleanRender();
+    }
   }, {
     key: "cleanRender",
     value: function cleanRender() {
       var _this3 = this,
-        _document$getElementB;
+        _document$getElementB,
+        _document$getElementB2;
       var immediately = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
       var containerService = ServiceProvider.getInstance(this.instanceId).getService('Container');
       var cleanElement = function cleanElement() {
@@ -350,7 +379,8 @@ export var AntomSDKCore = /*#__PURE__*/function () {
         removeRetentionPopup();
         // TODO @/component this.removeEventListener();
       };
-      (_document$getElementB = document.getElementById(LOADING_ID)) === null || _document$getElementB === void 0 || _document$getElementB.remove();
+      (_document$getElementB = document.getElementById(COMPONENT_CLOSE_MASK_BLOCK_ID)) === null || _document$getElementB === void 0 || _document$getElementB.remove();
+      (_document$getElementB2 = document.getElementById(LOADING_ID)) === null || _document$getElementB2 === void 0 || _document$getElementB2.remove();
       containerService.startHideAnim();
       hideMockup();
       if (immediately) {

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

@@ -116,13 +116,14 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
   }, {
     key: "buildWebAppPreloadUrl",
     value: function buildWebAppPreloadUrl(initConfig, instanceId, sdkMetaData) {
-      var _this = this;
-      var previousProductInfo = ProductInfoCacheUtil.getPreviousProductInfo(ProductSceneEnum.EASY_PAY, function (erorrMsg) {
-        if (erorrMsg) {
+      var _this = this,
+        _initConfig$analytics;
+      var previousProductInfo = ProductInfoCacheUtil.getPreviousProductInfo(ProductSceneEnum.EASY_PAY, function (errorMsg) {
+        if (errorMsg) {
           _this.logger.logError({
             title: 'performance_optimization_get_previousChannel_error'
           }, {
-            error: erorrMsg
+            errorMessage: errorMsg
           });
         }
       });
@@ -137,7 +138,7 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
         isPreload: true,
         productSceneVersion: productSceneVersion,
         query: {
-          analyticsEnabled: initConfig.analytics.enabled,
+          analyticsEnabled: (_initConfig$analytics = initConfig.analytics) === null || _initConfig$analytics === void 0 ? void 0 : _initConfig$analytics.enabled,
           displayType: DisplayTypeEnum.popup,
           instanceId: instanceId,
           locale: initConfig.locale,
@@ -152,7 +153,7 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
   }, {
     key: "buildWebAppUrl",
     value: function buildWebAppUrl() {
-      var _paymentContext$payme3, _paymentContext$payme4;
+      var _paymentContext$payme3, _paymentContext$payme4, _this$initConfig$anal;
       var paymentContext = this.paymentContext;
       var paymentMethodCategoryType = (_paymentContext$payme3 = paymentContext.paymentSessionObj.paymentSessionConfig) === null || _paymentContext$payme3 === void 0 ? void 0 : _paymentContext$payme3.paymentMethodCategoryType;
       var productSceneVersion = (_paymentContext$payme4 = paymentContext.paymentSessionObj.paymentSessionConfig) === null || _paymentContext$payme4 === void 0 ? void 0 : _paymentContext$payme4.productSceneVersion;
@@ -164,7 +165,7 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
         productSceneVersion: productSceneVersion,
         isPreload: false,
         query: {
-          analyticsEnabled: this.initConfig.analytics.enabled,
+          analyticsEnabled: (_this$initConfig$anal = this.initConfig.analytics) === null || _this$initConfig$anal === void 0 ? void 0 : _this$initConfig$anal.enabled,
           displayType: DisplayTypeEnum.popup,
           instanceId: this.instanceId,
           locale: this.initConfig.locale,
@@ -294,8 +295,8 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
               this.logger.logInfo({
                 title: 'sdk_event_submitPay'
               }, {
-                paymentSessionConfig: JSON.stringify(submitParams.paymentSessionConfig),
-                requestBizId: requestBizId
+                config: JSON.stringify(submitParams.paymentSessionConfig),
+                requestId: requestBizId
               });
               // 由渠道定制点来构建额外参数
               extParams = ((_this$channelBehavior2 = this.channelBehavior) === null || _this$channelBehavior2 === void 0 || (_this$channelBehavior3 = _this$channelBehavior2.buildSubmitPayExtParams) === null || _this$channelBehavior3 === void 0 ? void 0 : _this$channelBehavior3.call(_this$channelBehavior2, {
@@ -336,9 +337,9 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
               this.logger.logInfo({
                 title: 'sdk_event_submitPayEnd'
               }, {
-                paymentSessionConfig: JSON.stringify(submitParams.paymentSessionConfig),
-                requestBizId: requestBizId,
-                traceId: res.traceId
+                config: JSON.stringify(submitParams.paymentSessionConfig),
+                requestId: requestBizId,
+                rpcTraceId: res.traceId
               });
               return _context2.abrupt("return", res);
             case 30:
@@ -347,10 +348,10 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
               this.logger.logError({
                 title: 'sdk_event_submitPay_failed'
               }, {
-                paymentSessionConfig: JSON.stringify(submitParams.paymentSessionConfig),
-                errorReason: _context2.t7,
-                requestBizId: requestBizId,
-                traceId: _context2.t7 === null || _context2.t7 === void 0 ? void 0 : _context2.t7.traceId
+                config: JSON.stringify(submitParams.paymentSessionConfig),
+                errorMessage: _context2.t7,
+                requestId: requestBizId,
+                rpcTraceId: _context2.t7 === null || _context2.t7 === void 0 ? void 0 : _context2.t7.traceId
               });
               throw _context2.t7;
             case 34:

package/esm/foundation/service/api-bus/busManager.d.ts

@@ -15,17 +15,17 @@ export declare enum BusLogEventEnum {
     /**
      * 查询是否订阅
      * action：string
-     * sub: bool
+     * sub (processResult): bool
      */
     sdk_event_busIsSubscribe = "sdk_event_busIsSubscribe",
     /**
      * 订阅协议
-     * actions: string[] , 用逗号拼接
+     * actions (actionNames): string[] , 用逗号拼接
      */
     sdk_event_busSubscribe = "sdk_event_busSubscribe",
     /**
      * 退订协议
-     * actions: string[] , 用逗号拼接
+     * actions (actionNames): string[] , 用逗号拼接
      */
     sdk_event_busUnsubscribe = "sdk_event_busUnsubscribe",
     /**

package/esm/foundation/service/api-bus/busManager.js

@@ -147,7 +147,7 @@ export var BusManager = /*#__PURE__*/function () {
         this.logger.logInfo({
           title: title
         }, _objectSpread({
-          biz: 'sdk'
+          eventSource: 'sdk'
         }, optionalParams)).send();
       }
     }
@@ -161,7 +161,7 @@ export var BusManager = /*#__PURE__*/function () {
         this.logger.logError({
           title: title
         }, _objectSpread({
-          biz: 'sdk'
+          eventSource: 'sdk'
         }, optionalParams)).send();
       }
     }
@@ -194,7 +194,7 @@ export var BusManager = /*#__PURE__*/function () {
         setTimeout(function () {
           if (failed) {
             _this.traceError(BusLogEventEnum.sdk_error_busPublishNoResult, {
-              action: message.getAction()
+              actionName: message.getAction()
             });
             if ((config === null || config === void 0 ? void 0 : config.fallback) !== null) {
               resolve(message.result(config === null || config === void 0 ? void 0 : config.fallback));
@@ -211,7 +211,7 @@ export var BusManager = /*#__PURE__*/function () {
       var _this2 = this;
       var _callBack = function _callBack(result) {
         _this2.traceLog(BusLogEventEnum.sdk_event_busPublishCallback, {
-          action: message.getAction(),
+          actionName: message.getAction(),
           instanceId: _this2.instanceId
         });
         if (callback) {
@@ -222,7 +222,7 @@ export var BusManager = /*#__PURE__*/function () {
       var actionName = this.instanceId ? BusManager.getInstanceActionName(message.getAction(), this.instanceId) : message.getAction();
       var subscribers = BusManager.subscribersMap.get(actionName);
       this.traceLog(BusLogEventEnum.sdk_event_busPublishMessage, {
-        action: message.getAction(),
+        actionName: message.getAction(),
         instanceId: this.instanceId
       });
       if (!subscribers && this.instanceId) {
@@ -239,9 +239,9 @@ export var BusManager = /*#__PURE__*/function () {
               subscriber.onMessage(context, message);
             } catch (e) {
               this.traceError(BusLogEventEnum.sdk_error_busPublishError, {
-                action: message.getAction(),
+                actionName: message.getAction(),
                 instanceId: this.instanceId,
-                error: e
+                errorMessage: e
               });
               var _iterator2 = _createForOfIteratorHelper(BusManager.interceptors),
                 _step2;
@@ -280,7 +280,7 @@ export var BusManager = /*#__PURE__*/function () {
           this.publish(message, callback); // Re-publish the message
         } else {
           this.traceError(BusLogEventEnum.sdk_error_busPublishUnsubscribeError, {
-            action: message.getAction(),
+            actionName: message.getAction(),
             instanceId: this.instanceId
           });
         }
@@ -290,7 +290,7 @@ export var BusManager = /*#__PURE__*/function () {
     key: "subscribe",
     value: function subscribe(subscriber) {
       this.traceLog(BusLogEventEnum.sdk_event_busSubscribe, {
-        actions: subscriber.actionNames(),
+        actionNames: subscriber.actionNames(),
         instanceId: this.instanceId
       });
       var _iterator4 = _createForOfIteratorHelper(subscriber.actionNames()),
@@ -317,7 +317,7 @@ export var BusManager = /*#__PURE__*/function () {
     key: "unsubscribe",
     value: function unsubscribe(subscriber) {
       this.traceLog(BusLogEventEnum.sdk_event_busUnsubscribe, {
-        actions: subscriber.actionNames(),
+        actionNames: subscriber.actionNames(),
         instanceId: this.instanceId
       });
       var _iterator5 = _createForOfIteratorHelper(subscriber.actionNames()),
@@ -354,9 +354,9 @@ export var BusManager = /*#__PURE__*/function () {
       }
       if (subscribers && subscribers.length > 0) {
         this.traceLog(BusLogEventEnum.sdk_event_busIsSubscribe, {
-          action: actionName,
+          actionName: actionName,
           instanceId: this.instanceId,
-          sub: true
+          processResult: true
         });
         return true;
       }
@@ -377,9 +377,9 @@ export var BusManager = /*#__PURE__*/function () {
         return BusManager.subscribersMap.has(key);
       }
       this.traceLog(BusLogEventEnum.sdk_event_busIsSubscribe, {
-        action: actionName,
+        actionName: actionName,
         instanceId: this.instanceId,
-        sub: false
+        processResult: false
       });
       return false;
     }

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

@@ -24,7 +24,9 @@ export declare class ContainerService implements Service {
     startHideAnim(): void;
     private addCapabilityToEventCenter;
     private addCapabilityToApiBusManager;
+    private updateMaskCloseBtn;
     private handleSizeChanged;
     private handleAppHeartBeat;
     private changeCloseBtnVisibility;
+    private handleMaskCloseBtnShow;
 }

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

@@ -11,7 +11,7 @@ import { DisplayTypeEnum } from "../../../types";
 import { createIframe, createPreloadIframe, startSizeChangeAnim } from "./utils";
 import { addInlineLoading, createInlineBaseElement } from "../../../component/component.inline.style";
 import { addPopupLoading, createBaseElement } from "../../../component/component.popup.style";
-import { COMPONENT_CLOSE_BLOCK_ID, COMPONENT_CONTAINER_ID, ERRORMESSAGE, LOADING_ID, MOCKUP_ID } from "../../../constant";
+import { COMPONENT_CLOSE_BLOCK_ID, COMPONENT_CLOSE_MASK_BLOCK_ID, COMPONENT_CONTAINER_ID, ERRORMESSAGE, LOADING_ID, MOCKUP_ID } from "../../../constant";
 import { ServiceProvider } from "../index";
 import { EVENT, TIMEOUT_WEB_APP_HEART_BEAT, TIME_DELAY_SEND_HEART_BEAT } from "../../../constant";
 import { PopupManager } from "./popup";
@@ -82,6 +82,8 @@ export var ContainerService = /*#__PURE__*/function () {
       }
       var container = document.getElementById(COMPONENT_CONTAINER_ID);
       if (container) container === null || container === void 0 || container.remove();
+      this.webApp = null;
+      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();
@@ -204,6 +206,9 @@ export var ContainerService = /*#__PURE__*/function () {
       this.eventCenter.listen(EVENT.hideCloseButton.name, function () {
         _this2.changeCloseBtnVisibility(false);
       });
+      this.eventCenter.listen(EVENT.setMaskCloseButton.name, function (data) {
+        _this2.handleMaskCloseBtnShow(data);
+      });
       this.eventCenter.listen(EVENT.appHeartBeat.name, function () {
         _this2.handleAppHeartBeat();
       });
@@ -211,6 +216,21 @@ export var ContainerService = /*#__PURE__*/function () {
   }, {
     key: "addCapabilityToApiBusManager",
     value: function addCapabilityToApiBusManager() {}
+  }, {
+    key: "updateMaskCloseBtn",
+    value: function updateMaskCloseBtn(data) {
+      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");
+        }
+      }
+    }
   }, {
     key: "handleSizeChanged",
     value: function handleSizeChanged(data) {
@@ -239,6 +259,8 @@ export var ContainerService = /*#__PURE__*/function () {
         }
         // 关闭loading，保留蒙层
         this.dismissLoading();
+        // 更新弹窗关闭按钮位置
+        this.updateMaskCloseBtn(data);
       }
       if (this.displayInfo.type === DisplayTypeEnum.inline) {
         var _document$getElementB3;
@@ -293,6 +315,16 @@ export var ContainerService = /*#__PURE__*/function () {
         closeBlock === null || closeBlock === void 0 || closeBlock.classList.add("".concat(COMPONENT_CLOSE_BLOCK_ID, "-hidden"));
       }
     }
+  }, {
+    key: "handleMaskCloseBtnShow",
+    value: function handleMaskCloseBtnShow(data) {
+      var closeBlock = document.getElementById(COMPONENT_CLOSE_MASK_BLOCK_ID);
+      if ((data === null || data === void 0 ? void 0 : data.status) === 'show') {
+        closeBlock === null || closeBlock === void 0 || closeBlock.classList.remove("".concat(COMPONENT_CLOSE_MASK_BLOCK_ID, "-hidden"));
+      } else {
+        closeBlock === null || closeBlock === void 0 || closeBlock.classList.add("".concat(COMPONENT_CLOSE_MASK_BLOCK_ID, "-hidden"));
+      }
+    }
   }]);
   return ContainerService;
 }();

package/esm/foundation/service/event-center.d.ts

@@ -27,12 +27,17 @@ export declare class EventCenter implements Service {
      * @param domain - The domain of the app.
      */
     addIFrame(iframe: HTMLIFrameElement): void;
+    /**
+     * Cleans iframes when web app close
+     */
+    cleanIFrames(): void;
     removeIFrame(iframe: HTMLIFrameElement): void;
     /**
      * Handles messages received from the app.
      * @param e - The message event.
      */
     private handleAppMessage;
+    private checkEventCompliant;
     /**
      * Processes the application message and emits the associated event.
      * @param data - Parsed EventPayload from the app.
@@ -42,8 +47,9 @@ export declare class EventCenter implements Service {
      * Listens to an event by adding a callback function.
      * @param name - The name of the event to listen for.
      * @param func - The callback function to execute when the event is emitted.
+     * @param isAppend - Append to event handlers as chain, default value is false
      */
-    listen(name: string, func: IListener): void;
+    listen(name: string, func: IListener, isAppend?: boolean): void;
     /**
      * Unsubscribes from an event. If a function is provided, only that function is removed.
      * @param name - The name of the event to unlisten to.
@@ -55,7 +61,7 @@ export declare class EventCenter implements Service {
      * @param name - The name of the event to emit.
      * @param data - The event data to pass to the event listeners.
      */
-    emit(name: string, data: any, EventPayload?: EventPayload): void;
+    emit(name: string, data: any, eventPayload?: EventPayload): void;
     /**
      * Registers a callback for an event and immediately dispatches the event to the app.
      * @param payloadContext - The context containing event information and callback ID.
@@ -71,6 +77,6 @@ export declare class EventCenter implements Service {
     isExist(name: string): boolean;
 }
 interface IListener {
-    (data: any, EventPayload?: EventPayload): void;
+    (data: any, eventPayload?: EventPayload): void;
 }
 export {};