@alipay/ams-checkout 0.0.1720509876-dev.1 → 0.0.1723203704-dev.1

package/esm/plugin/address/popupWindow.style.d.ts

@@ -0,0 +1,8 @@
+export declare const insertStyleSheet: () => void;
+export declare const createModal: ({ device, url, widthPadding, heightPadding }: {
+    device: any;
+    url: any;
+    widthPadding: any;
+    heightPadding: any;
+}) => Promise<HTMLIFrameElement>;
+export declare const destroyModal: () => void;

package/esm/plugin/address/popupWindow.style.js

@@ -0,0 +1,65 @@
+import { AMSPOPUP_PREFIX, ANIMATION_TIME } from "../../constant";
+
+// CSS样式字符串
+var modalStyles = "\n  .".concat(AMSPOPUP_PREFIX, "modal {\n    /* \u6DFB\u52A0\u5F39\u7A97\u6837\u5F0F */\n    background-color: #fff;\n    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);\n    position: fixed;\n    top: 50%;\n    left: 50%;\n    transform: translate(-50%, -50%);\n    z-index: 9999; /* \u8BBE\u7F6E\u5F39\u7A97\u7684\u5C42\u7EA7\u4E3A 9999 */\n    overflow: hidden;\n  }\n\n  .").concat(AMSPOPUP_PREFIX, "overlay {\n    /* \u6DFB\u52A0\u8499\u5C42\u6837\u5F0F */\n    position: fixed;\n    top: 0;\n    left: 0;\n    width: 100%;\n    height: 100%;\n    background-color: rgba(0, 0, 0, 0.4);\n    z-index: 999;\n  }\n\n  .").concat(AMSPOPUP_PREFIX, "fadeIn {\n    /* \u6DFB\u52A0\u6DE1\u5165\u52A8\u753B */\n    animation: fadeIn ").concat(ANIMATION_TIME, "ms;\n    animation-fill-mode: forwards;\n  }\n\n  .").concat(AMSPOPUP_PREFIX, "fadeOut {\n    /* \u6DFB\u52A0\u6DE1\u51FA\u52A8\u753B */\n    animation: fadeOut ").concat(ANIMATION_TIME, "ms;\n    animation-fill-mode: forwards;\n  }\n\n  /* \u5B9A\u4E49\u6DE1\u5165\u52A8\u753B */\n  @keyframes fadeIn {\n    0% {\n      opacity: 0;\n    }\n    100% {\n      opacity: 1;\n    }\n  }\n\n  @-webkit-keyframes fadeIn {\n    0% {\n      opacity: 0;\n    }\n    100% {\n      opacity: 1;\n    }\n  }\n\n  @-moz-keyframes fadeIn {\n    0% {\n      opacity: 0;\n    }\n    100% {\n      opacity: 1;\n    }\n  }\n\n  /* \u5B9A\u4E49\u6DE1\u51FA\u52A8\u753B */\n  @keyframes fadeOut {\n    0% {\n      opacity: 1;\n    }\n    100% {\n      opacity: 0;\n    }\n  }\n\n  @-webkit-keyframes fadeOut {\n    0% {\n      opacity: 1;\n    }\n    100% {\n      opacity: 0;\n    }\n  }\n\n  @-moz-keyframes fadeOut {\n    0% {\n      opacity: 1;\n    }\n    100% {\n      opacity: 0;\n    }\n  }\n");
+
+// 创建和插入样式表
+export var insertStyleSheet = function insertStyleSheet() {
+  var style = document.createElement('style');
+  style.innerHTML = modalStyles;
+  document.head.appendChild(style);
+};
+
+// 插入弹窗
+export var createModal = function createModal(_ref) {
+  var device = _ref.device,
+    url = _ref.url,
+    widthPadding = _ref.widthPadding,
+    heightPadding = _ref.heightPadding;
+  return new Promise(function (resolve, reject) {
+    try {
+      var overlay = document.createElement('div');
+      overlay.classList.add("".concat(AMSPOPUP_PREFIX, "overlay"), "".concat(AMSPOPUP_PREFIX, "fadeIn"));
+      var modal = document.createElement('div');
+      modal.classList.add("".concat(AMSPOPUP_PREFIX, "modal"), "".concat(AMSPOPUP_PREFIX, "fadeIn"));
+      if (device === 'desktop') {
+        modal.style.width = '600px';
+        modal.style.height = '464px';
+        modal.style.borderRadius = '12px';
+      } else {
+        modal.style.width = "calc(100% - ".concat(2 * widthPadding, "px)");
+        modal.style.height = "calc(100% - ".concat(2 * heightPadding, "px)");
+        modal.style.borderRadius = '8px';
+      }
+      var iframe = document.createElement('iframe');
+      iframe.src = url; // 替换为实际的 URL 地址
+      iframe.style.border = 'none';
+      iframe.style.width = '100%';
+      iframe.style.height = '100%';
+      modal.appendChild(iframe);
+      var body = document.getElementsByTagName('body')[0];
+      body.appendChild(overlay);
+      body.appendChild(modal);
+      resolve(iframe);
+    } catch (error) {
+      reject({
+        title: 'sdk_error_create_pop_up',
+        message: error === null || error === void 0 ? void 0 : error.toString()
+      });
+    }
+  });
+};
+
+// 销毁弹窗
+export var destroyModal = function destroyModal() {
+  var overlay = document.querySelector(".".concat(AMSPOPUP_PREFIX, "overlay"));
+  var modal = document.querySelector(".".concat(AMSPOPUP_PREFIX, "modal"));
+  overlay.classList.remove("".concat(AMSPOPUP_PREFIX, "fadeIn"));
+  overlay.classList.add("".concat(AMSPOPUP_PREFIX, "fadeOut"));
+  modal.classList.remove("".concat(AMSPOPUP_PREFIX, "fadeIn"));
+  modal.classList.add("".concat(AMSPOPUP_PREFIX, "fadeOut"));
+  setTimeout(function () {
+    overlay.parentNode.removeChild(overlay);
+    modal.parentNode.removeChild(modal);
+  }, ANIMATION_TIME);
+};

package/esm/plugin/applepay/component.js

