@alipay/ams-checkout 0.0.1726734012-dev.1 → 0.0.1726734012-dev.3

package/esm/plugin/component/index.js

@@ -19,20 +19,22 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { v4 as uuid } from 'uuid';
 import { sdkVersion } from "../../config";
-import { COMPONENTPLUGINID, COMPONENT_CLOSE_BLOCK_ID, COMPONENT_CONTAINER_ID, COMPONENT_RETENTION_ID, COMPONENT_SECTION_ID, ERRORMESSAGE, EVENT, LISTENER_PREFIX, LOADING_ID, LOADTIME_LIMIT, MOCKUP_ID, POPUP_LOADTIME_LOG_LIMIT, TIMEOUT_WEB_APP_HEART_BEAT, TIME_DELAY_SEND_HEART_BEAT } from "../../constant";
+import { COMPONENTPLUGINID, COMPONENT_CLOSE_BLOCK_ID, COMPONENT_CLOSE_MASK_BLOCK_ID, COMPONENT_CONTAINER_ID, COMPONENT_RETENTION_ID, COMPONENT_SECTION_ID, ERRORMESSAGE, EVENT, LISTENER_PREFIX, LOADING_ID, LOADTIME_LIMIT, MOCKUP_ID, POPUP_LOADTIME_LOG_LIMIT, TIMEOUT_WEB_APP_HEART_BEAT, TIME_DELAY_SEND_HEART_BEAT } from "../../constant";
 import { queryPaymentInfo, submitPayInfo } from "../../service";
-import { componentSignEnum, eventCodeEnum, messageName, platformEnum, productSceneEnum, RedirectType, renderDisplayTypeEnum, targetEnum } from "../../types";
+import { ComponentSignEnum, eventCodeEnum, MessageName, PlatformEnum, ProductSceneEnum, RedirectType, DisplayTypeEnum, TargetEnum } from "../../types";
 import { getType, isJsonString, isPC } from "../../util";
 import { isLocalMock } from "../../util/mock";
 import { matchVersion } from "../../util/versionCompare";
+import { getBackScheme } from "../../util/getBackScheme";
+import { handlePaymentSessionConfig } from "../payment-element/utils";
 import { createIframe, createPreloadIframe, getAppDomain, getIframeUrl } from "./cashierApp";
-import { getChannelBehavior } from "./channel";
+import { getChannelBehavior, handleGooglePay } from "./channel";
 import { addInlineLoading, createInlineBaseElement } from "./component.inline.style";
