@pisell/private-materials 6.6.66 → 6.6.68

package/es/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<"stripe" | "tyro" | "mx51" | "payo" | "windcave" | "linkly" | "huifu">;
+    readonly eftposRef: React.MutableRefObject<"stripe" | "tyro" | "windcave" | "mx51" | "payo" | "linkly" | "huifu">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

package/es/components/eftposPay/mx51/Action.d.ts

@@ -1,6 +1,13 @@
+import { ParsedElement } from './types';
 /**
  * @title 渲染动态内容
  * @description 用于渲染从接口解析出来的元素
  */
-declare const Action: (props: any) => JSX.Element;
+interface ActionProps {
+    data: any;
+    cancelDisabled?: boolean;
+    isLoading?: boolean;
+    onClick: (element: ParsedElement, extra: Record<string, any>) => void;
+}
+declare const Action: (props: ActionProps) => JSX.Element;
 export default Action;

package/es/components/eftposPay/mx51/Action.js

@@ -22,10 +22,10 @@ import { EButtonKeyType } from "./types";
 var Action = function Action(props) {
   var _data$layouts2, _data$layouts3;
   var data = props.data,
-    _props$showMessage = props.showMessage,
-    showMessage = _props$showMessage === void 0 ? true : _props$showMessage,
     _props$cancelDisabled = props.cancelDisabled,
-    cancelDisabled = _props$cancelDisabled === void 0 ? false : _props$cancelDisabled;
+    cancelDisabled = _props$cancelDisabled === void 0 ? false : _props$cancelDisabled,
+    _props$isLoading = props.isLoading,
+    isLoading = _props$isLoading === void 0 ? false : _props$isLoading;
   var _useState = useState({}),
     _useState2 = _slicedToArray(_useState, 2),
     inputValues = _useState2[0],
@@ -53,7 +53,7 @@ var Action = function Action(props) {
       return _objectSpread(_objectSpread({}, prev), {}, _defineProperty({}, key, value));
     });
   };