@@ -84,7 +84,7 @@ var ApplePayComponent = /*#__PURE__*/function () {
       }, {
         biz: 'sdk',
         type: 'funnel',
-        success: eventCodeEnum.SDK_PAYMENT_FAIL === (state === null || state === void 0 ? void 0 : state.code),
+        success: eventCodeEnum.SDK_PAYMENT_SUCCESSFUL === (state === null || state === void 0 ? void 0 : state.code),
         code: state === null || state === void 0 ? void 0 : state.code,
         errorCode: state === null || state === void 0 || (_state$result = state.result) === null || _state$result === void 0 ? void 0 : _state$result.errorCode,
         errorMessage: state === null || state === void 0 || (_state$result2 = state.result) === null || _state$result2 === void 0 ? void 0 : _state$result2.errorMessage,

package/esm/plugin/component/cashierApp.js

@@ -15,7 +15,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
  * 1. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE; and
  * 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 { marmotMap, sdkVersion, elementAppMarmotMap } from "../../config/index";
+import { elementAppMarmotMap, marmotMap, sdkVersion } from "../../config/index";
 import { componentSignEnum, ComponentSignEnumV2 } from "../../types";
 import { isDebugLog } from "../../util/debug";
 import { queryParse, serialize } from "../../util/index";
@@ -45,12 +45,12 @@ var getAppVersion = function getAppVersion(_extendInfo, productScene, mid) {
 
     // 没有匹配到版本，查询上次的加载版本
     if (!appVersion) {
-      appVersion = getLastAppVersion(productScene);
+      appVersion = getLastAppVersion(sdkVersion + productScene);
       return appVersion;
     }
     // 不为空时代表是有sessionData，因此要保存当前版本
     if (_extendInfo) {
-      setLastAppVersion(productScene, appVersion);
+      setLastAppVersion(sdkVersion + productScene, appVersion);
     }
     return appVersion;
   } catch (error) {
@@ -58,7 +58,8 @@ var getAppVersion = function getAppVersion(_extendInfo, productScene, mid) {
   }
 };
 var getFinalProductSceneVersion = function getFinalProductSceneVersion(componentSign, productSceneVersion) {
-  var signSupportMap = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, componentSignEnum.NONE, ['']), componentSignEnum.AUTO_DEBIT_WALLET, ['1.0']), componentSignEnum.CASHIER_PAYMENT_BANK, ['1.0']), componentSignEnum.CASHIER_PAYMENT_CARD, ['1.0']), componentSignEnum.CASHIER_PAYMENT_APM, ['1.0']), componentSignEnum.EASY_PAY_WALLET, ['1.0', '2.0']), componentSignEnum.EASY_PAY_APM, ['2.0']), componentSignEnum.VAULTING_CARD, ['1.0']), componentSignEnum.ELEMENT_PAYMENT, ['1.0']);
+  var _signSupportMap;
+  var signSupportMap = (_signSupportMap = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_signSupportMap, componentSignEnum.NONE, ['']), componentSignEnum.AUTO_DEBIT_WALLET, ['1.0']), componentSignEnum.AUTO_DEBIT_PAY_WALLET, ['']), componentSignEnum.CASHIER_PAYMENT_BANK, ['1.0']), componentSignEnum.CASHIER_PAYMENT_CARD, ['1.0']), componentSignEnum.CASHIER_PAYMENT_APM, ['1.0']), componentSignEnum.EASY_PAY_WALLET, ['1.0', '2.0']), componentSignEnum.EASY_PAY_APM, ['2.0']), componentSignEnum.VAULTING_CARD, ['1.0']), componentSignEnum.ELEMENT_PAYMENT, ['1.0']), _defineProperty(_signSupportMap, componentSignEnum.ELEMENT_ADDRESS, ['1.0']));
   var supportProductSceneVersion = signSupportMap[componentSign];
   // 从左到右，从旧到新
   var isSupport = supportProductSceneVersion.find(function (it) {
@@ -98,7 +99,20 @@ export var getAppPath = function getAppPath() {
   }
   // element应用特殊处理
   if (_toConsumableArray(Object.values(ComponentSignEnumV2)).includes(componentSign)) {
-    return "".concat(elementAppMarmotMap[environment], "/elements/").concat(finalAppVersion, "/pages/").concat(productScene.toLowerCase(), "/index.html");
+    // element又分为express_checkout模式和普通模式, express_checkout 模式在扩展参数是返回expressCheckout=true
+    var isExpressCheckout = false;
+    try {
+      // expressCheckout可能出现string(false) JSON.parse再转一次
+      isExpressCheckout = JSON.parse(JSON.parse(extendInfo).expressCheckout);
+    } catch (error) {
+      // 遇到JSON解析错误，默认false
+    }
+    if (isExpressCheckout) {
+      // express_checkout模式走单独映射
+      return "".concat(elementAppMarmotMap[environment], "/elements/").concat(finalAppVersion, "/pages/express_checkout/index.html");
+    } else {
+      return "".concat(elementAppMarmotMap[environment], "/elements/").concat(finalAppVersion, "/pages/").concat(productScene.toLowerCase(), "/index.html");
+    }
   }
   return "".concat(marmotMap[environment], "/").concat(componentSign, "/").concat(finalProductSceneVersion, "/index.").concat(finalAppVersion, ".html");
 };
@@ -199,6 +213,8 @@ export var createIframe = function createIframe(mode, platform) {
   iframe.style.border = none;
   iframe.style.opacity = none;
   iframe.style.overflow = 'hidden';
+  // iframe设置支持第三方支付
+  iframe.allow = 'payment';
   return iframe;
 };
 export var createPreloadIframe = function createPreloadIframe(channelType, version) {

package/esm/plugin/component/component.inline.style.d.ts

@@ -1,11 +1,10 @@
-/**
- * Copyright (c) 2022 International Business Group, Ant Group. All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), the rights to use, copy, modify, merge, and/or distribute the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- * 1. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE; and
- * 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 { platformEnum } from '../../types';
+import { componentSignEnum, platformEnum } from '../../types';
+interface Options {
+    componentSign?: componentSignEnum;
+    type: 'tabs' | 'Accordion';
+    isExpressCheckout?: boolean;
+}
 export declare const inlineComponentAddCss: () => void;
-export declare const addInlineLoading: (_selector: HTMLDivElement, platform: platformEnum) => void;
+export declare const addInlineLoading: (_selector: HTMLDivElement, platform: platformEnum, options: Options) => void;
 export declare const createInlineBaseElement: (selector: string) => HTMLDivElement;
+export {};

package/esm/plugin/component/component.inline.style.js

@@ -5,10 +5,11 @@
  * 1. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE; and
  * 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 { platformEnum } from "../../types";
-import { INLINE_BASE_STYLE_ID, LOADING_ID, INLINE_IMG_CLASSNAME, COMPONENT_CONTAINER_ID, COMPONENT_IFRAME_TAG_ID } from "../../constant";
+import { COMPONENT_CONTAINER_ID, COMPONENT_IFRAME_TAG_ID, INLINE_BASE_STYLE_ID, INLINE_IMG_CLASSNAME, LOADING_ID } from "../../constant";
+import { componentSignEnum, platformEnum } from "../../types";
 import { amsSetSize } from "../../util";
-var inlineComponentCss = "#".concat(COMPONENT_IFRAME_TAG_ID, "-desktop{\n  border-radius: 8px;\n  position: absolute;\n  top: 0;\n  left: 0;\n}\n#").concat(COMPONENT_IFRAME_TAG_ID, "-mobile{\n  position: absolute;\n  top: 0;\n  left: 0;\n}\n.").concat(COMPONENT_CONTAINER_ID, "-inline{\n  width: 100%;\n  height: auto;\n  position: relative;\n  line-height: 0;\n  display: flex;\n}\n#").concat(LOADING_ID, "{\n  width: 100%;\n  flex: 1;\n}\n.").concat(INLINE_IMG_CLASSNAME, "{\n  width: 100%;\n  height: auto;\n  object-fit: contain;\n  box-sizing: border-box;\n}\n.").concat(INLINE_IMG_CLASSNAME, "-mobile{\n  padding: 0 0.16em;\n}\n.").concat(INLINE_IMG_CLASSNAME, "-desktop{}\n");
+// border-radius: 8px;
+var inlineComponentCss = "#".concat(COMPONENT_IFRAME_TAG_ID, "-desktop{\n  position: absolute;\n  top: 0;\n  left: 0;\n}\n#").concat(COMPONENT_IFRAME_TAG_ID, "-mobile{\n  position: absolute;\n  top: 0;\n  left: 0;\n}\n.").concat(COMPONENT_CONTAINER_ID, "-inline{\n  width: 100%;\n  height: auto;\n  position: relative;\n  line-height: 0;\n  display: flex;\n}\n#").concat(LOADING_ID, "{\n  width: 100%;\n  flex: 1;\n}\n.").concat(INLINE_IMG_CLASSNAME, "{\n  width: 100%;\n  height: auto;\n  object-fit: contain;\n  box-sizing: border-box;\n}\n.").concat(INLINE_IMG_CLASSNAME, "-mobile{\n  padding: 0 0.16em;\n}\n.").concat(INLINE_IMG_CLASSNAME, "-desktop{}\n");
 export var inlineComponentAddCss = function inlineComponentAddCss() {
   var style = document.createElement('style');
   style.id = 'ams-inline-component-style';
@@ -16,11 +17,91 @@ export var inlineComponentAddCss = function inlineComponentAddCss() {
   style.innerHTML = inlineComponentCss;
   document.head.appendChild(style);
 };
-export var addInlineLoading = function addInlineLoading(_selector, platform) {
+/**
+ * @description componentSignEnum.ELEMENT_PAYMENT特殊处理
+ * @param {Options['type']} type
+ */
+var renderElementPayment = function renderElementPayment(type) {
+  var spliceStr = function spliceStr() {
+    var arr = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+    return arr.reduce(function (pre, cur) {
+      return pre += cur;
+    }, '');
+  };
+  var commonDom = function commonDom(children) {
+    var viewBox = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '0 0 560 256';
+    var height = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 256;
+    return "<svg id=\"".concat(INLINE_IMG_CLASSNAME, "-").concat(type, "\" width=\"100%\" height=\"").concat(height, "\" viewBox=\"").concat(viewBox, "\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\" preserveAspectRatio=\"none\">\n    ").concat(spliceStr(children), "\n    <animate xlink:href=\"#").concat(INLINE_IMG_CLASSNAME, "-").concat(type, "\" attributeName=\"opacity\" values=\"0.5; 1; 0.5\" begin=\"0s\" dur=\"1s\" repeatCount=\"indefinite\"></animate>\n  </svg>");
+  };
+  var creatRect = function creatRect(_ref) {
+    var _ref$x = _ref.x,
+      x = _ref$x === void 0 ? 0 : _ref$x,
+      _ref$y = _ref.y,
+      y = _ref$y === void 0 ? 0 : _ref$y,
+      _ref$fill = _ref.fill,
+      fill = _ref$fill === void 0 ? 'black' : _ref$fill,
+      _ref$width = _ref.width,
+      width = _ref$width === void 0 ? 560 : _ref$width,
+      _ref$height = _ref.height,
+      height = _ref$height === void 0 ? 32 : _ref$height,
+      _ref$rx = _ref.rx,
+      rx = _ref$rx === void 0 ? 4 : _ref$rx;
+    return "<rect fill-opacity=\"0.04\" x=\"".concat(x, "\" y=\"").concat(y, "\" width=\"").concat(width, "\" height=\"").concat(height, "\" rx=\"").concat(rx, "\" fill=\"").concat(fill, "\"/>");
+  };
+  var result = [creatRect({
+    fill: 'white'
+  }), creatRect({
+    y: 4
+  }), creatRect({
+    y: 48,
+    height: 64
+  }), creatRect({
+    y: 128
+  }), creatRect({
+    y: 176
+  }), creatRect({
+    y: 224
+  })];
+  if (type === 'tabs') {
+    result = [creatRect({
+      fill: 'white',
+      width: 358,
+      height: 305
+    }), creatRect({
+      y: 4,
+      width: '50%',
+      height: 73
+    }), creatRect({
+      x: '51%',
+      y: 4,
+      height: 73
+    }), creatRect({
+      y: 96,
+      height: 64
+    }), creatRect({
+      y: 178
+    }), creatRect({
+      y: 228
+    }), creatRect({
+      y: 276
+    })];
+  }
+  var viewBox = {
+    view: type === 'tabs' ? '0 0 358 305' : '0 0 560 256',
+    height: type === 'tabs' ? 305 : 256
+  };
+  return commonDom(result, viewBox.view, viewBox.height);
+};
+export var addInlineLoading = function addInlineLoading(_selector, platform, options) {
   var loading = document.createElement('div');
   loading.id = LOADING_ID;
-  if (platform === platformEnum.desktop) loading.innerHTML = "<svg class=\"".concat(INLINE_IMG_CLASSNAME, " ").concat(INLINE_IMG_CLASSNAME, "-").concat(platform, "\" width=\"740\" height=\"360\" viewBox=\"0 0 740 360\" fill=\"none\" xmlns=\"\">\n  <rect width=\"740\" height=\"360\" rx=\"12\" fill=\"#F6F6F6\"/>\n  <rect opacity=\"0.7\" x=\"44\" y=\"44\" width=\"32\" height=\"32\" rx=\"4\" fill=\"#E1E6ED\"/>\n  <rect opacity=\"0.7\" x=\"94\" y=\"44\" width=\"32\" height=\"32\" rx=\"4\" fill=\"#E1E6ED\"/>\n  <rect opacity=\"0.7\" x=\"144\" y=\"44\" width=\"32\" height=\"32\" rx=\"4\" fill=\"#E1E6ED\"/>\n  <g style=\"mix-blend-mode:multiply\" opacity=\"0.336007\">\n  <path d=\"M136 100H48C43.5817 100 40 103.582 40 108C40 112.418 43.5817 116 48 116H136C140.418 116 144 112.418 144 108C144 103.582 140.418 100 136 100Z\" fill=\"#E1E6ED\"/>\n  </g>\n  <g style=\"mix-blend-mode:multiply\" opacity=\"0.336007\">\n  <path d=\"M682 126H58C48.0589 126 40 134.059 40 144C40 153.941 48.0589 162 58 162H682C691.941 162 700 153.941 700 144C700 134.059 691.941 126 682 126Z\" fill=\"#E1E6ED\"/>\n  </g>\n  <g style=\"mix-blend-mode:multiply\" opacity=\"0.336007\">\n  <path d=\"M682 182H58C48.0589 182 40 190.059 40 200C40 209.941 48.0589 218 58 218H682C691.941 218 700 209.941 700 200C700 190.059 691.941 182 682 182Z\" fill=\"#E1E6ED\"/>\n  </g>\n  <g style=\"mix-blend-mode:multiply\" opacity=\"0.336007\">\n  <path d=\"M504 274H64C52.9543 274 44 282.954 44 294C44 305.046 52.9543 314 64 314H504C515.046 314 524 305.046 524 294C524 282.954 515.046 274 504 274Z\" fill=\"#E1E6ED\"/>\n  </g>\n  </svg>");
-  if (platform === platformEnum.mobile) loading.innerHTML = "<svg class=\"".concat(INLINE_IMG_CLASSNAME, " ").concat(INLINE_IMG_CLASSNAME, "-").concat(platform, "\" width=\"358\" height=\"186\" viewBox=\"0 0 358 186\" fill=\"none\" xmlns=\"\">\n  <g clip-path=\"url(#clip0_2543_91192)\">\n  <rect width=\"358\" height=\"186\" fill=\"white\"/>\n  <g clip-path=\"url(#clip1_2543_91192)\">\n  <rect width=\"358\" height=\"186\" fill=\"white\"/>\n  <rect width=\"358\" height=\"40\" fill=\"white\"/>\n  <rect opacity=\"0.7\" x=\"4\" y=\"4\" width=\"32\" height=\"32\" rx=\"4\" fill=\"#E1E6ED\"/>\n  <rect opacity=\"0.7\" x=\"54\" y=\"4\" width=\"32\" height=\"32\" rx=\"4\" fill=\"#E1E6ED\"/>\n  <rect opacity=\"0.7\" x=\"104\" y=\"4\" width=\"32\" height=\"32\" rx=\"4\" fill=\"#E1E6ED\"/>\n  <g clip-path=\"url(#clip2_2543_91192)\">\n  <rect width=\"358\" height=\"120\" transform=\"translate(0 66)\" fill=\"white\"/>\n  <g style=\"mix-blend-mode:multiply\" opacity=\"0.336007\">\n  <path d=\"M95 66H9C4.02944 66 0 70.0294 0 75C0 79.9706 4.02943 84 9 84H95C99.9706 84 104 79.9706 104 75C104 70.0294 99.9706 66 95 66Z\" fill=\"#E1E6ED\"/>\n  </g>\n  <g clip-path=\"url(#clip3_2543_91192)\">\n  <g style=\"mix-blend-mode:multiply\" opacity=\"0.336007\">\n  <path d=\"M340 94H18C8.05888 94 0 102.059 0 112C0 121.941 8.05887 130 18 130H340C349.941 130 358 121.941 358 112C358 102.059 349.941 94 340 94Z\" fill=\"#E1E6ED\"/>\n  </g>\n  <g style=\"mix-blend-mode:multiply\" opacity=\"0.336007\">\n  <path d=\"M340 150H18C8.05888 150 0 158.059 0 168C0 177.941 8.05887 186 18 186H340C349.941 186 358 177.941 358 168C358 158.059 349.941 150 340 150Z\" fill=\"#E1E6ED\"/>\n  </g>\n  </g>\n  </g>\n  </g>\n  </g>\n  <defs>\n  <clipPath id=\"clip0_2543_91192\">\n  <rect width=\"358\" height=\"186\" fill=\"white\"/>\n  </clipPath>\n  <clipPath id=\"clip1_2543_91192\">\n  <rect width=\"358\" height=\"186\" fill=\"white\"/>\n  </clipPath>\n  <clipPath id=\"clip2_2543_91192\">\n  <rect width=\"358\" height=\"120\" fill=\"white\" transform=\"translate(0 66)\"/>\n  </clipPath>\n  <clipPath id=\"clip3_2543_91192\">\n  <rect width=\"358\" height=\"92\" fill=\"white\" transform=\"translate(0 94)\"/>\n  </clipPath>\n  </defs>\n  </svg>\n  ");
+  if (options.componentSign === componentSignEnum.ELEMENT_PAYMENT) {
+    if (options.isExpressCheckout) {
+      loading.innerHTML = '';
+    } else {
+      loading.innerHTML = renderElementPayment(options === null || options === void 0 ? void 0 : options.type);
+    }
+  } else if (platform === platformEnum.desktop) loading.innerHTML = "<svg class=\"".concat(INLINE_IMG_CLASSNAME, " ").concat(INLINE_IMG_CLASSNAME, "-").concat(platform, "\" width=\"740\" height=\"360\" viewBox=\"0 0 740 360\" fill=\"none\" xmlns=\"\">\n  <rect width=\"740\" height=\"360\" rx=\"12\" fill=\"#F6F6F6\"/>\n  <rect opacity=\"0.7\" x=\"44\" y=\"44\" width=\"32\" height=\"32\" rx=\"4\" fill=\"#E1E6ED\"/>\n  <rect opacity=\"0.7\" x=\"94\" y=\"44\" width=\"32\" height=\"32\" rx=\"4\" fill=\"#E1E6ED\"/>\n  <rect opacity=\"0.7\" x=\"144\" y=\"44\" width=\"32\" height=\"32\" rx=\"4\" fill=\"#E1E6ED\"/>\n  <g style=\"mix-blend-mode:multiply\" opacity=\"0.336007\">\n  <path d=\"M136 100H48C43.5817 100 40 103.582 40 108C40 112.418 43.5817 116 48 116H136C140.418 116 144 112.418 144 108C144 103.582 140.418 100 136 100Z\" fill=\"#E1E6ED\"/>\n  </g>\n  <g style=\"mix-blend-mode:multiply\" opacity=\"0.336007\">\n  <path d=\"M682 126H58C48.0589 126 40 134.059 40 144C40 153.941 48.0589 162 58 162H682C691.941 162 700 153.941 700 144C700 134.059 691.941 126 682 126Z\" fill=\"#E1E6ED\"/>\n  </g>\n  <g style=\"mix-blend-mode:multiply\" opacity=\"0.336007\">\n  <path d=\"M682 182H58C48.0589 182 40 190.059 40 200C40 209.941 48.0589 218 58 218H682C691.941 218 700 209.941 700 200C700 190.059 691.941 182 682 182Z\" fill=\"#E1E6ED\"/>\n  </g>\n  <g style=\"mix-blend-mode:multiply\" opacity=\"0.336007\">\n  <path d=\"M504 274H64C52.9543 274 44 282.954 44 294C44 305.046 52.9543 314 64 314H504C515.046 314 524 305.046 524 294C524 282.954 515.046 274 504 274Z\" fill=\"#E1E6ED\"/>\n  </g>\n  </svg>");else if (platform === platformEnum.mobile) loading.innerHTML = "<svg class=\"".concat(INLINE_IMG_CLASSNAME, " ").concat(INLINE_IMG_CLASSNAME, "-").concat(platform, "\" width=\"358\" height=\"186\" viewBox=\"0 0 358 186\" fill=\"none\" xmlns=\"\">\n  <g clip-path=\"url(#clip0_2543_91192)\">\n  <rect width=\"358\" height=\"186\" fill=\"white\"/>\n  <g clip-path=\"url(#clip1_2543_91192)\">\n  <rect width=\"358\" height=\"186\" fill=\"white\"/>\n  <rect width=\"358\" height=\"40\" fill=\"white\"/>\n  <rect opacity=\"0.7\" x=\"4\" y=\"4\" width=\"32\" height=\"32\" rx=\"4\" fill=\"#E1E6ED\"/>\n  <rect opacity=\"0.7\" x=\"54\" y=\"4\" width=\"32\" height=\"32\" rx=\"4\" fill=\"#E1E6ED\"/>\n  <rect opacity=\"0.7\" x=\"104\" y=\"4\" width=\"32\" height=\"32\" rx=\"4\" fill=\"#E1E6ED\"/>\n  <g clip-path=\"url(#clip2_2543_91192)\">\n  <rect width=\"358\" height=\"120\" transform=\"translate(0 66)\" fill=\"white\"/>\n  <g style=\"mix-blend-mode:multiply\" opacity=\"0.336007\">\n  <path d=\"M95 66H9C4.02944 66 0 70.0294 0 75C0 79.9706 4.02943 84 9 84H95C99.9706 84 104 79.9706 104 75C104 70.0294 99.9706 66 95 66Z\" fill=\"#E1E6ED\"/>\n  </g>\n  <g clip-path=\"url(#clip3_2543_91192)\">\n  <g style=\"mix-blend-mode:multiply\" opacity=\"0.336007\">\n  <path d=\"M340 94H18C8.05888 94 0 102.059 0 112C0 121.941 8.05887 130 18 130H340C349.941 130 358 121.941 358 112C358 102.059 349.941 94 340 94Z\" fill=\"#E1E6ED\"/>\n  </g>\n  <g style=\"mix-blend-mode:multiply\" opacity=\"0.336007\">\n  <path d=\"M340 150H18C8.05888 150 0 158.059 0 168C0 177.941 8.05887 186 18 186H340C349.941 186 358 177.941 358 168C358 158.059 349.941 150 340 150Z\" fill=\"#E1E6ED\"/>\n  </g>\n  </g>\n  </g>\n  </g>\n  </g>\n  <defs>\n  <clipPath id=\"clip0_2543_91192\">\n  <rect width=\"358\" height=\"186\" fill=\"white\"/>\n  </clipPath>\n  <clipPath id=\"clip1_2543_91192\">\n  <rect width=\"358\" height=\"186\" fill=\"white\"/>\n  </clipPath>\n  <clipPath id=\"clip2_2543_91192\">\n  <rect width=\"358\" height=\"120\" fill=\"white\" transform=\"translate(0 66)\"/>\n  </clipPath>\n  <clipPath id=\"clip3_2543_91192\">\n  <rect width=\"358\" height=\"92\" fill=\"white\" transform=\"translate(0 94)\"/>\n  </clipPath>\n  </defs>\n  </svg>\n  ");
   if (_selector) _selector.appendChild(loading);
   var loadingDom = document.getElementById(LOADING_ID);
   amsSetSize(null, loadingDom);

package/esm/plugin/component/index.js

@@ -24,12 +24,12 @@ import { componentSignEnum, eventCodeEnum, messageName, platformEnum, productSce
 import { getType, isJsonString, isPC } from "../../util";
 import { isLocalMock } from "../../util/mock";
 import { matchVersion } from "../../util/versionCompare";
+import { handlePaymentSessionConfig } from "../payment-element/utils";
 import { createIframe, createPreloadIframe, getAppDomain, getIframeUrl } from "./cashierApp";
 import { getChannelBehavior } from "./channel";
 import { addInlineLoading, createInlineBaseElement } from "./component.inline.style";
 import { addPopupLoading, createBaseElement, createMockup, createRetentionPopup, handleDeclareInfo as _handleDeclareInfo, hideRetentionPopup, removeRetentionPopup as _removeRetentionPopup, slideInAndOutKeyframes } from "./component.popup.style";
-import { handlePaymentSessionConfig } from "../payment-element/utils";
-import { createModal, destroyModal, insertStyleSheet } from "./popupWindow.style";
+import { createModal, destroyModal, insertStyleSheet, removePopupLoading } from "./popupWindow.style";
 window.changingPageHeight = window.innerHeight;
 var ComponentApp = /*#__PURE__*/function () {
   function ComponentApp() {
@@ -299,7 +299,7 @@ var ComponentApp = /*#__PURE__*/function () {
       }).send();
       if (componentSignEnum.EASY_PAY_WALLET === this._componentSign) {
         if (productScene === productSceneEnum.EASY_PAY && productSceneVersion === '1.0' && !autoDebitWithToken && requireFastSdk) {
-          // EASY_PAY 1.0首次支付，requireFastSdk为true，不需要接口请求      
+          // EASY_PAY 1.0首次支付，requireFastSdk为true，不需要接口请求
           this.handleAuthUrlInfo(authUrlInfo);
           return;
         }
@@ -315,6 +315,18 @@ var ComponentApp = /*#__PURE__*/function () {
           return;
         }
       }
+      if (componentSignEnum.AUTO_DEBIT_PAY_WALLET === this._componentSign) {
+        if (requireFastSdk === true && productSceneVersion === '1.0') {
+          // REDIRECT，requireFastSdk为true，不需要接口请求
+          this.handleAuthUrlInfo(authUrlInfo);
+          return;
+        } else {
+          return Promise.reject({
+            code: ERRORMESSAGE.CREATEPAYMENT_PARAMETER_ERROR.code,
+            message: "Abnormal response data, interface failure, or unsupported payment method."
+          });
+        }
+      }
       this.dispatchToSDK(EVENT.eventCallback.name, {
         code: eventCodeEnum.SDK_START_OF_LOADING
       });
@@ -375,10 +387,22 @@ var ComponentApp = /*#__PURE__*/function () {
   }, {
     key: "renderInlineLoading",
     value: function renderInlineLoading(renderParams, selector) {
-      var _renderParams$appeara;
+      var _renderParams$appeara, _this$_renderParams11;
       var showLoading = renderParams === null || renderParams === void 0 || (_renderParams$appeara = renderParams.appearance) === null || _renderParams$appeara === void 0 ? void 0 : _renderParams$appeara.showLoading;
       showLoading = typeof showLoading === 'boolean' ? showLoading : true;
-      if (showLoading) addInlineLoading(selector, this.platform);
+      var extendInfo = renderParams.paymentSessionMetaData.extendInfo;
+      var isExpressCheckout = false;
+      try {
+        // expressCheckout可能出现string(false) JSON.parse再转一次
+        isExpressCheckout = JSON.parse(JSON.parse(extendInfo).expressCheckout);
+      } catch (error) {
+        // 遇到JSON解析错误，默认false
+      }
+      if (showLoading) addInlineLoading(selector, this.platform, {
+        componentSign: this._componentSign,
+        type: (_this$_renderParams11 = this._renderParams) === null || _this$_renderParams11 === void 0 || (_this$_renderParams11 = _this$_renderParams11.appearance) === null || _this$_renderParams11 === void 0 || (_this$_renderParams11 = _this$_renderParams11.layout) === null || _this$_renderParams11 === void 0 ? void 0 : _this$_renderParams11.type,
+        isExpressCheckout: isExpressCheckout
+      });
     }
   }, {
     key: "renderPopupLoading",
@@ -420,7 +444,6 @@ var ComponentApp = /*#__PURE__*/function () {
         key: 'sdk_action_query_start',
         value: Date.now()
       });
-
       // eslint-disable-next-line no-async-promise-executor
       this._actionQueryPromise = new Promise( /*#__PURE__*/function () {
         var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(resolve, reject) {
@@ -641,19 +664,19 @@ var ComponentApp = /*#__PURE__*/function () {
   }, {
     key: "createSubmitPromise",
     value: function createSubmitPromise() {
-      var _this$_renderParams11,
-        _this$_renderParams12,
+      var _this$_renderParams12,
         _this$_renderParams13,
+        _this$_renderParams14,
         _this6 = this;
       this._performanceData.push({
         key: 'sdk_submit_start',
         value: Date.now()
       });
       var params = {
-        paymentSessionData: this._renderParams && ((_this$_renderParams11 = this._renderParams) === null || _this$_renderParams11 === void 0 ? void 0 : _this$_renderParams11.sessionData) || '',
-        paymentSessionConfig: (_this$_renderParams12 = this._renderParams) === null || _this$_renderParams12 === void 0 || (_this$_renderParams12 = _this$_renderParams12.paymentSessionMetaData) === null || _this$_renderParams12 === void 0 ? void 0 : _this$_renderParams12.paymentSessionConfig
+        paymentSessionData: this._renderParams && ((_this$_renderParams12 = this._renderParams) === null || _this$_renderParams12 === void 0 ? void 0 : _this$_renderParams12.sessionData) || '',
+        paymentSessionConfig: (_this$_renderParams13 = this._renderParams) === null || _this$_renderParams13 === void 0 || (_this$_renderParams13 = _this$_renderParams13.paymentSessionMetaData) === null || _this$_renderParams13 === void 0 ? void 0 : _this$_renderParams13.paymentSessionConfig
       };
-      var channelBehavior = getChannelBehavior((_this$_renderParams13 = this._renderParams) === null || _this$_renderParams13 === void 0 ? void 0 : _this$_renderParams13.paymentSessionMetaData);
+      var channelBehavior = getChannelBehavior((_this$_renderParams14 = this._renderParams) === null || _this$_renderParams14 === void 0 ? void 0 : _this$_renderParams14.paymentSessionMetaData);
       // eslint-disable-next-line no-async-promise-executor
       this._actionSubmitPromise = new Promise( /*#__PURE__*/function () {
         var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(resolve) {
@@ -922,7 +945,7 @@ var ComponentApp = /*#__PURE__*/function () {
     key: "createDialog",
     value: function () {
       var _createDialog = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(data) {
-        var pageUrl, isLoad, timeout, logTimeout;
+        var pageUrl, _data$device, isLoad, timeout, logTimeout;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
@@ -932,8 +955,8 @@ var ComponentApp = /*#__PURE__*/function () {
               _context4.next = 5;
               return createModal({
                 widthPadding: data === null || data === void 0 ? void 0 : data.widthPadding,
-                heightPadding: data === null || data === void 0 ? void 0 : data.heightPadding,
-                device: this.platform,
+                device: (_data$device = data === null || data === void 0 ? void 0 : data.device) !== null && _data$device !== void 0 ? _data$device : this.platform,
+                loadingConfig: data === null || data === void 0 ? void 0 : data.loadingConfig,
                 url: pageUrl
               });
             case 5:
@@ -952,6 +975,7 @@ var ComponentApp = /*#__PURE__*/function () {
               }, POPUP_LOADTIME_LOG_LIMIT);
               this.popupApp.onload = function () {
                 isLoad = true;
+                removePopupLoading();
                 clearTimeout(timeout);
                 clearTimeout(logTimeout);
               };
@@ -1517,7 +1541,7 @@ var ComponentApp = /*#__PURE__*/function () {
     key: "sendRenderEvent",
     value: (function () {
       var _sendRenderEvent = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
-        var _this$_renderParams14, _this$_renderParams15, _this$_renderParams16, _this$_renderParams17, _this$_renderParams18, _this$_renderParams19, _this$AMSSDK$logger, _this$_renderParams20, _this$_renderParams21, _this$_renderParams22, _this$AMSSDK, _this$_renderParams23, res, submitRes;
+        var _this$_renderParams15, _this$_renderParams16, _this$_renderParams17, _this$_renderParams18, _this$_renderParams19, _this$_renderParams20, _this$AMSSDK$logger, _this$_renderParams21, _this$_renderParams22, _this$_renderParams23, _this$AMSSDK, _this$_renderParams24, res, submitRes;
         return _regeneratorRuntime().wrap(function _callee8$(_context8) {
           while (1) switch (_context8.prev = _context8.next) {
             case 0:
@@ -1546,12 +1570,12 @@ var ComponentApp = /*#__PURE__*/function () {
                   data: {
                     queryResult: res,
                     submitResult: submitRes,
-                    sessionResult: (_this$_renderParams14 = this._renderParams) === null || _this$_renderParams14 === void 0 ? void 0 : _this$_renderParams14.paymentSessionMetaData,
-                    paymentSessionData: (_this$_renderParams15 = this._renderParams) === null || _this$_renderParams15 === void 0 ? void 0 : _this$_renderParams15.sessionData,
+                    sessionResult: (_this$_renderParams15 = this._renderParams) === null || _this$_renderParams15 === void 0 ? void 0 : _this$_renderParams15.paymentSessionMetaData,
+                    paymentSessionData: (_this$_renderParams16 = this._renderParams) === null || _this$_renderParams16 === void 0 ? void 0 : _this$_renderParams16.sessionData,
                     heightOfVisible: Math.max(window.changingPageHeight, window.innerHeight),
-                    renderDisplayType: (_this$_renderParams16 = this._renderParams) === null || _this$_renderParams16 === void 0 ? void 0 : _this$_renderParams16.renderDisplayType,
-                    appearance: (_this$_renderParams17 = this._renderParams) === null || _this$_renderParams17 === void 0 ? void 0 : _this$_renderParams17.appearance,
-                    notRedirectAfterComplete: ((_this$_renderParams18 = this._renderParams) === null || _this$_renderParams18 === void 0 ? void 0 : _this$_renderParams18.notRedirectAfterComplete) === true,
+                    renderDisplayType: (_this$_renderParams17 = this._renderParams) === null || _this$_renderParams17 === void 0 ? void 0 : _this$_renderParams17.renderDisplayType,
+                    appearance: (_this$_renderParams18 = this._renderParams) === null || _this$_renderParams18 === void 0 ? void 0 : _this$_renderParams18.appearance,
+                    notRedirectAfterComplete: ((_this$_renderParams19 = this._renderParams) === null || _this$_renderParams19 === void 0 ? void 0 : _this$_renderParams19.notRedirectAfterComplete) === true,
                     merchantAppointParam: this._merchantAppointParam,
                     allowSubmitPayCallAhead: this._allowSubmitPayCallAhead,
                     envInfo: {
@@ -1559,16 +1583,16 @@ var ComponentApp = /*#__PURE__*/function () {
                       screenWidth: screen.width
                     },
                     logMetaData: _objectSpread(_objectSpread({
-                      trackId: (_this$_renderParams19 = this._renderParams) === null || _this$_renderParams19 === void 0 ? void 0 : _this$_renderParams19.sessionData,
+                      trackId: (_this$_renderParams20 = this._renderParams) === null || _this$_renderParams20 === void 0 ? void 0 : _this$_renderParams20.sessionData,
                       platform: this.platform,
                       firstLogTime: (_this$AMSSDK$logger = this.AMSSDK.logger) === null || _this$AMSSDK$logger === void 0 ? void 0 : _this$AMSSDK$logger.getComponentStartTime()
-                    }, ((_this$_renderParams20 = this._renderParams) === null || _this$_renderParams20 === void 0 || (_this$_renderParams20 = _this$_renderParams20.paymentSessionMetaData) === null || _this$_renderParams20 === void 0 ? void 0 : _this$_renderParams20.paymentSessionConfig) || {}), {}, {
-                      renderDisplayType: (_this$_renderParams21 = this._renderParams) === null || _this$_renderParams21 === void 0 ? void 0 : _this$_renderParams21.renderDisplayType,
+                    }, ((_this$_renderParams21 = this._renderParams) === null || _this$_renderParams21 === void 0 || (_this$_renderParams21 = _this$_renderParams21.paymentSessionMetaData) === null || _this$_renderParams21 === void 0 ? void 0 : _this$_renderParams21.paymentSessionConfig) || {}), {}, {
+                      renderDisplayType: (_this$_renderParams22 = this._renderParams) === null || _this$_renderParams22 === void 0 ? void 0 : _this$_renderParams22.renderDisplayType,
                       sdkVersion: this._appVersion,
-                      merchantId: (_this$_renderParams22 = this._renderParams) === null || _this$_renderParams22 === void 0 || (_this$_renderParams22 = _this$_renderParams22.paymentSessionMetaData) === null || _this$_renderParams22 === void 0 ? void 0 : _this$_renderParams22.clientId,
+                      merchantId: (_this$_renderParams23 = this._renderParams) === null || _this$_renderParams23 === void 0 || (_this$_renderParams23 = _this$_renderParams23.paymentSessionMetaData) === null || _this$_renderParams23 === void 0 ? void 0 : _this$_renderParams23.clientId,
                       instanceId: (_this$AMSSDK = this.AMSSDK) === null || _this$AMSSDK === void 0 ? void 0 : _this$AMSSDK._instanceId,
                       performanceData: this._performanceData,
-                      paymentMethodType: (_this$_renderParams23 = this._renderParams) === null || _this$_renderParams23 === void 0 || (_this$_renderParams23 = _this$_renderParams23.paymentSessionMetaData) === null || _this$_renderParams23 === void 0 || (_this$_renderParams23 = _this$_renderParams23.paymentMethodInfoView) === null || _this$_renderParams23 === void 0 ? void 0 : _this$_renderParams23.paymentMethodType
+                      paymentMethodType: (_this$_renderParams24 = this._renderParams) === null || _this$_renderParams24 === void 0 || (_this$_renderParams24 = _this$_renderParams24.paymentSessionMetaData) === null || _this$_renderParams24 === void 0 || (_this$_renderParams24 = _this$_renderParams24.paymentMethodInfoView) === null || _this$_renderParams24 === void 0 ? void 0 : _this$_renderParams24.paymentMethodType
                     })
                   }
                 }

package/esm/plugin/component/popupWindow.style.d.ts

@@ -1,8 +1,11 @@
+export declare const createCustomSheet: (curTheme?: 'dark' | 'light') => void;
+export declare const renderPopupLoading: (container: HTMLDivElement, curTheme: 'dark' | 'light') => void;
+export declare const removePopupLoading: (isShowMockup?: boolean) => void;
 export declare const insertStyleSheet: () => void;
-export declare const createModal: ({ device, url, widthPadding, heightPadding }: {
+export declare const createModal: ({ device, url, widthPadding, loadingConfig }: {
     device: any;
     url: any;
     widthPadding: any;
-    heightPadding: any;
+    loadingConfig: any;
 }) => Promise<HTMLIFrameElement>;
 export declare const destroyModal: () => void;

package/esm/plugin/component/popupWindow.style.js

@@ -1,8 +1,46 @@
-import { AMSPOPUP_PREFIX, ANIMATION_TIME } from "../../constant";
+import { AMSPOPUP_PREFIX, ANIMATION_TIME, MOCKUP_ID, POPUPLOADING_ID } from "../../constant";
+import { getDesignFontSize } from "../../util";
 
 // CSS样式字符串
-var modalStyles = "\n  .".concat(AMSPOPUP_PREFIX, "modal {\n    /* \u6DFB\u52A0\u5F39\u7A97\u6837\u5F0F */\n    background-color: #fff;\n    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);\n    position: fixed;\n    top: 50%;\n    left: 50%;\n    transform: translate(-50%, -50%);\n    z-index: 9999; /* \u8BBE\u7F6E\u5F39\u7A97\u7684\u5C42\u7EA7\u4E3A 9999 */\n    overflow: hidden;\n  }\n\n  .").concat(AMSPOPUP_PREFIX, "overlay {\n    /* \u6DFB\u52A0\u8499\u5C42\u6837\u5F0F */\n    position: fixed;\n    top: 0;\n    left: 0;\n    width: 100%;\n    height: 100%;\n    background-color: rgba(0, 0, 0, 0.4);\n    z-index: 999;\n  }\n\n  .").concat(AMSPOPUP_PREFIX, "fadeIn {\n    /* \u6DFB\u52A0\u6DE1\u5165\u52A8\u753B */\n    animation: fadeIn ").concat(ANIMATION_TIME, "ms;\n    animation-fill-mode: forwards;\n  }\n\n  .").concat(AMSPOPUP_PREFIX, "fadeOut {\n    /* \u6DFB\u52A0\u6DE1\u51FA\u52A8\u753B */\n    animation: fadeOut ").concat(ANIMATION_TIME, "ms;\n    animation-fill-mode: forwards;\n  }\n\n  /* \u5B9A\u4E49\u6DE1\u5165\u52A8\u753B */\n  @keyframes fadeIn {\n    0% {\n      opacity: 0;\n    }\n    100% {\n      opacity: 1;\n    }\n  }\n\n  @-webkit-keyframes fadeIn {\n    0% {\n      opacity: 0;\n    }\n    100% {\n      opacity: 1;\n    }\n  }\n\n  @-moz-keyframes fadeIn {\n    0% {\n      opacity: 0;\n    }\n    100% {\n      opacity: 1;\n    }\n  }\n\n  /* \u5B9A\u4E49\u6DE1\u51FA\u52A8\u753B */\n  @keyframes fadeOut {\n    0% {\n      opacity: 1;\n    }\n    100% {\n      opacity: 0;\n    }\n  }\n\n  @-webkit-keyframes fadeOut {\n    0% {\n      opacity: 1;\n    }\n    100% {\n      opacity: 0;\n    }\n  }\n\n  @-moz-keyframes fadeOut {\n    0% {\n      opacity: 1;\n    }\n    100% {\n      opacity: 0;\n    }\n  }\n");
-
+var modalStyles = "\n  .".concat(AMSPOPUP_PREFIX, "modal {\n    /* \u6DFB\u52A0\u5F39\u7A97\u6837\u5F0F */\n    background-color: #fff;\n    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);\n    position: fixed;\n    top: 50%;\n    left: 50%;\n    transform: translate(-50%, -50%);\n    z-index: 9999; /* \u8BBE\u7F6E\u5F39\u7A97\u7684\u5C42\u7EA7\u4E3A 9999 */\n    overflow: hidden;\n  }\n\n  .").concat(AMSPOPUP_PREFIX, "overlay {\n    /* \u6DFB\u52A0\u8499\u5C42\u6837\u5F0F */\n    position: fixed;\n    top: 0;\n    left: 0;\n    width: 100%;\n    height: 100%;\n    background-color: rgba(0, 0, 0, 0.4);\n    z-index: 999;\n  }\n\n  .").concat(AMSPOPUP_PREFIX, "fadeIn {\n    /* \u6DFB\u52A0\u6DE1\u5165\u52A8\u753B */\n    animation: fadeIn ").concat(ANIMATION_TIME, "ms;\n    animation-fill-mode: forwards;\n  }\n\n  .").concat(AMSPOPUP_PREFIX, "fadeOut {\n    /* \u6DFB\u52A0\u6DE1\u51FA\u52A8\u753B */\n    animation: fadeOut ").concat(ANIMATION_TIME, "ms;\n    animation-fill-mode: forwards;\n  }\n\n  /* \u5B9A\u4E49\u6DE1\u5165\u52A8\u753B */\n  @keyframes fadeIn {\n    0% {\n      opacity: 0;\n    }\n    100% {\n      opacity: 1;\n    }\n  }\n\n  @-webkit-keyframes fadeIn {\n    0% {\n      opacity: 0;\n    }\n    100% {\n      opacity: 1;\n    }\n  }\n\n  @-moz-keyframes fadeIn {\n    0% {\n      opacity: 0;\n    }\n    100% {\n      opacity: 1;\n    }\n  }\n\n  /* \u5B9A\u4E49\u6DE1\u51FA\u52A8\u753B */\n  @keyframes fadeOut {\n    0% {\n      opacity: 1;\n    }\n    100% {\n      opacity: 0;\n    }\n  }\n\n  @-webkit-keyframes fadeOut {\n    0% {\n      opacity: 1;\n    }\n    100% {\n      opacity: 0;\n    }\n  }\n\n  @-moz-keyframes fadeOut {\n    0% {\n      opacity: 1;\n    }\n    100% {\n      opacity: 0;\n    }\n  }\n\n\n.ams-component-popup-loading {\n  width: 0.8em;\n  height:0.8em;\n  border-radius: 8px;\n  position: fixed;\n  top: 50%;\n  left: 50%;\n  transform: translate(-50%, -50%);\n  z-index: 1001;\n  display: flex;\n  flex-direction: column;\n  justify-content: center;\n  align-items: center;\n}\n\n.ams-component-popup-loading .line {\n  width: 40px;\n  height: 40px;\n  position: absolute;\n  top: 50%;\n  left: 50%;\n  transform: translate(-50%, -50%);\n}\n.ams-component-popup-loading .line div {\n  position: absolute;\n  left: 17.67px;\n  top: 0;\n  width: 5.33px;\n  height: 40px;\n}\n\n.ams-component-popup-loading .line div:before,\n.ams-component-popup-loading .line div:after {\n  content: '';\n  display: block;\n  height: 13.33px;\n  background: black;\n  border-radius: 5.3px;\n}\n.ams-component-popup-loading .line div:after {\n  margin-top: 13.33px;\n}\n\n.ams-component-popup-loading .line div:nth-child(2) {\n  -webkit-transform: rotate(45deg);\n}\n\n.ams-component-popup-loading .line div:nth-child(3) {\n  -webkit-transform: rotate(90deg);\n}\n\n.ams-component-popup-loading .line div:nth-child(4) {\n  -webkit-transform: rotate(135deg);\n}\n\n/** \u52A0\u8F7D\u52A8\u753B **/\n@-webkit-keyframes load {\n  0% {\n      opacity: 0;\n  }\n\n  100% {\n      opacity: 1;\n  }\n}\n\n.ams-component-popup-loading .line div:nth-child(1):before {\n  -webkit-animation: load 1s linear 0s infinite;\n}\n\n.ams-component-popup-loading .line div:nth-child(2):before {\n  -webkit-animation: load 1s linear 0.125s infinite;\n}\n\n.ams-component-popup-loading .line div:nth-child(3):before {\n  -webkit-animation: load 1s linear 0.25s infinite;\n}\n\n.ams-component-popup-loading .line div:nth-child(4):before {\n  -webkit-animation: load 1s linear 0.375s infinite;\n}\n\n.ams-component-popup-loading .line div:nth-child(1):after {\n  -webkit-animation: load 1s linear 0.5s infinite;\n}\n\n.ams-component-popup-loading .line div:nth-child(2):after {\n  -webkit-animation: load 1s linear 0.675s infinite;\n}\n\n.ams-component-popup-loading .line div:nth-child(3):after {\n  -webkit-animation: load 1s linear 0.75s infinite;\n}\n\n.ams-component-popup-loading .line div:nth-child(4):after {\n  -webkit-animation: load 1s linear 0.875s infinite;\n}\n\n.ams-component-popup-loading-logo {\n  width: 0.44em;\n  height: 0.44em;\n  -webkit-transform:rotate(360deg);\n  transform:rotate(360deg);\n  -webkit-transition:-webkit-transform 1s linear;\n  transition:transform 1s linear;\n  animation: ams-component-loading-logo 1s linear infinite;\n}\n");
+var getCurrentTheme = function getCurrentTheme() {
+  var curTheme = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'default';
+  var theme = {
+    night: 'dark',
+    gamingPurple: 'dark',
+    agateGreen: 'dark',
+    default: 'light',
+    nostalgicGray: 'light',
+    cherryBlossomPink: 'light'
+  };
+  return theme[curTheme];
+};
+export var createCustomSheet = function createCustomSheet() {
+  var curTheme = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'light';
+  var sheet = "\n  .ams-component-popup-loading .line div:before,\n  .ams-component-popup-loading .line div:after {\n    background: ".concat(curTheme === 'light' ? '#000000' : '#ffffff', " !important;\n  }");
+  var style = document.createElement('style');
+  style.innerHTML = sheet;
+  document.head.appendChild(style);
+};
+export var renderPopupLoading = function renderPopupLoading(container, curTheme) {
+  createCustomSheet(curTheme);
+  var loading = document.createElement('div');
+  loading === null || loading === void 0 || loading.classList.add(POPUPLOADING_ID);
+  loading.id = POPUPLOADING_ID;
+  loading.innerHTML = '<div class="line"><div></div><div></div><div></div><div></div></div>';
+  loading.style.fontSize = "".concat(getDesignFontSize(), "px");
+  container.appendChild(loading);
+};
+export var removePopupLoading = function removePopupLoading() {
+  var _document$getElementB;
+  var isShowMockup = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
+  var mockup = document.getElementById(MOCKUP_ID);
+  if (mockup) {
+    mockup.style.background = 'rgb(0, 0, 0, 0.6)';
+    mockup.style.display = isShowMockup ? 'block' : 'none';
+  }
+  (_document$getElementB = document.getElementById(POPUPLOADING_ID)) === null || _document$getElementB === void 0 || _document$getElementB.remove();
+};
 // 创建和插入样式表
 export var insertStyleSheet = function insertStyleSheet() {
   var style = document.createElement('style');
@@ -15,7 +53,7 @@ export var createModal = function createModal(_ref) {
   var device = _ref.device,
     url = _ref.url,
     widthPadding = _ref.widthPadding,
-    heightPadding = _ref.heightPadding;
+    loadingConfig = _ref.loadingConfig;
   return new Promise(function (resolve, reject) {
     try {
       var overlay = document.createElement('div');
@@ -23,12 +61,12 @@ export var createModal = function createModal(_ref) {
       var modal = document.createElement('div');
       modal.classList.add("".concat(AMSPOPUP_PREFIX, "modal"), "".concat(AMSPOPUP_PREFIX, "fadeIn"));
       if (device === 'desktop') {
-        modal.style.width = '600px';
-        modal.style.height = '464px';
+        modal.style.width = '656px';
+        modal.style.height = '620px';
         modal.style.borderRadius = '12px';
       } else {
         modal.style.width = "calc(100% - ".concat(2 * widthPadding, "px)");
-        modal.style.height = "calc(100% - ".concat(2 * heightPadding, "px)");
+        modal.style.height = "80vh";
         modal.style.borderRadius = '8px';
       }
       var iframe = document.createElement('iframe');
@@ -36,6 +74,16 @@ export var createModal = function createModal(_ref) {
       iframe.style.border = 'none';
       iframe.style.width = '100%';
       iframe.style.height = '100%';
+      if (loadingConfig && Object.keys(loadingConfig).length) {
+        var _loadingConfig$theme = loadingConfig.theme,
+          theme = _loadingConfig$theme === void 0 ? 'default' : _loadingConfig$theme,
+          _loadingConfig$backgr = loadingConfig.backgroundPrimary,
+          backgroundPrimary = _loadingConfig$backgr === void 0 ? '#ffffff' : _loadingConfig$backgr;
+        var mode = getCurrentTheme(theme);
+        renderPopupLoading(modal, mode);
+        modal.style.backgroundColor = backgroundPrimary;
+        iframe.style.backgroundColor = backgroundPrimary;
+      }
       modal.appendChild(iframe);
       var body = document.getElementsByTagName('body')[0];
       body.appendChild(overlay);

package/esm/plugin/type.d.ts

@@ -8,6 +8,7 @@ export interface ComponentActionNamesType {
     mountComponent?: string;
     submit?: string;
     destroyComponent?: string;
+    getValue?: string;
 }
 export type IExtendPluginItem = {
     /**