@pisell/private-materials 3.0.139 → 3.0.140

package/es/components/eftpos/deviceList/index.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+declare const _default: ({ input, ...formItemProps }: any) => React.JSX.Element;
+export default _default;

package/es/components/eftpos/deviceList/index.js

@@ -0,0 +1,52 @@
+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 = ["input"],
+  _excluded2 = ["input"];
+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(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; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+import React, { useMemo } from 'react';
+import { Form } from 'antd';
+import { CheckboxGroup } from "../group";
+var DeviceList = function DeviceList(props) {
+  var _Form$useForm = Form.useForm(),
+    _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
+    form = _Form$useForm2[0];
+  var list = props.list,
+    onChange = props.onChange; //value 是form表单中"name"对应的字段值
+  console.log(list);
+  var onValuesChange = function onValuesChange() {
+    var val = Object.values(form.getFieldsValue()).flat();
+    onChange(val);
+  };
+  var initialValues = useMemo(function () {
+    return list.reduce(function (target, item) {
+      var _item$input, _item$input2;
+      return _objectSpread(_objectSpread({}, target), {}, _defineProperty({}, item.name, (item === null || item === void 0 ? void 0 : (_item$input = item.input) === null || _item$input === void 0 ? void 0 : _item$input.value) || (item === null || item === void 0 ? void 0 : (_item$input2 = item.input) === null || _item$input2 === void 0 ? void 0 : _item$input2.defaultValue)));
+    }, {});
+  }, [list]);
+  return /*#__PURE__*/React.createElement(Form, {
+    layout: "vertical",
+    onValuesChange: onValuesChange,
+    form: form,
+    initialValues: initialValues
+  }, list.map(function (_ref) {
+    var input = _ref.input,
+      formItemProps = _objectWithoutProperties(_ref, _excluded);
+    return /*#__PURE__*/React.createElement(Form.Item, formItemProps, /*#__PURE__*/React.createElement(CheckboxGroup, input));
+  }));
+};
+export default (function (_ref2) {
+  var input = _ref2.input,
+    formItemProps = _objectWithoutProperties(_ref2, _excluded2);
+  return /*#__PURE__*/React.createElement(Form.Item, formItemProps, /*#__PURE__*/React.createElement(DeviceList, input));
+});

package/es/components/eftpos/form/index.js

@@ -1,78 +1,24 @@
-var _excluded = ["direction", "options"],
-  _excluded2 = ["label", "value"],
-  _excluded3 = ["direction", "options"],
-  _excluded4 = ["label", "value"],
-  _excluded5 = ["__sourceName", "Component"],
-  _excluded6 = ["input"],
-  _excluded7 = ["input"];
+var _excluded = ["__sourceName", "Component"],
+  _excluded2 = ["input"],
+  _excluded3 = ["input"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 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); }
 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; }
 import React from 'react';
-import { Input, InputNumber, Checkbox, Radio, Cascader, DatePicker, Select, Slider, Switch, TimePicker, Transfer, TreeSelect, Upload, Form, Space } from 'antd';
+import { Input, InputNumber, Checkbox, Radio, Cascader, DatePicker, Select, Slider, Switch, TimePicker, Transfer, TreeSelect, Upload, Form } from 'antd';
+import { CheckboxGroup, RadioGroup } from "../group";
 import Surcharge, { getCommName, getCommDefaultVal } from "../surcharge";