-  return /*#__PURE__*/React.createElement(React.Fragment, null, showMessage && (data === null || data === void 0 ? void 0 : data.message) && /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, isLoading && (data === null || data === void 0 ? void 0 : data.message) && /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__eft-pay-step-item pisell-lowcode__eft-pay-step-item-tip"
   }, data === null || data === void 0 ? void 0 : data.message), (data === null || data === void 0 || (_data$layouts2 = data.layouts) === null || _data$layouts2 === void 0 ? void 0 : _data$layouts2.length) > 0 && (data === null || data === void 0 || (_data$layouts3 = data.layouts) === null || _data$layouts3 === void 0 ? void 0 : _data$layouts3.map(function (item, index) {
     var _item$elements2;

package/es/components/eftposPay/mx51/index.js

@@ -1,4 +1,7 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+var _excluded = ["customAction"];
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -71,6 +74,8 @@ var AggregatePayment = function AggregatePayment(_ref) {
     _useState6 = _slicedToArray(_useState5, 2),
     cancelDisabled = _useState6[0],
     setCancelDisabled = _useState6[1];
+  var clickLockedRef = useRef(false);
+  var clickUnlockTimerRef = useRef(null);
   // 操作行为超时
   var actionTimeoutRef = useRef(null);
   var clearRef = useRef(null);
@@ -198,6 +203,10 @@ var AggregatePayment = function AggregatePayment(_ref) {
         clearTimeout(clearRef.current);
         clearRef.current = null;
       }
+      if (clickUnlockTimerRef.current) {
+        clearTimeout(clickUnlockTimerRef.current);
+        clickUnlockTimerRef.current = null;
+      }
     };
   }, []);
 
@@ -296,8 +305,6 @@ var AggregatePayment = function AggregatePayment(_ref) {
 
   // 拒绝签名
   var onDecline = function onDecline(element) {
-    console.log('onDecline', element);
-    updateToLoading();
     payment.action({
       submit_url: element === null || element === void 0 ? void 0 : element.submitUrl
     });
@@ -305,8 +312,6 @@ var AggregatePayment = function AggregatePayment(_ref) {
 
   // 接受签名
   var onAccept = function onAccept(element) {
-    console.log('onAccept', element);
-    updateToLoading();
     payment.action({
       submit_url: element === null || element === void 0 ? void 0 : element.submitUrl
     });
@@ -314,7 +319,6 @@ var AggregatePayment = function AggregatePayment(_ref) {
 
   // 打印商户收据
   var onPrintMerchantReceipt = function onPrintMerchantReceipt(element) {
-    console.log('onPrintMerchantReceipt', element);
     onChange('print', element !== null && element !== void 0 && element.receipt ? [element === null || element === void 0 ? void 0 : element.receipt] : []);
     setReceiptModalShow(true);
     setReceiptModalData(element === null || element === void 0 ? void 0 : element.receipt);
@@ -322,7 +326,6 @@ var AggregatePayment = function AggregatePayment(_ref) {
 
   // 打印客户收据
   var onPrintCustomerReceipt = function onPrintCustomerReceipt(element) {
-    console.log('onPrintCustomerReceipt', element);
     onChange('print', element !== null && element !== void 0 && element.receipt ? [element === null || element === void 0 ? void 0 : element.receipt] : []);
     setReceiptModalShow(true);
     setReceiptModalData(element === null || element === void 0 ? void 0 : element.receipt);
@@ -330,9 +333,11 @@ var AggregatePayment = function AggregatePayment(_ref) {
 
   // 重试交易
   var onRetry = function onRetry(element) {
-    console.log('onRetry', element);
     onChange('page', 'pay');
-    var _params = _objectSpread(_objectSpread({}, custom || {}), {}, {
+    var _ref7 = custom || {},
+      customAction = _ref7.customAction,
+      restCustom = _objectWithoutProperties(_ref7, _excluded);
+    var _params = _objectSpread(_objectSpread({}, restCustom), {}, {
       // 自定义参数需要重新传递
       mode: mode,
       name: name,
@@ -346,12 +351,11 @@ var AggregatePayment = function AggregatePayment(_ref) {
 
   // 交易完成
   var onTransactionComplete = function onTransactionComplete(element) {
-    console.log('onTransactionComplete', element);
-    var _ref7 = element._extra || {},
-      paymentStatus = _ref7.paymentStatus,
-      response = _ref7.response,
-      merchantReceipt = _ref7.merchantReceipt,
-      customerReceipt = _ref7.customerReceipt;
+    var _ref8 = element._extra || {},
+      paymentStatus = _ref8.paymentStatus,
+      response = _ref8.response,
+      merchantReceipt = _ref8.merchantReceipt,
+      customerReceipt = _ref8.customerReceipt;
     if (paymentStatus === EPaymentStatus.Success) {
       var _response$data, _deviceRef$current2;
       var receipt = [];
@@ -395,7 +399,6 @@ var AggregatePayment = function AggregatePayment(_ref) {
 
   // 提交到API
   var onSubmitToAPI = function onSubmitToAPI(element, extra) {
-    updateToLoading();
     var inputValues = (extra === null || extra === void 0 ? void 0 : extra.inputValues) || {};
     payment.action({
       submit_url: element === null || element === void 0 ? void 0 : element.submitUrl,
@@ -408,7 +411,6 @@ var AggregatePayment = function AggregatePayment(_ref) {
     // 如果存在submit_url，则提交到API
     if (element !== null && element !== void 0 && element.submitUrl) {
       console.log('onNormalClick_submit_url', element === null || element === void 0 ? void 0 : element.submitUrl);
-      updateToLoading();
       payment.action({
         submit_url: element === null || element === void 0 ? void 0 : element.submitUrl
       }, config);
@@ -416,9 +418,34 @@ var AggregatePayment = function AggregatePayment(_ref) {
       console.log('onNormalClick_no_submit_url', element);
     }
   };
+  var shouldLockElementClick = function shouldLockElementClick(element) {
+    var lockKeys = [EButtonKeyType.DeclineSignature, EButtonKeyType.ApproveSignature, EButtonKeyType.RetryTransaction, EButtonKeyType.SubmitToAPI, EButtonKeyType.CallTestFunction];
+    return lockKeys.includes(element.key);
+  };
+  var lockElementClick = function lockElementClick() {
+    clickLockedRef.current = true;
+    clickUnlockTimerRef.current = setTimeout(function () {
+      clickLockedRef.current = false;
+      clickUnlockTimerRef.current = null;
+    }, 1000);
+  };
 
   // 点击元素
   var onElementClick = function onElementClick(element, extra) {
+    if (shouldLockElementClick(element)) {
+      if (clickLockedRef.current) {
+        payLog.log("\u5FFD\u7565\u91CD\u590D\u70B9\u51FB".concat((element === null || element === void 0 ? void 0 : element.key) || '未知', "\u6309\u94AE"));
+        return;
+      }
+      // 锁定点击
+      lockElementClick();
+      // 清除action data
+      dispatch(updateCustom({
+        customAction: {}
+      }));
+      // 更新为加载状态
+      updateToLoading();
+    }
     console.log('onElementClick', element, extra);
     payLog.log("\u70B9\u51FB".concat((element === null || element === void 0 ? void 0 : element.key) || '未知', "\u6309\u94AE"));
     switch (element.key) {
@@ -471,9 +498,9 @@ var AggregatePayment = function AggregatePayment(_ref) {
     }
   }, title) : null, status !== StatusEnum.Success ? /*#__PURE__*/React.createElement(Action, {
     data: custom === null || custom === void 0 ? void 0 : custom.customAction,
-    showMessage: status === StatusEnum.Loading,
     onClick: onElementClick,
-    cancelDisabled: cancelDisabled
+    cancelDisabled: cancelDisabled,
+    isLoading: status === StatusEnum.Loading
   }) : null), receiptModalShow ? /*#__PURE__*/React.createElement(PisellModal, {
     open: receiptModalShow,
     onCancel: onCloseReceiptModal,

package/es/components/eftposPay/store/index.d.ts

@@ -299,8 +299,8 @@ export declare const backUpFree: (payload: Partial<State>) => {
         amount?: string | number | undefined;
         mode?: "pay" | "refund" | "fullPay" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "stripe" | "tyro" | "mx51" | "payo" | "windcave" | "linkly" | "huifu" | undefined;
-        action?: "pay" | "amount" | "deviceList" | undefined;
+        eftpos?: "stripe" | "tyro" | "windcave" | "mx51" | "payo" | "linkly" | "huifu" | undefined;
+        action?: "amount" | "pay" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | undefined;
         title?: string | undefined;

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<"stripe" | "tyro" | "mx51" | "payo" | "windcave" | "linkly" | "huifu">;
+    readonly eftposRef: React.MutableRefObject<"stripe" | "tyro" | "windcave" | "mx51" | "payo" | "linkly" | "huifu">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

package/lib/components/eftposPay/mx51/Action.d.ts

@@ -1,6 +1,13 @@
+import { ParsedElement } from './types';
 /**
  * @title 渲染动态内容
  * @description 用于渲染从接口解析出来的元素
  */
-declare const Action: (props: any) => JSX.Element;
+interface ActionProps {
+    data: any;
+    cancelDisabled?: boolean;
+    isLoading?: boolean;
+    onClick: (element: ParsedElement, extra: Record<string, any>) => void;
+}
+declare const Action: (props: ActionProps) => JSX.Element;
 export default Action;

package/lib/components/eftposPay/mx51/Action.js

@@ -37,7 +37,7 @@ var import_antd = require("antd");
 var import_types = require("./types");
 var Action = (props) => {
   var _a, _b;
-  const { data, showMessage = true, cancelDisabled = false } = props;
+  const { data, cancelDisabled = false, isLoading = false } = props;
   const [inputValues, setInputValues] = (0, import_react.useState)({});
   const inputValuesRef = (0, import_react.useRef)(inputValues);
   (0, import_react.useEffect)(() => {
@@ -60,7 +60,7 @@ var Action = (props) => {
   const handleInputChange = (key, value) => {
     setInputValues((prev) => ({ ...prev, [key]: value }));
   };
-  return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, showMessage && (data == null ? void 0 : data.message) && /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__eft-pay-step-item pisell-lowcode__eft-pay-step-item-tip" }, data == null ? void 0 : data.message), ((_a = data == null ? void 0 : data.layouts) == null ? void 0 : _a.length) > 0 && ((_b = data == null ? void 0 : data.layouts) == null ? void 0 : _b.map((item, index) => {
+  return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, isLoading && (data == null ? void 0 : data.message) && /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__eft-pay-step-item pisell-lowcode__eft-pay-step-item-tip" }, data == null ? void 0 : data.message), ((_a = data == null ? void 0 : data.layouts) == null ? void 0 : _a.length) > 0 && ((_b = data == null ? void 0 : data.layouts) == null ? void 0 : _b.map((item, index) => {
     var _a2;
     return /* @__PURE__ */ import_react.default.createElement(
       "div",

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

@@ -81,6 +81,8 @@ var AggregatePayment = ({ onChange }) => {
   const [receiptModalShow, setReceiptModalShow] = (0, import_react.useState)(false);
   const [receiptModalData, setReceiptModalData] = (0, import_react.useState)(null);
   const [cancelDisabled, setCancelDisabled] = (0, import_react.useState)(false);
+  const clickLockedRef = (0, import_react.useRef)(false);
+  const clickUnlockTimerRef = (0, import_react.useRef)(null);
   const actionTimeoutRef = (0, import_react.useRef)(null);
   const clearRef = (0, import_react.useRef)(null);
   (0, import_react.useEffect)(() => {
@@ -177,6 +179,10 @@ var AggregatePayment = ({ onChange }) => {
         clearTimeout(clearRef.current);
         clearRef.current = null;
       }
+      if (clickUnlockTimerRef.current) {
+        clearTimeout(clickUnlockTimerRef.current);
+        clickUnlockTimerRef.current = null;
+      }
     };
   }, []);
   const handleFail = (errorData) => {
@@ -248,32 +254,26 @@ var AggregatePayment = ({ onChange }) => {
     }, import_types2.CANCEL_ACTION_TIMEOUT);
   };
   const onDecline = (element) => {
-    console.log("onDecline", element);
-    updateToLoading();
     payment.action({ submit_url: element == null ? void 0 : element.submitUrl });
   };
   const onAccept = (element) => {
-    console.log("onAccept", element);
-    updateToLoading();
     payment.action({ submit_url: element == null ? void 0 : element.submitUrl });
   };
   const onPrintMerchantReceipt = (element) => {
-    console.log("onPrintMerchantReceipt", element);
     onChange("print", (element == null ? void 0 : element.receipt) ? [element == null ? void 0 : element.receipt] : []);
     setReceiptModalShow(true);
     setReceiptModalData(element == null ? void 0 : element.receipt);
   };
   const onPrintCustomerReceipt = (element) => {
-    console.log("onPrintCustomerReceipt", element);
     onChange("print", (element == null ? void 0 : element.receipt) ? [element == null ? void 0 : element.receipt] : []);
     setReceiptModalShow(true);
     setReceiptModalData(element == null ? void 0 : element.receipt);
   };
   const onRetry = (element) => {
-    console.log("onRetry", element);
     onChange("page", "pay");
+    const { customAction, ...restCustom } = custom || {};
     const _params = {
-      ...custom || {},
+      ...restCustom,
       // 自定义参数需要重新传递
       mode,
       name,
@@ -286,7 +286,6 @@ var AggregatePayment = ({ onChange }) => {
   };
   const onTransactionComplete = (element) => {
     var _a, _b, _c;
-    console.log("onTransactionComplete", element);
     const { paymentStatus, response, merchantReceipt, customerReceipt } = element._extra || {};
     if (paymentStatus === import_types.EPaymentStatus.Success) {
       const receipt = [];
@@ -326,7 +325,6 @@ var AggregatePayment = ({ onChange }) => {
     }
   };
   const onSubmitToAPI = (element, extra) => {
-    updateToLoading();
     const inputValues = (extra == null ? void 0 : extra.inputValues) || {};
     payment.action(
       { submit_url: element == null ? void 0 : element.submitUrl, payload: { ...inputValues } },
@@ -336,13 +334,38 @@ var AggregatePayment = ({ onChange }) => {
   const onNormalClick = (element, config) => {
     if (element == null ? void 0 : element.submitUrl) {
       console.log("onNormalClick_submit_url", element == null ? void 0 : element.submitUrl);
-      updateToLoading();
       payment.action({ submit_url: element == null ? void 0 : element.submitUrl }, config);
     } else {
       console.log("onNormalClick_no_submit_url", element);
     }
   };
+  const shouldLockElementClick = (element) => {
+    const lockKeys = [
+      import_types2.EButtonKeyType.DeclineSignature,
+      import_types2.EButtonKeyType.ApproveSignature,
+      import_types2.EButtonKeyType.RetryTransaction,
+      import_types2.EButtonKeyType.SubmitToAPI,
+      import_types2.EButtonKeyType.CallTestFunction
+    ];
+    return lockKeys.includes(element.key);
+  };
+  const lockElementClick = () => {
+    clickLockedRef.current = true;
+    clickUnlockTimerRef.current = setTimeout(() => {
+      clickLockedRef.current = false;
+      clickUnlockTimerRef.current = null;
+    }, 1e3);
+  };
   const onElementClick = (element, extra) => {
+    if (shouldLockElementClick(element)) {
+      if (clickLockedRef.current) {
+        import_payLog.default.log(`忽略重复点击${(element == null ? void 0 : element.key) || "未知"}按钮`);
+        return;
+      }
+      lockElementClick();
+      dispatch((0, import_store2.updateCustom)({ customAction: {} }));
+      updateToLoading();
+    }
     console.log("onElementClick", element, extra);
     import_payLog.default.log(`点击${(element == null ? void 0 : element.key) || "未知"}按钮`);
     switch (element.key) {
@@ -393,9 +416,9 @@ var AggregatePayment = ({ onChange }) => {
     import_Action.default,
     {
       data: custom == null ? void 0 : custom.customAction,
-      showMessage: status === import_const.StatusEnum.Loading,
       onClick: onElementClick,
-      cancelDisabled
+      cancelDisabled,
+      isLoading: status === import_const.StatusEnum.Loading
     }
   ) : null), receiptModalShow ? /* @__PURE__ */ import_react.default.createElement(
     import_materials.PisellModal,

package/lib/components/eftposPay/store/index.d.ts

@@ -299,8 +299,8 @@ export declare const backUpFree: (payload: Partial<State>) => {
         amount?: string | number | undefined;
         mode?: "pay" | "refund" | "fullPay" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "stripe" | "tyro" | "mx51" | "payo" | "windcave" | "linkly" | "huifu" | undefined;
-        action?: "pay" | "amount" | "deviceList" | undefined;
+        eftpos?: "stripe" | "tyro" | "windcave" | "mx51" | "payo" | "linkly" | "huifu" | undefined;
+        action?: "amount" | "pay" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | undefined;
         title?: string | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.6.66",
+  "version": "6.6.68",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -62,9 +62,9 @@
     "@react-spring/web": "^9.6.1",
     "@use-gesture/react": "^10.3.1",
     "@pisell/utils": "3.0.2",
-    "@pisell/date-picker": "3.0.7",
+    "@pisell/materials": "6.6.17",
     "@pisell/icon": "0.0.11",
-    "@pisell/materials": "6.6.17"
+    "@pisell/date-picker": "3.0.7"
   },
   "peerDependencies": {
     "react": "^18.0.0",