@pisell/private-materials 3.0.136 → 3.0.138

package/es/components/eftposPay/index.js

@@ -1,5 +1,5 @@
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-var _excluded = ["action", "getApi", "device_number", "terminal"];
+var _excluded = ["action", "getApi", "device_number", "terminal", "tyroUrl", "tyroVersion", "onChangeParams"];
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 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; }
@@ -15,7 +15,7 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 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; }
 /* eslint-disable react/destructuring-assignment */
 import { locales } from '@pisell/utils';
-import React, { useEffect, useState, useMemo, useRef } from 'react';
+import React, { useEffect, useState, useMemo, useRef, useCallback } from 'react';
 import { useNetwork } from 'ahooks';
 import useEngineContext from "../../hooks/useEngineContext";
 import Amount from "./amount";
@@ -24,7 +24,7 @@ import Device from "./device";
 import localeTexts from "./locales";
 import { getInitState } from "./manufacturer";
 import Pay from "./pay";
-import { Provider, useContextData } from "./store";
+import { Provider, useContextData, useDispatch, updateState } from "./store";
 import "./index.less";
 locales.init(localeTexts, localStorage.getItem('umi_locale') || 'en');
 var App = function App(_ref) {
@@ -33,15 +33,17 @@ var App = function App(_ref) {
     getApi = _ref.getApi,
     device_number = _ref.device_number,
     terminal = _ref.terminal,
+    tyroUrl = _ref.tyroUrl,
+    tyroVersion = _ref.tyroVersion,
+    onChangeParams = _ref.onChangeParams,
     props = _objectWithoutProperties(_ref, _excluded);
   var data = useContextData();
-  var ref = useRef(false);
+  var dispatch = useDispatch();
   var _useState = useState(action),
     _useState2 = _slicedToArray(_useState, 2),
     current = _useState2[0],
     setCurrent = _useState2[1];
   var statusRef = useRef(data.status);
-  var actRef = useRef(action);
   var context = useEngineContext();
   var _ref2 = ((_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils) || {
       formatAmount: function formatAmount(number, precision, symbol) {
@@ -53,12 +55,17 @@ var App = function App(_ref) {
     },
     formatAmount = _ref2.formatAmount,
     isTerminal = _ref2.isTerminal;
+
+  // 外部网络数据
   var network = useMemo(function () {
     return typeof terminal.network === 'boolean' ? terminal.network : true;
   }, [terminal === null || terminal === void 0 ? void 0 : terminal.network]);
+  // 内部网络数据
   var _useNetwork = useNetwork(),
     online = _useNetwork.online;
   var netRef = useRef([network, online]);
+
+  // 网络数据
   var net = useMemo(function () {
     var networkChange = false,
       onlineChange = false;
@@ -81,6 +88,12 @@ var App = function App(_ref) {
   var isIpad = useMemo(function () {
     return isTerminal && isTerminal();
   }, [isTerminal]);
+
+  /**
+   * @title: api 接口 数据
+   * @Author: hongbing.wang
+   * @Date: 2024-08-20 13:10
+   */
   var api = useMemo(function () {
     if (typeof getApi === 'function') {
       return getApi();
@@ -88,20 +101,51 @@ var App = function App(_ref) {
     return {};
   }, [getApi]);
 
-  // 切换
-  var onChange = function onChange(status, params) {
+  /**
+   * @title: 缓存状态数据 可以用于闪退,成功or失败时清除缓存
+   * @Author: hongbing.wang
+   * @Date: 2024-08-20 10:27
+   */
+  useEffect(function () {
+    onChangeParams && onChangeParams(_objectSpread(_objectSpread(_objectSpread({}, data), data.eftpos === 'tyro' ? {
+      custom: _objectSpread(_objectSpread({}, data.custom), {}, {
+        btnList: [],
+        list: []
+      })
+    } : {}), {}, {
+      form: 'restore'
+    }));
+  }, [data, onChangeParams]);
+
+  /**
+   * @title: 支付状态切换页
+   * @Author: hongbing.wang
+   * @Date: 2024-08-20 13:10
+   */
+  var onChange = useCallback(function (status, params) {
     if (status === 'page' && typeof params === 'string') {
       if (['amount', 'deviceList', 'pay'].includes(params)) {
         setCurrent(params);
+        dispatch(updateState({
+          action: params
+        }));
       }
     }
     console.log('状态切换 = ', status, params);
     props.onChangeStatus(status, params);
-  };
+  }, []);
 
-  // 成功失败
+  /**
+   * @title: 支付失败
+   * @Author: hongbing.wang
+   * @Date: 2024-08-20 13:09
+   */
   var onClose = function onClose() {
-    onChange('fail');
+    onChange('fail', {
+      number: data.number,
+      device: data.device,
+      order_id: data.order_id
+    });
   };
   if (current === RouteEnum.DeviceList) {
     return /*#__PURE__*/React.createElement(Device, {
@@ -126,11 +170,14 @@ var App = function App(_ref) {
   }
   return /*#__PURE__*/React.createElement(Pay, {
     api: api,
+    tyroUrl: tyroUrl,
+    tyroVersion: tyroVersion,
     onChange: onChange,
     className: isIpad ? 'pisell-lowcode__eft-pay-terminal' : '',
     terminal: terminal,
     isIpad: isIpad,
-    net: net
+    net: net,
+    formatAmount: formatAmount
   });
 };
 export default (function (props) {
@@ -140,31 +187,34 @@ export default (function (props) {
       store: {}
     },
     store = _ref3.store;
+  var symbol = (store === null || store === void 0 ? void 0 : (_store$getState = store.getState) === null || _store$getState === void 0 ? void 0 : (_store$getState$call = _store$getState.call(store)) === null || _store$getState$call === void 0 ? void 0 : (_store$getState$call$ = _store$getState$call.global) === null || _store$getState$call$ === void 0 ? void 0 : _store$getState$call$.symbol) || '$';
   var mode = useMemo(function () {
+    if (props.source === 'restore') {
+      if (props.params) {
+        if (props.params.mode) {
+          return props.params.mode;
+        }
+      }
+      return ModeEnum.Pay;
+    }
     if (props.mode) {
       return props.mode;
     }
     return ModeEnum.Pay;
-  }, [props.mode]);
-  var action = useMemo(function () {
-    if (mode === ModeEnum.Pay) {
-      return RouteEnum.DeviceList;
-    }
-    if (mode === ModeEnum.Refund) {
-      return RouteEnum.DeviceList;
-    }
-    if (mode === ModeEnum.Query) {
-      return RouteEnum.Pay;
-    }
-    throw Error('未知模式');
-  }, [mode]);
-  var symbol = (store === null || store === void 0 ? void 0 : (_store$getState = store.getState) === null || _store$getState === void 0 ? void 0 : (_store$getState$call = _store$getState.call(store)) === null || _store$getState$call === void 0 ? void 0 : (_store$getState$call$ = _store$getState$call.global) === null || _store$getState$call$ === void 0 ? void 0 : _store$getState$call$.symbol) || '$';
-  var onChangeStatus = function onChangeStatus(status, params) {
-    props.onChangeStatus(status, params);
-  };
+  }, [props.mode, props.source, props.params]);
+
+  /**
+   * @title: 构建全局状态
+   * @description: 1. 初始化, 2. 恢复
+   * @Author: hongbing.wang
+   * @Date: 2024-08-20 13:11
+   */
   var state = useMemo(function () {
     var current = props.params && props.params.symbol ? props.params.symbol : symbol;
-    console.log('current 单位 = ', props.params.symbol, symbol);
+    // console.log('current 单位 = ', props.params.symbol, symbol);
+    if (props.source === 'restore') {
+      return props.params;
+    }
     return getInitState(props.type, props.params ? _objectSpread(_objectSpread({
       mode: mode
     }, props.params), {}, {
@@ -174,9 +224,45 @@ export default (function (props) {
       symbol: current
     });
   }, [mode, props.params, props.type, symbol]);
-  useEffect(function () {
-    document.body.id = 'body';
+  var onChangeStatus = useCallback(function (status, params) {
+    props.onChangeStatus(status, params);
   }, []);
+  var action = useMemo(function () {
+    var act = function () {
+      if (state.action) {
+        return state.action;
+      }
+      if (mode === ModeEnum.Pay) {
+        if (state.device && state.pay) {
+          return RouteEnum.Pay;
+        }
+        if (state.device) {
+          return RouteEnum.Amount;
+        }
+        return RouteEnum.DeviceList;
+      }
+      if (mode === ModeEnum.Refund) {
+        if (state.device) {
+          return RouteEnum.Pay;
+        }
+        return RouteEnum.DeviceList;
+      }
+      if (mode === ModeEnum.Query) {
+        return RouteEnum.Pay;
+      }
+      throw Error('未知模式');
+    }();
+    if (props.source === 'restore') {
+      onChangeStatus('page', act);
+    }
+    return act;
+  }, [mode, state]);
+
+  // useEffect(() => {
+  //   document.body.id = 'body';
+  // }, []);
+
+  // console.log('action = ', action);
   console.log('props?.params?.device_number = ', props === null || props === void 0 ? void 0 : (_props$params = props.params) === null || _props$params === void 0 ? void 0 : _props$params.device_number);
   return /*#__PURE__*/React.createElement(Provider, {
     state: state
@@ -185,7 +271,9 @@ export default (function (props) {
     params: props.params,
     onChangeStatus: onChangeStatus,
     terminal: props.terminal,
+    onChangeParams: props.onChangeParams,
     action: action,
+    source: props.source,
     device_number: props === null || props === void 0 ? void 0 : (_props$params2 = props.params) === null || _props$params2 === void 0 ? void 0 : _props$params2.device_number
   }));
 });

package/es/components/eftposPay/index.less

@@ -1,17 +1,17 @@
-@import  './var.less';
+@import './var.less';
 
 .pisell-lowcode__eft-pay-amount {
   display: flex;
   flex-direction: column;
 }
 
-//
 .pisell-lowcode__eft-pay-step-box {
   display: flex;
   flex-direction: column;
   gap: 4;
   margin: 4px 0;
 }
+.pisell-lowcode__eft-pay-sub-title,
 .pisell-lowcode__eft-pay-step-item,
 .pisell-lowcode__eft-pay-step-item-success {
   color: var(--gray-true-900, #141414);
@@ -19,6 +19,8 @@
   font-style: normal;
   font-weight: 400;
   line-height: 20px; /* 142.857% */
+
+  white-space: pre-line;
 }
 .pisell-lowcode__eft-pay-step-item-icon {
   vertical-align: middle;
@@ -30,7 +32,7 @@
 }
 .pisell-lowcode__eft-pay-step-item-loading {
   color: var(--gray-500, #667085);
-  
+
   font-size: 14px;
   font-style: normal;
   font-weight: 400;
@@ -39,7 +41,7 @@
 .pisell-lowcode__eft-pay-step-item-tip {
   color: var(--gray-500, #667085);
   /* Text sm/Regular */
-  
+
   font-size: 14px;
   font-style: normal;
   font-weight: 400;
@@ -56,9 +58,6 @@
   height: 48px !important;
 }
 
- 
- 
-
 .pisell-lowcode__eft-pay-amount-body {
   gap: 20px;
   display: flex;
@@ -86,7 +85,7 @@
 .pisell-lowcode__eft-pay-money-title {
   color: var(--Gray-700, #344054);
   /* Text sm/Semibold */
-  
+
   font-size: 14px;
   font-style: normal;
   font-weight: 600;
@@ -95,7 +94,7 @@
 .pisell-lowcode__eft-pay-money-tip {
   color: var(--Gray-600, #475467);
   /* Text sm/Regular */
-  
+
   font-size: 14px;
   font-style: normal;
   font-weight: 400;
@@ -116,7 +115,7 @@
 .pisell-lowcode__eft-pay-total {
   color: var(--Gray-900, #101828);
   /* Text sm/Regular */
-  
+
   font-size: 14px;
   font-style: normal;
   font-weight: 400;
@@ -125,7 +124,7 @@
 .pisell-lowcode__eft-pay-money {
   color: var(--Gray-900, #101828);
   /* Text sm/Regular */
-  
+
   font-size: 14px;
   font-style: normal;
   font-weight: 400;
@@ -148,7 +147,7 @@
 
   color: var(--Warning-700, #b54708);
   /* Text sm/Semibold */
-  
+
   font-size: 14px;
   font-style: normal;
   font-weight: 600;
@@ -183,7 +182,7 @@
   color: var(--Gray-700, #344054);
 
   /* Text sm/Semibold */
-  
+
   font-size: 14px;
   font-style: normal;
   font-weight: 600;
@@ -207,7 +206,7 @@
 .pisell-lowcode__eft-pay-warn-title {
   color: var(--gray-900, #101828);
   /* Text lg/Semibold */
-  
+
   font-size: 18px;
   font-style: normal;
   font-weight: 600;
@@ -218,28 +217,28 @@
 .pisell-lowcode__eft-pay-warn-text {
   color: var(--error-600, #d92d20);
   /* Text sm/Regular */
-  
+
   font-size: 14px;
   font-style: normal;
   font-weight: 400;
   line-height: 20px; /* 142.857% */
-}
 
+  white-space: pre-line;
+}
 
 .pisell-lowcode__eft-pay-step-item-resolve {
   color: var(--gray-true-900, #141414);
-  
+
   font-size: 14px;
   font-style: normal;
   font-weight: 400;
   line-height: 20px; /* 142.857% */
 }
-.pisell-lowcode__eft-pay-manual-btn{
+.pisell-lowcode__eft-pay-manual-btn {
   // height: ;
   height: 48px !important;
 }
 
-
 .pisell-lowcode__eft-pay-box {
   max-height: var(--pisel-lc-pos-pay-max-height, unset);
   width: var(--pisel-lc-pos-pay-width, 600px);
@@ -261,3 +260,12 @@
   flex-direction: column;
 }
 
+.pisell-lowcode__eft-pay-tyro-text {
+  color: var(--Gray-900, #101828);
+  /* Text sm/Regular */
+  font-size: 14px;
+  font-style: normal;
+  font-weight: 400;
+  line-height: 20px; /* 142.857% */
+  padding: 0 0 12px 0;
+}

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

@@ -30,6 +30,13 @@ declare const _default: {
         'page.eftpos-pay.text.accept': string;
         'page.eftpos-pay.text.decline': string;
         'page.eftpos-pay.text.manual.marking': string;
+        'page.eftpos-pay.text.manual.title': string;
+        'page.eftpos-pay.text.manual.subtitle': (money: string) => string;
+        'page.eftpos-pay.text.manual.confirm': string;
+        'page.eftpos-pay.text.manual.btn.confirm': (money: string) => string;
+        'page.eftpos-pay.text.manual.diff': string;
+        'page.eftpos-pay.text.manual.tip': string;
+        'page.eftpos-pay.text.manual.cancel': string;
         'page.eftpos-pay.text.modify.payment.info': (mode: string) => "Modify payment info" | "Modify refund information";
         'page.eftpos-pay.text.successful': (mode: string) => string;
         'page.eftpos-pay.text.failed': (mode: string) => string;
@@ -58,6 +65,12 @@ declare const _default: {
         'page.eftpos-pay.text.surcharge.edit.rate': string;
         'page.eftpos-pay.text.surcharge.edit.surcharge': string;
         'page.eftpos-pay.text.transaction.end': string;
+        'page.eftpos-pay.text.transaction.user.declined.title': string;
+        'page.eftpos-pay.text.transaction.user.declined.text': string;
+        'page.eftpos-pay.text.transaction.user.config.title': string;
+        'page.eftpos-pay.text.transaction.user.config.text': string;
+        'page.eftpos-pay.text.transaction.back.declined.title': string;
+        'page.eftpos-pay.text.transaction.back.declined.text': string;
         'page.eftpos-pay.text.transaction.fail': string;
         'page.eftpos-pay.text.transaction.fail.timeout': string;
         'page.eftpos-pay.text.transaction.pay.fail.timeout': string;
@@ -85,6 +98,8 @@ declare const _default: {
         'page.eftpos-pay.text.reconnect.network': string;
         'page.eftpos-pay.text.network.disconnected': string;
         'page.eftpos-pay.text.not.connected': string;
+        'page.eftpos-pay.text.tyro-btn': (key: string) => string;
+        'page.eftpos-pay.text.tyro': (key: string) => string;
     };
     'zh-CN': {
         'page.eftpos-pay.text.loading': (mode: string) => string;
@@ -117,6 +132,13 @@ declare const _default: {
         'page.eftpos-pay.text.accept': string;
         'page.eftpos-pay.text.decline': string;
         'page.eftpos-pay.text.manual.marking': string;
+        'page.eftpos-pay.text.manual.title': string;
+        'page.eftpos-pay.text.manual.subtitle': (money: string) => string;
+        'page.eftpos-pay.text.manual.confirm': string;
+        'page.eftpos-pay.text.manual.btn.confirm': (money: string) => string;
+        'page.eftpos-pay.text.manual.diff': string;
+        'page.eftpos-pay.text.manual.tip': string;
+        'page.eftpos-pay.text.manual.cancel': string;
         'page.eftpos-pay.text.modify.payment.info': (mode: string) => "修改支付信息" | "修改退款信息";
         'page.eftpos-pay.text.successful': (mode: string) => string;
         'page.eftpos-pay.text.failed': (mode: string) => string;
@@ -145,6 +167,12 @@ declare const _default: {
         'page.eftpos-pay.text.surcharge.edit.rate': string;
         'page.eftpos-pay.text.surcharge.edit.surcharge': string;
         'page.eftpos-pay.text.transaction.end': string;
+        'page.eftpos-pay.text.transaction.user.declined.title': string;
+        'page.eftpos-pay.text.transaction.user.declined.text': string;
+        'page.eftpos-pay.text.transaction.user.config.title': string;
+        'page.eftpos-pay.text.transaction.user.config.text': string;
+        'page.eftpos-pay.text.transaction.back.declined.title': string;
+        'page.eftpos-pay.text.transaction.back.declined.text': string;
         'page.eftpos-pay.text.transaction.fail': string;
         'page.eftpos-pay.text.transaction.fail.timeout': string;
         'page.eftpos-pay.text.transaction.pay.fail.timeout': string;
@@ -172,6 +200,8 @@ declare const _default: {
         'page.eftpos-pay.text.reconnect.network': string;
         'page.eftpos-pay.text.network.disconnected': string;
         'page.eftpos-pay.text.not.connected': string;
+        'page.eftpos-pay.text.tyro-btn': (key: string) => string;
+        'page.eftpos-pay.text.tyro': (key: string) => string | string[];
     };
     'zh-HK': {
         'page.eftpos-pay.text.loading': (mode: string) => string;
@@ -204,6 +234,13 @@ declare const _default: {
         'page.eftpos-pay.text.accept': string;
         'page.eftpos-pay.text.decline': string;
         'page.eftpos-pay.text.manual.marking': string;
+        'page.eftpos-pay.text.manual.title': string;
+        'page.eftpos-pay.text.manual.subtitle': (money: string) => string;
+        'page.eftpos-pay.text.manual.confirm': string;
+        'page.eftpos-pay.text.manual.btn.confirm': (money: string) => string;
+        'page.eftpos-pay.text.manual.diff': string;
+        'page.eftpos-pay.text.manual.tip': string;
+        'page.eftpos-pay.text.manual.cancel': string;
         'page.eftpos-pay.text.modify.payment.info': (mode: string) => "修改支付信息" | "修改退款信息";
         'page.eftpos-pay.text.successful': (mode: string) => string;
         'page.eftpos-pay.text.failed': (mode: string) => string;
@@ -232,6 +269,12 @@ declare const _default: {
         'page.eftpos-pay.text.surcharge.edit.rate': string;
         'page.eftpos-pay.text.surcharge.edit.surcharge': string;
         'page.eftpos-pay.text.transaction.end': string;
+        'page.eftpos-pay.text.transaction.user.declined.title': string;
+        'page.eftpos-pay.text.transaction.user.declined.text': string;
+        'page.eftpos-pay.text.transaction.user.config.title': string;
+        'page.eftpos-pay.text.transaction.user.config.text': string;
+        'page.eftpos-pay.text.transaction.back.declined.title': string;
+        'page.eftpos-pay.text.transaction.back.declined.text': string;
         'page.eftpos-pay.text.transaction.fail': string;
         'page.eftpos-pay.text.transaction.fail.timeout': string;
         'page.eftpos-pay.text.transaction.pay.fail.timeout': string;
@@ -259,6 +302,8 @@ declare const _default: {
         'page.eftpos-pay.text.reconnect.network': string;
         'page.eftpos-pay.text.network.disconnected': string;
         'page.eftpos-pay.text.not.connected': string;
+        'page.eftpos-pay.text.tyro-btn': (key: string) => string;
+        'page.eftpos-pay.text.tyro': (key: string) => string | string[];
     };
 };
 export default _default;