@alipay/ams-checkout 0.0.1744283958-dev.9 → 0.0.1744698677-dev.0

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

@@ -7,6 +7,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { EVENT } from "../../../../constant";
 import { ServiceProvider } from "./../../../../foundation/service";
+import { device } from "../../../../util";
 import { DisplayTypeEnum, PlatformEnum, ProductSceneEnum } from "./../../../../types";
 export var IContainerStatus = /*#__PURE__*/function (IContainerStatus) {
   IContainerStatus["UNINIT"] = "UNINIT";
@@ -42,7 +43,7 @@ export var ContainerController = /*#__PURE__*/function () {
     });
     this.containerElement = this.containerService.load({
       type: DisplayTypeEnum.inline,
-      platform: PlatformEnum.desktop,
+      platform: device.isMobile ? PlatformEnum.mobile : PlatformEnum.desktop,
       isRetention: false,
       selector: selector,
       appendAliasContainerId: true,

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

@@ -7,6 +7,7 @@ declare class ElementController {
     private elementProcessors;
     private initTimeout;
     private elementContainerService;
+    private onStatusChangeCallback;
     constructor(options: IElementOptions);
     private initService;
     private initElementProcessors;
@@ -21,5 +22,6 @@ declare class ElementController {
     updatePayment(paymentSessionData: any): Promise<unknown>;
     private destroyHandle;
     destroy(): void;
+    private setControllerStatusOrView;
 }
 export default ElementController;

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

@@ -23,9 +23,10 @@ import { EVENT } from "../../../../constant";
 import AddressProcessor from "../../../../core/component/element/elementProcessor/addressProcessor";
 import AuthProcessor from "../../../../core/component/element/elementProcessor/authProcessor";
 import PaymentProcessor from "../../../../core/component/element/elementProcessor/paymentProcessor";
+import { IElementStatus } from "../../../../foundation";
 import { AntomSDKCore } from "../../../../foundation/core";
 import { ElementProcessor } from "../../../../foundation/product-processor/element";
-import { destroyModal } from "../../../../plugin/component/popupWindow.style";
+import { cleanMockup, removeRetentionPopup } from "../../../../component/component.popup.style";
 import { ProductSceneEnum } from "../../../../types";
 import { ElementContainerService } from "../elementContainerService"; // 引入 ElementContainerService
 import { IContainerStatus } from "../elementContainerService/containerService";
@@ -45,6 +46,8 @@ var ElementController = /*#__PURE__*/function () {
     _defineProperty(this, "elementProcessors", void 0);
     _defineProperty(this, "initTimeout", void 0);
     _defineProperty(this, "elementContainerService", void 0);
+    // 新增变量
+    _defineProperty(this, "onStatusChangeCallback", void 0);
     _defineProperty(this, "onValidateFunc", function (event, target, params) {
       return new Promise(function (resolve) {
         event.emitAndListen({
@@ -60,6 +63,8 @@ var ElementController = /*#__PURE__*/function () {
       });
     });
     this.options = options;
+    var _options = options;
+    this.onStatusChangeCallback = _options === null || _options === void 0 ? void 0 : _options.onStatusChangeCallback;
     this.elementContainer = new AntomSDKCore();
     this.elementContainer.registerProcessor(ProductSceneEnum.ELEMENT_PAYMENT, '', new ElementProcessor());
     this.elementContainer.init(this.options, ProductSceneEnum.ELEMENT_PAYMENT);
@@ -67,7 +72,7 @@ var ElementController = /*#__PURE__*/function () {
     this.elementContainerService = new ElementContainerService({
       instanceId: this.elementContainer.getInstanceId()
     });
-    this.elementContainer.setStatus(IContainerStatus.READY);
+    this.setControllerStatusOrView(IElementStatus.READY);
   }
   _createClass(ElementController, [{
     key: "initService",
@@ -127,7 +132,7 @@ var ElementController = /*#__PURE__*/function () {
           clearTimeout(_this.initTimeout);
           _this.initTimeout = null;
           _this.changeLoading(false);
-          _this.elementContainer.setStatus(IContainerStatus.READY);
+          _this.setControllerStatusOrView(IElementStatus.READY);
           _this.elementContainerService.getContainerServices().forEach(function (value) {
             value.getContainerElement().remove();
           });
@@ -143,6 +148,7 @@ var ElementController = /*#__PURE__*/function () {
         if (cashier && renderOptions.sessionData) {
           startBizFlowData.paymentSession = renderOptions.sessionData;
         }
+        _this.setControllerStatusOrView(IElementStatus.IN_BIZ_FLOW);
         _this.elementContainer.startBizFlow(startBizFlowData).catch(function (error) {
           _this.onEventCallback({
             code: EventCallbackCode.SDK_CREATEPAYMENT_PARAMETER_ERROR,
@@ -291,14 +297,14 @@ var ElementController = /*#__PURE__*/function () {
         //   (containerService) => containerService.getContainerStatus() === IContainerStatus.IN_BIZ_FLOW,
         // );
         // if (allContainersInBizFlow) {
-        //   this.elementContainer.setStatus(IContainerStatus.IN_BIZ_FLOW);
+        //   this.setControllerStatusOrView(IContainerStatus.IN_BIZ_FLOW);
         // }
       });
       this.serviceMap.EventCenter.listen(EVENT.redirect.name, function (data) {
         handleRedirect(data);
       });
       this.serviceMap.EventCenter.listen(EVENT.destroy.name, function () {
-        _this4.elementContainer.setStatus(IContainerStatus.READY);
+        _this4.setControllerStatusOrView(IElementStatus.READY);
         _this4.destroyHandle();
       });
       this.serviceMap.EventCenter.listen(EVENT.webAppReady.name, function (data) {
@@ -343,8 +349,20 @@ var ElementController = /*#__PURE__*/function () {
   }, {
     key: "sendReady",
     value: function sendReady(type, options) {
-      var _this$elementProcesso;
+      var _this$elementProcesso, _paymentResult$origin;
       var paymentResult = (_this$elementProcesso = this.elementProcessors[ElementType.payment]) === null || _this$elementProcesso === void 0 ? void 0 : _this$elementProcesso.getObtainDataRes();
+      if (!(paymentResult !== null && paymentResult !== void 0 && (_paymentResult$origin = paymentResult.originActionQueryResult) !== null && _paymentResult$origin !== void 0 && _paymentResult$origin.success)) {
+        var _this$options$onEvent, _this$options;
+        clearTimeout(this.initTimeout);
+        this.changeLoading(false);
+        this.initTimeout = null;
+        (_this$options$onEvent = (_this$options = this.options).onEventCallback) === null || _this$options$onEvent === void 0 || _this$options$onEvent.call(_this$options, {
+          code: EventCallbackCode.SDK_CREATE_COMPONENT_ERROR,
+          message: 'Component initialization exception.'
+        });
+        this.destroy();
+        return;
+      }
       var paymentContext = this.elementContainer.getPaymentContext();
       var params = _objectSpread(_objectSpread({}, options), {}, {
         originActionQueryResult: paymentResult === null || paymentResult === void 0 ? void 0 : paymentResult.originActionQueryResult,
@@ -428,19 +446,29 @@ var ElementController = /*#__PURE__*/function () {
   }, {
     key: "destroyHandle",
     value: function destroyHandle() {
+      var _this7 = this;
       this.elementContainer.destroy();
-      this.elementContainerService.destroy();
-      this.serviceMap.EventCenter.cleanIFrames();
-      // popup未注册会报错，但element不需要感知popup是否被注册
-      try {
-        destroyModal(); // 关闭popup弹窗
-      } catch (error) {}
+      cleanMockup();
+      removeRetentionPopup();
+      setTimeout(function () {
+        _this7.serviceMap.EventCenter.cleanIFrames();
+        _this7.elementContainerService.destroy();
+      }, 0);
     }
   }, {
     key: "destroy",
     value: function destroy() {
       this.destroyHandle();
-      this.elementContainer.setStatus(IContainerStatus.DESTROYED);
+      this.setControllerStatusOrView(IElementStatus.DESTROYED);
+    }
+  }, {
+    key: "setControllerStatusOrView",
+    value: function setControllerStatusOrView(status) {
+      var _this$onStatusChangeC;
+      var _status = this.elementContainer.getStatus();
+      if (status === _status) return;
+      (_this$onStatusChangeC = this.onStatusChangeCallback) === null || _this$onStatusChangeC === void 0 || _this$onStatusChangeC.call(this, "\u72B6\u6001\u7531 ".concat(_status, " \u53D8\u66F4\u4E3A ").concat(status));
+      this.elementContainer.setStatus(status);
     }
   }]);
   return ElementController;

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

@@ -5,6 +5,9 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
@@ -17,6 +20,7 @@ function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) ===
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+import { ProductSceneEnum } from "../../../../types";
 import { parseSessionData } from "../..";
 import PackageJson from "../../../../../package.json";
 import { generateIframeSrc as _generateIframeSrc } from "../util";
@@ -31,21 +35,32 @@ var AddressProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
   _createClass(AddressProcessor, [{
     key: "onReady",
     value: function onReady(extraParam) {
-      var _this$elementContaine, _this$elementContaine2, _this$elementContaine3, _extraParam$originOne;
+      var _paymentSessionObj$pa, _extraParam$originOne;
+      var paymentContext = this.elementContainer.getPaymentContext();
+      var paymentSessionObj = paymentContext.paymentSessionObj,
+        paymentSessionId = paymentContext.paymentSessionId,
+        displayInfo = paymentContext.displayInfo;
+      var isConnect = paymentSessionObj.connectFactor.enableConnect && ((_paymentSessionObj$pa = paymentSessionObj.paymentSessionConfig) === null || _paymentSessionObj$pa === void 0 ? void 0 : _paymentSessionObj$pa.productScene) === ProductSceneEnum.ELEMENT_PAYMENT;
       this.eventCenter.dispatchToApp({
         event: 'renderComponent',
         data: {
           params: {
             heightOfVisible: Math.max(window.changingPageHeight, window.innerHeight),
-            paymentSessionData: (_this$elementContaine = this.elementContainer.getPaymentContext()) === null || _this$elementContaine === void 0 ? void 0 : _this$elementContaine.paymentSessionId,
+            paymentSessionData: paymentSessionId,
             queryResult: extraParam.queryResult,
             envInfo: {
               screenHeight: screen.height,
               screenWidth: screen.width
             },
-            appearance: (_this$elementContaine2 = this.elementContainer.getPaymentContext()) === null || _this$elementContaine2 === void 0 ? void 0 : _this$elementContaine2.displayInfo.appearance,
-            sessionResult: (_this$elementContaine3 = this.elementContainer.getPaymentContext()) === null || _this$elementContaine3 === void 0 ? void 0 : _this$elementContaine3.paymentSessionObj,
-            prefillValue: (extraParam === null || extraParam === void 0 || (_extraParam$originOne = extraParam.originOneAccountQueryResult) === null || _extraParam$originOne === void 0 ? void 0 : _extraParam$originOne.shippings) || []
+            configParams: _objectSpread({
+              needEditBackBtn: isConnect,
+              autoSaveAsDefaultAddress: isConnect,
+              editingNeedShippingQuery: isConnect,
+              showTitle: isConnect
+            }, extraParam.configParams),
+            appearance: displayInfo.appearance,
+            sessionResult: paymentSessionObj,
+            prefillValue: extraParam !== null && extraParam !== void 0 && extraParam.originOneAccountQueryResult ? extraParam === null || extraParam === void 0 || (_extraParam$originOne = extraParam.originOneAccountQueryResult) === null || _extraParam$originOne === void 0 ? void 0 : _extraParam$originOne.shippings : extraParam.prefillValue
           },
           target: 'ADDRESS_ELEMENT'
         }

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

@@ -73,7 +73,8 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
           appearance: paymentContext === null || paymentContext === void 0 ? void 0 : paymentContext.displayInfo.appearance,
           sessionResult: paymentContext === null || paymentContext === void 0 ? void 0 : paymentContext.paymentSessionObj,
           notRedirectAfterComplete: (extraParam === null || extraParam === void 0 ? void 0 : extraParam.notRedirectAfterComplete) === true,
-          merchantAppointParam: extraParam === null || extraParam === void 0 ? void 0 : extraParam.merchantAppointParam
+          merchantAppointParam: extraParam === null || extraParam === void 0 ? void 0 : extraParam.merchantAppointParam,
+          originOneAccountQueryResult: extraParam === null || extraParam === void 0 ? void 0 : extraParam.originOneAccountQueryResult
         }
       });
     }

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

@@ -1,3 +1,5 @@
+export declare const sdkAction1: any;
+export declare const sdkAction2: any;
 export declare const sdkAction: any;
 export declare const oneAccount1: any;
 export declare const oneAccount2: any;

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

@@ -1,4 +1,4 @@
-export var sdkAction = {
+export var sdkAction1 = {
   accountInfo: {
     accountStatus: 'EFFECTIVE',
     email: 'test10@test.com'
@@ -361,6 +361,10 @@ export var sdkAction = {
   },
   success: true
 };
+export var sdkAction2 = {
+  success: false
+};
+export var sdkAction = sdkAction1;
 export var oneAccount1 = {
   accountInfo: {
     accountStatus: 'EFFECTIVE',

package/esm/foundation/service/log/keys.js

@@ -89,7 +89,9 @@ _defineProperty(LogComplianceExtendKeys, "complianceExtParams", {
   // M 数字类型
   timeCost: 'M',
   pageLoadProgress: 'M',
-  fsDuration: 'M'
+  fsDuration: 'M',
+  // 由于部分logerror参数是msg
+  msg: 'C'
 });
 export var KEYS = {
   EVENT_SDK_ON_ABNORMAL_EVENT_NAME: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alipay/ams-checkout",
-  "version": "0.0.1744283958-dev.9",
+  "version": "0.0.1744698677-dev.0",
   "description": "",
   "author": "",
   "main": "esm/index.js",