@pisell/private-materials 3.0.136 → 3.0.138

package/es/components/eftposPay/windcave/receiptAction.js

@@ -15,8 +15,16 @@ import { locales } from '@pisell/utils';
 import { Button } from 'antd';
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 import { StatusEnum } from "../const";
-import { useContextData, useDispatch, updateState, updateCustom, updateStatus, updateComponent } from "../store";
+import { useContextData, useDispatch, updateState, updateCustom, updateStatus } from "../store";
+import { useStoreRef } from "../hooks";
 import { StemTypeEnum, StepStatusEnum, getStepMapping } from "./const";
+
+/**
+ * @title: 按钮操作区
+ * @description: 仅包含签名
+ * @Author: hongbing.wang
+ * @Date: 2024-08-20 12:33
+ */
 export var ReceiptAction = function ReceiptAction(_ref) {
   var api = _ref.api,
     onChange = _ref.onChange;
@@ -24,7 +32,8 @@ export var ReceiptAction = function ReceiptAction(_ref) {
   var _useContextData = useContextData(),
     custom = _useContextData.custom,
     mode = _useContextData.mode;
-  var ref = useRef(custom === null || custom === void 0 ? void 0 : custom.number);
+  var _useStoreRef = useStoreRef(),
+    numRef = _useStoreRef.numRef;
   var listRef = useRef(custom === null || custom === void 0 ? void 0 : custom.list);
   var _useState = useState((custom === null || custom === void 0 ? void 0 : custom.receiptLoading) || false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -42,15 +51,20 @@ export var ReceiptAction = function ReceiptAction(_ref) {
   useEffect(function () {
     listRef.current = custom === null || custom === void 0 ? void 0 : custom.list;
   }, [custom === null || custom === void 0 ? void 0 : custom.list]);
-  useEffect(function () {
-    ref.current = custom === null || custom === void 0 ? void 0 : custom.number;
-  }, [custom === null || custom === void 0 ? void 0 : custom.number]);
+
+  /**
+   * @title: 确认签名
+   * @description: 确认签名 不阻碍-查询
+   * @return null
+   * @Author: hongbing.wang
+   * @Date: 2024-08-12 11:30
+   */
   var onAccept = function onAccept() {
     // 确认签名
     dispatch(updateStatus(StatusEnum.Loading));
     dispatch(updateCustom({
       list: listRef.current.map(function (item) {
-        return item.index === 7 ? _objectSpread(_objectSpread({}, item), {}, {
+        return item.index === StepStatusEnum.Receipt ? _objectSpread(_objectSpread({}, item), {}, {
           status: 'resolve'
         }) : item;
       })
@@ -61,12 +75,12 @@ export var ReceiptAction = function ReceiptAction(_ref) {
     setReceiptLoading(true);
     api.update({
       type: 'YES',
-      number: custom === null || custom === void 0 ? void 0 : custom.number
+      number: numRef.current
     }).then(function (res) {
       if (unloadRef.current) {
         return res;
       }
-      if (res && (res.code === 200 || res.code === '200')) {
+      if (res && "".concat(res.code) === '200') {
         setReceiptLoading(false);
         var current = listRef.current.map(function (item) {
           if (Number(item === null || item === void 0 ? void 0 : item.index) < StepStatusEnum.Wait) {
@@ -91,8 +105,7 @@ export var ReceiptAction = function ReceiptAction(_ref) {
         }
         dispatch(updateCustom({
           step: StepStatusEnum.Wait,
-          list: current,
-          isDeclineReceipt: false
+          list: current
         }));
         onChange(true);
         return res;
@@ -107,8 +120,7 @@ export var ReceiptAction = function ReceiptAction(_ref) {
           return item.index === StepStatusEnum.Receipt ? _objectSpread(_objectSpread({}, item), {}, {
             status: 'pedding'
           }) : item;
-        }),
-        isDeclineReceipt: false
+        })
       }));
       dispatch(updateState({
         title: locales.getText('page.eftpos-pay.text.waiting.signature') // 等待签名
@@ -119,6 +131,13 @@ export var ReceiptAction = function ReceiptAction(_ref) {
       onChange(false);
     });
   };
+
+  /**
+   * @title: 后退
+   * @description: 
+   * @Author: hongbing.wang
+   * @Date: 2024-08-20 12:34
+   */
   var onBack = function onBack() {
     dispatch(updateState({
       title: locales.getText('page.eftpos-pay.text.waiting.signature'),
@@ -129,6 +148,14 @@ export var ReceiptAction = function ReceiptAction(_ref) {
       receiptPage: 'receipt'
     }));
   };
+
+  /**
+   * @title: 取消签名
+   * @description: 取消签名 不阻碍-状态查询
+   * @return null
+   * @Author: hongbing.wang
+   * @Date: 2024-08-12 11:30
+   */
   var onConfirm = function onConfirm() {
     // 取消签名
     dispatch(updateState({
@@ -146,13 +173,13 @@ export var ReceiptAction = function ReceiptAction(_ref) {
     setReceiptLoading(true);
     api.update({
       type: 'NO',
-      number: custom === null || custom === void 0 ? void 0 : custom.number
+      number: numRef.current
     }).then(function (res) {
       if (unloadRef.current) {
         return res;
       }
       setReceiptLoading(false);
-      if (res && (res.code === 200 || res.code === '200')) {
+      if (res && "".concat(res.code) === '200') {
         // 取消接口
         var current = listRef.current.map(function (item) {
           if (Number(item === null || item === void 0 ? void 0 : item.index) === StepStatusEnum.Receipt) {
@@ -184,8 +211,7 @@ export var ReceiptAction = function ReceiptAction(_ref) {
         }
         dispatch(updateCustom({
           step: StepStatusEnum.Wait,
-          list: current,
-          isDeclineReceipt: true
+          list: current
         }));
         onChange(true);
         return res;
@@ -202,8 +228,7 @@ export var ReceiptAction = function ReceiptAction(_ref) {
           return item.index === StepStatusEnum.Receipt ? _objectSpread(_objectSpread({}, item), {}, {
             status: 'pedding'
           }) : item;
-        }),
-        isDeclineReceipt: false
+        })
       }));
       dispatch(updateState({
         title: locales.getText('page.eftpos-pay.text.waiting.signature') // 等待签名
@@ -213,13 +238,18 @@ export var ReceiptAction = function ReceiptAction(_ref) {
       setReceiptLoading(false);
     });
   };
+
+  /**
+   * @title: 前往取消签名
+   * @description: 前往取消签名确认流程
+   * @Author: hongbing.wang
+   * @Date: 2024-08-20 12:40
+   */
   var onDecline = function onDecline() {
     dispatch(updateState({
       title: locales.getText('page.eftpos-pay.text.signature.title'),
       // 'page.eftpos-pay.text.waiting.signature'), // 等待签名
-      status: StatusEnum.Warn
-    }));
-    dispatch(updateState({
+      status: StatusEnum.Warn,
       custom: _objectSpread(_objectSpread({}, custom), {}, {
         receiptPage: 'again'
       })
@@ -230,6 +260,7 @@ export var ReceiptAction = function ReceiptAction(_ref) {
       unloadRef.current = true;
     };
   }, []);
+  // 在 签名操作状态(确认/取消) 时 取消按钮
   if (receiptLoading) {
     return /*#__PURE__*/React.createElement("div", {
       className: "pisell-lowcode__eft-pay-step-item-btns"
@@ -239,6 +270,7 @@ export var ReceiptAction = function ReceiptAction(_ref) {
       disabled: true
     }, locales.getText('page.eftpos-pay.text.leave')));
   }
+  // 在 签名 常规操作项
   if (receiptPage === 'receipt') {
     return /*#__PURE__*/React.createElement("div", {
       className: "pisell-lowcode__eft-pay-step-item-btns"
@@ -253,6 +285,8 @@ export var ReceiptAction = function ReceiptAction(_ref) {
       onClick: onAccept
     }, locales.getText('page.eftpos-pay.text.accept')));
   }
+
+  // 在 取消签名 操作项目
   return /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__eft-pay-step-item-btns"
   }, /*#__PURE__*/React.createElement(Button, {
@@ -267,6 +301,13 @@ export var ReceiptAction = function ReceiptAction(_ref) {
     disabled: receiptLoading
   }, locales.getText('page.eftpos-pay.text.confirm.decline')));
 };
+
+/**
+ * @title: 按钮操作区
+ * @description: 不包含签名
+ * @Author: hongbing.wang
+ * @Date: 2024-08-20 12:32
+ */
 var Action = function Action(_ref2) {
   var index = _ref2.index,
     onCancel = _ref2.onCancel,
@@ -275,16 +316,26 @@ var Action = function Action(_ref2) {
   var _useContextData2 = useContextData(),
     custom = _useContextData2.custom,
     mode = _useContextData2.mode;
-  var onManually = function onManually() {
-    dispatch(updateState({
-      manual: {
-        title: locales.getText('page.eftpos-pay.text.request.title')(mode),
-        text: locales.getText('page.eftpos-pay.text.request.text')(mode)
-      }
-    }));
-    dispatch(updateComponent('Manual', true));
-  };
-  if (index < StepStatusEnum.Account) {
+
+  /**
+   * @title: 前往手动标记页
+   * @Author: hongbing.wang
+   * @Date: 2024-08-20 12:18
+   */
+  // const onManually = () => {
+  //   dispatch(
+  //     updateState({
+  //       manual: {
+  //         title: locales.getText('page.eftpos-pay.text.request.title')(mode),
+  //         text: locales.getText('page.eftpos-pay.text.request.text')(mode),
+  //       },
+  //     })
+  //   );
+  //   dispatch(updateComponent('Manual', true));
+  // };
+
+  // 在选择卡片应用之前 可取消支付
+  if (index < StepStatusEnum.Application) {
     return /*#__PURE__*/React.createElement("div", {
       className: "pisell-lowcode__eft-pay-step-item-btns"
     }, /*#__PURE__*/React.createElement(Button, {
@@ -294,7 +345,9 @@ var Action = function Action(_ref2) {
       disabled: disabled
     }, locales.getText('page.eftpos-pay.text.cancel')));
   }
-  if (index >= StepStatusEnum.Account && index < StepStatusEnum.Receipt) {
+
+  // 在选择卡片应用,和签名之间,不可进行用户操作
+  if (index >= StepStatusEnum.Application && index < StepStatusEnum.Receipt) {
     return /*#__PURE__*/React.createElement("div", {
       className: "pisell-lowcode__eft-pay-step-item-btns"
     }, /*#__PURE__*/React.createElement(Button, {
@@ -303,24 +356,19 @@ var Action = function Action(_ref2) {
       disabled: true
     }, locales.getText('page.eftpos-pay.text.leave')));
   }
+
+  // 签名期间 渲染 ReceiptAction 组件
   if (index === StepStatusEnum.Receipt) {
     return null;
   }
-  if (custom !== null && custom !== void 0 && custom.isDeclineReceipt) {
-    /*#__PURE__*/React.createElement("div", {
-      className: "pisell-lowcode__eft-pay-step-item-btns"
-    }, /*#__PURE__*/React.createElement(Button, {
-      block: true,
-      className: "pisell-lowcode__eft-pay-step-item-btn",
-      disabled: true
-    }, locales.getText('page.eftpos-pay.text.leave')));
-  }
+
+  // 其他场景 可前往 标记签名页
   return /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__eft-pay-step-item-btns"
   }, /*#__PURE__*/React.createElement(Button, {
     block: true,
     className: "pisell-lowcode__eft-pay-step-item-btn",
-    onClick: onManually
-  }, locales.getText('page.eftpos-pay.text.manual.marking')));
+    disabled: true
+  }, locales.getText('page.eftpos-pay.text.leave')));
 };
 export default Action;

package/es/components/eftposPay/windcave/timer.d.ts

@@ -1,3 +1,10 @@
+/**
+ * @title: 定时,轮询
+ * @description:  双层 proxy , 1. 轮询 2. 定时 关闭轮询 ,特殊状态码,前端  701001 超时关闭 -1  外部用户关闭
+ * @return null
+ * @Author: hongbing.wang
+ * @Date: 2024-08-12 11:25
+ */
 export default class XhrTimer {
     clearTimeout: number;
     isTimeoutClose: boolean;
@@ -10,8 +17,13 @@ export default class XhrTimer {
     constructor({ xhr, timeout, callback, max, }: {
         xhr: (...agrn: unknown[]) => Promise<unknown>;
         timeout: number;
-        callback: (...agrn: unknown[]) => unknown;
+        callback: (...agrn: any[]) => unknown;
         max?: number;
     });
+    /**
+     * @title: 关闭 循环
+     * @Author: hongbing.wang
+     * @Date: 2024-08-20 12:48
+     */
     close(): void;
 }

package/es/components/eftposPay/windcave/timer.js

@@ -13,6 +13,14 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 import { PayStatus } from "../const";
 import { sleep, getUuid } from "../helper";
 var MaxTime = 5000;
+
+/**
+ * @title: 定时,轮询
+ * @description:  双层 proxy , 1. 轮询 2. 定时 关闭轮询 ,特殊状态码,前端  701001 超时关闭 -1  外部用户关闭
+ * @return null
+ * @Author: hongbing.wang
+ * @Date: 2024-08-12 11:25
+ */
 var XhrTimer = /*#__PURE__*/function () {
   function XhrTimer(_ref) {
     var xhr = _ref.xhr,
@@ -34,6 +42,7 @@ var XhrTimer = /*#__PURE__*/function () {
     this.num = getUuid();
     // eslint-disable-next-line @typescript-eslint/no-this-alias
     var self = this;
+    // 此处 使用 Proxy 循环发送 被代理函数,直到用户关闭,其中在循环过程中 设置上限去对函数执行间隔进行限制
     var xhrApi = new Proxy(xhr, {
       apply: function apply(target, ctx, agrns) {
         return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
@@ -86,7 +95,7 @@ var XhrTimer = /*#__PURE__*/function () {
                 result = _context.sent;
               case 12:
                 currentTime = Date.now();
-                diff = currentTime - laster;
+                diff = currentTime - laster; // 未到执行时长上限 则进入等待 直到执行时长上限 进行下一步行为
                 if (!(self.flag && diff < max)) {
                   _context.next = 17;
                   break;
@@ -106,6 +115,8 @@ var XhrTimer = /*#__PURE__*/function () {
         }))();
       }
     });
+
+    // 此处使用 Proxy 对 被代理函数,执行整体计时处理, 当到达执行时长上限 则将上述循环中断,并返回结果 
     this.run = new Proxy(xhrApi, {
       apply: function apply(target, ctx, agrns) {
         return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
@@ -164,6 +175,12 @@ var XhrTimer = /*#__PURE__*/function () {
       }
     });
   }
+
+  /**
+   * @title: 关闭 循环
+   * @Author: hongbing.wang
+   * @Date: 2024-08-20 12:48
+   */
   _createClass(XhrTimer, [{
     key: "close",
     value: function close() {

package/es/components/eftposPay/windcave/windcave.d.ts

@@ -1,6 +1,7 @@
 import React from 'react';
-declare const _default: ({ api, onChange }: {
+declare const _default: ({ api, onChange, formatAmount, }: {
     api: any;
     onChange: any;
+    formatAmount(amount: number | string, precision: number, symbol: string): string;
 }) => React.JSX.Element;
 export default _default;