@alipay/ams-checkout 0.0.1757298389-dev.2 → 0.0.1757298389-dev.3

package/esm/core/component/element/elementContainerService/containerService.js

@@ -19,7 +19,7 @@ export var IContainerStatus = /*#__PURE__*/function (IContainerStatus) {
 }({});
 export var ContainerController = /*#__PURE__*/function () {
   function ContainerController(_ref) {
-    var _options$debugProps;
+    var _options$debugProps, _options$debugProps2;
     var type = _ref.type,
       instanceId = _ref.instanceId,
       selector = _ref.selector,
@@ -41,6 +41,7 @@ export var ContainerController = /*#__PURE__*/function () {
       sdkVersion: '',
       webAppVersion: ''
     });
+    var iframesSrcLink = options !== null && options !== void 0 && (_options$debugProps = options.debugProps) !== null && _options$debugProps !== void 0 && _options$debugProps.isDebug ? (options === null || options === void 0 || (_options$debugProps2 = options.debugProps) === null || _options$debugProps2 === void 0 ? void 0 : _options$debugProps2.localLink) || '' : '';
     this.containerElement = this.containerService.load({
       type: DisplayTypeEnum.inline,
       platform: isElementPad() ? PlatformEnum.desktop : isElementPC() ? PlatformEnum.desktop : PlatformEnum.mobile,
@@ -51,7 +52,7 @@ export var ContainerController = /*#__PURE__*/function () {
         display: 'block'
       }
     }, processor.generateIframeSrc({
-      link: options === null || options === void 0 || (_options$debugProps = options.debugProps) === null || _options$debugProps === void 0 ? void 0 : _options$debugProps.localLink,
+      link: iframesSrcLink,
       instanceId: this.instanceId
     }));
     this.eventService = ServiceProvider.getInstance(this.instanceId).getService('EventCenter');

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

@@ -6,7 +6,6 @@ declare class ElementController {
     private loading;
     private elementProcessors;
     private initTimeout;
-    private processingSubmitPay;
     private elementContainerService;
     private onStatusChangeCallback;
     constructor(options: IElementOptions);

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

@@ -46,8 +46,6 @@ var ElementController = /*#__PURE__*/function () {
     _defineProperty(this, "loading", void 0);
     _defineProperty(this, "elementProcessors", void 0);
     _defineProperty(this, "initTimeout", void 0);
-    _defineProperty(this, "processingSubmitPay", void 0);
-    // 支付中
     _defineProperty(this, "elementContainerService", void 0);
     // 新增变量
     _defineProperty(this, "onStatusChangeCallback", void 0);
@@ -81,7 +79,6 @@ var ElementController = /*#__PURE__*/function () {
     });
     this.options = options;
     var _options = options;
-    this.processingSubmitPay = false;
     this.onStatusChangeCallback = _options === null || _options === void 0 ? void 0 : _options.onStatusChangeCallback;
     this.elementContainer = new AntomSDKCore();
     this.elementContainer.registerProcessor(ProductSceneEnum.ELEMENT_PAYMENT, '', new ElementProcessor());
@@ -220,44 +217,34 @@ var ElementController = /*#__PURE__*/function () {
           return _regeneratorRuntime().wrap(function _callee$(_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
-                if (!_this3.processingSubmitPay) {
-                  _context.next = 4;
-                  break;
-                }
-                return _context.abrupt("return", resolve({
-                  isValid: false
-                }));
-              case 4:
                 if (!((_this3$elementProcess = _this3.elementProcessors) !== null && _this3$elementProcess !== void 0 && _this3$elementProcess[ElementType.payment])) {
-                  _context.next = 17;
+                  _context.next = 13;
                   break;
                 }
-                _context.prev = 5;
-                _context.next = 8;
+                _context.prev = 1;
+                _context.next = 4;
                 return _this3.onValidateFunc((_this3$elementProcess2 = _this3.elementProcessors[ElementType.payment]) === null || _this3$elementProcess2 === void 0 ? void 0 : _this3$elementProcess2.eventCenter, ElementPaymentMethod.PAYMENT_ELEMENT);
-              case 8:
+              case 4:
                 validateResult = _context.sent;
-                return _context.abrupt("return", resolve({
-                  isValid: validateResult.data.success
-                }));
-              case 12:
-                _context.prev = 12;
-                _context.t0 = _context["catch"](5);
+                return _context.abrupt("return", resolve(validateResult.data));
+              case 8:
+                _context.prev = 8;
+                _context.t0 = _context["catch"](1);
                 return _context.abrupt("return", resolve({
                   isValid: false
                 }));
-              case 15:
-                _context.next = 18;
+              case 11:
+                _context.next = 14;
                 break;
-              case 17:
+              case 13:
                 return _context.abrupt("return", resolve({
                   isValid: false
                 }));
-              case 18:
+              case 14:
               case "end":
                 return _context.stop();
             }
-          }, _callee, null, [[5, 12]]);
+          }, _callee, null, [[1, 8]]);
         }));
         return function (_x) {
           return _ref2.apply(this, arguments);
@@ -271,7 +258,7 @@ var ElementController = /*#__PURE__*/function () {
       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, _paymentSubmitResult$, paymentSubmitResult;
+          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:
@@ -307,29 +294,25 @@ var ElementController = /*#__PURE__*/function () {
                 return _context2.abrupt("return", resolve(undefined));
               case 15:
                 if (!_this4.elementProcessors[ElementType.payment]) {
-                  _context2.next = 29;
+                  _context2.next = 25;
                   break;
                 }
                 _context2.prev = 16;
-                _this4.processingSubmitPay = true;
-                _context2.next = 20;
+                _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 20:
-                paymentSubmitResult = _context2.sent;
-                _this4.processingSubmitPay = paymentSubmitResult === null || paymentSubmitResult === void 0 || (_paymentSubmitResult$ = paymentSubmitResult.data) === null || _paymentSubmitResult$ === void 0 ? void 0 : _paymentSubmitResult$.success;
+              case 19:
                 return _context2.abrupt("return", resolve(undefined));
-              case 25:
-                _context2.prev = 25;
+              case 22:
+                _context2.prev = 22;
                 _context2.t0 = _context2["catch"](16);
-                _this4.processingSubmitPay = false;
                 return _context2.abrupt("return", resolve(undefined));
-              case 29:
+              case 25:
                 resolve(params);
-              case 30:
+              case 26:
               case "end":
                 return _context2.stop();
             }
-          }, _callee2, null, [[16, 25]]);
+          }, _callee2, null, [[16, 22]]);
         }));
         return function (_x2) {
           return _ref3.apply(this, arguments);
@@ -367,9 +350,6 @@ var ElementController = /*#__PURE__*/function () {
         var _this5$onEventCallbac;
         (_this5$onEventCallbac = _this5.onEventCallback) === null || _this5$onEventCallbac === void 0 || _this5$onEventCallbac.call(_this5, data);
       });
