@alipay/ams-checkout 0.0.1715248982-dev.0 → 0.0.1716362599-dev.0

package/esm/plugin/component/index.js

@@ -25,6 +25,7 @@ import { getType, isJsonString, isPC } from "../../util";
 import { isLocalMock } from "../../util/mock";
 import { matchVersion } from "../../util/versionCompare";
 import { createIframe, createPreloadIframe, getAppDomain, getIframeUrl } from "./cashierApp";
+import { getChannelBehavior } 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";
@@ -46,6 +47,7 @@ var ComponentApp = /*#__PURE__*/function () {
     _defineProperty(this, "_selector", void 0);
     _defineProperty(this, "_appVersion", void 0);
     _defineProperty(this, "_isRetention", void 0);
+    _defineProperty(this, "_allowSubmitPayCallAhead", void 0);
     _defineProperty(this, "_actionQueryPromise", null);
     _defineProperty(this, "_actionSubmitPromise", null);
     _defineProperty(this, "_renderParams", null);
@@ -55,7 +57,7 @@ var ComponentApp = /*#__PURE__*/function () {
     _defineProperty(this, "_multipleCallbackEvents", void 0);
     _defineProperty(this, "_merchantAppointParam", void 0);
     _defineProperty(this, "_webAppHeartBeatTimeoutFn", void 0);
-    this._appVersion = '1.14.0.0';
+    this._appVersion = '1.18.0';
     this._isInitComponent = false;
     this._selector = "#".concat(COMPONENT_SECTION_ID);
     this.createIframeNode = function () {
@@ -112,7 +114,7 @@ var ComponentApp = /*#__PURE__*/function () {
         productSceneVersion: paymentSessionConfig === null || paymentSessionConfig === void 0 ? void 0 : paymentSessionConfig.productSceneVersion,
         paymentMethodType: paymentSessionMetaData === null || paymentSessionMetaData === void 0 || (_paymentSessionMetaDa = paymentSessionMetaData.paymentMethodInfoView) === null || _paymentSessionMetaDa === void 0 ? void 0 : _paymentSessionMetaDa.paymentMethodType,
         paymentMethodCategoryType: paymentSessionConfig === null || paymentSessionConfig === void 0 ? void 0 : paymentSessionConfig.paymentMethodCategoryType,
-        requestSeq: (_this$_renderParams2 = this._renderParams) === null || _this$_renderParams2 === void 0 ? void 0 : _this$_renderParams2.paymentSessionData,
+        requestSeq: (_this$_renderParams2 = this._renderParams) === null || _this$_renderParams2 === void 0 ? void 0 : _this$_renderParams2.sessionData,
         trackId: (_this$_renderParams3 = this._renderParams) === null || _this$_renderParams3 === void 0 ? void 0 : _this$_renderParams3.sessionData
       });
     }
@@ -246,6 +248,10 @@ var ComponentApp = /*#__PURE__*/function () {
     key: "appendIframeNodes",
     value: function appendIframeNodes(componentSign, renderParams) {
       var _renderParams,
+        _this$_renderParams5,
+        _this$_renderParams6,
+        _this$_renderParams7,
+        _this$_renderParams8,
         _this3 = this;
       if (this._isInitComponent) {
         this.dispatchToSDK(EVENT.error.name, ERRORMESSAGE.CREATECOMPONENT_ERROR.SINGLETON_COMPONENT_ERROR);
@@ -265,6 +271,61 @@ var ComponentApp = /*#__PURE__*/function () {
         key: 'sdk_create_component',
         value: Date.now()
       });
+      var params = {
+        paymentSessionData: this._renderParams && ((_this$_renderParams5 = this._renderParams) === null || _this$_renderParams5 === void 0 ? void 0 : _this$_renderParams5.sessionData) || '',
+        paymentSessionConfig: (_this$_renderParams6 = this._renderParams) === null || _this$_renderParams6 === void 0 || (_this$_renderParams6 = _this$_renderParams6.paymentSessionMetaData) === null || _this$_renderParams6 === void 0 ? void 0 : _this$_renderParams6.paymentSessionConfig
+      };
+      var _ref2 = params.paymentSessionConfig || {},
+        _ref2$productSceneVer = _ref2.productSceneVersion,
+        productSceneVersion = _ref2$productSceneVer === void 0 ? '' : _ref2$productSceneVer,
+        _ref2$productScene = _ref2.productScene,
+        productScene = _ref2$productScene === void 0 ? '' : _ref2$productScene;
+      var _ref3 = ((_this$_renderParams7 = this._renderParams) === null || _this$_renderParams7 === void 0 ? void 0 : _this$_renderParams7.paymentSessionMetaData) || {},
+        _ref3$action = _ref3.action,
+        _ref3$action2 = _ref3$action === void 0 ? {} : _ref3$action,
+        _ref3$action2$autoDeb = _ref3$action2.autoDebitWithToken,
+        autoDebitWithToken = _ref3$action2$autoDeb === void 0 ? false : _ref3$action2$autoDeb,
+        _ref3$action2$require = _ref3$action2.requireFastSdk,
+        requireFastSdk = _ref3$action2$require === void 0 ? false : _ref3$action2$require;
+      var _ref4 = ((_this$_renderParams8 = this._renderParams) === null || _this$_renderParams8 === void 0 ? void 0 : _this$_renderParams8.paymentSessionMetaData) || {},
+        _ref4$authUrlInfo = _ref4.authUrlInfo,
+        authUrlInfo = _ref4$authUrlInfo === void 0 ? {} : _ref4$authUrlInfo;
+      this.AMSSDK.logger.logInfo({
+        title: 'sdk_event_createComponent'
+      }, {
+        version: productSceneVersion,
+        product: this.AMSSDK.options.product
+      }).send();
+      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) {
+        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;
+        var _requireFastSdk = (action === null || action === void 0 ? void 0 : action.requireFastSdk) || false;
+        if (signType === 'REDIRECT' && _requireFastSdk === true) {
+          // REDIRECT，requireFastSdk为true，不需要接口请求
+          this.handleAuthUrlInfo(authUrlInfo);
+          return;
+        }
+      }
+      if (componentSignEnum.AUTO_DEBIT_PAY_WALLET === this._componentSign) {
+        if (requireFastSdk === true && productSceneVersion === '1.0') {
+          // REDIRECT，requireFastSdk为true，不需要接口请求
+          this.handleAuthUrlInfo(authUrlInfo);
+          return;
+        } else {
+          return Promise.reject({
+            code: ERRORMESSAGE.CREATEPAYMENT_PARAMETER_ERROR.code,
+            message: "Abnormal response data, interface failure, or unsupported payment method."
+          });
+        }
+      }
       this.dispatchToSDK(EVENT.eventCallback.name, {
         code: eventCodeEnum.SDK_START_OF_LOADING
       });
@@ -274,9 +335,18 @@ var ComponentApp = /*#__PURE__*/function () {
         insertStyleSheet();
       }
       if (this._renderDisplayType === renderDisplayTypeEnum.popup) {
+        var _this$_renderParams10;
         createBaseElement(this.platform, this.closeBtnFunc.bind(this));
         createRetentionPopup(this.platform, this.hideRetentionPopupFunc.bind(this), this.retentionPopupLeaveFunc.bind(this));
-        createMockup();
+        var channelBehavior = getChannelBehavior((_this$_renderParams10 = this._renderParams) === null || _this$_renderParams10 === void 0 ? void 0 : _this$_renderParams10.paymentSessionMetaData);
+        var onClickOutside = function onClickOutside() {};
+        if (channelBehavior !== null && channelBehavior !== void 0 && channelBehavior.allowClickOutsideClose) {
+          onClickOutside = this.closeBtnFunc.bind(this);
+        }
+        createMockup({
+          platform: this.platform,
+          onClickOutside: onClickOutside
+        });
         this.renderPopupLoading(renderParams);
       }
       this.createApp(renderParams);
@@ -356,17 +426,18 @@ var ComponentApp = /*#__PURE__*/function () {
   }, {
     key: "createActionQueryPromise",
     value: function createActionQueryPromise() {
-      var _this5 = this;
+      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;
       this._performanceData.push({
         key: 'sdk_action_query_start',
         value: Date.now()
       });
-
       // eslint-disable-next-line no-async-promise-executor
       this._actionQueryPromise = new Promise( /*#__PURE__*/function () {
-        var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(resolve, reject) {
-          var _this5$_renderParams, _this5$_renderParams2, _this5$_renderParams3, _this5$_renderParams4, _this5$_renderParams5;
-          var envInfo, params, _ref3, _ref3$extendInfo, extendInfo, enableVaultingApiOptimize, enableEasypayApiOptimize, _ref4, skipSdkQuery, skipSdkQueryForm, extendInfoData, ifSkip, _this5$_renderParams6, _this5$_renderParams7, _ref5, _ref5$productSceneVer, productSceneVersion, _ref5$productScene, productScene, _ref6, _ref6$action, _ref6$action2, _ref6$action2$autoDeb, autoDebitWithToken, _this5$_renderParams8, _action$web, _action$wap, action, signType;
+        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;
           return _regeneratorRuntime().wrap(function _callee2$(_context2) {
             while (1) switch (_context2.prev = _context2.next) {
               case 0:
@@ -382,10 +453,10 @@ var ComponentApp = /*#__PURE__*/function () {
                 /**
                  * @description Simulated or unnecessary scenarios
                  */
-                _ref3 = ((_this5$_renderParams4 = _this5._renderParams) === null || _this5$_renderParams4 === void 0 ? void 0 : _this5$_renderParams4.paymentSessionMetaData) || {}, _ref3$extendInfo = _ref3.extendInfo, extendInfo = _ref3$extendInfo === void 0 ? '' : _ref3$extendInfo;
+                _ref6 = ((_this5$_renderParams4 = _this5._renderParams) === null || _this5$_renderParams4 === void 0 ? void 0 : _this5$_renderParams4.paymentSessionMetaData) || {}, _ref6$extendInfo = _ref6.extendInfo, extendInfo = _ref6$extendInfo === void 0 ? '' : _ref6$extendInfo, actionData = _ref6.action;
                 enableVaultingApiOptimize = false;
                 enableEasypayApiOptimize = false;
-                _ref4 = ((_this5$_renderParams5 = _this5._renderParams) === null || _this5$_renderParams5 === void 0 || (_this5$_renderParams5 = _this5$_renderParams5.paymentSessionMetaData) === null || _this5$_renderParams5 === void 0 ? void 0 : _this5$_renderParams5.action) || {}, skipSdkQuery = _ref4.skipSdkQuery, skipSdkQueryForm = _ref4.skipSdkQueryForm;
+                _ref7 = ((_this5$_renderParams5 = _this5._renderParams) === null || _this5$_renderParams5 === void 0 || (_this5$_renderParams5 = _this5$_renderParams5.paymentSessionMetaData) === null || _this5$_renderParams5 === void 0 ? void 0 : _this5$_renderParams5.action) || {}, skipSdkQuery = _ref7.skipSdkQuery, skipSdkQueryForm = _ref7.skipSdkQueryForm;
                 try {
                   extendInfoData = JSON.parse(extendInfo);
                   enableVaultingApiOptimize = extendInfoData.enableVaultingApiOptimize || false;
@@ -439,78 +510,89 @@ var ComponentApp = /*#__PURE__*/function () {
                 });
                 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
+                if (!(channelBehavior !== null && channelBehavior !== void 0 && channelBehavior.usePaymentSessionAsQueryResult)) {
+                  _context2.next = 24;
+                  break;
+                }
+                return _context2.abrupt("return", resolve({
+                  autoDebitWithToken: actionData === null || actionData === void 0 ? void 0 : actionData.autoDebitWithToken,
+                  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 = 27;
+                  _context2.next = 30;
                   break;
                 }
                 params.paymentMethodType = 'CARD';
-                _context2.next = 25;
+                _context2.next = 28;
                 return _this5.getDeviceIdAndLog();
-              case 25:
+              case 28:
                 envInfo.deviceId = _context2.sent;
                 if (window.navigator.userAgent.indexOf('miniProgram') > -1) {
                   envInfo.extendInfo = {
                     WAP_SUB_TYPE: 'WECHAT_MINI_PROGRAM'
                   };
                 }
-              case 27:
+              case 30:
                 if (!(componentSignEnum.EASY_PAY_WALLET === _this5._componentSign)) {
-                  _context2.next = 37;
+                  _context2.next = 40;
                   break;
                 }
-                _ref5 = params.paymentSessionConfig || {}, _ref5$productSceneVer = _ref5.productSceneVersion, productSceneVersion = _ref5$productSceneVer === void 0 ? '' : _ref5$productSceneVer, _ref5$productScene = _ref5.productScene, productScene = _ref5$productScene === void 0 ? '' : _ref5$productScene;
-                _ref6 = ((_this5$_renderParams6 = _this5._renderParams) === null || _this5$_renderParams6 === void 0 ? void 0 : _this5$_renderParams6.paymentSessionMetaData) || {}, _ref6$action = _ref6.action, _ref6$action2 = _ref6$action === void 0 ? {} : _ref6$action, _ref6$action2$autoDeb = _ref6$action2.autoDebitWithToken, autoDebitWithToken = _ref6$action2$autoDeb === void 0 ? false : _ref6$action2$autoDeb;
-                if (!((_this5$_renderParams7 = _this5._renderParams) !== null && _this5$_renderParams7 !== void 0 && (_this5$_renderParams7 = _this5$_renderParams7.paymentSessionMetaData) !== null && _this5$_renderParams7 !== void 0 && (_this5$_renderParams7 = _this5$_renderParams7.action) !== null && _this5$_renderParams7 !== void 0 && _this5$_renderParams7.skipSdkQuery && enableEasypayApiOptimize)) {
-                  _context2.next = 32;
+                _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;
                   break;
                 }
                 return _context2.abrupt("return", resolve({
                   message: 'sdk no need to make query request',
                   success: true
                 }));
-              case 32:
-                if (!(productScene === productSceneEnum.EASY_PAY && productSceneVersion === '2.0' && !autoDebitWithToken)) {
-                  _context2.next = 34;
+              case 35:
+                if (!(productScene === productSceneEnum.EASY_PAY && productSceneVersion === '2.0')) {
+                  _context2.next = 37;
                   break;
                 }
                 return _context2.abrupt("return", resolve({
                   message: 'sdk no need to make query request',
                   success: true
                 }));
-              case 34:
-                _context2.next = 36;
+              case 37:
+                _context2.next = 39;
                 return _this5.getDeviceIdAndLog();
-              case 36:
+              case 39:
                 envInfo.deviceId = _context2.sent;
-              case 37:
+              case 40:
                 if (!(componentSignEnum.AUTO_DEBIT_WALLET === _this5._componentSign)) {
-                  _context2.next = 47;
+                  _context2.next = 50;
                   break;
                 }
-                action = ((_this5$_renderParams8 = _this5._renderParams) === null || _this5$_renderParams8 === void 0 || (_this5$_renderParams8 = _this5$_renderParams8.paymentSessionMetaData) === null || _this5$_renderParams8 === void 0 ? void 0 : _this5$_renderParams8.action) || {};
-                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;
+                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 = 42;
+                  _context2.next = 45;
                   break;
                 }
                 return _context2.abrupt("return", resolve({
                   message: 'sdk no need to make query request',
                   success: true
                 }));
-              case 42:
+              case 45:
                 if (!(!signType || signType !== 'REDIRECT')) {
-                  _context2.next = 44;
+                  _context2.next = 47;
                   break;
                 }
                 return _context2.abrupt("return", resolve({
                   success: false
                 }));
-              case 44:
-                _context2.next = 46;
+              case 47:
+                _context2.next = 49;
                 return _this5.getDeviceIdAndLog();
-              case 46:
+              case 49:
                 envInfo.deviceId = _context2.sent;
-              case 47:
+              case 50:
                 _this5.AMSSDK.logger.logInfo({
                   title: 'sdk_event_sdkQuery'
                 }, {
@@ -549,14 +631,14 @@ var ComponentApp = /*#__PURE__*/function () {
                   }).send();
                   reject(err);
                 });
-              case 49:
+              case 52:
               case "end":
                 return _context2.stop();
             }
           }, _callee2);
         }));
         return function (_x, _x2) {
-          return _ref2.apply(this, arguments);
+          return _ref5.apply(this, arguments);
         };
       }());
       return this._actionQueryPromise;
@@ -566,46 +648,74 @@ var ComponentApp = /*#__PURE__*/function () {
   }, {
     key: "createSubmitPromise",
     value: function createSubmitPromise() {
-      var _this$_renderParams5,
-        _this$_renderParams6,
+      var _this$_renderParams12,
+        _this$_renderParams13,
+        _this$_renderParams14,
         _this6 = this;
       this._performanceData.push({
         key: 'sdk_submit_start',
         value: Date.now()
       });
       var params = {
-        paymentSessionData: this._renderParams && ((_this$_renderParams5 = this._renderParams) === null || _this$_renderParams5 === void 0 ? void 0 : _this$_renderParams5.sessionData) || '',
-        paymentSessionConfig: (_this$_renderParams6 = this._renderParams) === null || _this$_renderParams6 === void 0 || (_this$_renderParams6 = _this$_renderParams6.paymentSessionMetaData) === null || _this$_renderParams6 === void 0 ? void 0 : _this$_renderParams6.paymentSessionConfig
+        paymentSessionData: this._renderParams && ((_this$_renderParams12 = this._renderParams) === null || _this$_renderParams12 === void 0 ? void 0 : _this$_renderParams12.sessionData) || '',
+        paymentSessionConfig: (_this$_renderParams13 = this._renderParams) === null || _this$_renderParams13 === void 0 || (_this$_renderParams13 = _this$_renderParams13.paymentSessionMetaData) === null || _this$_renderParams13 === void 0 ? void 0 : _this$_renderParams13.paymentSessionConfig
       };
-
+      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 _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(resolve) {
-          var _this6$_renderParams;
+        var _ref10 = _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;
           return _regeneratorRuntime().wrap(function _callee3$(_context3) {
             while (1) switch (_context3.prev = _context3.next) {
               case 0:
-                if (!(!((_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)) {
-                  _context3.next = 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;
+                }
+                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字段
+                    params['signAgreement'] = enableSignAgreement;
+                  }
+                }
+                // 带上标记告知WebCheckOut SDK已发送submitpay请求
+                _this6._allowSubmitPayCallAhead = !shouldSkipSubmitPayInSDK;
+                if (!shouldSkipSubmitPayInSDK) {
+                  _context3.next = 6;
                   break;
                 }
                 return _context3.abrupt("return", resolve({
                   message: 'sdk no need to make submitPay request',
                   success: true
                 }));
-              case 2:
+              case 6:
                 _this6.AMSSDK.logger.logInfo({
                   title: 'sdk_event_submitPay'
                 }, {
                   paymentSessionConfig: JSON.stringify(params.paymentSessionConfig),
                   requestBody: params
                 }).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,
+                  locale: _this6.AMSSDK.options.locale,
+                  paymentMethodType: (_this6$_renderParams$ = _this6._renderParams.paymentSessionMetaData) === null || _this6$_renderParams$ === void 0 || (_this6$_renderParams$ = _this6$_renderParams$.paymentMethodInfoView) === null || _this6$_renderParams$ === void 0 ? void 0 : _this6$_renderParams$.paymentMethodType,
+                  paymentSessionData: _this6._renderParams.sessionData,
+                  env: _this6.AMSSDK.options.env.environment,
+                  sdkVersion: _this6._appVersion
+                })) || {};
+                params.extParams = extParams;
                 _context3.t0 = submitPayInfo;
                 _context3.t1 = params;
                 _context3.t2 = _this6.AMSSDK.options.env.environment;
-                _context3.next = 8;
+                _context3.next = 14;
                 return _this6.getDeviceIdAndLog();
-              case 8:
+              case 14:
                 _context3.t3 = _context3.sent;
                 _context3.t4 = {
                   deviceId: _context3.t3
@@ -639,14 +749,14 @@ var ComponentApp = /*#__PURE__*/function () {
                     success: false
                   });
                 });
-              case 13:
+              case 19:
               case "end":
                 return _context3.stop();
             }
           }, _callee3);
         }));
         return function (_x3) {
-          return _ref7.apply(this, arguments);
+          return _ref10.apply(this, arguments);
         };
       }());
     }
