@pisell/private-materials 3.0.139 → 3.0.140

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

@@ -0,0 +1,70 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/eftpos/deviceList/index.tsx
+var deviceList_exports = {};
+__export(deviceList_exports, {
+  default: () => deviceList_default
+});
+module.exports = __toCommonJS(deviceList_exports);
+var import_react = __toESM(require("react"));
+var import_antd = require("antd");
+var import_group = require("../group");
+var DeviceList = (props) => {
+  const [form] = import_antd.Form.useForm();
+  const { list, onChange } = props;
+  console.log(list);
+  const onValuesChange = () => {
+    const val = Object.values(form.getFieldsValue()).flat();
+    onChange(val);
+  };
+  const initialValues = (0, import_react.useMemo)(() => {
+    return list.reduce((target, item) => {
+      var _a, _b;
+      return {
+        ...target,
+        [item.name]: ((_a = item == null ? void 0 : item.input) == null ? void 0 : _a.value) || ((_b = item == null ? void 0 : item.input) == null ? void 0 : _b.defaultValue)
+      };
+    }, {});
+  }, [list]);
+  return /* @__PURE__ */ import_react.default.createElement(
+    import_antd.Form,
+    {
+      layout: "vertical",
+      onValuesChange,
+      form,
+      initialValues
+    },
+    list.map(({ input, ...formItemProps }) => {
+      return /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, { ...formItemProps }, /* @__PURE__ */ import_react.default.createElement(import_group.CheckboxGroup, { ...input }));
+    })
+  );
+};
+var deviceList_default = ({ input, ...formItemProps }) => {
+  return /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, { ...formItemProps }, /* @__PURE__ */ import_react.default.createElement(DeviceList, { ...input }));
+};

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