-      this.serviceMap.EventCenter.listen(ElementPaymentEvent.ON_PAY_STATUS_CHANGE, function (data) {
-        _this5.processingSubmitPay = data.isProcessingPay;
-      });
       this.serviceMap.EventCenter.listen(EVENT.sizeChanged.name, function (data) {
         clearTimeout(_this5.initTimeout);
         _this5.initTimeout = null;

package/esm/core/component/element/elementProcessor/paymentProcessor.js

@@ -242,18 +242,19 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
     value: function () {
       var _obtainData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
         var _paymentSessionObj$co;
-        var requestService, _this$elementContaine8, paymentSession, paymentSessionObj, displayInfo, merchantAppointParam, _this$options2, environment, locale, _ref4, paymentSessionConfig, hostSign, isConnect, LOCAL_MOCK, _queryParse, appType, terminalType, generateActionQueryPromise, generateOneAccountQueryPromise, _yield$Promise$all, _yield$Promise$all2, originActionQueryResult, originOneAccountQueryResult;
+        var requestService, _this$elementContaine8, paymentSession, paymentSessionObj, displayInfo, _displayInfo, debugProps, _this$options2, environment, locale, _ref4, paymentSessionConfig, hostSign, isConnect, LOCAL_MOCK, _queryParse, appType, terminalType, generateActionQueryPromise, generateOneAccountQueryPromise, _yield$Promise$all, _yield$Promise$all2, originActionQueryResult, originOneAccountQueryResult;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               requestService = ServiceProvider.getInstance(this.instanceId).getService('Requester');
               _this$elementContaine8 = this.elementContainer.getPaymentContext(), paymentSession = _this$elementContaine8.paymentSession, paymentSessionObj = _this$elementContaine8.paymentSessionObj, displayInfo = _this$elementContaine8.displayInfo;
-              merchantAppointParam = displayInfo.merchantAppointParam;
+              _displayInfo = displayInfo;
+              debugProps = _displayInfo.debugProps;
               _this$options2 = this.options, environment = _this$options2.env.environment, locale = _this$options2.locale;
               _ref4 = paymentSessionObj || {}, paymentSessionConfig = _ref4.paymentSessionConfig;
               hostSign = paymentSession.split('&&')[1] || '';
               isConnect = paymentSessionObj === null || paymentSessionObj === void 0 || (_paymentSessionObj$co = paymentSessionObj.connectFactor) === null || _paymentSessionObj$co === void 0 ? void 0 : _paymentSessionObj$co.enableConnect;
-              LOCAL_MOCK = window.location.href.indexOf('LOCAL_MOCK=1') !== -1;
+              LOCAL_MOCK = (debugProps === null || debugProps === void 0 ? void 0 : debugProps.isDebug) && (debugProps === null || debugProps === void 0 ? void 0 : debugProps.local_mock);
               _queryParse = queryParse(this.getElementUrl()), appType = _queryParse.appType;
               terminalType = isElementPad() ? 'WEB' : appType ? 'APP' : isElementPC() ? 'WEB' : 'WAP';
               generateActionQueryPromise = function generateActionQueryPromise() {
@@ -322,9 +323,9 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
                   });
                 });
               };
