@alipay/ams-checkout 0.0.1733711101-dev.6 → 0.0.1733711101-dev.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -302,6 +302,7 @@ export var AntomSDKCore = /*#__PURE__*/function () {
|
|
302
302
|
var platform = this.paymentContext.displayInfo.platform;
|
303
303
|
var payload = this.bizFlowStartBehavior.payload;
|
304
304
|
var closeBtnCallbackForPopup = function closeBtnCallbackForPopup() {
|
305
|
+
var isOnCloseEvent = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
|
305
306
|
if (displayType === DisplayTypeEnum.inline) {
|
306
307
|
return;
|
307
308
|
}
|
@@ -309,13 +310,13 @@ export var AntomSDKCore = /*#__PURE__*/function () {
|
|
309
310
|
showRetentionPopup();
|
310
311
|
return;
|
311
312
|
} else {
|
312
|
-
_this2.handleClose();
|
313
|
+
_this2.handleClose(isOnCloseEvent);
|
313
314
|
}
|
314
315
|
};
|
315
316
|
|
316
317
|
// TODO 感觉有死循环
|
317
318
|
eventCenter.listen(EVENT.close.name, function () {
|
318
|
-
closeBtnCallbackForPopup();
|
319
|
+
closeBtnCallbackForPopup(true);
|
319
320
|
});
|
320
321
|
eventCenter.listen(EVENT.setAllowRetention.name, function (data) {
|
321
322
|
if (data === undefined || typeof data !== 'boolean') {
|
@@ -351,9 +352,10 @@ export var AntomSDKCore = /*#__PURE__*/function () {
|
|
351
352
|
}, {
|
352
353
|
key: "handleClose",
|
353
354
|
value: function handleClose() {
|
355
|
+
var isOnCloseEvent = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
|
354
356
|
var eventCenter = ServiceProvider.getInstance(this.instanceId).getService('EventCenter');
|
355
357
|
eventCenter.emit(EVENT.closeCallback.name, {});
|
356
|
-
if (this.enablePopWindowEventCallback) {
|
358
|
+
if (this.enablePopWindowEventCallback && !isOnCloseEvent) {
|
357
359
|
eventCenter.emit(EVENT.eventCallback.name, {
|
358
360
|
code: eventCodeEnum.SDK_PAYMENT_CANCEL,
|
359
361
|
result: {
|
@@ -1,5 +1,4 @@
|
|
1
|
-
import
|
2
|
-
import { EventPayloadContext, IoptionsParams } from '../../types';
|
1
|
+
import { EventPayload, EventPayloadContext, IoptionsParams } from '../../types';
|
3
2
|
import { SDKMetaData, Service } from '../index';
|
4
3
|
/**
|
5
4
|
* @author 江跃 <jiangbin.gjb@antgroup.com>
|
@@ -9,7 +9,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
|
|
9
9
|
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); }
|
10
10
|
import { v4 as uuid } from 'uuid';
|
11
11
|
import { ERRORMESSAGE } from "../../constant";
|
12
|
-
import { MessageName } from "../../types";
|
12
|
+
import { EventPayload, MessageName } from "../../types";
|
13
13
|
import { isJsonString } from "../../util";
|
14
14
|
import { getIframeOrigin, registerSystemEvents, unRegisterSystemEvents } from "../utils/system_events";
|
15
15
|
|
@@ -144,11 +144,11 @@ export var EventCenter = /*#__PURE__*/function () {
|
|
144
144
|
*/
|
145
145
|
}, {
|
146
146
|
key: "_handleAppMessage",
|
147
|
-
value: function _handleAppMessage(
|
148
|
-
var context =
|
147
|
+
value: function _handleAppMessage(EventPayload) {
|
148
|
+
var context = EventPayload.context;
|
149
149
|
var event = context.event,
|
150
150
|
data = context.data;
|
151
|
-
this.emit(event, data,
|
151
|
+
this.emit(event, data, EventPayload);
|
152
152
|
}
|
153
153
|
|
154
154
|
/**
|