@pisell/private-materials 6.3.116 → 6.3.117

package/lib/components/eftpos/locales.js

@@ -23,7 +23,7 @@ __export(locales_exports, {
 });
 module.exports = __toCommonJS(locales_exports);
 var locales_default = {
-  en: {
+  "en": {
     "page.eftpos.text.manufacturer": "Manufacturer",
     "page.eftpos.text.description": "Description",
     "page.eftpos.text.status": "status",
@@ -45,7 +45,6 @@ var locales_default = {
     "page.eftpos.text.edit": "Edit",
     "page.eftpos.text.delete": "Delete",
     "page.eftpos.text.save": "Save",
-    "page.eftpos.text.pair": "Pair",
     "page.eftpos.text.confim.delete": "Confirm delete",
     "page.eftpos.text.confirm_delete-message": (x) => `Confirm delete ${x} Device`,
     "page.eftpos.text.confim.cancel": "Cancel",
@@ -58,41 +57,9 @@ var locales_default = {
     "page.eftpos.text.table.del.delete": "Delete",
     "page.eftpos.text.table.del.cancel": "Cancel",
     "page.eftpos.text.log": "Log",
-    "page.eftpos.text.settlement": "Settlement",
-    "page.eftpos.text.settlement_enquiry": "Settlement enquiry",
     "page.eftpos.text.setting": "Setting",
     "page.eftpos.text.setting.tip": "You have not configured the necessary parameters, which may affect the normal use of your POS! ",
-    "page.eftpos.text.setting.btn": "Go to configure",
-    "page.eftpos.text.pair.modal.content.text-info": (status) => {
-      if (status === "pairing") {
-        return {
-          title: "Pairing",
-          description: "Confirm the code on the EFTPOS terminal to continue.",
-          codeTitle: "Code",
-          cancenButtonText: "Cancel",
-          okButtonText: "Check status"
-        };
-      } else if (status === "success") {
-        return {
-          title: "Pairing is active",
-          description: "You are ready to go!",
-          codeTitle: "",
-          cancenButtonText: "Unpair",
-          okButtonText: "Confirm"
-        };
-      } else if (status === "failed") {
-        return {
-          title: "Pairing not active",
-          description: "Check the terminal, confirm the pairing code, then try again.",
-          codeTitle: "Code",
-          cancenButtonText: "Cancel",
-          okButtonText: "Check status"
-        };
-      }
-    },
-    "page.eftpos.text.repair.message.warning": "Device is already connected. No need to reconnect.",
-    "page.eftpos.text.settlement.failed": "Please check network and terminal connections and try again",
-    "page.eftpos.text.settlement.button.done": "Done"
+    "page.eftpos.text.setting.btn": "Go to configure"
   },
   "zh-CN": {
     "page.eftpos.text.manufacturer": "厂商",
@@ -116,7 +83,6 @@ var locales_default = {
     "page.eftpos.text.edit": "编辑",
     "page.eftpos.text.delete": "删除",
     "page.eftpos.text.save": "保存",
-    "page.eftpos.text.pair": "配对",
     "page.eftpos.text.confim.delete": "确认删除",
     "page.eftpos.text.confirm_delete-message": (x) => `确认删除 ${x} 设备吗？`,
     "page.eftpos.text.confim.cancel": "取消",
@@ -129,41 +95,9 @@ var locales_default = {
     "page.eftpos.text.table.del.delete": "删除",
     "page.eftpos.text.table.del.cancel": "取消",
     "page.eftpos.text.log": "日志",
-    "page.eftpos.text.settlement": "结算",
-    "page.eftpos.text.settlement_enquiry": "结算查询",
     "page.eftpos.text.setting": "设置",
     "page.eftpos.text.setting.tip": "您尚未配置必要参数，这可能会影响您Pos的正常使用！",
-    "page.eftpos.text.setting.btn": "前往配置",
-    "page.eftpos.text.pair.modal.content.text-info": (status) => {
-      if (status === "pairing") {
-        return {
-          title: "正在配对",
-          description: "请在刷卡机上确认配对码以继续。",
-          codeTitle: "配对码",
-          cancenButtonText: "取消",
-          okButtonText: "检查状态"
-        };
-      } else if (status === "success") {
-        return {
-          title: "配对成功",
-          description: "设备已成功连接，可开始使用。",
-          codeTitle: "",
-          cancenButtonText: "解除配对",
-          okButtonText: "确认"
-        };
-      } else if (status === "failed") {
-        return {
-          title: "配对未生效",
-          description: "请检查刷卡机并确认配对码后重试。",
-          codeTitle: "配对码",
-          cancenButtonText: "取消",
-          okButtonText: "检查状态"
-        };
-      }
-    },
-    "page.eftpos.text.repair.message.warning": "设备已连接，无需重新连接。",
-    "page.eftpos.text.settlement.failed": "请检查网络和终端连接并重试",
-    "page.eftpos.text.settlement.button.done": "完成"
+    "page.eftpos.text.setting.btn": "前往配置"
   },
   "zh-HK": {
     "page.eftpos.text.manufacturer": "廠商",
@@ -187,7 +121,6 @@ var locales_default = {
     "page.eftpos.text.edit": "編輯",
     "page.eftpos.text.delete": "删除",
     "page.eftpos.text.save": "保存",
-    "page.eftpos.text.pair": "配對",
     "page.eftpos.text.confim.delete": "確認刪除",
     "page.eftpos.text.confirm_delete-message": (x) => `確認刪除 ${x} 設備嗎？`,
     "page.eftpos.text.confim.cancel": "取消",
@@ -200,40 +133,84 @@ var locales_default = {
     "page.eftpos.text.table.del.delete": "刪除",
     "page.eftpos.text.table.del.cancel": "取消",
     "page.eftpos.text.log": "日誌",
-    "page.eftpos.text.settlement": "結算",
-    "page.eftpos.text.settlement_enquiry": "結算查詢",
     "page.eftpos.text.setting": "设置",
     "page.eftpos.text.setting.tip": "您尚未配置必要參數，這可能會影響您Pos的正常使用！",
-    "page.eftpos.text.setting.btn": "前往配置",
-    "page.eftpos.text.pair.modal.content.text-info": (status) => {
-      if (status === "pairing") {
-        return {
-          title: "正在配對",
-          description: "請在刷卡機上確認配對碼以繼續。",
-          codeTitle: "配對碼",
-          cancenButtonText: "取消",
-          okButtonText: "檢查狀態"
-        };
-      } else if (status === "success") {
-        return {
-          title: "配對成功",
-          description: "設備已成功連接，可開始使用。",
-          codeTitle: "",
-          cancenButtonText: "解除配對",
-          okButtonText: "確認"
-        };
-      } else if (status === "failed") {
-        return {
-          title: "配對未生效",
-          description: "請檢查刷卡機並確認配對碼後重試。",
-          codeTitle: "配對碼",
-          cancenButtonText: "取消",
-          okButtonText: "檢查狀態"
-        };
+    "page.eftpos.text.setting.btn": "前往配置"
+  },
+  ja: {
+    "page.eftpos.text.manufacturer": "メーカー",
+    "page.eftpos.text.description": "説明",
+    "page.eftpos.text.status": "ステータス",
+    "page.eftpos.text.operation": "操作",
+    "page.eftpos.text.device": "デバイス",
+    "page.eftpos.text.device.add": (status, name) => {
+      if (!name) {
+        return `デバイスを追加`;
+      }
+      const action = status == "add" ? "追加" : status == "edit" ? "編集" : "再設定";
+      return `${action} ${name} デバイス`;
+    },
+    "page.eftpos.text.device.list": "デバイスリスト",
+    "page.eftpos.text.device.name": "デバイス名",
+    "page.eftpos.text.sucahrge": "支払い手数料",
+    "page.eftpos.text.paired": "ペアリング済み",
+    "page.eftpos.text.unpaired": "未ペアリング",
+    "page.eftpos.text.repair": "再設定",
+    "page.eftpos.text.edit": "編集",
+    "page.eftpos.text.delete": "削除",
+    "page.eftpos.text.save": "保存",
+    "page.eftpos.text.confim.delete": "削除を確認",
+    "page.eftpos.text.confirm_delete-message": (x) => `${x} デバイスを削除してもよろしいですか？`,
+    "page.eftpos.text.confim.cancel": "キャンセル",
+    "page.eftpos.text.table.name": "デバイス名",
+    "page.eftpos.text.table.status": "ステータス",
+    "page.eftpos.text.table.surcharge": "支払い手数料",
+    "page.eftpos.text.table.opeartion": "操作",
+    "page.eftpos.text.table.del.title": "デバイスを削除",
+    "page.eftpos.text.table.del.text": "デバイスを削除してもよろしいですか？",
+    "page.eftpos.text.table.del.delete": "削除",
+    "page.eftpos.text.table.del.cancel": "キャンセル",
+    "page.eftpos.text.log": "ログ",
+    "page.eftpos.text.setting": "設定",
+    "page.eftpos.text.setting.tip": "必要なパラメータが設定されていません。これによりPOSの正常な使用に影響する可能性があります！",
+    "page.eftpos.text.setting.btn": "設定に移動"
+  },
+  pt: {
+    "page.eftpos.text.manufacturer": "Fabricante",
+    "page.eftpos.text.description": "Descrição",
+    "page.eftpos.text.status": "status",
+    "page.eftpos.text.operation": "Operação",
+    "page.eftpos.text.device": "Dispositivo",
+    "page.eftpos.text.device.add": (status, name) => {
+      if (!name) {
+        return `Adicionar dispositivo`;
       }
+      const action = status == "add" ? "Adicionar" : status == "edit" ? "Editar" : "Reparar";
+      return `${action} dispositivo ${name}`;
     },
-    "page.eftpos.text.repair.message.warning": "設備已連接，無需重新連接。",
-    "page.eftpos.text.settlement.failed": "請檢查網絡和終端連接並重試",
-    "page.eftpos.text.settlement.button.done": "完成"
+    "page.eftpos.text.device.list": "Lista de dispositivos",
+    "page.eftpos.text.device.name": "Nome do dispositivo",
+    "page.eftpos.text.sucahrge": "Taxa",
+    "page.eftpos.text.paired": "Emparelhado",
+    "page.eftpos.text.unpaired": "Não emparelhado",
+    "page.eftpos.text.repair": "Reparar",
+    "page.eftpos.text.edit": "Editar",
+    "page.eftpos.text.delete": "Excluir",
+    "page.eftpos.text.save": "Salvar",
+    "page.eftpos.text.confim.delete": "Confirmar exclusão",
+    "page.eftpos.text.confirm_delete-message": (x) => `Confirmar exclusão do dispositivo ${x}`,
+    "page.eftpos.text.confim.cancel": "Cancelar",
+    "page.eftpos.text.table.name": "Nome do dispositivo",
+    "page.eftpos.text.table.status": "Status",
+    "page.eftpos.text.table.surcharge": "Taxa",
+    "page.eftpos.text.table.opeartion": "Operação",
+    "page.eftpos.text.table.del.title": "Excluir dispositivo",
+    "page.eftpos.text.table.del.text": "Tem certeza de que deseja excluir o dispositivo?",
+    "page.eftpos.text.table.del.delete": "Excluir",
+    "page.eftpos.text.table.del.cancel": "Cancelar",
+    "page.eftpos.text.log": "Log",
+    "page.eftpos.text.setting": "Configurações",
+    "page.eftpos.text.setting.tip": "Você não configurou os parâmetros necessários, o que pode afetar o uso normal do seu POS!",
+    "page.eftpos.text.setting.btn": "Ir para configurar"
   }
 };

package/lib/components/eftpos/table.js

@@ -36,8 +36,6 @@ var import_react = __toESM(require("react"));
 var import_antd = require("antd");
 var import_XClose = __toESM(require("@pisell/icon/es/XClose"));
 var import_utils = require("@pisell/utils");
-var import_const = require("./const");
-var import_SettlementModal = __toESM(require("./SettlementModal"));
 var { Column } = import_antd.Table;
 var { Title, Text } = import_antd.Typography;
 var App = ({
@@ -80,8 +78,6 @@ var App = ({
     total: 0
   });
   const [data, setData] = (0, import_react.useState)([]);
-  const [settlementModalOpen, setSettlementModalOpen] = (0, import_react.useState)(false);
-  const [settlementModalData, setSettlementModalData] = (0, import_react.useState)(null);
   const loadData = async (current) => {
     if (typeof getList !== "function") {
       return Promise.reject(`getList ${getList} is not function`);
@@ -150,16 +146,6 @@ var App = ({
   (0, import_react.useImperativeHandle)(ref, () => ({
     loadData
   }));
-  const onSettlement = (device) => {
-    console.log("onSettlement", device);
-    setSettlementModalOpen(true);
-    setSettlementModalData({ type: "SETTLEMENT", card_reader_id: device.id });
-  };
-  const onSettlementEnquiry = (device) => {
-    console.log("onSettlementEnquiry", device);
-    setSettlementModalOpen(true);
-    setSettlementModalData({ type: "ENQUIRY", card_reader_id: device.id });
-  };
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
     "div",
     {
@@ -253,17 +239,10 @@ var App = ({
         Column,
         {
           title: import_utils.locales.getText("page.eftpos.text.table.opeartion"),
-          width: type === import_const.Eftpos.MX51 ? 600 : size[3],
+          width: size[3],
           key: "opeartion",
           className: "pisell-lowcode__pos-table-col",
-          render: (record) => /* @__PURE__ */ import_react.default.createElement(import_antd.Space, { size: "middle" }, /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { type: "link", onClick: () => onRepairDevice(record) }, import_utils.locales.getText("page.eftpos.text.repair")), useTyroLog && type === "tyro" ? /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { type: "link", onClick: () => onLogDevice(record) }, import_utils.locales.getText("page.eftpos.text.log")) : null, /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { type: "link", onClick: () => onEditDevice(record) }, import_utils.locales.getText("page.eftpos.text.edit")), /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { type: "link", onClick: () => onDelDevice(record) }, import_utils.locales.getText("page.eftpos.text.delete")), type === import_const.Eftpos.MX51 ? /* @__PURE__ */ import_react.default.createElement(import_antd.Space, null, /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { type: "link", onClick: () => onSettlement(record) }, import_utils.locales.getText("page.eftpos.text.settlement")), /* @__PURE__ */ import_react.default.createElement(
-            import_antd.Button,
-            {
-              type: "link",
-              onClick: () => onSettlementEnquiry(record)
-            },
-            import_utils.locales.getText("page.eftpos.text.settlement_enquiry")
-          )) : null)
+          render: (record) => /* @__PURE__ */ import_react.default.createElement(import_antd.Space, { size: "middle" }, /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { type: "link", onClick: () => onRepairDevice(record) }, import_utils.locales.getText("page.eftpos.text.repair")), useTyroLog && type === "tyro" ? /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { type: "link", onClick: () => onLogDevice(record) }, import_utils.locales.getText("page.eftpos.text.log")) : null, /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { type: "link", onClick: () => onEditDevice(record) }, import_utils.locales.getText("page.eftpos.text.edit")), /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { type: "link", onClick: () => onDelDevice(record) }, import_utils.locales.getText("page.eftpos.text.delete")))
         }
       )
     ),
@@ -308,13 +287,6 @@ var App = ({
     /* @__PURE__ */ import_react.default.createElement("div", { style: { height: "34px" } }),
     /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__pos-table-del-title" }, import_utils.locales.getText("page.eftpos.text.table.del.title")),
     /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__pos-table-del-text" }, import_utils.locales.getText("page.eftpos.text.table.del.text"))
-  ), settlementModalOpen && /* @__PURE__ */ import_react.default.createElement(
-    import_SettlementModal.default,
-    {
-      open: settlementModalOpen,
-      onClose: () => setSettlementModalOpen(false),
-      data: settlementModalData
-    }
   ));
 };
 var table_default = import_react.default.forwardRef(App);

package/lib/components/eftposPay/amount.d.ts

@@ -9,7 +9,7 @@ import { PosProps } from './const';
  */
 declare const _default: ({ className, onChange, onClose, formatAmount, isMobile, net, client }: {
     className?: string | undefined;
-    onChange?: ((status: "success" | "page" | "print" | "fail" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "success" | "print" | "page" | "fail" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

package/lib/components/eftposPay/app.d.ts

@@ -0,0 +1,11 @@
+import React from 'react';
+import { PosProps, RouteType } from './const';
+declare const App: ({ action, api, device_number, terminal, tyroUrl, tyroVersion, onChangeParams, isMobile, channel, formatAmount, ...props }: Omit<PosProps, "type" | "mode" | "getApi"> & {
+    action: RouteType;
+    device_number: string | number;
+    api: ReturnType<PosProps['getApi']>;
+    isMobile: boolean;
+    channel?: string | undefined;
+    formatAmount(amount: number | string, precision: number, symbol: string): string;
+}) => React.JSX.Element;
+export default App;

package/lib/components/eftposPay/component/fail/failCustom.js

@@ -52,25 +52,31 @@ var failCustom_default = ({ className = "", isMobile, onChange }) => {
     order_id,
     number,
     device,
-    client
+    client,
+    originalParams
   } = (0, import_store.useContextData)();
   const failCustom = custom == null ? void 0 : custom.failCustom;
   const dispatch = (0, import_store.useDispatch)();
   const onRetry = () => {
     onChange("page", "pay");
-    dispatch(
-      (0, import_store.updateState)(
-        (0, import_manufacturer.getInitState)(
-          eftpos,
-          mode === import_const.ModeEnum.Query ? { mode, name, symbol, amount, order_id } : { mode, name, symbol, amount, order_id, number: "" }
-        )
-      )
-    );
+    const params = {
+      ...originalParams || {},
+      mode,
+      name,
+      symbol,
+      amount,
+      order_id
+    };
+    if (mode !== import_const.ModeEnum.Query) {
+      params.number = "";
+    }
+    dispatch((0, import_store.updateState)((0, import_manufacturer.getInitState)(eftpos, params)));
   };
   const onModify = () => {
     dispatch(
       (0, import_store.updateState)(
         (0, import_manufacturer.getInitState)(eftpos, {
+          ...originalParams || {},
           mode,
           name,
           symbol,

package/lib/components/eftposPay/component/fail/index.js

@@ -55,7 +55,8 @@ var fail_default = ({ onChange, className = "", isMobile }) => {
     number,
     device,
     client,
-    custom
+    custom,
+    originalParams
   } = (0, import_store.useContextData)();
   const isPosNetworkError = ((_b = (_a = steps[step]) == null ? void 0 : _a.custom) == null ? void 0 : _b.isPosNetworkError) || false;
   const dispatch = (0, import_store.useDispatch)();
@@ -64,6 +65,7 @@ var fail_default = ({ onChange, className = "", isMobile }) => {
     dispatch(
       (0, import_store.updateState)(
         (0, import_manufacturer.getInitState)(eftpos, {
+          ...originalParams || {},
           mode,
           name,
           symbol,
@@ -84,6 +86,7 @@ var fail_default = ({ onChange, className = "", isMobile }) => {
     dispatch(
       (0, import_store.updateState)(
         (0, import_manufacturer.getInitState)(eftpos, {
+          ...originalParams || {},
           mode,
           name,
           symbol,

package/lib/components/eftposPay/const.js

@@ -36,7 +36,6 @@ var EftposEnum = /* @__PURE__ */ ((EftposEnum2) => {
   EftposEnum2["Windcave"] = "windcave";
   EftposEnum2["Stripe"] = "stripe";
   EftposEnum2["Linkly"] = "linkly";
-  EftposEnum2["MX51"] = "mx51";
   return EftposEnum2;
 })(EftposEnum || {});
 var StatusEnum = /* @__PURE__ */ ((StatusEnum2) => {
@@ -102,7 +101,6 @@ var PayStatus = /* @__PURE__ */ ((PayStatus2) => {
   PayStatus2["PayBankRefuses"] = "701008";
   PayStatus2["SignatureDeclined"] = "701009";
   PayStatus2["UserConfigError"] = "701010";
-  PayStatus2["UnknownMx51"] = "702001";
   return PayStatus2;
 })(PayStatus || {});
 // Annotate the CommonJS export names for ESM import in node:

package/lib/components/eftposPay/device.d.ts

@@ -11,7 +11,7 @@ import './device.less';
 declare const _default: ({ api, onChange, onClose, className, device_number, isMobile, net, client, formatAmount, }: {
     api: PayProps['api'];
     className?: string | undefined;
-    onChange?: ((status: "success" | "page" | "print" | "fail" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "success" | "print" | "page" | "fail" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

package/lib/components/eftposPay/device.js

@@ -43,6 +43,8 @@ var import_ChevronRight = __toESM(require("@pisell/icon/es/ChevronRight"));
 var import_store = require("./store");
 var import_manufacturer = require("./manufacturer");
 var import_device = require("./device.less");
+var import_useEngineContext = __toESM(require("../../hooks/useEngineContext"));
+var import_utils2 = require("@pisell/utils");
 var device_default = ({
   api,
   onChange,
@@ -54,12 +56,15 @@ var device_default = ({
   client,
   formatAmount = (number, precision, symbol) => `${symbol}${number}`
 }) => {
+  const context = (0, import_useEngineContext.default)();
+  const { isTerminal, interaction } = context.appHelper.utils || {};
   const store = (0, import_store.useContextData)();
-  const { device, symbol, mode, eftpos } = store;
+  const { device, symbol, mode, eftpos, order_id } = store;
   const [loading, setLoading] = (0, import_react.useState)(false);
   const [dataStaus, setDataStaus] = (0, import_react.useState)(true);
   const [list, setList] = (0, import_react.useState)([]);
   const dispatch = (0, import_store.useDispatch)();
+  const timerRef = (0, import_react.useRef)();
   const onClick = (event) => {
     if (!net) {
       import_antd.message.open({
@@ -72,10 +77,41 @@ var device_default = ({
     const [index] = [Number(event.currentTarget.dataset.index)];
     setDevice(list[index]);
   };
+  const triggerCloseButton = (bool) => {
+    var _a, _b;
+    if (!(isTerminal == null ? void 0 : isTerminal())) {
+      return;
+    }
+    (_b = (_a = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _a.postMessageToApp) == null ? void 0 : _b.call(_a, {
+      module: "pos",
+      key: "other",
+      data: {
+        key: bool ? "show_close_button" : "hide_close_button"
+      }
+    });
+  };
+  const closeFirstWithDelayShow = () => {
+    timerRef.current && clearTimeout(timerRef.current);
+    if (!(isTerminal == null ? void 0 : isTerminal())) {
+      return;
+    }
+    triggerCloseButton(false);
+    timerRef.current = setTimeout(() => {
+      triggerCloseButton(true);
+    }, 5e3);
+  };
+  const clearTimer = () => {
+    if (timerRef.current) {
+      clearTimeout(timerRef.current);
+      timerRef.current = void 0;
+    }
+  };
   (0, import_ahooks.useMount)(() => {
     setLoading(true);
+    closeFirstWithDelayShow();
     api.getDeviceList({ type: eftpos, status: "paired" }).then(
       (res) => {
+        clearTimer();
         setLoading(false);
         if (res && Array.isArray(res.list) && res.list.length > 0) {
           if (device_number) {
@@ -100,24 +136,65 @@ var device_default = ({
           setList(setDeviceList(res.list));
           if (res.list.length === 1) {
             setDevice(res.list[0]);
+          } else {
+            triggerCloseButton(true);
           }
           return;
         }
+        triggerCloseButton(true);
         setDataStaus(false);
       },
       () => {
+        clearTimer();
+        triggerCloseButton(true);
         setDataStaus(false);
         setLoading(false);
       }
     );
   });
-  const setDevice = (device2) => {
+  (0, import_ahooks.useUnmount)(() => {
+    timerRef.current && clearTimeout(timerRef.current);
+  });
+  const checkIsActiveWithDelay = async (time = 100) => {
+    var _a, _b, _c;
+    if (!(isTerminal == null ? void 0 : isTerminal())) {
+      return true;
+    }
+    await new Promise((resolve) => setTimeout(resolve, time));
+    if ((_a = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _a.asyncDataManager) {
+      try {
+        const activeStatus = await ((_c = (_b = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _b.asyncDataManager) == null ? void 0 : _c.call(_b, {
+          module: "get",
+          key: "pay_webview_active"
+        }));
+        return activeStatus !== "unActive";
+      } catch (error) {
+        return true;
+      }
+    }
+    return true;
+  };
+  const setDevice = async (device2) => {
     dispatch((0, import_store.updateDevice)({ device: device2 }));
     if (typeof api.selectDevice === "function") {
       api.selectDevice(device2);
     }
     if (typeof onChange === "function") {
       if (mode === import_const.ModeEnum.Pay) {
+        triggerCloseButton(false);
+        const isActive = await checkIsActiveWithDelay(100);
+        if (!isActive) {
+          (0, import_utils2.sendWarningLog)({
+            title: "支付-当前页面非活跃状态，无法进行支付",
+            content: [
+              {
+                key: "activeStatus",
+                value: JSON.stringify({ order_id, isActive })
+              }
+            ]
+          });
+          return;
+        }
         if (device2.pay) {
           dispatch(
             (0, import_store.updateState)({
@@ -152,14 +229,19 @@ var device_default = ({
       className: "pisell-lowcode__eft-pay-device-list",
       style: isMobile ? { marginTop: "20px" } : {}
     },
-    /* @__PURE__ */ import_react.default.createElement(import_antd.Spin, { spinning: loading, style: { flex: 1, overflow: "auto" } }, /* @__PURE__ */ import_react.default.createElement(
-      "div",
+    /* @__PURE__ */ import_react.default.createElement(
+      import_antd.Spin,
       {
-        style: { display: "flex", flexDirection: "column", gap: "10px" }
+        spinning: loading,
+        size: "large",
+        style: { flex: 1, overflow: "auto", minHeight: "200px" }
       },
-      list.map(({ id, name, pay, connection }, index) => {
-        var _a;
-        return /* @__PURE__ */ import_react.default.createElement(
+      /* @__PURE__ */ import_react.default.createElement(
+        "div",
+        {
+          style: { display: "flex", flexDirection: "column", gap: "10px" }
+        },
+        list.map(({ id, name, pay }, index) => /* @__PURE__ */ import_react.default.createElement(
           "div",
           {
             key: id,
@@ -173,16 +255,16 @@ var device_default = ({
             "page.eftpos-pay.text.surcharge.edit.inc.surcharge"
           ), ": ", formatAmount(`${pay.surcharge}`, 2, symbol), " (", import_utils.locales.getText(
             "page.eftpos-pay.text.surcharge.edit.rate"
-          ), ":", pay.surRate, "% +", " ", formatAmount(`${pay.surMoney}`, 2, symbol), ")"), eftpos === import_const.EftposEnum.MX51 ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__eft-pay-device-sucharge" }, "Pairing ID: ", (_a = connection == null ? void 0 : connection.response) == null ? void 0 : _a.pairing_id) : null)),
+          ), ":", pay.surRate, "% +", " ", formatAmount(`${pay.surMoney}`, 2, symbol), ")"))),
           /* @__PURE__ */ import_react.default.createElement("div", { style: { flexShrink: 0 } }, /* @__PURE__ */ import_react.default.createElement(
             import_ChevronRight.default,
             {
               style: { fontWeight: "600", fontSize: "24px" }
             }
           ))
-        );
-      })
-    ))
+        ))
+      )
+    )
   ) : /* @__PURE__ */ import_react.default.createElement(
     "div",
     {

package/lib/components/eftposPay/hooks.d.ts

@@ -19,7 +19,7 @@ export declare const useStoreRef: <T extends {
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;
-    readonly eftposRef: React.MutableRefObject<"payo" | "tyro" | "windcave" | "stripe" | "linkly" | "mx51">;
+    readonly eftposRef: React.MutableRefObject<"payo" | "tyro" | "windcave" | "stripe" | "linkly">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

package/lib/components/eftposPay/index.js

@@ -94,10 +94,14 @@ var eftposPay_default = (props) => {
     if (props.source === import_const.RestoreEumn.Restore) {
       return props.params;
     }
-    return (0, import_manufacturer.getInitState)(
+    const initState = (0, import_manufacturer.getInitState)(
       props.type,
       props.params ? { mode, ...props.params, symbol: current } : { mode, symbol: current }
     );
+    return {
+      ...initState || {},
+      originalParams: props.params || {}
+    };
   }, [mode, props.params, props.type, symbol]);
   const stateRef = (0, import_react.useRef)(state);
   (0, import_react.useEffect)(() => {

package/lib/components/eftposPay/linkly/const.js

@@ -72,7 +72,7 @@ var const_default = (params) => {
     status: import_const.StatusEnum.Loading,
     steps: getStep(mode),
     render: true,
-    client: client !== "undefined" ? client : import_const.ClientEnum.Merchant,
+    client: client !== "undefined" && client !== void 0 ? client : import_const.ClientEnum.Merchant,
     warn: "",
     custom: other || {},
     ...typeof net !== "undefined" ? { net } : {},

package/lib/components/eftposPay/linkly/index.js

@@ -126,7 +126,6 @@ var Linkly = ({ api, onChange }) => {
   }, [fail]);
   (0, import_react.useEffect)(() => {
     var _a, _b, _c;
-    console.log("statusRef.current11111", statusRef.current);
     if (statusRef.current === import_const.StatusEnum.Success || statusRef.current === import_const.StatusEnum.Fail) {
       return;
     }