@@ -35,44 +35,16 @@ __export(form_exports, {
 module.exports = __toCommonJS(form_exports);
 var import_react = __toESM(require("react"));
 var import_antd = require("antd");
+var import_group = require("../group");
 var import_surcharge = __toESM(require("../surcharge"));
+var import_deviceList = __toESM(require("../deviceList"));
 var Mapping = {
   Input: import_antd.Input,
   InputNumber: import_antd.InputNumber,
   Checkbox: import_antd.Checkbox,
-  "Checkbox.Group": ({
-    direction,
-    options,
-    ...props
-  }) => {
-    if (direction === "vertical") {
-      return /* @__PURE__ */ import_react.default.createElement(import_antd.Checkbox.Group, { ...props }, /* @__PURE__ */ import_react.default.createElement(import_antd.Space, { direction }, options == null ? void 0 : options.map((item) => {
-        if (typeof item === "object") {
-          const { label, value, ...other } = item;
-          return /* @__PURE__ */ import_react.default.createElement(import_antd.Checkbox, { ...other, value, key: `${item.value}` }, label);
-        }
-        return /* @__PURE__ */ import_react.default.createElement(import_antd.Checkbox, { value: item, key: `${item}` }, item);
-      })));
-    }
-    return /* @__PURE__ */ import_react.default.createElement(import_antd.Checkbox.Group, { ...props, options });
-  },
+  "Checkbox.Group": import_group.CheckboxGroup,
   Radio: import_antd.Radio,
-  "Radio.Group": ({
-    direction,
-    options,
-    ...props
-  }) => {
-    if (direction === "vertical") {
-      return /* @__PURE__ */ import_react.default.createElement(import_antd.Radio.Group, { ...props }, /* @__PURE__ */ import_react.default.createElement(import_antd.Space, { direction: "vertical" }, options == null ? void 0 : options.map((item) => {
-        if (typeof item === "object") {
-          const { label, value, ...other } = item;
-          return /* @__PURE__ */ import_react.default.createElement(import_antd.Radio, { ...other, value, key: `${item.value}` }, label);
-        }
-        return /* @__PURE__ */ import_react.default.createElement(import_antd.Radio, { value: item, key: `${item}` }, item);
-      })));
-    }
-    return /* @__PURE__ */ import_react.default.createElement(import_antd.Radio.Group, { ...props, options });
-  },
+  "Radio.Group": import_group.RadioGroup,
   "Radio.Button": import_antd.Radio.Button,
   Cascader: import_antd.Cascader,
   DatePicker: import_antd.DatePicker,
@@ -85,7 +57,8 @@ var Mapping = {
   Upload: import_antd.Upload
 };
 var CustomMapping = {
-  Surcharge: import_surcharge.default
+  Surcharge: import_surcharge.default,
+  DeviceList: import_deviceList.default
 };
 var CustomFormItem = ({
   formItemList,

package/lib/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/lib/components/eftpos/group/index.js

@@ -0,0 +1,75 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/eftpos/group/index.tsx
+var group_exports = {};
+__export(group_exports, {
+  CheckboxGroup: () => CheckboxGroup,
+  RadioGroup: () => RadioGroup
+});
+module.exports = __toCommonJS(group_exports);
+var import_react = __toESM(require("react"));
+var import_antd = require("antd");
+var CheckboxGroup = ({
+  direction,
+  options,
+  ...props
+}) => {
+  if (direction === "vertical") {
+    return /* @__PURE__ */ import_react.default.createElement(import_antd.Checkbox.Group, { ...props }, /* @__PURE__ */ import_react.default.createElement(import_antd.Space, { direction }, options == null ? void 0 : options.map((item) => {
+      if (typeof item === "object") {
+        const { label, value, ...other } = item;
+        return /* @__PURE__ */ import_react.default.createElement(import_antd.Checkbox, { ...other, value, key: `${item.value}` }, label);
+      }
+      return /* @__PURE__ */ import_react.default.createElement(import_antd.Checkbox, { value: item, key: `${item}` }, item);
+    })));
+  }
+  return /* @__PURE__ */ import_react.default.createElement(import_antd.Checkbox.Group, { ...props, options });
+};
+var RadioGroup = ({
+  direction,
+  options,
+  component,
+  ...props
+}) => {
+  if (direction === "vertical") {
+    return /* @__PURE__ */ import_react.default.createElement(import_antd.Radio.Group, { ...props }, /* @__PURE__ */ import_react.default.createElement(import_antd.Space, { direction: "vertical" }, options == null ? void 0 : options.map((item) => {
+      if (typeof item === "object") {
+        const { label, value, ...other } = item;
+        return /* @__PURE__ */ import_react.default.createElement(import_antd.Radio, { ...other, value, key: `${item.value}` }, label);
+      }
+      return /* @__PURE__ */ import_react.default.createElement(import_antd.Radio, { value: item, key: `${item}` }, item);
+    })));
+  }
+  return /* @__PURE__ */ import_react.default.createElement(import_antd.Radio.Group, { ...props, options });
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  CheckboxGroup,
+  RadioGroup
+});

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

@@ -45,11 +45,11 @@ var manual_default = ({ onChange, className = "", formatAmount }) => {
   const dispatch = (0, import_store.useDispatch)();
   const { symbol, manual, order_id, mode, device, number, pay, amount } = (0, import_store.useContextData)();
   const start = (0, import_react.useMemo)(() => {
-    if (typeof (manual == null ? void 0 : manual.money) === "number") {
-      return manual == null ? void 0 : manual.money;
+    if (typeof (manual == null ? void 0 : manual.money) === "number" || typeof (manual == null ? void 0 : manual.money) === "string") {
+      return Number(manual == null ? void 0 : manual.money);
     }
-    if (typeof (pay == null ? void 0 : pay.total) === "number") {
-      return pay == null ? void 0 : pay.total;
+    if (typeof (pay == null ? void 0 : pay.total) === "number" || typeof (pay == null ? void 0 : pay.total) === "string") {
+      return Number(pay == null ? void 0 : pay.total);
     }
     return amount;
   }, [manual == null ? void 0 : manual.money, pay == null ? void 0 : pay.total, amount]);
@@ -61,17 +61,6 @@ var manual_default = ({ onChange, className = "", formatAmount }) => {
     if (disabled) {
       return;
     }
-    if (mode === import_const.ModeEnum.Pay) {
-      setDisabled(true);
-      const obj = pay || {};
-      onChange("success", {
-        ...obj,
-        number,
-        device,
-        order_id
-      });
-      return;
-    }
     if (mode === import_const.ModeEnum.Refund) {
       setDisabled(true);
       onChange("success", {

package/lib/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/lib/components/eftposPay/helper.js

@@ -20,6 +20,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var helper_exports = {};
 __export(helper_exports, {
   cloneDeep: () => cloneDeep,
+  getAmonunt: () => getAmonunt,
   getPayParams: () => getPayParams,
   getUuid: () => getUuid,
   limitDecimals: () => limitDecimals,
@@ -116,9 +117,57 @@ var limitDecimals = (value) => {
   }
   return "";
 };
+function getAmonunt(store) {
+  const { device, pay, custom, name, symbol, amount } = store;
+  if (!device || !custom) {
+    throw Error("device or custom is not defined");
+  }
+  const setting = device.setting;
+  if (pay) {
+    return {
+      name,
+      symbol,
+      // format,
+      money: Number(amount),
+      amount: Number(pay.amount),
+      surRate: Number(pay.surRate),
+      surMoney: Number(pay.surMoney),
+      surcharge: (setting == null ? void 0 : setting.surcharge) || false,
+      useOriginSurcharge: (pay == null ? void 0 : pay.useOriginSurcharge) || false
+    };
+  }
+  if (!setting) {
+    return {
+      name,
+      symbol,
+      // format,
+      money: Number(amount),
+      amount: Number(amount),
+      surRate: 0,
+      surMoney: 0,
+      surcharge: false,
+      useOriginSurcharge: false
+    };
+  }
+  const useOriginSurcharge = setting.useOriginSurcharge || false;
+  const surRate = setting.constant_rate || 0;
+  const surMoney = setting.constant_money || 0;
+  const surcharge = setting.surcharge;
+  return {
+    name,
+    symbol,
+    money: Number(amount),
+    amount: Number(amount),
+    surRate: useOriginSurcharge ? 0 : surcharge ? surRate : 0,
+    surMoney: useOriginSurcharge ? 0 : surcharge ? surMoney : 0,
+    surcharge,
+    useOriginSurcharge
+  };
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   cloneDeep,
+  getAmonunt,
   getPayParams,
   getUuid,
   limitDecimals,

package/lib/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/lib/components/eftposPay/manufacturer.js

@@ -32,7 +32,7 @@ __export(manufacturer_exports, {
   Payo: () => import_payo.default,
   Tyro: () => import_tyro.default,
   Windcave: () => import_windcave.default,
-  getAmonunt: () => getAmonunt,
+  getAmonunt: () => import_helper.getAmonunt,
   getInitState: () => getInitState
 });
 module.exports = __toCommonJS(manufacturer_exports);
@@ -40,6 +40,7 @@ var import_const = require("./const");
 var import_const2 = __toESM(require("./payo/const"));
 var import_const3 = __toESM(require("./tyro/const"));
 var import_const4 = __toESM(require("./windcave/const"));
+var import_helper = require("./helper");
 var import_payo = __toESM(require("./payo"));
 var import_windcave = __toESM(require("./windcave/windcave"));
 var import_tyro = __toESM(require("./tyro"));
@@ -55,18 +56,6 @@ var getInitState = (type, params) => {
       throw new Error("未知的厂商类型");
   }
 };
-var getAmonunt = (store) => {
-  if (store.eftpos === import_const.EftposEnum.Payo) {
-    return (0, import_const2.getAmonunt)(store);
-  }
-  if (store.eftpos === import_const.EftposEnum.Windcave) {
-    return (0, import_const4.getAmonunt)(store);
-  }
-  if (store.eftpos === import_const.EftposEnum.Tyro) {
-    return (0, import_const3.getAmonunt)(store);
-  }
-  throw new Error("未知的厂商类型");
-};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Payo,

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

@@ -109,10 +109,10 @@ function getAmonunt(store) {
       useOriginSurcharge: false
     };
   }
-  const surRate = setting.useOriginSurcharge ? 0 : setting.constant_rate || 0;
-  const surMoney = setting.useOriginSurcharge ? 0 : setting.constant_money || 0;
-  const surcharge = setting.surcharge;
   const useOriginSurcharge = setting.useOriginSurcharge || false;
+  const surRate = setting.constant_rate || 0;
+  const surMoney = setting.constant_money || 0;
+  const surcharge = setting.surcharge;
   return {
     name,
     symbol,

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

@@ -28,6 +28,7 @@ var import_helper = require("../helper");
 var useValidate = (timeout) => {
   const controllerRef = (0, import_react.useRef)();
   const ref = (0, import_react.useRef)(true);
+  const isTimeoutCloseRef = (0, import_react.useRef)(false);
   const TimeoutRef = (0, import_react.useRef)();
   const checkApi = (0, import_react.useCallback)(
     async (check, number, time) => {
@@ -49,6 +50,20 @@ var useValidate = (timeout) => {
           await (0, import_helper.sleep)(time - diff);
         }
       }
+      if (isTimeoutCloseRef.current) {
+        if (!res) {
+          return {
+            code: import_const.PayStatus.Timeout
+          };
+        }
+        const { code } = res;
+        if (`${code}` === `200`) {
+          return {
+            ...res,
+            code: import_const.PayStatus.Timeout
+          };
+        }
+      }
       return res;
     },
     []
@@ -59,8 +74,10 @@ var useValidate = (timeout) => {
     (_a = controllerRef.current) == null ? void 0 : _a.abort();
   }, []);
   const run = (...params) => {
+    isTimeoutCloseRef.current = false;
     TimeoutRef.current && clearTimeout(TimeoutRef.current);
     TimeoutRef.current = setTimeout(() => {
+      isTimeoutCloseRef.current = true;
       close();
     }, timeout);
     return checkApi(...params);

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

@@ -93,10 +93,10 @@ function getAmonunt(store) {
       useOriginSurcharge: false
     };
   }
+  const useOriginSurcharge = setting.useOriginSurcharge || false;
   const surRate = setting.constant_rate || 0;
   const surMoney = setting.constant_money || 0;
   const surcharge = setting.surcharge;
-  const useOriginSurcharge = setting.useOriginSurcharge || false;
   return {
     name,
     symbol,

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

@@ -98,10 +98,10 @@ function getAmonunt(store) {
       useOriginSurcharge: false
     };
   }
+  const useOriginSurcharge = setting.useOriginSurcharge || false;
   const surRate = setting.constant_rate || 0;
   const surMoney = setting.constant_money || 0;
   const surcharge = setting.surcharge;
-  const useOriginSurcharge = setting.useOriginSurcharge || false;
   return {
     name,
     symbol,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.0.139",
+  "version": "3.0.140",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -59,9 +59,9 @@
     "react-infinite-scroll-component": "^6.1.0",
     "rc-virtual-list": "^3.11.3",
     "decimal.js": "^10.4.3",
-    "@pisell/materials": "3.0.47",
-    "@pisell/icon": "0.0.11",
     "@pisell/utils": "1.0.42",
+    "@pisell/icon": "0.0.11",
+    "@pisell/materials": "3.0.47",
     "@pisell/date-picker": "1.0.100"
   },
   "peerDependencies": {