-import { addPopupLoading, createBaseElement, createMockup, createRetentionPopup, handleDeclareInfo as _handleDeclareInfo, hideRetentionPopup, removeRetentionPopup as _removeRetentionPopup } from "./component.popup.style";
-import { createModal, destroyModal, insertStyleSheet } from "./popupWindow.style";
+import { addPopupLoading, createBaseElement, createMockup, createRetentionPopup, handleDeclareInfo as _handleDeclareInfo, hideRetentionPopup, removeRetentionPopup as _removeRetentionPopup, slideInAndOutKeyframes } from "./component.popup.style";
+import { createModal, destroyModal, insertStyleSheet, removePopupLoading } from "./popupWindow.style";
 window.changingPageHeight = window.innerHeight;
 var ComponentApp = /*#__PURE__*/function () {
-  function ComponentApp() {
+  function ComponentApp(componentOption) {
     _classCallCheck(this, ComponentApp);
     _defineProperty(this, "app", void 0);
     _defineProperty(this, "AMSSDK", void 0);
@@ -52,13 +54,14 @@ var ComponentApp = /*#__PURE__*/function () {
     _defineProperty(this, "_actionQueryPromise", null);
     _defineProperty(this, "_actionSubmitPromise", null);
     _defineProperty(this, "_renderParams", null);
-    _defineProperty(this, "_componentSign", componentSignEnum.NONE);
+    _defineProperty(this, "_componentSign", ComponentSignEnum.NONE);
     _defineProperty(this, "_appLocationSearch", void 0);
-    _defineProperty(this, "_renderDisplayType", renderDisplayTypeEnum.popup);
+    _defineProperty(this, "_renderDisplayType", DisplayTypeEnum.popup);
     _defineProperty(this, "_multipleCallbackEvents", void 0);
+    _defineProperty(this, "_isAppWebview", void 0);
     _defineProperty(this, "_merchantAppointParam", void 0);
     _defineProperty(this, "_webAppHeartBeatTimeoutFn", void 0);
-    this._appVersion = '1.20.2';
+    this._appVersion = componentOption.appVersion;
     this._isInitComponent = false;
     this._selector = "#".concat(COMPONENT_SECTION_ID);
     this.createIframeNode = function () {
@@ -67,7 +70,7 @@ var ComponentApp = /*#__PURE__*/function () {
     this.createPreloadIframeNode = function () {
       return Promise.resolve();
     };
-    this.platform = isPC() ? platformEnum.desktop : platformEnum.mobile;
+    this.platform = isPC() ? PlatformEnum.desktop : PlatformEnum.mobile;
     this._isRetention = true;
     this._appLocationSearch = '';
     this._performanceData.push({
@@ -102,12 +105,12 @@ var ComponentApp = /*#__PURE__*/function () {
       var paymentSessionMetaData = (_this$_renderParams = this._renderParams) === null || _this$_renderParams === void 0 ? void 0 : _this$_renderParams.paymentSessionMetaData;
       var paymentSessionConfig = paymentSessionMetaData.paymentSessionConfig;
       this.AMSSDK.logger.setMedta({
-        platform: this.platform === platformEnum.desktop ? 'PC' : 'WAP',
+        platform: this.platform === PlatformEnum.desktop ? 'PC' : 'WAP',
         // PC/WAP,
         sdkVersion: sdkVersion,
         webAppVersion: this._appVersion,
         instanceId: this.AMSSDK._instanceId,
-        storageId: this.AMSSDK._storageId,
+        deviceId: this.AMSSDK._storageId,
         // the better way to use md5 paymentSesionID
         renderDisplayType: paymentSessionMetaData === null || paymentSessionMetaData === void 0 ? void 0 : paymentSessionMetaData.renderDisplayType,
         merchantId: paymentSessionMetaData === null || paymentSessionMetaData === void 0 ? void 0 : paymentSessionMetaData.clientId,
@@ -139,12 +142,12 @@ var ComponentApp = /*#__PURE__*/function () {
       var _this$_renderParams4,
         _this = this;
       var product = (_this$_renderParams4 = this._renderParams) === null || _this$_renderParams4 === void 0 || (_this$_renderParams4 = _this$_renderParams4.paymentSessionMetaData) === null || _this$_renderParams4 === void 0 || (_this$_renderParams4 = _this$_renderParams4.paymentSessionConfig) === null || _this$_renderParams4 === void 0 ? void 0 : _this$_renderParams4.productScene;
-      if (componentSignEnum.CASHIER_PAYMENT_APM === this._componentSign) return;
-      if (componentSignEnum.CASHIER_PAYMENT_BANK === this._componentSign) {
+      if (ComponentSignEnum.CASHIER_PAYMENT_APM === this._componentSign) return;
+      if (ComponentSignEnum.CASHIER_PAYMENT_BANK === this._componentSign) {
         this.AMSSDK.logger.logInfo({
           title: 'sdk_event_security_unneeded_scenarios'
         }, {
-          product: product
+          productScene: product
         });
       }
       var securitySDK = this.AMSSDK._getSecuritySDKByProductScene({
@@ -177,15 +180,13 @@ var ComponentApp = /*#__PURE__*/function () {
         this.AMSSDK.logger.logInfo({
           title: 'sdk_event_securitySdkGetTokenSuccess'
         }, {
-          deviceId: deviceId,
-          time: time
+          eventMessage: time
         }).send();
       } else {
         this.AMSSDK.logger.logInfo({
           title: 'sdk_error_securitySdkGetTokenFailed'
         }, {
-          deviceId: deviceId,
-          time: time
+          eventMessage: time
         }).send();
       }
     }
@@ -249,6 +250,12 @@ var ComponentApp = /*#__PURE__*/function () {
     key: "appendIframeNodes",
     value: function appendIframeNodes(componentSign, renderParams) {
       var _renderParams,
+        _renderParams2,
+        _this$_selector,
+        _this$_selector$index,
+        _this$_selector2,
+        _this$_selector2$slic,
+        _renderParams3,
         _this$_renderParams5,
         _this$_renderParams6,
         _this$_renderParams7,
@@ -259,13 +266,19 @@ var ComponentApp = /*#__PURE__*/function () {
         return Promise.reject(ERRORMESSAGE.CREATECOMPONENT_ERROR.SINGLETON_COMPONENT_ERROR);
       }
       renderParams = this.setParameterDefaultValues(componentSign, renderParams);
+      this._merchantAppointParam = renderParams.merchantAppointParam;
       this._isInitComponent = true;
       this._renderParams = renderParams;
       this._componentSign = componentSign;
       if ((_renderParams = renderParams) !== null && _renderParams !== void 0 && _renderParams.selector) this._selector = renderParams.selector;
-      this._renderDisplayType = renderParams.renderDisplayType;
-      this._merchantAppointParam = renderParams.merchantAppointParam;
-      var insertedNode = this._renderDisplayType === renderDisplayTypeEnum.inline ? "#".concat(COMPONENT_CONTAINER_ID) : this._selector;
+      this._renderDisplayType = (_renderParams2 = renderParams) === null || _renderParams2 === void 0 ? void 0 : _renderParams2.renderDisplayType;
+      // connect element模式会存在加载多个sdk，appendAliasContainerId为true来判断，给容器inlineId添加标识，id中不能存在#需在这里提前过滤一下
+      var _selector = (this === null || this === void 0 || (_this$_selector = this._selector) === null || _this$_selector === void 0 || (_this$_selector$index = _this$_selector.indexOf) === null || _this$_selector$index === void 0 ? void 0 : _this$_selector$index.call(_this$_selector, '#')) === -1 ? this === null || this === void 0 ? void 0 : this._selector : this === null || this === void 0 || (_this$_selector2 = this._selector) === null || _this$_selector2 === void 0 || (_this$_selector2$slic = _this$_selector2.slice) === null || _this$_selector2$slic === void 0 ? void 0 : _this$_selector2$slic.call(_this$_selector2, 1);
+      // 修改需当前文件搜索，这段注释appendAliasContainerId
+      var appendAliasContainerId = (_renderParams3 = renderParams) !== null && _renderParams3 !== void 0 && _renderParams3.appendAliasContainerId ? "-".concat(_selector) : '';
+      var inlineId = "".concat(COMPONENT_CONTAINER_ID).concat(appendAliasContainerId);
+      var insertedNode = (this === null || this === void 0 ? void 0 : this._renderDisplayType) === DisplayTypeEnum.inline ? "#".concat(inlineId) : this === null || this === void 0 ? void 0 : this._selector;
+      this._isAppWebview = renderParams.isAppWebview;
       this.initLoggerMeta();
       this.initSecurity();
       this._performanceData.push({
@@ -294,17 +307,16 @@ var ComponentApp = /*#__PURE__*/function () {
       this.AMSSDK.logger.logInfo({
         title: 'sdk_event_createComponent'
       }, {
-        version: productSceneVersion,
-        product: this.AMSSDK.options.product
+        productScene: this.AMSSDK.options.product
       }).send();
-      if (componentSignEnum.EASY_PAY_WALLET === this._componentSign) {
-        if (productScene === productSceneEnum.EASY_PAY && productSceneVersion === '1.0' && !autoDebitWithToken && requireFastSdk) {
+      if (ComponentSignEnum.EASY_PAY_WALLET === this._componentSign) {
+        if (productScene === ProductSceneEnum.EASY_PAY && productSceneVersion === '1.0' && !autoDebitWithToken && requireFastSdk) {
           // EASY_PAY 1.0首次支付，requireFastSdk为true，不需要接口请求
           this.handleAuthUrlInfo(authUrlInfo);
           return;
         }
       }
-      if (componentSignEnum.AUTO_DEBIT_WALLET === this._componentSign) {
+      if (ComponentSignEnum.AUTO_DEBIT_WALLET === this._componentSign) {
         var _this$_renderParams9, _action$web, _action$wap;
         var action = ((_this$_renderParams9 = this._renderParams) === null || _this$_renderParams9 === void 0 || (_this$_renderParams9 = _this$_renderParams9.paymentSessionMetaData) === null || _this$_renderParams9 === void 0 ? void 0 : _this$_renderParams9.action) || {};
         var signType = isPC() ? action === null || action === void 0 || (_action$web = action.web) === null || _action$web === void 0 ? void 0 : _action$web.signType : action === null || action === void 0 || (_action$wap = action.wap) === null || _action$wap === void 0 ? void 0 : _action$wap.signType;
@@ -315,7 +327,7 @@ var ComponentApp = /*#__PURE__*/function () {
           return;
         }
       }
-      if (componentSignEnum.AUTO_DEBIT_PAY_WALLET === this._componentSign) {
+      if (ComponentSignEnum.AUTO_DEBIT_PAY_WALLET === this._componentSign) {
         if (requireFastSdk === true && productSceneVersion === '1.0') {
           // REDIRECT，requireFastSdk为true，不需要接口请求
           this.handleAuthUrlInfo(authUrlInfo);
@@ -330,12 +342,12 @@ var ComponentApp = /*#__PURE__*/function () {
       this.dispatchToSDK(EVENT.eventCallback.name, {
         code: eventCodeEnum.SDK_START_OF_LOADING
       });
-      if (this._renderDisplayType === renderDisplayTypeEnum.inline) {
-        var container = createInlineBaseElement(this._selector);
+      if (this._renderDisplayType === DisplayTypeEnum.inline) {
+        var container = createInlineBaseElement(this._selector, COMPONENT_CONTAINER_ID, inlineId);
         if (container) this.renderInlineLoading(renderParams, container);
         insertStyleSheet();
       }
-      if (this._renderDisplayType === renderDisplayTypeEnum.popup) {
+      if (this._renderDisplayType === DisplayTypeEnum.popup) {
         var _this$_renderParams10;
         createBaseElement(this.platform, this.closeBtnFunc.bind(this));
         createRetentionPopup(this.platform, this.hideRetentionPopupFunc.bind(this), this.retentionPopupLeaveFunc.bind(this));
@@ -344,9 +356,11 @@ var ComponentApp = /*#__PURE__*/function () {
         if (channelBehavior !== null && channelBehavior !== void 0 && channelBehavior.allowClickOutsideClose) {
           onClickOutside = this.closeBtnFunc.bind(this);
         }
+        var closeBtnFunc = this.closeBtnFunc.bind(this);
         createMockup({
           platform: this.platform,
-          onClickOutside: onClickOutside
+          onClickOutside: onClickOutside,
+          closeBtnFunc: closeBtnFunc
         });
         this.renderPopupLoading(renderParams);
       }
@@ -370,7 +384,6 @@ var ComponentApp = /*#__PURE__*/function () {
       this.AMSSDK.logger.logInfo({
         title: 'performance_optimization_preload'
       }, {
-        componentSign: componentSign,
         productSceneVersion: productSceneVersion
       });
     }
@@ -378,7 +391,7 @@ var ComponentApp = /*#__PURE__*/function () {
     key: "setParameterDefaultValues",
     value: function setParameterDefaultValues(componentSign, renderParams) {
       var newParams = Object.assign({}, renderParams);
-      if (componentSign === componentSignEnum.VAULTING_CARD) {
+      if (componentSign === ComponentSignEnum.VAULTING_CARD) {
         var _newParams$notRedirec;
         newParams.notRedirectAfterComplete = (_newParams$notRedirec = newParams === null || newParams === void 0 ? void 0 : newParams.notRedirectAfterComplete) !== null && _newParams$notRedirec !== void 0 ? _newParams$notRedirec : true;
       }
@@ -387,10 +400,22 @@ var ComponentApp = /*#__PURE__*/function () {
   }, {
     key: "renderInlineLoading",
     value: function renderInlineLoading(renderParams, selector) {
-      var _renderParams$appeara;
+      var _renderParams$appeara, _this$_renderParams11;
       var showLoading = renderParams === null || renderParams === void 0 || (_renderParams$appeara = renderParams.appearance) === null || _renderParams$appeara === void 0 ? void 0 : _renderParams$appeara.showLoading;
       showLoading = typeof showLoading === 'boolean' ? showLoading : true;
-      if (showLoading) addInlineLoading(selector, this.platform);
+      var extendInfo = renderParams.paymentSessionMetaData.extendInfo;
+      var isExpressCheckout = false;
+      try {
+        // expressCheckout可能出现string(false) JSON.parse再转一次
+        isExpressCheckout = JSON.parse(JSON.parse(extendInfo).expressCheckout);
+      } catch (error) {
+        // 遇到JSON解析错误，默认false
+      }
+      if (showLoading) addInlineLoading(selector, this.platform, {
+        componentSign: this._componentSign,
+        type: (_this$_renderParams11 = this._renderParams) === null || _this$_renderParams11 === void 0 || (_this$_renderParams11 = _this$_renderParams11.appearance) === null || _this$_renderParams11 === void 0 || (_this$_renderParams11 = _this$_renderParams11.layout) === null || _this$_renderParams11 === void 0 ? void 0 : _this$_renderParams11.type,
+        isExpressCheckout: isExpressCheckout
+      });
     }
   }, {
     key: "renderPopupLoading",
@@ -427,9 +452,7 @@ var ComponentApp = /*#__PURE__*/function () {
   }, {
     key: "createActionQueryPromise",
     value: function createActionQueryPromise() {
-      var _this$_renderParams11,
-        _this5 = this;
-      var paymentMethodType = (_this$_renderParams11 = this._renderParams) === null || _this$_renderParams11 === void 0 || (_this$_renderParams11 = _this$_renderParams11.paymentSessionMetaData) === null || _this$_renderParams11 === void 0 || (_this$_renderParams11 = _this$_renderParams11.paymentMethodInfoView) === null || _this$_renderParams11 === void 0 ? void 0 : _this$_renderParams11.paymentMethodType;
+      var _this5 = this;
       this._performanceData.push({
         key: 'sdk_action_query_start',
         value: Date.now()
@@ -437,8 +460,8 @@ var ComponentApp = /*#__PURE__*/function () {
       // eslint-disable-next-line no-async-promise-executor
       this._actionQueryPromise = new Promise( /*#__PURE__*/function () {
         var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(resolve, reject) {
-          var _this5$_renderParams, _this5$_renderParams2, _this5$_renderParams3, _this5$_renderParams4, _this5$_renderParams5, _this5$_renderParams6;
-          var envInfo, params, _ref6, _ref6$extendInfo, extendInfo, actionData, enableVaultingApiOptimize, enableEasypayApiOptimize, _ref7, skipSdkQuery, skipSdkQueryForm, extendInfoData, ifSkip, channelBehavior, _this5$_renderParams7, _this5$_renderParams8, _ref8, _ref8$productSceneVer, productSceneVersion, _ref8$productScene, productScene, _ref9, _ref9$action, _ref9$action2, _ref9$action2$autoDeb, autoDebitWithToken, _this5$_renderParams9, _action$web2, _action$wap2, action, signType;
+          var _this5$_renderParams, _this5$_renderParams2, _this5$_renderParams3, _this5$_renderParams4, _this5$_renderParams5, _this5$_renderParams6, _this5$_renderParams7;
+          var envInfo, params, _ref6, _ref6$extendInfo, extendInfo, actionData, enableVaultingApiOptimize, enableEasypayApiOptimize, _ref7, skipSdkQuery, skipSdkQueryForm, extendInfoData, ifSkip, channelBehavior, _this5$_renderParams8, _ref8, _ref8$productSceneVer, productSceneVersion, _ref8$productScene, productScene, _this5$_renderParams9, _action$web2, _action$wap2, action, signType;
           return _regeneratorRuntime().wrap(function _callee2$(_context2) {
             while (1) switch (_context2.prev = _context2.next) {
               case 0:
@@ -474,22 +497,43 @@ var ComponentApp = /*#__PURE__*/function () {
                   success: true
                 }));
               case 9:
-                if (!(componentSignEnum.VAULTING_CARD === _this5._componentSign)) {
-                  _context2.next = 21;
+                if (ComponentSignEnum.ELEMENT_PAYMENT === _this5._componentSign) {
+                  params.paymentSessionConfig = handlePaymentSessionConfig(params.paymentSessionConfig);
+                }
+                if (!(ComponentSignEnum.ELEMENT_PAYMENT === _this5._componentSign && _this5 !== null && _this5 !== void 0 && (_this5$_renderParams6 = _this5._renderParams) !== null && _this5$_renderParams6 !== void 0 && (_this5$_renderParams6 = _this5$_renderParams6.paymentSessionMetaData) !== null && _this5$_renderParams6 !== void 0 && (_this5$_renderParams6 = _this5$_renderParams6.connectFactor) !== null && _this5$_renderParams6 !== void 0 && _this5$_renderParams6.enableConnect)) {
+                  _context2.next = 12;
+                  break;
+                }
+                return _context2.abrupt("return", resolve({
+                  message: 'sdk no need to make query request',
+                  success: true
+                }));
+              case 12:
+                if (!(ComponentSignEnum.ELEMENT_ADDRESS === _this5._componentSign)) {
+                  _context2.next = 14;
+                  break;
+                }
+                return _context2.abrupt("return", resolve({
+                  message: 'sdk no need to make query request',
+                  success: true
+                }));
+              case 14:
+                if (!(ComponentSignEnum.VAULTING_CARD === _this5._componentSign)) {
+                  _context2.next = 26;
                   break;
                 }
                 if (!enableVaultingApiOptimize) {
-                  _context2.next = 21;
+                  _context2.next = 26;
                   break;
                 }
                 if (!skipSdkQueryForm) {
-                  _context2.next = 18;
+                  _context2.next = 23;
                   break;
                 }
                 // 优先判断 skipSdkQueryForm
                 ifSkip = matchVersion(skipSdkQueryForm, _this5._appVersion);
                 if (!ifSkip) {
-                  _context2.next = 16;
+                  _context2.next = 21;
                   break;
                 }
                 resolve({
@@ -497,12 +541,12 @@ var ComponentApp = /*#__PURE__*/function () {
                   success: true
                 });
                 return _context2.abrupt("return");
-              case 16:
-                _context2.next = 21;
+              case 21:
+                _context2.next = 26;
                 break;
-              case 18:
+              case 23:
                 if (!skipSdkQuery) {
-                  _context2.next = 21;
+                  _context2.next = 26;
                   break;
                 }
                 resolve({
@@ -510,10 +554,10 @@ var ComponentApp = /*#__PURE__*/function () {
                   success: true
                 });
                 return _context2.abrupt("return");
-              case 21:
-                channelBehavior = getChannelBehavior((_this5$_renderParams6 = _this5._renderParams) === null || _this5$_renderParams6 === void 0 ? void 0 : _this5$_renderParams6.paymentSessionMetaData); // Easypay TOSS 渠道无需actionQuery
+              case 26:
+                channelBehavior = getChannelBehavior((_this5$_renderParams7 = _this5._renderParams) === null || _this5$_renderParams7 === void 0 ? void 0 : _this5$_renderParams7.paymentSessionMetaData); // Easypay TOSS 渠道无需actionQuery
                 if (!(channelBehavior !== null && channelBehavior !== void 0 && channelBehavior.usePaymentSessionAsQueryResult)) {
-                  _context2.next = 24;
+                  _context2.next = 29;
                   break;
                 }
                 return _context2.abrupt("return", resolve({
@@ -521,84 +565,82 @@ var ComponentApp = /*#__PURE__*/function () {
                   amountConfirmRequired: actionData === null || actionData === void 0 ? void 0 : actionData.amountConfirmRequired,
                   success: true
                 }));
-              case 24:
-                if (!(componentSignEnum.CASHIER_PAYMENT_CARD === _this5._componentSign || componentSignEnum.VAULTING_CARD === _this5._componentSign)) {
-                  _context2.next = 30;
+              case 29:
+                if (!(ComponentSignEnum.CASHIER_PAYMENT_CARD === _this5._componentSign || ComponentSignEnum.VAULTING_CARD === _this5._componentSign)) {
+                  _context2.next = 35;
                   break;
                 }
                 params.paymentMethodType = 'CARD';
-                _context2.next = 28;
+                _context2.next = 33;
                 return _this5.getDeviceIdAndLog();
-              case 28:
+              case 33:
                 envInfo.deviceId = _context2.sent;
                 if (window.navigator.userAgent.indexOf('miniProgram') > -1) {
                   envInfo.extendInfo = {
                     WAP_SUB_TYPE: 'WECHAT_MINI_PROGRAM'
                   };
                 }
-              case 30:
-                if (!(componentSignEnum.EASY_PAY_WALLET === _this5._componentSign)) {
-                  _context2.next = 40;
+              case 35:
+                if (!(ComponentSignEnum.EASY_PAY_WALLET === _this5._componentSign)) {
+                  _context2.next = 44;
                   break;
                 }
                 _ref8 = params.paymentSessionConfig || {}, _ref8$productSceneVer = _ref8.productSceneVersion, productSceneVersion = _ref8$productSceneVer === void 0 ? '' : _ref8$productSceneVer, _ref8$productScene = _ref8.productScene, productScene = _ref8$productScene === void 0 ? '' : _ref8$productScene;
-                _ref9 = ((_this5$_renderParams7 = _this5._renderParams) === null || _this5$_renderParams7 === void 0 ? void 0 : _this5$_renderParams7.paymentSessionMetaData) || {}, _ref9$action = _ref9.action, _ref9$action2 = _ref9$action === void 0 ? {} : _ref9$action, _ref9$action2$autoDeb = _ref9$action2.autoDebitWithToken, autoDebitWithToken = _ref9$action2$autoDeb === void 0 ? false : _ref9$action2$autoDeb;
                 if (!((_this5$_renderParams8 = _this5._renderParams) !== null && _this5$_renderParams8 !== void 0 && (_this5$_renderParams8 = _this5$_renderParams8.paymentSessionMetaData) !== null && _this5$_renderParams8 !== void 0 && (_this5$_renderParams8 = _this5$_renderParams8.action) !== null && _this5$_renderParams8 !== void 0 && _this5$_renderParams8.skipSdkQuery && enableEasypayApiOptimize)) {
-                  _context2.next = 35;
+                  _context2.next = 39;
                   break;
                 }
                 return _context2.abrupt("return", resolve({
                   message: 'sdk no need to make query request',
                   success: true
                 }));
-              case 35:
-                if (!(productScene === productSceneEnum.EASY_PAY && productSceneVersion === '2.0')) {
-                  _context2.next = 37;
+              case 39:
+                if (!(productScene === ProductSceneEnum.EASY_PAY && productSceneVersion === '2.0')) {
+                  _context2.next = 41;
                   break;
                 }
                 return _context2.abrupt("return", resolve({
                   message: 'sdk no need to make query request',
                   success: true
                 }));
-              case 37:
-                _context2.next = 39;
+              case 41:
+                _context2.next = 43;
                 return _this5.getDeviceIdAndLog();
-              case 39:
+              case 43:
                 envInfo.deviceId = _context2.sent;
-              case 40:
-                if (!(componentSignEnum.AUTO_DEBIT_WALLET === _this5._componentSign)) {
-                  _context2.next = 50;
+              case 44:
+                if (!(ComponentSignEnum.AUTO_DEBIT_WALLET === _this5._componentSign)) {
+                  _context2.next = 54;
                   break;
                 }
                 action = ((_this5$_renderParams9 = _this5._renderParams) === null || _this5$_renderParams9 === void 0 || (_this5$_renderParams9 = _this5$_renderParams9.paymentSessionMetaData) === null || _this5$_renderParams9 === void 0 ? void 0 : _this5$_renderParams9.action) || {};
                 signType = isPC() ? action === null || action === void 0 || (_action$web2 = action.web) === null || _action$web2 === void 0 ? void 0 : _action$web2.signType : action === null || action === void 0 || (_action$wap2 = action.wap) === null || _action$wap2 === void 0 ? void 0 : _action$wap2.signType;
                 if (!(signType === 'SMS')) {
-                  _context2.next = 45;
+                  _context2.next = 49;
                   break;
                 }
                 return _context2.abrupt("return", resolve({
                   message: 'sdk no need to make query request',
                   success: true
                 }));
-              case 45:
+              case 49:
                 if (!(!signType || signType !== 'REDIRECT')) {
-                  _context2.next = 47;
+                  _context2.next = 51;
                   break;
                 }
                 return _context2.abrupt("return", resolve({
                   success: false
                 }));
-              case 47:
-                _context2.next = 49;
+              case 51:
+                _context2.next = 53;
                 return _this5.getDeviceIdAndLog();
-              case 49:
+              case 53:
                 envInfo.deviceId = _context2.sent;
-              case 50:
+              case 54:
                 _this5.AMSSDK.logger.logInfo({
                   title: 'sdk_event_sdkQuery'
                 }, {
-                  paymentSessionConfig: JSON.stringify(params.paymentSessionConfig),
-                  requestBody: params
+                  paymentSessionConfig: JSON.stringify(params.paymentSessionConfig)
                 }).send();
                 queryPaymentInfo(params, {
                   env: _this5.AMSSDK.options.env.environment,
@@ -612,11 +654,10 @@ var ComponentApp = /*#__PURE__*/function () {
                   _this5.AMSSDK.logger.logInfo({
                     title: 'sdk_event_sdkQueryEnd'
                   }, {
-                    paymentSessionConfig: JSON.stringify(params.paymentSessionConfig),
-                    responseBody: res
+                    paymentSessionConfig: JSON.stringify(params.paymentSessionConfig)
                   }).send();
                 }).catch(function (err) {
-                  if ([componentSignEnum.CASHIER_PAYMENT_CARD, componentSignEnum.VAULTING_CARD, componentSignEnum.CASHIER_PAYMENT_APM].includes(_this5._componentSign)) {
+                  if ([ComponentSignEnum.CASHIER_PAYMENT_CARD, ComponentSignEnum.VAULTING_CARD, ComponentSignEnum.CASHIER_PAYMENT_APM].includes(_this5._componentSign)) {
                     return resolve({
                       success: false
                     });
@@ -628,11 +669,11 @@ var ComponentApp = /*#__PURE__*/function () {
                     title: 'sdk_event_sdkQuery_failed'
                   }, {
                     paymentSessionConfig: JSON.stringify(params.paymentSessionConfig),
-                    errorReason: err
+                    errorMessage: err
                   }).send();
                   reject(err);
                 });
-              case 52:
+              case 56:
               case "end":
                 return _context2.stop();
             }
@@ -664,43 +705,58 @@ var ComponentApp = /*#__PURE__*/function () {
       var channelBehavior = getChannelBehavior((_this$_renderParams14 = this._renderParams) === null || _this$_renderParams14 === void 0 ? void 0 : _this$_renderParams14.paymentSessionMetaData);
       // eslint-disable-next-line no-async-promise-executor
       this._actionSubmitPromise = new Promise( /*#__PURE__*/function () {
-        var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(resolve) {
+        var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(resolve) {
           var _channelBehavior$buil, _this6$_renderParams$;
-          var shouldSkipSubmitPayInSDK, _this6$_renderParams, _this6$_renderParams2, _ref11, _ref11$productSceneVe, productSceneVersion, _ref11$productScene, productScene, _ref12, _ref12$action, _ref12$action2, _ref12$action2$enable, enableSignAgreement, _ref12$action2$autoDe, autoDebitWithToken, extParams;
+          var shouldSkipSubmitPayInSDK, _this6$_renderParams, _this6$_renderParams2, _this6$_renderParams3, _ref10, _ref10$productSceneVe, productSceneVersion, _ref10$productScene, productScene, _ref11, _ref11$action, _ref11$action2, _ref11$action2$enable, enableSignAgreement, _ref11$action2$autoDe, autoDebitWithToken, _ref12, _ref12$paymentMethodI, _ref12$paymentMethodI2, _ref12$paymentMethodI3, paymentMethodType, isAppWebview, backScheme, extParams;
           return _regeneratorRuntime().wrap(function _callee3$(_context3) {
             while (1) switch (_context3.prev = _context3.next) {
               case 0:
+                if (!(_this6.AMSSDK.options.product === ProductSceneEnum.ELEMENT_ADDRESS)) {
+                  _context3.next = 2;
+                  break;
+                }
+                return _context3.abrupt("return", resolve({
+                  message: 'sdk no need to make submitPay request',
+                  success: true
+                }));
+              case 2:
                 shouldSkipSubmitPayInSDK = false;
                 if (channelBehavior) {
                   // 新逻辑走 channelBehavior判断
                   shouldSkipSubmitPayInSDK = !channelBehavior.submitPayInSdk;
                 } else {
-                  shouldSkipSubmitPayInSDK = !((_this6$_renderParams = _this6._renderParams) !== null && _this6$_renderParams !== void 0 && (_this6$_renderParams = _this6$_renderParams.paymentSessionMetaData) !== null && _this6$_renderParams !== void 0 && (_this6$_renderParams = _this6$_renderParams.action) !== null && _this6$_renderParams !== void 0 && _this6$_renderParams.skipSdkQuery) || componentSignEnum.EASY_PAY_WALLET !== _this6._componentSign;
+                  shouldSkipSubmitPayInSDK = !((_this6$_renderParams = _this6._renderParams) !== null && _this6$_renderParams !== void 0 && (_this6$_renderParams = _this6$_renderParams.paymentSessionMetaData) !== null && _this6$_renderParams !== void 0 && (_this6$_renderParams = _this6$_renderParams.action) !== null && _this6$_renderParams !== void 0 && _this6$_renderParams.skipSdkQuery) || ComponentSignEnum.EASY_PAY_WALLET !== _this6._componentSign;
                 }
-                if (componentSignEnum.EASY_PAY_WALLET === _this6._componentSign) {
-                  _ref11 = params.paymentSessionConfig || {}, _ref11$productSceneVe = _ref11.productSceneVersion, productSceneVersion = _ref11$productSceneVe === void 0 ? '' : _ref11$productSceneVe, _ref11$productScene = _ref11.productScene, productScene = _ref11$productScene === void 0 ? '' : _ref11$productScene;
-                  _ref12 = ((_this6$_renderParams2 = _this6._renderParams) === null || _this6$_renderParams2 === void 0 ? void 0 : _this6$_renderParams2.paymentSessionMetaData) || {}, _ref12$action = _ref12.action, _ref12$action2 = _ref12$action === void 0 ? {} : _ref12$action, _ref12$action2$enable = _ref12$action2.enableSignAgreement, enableSignAgreement = _ref12$action2$enable === void 0 ? false : _ref12$action2$enable, _ref12$action2$autoDe = _ref12$action2.autoDebitWithToken, autoDebitWithToken = _ref12$action2$autoDe === void 0 ? false : _ref12$action2$autoDe;
-                  if (productScene === productSceneEnum.EASY_PAY && productSceneVersion === '2.0' && !autoDebitWithToken) {
-                    ///EasyPay 2.0 首次传signAgreement字段
+                if (ComponentSignEnum.EASY_PAY_WALLET === _this6._componentSign) {
+                  _ref10 = params.paymentSessionConfig || {}, _ref10$productSceneVe = _ref10.productSceneVersion, productSceneVersion = _ref10$productSceneVe === void 0 ? '' : _ref10$productSceneVe, _ref10$productScene = _ref10.productScene, productScene = _ref10$productScene === void 0 ? '' : _ref10$productScene;
+                  _ref11 = ((_this6$_renderParams2 = _this6._renderParams) === null || _this6$_renderParams2 === void 0 ? void 0 : _this6$_renderParams2.paymentSessionMetaData) || {}, _ref11$action = _ref11.action, _ref11$action2 = _ref11$action === void 0 ? {} : _ref11$action, _ref11$action2$enable = _ref11$action2.enableSignAgreement, enableSignAgreement = _ref11$action2$enable === void 0 ? false : _ref11$action2$enable, _ref11$action2$autoDe = _ref11$action2.autoDebitWithToken, autoDebitWithToken = _ref11$action2$autoDe === void 0 ? false : _ref11$action2$autoDe;
+                  _ref12 = ((_this6$_renderParams3 = _this6._renderParams) === null || _this6$_renderParams3 === void 0 ? void 0 : _this6$_renderParams3.paymentSessionMetaData) || {}, _ref12$paymentMethodI = _ref12.paymentMethodInfoView, _ref12$paymentMethodI2 = _ref12$paymentMethodI === void 0 ? {} : _ref12$paymentMethodI, _ref12$paymentMethodI3 = _ref12$paymentMethodI2.paymentMethodType, paymentMethodType = _ref12$paymentMethodI3 === void 0 ? '' : _ref12$paymentMethodI3;
+                  if (productScene === ProductSceneEnum.EASY_PAY && productSceneVersion === '2.0' && !autoDebitWithToken) {
+                    isAppWebview = _this6._isAppWebview || false; ///EasyPay 2.0 首次传signAgreement字段
                     params['signAgreement'] = enableSignAgreement;
+                    if (paymentMethodType == 'ALIPAY_CN' && !isAppWebview) {
+                      backScheme = getBackScheme(undefined, _this6.AMSSDK.logger);
+                      if (backScheme && backScheme !== 'https') {
+                        params['h5FromApp'] = encodeURIComponent(backScheme);
+                      }
+                    }
                   }
                 }
                 // 带上标记告知WebCheckOut SDK已发送submitpay请求
                 _this6._allowSubmitPayCallAhead = !shouldSkipSubmitPayInSDK;
                 if (!shouldSkipSubmitPayInSDK) {
-                  _context3.next = 6;
+                  _context3.next = 8;
                   break;
                 }
                 return _context3.abrupt("return", resolve({
                   message: 'sdk no need to make submitPay request',
                   success: true
                 }));
-              case 6:
+              case 8:
                 _this6.AMSSDK.logger.logInfo({
                   title: 'sdk_event_submitPay'
                 }, {
-                  paymentSessionConfig: JSON.stringify(params.paymentSessionConfig),
-                  requestBody: params
+                  paymentSessionConfig: JSON.stringify(params.paymentSessionConfig)
                 }).send();
                 extParams = (channelBehavior === null || channelBehavior === void 0 || (_channelBehavior$buil = channelBehavior.buildSubmitPayExtParams) === null || _channelBehavior$buil === void 0 ? void 0 : _channelBehavior$buil.call(channelBehavior, {
                   instanceId: _this6.AMSSDK._instanceId,
@@ -714,9 +770,9 @@ var ComponentApp = /*#__PURE__*/function () {
                 _context3.t0 = submitPayInfo;
                 _context3.t1 = params;
                 _context3.t2 = _this6.AMSSDK.options.env.environment;
-                _context3.next = 14;
+                _context3.next = 16;
                 return _this6.getDeviceIdAndLog();
-              case 14:
+              case 16:
                 _context3.t3 = _context3.sent;
                 _context3.t4 = {
                   deviceId: _context3.t3
@@ -735,29 +791,27 @@ var ComponentApp = /*#__PURE__*/function () {
                   _this6.AMSSDK.logger.logInfo({
                     title: 'sdk_event_submitPayEnd'
                   }, {
-                    paymentSessionConfig: JSON.stringify(params.paymentSessionConfig),
-                    responseBody: res
+                    paymentSessionConfig: JSON.stringify(params.paymentSessionConfig)
                   }).send();
                   resolve(res);
                 }).catch(function (err) {
                   _this6.AMSSDK.logger.logError({
                     title: 'sdk_event_submitPay_failed'
                   }, {
-                    paymentSessionConfig: JSON.stringify(params.paymentSessionConfig),
-                    responseBody: err
+                    paymentSessionConfig: JSON.stringify(params.paymentSessionConfig)
                   }).send();
                   resolve({
                     success: false
                   });
                 });
-              case 19:
+              case 21:
               case "end":
                 return _context3.stop();
             }
           }, _callee3);
         }));
         return function (_x3) {
-          return _ref10.apply(this, arguments);
+          return _ref9.apply(this, arguments);
         };
       }());
     }
@@ -798,19 +852,17 @@ var ComponentApp = /*#__PURE__*/function () {
     value: function createPreloadApp(componentSign) {
       var productSceneVersion = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '1.0';
       var preloadIframe = createPreloadIframe(componentSign, productSceneVersion);
+      var productScene = componentSign.split(/_(?=[^_]*$)/)[0];
       var _getIframeUrl = getIframeUrl({
-          renderDisplayType: renderDisplayTypeEnum.popup,
+          renderDisplayType: DisplayTypeEnum.popup,
           componentSign: componentSign,
           analytics: {
             enabled: false
           },
-          productScene: componentSign,
+          productScene: productScene,
           productSceneVersion: productSceneVersion,
           environment: this.AMSSDK.options.env.environment,
-          // TODO 确定一下这个参数是干啥的
           appVersion: this._appVersion,
-          extendInfo: '',
-          locale: '',
           instanceId: '',
           isPreload: 'true',
           mid: ''
@@ -822,8 +874,7 @@ var ComponentApp = /*#__PURE__*/function () {
         this.AMSSDK.logger.logError({
           title: 'performance_optimization_preload_path_error'
         }, {
-          path: path,
-          locationSearch: locationSearch
+          eventMessage: path
         });
       }
       return preloadIframe;
@@ -843,7 +894,7 @@ var ComponentApp = /*#__PURE__*/function () {
         value: Date.now()
       });
       try {
-        var _renderParams$payment, _renderParams$payment2, _renderParams$payment3, _renderParams$payment4;
+        var _renderParams$payment, _renderParams$payment2, _renderParams$payment3, _renderParams$payment4, _renderParams$element, _renderParams$element2;
         var productSceneVersion = (renderParams === null || renderParams === void 0 || (_renderParams$payment = renderParams.paymentSessionMetaData) === null || _renderParams$payment === void 0 || (_renderParams$payment = _renderParams$payment.paymentSessionConfig) === null || _renderParams$payment === void 0 ? void 0 : _renderParams$payment.productSceneVersion) || '';
         var productScene = (renderParams === null || renderParams === void 0 || (_renderParams$payment2 = renderParams.paymentSessionMetaData) === null || _renderParams$payment2 === void 0 || (_renderParams$payment2 = _renderParams$payment2.paymentSessionConfig) === null || _renderParams$payment2 === void 0 ? void 0 : _renderParams$payment2.productScene) || '';
         var extendInfo = (renderParams === null || renderParams === void 0 || (_renderParams$payment3 = renderParams.paymentSessionMetaData) === null || _renderParams$payment3 === void 0 ? void 0 : _renderParams$payment3.extendInfo) || '';
@@ -856,7 +907,8 @@ var ComponentApp = /*#__PURE__*/function () {
           productScene: productScene,
           productSceneVersion: productSceneVersion,
           extendInfo: extendInfo,
-          mid: mid
+          mid: mid,
+          elementLink: renderParams === null || renderParams === void 0 || (_renderParams$element = renderParams.elementProps) === null || _renderParams$element === void 0 ? void 0 : _renderParams$element.elementLink // TODO Connect本地调试link
         });
         this.app = createIframe(this.AMSSDK.options.mode, this.platform);
         var hostSign = ((renderParams === null || renderParams === void 0 ? void 0 : renderParams.sessionData) || '').split('&&')[1] || '';
@@ -872,7 +924,8 @@ var ComponentApp = /*#__PURE__*/function () {
             locale: this.AMSSDK.options.locale,
             instanceId: this.AMSSDK._instanceId,
             hostSign: hostSign,
-            mid: mid
+            mid: mid,
+            elementLink: renderParams === null || renderParams === void 0 || (_renderParams$element2 = renderParams.elementProps) === null || _renderParams$element2 === void 0 ? void 0 : _renderParams$element2.elementLink // TODO Connect本地调试link
           }),
           path = _getIframeUrl2.path,
           locationSearch = _getIframeUrl2.locationSearch;
@@ -907,7 +960,7 @@ var ComponentApp = /*#__PURE__*/function () {
       var isJson = isJsonString(e.data);
       if (isJson) {
         var data = JSON.parse(e.data);
-        if (data.name !== messageName.APP_TO_SDK && data.name !== messageName.APP_TO_APP || data.instanceId !== this.AMSSDK._instanceId) return;
+        if (data.name !== MessageName.APP_TO_SDK && data.name !== MessageName.APP_TO_APP || data.instanceId !== this.AMSSDK._instanceId) return;
         this._handleAppMessage(data);
       } else {
         console.warn(ERRORMESSAGE.NOT_JSON_FORMAT);
@@ -934,7 +987,7 @@ var ComponentApp = /*#__PURE__*/function () {
     key: "createDialog",
     value: function () {
       var _createDialog = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(data) {
-        var pageUrl, isLoad, timeout, logTimeout;
+        var pageUrl, _data$device, isLoad, timeout, logTimeout;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
@@ -944,8 +997,8 @@ var ComponentApp = /*#__PURE__*/function () {
               _context4.next = 5;
               return createModal({
                 widthPadding: data === null || data === void 0 ? void 0 : data.widthPadding,
-                heightPadding: data === null || data === void 0 ? void 0 : data.heightPadding,
-                device: this.platform,
+                device: (_data$device = data === null || data === void 0 ? void 0 : data.device) !== null && _data$device !== void 0 ? _data$device : this.platform,
+                loadingConfig: data === null || data === void 0 ? void 0 : data.loadingConfig,
                 url: pageUrl
               });
             case 5:
@@ -964,6 +1017,7 @@ var ComponentApp = /*#__PURE__*/function () {
               }, POPUP_LOADTIME_LOG_LIMIT);
               this.popupApp.onload = function () {
                 isLoad = true;
+                removePopupLoading();
                 clearTimeout(timeout);
                 clearTimeout(logTimeout);
               };
@@ -975,7 +1029,7 @@ var ComponentApp = /*#__PURE__*/function () {
               this.AMSSDK.logger.logError({
                 title: (_context4.t0 === null || _context4.t0 === void 0 ? void 0 : _context4.t0.title) || 'sdk_error_create_pop_up'
               }, {
-                message: _context4.t0 === null || _context4.t0 === void 0 ? void 0 : _context4.t0.message,
+                errorMessage: _context4.t0 === null || _context4.t0 === void 0 ? void 0 : _context4.t0.message,
                 url: pageUrl
               });
               this.dispatchToSDK(EVENT.error.name, ERRORMESSAGE.CREATECOMPONENT_ERROR.LOAD_APP_TIMEOUT);
@@ -1113,6 +1167,8 @@ var ComponentApp = /*#__PURE__*/function () {
   }, {
     key: "_handleAppMessage",
     value: function _handleAppMessage(data) {
+      var _data$context2,
+        _this7 = this;
       var eventKeyMap = Object.keys(EVENT).map(function (key) {
         return EVENT[key].name;
       });
@@ -1196,6 +1252,10 @@ var ComponentApp = /*#__PURE__*/function () {
         this.handleCloseBtnShow(true);
         return;
       }
+      if (data.context.event === EVENT.setMaskCloseButton.name) {
+        this.handleMaskCloseBtnShow(data.context.data);
+        return;
+      }
       if (data.context.event === EVENT.setAllowRetention.name) {
         if (data.context.data === true) this._isRetention = true;
         if (data.context.data === false) this._isRetention = false;
@@ -1237,9 +1297,57 @@ var ComponentApp = /*#__PURE__*/function () {
           title: 'sdk_event_event_callback'
         }).send();
       }
+      if ((data === null || data === void 0 || (_data$context2 = data.context) === null || _data$context2 === void 0 ? void 0 : _data$context2.event) === EVENT.getGooglePayToken.name) {
+        handleGooglePay(data).then(function (res) {
+          _this7.dispatchToApp({
+            context: {
+              event: 'getGooglePayToken',
+              data: _objectSpread({}, res)
+            }
+          });
+        }).catch(function (err) {
+          _this7.dispatchToApp({
+            context: {
+              event: 'getGooglePayToken',
+              data: {
+                err: err
+              }
+            }
+          });
+        });
+        return;
+      }
 
-      // The plug-in communicates with the sdk after processing
-      this.dispatchToSDK(data.context.event, data.context.data, data.context.eventCallbackId);
+      // log event before sending the callback
+      this.logEventCallback(data, "sdk_event_event_callback");
+      try {
+        // The plug-in communicates with the sdk after processing
+        this.dispatchToSDK(data.context.event, data.context.data, data.context.eventCallbackId);
+        // log event after sending the callback
+        this.logEventCallback(data, "sdk_event_afterEventCallback");
+      } catch (e) {
+        console.error(e);
+      }
+    }
+  }, {
+    key: "logEventCallback",
+    value: function logEventCallback(data, title) {
+      if (data.context.event === EVENT.eventCallback.name) {
+        var _data$context4;
+        var callbackData = "";
+        try {
+          var _data$context3;
+          callbackData = JSON.stringify((data === null || data === void 0 || (_data$context3 = data.context) === null || _data$context3 === void 0 ? void 0 : _data$context3.data) || "");
+        } catch (e) {
+          console.error(e);
+        }
+        this.AMSSDK.logger.logInfo({
+          title: title
+        }, {
+          callbackData: callbackData,
+          callbackId: (data === null || data === void 0 || (_data$context4 = data.context) === null || _data$context4 === void 0 ? void 0 : _data$context4.eventCallbackId) || ""
+        }).send();
+      }
     }
   }, {
     key: "dismissLoadingFunc",
@@ -1253,15 +1361,34 @@ var ComponentApp = /*#__PURE__*/function () {
       }
       (_document$getElementB2 = document.getElementById(LOADING_ID)) === null || _document$getElementB2 === void 0 || _document$getElementB2.remove();
     }
+  }, {
+    key: "updateMaskCloseBtn",
+    value: function updateMaskCloseBtn(data) {
+      var maskCloseBtn = document.getElementById("".concat(COMPONENT_CLOSE_MASK_BLOCK_ID));
+      if (maskCloseBtn) {
+        if (this.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) {
-      var _data$context$data4;
-      var cashier = document.getElementById(COMPONENT_CONTAINER_ID);
-      if (((_data$context$data4 = data.context.data) === null || _data$context$data4 === void 0 ? void 0 : _data$context$data4.height) <= 1 || data.context.data.height === parseInt(cashier.style.height)) return;
+      var _this$_renderParams15, _this$_renderParams16, _this$_renderParams17, _this$_renderParams18, _this$_renderParams19, _this$_renderParams20, _data$context$data4, _cashier$style;
+      var _selector = (this === null || this === void 0 || (_this$_renderParams15 = this._renderParams) === null || _this$_renderParams15 === void 0 || (_this$_renderParams15 = _this$_renderParams15.selector) === null || _this$_renderParams15 === void 0 || (_this$_renderParams16 = _this$_renderParams15.indexOf) === null || _this$_renderParams16 === void 0 ? void 0 : _this$_renderParams16.call(_this$_renderParams15, '#')) === -1 ? this === null || this === void 0 || (_this$_renderParams17 = this._renderParams) === null || _this$_renderParams17 === void 0 ? void 0 : _this$_renderParams17.selector : this === null || this === void 0 || (_this$_renderParams18 = this._renderParams) === null || _this$_renderParams18 === void 0 || (_this$_renderParams18 = _this$_renderParams18.selector) === null || _this$_renderParams18 === void 0 || (_this$_renderParams19 = _this$_renderParams18.slice) === null || _this$_renderParams19 === void 0 ? void 0 : _this$_renderParams19.call(_this$_renderParams18, 1);
+      // 修改需当前文件搜索，这段注释appendAliasContainerId
+      var appendAliasContainerId = this === null || this === void 0 || (_this$_renderParams20 = this._renderParams) === null || _this$_renderParams20 === void 0 ? void 0 : _this$_renderParams20.appendAliasContainerId;
+      var selectorId = appendAliasContainerId ? "".concat(COMPONENT_CONTAINER_ID, "-").concat(_selector) : COMPONENT_CONTAINER_ID;
+      var cashier = document.getElementById(selectorId);
+      if (((_data$context$data4 = data.context.data) === null || _data$context$data4 === void 0 ? void 0 : _data$context$data4.height) <= 1 || data.context.data.height === parseInt(cashier === null || cashier === void 0 || (_cashier$style = cashier.style) === null || _cashier$style === void 0 ? void 0 : _cashier$style.height)) return;
       cashier.style.height = "".concat(data.context.data.height, "px");
       this.app.style.opacity = '1';
-      if (this._renderDisplayType === renderDisplayTypeEnum.popup) {
+      if (this._renderDisplayType === DisplayTypeEnum.popup) {
         if (this.platform === 'desktop') {
           if (data.context.data.width) cashier.style.width = "".concat(data.context.data.width, "px");
           cashier.classList.add("".concat(COMPONENT_CONTAINER_ID, "-").concat(this.platform, "-animation"));
@@ -1275,9 +1402,8 @@ var ComponentApp = /*#__PURE__*/function () {
 
           // 此style用于弹窗出现和高度变化时动画，动画不同，属性不同
           this.app.style.height = parseInt(this.app.style.height) > 0 ? '100%' : "".concat(data.context.data.height, "px");
-
           // 弹出和弹入动画
-          var runkeyframes = "@keyframes ".concat(COMPONENT_CONTAINER_ID, "-slide-in {\n          0% {\n            height: 1px;\n          }\n          100% {\n            height: ").concat(data.context.data.height, "px;\n          }\n        }\n        @keyframes ").concat(COMPONENT_CONTAINER_ID, "-slide-out {\n          0% {\n            height: ").concat(data.context.data.height, "px;\n            opacity: 1;\n          }\n          50% {\n            opacity: 1;\n          }\n          100% {\n            height: 1px;\n            opacity: 0;\n          }\n        }");
+          var runkeyframes = slideInAndOutKeyframes(COMPONENT_CONTAINER_ID, data.context.data.height);
           // 创建style标签
           var style = document.createElement('style');
           style.id = animationStyleId;
@@ -1287,7 +1413,6 @@ var ComponentApp = /*#__PURE__*/function () {
           style.innerHTML = runkeyframes;
           // 将style样式存放到head标签
           document.getElementsByTagName('head')[0].appendChild(style);
-
           // size变动时动画
           setTimeout(function () {
             cashier.style.transition = 'height 0.28s ease-in-out';
@@ -1295,8 +1420,10 @@ var ComponentApp = /*#__PURE__*/function () {
         }
         // 关闭loading，保留蒙层
         this.dismissLoadingFunc();
+        // 更新弹窗关闭按钮位置
+        this.updateMaskCloseBtn(data.context.data);
       }
-      if (this._renderDisplayType === renderDisplayTypeEnum.inline) {
+      if (this._renderDisplayType === DisplayTypeEnum.inline) {
         var _document$getElementB3;
         (_document$getElementB3 = document.getElementById(LOADING_ID)) === null || _document$getElementB3 === void 0 || _document$getElementB3.remove();
         this.app.style.height = "".concat(data.context.data.height, "px");
@@ -1325,7 +1452,12 @@ var ComponentApp = /*#__PURE__*/function () {
     key: "handleRedirect",
     value: function handleRedirect(data) {
       var _data$isDestroy,
-        _this7 = this;
+        _data$isCallApp,
+        _data$callAppDetectSu,
+        _data$isDestroy2,
+        _data$isCallApp2,
+        _data$callAppDetectSu2,
+        _this8 = this;
       var fromFastSdk = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
       var _data = typeof data === 'string' ? {
         normalUrl: data
@@ -1334,48 +1466,69 @@ var ComponentApp = /*#__PURE__*/function () {
         schemeUrl: (data === null || data === void 0 ? void 0 : data.schemeUrl) || '',
         normalUrl: (data === null || data === void 0 ? void 0 : data.normalUrl) || '',
         target: data === null || data === void 0 ? void 0 : data.target,
-        isDestroy: (_data$isDestroy = data === null || data === void 0 ? void 0 : data.isDestroy) !== null && _data$isDestroy !== void 0 ? _data$isDestroy : true
+        isDestroy: (_data$isDestroy = data === null || data === void 0 ? void 0 : data.isDestroy) !== null && _data$isDestroy !== void 0 ? _data$isDestroy : true,
+        isCallApp: (_data$isCallApp = data === null || data === void 0 ? void 0 : data.isCallApp) !== null && _data$isCallApp !== void 0 ? _data$isCallApp : false,
+        callAppDetectSuccessDelay: (_data$callAppDetectSu = data === null || data === void 0 ? void 0 : data.callAppDetectSuccessDelay) !== null && _data$callAppDetectSu !== void 0 ? _data$callAppDetectSu : 2000
       });
+      var logParams = {
+        applinkUrl: (data === null || data === void 0 ? void 0 : data.applinkUrl) || '',
+        schemeUrl: (data === null || data === void 0 ? void 0 : data.schemeUrl) || '',
+        normalUrl: (data === null || data === void 0 ? void 0 : data.normalUrl) || '',
+        target: data === null || data === void 0 ? void 0 : data.target,
+        isDestroy: (_data$isDestroy2 = data === null || data === void 0 ? void 0 : data.isDestroy) !== null && _data$isDestroy2 !== void 0 ? _data$isDestroy2 : true,
+        isCallApp: (_data$isCallApp2 = data === null || data === void 0 ? void 0 : data.isCallApp) !== null && _data$isCallApp2 !== void 0 ? _data$isCallApp2 : false,
+        callAppDetectSuccessDelay: (_data$callAppDetectSu2 = data === null || data === void 0 ? void 0 : data.callAppDetectSuccessDelay) !== null && _data$callAppDetectSu2 !== void 0 ? _data$callAppDetectSu2 : 2000
+      };
       this.AMSSDK.logger.logInfo({
         title: 'sdk_event_call_url_start'
-      }, _objectSpread({}, data)).send();
-      var successCallback = function successCallback(type, url) {
-        _this7.dispatchToSDK(EVENT.eventCallback.name, {
+      }, {
+        redirectInfo: JSON.stringify(logParams)
+      }).send();
+      var successCallback = function successCallback(type, url, durationInSeconds) {
+        _this8.dispatchToSDK(EVENT.eventCallback.name, {
           code: eventCodeEnum.SDK_CALL_URL_SUCCESS,
           message: "Successfully opened the app,".concat(type, ": ").concat(url)
         });
-        _this7.AMSSDK.logger.logInfo({
-          title: 'sdk_event_call_url_success'
-        }, {
+        var extra = {
           redirectInfo: JSON.stringify(_data),
           openType: type,
           url: url,
           fromFastSdk: fromFastSdk
-        }).send();
+        };
+        if (durationInSeconds) {
+          extra['durationInSeconds'] = durationInSeconds;
+        }
+        _this8.AMSSDK.logger.logInfo({
+          title: 'sdk_event_call_url_success'
+        }, extra).send();
       };
-      var failCallback = function failCallback(type, url) {
-        _this7.dispatchToSDK(EVENT.eventCallback.name, {
+      var failCallback = function failCallback(type, url, durationInSeconds) {
+        _this8.dispatchToSDK(EVENT.eventCallback.name, {
           code: eventCodeEnum.SDK_CALL_URL_ERROR,
           message: "Failed to open app,applinkUrl: ".concat(_data === null || _data === void 0 ? void 0 : _data.applinkUrl, " schemeUrl: ").concat(_data === null || _data === void 0 ? void 0 : _data.schemeUrl, " normalUrl: ").concat(_data === null || _data === void 0 ? void 0 : _data.normalUrl)
         });
-        _this7.AMSSDK.logger.logInfo({
-          title: 'sdk_error_call_url_failed'
-        }, {
+        var extra = {
           redirectInfo: JSON.stringify(_data),
           openType: type,
           url: url,
           fromFastSdk: fromFastSdk
-        }).send();
+        };
+        if (durationInSeconds) {
+          extra['durationInSeconds'] = durationInSeconds;
+        }
+        _this8.AMSSDK.logger.logInfo({
+          title: 'sdk_error_call_url_failed'
+        }, extra).send();
       };
 
       // 支持 target: _blank，新开tab页打开
-      if (_data.target === targetEnum.BLANK) {
+      if (_data.target === TargetEnum.BLANK) {
         if (!_data.normalUrl) return failCallback(RedirectType.NormalUrl, '');
         successCallback(RedirectType.NormalUrl, _data.normalUrl);
         window.open(_data.normalUrl);
         return;
       }
-      if (_data.target === targetEnum.REPLACE && !(_data !== null && _data !== void 0 && _data.applinkUrl) && !(_data !== null && _data !== void 0 && _data.schemeUrl)) {
+      if (_data.target === TargetEnum.REPLACE && !(_data !== null && _data !== void 0 && _data.applinkUrl) && !(_data !== null && _data !== void 0 && _data.schemeUrl)) {
         if (!_data.normalUrl) return failCallback(RedirectType.NormalUrl, '');
         successCallback(RedirectType.NormalUrl, _data.normalUrl);
         window.location.replace(_data.normalUrl);
@@ -1383,20 +1536,40 @@ var ComponentApp = /*#__PURE__*/function () {
       }
       // 销毁iframe和全局loading
       if (_data !== null && _data !== void 0 && _data.isDestroy) this.cleanContainer();
+      // 唤端
+      if (_data !== null && _data !== void 0 && _data.isCallApp && _data !== null && _data !== void 0 && _data.schemeUrl) {
+        var startCallAppTime = new Date();
+        var detectSuccessDelay = typeof (data === null || data === void 0 ? void 0 : data.callAppDetectSuccessDelay) === 'number' ? data.callAppDetectSuccessDelay : 5000;
+        this.AMSSDK._redirect({
+          schemeUrl: _data === null || _data === void 0 ? void 0 : _data.schemeUrl,
+          callAppJudgeTime: detectSuccessDelay
+        }).then(function () {
+          var endCallAppTime = new Date();
+          var durationInMilliseconds = endCallAppTime.getTime() - startCallAppTime.getTime();
+          var durationInSeconds = durationInMilliseconds / 1000;
+          successCallback(RedirectType.SchemeUrl, _data === null || _data === void 0 ? void 0 : _data.schemeUrl, durationInSeconds);
+        }).catch(function () {
+          var endCallAppTime = new Date();
+          var durationInMilliseconds = endCallAppTime.getTime() - startCallAppTime.getTime();
+          var durationInSeconds = durationInMilliseconds / 1000;
+          failCallback(RedirectType.SchemeUrl, _data.schemeUrl, durationInSeconds);
+        });
+        return;
+      }
       this.AMSSDK._redirect({
         applinkUrl: _data === null || _data === void 0 ? void 0 : _data.applinkUrl
       }).then(function () {
         successCallback(RedirectType.ApplinkUrl, _data === null || _data === void 0 ? void 0 : _data.applinkUrl);
       }).catch(function () {
         if (_data !== null && _data !== void 0 && _data.applinkUrl) failCallback(RedirectType.ApplinkUrl, _data === null || _data === void 0 ? void 0 : _data.applinkUrl);
-        return _this7.AMSSDK._redirect({
+        return _this8.AMSSDK._redirect({
           schemeUrl: _data === null || _data === void 0 ? void 0 : _data.schemeUrl
         });
       }).then(function () {
         successCallback(RedirectType.SchemeUrl, _data === null || _data === void 0 ? void 0 : _data.schemeUrl);
       }).catch(function () {
         if (_data !== null && _data !== void 0 && _data.schemeUrl) failCallback(RedirectType.SchemeUrl, _data === null || _data === void 0 ? void 0 : _data.schemeUrl);
-        return _this7.AMSSDK._redirect({
+        return _this8.AMSSDK._redirect({
           normalUrl: _data === null || _data === void 0 ? void 0 : _data.normalUrl
         });
       }).then(function () {
@@ -1435,12 +1608,12 @@ var ComponentApp = /*#__PURE__*/function () {
   }, {
     key: "handleAppHeartBeat",
     value: function handleAppHeartBeat() {
-      var _this8 = this;
+      var _this9 = this;
       try {
         if (!this._webAppHeartBeatTimeoutFn) {
           this._webAppHeartBeatTimeoutFn = function () {
-            if (_this8.isAppAttached()) {
-              _this8.AMSSDK.logger.logError({
+            if (_this9.isAppAttached()) {
+              _this9.AMSSDK.logger.logError({
                 title: 'sdk_error_appHeartBeatTimeout'
               });
             }
@@ -1454,8 +1627,8 @@ var ComponentApp = /*#__PURE__*/function () {
           window._webAppHeartBeatTimeoutId = setTimeout(this._webAppHeartBeatTimeoutFn, TIMEOUT_WEB_APP_HEART_BEAT);
         }
         setTimeout(function () {
-          if (_this8.isAppAttached()) {
-            _this8.dispatchToApp({
+          if (_this9.isAppAttached()) {
+            _this9.dispatchToApp({
               context: {
                 event: 'sdkHeartBeat',
                 data: {}
@@ -1492,6 +1665,16 @@ var ComponentApp = /*#__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"));
+      }
+    }
 
     /**
      * @description Send message to SDK
@@ -1511,7 +1694,7 @@ var ComponentApp = /*#__PURE__*/function () {
     value: function dispatchToApp(payload) {
       var targetElement = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
       var data = Object.assign({}, payload, {
-        name: messageName.SDK_TO_APP,
+        name: MessageName.SDK_TO_APP,
         mode: this.AMSSDK.options.mode,
         appId: COMPONENTPLUGINID,
         instanceId: this.AMSSDK._instanceId
@@ -1550,24 +1733,25 @@ var ComponentApp = /*#__PURE__*/function () {
     key: "sendRenderEvent",
     value: (function () {
       var _sendRenderEvent = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
-        var _this$_renderParams15, _this$_renderParams16, _this$_renderParams17, _this$_renderParams18, _this$_renderParams19, _this$_renderParams20, _this$AMSSDK$logger, _this$_renderParams21, _this$_renderParams22, _this$_renderParams23, _this$AMSSDK, _this$_renderParams24, res, submitRes;
+        var _this$_renderParams21, _this$_renderParams22, _this$_renderParams23, _this$_renderParams24, _this$_renderParams25, _this$_renderParams26, _this$_renderParams27, _this$_renderParams28, _this$_renderParams29, _this$AMSSDK$logger, _this$_renderParams30, _this$_renderParams31, _this$_renderParams32, _this$AMSSDK, _this$_renderParams33, isAddressElement, res, submitRes;
         return _regeneratorRuntime().wrap(function _callee8$(_context8) {
           while (1) switch (_context8.prev = _context8.next) {
             case 0:
               _context8.prev = 0;
-              if (!(!this._actionQueryPromise || !this._actionSubmitPromise)) {
-                _context8.next = 3;
+              isAddressElement = this.AMSSDK.options.product === ProductSceneEnum.ELEMENT_ADDRESS;
+              if (!((!this._actionQueryPromise || !this._actionSubmitPromise) && !isAddressElement)) {
+                _context8.next = 4;
                 break;
               }
               return _context8.abrupt("return");
-            case 3:
-              _context8.next = 5;
+            case 4:
+              _context8.next = 6;
               return this._actionQueryPromise;
-            case 5:
+            case 6:
               res = _context8.sent;
-              _context8.next = 8;
+              _context8.next = 9;
               return this._actionSubmitPromise;
-            case 8:
+            case 9:
               submitRes = _context8.sent;
               this._performanceData.push({
                 key: 'sdk_render_component',
@@ -1579,29 +1763,34 @@ var ComponentApp = /*#__PURE__*/function () {
                   data: {
                     queryResult: res,
                     submitResult: submitRes,
-                    sessionResult: (_this$_renderParams15 = this._renderParams) === null || _this$_renderParams15 === void 0 ? void 0 : _this$_renderParams15.paymentSessionMetaData,
-                    paymentSessionData: (_this$_renderParams16 = this._renderParams) === null || _this$_renderParams16 === void 0 ? void 0 : _this$_renderParams16.sessionData,
+                    sessionResult: (_this$_renderParams21 = this._renderParams) === null || _this$_renderParams21 === void 0 ? void 0 : _this$_renderParams21.paymentSessionMetaData,
+                    paymentSessionData: (_this$_renderParams22 = this._renderParams) === null || _this$_renderParams22 === void 0 ? void 0 : _this$_renderParams22.sessionData,
                     heightOfVisible: Math.max(window.changingPageHeight, window.innerHeight),
-                    renderDisplayType: (_this$_renderParams17 = this._renderParams) === null || _this$_renderParams17 === void 0 ? void 0 : _this$_renderParams17.renderDisplayType,
-                    appearance: (_this$_renderParams18 = this._renderParams) === null || _this$_renderParams18 === void 0 ? void 0 : _this$_renderParams18.appearance,
-                    notRedirectAfterComplete: ((_this$_renderParams19 = this._renderParams) === null || _this$_renderParams19 === void 0 ? void 0 : _this$_renderParams19.notRedirectAfterComplete) === true,
+                    renderDisplayType: (_this$_renderParams23 = this._renderParams) === null || _this$_renderParams23 === void 0 ? void 0 : _this$_renderParams23.renderDisplayType,
+                    appearance: (_this$_renderParams24 = this._renderParams) === null || _this$_renderParams24 === void 0 ? void 0 : _this$_renderParams24.appearance,
+                    notRedirectAfterComplete: ((_this$_renderParams25 = this._renderParams) === null || _this$_renderParams25 === void 0 ? void 0 : _this$_renderParams25.notRedirectAfterComplete) === true,
+                    isAppWebview: this._isAppWebview,
                     merchantAppointParam: this._merchantAppointParam,
                     allowSubmitPayCallAhead: this._allowSubmitPayCallAhead,
+                    /** 地址组件集成的参数 */
+                    configParams: (_this$_renderParams26 = this._renderParams) === null || _this$_renderParams26 === void 0 ? void 0 : _this$_renderParams26.configParams,
+                    prefillValue: (_this$_renderParams27 = this._renderParams) === null || _this$_renderParams27 === void 0 ? void 0 : _this$_renderParams27.prefillValue,
+                    componentSession: (_this$_renderParams28 = this._renderParams) === null || _this$_renderParams28 === void 0 ? void 0 : _this$_renderParams28.componentSession,
                     envInfo: {
                       screenHeight: screen.height,
                       screenWidth: screen.width
                     },
                     logMetaData: _objectSpread(_objectSpread({
-                      trackId: (_this$_renderParams20 = this._renderParams) === null || _this$_renderParams20 === void 0 ? void 0 : _this$_renderParams20.sessionData,
+                      trackId: (_this$_renderParams29 = this._renderParams) === null || _this$_renderParams29 === void 0 ? void 0 : _this$_renderParams29.sessionData,
                       platform: this.platform,
                       firstLogTime: (_this$AMSSDK$logger = this.AMSSDK.logger) === null || _this$AMSSDK$logger === void 0 ? void 0 : _this$AMSSDK$logger.getComponentStartTime()
-                    }, ((_this$_renderParams21 = this._renderParams) === null || _this$_renderParams21 === void 0 || (_this$_renderParams21 = _this$_renderParams21.paymentSessionMetaData) === null || _this$_renderParams21 === void 0 ? void 0 : _this$_renderParams21.paymentSessionConfig) || {}), {}, {
-                      renderDisplayType: (_this$_renderParams22 = this._renderParams) === null || _this$_renderParams22 === void 0 ? void 0 : _this$_renderParams22.renderDisplayType,
+                    }, ((_this$_renderParams30 = this._renderParams) === null || _this$_renderParams30 === void 0 || (_this$_renderParams30 = _this$_renderParams30.paymentSessionMetaData) === null || _this$_renderParams30 === void 0 ? void 0 : _this$_renderParams30.paymentSessionConfig) || {}), {}, {
+                      renderDisplayType: (_this$_renderParams31 = this._renderParams) === null || _this$_renderParams31 === void 0 ? void 0 : _this$_renderParams31.renderDisplayType,
                       sdkVersion: this._appVersion,
-                      merchantId: (_this$_renderParams23 = this._renderParams) === null || _this$_renderParams23 === void 0 || (_this$_renderParams23 = _this$_renderParams23.paymentSessionMetaData) === null || _this$_renderParams23 === void 0 ? void 0 : _this$_renderParams23.clientId,
+                      merchantId: (_this$_renderParams32 = this._renderParams) === null || _this$_renderParams32 === void 0 || (_this$_renderParams32 = _this$_renderParams32.paymentSessionMetaData) === null || _this$_renderParams32 === void 0 ? void 0 : _this$_renderParams32.clientId,
                       instanceId: (_this$AMSSDK = this.AMSSDK) === null || _this$AMSSDK === void 0 ? void 0 : _this$AMSSDK._instanceId,
                       performanceData: this._performanceData,
-                      paymentMethodType: (_this$_renderParams24 = this._renderParams) === null || _this$_renderParams24 === void 0 || (_this$_renderParams24 = _this$_renderParams24.paymentSessionMetaData) === null || _this$_renderParams24 === void 0 || (_this$_renderParams24 = _this$_renderParams24.paymentMethodInfoView) === null || _this$_renderParams24 === void 0 ? void 0 : _this$_renderParams24.paymentMethodType
+                      paymentMethodType: (_this$_renderParams33 = this._renderParams) === null || _this$_renderParams33 === void 0 || (_this$_renderParams33 = _this$_renderParams33.paymentSessionMetaData) === null || _this$_renderParams33 === void 0 || (_this$_renderParams33 = _this$_renderParams33.paymentMethodInfoView) === null || _this$_renderParams33 === void 0 ? void 0 : _this$_renderParams33.paymentMethodType
                     })
                   }
                 }
@@ -1618,16 +1807,16 @@ var ComponentApp = /*#__PURE__*/function () {
                 }
               });
               // eslint-disable-next-line no-empty
-              _context8.next = 17;
+              _context8.next = 18;
               break;
-            case 15:
-              _context8.prev = 15;
+            case 16:
+              _context8.prev = 16;
               _context8.t0 = _context8["catch"](0);
-            case 17:
+            case 18:
             case "end":
               return _context8.stop();
           }
-        }, _callee8, this, [[0, 15]]);
+        }, _callee8, this, [[0, 16]]);
       }));
       function sendRenderEvent() {
         return _sendRenderEvent.apply(this, arguments);
@@ -1642,9 +1831,11 @@ var ComponentApp = /*#__PURE__*/function () {
     key: "cleanContainer",
     value: function cleanContainer() {
       var _document$getElementB4,
-        _this9 = this;
+        _document$getElementB5,
+        _this10 = this;
       var immediately = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-      (_document$getElementB4 = document.getElementById(LOADING_ID)) === null || _document$getElementB4 === void 0 || _document$getElementB4.remove();
+      (_document$getElementB4 = document.getElementById(COMPONENT_CLOSE_MASK_BLOCK_ID)) === null || _document$getElementB4 === void 0 || _document$getElementB4.remove();
+      (_document$getElementB5 = document.getElementById(LOADING_ID)) === null || _document$getElementB5 === void 0 || _document$getElementB5.remove();
       this.hideComponentAnimation();
       var mockup = document.getElementById(MOCKUP_ID);
       mockup === null || mockup === void 0 || mockup.classList.add("".concat(MOCKUP_ID, "-hidden"));
@@ -1654,21 +1845,26 @@ var ComponentApp = /*#__PURE__*/function () {
       this.app = null;
       if (immediately) this.cleanElement();else {
         setTimeout(function () {
-          _this9.cleanElement();
+          _this10.cleanElement();
         }, 300);
       }
     }
   }, {
     key: "hideComponentAnimation",
     value: function hideComponentAnimation() {
-      var container = document.getElementById(COMPONENT_CONTAINER_ID);
-      if (this.app) this.app.style.height = container.style.height;
+      var _this$_renderParams34, _this$_renderParams35, _this$_renderParams36, _this$_renderParams37, _this$_renderParams38, _this$_renderParams39, _container$style;
+      // 修改需当前文件搜索，这段注释appendAliasContainerId
+      var _selector = (this === null || this === void 0 || (_this$_renderParams34 = this._renderParams) === null || _this$_renderParams34 === void 0 || (_this$_renderParams34 = _this$_renderParams34.selector) === null || _this$_renderParams34 === void 0 || (_this$_renderParams35 = _this$_renderParams34.indexOf) === null || _this$_renderParams35 === void 0 ? void 0 : _this$_renderParams35.call(_this$_renderParams34, '#')) === -1 ? this === null || this === void 0 || (_this$_renderParams36 = this._renderParams) === null || _this$_renderParams36 === void 0 ? void 0 : _this$_renderParams36.selector : this === null || this === void 0 || (_this$_renderParams37 = this._renderParams) === null || _this$_renderParams37 === void 0 || (_this$_renderParams37 = _this$_renderParams37.selector) === null || _this$_renderParams37 === void 0 || (_this$_renderParams38 = _this$_renderParams37.slice) === null || _this$_renderParams38 === void 0 ? void 0 : _this$_renderParams38.call(_this$_renderParams37, 1);
+      var appendAliasContainerId = this !== null && this !== void 0 && (_this$_renderParams39 = this._renderParams) !== null && _this$_renderParams39 !== void 0 && _this$_renderParams39.appendAliasContainerId ? "-".concat(_selector) : '';
+      var inlineId = "".concat(COMPONENT_CONTAINER_ID).concat(appendAliasContainerId);
+      var container = document.getElementById(inlineId);
+      if (this.app && container) this.app.style.height = container === null || container === void 0 || (_container$style = container.style) === null || _container$style === void 0 ? void 0 : _container$style.height;
       if (container) {
         // size变化动画取消
         container.style.transition = '';
-        container === null || container === void 0 || container.classList.remove("".concat(COMPONENT_CONTAINER_ID, "-").concat(this.platform));
-        container === null || container === void 0 || container.classList.remove("".concat(COMPONENT_CONTAINER_ID, "-").concat(this.platform, "-animation"));
-        container === null || container === void 0 || container.classList.add("".concat(COMPONENT_CONTAINER_ID, "-hidden-").concat(this.platform));
+        container === null || container === void 0 || container.classList.remove("".concat(inlineId, "-").concat(this.platform));
+        container === null || container === void 0 || container.classList.remove("".concat(inlineId, "-").concat(this.platform, "-animation"));
+        container === null || container === void 0 || container.classList.add("".concat(inlineId, "-hidden-").concat(this.platform));
       }
     }
   }, {