-              _context2.next = 14;
+              _context2.next = 15;
               return Promise.all(isConnect ? [generateActionQueryPromise(), generateOneAccountQueryPromise()] : [generateActionQueryPromise()]);
-            case 14:
+            case 15:
               _yield$Promise$all = _context2.sent;
               _yield$Promise$all2 = _slicedToArray(_yield$Promise$all, 2);
               originActionQueryResult = _yield$Promise$all2[0];
@@ -337,7 +338,7 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
                 originActionQueryResult: originActionQueryResult,
                 originOneAccountQueryResult: originOneAccountQueryResult
               });
-            case 20:
+            case 21:
             case "end":
               return _context2.stop();
           }

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

@@ -23,8 +23,7 @@ export declare enum ElementPaymentEvent {
     SEND_MUITI_APP_EVENT_TO_SDK = "sendMuitiAppEventToSdk",
     LOG = "log",
     HANDLE_PAYMENT = "handlePayment",
-    ON_EVENT_CALLBACK = "onEventCallback",
-    ON_PAY_STATUS_CHANGE = "onPayStatusChange"
+    ON_EVENT_CALLBACK = "onEventCallback"
 }
 export declare enum ElementPaymentMethod {
     CONTAINER_ELEMENT = "CONTAINER_ELEMENT",

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

@@ -21,7 +21,6 @@ export var ElementPaymentEvent = /*#__PURE__*/function (ElementPaymentEvent) {
   ElementPaymentEvent["LOG"] = "log";
   ElementPaymentEvent["HANDLE_PAYMENT"] = "handlePayment";
   ElementPaymentEvent["ON_EVENT_CALLBACK"] = "onEventCallback";
-  ElementPaymentEvent["ON_PAY_STATUS_CHANGE"] = "onPayStatusChange";
   return ElementPaymentEvent;
 }({});
 export var ElementPaymentMethod = /*#__PURE__*/function (ElementPaymentMethod) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alipay/ams-checkout",
-  "version": "0.0.1757298389-dev.2",
+  "version": "0.0.1757298389-dev.3",
   "description": "",
   "author": "",
   "main": "esm/index.js",