+import DeviceList from "../deviceList";
 
 // 通用表单配置
 var Mapping = {
   Input: Input,
   InputNumber: InputNumber,
   Checkbox: Checkbox,
-  'Checkbox.Group': function CheckboxGroup(_ref) {
-    var direction = _ref.direction,
-      options = _ref.options,
-      props = _objectWithoutProperties(_ref, _excluded);
-    if (direction === 'vertical') {
-      return /*#__PURE__*/React.createElement(Checkbox.Group, props, /*#__PURE__*/React.createElement(Space, {
-        direction: direction
-      }, options === null || options === void 0 ? void 0 : options.map(function (item) {
-        if (_typeof(item) === 'object') {
-          var label = item.label,
-            value = item.value,
-            other = _objectWithoutProperties(item, _excluded2);
-          return /*#__PURE__*/React.createElement(Checkbox, _extends({}, other, {
-            value: value,
-            key: "".concat(item.value)
-          }), label);
-        }
-        return /*#__PURE__*/React.createElement(Checkbox, {
-          value: item,
-          key: "".concat(item)
-        }, item);
-      })));
-    }
-    return /*#__PURE__*/React.createElement(Checkbox.Group, _extends({}, props, {
-      options: options
-    }));
-  },
+  'Checkbox.Group': CheckboxGroup,
   Radio: Radio,
-  'Radio.Group': function RadioGroup(_ref2) {
-    var direction = _ref2.direction,
-      options = _ref2.options,
-      props = _objectWithoutProperties(_ref2, _excluded3);
-    if (direction === 'vertical') {
-      return /*#__PURE__*/React.createElement(Radio.Group, props, /*#__PURE__*/React.createElement(Space, {
-        direction: "vertical"
-      }, options === null || options === void 0 ? void 0 : options.map(function (item) {
-        if (_typeof(item) === 'object') {
-          var label = item.label,
-            value = item.value,
-            other = _objectWithoutProperties(item, _excluded4);
-          return /*#__PURE__*/React.createElement(Radio, _extends({}, other, {
-            value: value,
-            key: "".concat(item.value)
-          }), label);
-        }
-        return /*#__PURE__*/React.createElement(Radio, {
-          value: item,
-          key: "".concat(item)
-        }, item);
-      })));
-    }
-    return /*#__PURE__*/React.createElement(Radio.Group, _extends({}, props, {
-      options: options
-    }));
-  },
+  'Radio.Group': RadioGroup,
   'Radio.Button': Radio.Button,
   Cascader: Cascader,
   DatePicker: DatePicker,
@@ -85,7 +31,8 @@ var Mapping = {
   Upload: Upload
 };
 var CustomMapping = {
-  Surcharge: Surcharge
+  Surcharge: Surcharge,
+  DeviceList: DeviceList
 };
 
 /**
@@ -93,15 +40,15 @@ var CustomMapping = {
  * @Author: hongbing.wang
  * @Date: 2024-08-20 13:21
  */
-var CustomFormItem = function CustomFormItem(_ref3) {
-  var formItemList = _ref3.formItemList,
-    _ref3$level = _ref3.level,
-    level = _ref3$level === void 0 ? 0 : _ref3$level,
-    onChange = _ref3.onChange;
-  return /*#__PURE__*/React.createElement(React.Fragment, null, formItemList.map(function (_ref4, index) {
-    var __sourceName = _ref4.__sourceName,
-      Component = _ref4.Component,
-      item = _objectWithoutProperties(_ref4, _excluded5);
+var CustomFormItem = function CustomFormItem(_ref) {
+  var formItemList = _ref.formItemList,
+    _ref$level = _ref.level,
+    level = _ref$level === void 0 ? 0 : _ref$level,
+    onChange = _ref.onChange;
+  return /*#__PURE__*/React.createElement(React.Fragment, null, formItemList.map(function (_ref2, index) {
+    var __sourceName = _ref2.__sourceName,
+      Component = _ref2.Component,
+      item = _objectWithoutProperties(_ref2, _excluded);
     if (Array.isArray(item.children)) {
       return /*#__PURE__*/React.createElement(CustomFormItem, {
         formItemList: item.children,
@@ -118,7 +65,7 @@ var CustomFormItem = function CustomFormItem(_ref3) {
     if (Mapping[Component]) {
       var Comm = Mapping[Component];
       var input = item.input,
-        formItemProps = _objectWithoutProperties(item, _excluded6);
+        formItemProps = _objectWithoutProperties(item, _excluded2);
       return /*#__PURE__*/React.createElement(Form.Item, _extends({}, formItemProps, {
         key: item.name + level
       }), /*#__PURE__*/React.createElement(Comm, input));
@@ -126,7 +73,7 @@ var CustomFormItem = function CustomFormItem(_ref3) {
     if (Mapping[Component]) {
       var _Comm = Mapping[Component];
       var _input = item.input,
-        _formItemProps = _objectWithoutProperties(item, _excluded7);
+        _formItemProps = _objectWithoutProperties(item, _excluded3);
       return /*#__PURE__*/React.createElement(Form.Item, _extends({}, _formItemProps, {
         key: item.name + level
       }), /*#__PURE__*/React.createElement(_Comm, _input));

package/es/components/eftpos/group/index.d.ts

@@ -0,0 +1,7 @@
+import React from 'react';
+import { RadioGroupProps } from 'antd';
+export declare const CheckboxGroup: ({ direction, options, ...props }: any) => React.JSX.Element;
+export declare const RadioGroup: ({ direction, options, component, ...props }: RadioGroupProps & {
+    direction?: "vertical" | undefined;
+    component: string;
+}) => React.JSX.Element;

package/es/components/eftpos/group/index.js

@@ -0,0 +1,65 @@
+var _excluded = ["direction", "options"],
+  _excluded2 = ["label", "value"],
+  _excluded3 = ["direction", "options", "component"],
+  _excluded4 = ["label", "value"];
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+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); }
+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; }
+import React from 'react';
+import { Checkbox, Radio, Space } from 'antd';
+export var CheckboxGroup = function CheckboxGroup(_ref) {
+  var direction = _ref.direction,
+    options = _ref.options,
+    props = _objectWithoutProperties(_ref, _excluded);
+  if (direction === 'vertical') {
+    return /*#__PURE__*/React.createElement(Checkbox.Group, props, /*#__PURE__*/React.createElement(Space, {
+      direction: direction
+    }, options === null || options === void 0 ? void 0 : options.map(function (item) {
+      if (_typeof(item) === 'object') {
+        var label = item.label,
+          value = item.value,
+          other = _objectWithoutProperties(item, _excluded2);
+        return /*#__PURE__*/React.createElement(Checkbox, _extends({}, other, {
+          value: value,
+          key: "".concat(item.value)
+        }), label);
+      }
+      return /*#__PURE__*/React.createElement(Checkbox, {
+        value: item,
+        key: "".concat(item)
+      }, item);
+    })));
+  }
+  return /*#__PURE__*/React.createElement(Checkbox.Group, _extends({}, props, {
+    options: options
+  }));
+};
+export var RadioGroup = function RadioGroup(_ref2) {
+  var direction = _ref2.direction,
+    options = _ref2.options,
+    component = _ref2.component,
+    props = _objectWithoutProperties(_ref2, _excluded3);
+  if (direction === 'vertical') {
+    return /*#__PURE__*/React.createElement(Radio.Group, props, /*#__PURE__*/React.createElement(Space, {
+      direction: "vertical"
+    }, options === null || options === void 0 ? void 0 : options.map(function (item) {
+      if (_typeof(item) === 'object') {
+        var label = item.label,
+          value = item.value,
+          other = _objectWithoutProperties(item, _excluded4);
+        return /*#__PURE__*/React.createElement(Radio, _extends({}, other, {
+          value: value,
+          key: "".concat(item.value)
+        }), label);
+      }
+      return /*#__PURE__*/React.createElement(Radio, {
+        value: item,
+        key: "".concat(item)
+      }, item);
+    })));
+  }
+  return /*#__PURE__*/React.createElement(Radio.Group, _extends({}, props, {
+    options: options
+  }));
+};

package/es/components/eftposPay/component/manual/index.js

@@ -41,11 +41,11 @@ export default (function (_ref) {
     pay = _useContextData.pay,
     amount = _useContextData.amount;
   var start = useMemo(function () {
-    if (typeof (manual === null || manual === void 0 ? void 0 : manual.money) === 'number') {
-      return manual === null || manual === void 0 ? void 0 : manual.money;
+    if (typeof (manual === null || manual === void 0 ? void 0 : manual.money) === 'number' || typeof (manual === null || manual === void 0 ? void 0 : manual.money) === 'string') {
+      return Number(manual === null || manual === void 0 ? void 0 : manual.money);
     }
-    if (typeof (pay === null || pay === void 0 ? void 0 : pay.total) === 'number') {
-      return pay === null || pay === void 0 ? void 0 : pay.total;
+    if (typeof (pay === null || pay === void 0 ? void 0 : pay.total) === 'number' || typeof (pay === null || pay === void 0 ? void 0 : pay.total) === 'string') {
+      return Number(pay === null || pay === void 0 ? void 0 : pay.total);
     }
     return amount;
   }, [manual === null || manual === void 0 ? void 0 : manual.money, pay === null || pay === void 0 ? void 0 : pay.total, amount]);
@@ -72,17 +72,17 @@ export default (function (_ref) {
     if (disabled) {
       return;
     }
-    // 暂时关闭 后期可以放开用于自定义编辑金额
-    if (mode === ModeEnum.Pay) {
-      setDisabled(true);
-      var obj = pay || {};
-      onChange('success', _objectSpread(_objectSpread({}, obj), {}, {
-        number: number,
-        device: device,
-        order_id: order_id
-      }));
-      return;
-    }
+    // if (mode === ModeEnum.Pay) {
+    //   setDisabled(true);
+    //   const obj = pay || {};
+    //   onChange('success', {
+    //     ...obj,
+    //     number,
+    //     device,
+    //     order_id,
+    //   } as { [key: string]: unknown });
+    //   return;
+    // }
     if (mode === ModeEnum.Refund) {
       setDisabled(true);
       onChange('success', {

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

@@ -1,4 +1,5 @@
 import { State } from './store';
+import { Amount } from './const';
 export declare function getUuid(): string;
 /**
  * @title: Promise化 setTimeout
@@ -54,4 +55,12 @@ export declare const getPayParams: (data: Partial<Omit<State, key>> & Pick<State
     device?: undefined;
 };
 export declare const limitDecimals: (value: any) => any;
+/**
+ * @title:  通用获取 金额信息
+ * @description: 在 amount 页面设置则使用 pay ,如果有 setting 则使用 setting 信息 ,都没有则设置0
+ * @param {State} store : 全局store数据管理
+ * @Author: hongbing.wang
+ * @Date: 2024-08-12 10:24
+ */
+export declare function getAmonunt(store: State): Amount;
 export {};

package/es/components/eftposPay/helper.js

@@ -124,4 +124,72 @@ export var limitDecimals = function limitDecimals(value) {
     return !isNaN(value) ? String(value).replace(reg, '$1$2.$3') : '';
   }
   return '';
-};
+};
+
+/**
+ * @title:  通用获取 金额信息
+ * @description: 在 amount 页面设置则使用 pay ,如果有 setting 则使用 setting 信息 ,都没有则设置0 
+ * @param {State} store : 全局store数据管理
+ * @Author: hongbing.wang
+ * @Date: 2024-08-12 10:24
+ */
+export function getAmonunt(store) {
+  var device = store.device,
+    pay = store.pay,
+    custom = store.custom,
+    name = store.name,
+    symbol = store.symbol,
+    amount = store.amount;
+  if (!device || !custom) {
+    throw Error('device or custom is not defined');
+  }
+  var setting = device.setting;
+
+  // 从 金额编辑页 获取到 支付数据
+  if (pay) {
+    return {
+      name: name,
+      symbol: symbol,
+      // format,
+      money: Number(amount),
+      amount: Number(pay.amount),
+      surRate: Number(pay.surRate),
+      surMoney: Number(pay.surMoney),
+      surcharge: (setting === null || setting === void 0 ? void 0 : setting.surcharge) || false,
+      useOriginSurcharge: (pay === null || pay === void 0 ? void 0 : pay.useOriginSurcharge) || false
+    };
+  }
+  // 原始支付总额
+  if (!setting) {
+    return {
+      name: name,
+      symbol: symbol,
+      // format,
+      money: Number(amount),
+      amount: Number(amount),
+      surRate: 0,
+      surMoney: 0,
+      surcharge: false,
+      useOriginSurcharge: false
+    };
+  }
+  // 原始手续费 是指 各个pos机厂商跟银行合作直接收取的手续费,一旦设置则清空,配置中设置的手续费
+  var useOriginSurcharge = setting.useOriginSurcharge || false;
+
+  // 直接设备中手续费金额 
+  var surRate = setting.constant_rate || 0;
+  var surMoney = setting.constant_money || 0;
+
+  // 是否开启手续费
+  var surcharge = setting.surcharge;
+  return {
+    name: name,
+    symbol: symbol,
+    money: Number(amount),
+    amount: Number(amount),
+    surRate: useOriginSurcharge ? 0 : surcharge ? surRate : 0,
+    surMoney: useOriginSurcharge ? 0 : surcharge ? surMoney : 0,
+    surcharge: surcharge,
+    useOriginSurcharge: useOriginSurcharge
+  };
+}

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

@@ -1,6 +1,6 @@
 import { State } from './store';
+export { getAmonunt } from './helper';
 export { default as Payo } from './payo';
 export { default as Windcave } from './windcave/windcave';
 export { default as Tyro } from './tyro';
 export declare const getInitState: (type: string, params?: any) => State;
-export declare const getAmonunt: (store: State) => import("./const").Amount;

package/es/components/eftposPay/manufacturer.js

@@ -1,7 +1,8 @@
 import { EftposEnum } from "./const";
-import getPayoInitState, { getAmonunt as getPayoAmonunt } from "./payo/const";
-import getTyroInitState, { getAmonunt as getTyroAmonunt } from "./tyro/const";
-import getWindcaveInitState, { getAmonunt as getWindcaveAmonunt } from "./windcave/const";
+import getPayoInitState from "./payo/const";
+import getTyroInitState from "./tyro/const";
+import getWindcaveInitState from "./windcave/const";
+export { getAmonunt } from "./helper";
 export { default as Payo } from "./payo";
 export { default as Windcave } from "./windcave/windcave";
 export { default as Tyro } from "./tyro";
@@ -17,15 +18,16 @@ export var getInitState = function getInitState(type, params) {
       throw new Error('未知的厂商类型');
   }
 };
-export var getAmonunt = function getAmonunt(store) {
-  if (store.eftpos === EftposEnum.Payo) {
-    return getPayoAmonunt(store);
-  }
-  if (store.eftpos === EftposEnum.Windcave) {
-    return getWindcaveAmonunt(store);
-  }
-  if (store.eftpos === EftposEnum.Tyro) {
-    return getTyroAmonunt(store);
-  }
-  throw new Error('未知的厂商类型');
-};
+// 暂无定制业务
+// export const getAmonunt = (store: State) => {
+//   if (store.eftpos === EftposEnum.Payo) {
+//     return getPayoAmonunt(store);
+//   }
+//   if (store.eftpos === EftposEnum.Windcave) {
+//     return getWindcaveAmonunt(store);
+//   }
+//   if (store.eftpos === EftposEnum.Tyro) {
+//     return getTyroAmonunt(store);
+//   }
+//   throw new Error('未知的厂商类型');
+// };

package/es/components/eftposPay/payo/const.js

@@ -111,6 +111,7 @@ export function getAmonunt(store) {
       useOriginSurcharge: (pay === null || pay === void 0 ? void 0 : pay.useOriginSurcharge) || false
     };
   }
+
   // 原始支付总额
   if (!setting) {
     return {
@@ -125,11 +126,13 @@ export function getAmonunt(store) {
       useOriginSurcharge: false
     };
   }
+  var useOriginSurcharge = setting.useOriginSurcharge || false;
+
   // 直接设备中手续费金额 + 原始支付总额
-  var surRate = setting.useOriginSurcharge ? 0 : setting.constant_rate || 0;
-  var surMoney = setting.useOriginSurcharge ? 0 : setting.constant_money || 0;
+
+  var surRate = setting.constant_rate || 0;
+  var surMoney = setting.constant_money || 0;
   var surcharge = setting.surcharge;
-  var useOriginSurcharge = setting.useOriginSurcharge || false;
   return {
     name: name,
     symbol: symbol,

package/es/components/eftposPay/payo/hooks.js

@@ -1,5 +1,10 @@
 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); }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
+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; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 /* eslint-disable @typescript-eslint/no-unused-expressions */
@@ -16,10 +21,11 @@ import { sleep } from "../helper";
 export var useValidate = function useValidate(timeout) {
   var controllerRef = useRef();
   var ref = useRef(true);
+  var isTimeoutCloseRef = useRef(false);
   var TimeoutRef = useRef();
   var checkApi = useCallback( /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(check, number, time) {
-      var res, start, diff;
+      var res, start, diff, _ref2, code;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -61,8 +67,29 @@ export var useValidate = function useValidate(timeout) {
             _context.next = 4;
             break;
           case 16:
+            if (!isTimeoutCloseRef.current) {
+              _context.next = 22;
+              break;
+            }
+            if (res) {
+              _context.next = 19;
+              break;
+            }
+            return _context.abrupt("return", {
+              code: PayStatus.Timeout
+            });
+          case 19:
+            _ref2 = res, code = _ref2.code;
+            if (!("".concat(code) === "200")) {
+              _context.next = 22;
+              break;
+            }
+            return _context.abrupt("return", _objectSpread(_objectSpread({}, res), {}, {
+              code: PayStatus.Timeout
+            }));
+          case 22:
             return _context.abrupt("return", res);
-          case 17:
+          case 23:
           case "end":
             return _context.stop();
         }
@@ -84,9 +111,11 @@ export var useValidate = function useValidate(timeout) {
     (_controllerRef$curren = controllerRef.current) === null || _controllerRef$curren === void 0 ? void 0 : _controllerRef$curren.abort();
   }, []);
   var run = function run() {
+    isTimeoutCloseRef.current = false;
     TimeoutRef.current && clearTimeout(TimeoutRef.current);
     // 开启计时
     TimeoutRef.current = setTimeout(function () {
+      isTimeoutCloseRef.current = true;
       close();
     }, timeout);
     return checkApi.apply(void 0, arguments);

package/es/components/eftposPay/tyro/const.js

@@ -102,11 +102,13 @@ export function getAmonunt(store) {
       useOriginSurcharge: false
     };
   }
+  var useOriginSurcharge = setting.useOriginSurcharge || false;
+
   // 直接设备中手续费金额
+
   var surRate = setting.constant_rate || 0;
   var surMoney = setting.constant_money || 0;
   var surcharge = setting.surcharge;
-  var useOriginSurcharge = setting.useOriginSurcharge || false;
   return {
     name: name,
     symbol: symbol,

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

@@ -111,11 +111,12 @@ export function getAmonunt(store) {
       useOriginSurcharge: false
     };
   }
+  var useOriginSurcharge = setting.useOriginSurcharge || false;
+
   // 直接设备中手续费金额 + 原始支付总额
   var surRate = setting.constant_rate || 0;
   var surMoney = setting.constant_money || 0;
   var surcharge = setting.surcharge;
-  var useOriginSurcharge = setting.useOriginSurcharge || false;
   return {
     name: name,
     symbol: symbol,

package/lib/components/eftpos/deviceList/index.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+declare const _default: ({ input, ...formItemProps }: any) => React.JSX.Element;
+export default _default;