@@ -766,8 +876,13 @@ var ComponentApp = /*#__PURE__*/function () {
           path = _getIframeUrl2.path,
           locationSearch = _getIframeUrl2.locationSearch;
         this._appLocationSearch = locationSearch;
-        this.app.src = "".concat(path, "?").concat(locationSearch);
-
+        // locationSearch 是一个序列化好的字符串
+        // 先判断path 是否有QueryParams，如果有需要扩展，否则直接拼?xx=xx
+        if (path.indexOf('?') !== -1) {
+          this.app.src = "".concat(path, "&").concat(locationSearch);
+        } else {
+          this.app.src = "".concat(path, "?").concat(locationSearch);
+        }
         // Subscribe to messages from iframe
         this.addEventListener();
       } catch (error) {
@@ -782,7 +897,12 @@ var ComponentApp = /*#__PURE__*/function () {
   }, {
     key: "listener",
     value: function listener(e) {
+      var _e$data;
       if (e.origin !== this.appDomain) return;
+      if (((_e$data = e.data) === null || _e$data === void 0 ? void 0 : _e$data.source) === 'react-devtools-content-script') {
+        // 防止 react 开发工具发的消息，非常频繁影响查看日志
+        return;
+      }
       var isJson = isJsonString(e.data);
       if (isJson) {
         var data = JSON.parse(e.data);
@@ -1162,11 +1282,31 @@ var ComponentApp = /*#__PURE__*/function () {
         this.app.style.height = "".concat(data.context.data.height, "px");
       }
     }
+  }, {
+    key: "handleAuthUrlInfo",
+    value: function handleAuthUrlInfo(authUrlInfo) {
+      var data = {};
+      if (!(authUrlInfo !== null && authUrlInfo !== void 0 && authUrlInfo.normalUrl) && !(authUrlInfo !== null && authUrlInfo !== void 0 && authUrlInfo.schemeUrl) && !(authUrlInfo !== null && authUrlInfo !== void 0 && authUrlInfo.applinkUrl) && authUrlInfo !== null && authUrlInfo !== void 0 && authUrlInfo.authUrl) {
+        data = {
+          normalUrl: authUrlInfo === null || authUrlInfo === void 0 ? void 0 : authUrlInfo.authUrl,
+          schemeUrl: authUrlInfo === null || authUrlInfo === void 0 ? void 0 : authUrlInfo.authUrl,
+          applinkUrl: authUrlInfo === null || authUrlInfo === void 0 ? void 0 : authUrlInfo.authUrl
+        };
+      } else {
+        data = {
+          normalUrl: authUrlInfo === null || authUrlInfo === void 0 ? void 0 : authUrlInfo.normalUrl,
+          schemeUrl: authUrlInfo === null || authUrlInfo === void 0 ? void 0 : authUrlInfo.schemeUrl,
+          applinkUrl: authUrlInfo === null || authUrlInfo === void 0 ? void 0 : authUrlInfo.applinkUrl
+        };
+      }
+      this.handleRedirect(data, true);
+    }
   }, {
     key: "handleRedirect",
     value: function handleRedirect(data) {
       var _data$isDestroy,
         _this7 = this;
+      var fromFastSdk = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
       var _data = typeof data === 'string' ? {
         normalUrl: data
       } : _objectSpread(_objectSpread({}, data), {}, {
@@ -1189,7 +1329,8 @@ var ComponentApp = /*#__PURE__*/function () {
         }, {
           redirectInfo: JSON.stringify(_data),
           openType: type,
-          url: url
+          url: url,
+          fromFastSdk: fromFastSdk
         }).send();
       };
       var failCallback = function failCallback(type, url) {
@@ -1202,7 +1343,8 @@ var ComponentApp = /*#__PURE__*/function () {
         }, {
           redirectInfo: JSON.stringify(_data),
           openType: type,
-          url: url
+          url: url,
+          fromFastSdk: fromFastSdk
         }).send();
       };
 
@@ -1245,9 +1387,9 @@ var ComponentApp = /*#__PURE__*/function () {
     }
   }, {
     key: "handleDeclareInfo",
-    value: function handleDeclareInfo(_ref8) {
-      var _ref8$closeDialogData = _ref8.closeDialogData,
-        closeDialogData = _ref8$closeDialogData === void 0 ? {} : _ref8$closeDialogData;
+    value: function handleDeclareInfo(_ref13) {
+      var _ref13$closeDialogDat = _ref13.closeDialogData,
+        closeDialogData = _ref13$closeDialogDat === void 0 ? {} : _ref13$closeDialogDat;
       _handleDeclareInfo({
         closeDialogData: closeDialogData
       });
@@ -1348,20 +1490,12 @@ var ComponentApp = /*#__PURE__*/function () {
     key: "dispatchToApp",
     value: function dispatchToApp(payload) {
       var targetElement = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
-      var sendLog = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
       var data = Object.assign({}, payload, {
         name: messageName.SDK_TO_APP,
         mode: this.AMSSDK.options.mode,
         appId: COMPONENTPLUGINID,
         instanceId: this.AMSSDK._instanceId
       });
-      if (sendLog) {
-        this.AMSSDK.logger.logInfo({
-          title: 'sdk_event_send_message_to_web'
-        }, {
-          event: data === null || data === void 0 ? void 0 : data.context.event
-        }).send();
-      }
       if (targetElement && targetElement.contentWindow) {
         return targetElement.contentWindow.postMessage(JSON.stringify(data), '*');
       }
@@ -1396,7 +1530,7 @@ var ComponentApp = /*#__PURE__*/function () {
     key: "sendRenderEvent",
     value: (function () {
       var _sendRenderEvent = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
-        var _this$_renderParams7, _this$_renderParams8, _this$_renderParams9, _this$_renderParams10, _this$_renderParams11, _this$_renderParams12, _this$AMSSDK$logger, _this$_renderParams13, _this$_renderParams14, _this$_renderParams15, _this$AMSSDK, _this$_renderParams16, res, submitRes;
+        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;
         return _regeneratorRuntime().wrap(function _callee8$(_context8) {
           while (1) switch (_context8.prev = _context8.next) {
             case 0:
@@ -1425,32 +1559,33 @@ var ComponentApp = /*#__PURE__*/function () {
                   data: {
                     queryResult: res,
                     submitResult: submitRes,
-                    sessionResult: (_this$_renderParams7 = this._renderParams) === null || _this$_renderParams7 === void 0 ? void 0 : _this$_renderParams7.paymentSessionMetaData,
-                    paymentSessionData: (_this$_renderParams8 = this._renderParams) === null || _this$_renderParams8 === void 0 ? void 0 : _this$_renderParams8.sessionData,
+                    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,
                     heightOfVisible: Math.max(window.changingPageHeight, window.innerHeight),
-                    renderDisplayType: (_this$_renderParams9 = this._renderParams) === null || _this$_renderParams9 === void 0 ? void 0 : _this$_renderParams9.renderDisplayType,
-                    appearance: (_this$_renderParams10 = this._renderParams) === null || _this$_renderParams10 === void 0 ? void 0 : _this$_renderParams10.appearance,
-                    notRedirectAfterComplete: ((_this$_renderParams11 = this._renderParams) === null || _this$_renderParams11 === void 0 ? void 0 : _this$_renderParams11.notRedirectAfterComplete) === true,
+                    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,
                     merchantAppointParam: this._merchantAppointParam,
+                    allowSubmitPayCallAhead: this._allowSubmitPayCallAhead,
                     envInfo: {
                       screenHeight: screen.height,
                       screenWidth: screen.width
                     },
                     logMetaData: _objectSpread(_objectSpread({
-                      trackId: (_this$_renderParams12 = this._renderParams) === null || _this$_renderParams12 === void 0 ? void 0 : _this$_renderParams12.sessionData,
+                      trackId: (_this$_renderParams20 = this._renderParams) === null || _this$_renderParams20 === void 0 ? void 0 : _this$_renderParams20.sessionData,
                       platform: this.platform,
                       firstLogTime: (_this$AMSSDK$logger = this.AMSSDK.logger) === null || _this$AMSSDK$logger === void 0 ? void 0 : _this$AMSSDK$logger.getComponentStartTime()
-                    }, ((_this$_renderParams13 = this._renderParams) === null || _this$_renderParams13 === void 0 || (_this$_renderParams13 = _this$_renderParams13.paymentSessionMetaData) === null || _this$_renderParams13 === void 0 ? void 0 : _this$_renderParams13.paymentSessionConfig) || {}), {}, {
-                      renderDisplayType: (_this$_renderParams14 = this._renderParams) === null || _this$_renderParams14 === void 0 ? void 0 : _this$_renderParams14.renderDisplayType,
+                    }, ((_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,
                       sdkVersion: this._appVersion,
-                      merchantId: (_this$_renderParams15 = this._renderParams) === null || _this$_renderParams15 === void 0 || (_this$_renderParams15 = _this$_renderParams15.paymentSessionMetaData) === null || _this$_renderParams15 === void 0 ? void 0 : _this$_renderParams15.clientId,
+                      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,
                       instanceId: (_this$AMSSDK = this.AMSSDK) === null || _this$AMSSDK === void 0 ? void 0 : _this$AMSSDK._instanceId,
                       performanceData: this._performanceData,
-                      paymentMethodType: (_this$_renderParams16 = this._renderParams) === null || _this$_renderParams16 === void 0 || (_this$_renderParams16 = _this$_renderParams16.paymentSessionMetaData) === null || _this$_renderParams16 === void 0 || (_this$_renderParams16 = _this$_renderParams16.paymentMethodInfoView) === null || _this$_renderParams16 === void 0 ? void 0 : _this$_renderParams16.paymentMethodType
+                      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
                     })
                   }
                 }
-              }, null, true);
+              }, null);
               this.AMSSDK.logger.logInfo({
                 title: 'sdk_event_renderComponent'
               });
@@ -1489,9 +1624,6 @@ var ComponentApp = /*#__PURE__*/function () {
       var _document$getElementB4,
         _this9 = this;
       var immediately = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-      this.AMSSDK.logger.logInfo({
-        title: 'sdk_event_clean_component'
-      }).send();
       (_document$getElementB4 = document.getElementById(LOADING_ID)) === null || _document$getElementB4 === void 0 || _document$getElementB4.remove();
       this.hideComponentAnimation();
       var mockup = document.getElementById(MOCKUP_ID);

package/esm/plugin/paypal/index.js

@@ -124,7 +124,7 @@ export var PaypalBusSubscriber = /*#__PURE__*/function (_BusSubscriber) {
         locale: locale,
         'client-id': channelMerchantAccountId
       });
-      var disableFundingArr = [];
+      var disableFundingArr = ['bancontact', 'blik', 'eps', 'giropay', 'ideal', 'mercadopago', 'mybank', 'p24', 'sepa', 'sofort'];
       if (blockPayPalCreditButton && !displayPayPalPayLaterButtonOnly) {
         disableFundingArr.push('card');
       }

package/esm/request/index.js

@@ -91,9 +91,9 @@ function _request() {
           if (envInfo.terminalType === 'WAP') envInfo.osType = device.iOS ? 'IOS' : 'ANDROID';
           _data = [_objectSpread(_objectSpread({}, requestData), {}, {
             envInfo: envInfo,
-            extParams: {
+            extParams: _objectSpread(_objectSpread({}, requestData === null || requestData === void 0 ? void 0 : requestData.extParams), {}, {
               refUrl: window.location.href
-            }
+            })
           })];
           startTime = Date.now();
           _context.prev = 5;