@alipay/ams-checkout 0.0.1756987734-dev.2 → 0.0.1757298389-dev.1

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

@@ -49,10 +49,24 @@ var ElementController = /*#__PURE__*/function () {
     _defineProperty(this, "elementContainerService", void 0);
     // 新增变量
     _defineProperty(this, "onStatusChangeCallback", void 0);
-    _defineProperty(this, "onValidateFunc", function (event, target, params) {
+    _defineProperty(this, "onValidateFunc", function (event, target) {
       return new Promise(function (resolve) {
         event.emitAndListen({
           event: ElementPaymentEvent.VALIDATE,
+          data: {
+            params: {},
+            target: target,
+            source: ElementPaymentMethod.CONTAINER_ELEMENT
+          }
+        }, function (result) {
+          resolve(result);
+        });
+      });
+    });
+    _defineProperty(this, "onValidateAndSubmitPay", function (event, target, params) {
+      return new Promise(function (resolve) {
+        event.emitAndListen({
+          event: ElementPaymentEvent.SUBMIT_PAY,
           data: {
             params: _objectSpread({}, params),
             target: target,
@@ -188,75 +202,127 @@ var ElementController = /*#__PURE__*/function () {
       });
     }
   }, {
-    key: "submitPayment",
-    value: function submitPayment() {
+    key: "validateFields",
+    value:
+    /**
+     * 25/09/08 新增商户主动校验api
+     * @returns {Promise<{isValid: boolean}>}
+     */
+    function validateFields() {
       var _this3 = this;
-      this.changeLoading(true);
-      new Promise( /*#__PURE__*/function () {
+      return new Promise( /*#__PURE__*/function () {
         var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(resolve) {
-          var params, _this3$elementProcess, _result$data, _result$data2, result, _this3$elementProcess2, _result$data3, _result$data4, _result, _this3$elementProcess3;
+          var _this3$elementProcess;
+          var _this3$elementProcess2, validateResult;
           return _regeneratorRuntime().wrap(function _callee$(_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
-                params = {};
-                if (!_this3.elementProcessors[ElementType.auth]) {
-                  _context.next = 8;
+                if (!((_this3$elementProcess = _this3.elementProcessors) !== null && _this3$elementProcess !== void 0 && _this3$elementProcess[ElementType.payment])) {
+                  _context.next = 13;
                   break;
                 }
+                _context.prev = 1;
                 _context.next = 4;
-                return _this3.onValidateFunc((_this3$elementProcess = _this3.elementProcessors[ElementType.auth]) === null || _this3$elementProcess === void 0 ? void 0 : _this3$elementProcess.eventCenter, ElementPaymentMethod.AUTH_ELEMENT);
+                return _this3.onValidateFunc((_this3$elementProcess2 = _this3.elementProcessors[ElementType.payment]) === null || _this3$elementProcess2 === void 0 ? void 0 : _this3$elementProcess2.eventCenter, ElementPaymentMethod.PAYMENT_ELEMENT);
+              case 4:
+                validateResult = _context.sent;
+                return _context.abrupt("return", resolve({
+                  isValid: validateResult.data.success
+                }));
+              case 8:
+                _context.prev = 8;
+                _context.t0 = _context["catch"](1);
+                return _context.abrupt("return", resolve({
+                  isValid: false
+                }));
+              case 11:
+                _context.next = 14;
+                break;
+              case 13:
+                return _context.abrupt("return", resolve({
+                  isValid: false
+                }));
+              case 14:
+              case "end":
+                return _context.stop();
+            }
+          }, _callee, null, [[1, 8]]);
+        }));
+        return function (_x) {
+          return _ref2.apply(this, arguments);
+        };
+      }());
+    }
+  }, {
+    key: "submitPayment",
+    value: function submitPayment() {
+      var _this4 = this;
+      this.changeLoading(true);
+      new Promise( /*#__PURE__*/function () {
+        var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(resolve) {
+          var params, _this4$elementProcess, _result$data, _result$data2, result, _this4$elementProcess2, _result$data3, _result$data4, _result, _this4$elementProcess3;
+          return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+            while (1) switch (_context2.prev = _context2.next) {
+              case 0:
+                params = {};
+                if (!_this4.elementProcessors[ElementType.auth]) {
+                  _context2.next = 8;
+                  break;
+                }
+                _context2.next = 4;
+                return _this4.onValidateAndSubmitPay((_this4$elementProcess = _this4.elementProcessors[ElementType.auth]) === null || _this4$elementProcess === void 0 ? void 0 : _this4$elementProcess.eventCenter, ElementPaymentMethod.AUTH_ELEMENT);
               case 4:
-                result = _context.sent;
+                result = _context2.sent;
                 params.accountInfo = (_result$data = result.data) === null || _result$data === void 0 || (_result$data = _result$data.data) === null || _result$data === void 0 ? void 0 : _result$data.accountInfo;
                 if (result !== null && result !== void 0 && (_result$data2 = result.data) !== null && _result$data2 !== void 0 && _result$data2.success) {
-                  _context.next = 8;
+                  _context2.next = 8;
                   break;
                 }
-                return _context.abrupt("return", resolve(undefined));
+                return _context2.abrupt("return", resolve(undefined));
               case 8:
-                if (!_this3.elementProcessors[ElementType.address]) {
-                  _context.next = 15;
+                if (!_this4.elementProcessors[ElementType.address]) {
+                  _context2.next = 15;
                   break;
                 }
-                _context.next = 11;
-                return _this3.onValidateFunc((_this3$elementProcess2 = _this3.elementProcessors[ElementType.address]) === null || _this3$elementProcess2 === void 0 ? void 0 : _this3$elementProcess2.eventCenter, ElementPaymentMethod.ADDRESS_ELEMENT);
+                _context2.next = 11;
+                return _this4.onValidateAndSubmitPay((_this4$elementProcess2 = _this4.elementProcessors[ElementType.address]) === null || _this4$elementProcess2 === void 0 ? void 0 : _this4$elementProcess2.eventCenter, ElementPaymentMethod.ADDRESS_ELEMENT);
               case 11:
-                _result = _context.sent;
+                _result = _context2.sent;
                 params.shipping = (_result$data3 = _result.data) === null || _result$data3 === void 0 ? void 0 : _result$data3.data;
                 if (_result !== null && _result !== void 0 && (_result$data4 = _result.data) !== null && _result$data4 !== void 0 && _result$data4.success) {
-                  _context.next = 15;
+                  _context2.next = 15;
                   break;
                 }
-                return _context.abrupt("return", resolve(undefined));
+                return _context2.abrupt("return", resolve(undefined));
               case 15:
-                if (!_this3.elementProcessors[ElementType.payment]) {
-                  _context.next = 25;
+                if (!_this4.elementProcessors[ElementType.payment]) {
+                  _context2.next = 25;
                   break;
                 }
-                _context.prev = 16;
-                _context.next = 19;
-                return _this3.onValidateFunc((_this3$elementProcess3 = _this3.elementProcessors[ElementType.payment]) === null || _this3$elementProcess3 === void 0 ? void 0 : _this3$elementProcess3.eventCenter, ElementPaymentMethod.PAYMENT_ELEMENT, params);
+                _context2.prev = 16;
+                _context2.next = 19;
+                return _this4.onValidateAndSubmitPay((_this4$elementProcess3 = _this4.elementProcessors[ElementType.payment]) === null || _this4$elementProcess3 === void 0 ? void 0 : _this4$elementProcess3.eventCenter, ElementPaymentMethod.PAYMENT_ELEMENT, params);
               case 19:
-                return _context.abrupt("return", resolve(undefined));
+                return _context2.abrupt("return", resolve(undefined));
               case 22:
-                _context.prev = 22;
-                _context.t0 = _context["catch"](16);
-                return _context.abrupt("return", resolve(undefined));
+                _context2.prev = 22;
+                _context2.t0 = _context2["catch"](16);
+                return _context2.abrupt("return", resolve(undefined));
               case 25:
                 resolve(params);
               case 26:
               case "end":
-                return _context.stop();
+                return _context2.stop();
             }
-          }, _callee, null, [[16, 22]]);
+          }, _callee2, null, [[16, 22]]);
         }));
-        return function (_x) {
-          return _ref2.apply(this, arguments);
+        return function (_x2) {
+          return _ref3.apply(this, arguments);
         };
       }()).then(function () {
-        _this3.changeLoading(false);
+        _this4.changeLoading(false);
       }, function () {
-        _this3.changeLoading(false);
+        _this4.changeLoading(false);
       });
     }
   }, {
@@ -281,21 +347,21 @@ var ElementController = /*#__PURE__*/function () {
   }, {
     key: "addEventListener",
     value: function addEventListener(renderCallback) {
-      var _this4 = this;
+      var _this5 = this;
       this.serviceMap.EventCenter.listen(ElementPaymentEvent.ON_EVENT_CALLBACK, function (data) {
-        var _this4$onEventCallbac;
-        (_this4$onEventCallbac = _this4.onEventCallback) === null || _this4$onEventCallbac === void 0 || _this4$onEventCallbac.call(_this4, data);
+        var _this5$onEventCallbac;
+        (_this5$onEventCallbac = _this5.onEventCallback) === null || _this5$onEventCallbac === void 0 || _this5$onEventCallbac.call(_this5, data);
       });
       this.serviceMap.EventCenter.listen(EVENT.sizeChanged.name, function (data) {
-        clearTimeout(_this4.initTimeout);
-        _this4.initTimeout = null;
-        if (_this4.elementContainerService.getContainerService(data.source)) {
+        clearTimeout(_this5.initTimeout);
+        _this5.initTimeout = null;
+        if (_this5.elementContainerService.getContainerService(data.source)) {
           renderCallback({
             success: true
           });
-          _this4.elementContainerService.getContainerService(data.source).switchContainerStatus(IContainerStatus.IN_BIZ_FLOW);
+          _this5.elementContainerService.getContainerService(data.source).switchContainerStatus(IContainerStatus.IN_BIZ_FLOW);
         }
-        _this4.changeLoading(false);
+        _this5.changeLoading(false);
         // 遍历containerService中的所有container查看是否所有状态都是IN_BIZ_FLOW
         // const allContainersInBizFlow = Object.values(this.elementContainerService.getContainerServices()).every(
         //   (containerService) => containerService.getContainerStatus() === IContainerStatus.IN_BIZ_FLOW,
@@ -305,22 +371,22 @@ var ElementController = /*#__PURE__*/function () {
         // }
       });
       this.serviceMap.EventCenter.listen(EVENT.redirect.name, function (data) {
-        var onEventCallback = _this4.onEventCallback.bind(_this4);
+        var onEventCallback = _this5.onEventCallback.bind(_this5);
         handleRedirect(data, false, onEventCallback);
       });
       this.serviceMap.EventCenter.listen(EVENT.destroy.name, function () {
-        _this4.setControllerStatusOrView(IElementStatus.READY);
-        _this4.destroyHandle();
+        _this5.setControllerStatusOrView(IElementStatus.READY);
+        _this5.destroyHandle();
       });
       this.serviceMap.EventCenter.listen(EVENT.webAppReady.name, function (data) {
-        clearTimeout(_this4.initTimeout);
-        if (_this4.elementContainerService.getContainerService(data.source)) {
+        clearTimeout(_this5.initTimeout);
+        if (_this5.elementContainerService.getContainerService(data.source)) {
           renderCallback({
             success: true
           });
-          _this4.elementContainerService.getContainerService(data.source).switchContainerStatus(IContainerStatus.IN_BIZ_FLOW);
+          _this5.elementContainerService.getContainerService(data.source).switchContainerStatus(IContainerStatus.IN_BIZ_FLOW);
         }
-        _this4.changeLoading(false);
+        _this5.changeLoading(false);
       });
       this.serviceMap.EventCenter.listen(EVENT.showToast.name, function (data) {
         showToast(data);
@@ -328,8 +394,8 @@ var ElementController = /*#__PURE__*/function () {
       this.serviceMap.EventCenter.listen(EVENT.messageForward.name, function (data) {
         var source = MountElementType[data.source];
         var target = MountElementType[data.target];
-        if (_this4.elementProcessors[source] && _this4.elementProcessors[target]) {
-          _this4.elementProcessors[target].eventCenter.dispatchToApp({
+        if (_this5.elementProcessors[source] && _this5.elementProcessors[target]) {
+          _this5.elementProcessors[target].eventCenter.dispatchToApp({
             event: data.event,
             data: data
           });
@@ -339,24 +405,24 @@ var ElementController = /*#__PURE__*/function () {
   }, {
     key: "sendRequestAndWaitWebLaunch",
     value: function sendRequestAndWaitWebLaunch(renderOptions) {
-      var _this5 = this;
+      var _this6 = this;
       var type = renderOptions.type,
         options = _objectWithoutProperties(renderOptions, _excluded);
       var webLaunchPromise = this.elementContainerService.getContainerService(type).createWebLaunchPromise();
-      Promise.all([webLaunchPromise, this.elementProcessors[type].obtainData()]).then(function (_ref3) {
-        var _this5$elementContain;
-        var _ref4 = _slicedToArray(_ref3, 2),
-          _webLaunchRes = _ref4[0],
-          _obtainDataRes = _ref4[1];
-        (_this5$elementContain = _this5.elementContainerService.getContainerService(type)) === null || _this5$elementContain === void 0 || _this5$elementContain.switchContainerStatus(IContainerStatus.READY);
+      Promise.all([webLaunchPromise, this.elementProcessors[type].obtainData()]).then(function (_ref4) {
+        var _this6$elementContain;
+        var _ref5 = _slicedToArray(_ref4, 2),
+          _webLaunchRes = _ref5[0],
+          _obtainDataRes = _ref5[1];
+        (_this6$elementContain = _this6.elementContainerService.getContainerService(type)) === null || _this6$elementContain === void 0 || _this6$elementContain.switchContainerStatus(IContainerStatus.READY);
         var allReady = true;
-        _this5.elementContainerService.getContainerServices().forEach(function (item) {
+        _this6.elementContainerService.getContainerServices().forEach(function (item) {
           if (!allReady) return;
           allReady = item.getContainerStatus() === IContainerStatus.READY;
         });
         if (allReady) {
-          _this5.elementContainerService.getContainerServices().forEach(function (value, key) {
-            _this5.sendReady(key, options);
+          _this6.elementContainerService.getContainerServices().forEach(function (value, key) {
+            _this6.sendReady(key, options);
           });
         }
       });
@@ -392,37 +458,37 @@ var ElementController = /*#__PURE__*/function () {
   }, {
     key: "updatePayment",
     value: function () {
-      var _updatePayment = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(paymentSessionData) {
-        var _this6 = this;
-        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
+      var _updatePayment = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(paymentSessionData) {
+        var _this7 = this;
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              return _context3.abrupt("return", new Promise( /*#__PURE__*/function () {
-                var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(resolve) {
+              return _context4.abrupt("return", new Promise( /*#__PURE__*/function () {
+                var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(resolve) {
                   var prePaymentSessionData, data, LOCAL_MOCK;
-                  return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-                    while (1) switch (_context2.prev = _context2.next) {
+                  return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+                    while (1) switch (_context3.prev = _context3.next) {
                       case 0:
                         if (checkCanUpdate({
-                          status: _this6.elementContainer.getStatus(),
-                          paymentContainerService: _this6.elementContainerService.getContainerService(ElementType.payment),
+                          status: _this7.elementContainer.getStatus(),
+                          paymentContainerService: _this7.elementContainerService.getContainerService(ElementType.payment),
                           newPaymentSessionData: paymentSessionData,
-                          oldPaymentSessionData: _this6.options.sessionData
+                          oldPaymentSessionData: _this7.options.sessionData
                         })) {
-                          _context2.next = 2;
+                          _context3.next = 2;
                           break;
                         }
-                        return _context2.abrupt("return", resolve(false));
+                        return _context3.abrupt("return", resolve(false));
                       case 2:
-                        prePaymentSessionData = _this6.elementContainer.getPaymentContext().paymentSession;
-                        _this6.elementContainer.updatePaymentSessionData(paymentSessionData);
+                        prePaymentSessionData = _this7.elementContainer.getPaymentContext().paymentSession;
+                        _this7.elementContainer.updatePaymentSessionData(paymentSessionData);
                         // 1、数据获取
-                        _context2.next = 6;
-                        return _this6.elementProcessors[ElementType.payment].obtainData();
+                        _context3.next = 6;
+                        return _this7.elementProcessors[ElementType.payment].obtainData();
                       case 6:
-                        data = _context2.sent;
+                        data = _context3.sent;
                         LOCAL_MOCK = window.location.href.indexOf('LOCAL_MOCK=1') !== -1; // 2、发送update消息
-                        Object.values(_this6.elementProcessors).forEach(function (processor) {
+                        Object.values(_this7.elementProcessors).forEach(function (processor) {
                           processor.update({
                             data: {
                               originActionQueryResult: LOCAL_MOCK ? sdkActionUpdate : data.originActionQueryResult,
@@ -432,30 +498,30 @@ var ElementController = /*#__PURE__*/function () {
                           });
                         });
                         // 3、返回更新结果
-                        _this6.serviceMap.EventCenter.listen(EVENT.updated.name, function (data) {
+                        _this7.serviceMap.EventCenter.listen(EVENT.updated.name, function (data) {
                           // 若更新不成功，还原core.paymentContext信息
                           if (!data.success) {
-                            _this6.elementContainer.updatePaymentSessionData(prePaymentSessionData);
+                            _this7.elementContainer.updatePaymentSessionData(prePaymentSessionData);
                           }
                           return resolve(data.success || false);
                         });
                       case 10:
                       case "end":
-                        return _context2.stop();
+                        return _context3.stop();
                     }
-                  }, _callee2);
+                  }, _callee3);
                 }));
-                return function (_x3) {
-                  return _ref5.apply(this, arguments);
+                return function (_x4) {
+                  return _ref6.apply(this, arguments);
                 };
               }()));
             case 1:
             case "end":
-              return _context3.stop();
+              return _context4.stop();
           }
-        }, _callee3);
+        }, _callee4);
       }));
-      function updatePayment(_x2) {
+      function updatePayment(_x3) {
         return _updatePayment.apply(this, arguments);
       }
       return updatePayment;

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

@@ -7,6 +7,9 @@ export declare class ElementComponent {
     mount(renderOptions: LinkAuthMountOptions, sdkSelector: string): LinkAuthMountResult;
     mount(renderOptions: AddressMountOptions, sdkSelector: string): AddressMountResult;
     mount(renderOptions: PaymentMountOptions, sdkSelector: string): PaymentMountResult;
+    validateFields(): Promise<{
+        isValid: boolean;
+    }>;
     submitPayment(): void;
     destroy(): void;
 }

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

@@ -49,6 +49,11 @@ export var ElementComponent = /*#__PURE__*/function () {
         appearance: this === null || this === void 0 || (_this$options = this.options) === null || _this$options === void 0 ? void 0 : _this$options.appearance
       }, renderOptions), sdkSelector);
     }
+  }, {
+    key: "validateFields",
+    value: function validateFields() {
+      return this.controller.validateFields();
+    }
   }, {
     key: "submitPayment",
     value: function submitPayment() {

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

@@ -10,7 +10,8 @@ export declare enum ElementPaymentEvent {
     CAPTURE_ASSET = "onCaptureAsset",
     SIGN_OUT = "onSignout",
     BLUR = "onBlur",
-    VALIDATE = "submitPay",
+    SUBMIT_PAY = "submitPay",
+    VALIDATE = "onValidate",
     SUBMIT_RISK = "onSubmitRisk",
     AFTER_SUBMIT = "onAfterSubmit",
     SIZE_CHANGE = "onSizeChange",

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

@@ -10,7 +10,8 @@ export var ElementPaymentEvent = /*#__PURE__*/function (ElementPaymentEvent) {
   ElementPaymentEvent["CAPTURE_ASSET"] = "onCaptureAsset";
   ElementPaymentEvent["SIGN_OUT"] = "onSignout";
   ElementPaymentEvent["BLUR"] = "onBlur";
-  ElementPaymentEvent["VALIDATE"] = "submitPay";
+  ElementPaymentEvent["SUBMIT_PAY"] = "submitPay";
+  ElementPaymentEvent["VALIDATE"] = "onValidate";
   ElementPaymentEvent["SUBMIT_RISK"] = "onSubmitRisk";
   ElementPaymentEvent["AFTER_SUBMIT"] = "onAfterSubmit";
   ElementPaymentEvent["SIZE_CHANGE"] = "onSizeChange";

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

@@ -1,5 +1,5 @@
 import ComponentApp from '../../plugin/component';
-import { ComponentSignEnum, EventPayloadContext, IappendIframeNodesParams, IcreateComponent, IoptionsParams, IPaymentSessionMetaData, Iselector, Isubmit, PaymentMethodTypeEnum, SubPaymentMethodTypeEnum, ValidationResult } from '../../types';
+import { ComponentSignEnum, IappendIframeNodesParams, IcreateComponent, IoptionsParams, IPaymentSessionMetaData, Iselector, Isubmit, PaymentMethodTypeEnum, SubPaymentMethodTypeEnum } from '../../types';
 import CoreInstance from '../instance/index';
 export declare const getComponentSign: (params: IPaymentSessionMetaData) => ComponentSignEnum;
 export declare const parseSessionData: (sessionData: string) => [IPaymentSessionMetaData, string];
@@ -52,6 +52,4 @@ export declare class AMSComponent extends CoreInstance {
      * @param data - Transfer information in the submission interface according to your requirements (optional)
      */
     submit(data?: Isubmit): Promise<unknown>;
-    protected _validateFields(): Promise<ValidationResult>;
-    protected _sendMessageToAPP(eventContext: EventPayloadContext): void;
 }

package/esm/core/component/index.js

@@ -35,7 +35,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
  * 2. If applicable, the use of the Software is also subject to the terms and conditions of any non-disclosure agreement signed by you and the relevant Ant Group entity.
  */
 import { v4 as uuid } from 'uuid';
-import { COMPONENTPLUGINID, ERRORMESSAGE, EVENT, SENDEVENT } from "../../constant";
+import { COMPONENTPLUGINID, ERRORMESSAGE, EVENT } from "../../constant";
 import { ApplePayBusSubscriber } from "../../plugin/applepay";
 import ComponentApp from "../../plugin/component";
 import { ExtendPlugin } from "../../plugin/const";
@@ -526,88 +526,6 @@ export var AMSComponent = /*#__PURE__*/function (_CoreInstance) {
         }
       });
     }
-
-    // 预留给AMSVaulting复用
-  }, {
-    key: "_validateFields",
-    value: function _validateFields() {
-      var _this9 = this;
-      return new Promise(function (resolve) {
-        // 收银台应用渲染表单后，才允许发送校验消息，三端约定一致
-        if (!_this9._componentApp.shouldValidateFields()) {
-          resolve({
-            isValid: false
-          });
-          _this9.logger.logInfo({
-            title: 'sdk_event_validateFields'
-          }, {
-            processResult: 'notRenderComponent'
-          });
-          return;
-        }
-        var timeoutId;
-        var validationPromise = new Promise(function (validationResolve) {
-          // 发送validateFields消息
-          _this9._sendMessageToAPP({
-            event: SENDEVENT.validateFields.name,
-            data: {}
-          });
-          // 接收收银台应用的返回validateFieldsResult消息
-          _this9._overrideSubscription(EVENT.validateFieldsResult.name, /*#__PURE__*/function () {
-            var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(payload) {
-              return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-                while (1) switch (_context2.prev = _context2.next) {
-                  case 0:
-                    _this9.logger.logInfo({
-                      title: 'sdk_event_validateFields'
-                    }, {
-                      processResult: payload.isValid ? 'true' : 'false'
-                    });
-                    // 收银台应用保证数据格式，三端SDK负责透传
-                    validationResolve(payload);
-                  case 2:
-                  case "end":
-                    return _context2.stop();
-                }
-              }, _callee2);
-            }));
-            return function (_x2) {
-              return _ref5.apply(this, arguments);
-            };
-          }(), EVENT.validateFieldsResult.uniqueKey);
-        });
-
-        // 兜底场景，三端约定超时时间15秒，兼容cpf网络校验超时场景
-        var timeoutPromise = new Promise(function (timeoutResolve) {
-          timeoutId = setTimeout(function () {
-            _this9.logger.logInfo({
-              title: 'sdk_event_validateFields'
-            }, {
-              processResult: 'timeout'
-            });
-            timeoutResolve({
-              isValid: false
-            });
-          }, 15000);
-        });
-        Promise.race([validationPromise, timeoutPromise]).then(function (result) {
-          clearTimeout(timeoutId);
-          resolve(result);
-        }).catch(function () {
-          clearTimeout(timeoutId);
-          resolve({
-            isValid: false
-          });
-        });
-      });
-    }
-  }, {
-    key: "_sendMessageToAPP",
-    value: function _sendMessageToAPP(eventContext) {
-      this._componentApp.dispatchToApp({
-        context: eventContext
-      });
-    }
   }]);
   return AMSComponent;
 }(CoreInstance);

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

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

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

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

package/esm/index.d.ts

@@ -1,7 +1,7 @@
 import { AddressComponent } from './core/component/address';
 import { ElementComponent } from './core/component/element';
 import { AMSComponent } from './core/component/index';
-import { ComponentSignEnum, IcreateComponent, IElementOptions, IoptionsAddressParams, IoptionsParams, IPreloadOptions, ValidationResult } from './types';
+import { ComponentSignEnum, IcreateComponent, IElementOptions, IoptionsAddressParams, IoptionsParams, IPreloadOptions } from './types';
 export { AMSCheckoutPage } from './core/component/ckp';
 export * from './types';
 export declare class AMSCheckout extends AMSComponent {
@@ -14,15 +14,6 @@ export declare class AMSAutoDebitPay extends AMSCheckout {
 export declare class AMSCashierPayment extends AMSCheckout {
     constructor(options: IoptionsParams);
     static preload(options?: IPreloadOptions): void;
-    /**
-   * Form validation function
-   * If the form is currently displayed:
-   *   - Successful validation: isValid is true
-   *   - Failed validation: isValid is false, and error messages are displayed on the form page
-   * If not on the form display page, isValid returns false
-   * @returns {Promise<ValidationResult>} Returns a Promise containing the validation result
-   */
-    validateFields(): Promise<ValidationResult>;
 }
 export declare class AMSVaulting extends AMSCheckout {
     constructor(options: IoptionsParams);