@alipay/ams-checkout 0.0.1738831627-dev.4 → 0.0.1738831627-dev.5

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

@@ -28,6 +28,7 @@ import { ElementPaymentComponent } from "./components/payment";
 import { v4 as uuid } from 'uuid';
 import { LogConfig, Logger } from "../../../util/logger";
 import { addressTheme, ElementPaymentEvent, ElementPaymentMethod, ElementType, ELEMENT_ENVIRONMENT, EventCallbackCode, ThemeType, MountElementType } from "./type";
+import { destroyModal } from "../../../plugin/component/popupWindow.style";
 var logger = new Logger(LogConfig, true);
 var ElementProcessor = /*#__PURE__*/function () {
   function ElementProcessor(options) {
@@ -577,6 +578,14 @@ export var ElementComponent = /*#__PURE__*/function () {
       this.eventService.listen(ConstantEvent.redirect.name, function (data, res) {
         data.isDestroy && _this6.unmount();
       });
+      this.eventService.listen('appHeartBeat', function (result) {
+        var _this6$_options$loadi;
+        if (_this6.loading && (_this6$_options$loadi = _this6._options.loading) !== null && _this6$_options$loadi !== void 0 && _this6$_options$loadi.onEndLoading) {
+          var _this6$_options$loadi2, _this6$_options$loadi3;
+          (_this6$_options$loadi2 = _this6._options.loading) === null || _this6$_options$loadi2 === void 0 || (_this6$_options$loadi3 = _this6$_options$loadi2.onEndLoading) === null || _this6$_options$loadi3 === void 0 || _this6$_options$loadi3.call(_this6$_options$loadi2);
+        }
+        _this6.loading = false;
+      });
 
       // this.eventService.listen(ElementPaymentEvent.LOG, (result: EventCallbackData) => {
       //   console.log('antom sdk 组件日志回调');
@@ -603,15 +612,10 @@ export var ElementComponent = /*#__PURE__*/function () {
   }, {
     key: "showIframe",
     value: function showIframe() {
-      var _this$paymentBase, _this$addressBase, _this$authBase, _this$_options$loadin;
-      this.loading = false;
+      var _this$paymentBase, _this$addressBase, _this$authBase;
       (this === null || this === void 0 ? void 0 : this.paymentBase) && (this === null || this === void 0 || (_this$paymentBase = this.paymentBase) === null || _this$paymentBase === void 0 ? void 0 : _this$paymentBase.update());
       (this === null || this === void 0 ? void 0 : this.addressBase) && (this === null || this === void 0 || (_this$addressBase = this.addressBase) === null || _this$addressBase === void 0 ? void 0 : _this$addressBase.update());
       (this === null || this === void 0 ? void 0 : this.authBase) && (this === null || this === void 0 || (_this$authBase = this.authBase) === null || _this$authBase === void 0 ? void 0 : _this$authBase.update());
-      if ((_this$_options$loadin = this._options.loading) !== null && _this$_options$loadin !== void 0 && _this$_options$loadin.onEndLoading) {
-        var _this$_options$loadin2, _this$_options$loadin3;
-        (_this$_options$loadin2 = this._options.loading) === null || _this$_options$loadin2 === void 0 || (_this$_options$loadin3 = _this$_options$loadin2.onEndLoading) === null || _this$_options$loadin3 === void 0 || _this$_options$loadin3.call(_this$_options$loadin2);
-      }
     }
   }, {
     key: "afterInit",
@@ -731,21 +735,21 @@ export var ElementComponent = /*#__PURE__*/function () {
         title: 'sdk_element_mount_start'
       });
       if (typeof sdkSelector === 'string') {
-        var _this$_options$loadin4, _renderOptions$debugP, _renderOptions$debugP2;
+        var _this$_options$loadin, _renderOptions$debugP, _renderOptions$debugP2;
         var element = document.querySelector(sdkSelector);
         if (!element) {
           throw Error("Loading failed, you need to check if the element exists.");
         }
         this.componentsCount = this.componentsCount + 1;
-        if (!this.loading && (_this$_options$loadin4 = this._options.loading) !== null && _this$_options$loadin4 !== void 0 && _this$_options$loadin4.onStartLoading && this.isConnect) {
-          var _this$_options$loadin5, _this$_options$loadin6;
-          (_this$_options$loadin5 = this._options.loading) === null || _this$_options$loadin5 === void 0 || (_this$_options$loadin6 = _this$_options$loadin5.onStartLoading) === null || _this$_options$loadin6 === void 0 || _this$_options$loadin6.call(_this$_options$loadin5);
+        if (!this.loading && (_this$_options$loadin = this._options.loading) !== null && _this$_options$loadin !== void 0 && _this$_options$loadin.onStartLoading && renderOptions.type === ElementType.payment) {
+          var _this$_options$loadin2, _this$_options$loadin3;
+          (_this$_options$loadin2 = this._options.loading) === null || _this$_options$loadin2 === void 0 || (_this$_options$loadin3 = _this$_options$loadin2.onStartLoading) === null || _this$_options$loadin3 === void 0 || _this$_options$loadin3.call(_this$_options$loadin2);
         }
+        this.loading = true;
         var elementLink = renderOptions !== null && renderOptions !== void 0 && (_renderOptions$debugP = renderOptions.debugProps) !== null && _renderOptions$debugP !== void 0 && _renderOptions$debugP.localLink ? renderOptions === null || renderOptions === void 0 || (_renderOptions$debugP2 = renderOptions.debugProps) === null || _renderOptions$debugP2 === void 0 ? void 0 : _renderOptions$debugP2.localLink : this.iframeSrc[renderOptions.type];
         renderOptions.elementProps = {
           elementLink: elementLink
         };
-        this.loading = true;
         if (renderOptions.type === ElementType.auth) {
           return this.mountAuth(renderOptions, sdkSelector);
         }
@@ -780,6 +784,13 @@ export var ElementComponent = /*#__PURE__*/function () {
     key: "unmount",
     value: function unmount() {
       var _this$authBase2, _this$authBase2$unmou, _this$addressBase2, _this$addressBase2$un, _this$paymentBase2, _this$paymentBase2$un;
+      if (!this.iframes.PAYMENT_ELEMENT) {
+        throw Error("Component is not mounted. You need to check if the mount method has been successfully called to mount the component.");
+      }
+      // popup未注册会报错，但element不需要感知popup是否被注册
+      try {
+        destroyModal(); // 关闭popup弹窗
+      } catch (error) {}
       (_this$authBase2 = this.authBase) === null || _this$authBase2 === void 0 || (_this$authBase2$unmou = _this$authBase2.unmount) === null || _this$authBase2$unmou === void 0 || _this$authBase2$unmou.call(_this$authBase2);
       (_this$addressBase2 = this.addressBase) === null || _this$addressBase2 === void 0 || (_this$addressBase2$un = _this$addressBase2.unmount) === null || _this$addressBase2$un === void 0 || _this$addressBase2$un.call(_this$addressBase2);
       (_this$paymentBase2 = this.paymentBase) === null || _this$paymentBase2 === void 0 || (_this$paymentBase2$un = _this$paymentBase2.unmount) === null || _this$paymentBase2$un === void 0 || _this$paymentBase2$un.call(_this$paymentBase2);
@@ -795,8 +806,8 @@ export var ElementComponent = /*#__PURE__*/function () {
     value: // 暴露出去的submit方法
     function () {
       var _submitPayment = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-        var _this$_options$loadin7, _this$_options$loadin10;
-        var _this$_options$loadin8, _this$_options$loadin9, _this$_options$loadin11, _this$_options$loadin12;
+        var _this$_options$loadin4, _this$_options$loadin7;
+        var _this$_options$loadin5, _this$_options$loadin6, _this$_options$loadin8, _this$_options$loadin9;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
@@ -806,17 +817,25 @@ export var ElementComponent = /*#__PURE__*/function () {
               }
               throw Error("Component is not mounted. You need to check if the mount method has been successfully called to mount the component.");
             case 2:
-              if ((_this$_options$loadin7 = this._options.loading) !== null && _this$_options$loadin7 !== void 0 && _this$_options$loadin7.onStartLoading) {
-                (_this$_options$loadin8 = this._options.loading) === null || _this$_options$loadin8 === void 0 || (_this$_options$loadin9 = _this$_options$loadin8.onStartLoading) === null || _this$_options$loadin9 === void 0 || _this$_options$loadin9.call(_this$_options$loadin8);
+              if (!this.loading) {
+                _context2.next = 4;
+                break;
+              }
+              throw Error("The form is submitted repeatedly.  without the need to click submit repeatedly.");
+            case 4:
+              if ((_this$_options$loadin4 = this._options.loading) !== null && _this$_options$loadin4 !== void 0 && _this$_options$loadin4.onStartLoading) {
+                (_this$_options$loadin5 = this._options.loading) === null || _this$_options$loadin5 === void 0 || (_this$_options$loadin6 = _this$_options$loadin5.onStartLoading) === null || _this$_options$loadin6 === void 0 || _this$_options$loadin6.call(_this$_options$loadin5);
               }
-              _context2.next = 5;
+              this.loading = true;
+              _context2.next = 8;
               return this.validatePromiseFuncs();
-            case 5:
-              if ((_this$_options$loadin10 = this._options.loading) !== null && _this$_options$loadin10 !== void 0 && _this$_options$loadin10.onEndLoading) {
-                (_this$_options$loadin11 = this._options.loading) === null || _this$_options$loadin11 === void 0 || (_this$_options$loadin12 = _this$_options$loadin11.onEndLoading) === null || _this$_options$loadin12 === void 0 || _this$_options$loadin12.call(_this$_options$loadin11);
+            case 8:
+              this.loading = false;
+              if ((_this$_options$loadin7 = this._options.loading) !== null && _this$_options$loadin7 !== void 0 && _this$_options$loadin7.onEndLoading) {
+                (_this$_options$loadin8 = this._options.loading) === null || _this$_options$loadin8 === void 0 || (_this$_options$loadin9 = _this$_options$loadin8.onEndLoading) === null || _this$_options$loadin9 === void 0 || _this$_options$loadin9.call(_this$_options$loadin8);
               }
               return _context2.abrupt("return");
-            case 7:
+            case 11:
             case "end":
               return _context2.stop();
           }

package/esm/types/index.d.ts

@@ -6,7 +6,7 @@
  * 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.
  */
 export type onChange = () => onCnageResult;
-export type { IElementOptions, ThemeType, PaymentElementLayout } from '../core/component/element/type';
+export { type IElementOptions, ElementType, ThemeType, PaymentElementLayout } from '../core/component/element/type';
 interface onCnageResult {
     complete: boolean;
     addressValue: AddressItem[];

package/esm/types/index.js

@@ -7,6 +7,8 @@
  */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
+export { ElementType, ThemeType, PaymentElementLayout } from "../core/component/element/type";
+
 /**
  * SDK options
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alipay/ams-checkout",
-  "version": "0.0.1738831627-dev.4",
+  "version": "0.0.1738831627-dev.5",
   "description": "",
   "author": "",
   "main": "esm/index.js",