@pisell/private-materials 3.0.133 → 3.0.135

package/lib/components/eftpos/index.js

@@ -144,25 +144,26 @@ var eftpos_default = (props) => {
   const onDelDevice = (id) => {
     return onDel(id);
   };
-  const onEditDevice = (device) => {
-    if (!device) {
-      setStatus(import_const.DeviceEnum.Add);
-      const field = getField(type);
-      const list = (0, import_const.getCommByFields)({ field, getComm });
-      console.log(list);
-      setDeviceCommList(list);
-    } else {
+  const onEditDevice = async (device) => {
+    if (device) {
       deviceIdRef.current = device.id;
-      const field = getField(type, import_const.DeviceEnum.Edit);
-      const list = (0, import_const.getCommByFields)({ field, value: device, getComm });
+      const field2 = getField(type, import_const.DeviceEnum.Edit);
+      const list2 = await (0, import_const.getCommByFields)({ field: field2, value: device, getComm });
       setStatus(import_const.DeviceEnum.Edit);
-      setDeviceCommList(list);
+      setDeviceCommList(list2);
+      setPage("edit");
+      return;
     }
+    setStatus(import_const.DeviceEnum.Add);
+    const field = getField(type);
+    const list = await (0, import_const.getCommByFields)({ field, getComm });
+    console.log(list);
+    setDeviceCommList(list);
     setPage("edit");
   };
-  const onRepair = (device) => {
+  const onRepair = async (device) => {
     const field = getField(type, import_const.DeviceEnum.Repair);
-    const list = (0, import_const.getCommByFields)({ field, value: device, getComm });
+    const list = await (0, import_const.getCommByFields)({ field, value: device, getComm });
     deviceIdRef.current = device.id;
     setDeviceCommList(list);
     setStatus(import_const.DeviceEnum.Repair);
@@ -238,7 +239,14 @@ var eftpos_default = (props) => {
           spinning: loading,
           wrapperClassName: "pisell-lowcode__pos_box"
         },
-        /* @__PURE__ */ import_react.default.createElement(import_device.default, { formItemList: deviceItemList, onSave, key: `posdevice${type}` })
+        /* @__PURE__ */ import_react.default.createElement(
+          import_device.default,
+          {
+            formItemList: deviceItemList,
+            onSave,
+            key: `posdevice${type}`
+          }
+        )
       )
     ));
   }
@@ -273,7 +281,14 @@ var eftpos_default = (props) => {
         spinning: loading,
         wrapperClassName: "pisell-lowcode__pos_box"
       },
-      /* @__PURE__ */ import_react.default.createElement(import_device.default, { formItemList: deviceItemList, onSave, key: `device${type}` })
+      /* @__PURE__ */ import_react.default.createElement(
+        import_device.default,
+        {
+          formItemList: deviceItemList,
+          onSave,
+          key: `device${type}`
+        }
+      )
     )
   ));
 };

package/lib/components/eftposPay/device.d.ts

@@ -1,13 +1,14 @@
 import React from 'react';
 import { PayProps, PosProps } from './const';
 import './device.less';
-declare const _default: ({ api, onChange, onClose, className, isIpad, net, }: {
+declare const _default: ({ api, onChange, onClose, className, device_number, isIpad, net, }: {
     api: PayProps['api'];
     className?: string | undefined;
-    onChange?: ((status: "page" | "success" | "fail", params?: string | {
+    onChange?: ((status: "fail" | "success" | "page", params?: string | {
         [keys: string]: unknown;
     } | undefined) => void) | undefined;
     onClose: () => void;
+    device_number?: string | number | undefined;
     isIpad: boolean;
     net: boolean;
 }) => React.JSX.Element;

package/lib/components/eftposPay/device.js

@@ -45,6 +45,7 @@ var device_default = ({
   onChange,
   onClose,
   className = "",
+  device_number,
   isIpad,
   net
 }) => {
@@ -74,6 +75,30 @@ var device_default = ({
       (res) => {
         setLoading(false);
         if (res && Array.isArray(res.list) && res.list.length > 0) {
+          if (device_number) {
+            const hostDeviceList = res.list.filter(
+              (item) => {
+                var _a, _b;
+                return (_b = (_a = item == null ? void 0 : item.setting) == null ? void 0 : _a.devices) == null ? void 0 : _b.some(
+                  (i) => i.number === device_number
+                );
+              }
+            );
+            if (hostDeviceList.length >= 1) {
+              setDataStaus(true);
+              setList(hostDeviceList);
+              if (hostDeviceList.length === 1) {
+                dispatch((0, import_store.updateDevice)({ device: hostDeviceList[0] }));
+                if (typeof api.selectDevice === "function") {
+                  api.selectDevice(hostDeviceList[0]);
+                }
+                if (typeof onChange === "function") {
+                  onChange("page", mode === import_const.ModeEnum.Pay ? "amount" : "pay");
+                }
+              }
+              return;
+            }
+          }
           setDataStaus(true);
           setList(res.list);
           if (res.list.length === 1) {

package/lib/components/eftposPay/index.js

@@ -48,6 +48,7 @@ import_utils.locales.init(import_locales.default, localStorage.getItem("umi_loca
 var App = ({
   action,
   getApi,
+  device_number,
   terminal,
   ...props
 }) => {
@@ -114,7 +115,8 @@ var App = ({
         onClose,
         isIpad,
         className: isIpad ? "pisell-lowcode__eft-pay-terminal" : "",
-        net
+        net,
+        device_number
       }
     );
   }
@@ -144,7 +146,7 @@ var App = ({
   );
 };
 var eftposPay_default = (props) => {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e, _f;
   const context = (0, import_useEngineContext.default)();
   const { store } = ((_a = context.appHelper) == null ? void 0 : _a.utils) || { store: {} };
   const mode = (0, import_react.useMemo)(() => {
@@ -180,6 +182,7 @@ var eftposPay_default = (props) => {
   (0, import_react.useEffect)(() => {
     document.body.id = "body";
   }, []);
+  console.log("props?.params?.device_number = ", (_e = props == null ? void 0 : props.params) == null ? void 0 : _e.device_number);
   return /* @__PURE__ */ import_react.default.createElement(import_store.Provider, { state }, /* @__PURE__ */ import_react.default.createElement(
     App,
     {
@@ -187,7 +190,8 @@ var eftposPay_default = (props) => {
       params: props.params,
       onChangeStatus,
       terminal: props.terminal,
-      action
+      action,
+      device_number: (_f = props == null ? void 0 : props.params) == null ? void 0 : _f.device_number
     }
   ));
 };

package/package.json

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