@pisell/private-materials 6.3.113 → 6.3.114

package/es/components/eftpos/index.js

@@ -23,11 +23,17 @@ import Pos from "./pos";
 import Drawer from "../booking/components/drawer";
 import Log from "./log";
 import localeTexts from "./locales";
-import { usePairTerminalo } from "./hooks";
+import { usePairRequest, usePairTerminalo, useCheckPairRequest } from "./hooks";
 import DeviceIcon from "./icon/apiKey";
 import ApiKeyIcon from "./icon/device";
 import { getLocale } from "../../utils/locales";
+import { usePairModal } from "./PairModal/hooks";
+import PairModal from "./PairModal/index";
 import { Eftpos, getCommByFields, DeviceEnum, getDefaultValue } from "./const";
+import { Image } from '@pisell/materials';
+import mx51SCISvg from "./assets/mx51SCI.svg";
+import useEngineContext from "../../hooks/useEngineContext";
+import { request } from "../../utils";
 import "./index.less";
 locales.init(localeTexts, getLocale());
 
@@ -134,6 +140,10 @@ export default (function (props) {
     tyroUrl = props.tyroUrl,
     tyroVersion = props.tyroVersion,
     useTyroLog = props.useTyroLog;
+  // 设置request
+  var context = useEngineContext();
+  var utils = context.appHelper.utils || {};
+  request.setRequest(utils === null || utils === void 0 ? void 0 : utils.request);
   var _useState3 = useState('list'),
     _useState4 = _slicedToArray(_useState3, 2),
     page = _useState4[0],
@@ -184,6 +194,13 @@ export default (function (props) {
     posLoading = _useState22[0],
     setPosLoading = _useState22[1];
 
+  // 配对弹窗
+  var pairModalHook = usePairModal();
+  // 配对请求
+  var pairRequest = usePairRequest();
+  // 检查配对状态
+  var checkPairRequest = useCheckPairRequest();
+
   /**
    * @title: 删除设备
    * @param {string} id 设备id
@@ -258,28 +275,69 @@ export default (function (props) {
    */
   var onRepair = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(device) {
-      var field, list;
+      var checkPairResponse, field, list;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
+            console.log('onRepair device = ', device);
+            // 特殊操作，如果是MX51设备需要先调用接口查询设备状态，如果设备状态为离线，则需要先调用接口进行重连
+            if (!(type === Eftpos.MX51)) {
+              _context2.next = 19;
+              break;
+            }
+            _context2.prev = 2;
+            setLoading(true);
+            _context2.next = 6;
+            return checkPairRequest.run({
+              type: type,
+              pair_response: device === null || device === void 0 ? void 0 : device.response
+            });
+          case 6:
+            checkPairResponse = _context2.sent;
+            console.log('checkPairResponse = ', checkPairResponse);
+            // code为200表示设备正常连接，提示用户并且不可以继续重配对
+            if (!((checkPairResponse === null || checkPairResponse === void 0 ? void 0 : checkPairResponse.code) == 200)) {
+              _context2.next = 11;
+              break;
+            }
+            messageApi.open({
+              type: 'warning',
+              style: {
+                zIndex: (zIndex || 9999) + 1
+              },
+              content: locales.getText('page.eftpos.text.repair.message.warning')
+            });
+            return _context2.abrupt("return");
+          case 11:
+            _context2.next = 16;
+            break;
+          case 13:
+            _context2.prev = 13;
+            _context2.t0 = _context2["catch"](2);
+            console.error('onRepair error =>', _context2.t0);
+          case 16:
+            _context2.prev = 16;
+            setLoading(false);
+            return _context2.finish(16);
+          case 19:
             field = getField(type, DeviceEnum.Repair);
-            _context2.next = 3;
+            _context2.next = 22;
             return getCommByFields({
               field: field,
               value: device,
               getComm: getComm
             });
-          case 3:
+          case 22:
             list = _context2.sent;
             deviceIdRef.current = device.id;
             setDeviceCommList(list);
             setStatus(DeviceEnum.Repair);
             setPage('edit');
-          case 8:
+          case 27:
           case "end":
             return _context2.stop();
         }
-      }, _callee2);
+      }, _callee2, null, [[2, 13, 16, 19]]);
     }));
     return function onRepair(_x2) {
       return _ref3.apply(this, arguments);
@@ -303,34 +361,58 @@ export default (function (props) {
    * @Date: 2024-08-20 11:21
    */
   var onSave = /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(device) {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(device, pair_response) {
       var update;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
             console.log('device = ', device);
+            console.log('pair_response = ', pair_response);
             update = /*#__PURE__*/function () {
               var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+                var _device$connection, _device$connection2;
                 return _regeneratorRuntime().wrap(function _callee3$(_context3) {
                   while (1) switch (_context3.prev = _context3.next) {
                     case 0:
-                      _context3.next = 2;
+                      _context3.prev = 0;
+                      _context3.next = 3;
                       return onEdit(_objectSpread(_objectSpread({}, device), {}, {
-                        type: type
-                      }), status || 'add').catch(function () {
-                        setLoading(false);
-                      });
-                    case 2:
+                        type: type,
+                        pair_response: pair_response
+                      }), status || 'add');
+                    case 3:
+                      // MX51 设备在新增与重连时候需单独展示提示信息
+                      if (type === Eftpos.MX51 && (status === DeviceEnum.Add || status === DeviceEnum.Repair)) {
+                        messageApi.open({
+                          type: 'success',
+                          style: {
+                            zIndex: (zIndex || 9999) + 1
+                          },
+                          content: /*#__PURE__*/React.createElement("div", {
+                            className: "pisell-lowcode__pos_message-custom-content_mx51"
+                          }, /*#__PURE__*/React.createElement("span", null, "Terminal paired successfully."), /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement("span", null, "Pairing Name: ", (device === null || device === void 0 || (_device$connection = device.connection) === null || _device$connection === void 0 ? void 0 : _device$connection.pairing_nickname) || '-'), /*#__PURE__*/React.createElement("span", null, "Pairing ID: ", (device === null || device === void 0 || (_device$connection2 = device.connection) === null || _device$connection2 === void 0 ? void 0 : _device$connection2.pairing_code) || '-')))
+                        });
+                      }
+                      _context3.next = 9;
+                      break;
+                    case 6:
+                      _context3.prev = 6;
+                      _context3.t0 = _context3["catch"](0);
+                      console.error('onSave error =>', _context3.t0);
+                    case 9:
+                      _context3.prev = 9;
                       setLoading(false);
-                      _context3.next = 5;
+                      return _context3.finish(9);
+                    case 12:
+                      _context3.next = 14;
                       return tableRef.current.loadData();
-                    case 5:
+                    case 14:
                       setPage('list');
-                    case 6:
+                    case 15:
                     case "end":
                       return _context3.stop();
                   }
-                }, _callee3);
+                }, _callee3, null, [[0, 6, 9, 12]]);
               }));
               return function update() {
                 return _ref5.apply(this, arguments);
@@ -338,7 +420,7 @@ export default (function (props) {
             }();
             setLoading(true);
             if (!(type === 'tyro' && status !== 'edit')) {
-              _context4.next = 6;
+              _context4.next = 7;
               break;
             }
             pair(_objectSpread(_objectSpread({}, config), device.connection), function (response) {
@@ -379,15 +461,15 @@ export default (function (props) {
               update();
             });
             return _context4.abrupt("return");
-          case 6:
-            update();
           case 7:
+            update();
+          case 8:
           case "end":
             return _context4.stop();
         }
       }, _callee4);
     }));
-    return function onSave(_x3) {
+    return function onSave(_x3, _x4) {
       return _ref4.apply(this, arguments);
     };
   }();
@@ -479,6 +561,71 @@ export default (function (props) {
   useEffect(function () {
     setPage('list');
   }, [type]);
+
+  /**
+   * @title 保存配对信息
+   * @description MX51设备配对的第一步不是直接保存，而是要先发起配对请求，等刷卡机上配对后，再保存
+   */
+  var onSavePair = /*#__PURE__*/function () {
+    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(device) {
+      var eftposList, response;
+      return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+        while (1) switch (_context6.prev = _context6.next) {
+          case 0:
+            eftposList = [Eftpos.MX51]; // MX51 设备在新增与重连时候需单独发起配对请求
+            if (!(eftposList.includes(type) && (status === DeviceEnum.Add || status === DeviceEnum.Repair))) {
+              _context6.next = 18;
+              break;
+            }
+            _context6.prev = 2;
+            setLoading(true);
+            _context6.next = 6;
+            return pairRequest.run(_objectSpread(_objectSpread({}, (device === null || device === void 0 ? void 0 : device.connection) || {}), {}, {
+              type: type
+            }));
+          case 6:
+            response = _context6.sent;
+            if ((response === null || response === void 0 ? void 0 : response.code) == 200) {
+              pairModalHook.open({
+                data: {
+                  type: type,
+                  device: device,
+                  pairResponse: response === null || response === void 0 ? void 0 : response.data
+                },
+                onCancel: function onCancel() {
+                  pairModalHook.close();
+                },
+                onConfirm: function onConfirm() {
+                  pairModalHook.close();
+                  onSave(device, response === null || response === void 0 ? void 0 : response.data);
+                }
+              });
+            }
+            _context6.next = 13;
+            break;
+          case 10:
+            _context6.prev = 10;
+            _context6.t0 = _context6["catch"](2);
+            console.error('onSavePair error =>', _context6.t0);
+          case 13:
+            _context6.prev = 13;
+            setLoading(false);
+            return _context6.finish(13);
+          case 16:
+            _context6.next = 19;
+            break;
+          case 18:
+            onSave(device);
+          case 19:
+          case "end":
+            return _context6.stop();
+        }
+      }, _callee6, null, [[2, 10, 13, 16]]);
+    }));
+    return function onSavePair(_x5) {
+      return _ref7.apply(this, arguments);
+    };
+  }();
   if (type === Eftpos.Windcave) {
     // 使用 stripe 支付 需要设置 商家参数
     return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(PosTabs, {
@@ -567,7 +714,17 @@ export default (function (props) {
   }), /*#__PURE__*/React.createElement(Drawer, {
     open: page === 'edit',
     onClose: onBack,
-    title: locales.getText('page.eftpos.text.device.add')(status, name),
+    title: type === Eftpos.MX51 ? /*#__PURE__*/React.createElement("span", {
+      style: {
+        display: 'inline-flex',
+        alignItems: 'center',
+        gap: '4px'
+      }
+    }, /*#__PURE__*/React.createElement(Image, {
+      src: mx51SCISvg,
+      preview: false,
+      width: 24
+    }), /*#__PURE__*/React.createElement("span", null, "Simple Cloud Payments")) : locales.getText('page.eftpos.text.device.add')(status, name),
     titleNoWrap: true,
     zIndex: zIndex || 9999,
     destroyOnClose: true,
@@ -578,8 +735,10 @@ export default (function (props) {
     wrapperClassName: "pisell-lowcode__pos_box"
   }, /*#__PURE__*/React.createElement(Device, {
     formItemList: deviceItemList,
-    onSave: onSave,
-    key: "device".concat(type)
+    onSave: onSavePair,
+    key: "device".concat(type),
+    type: type,
+    status: status
   }, pairStatus ? /*#__PURE__*/React.createElement(Form.Item, {
     label: "Status"
   }, /*#__PURE__*/React.createElement(Input, {
@@ -603,5 +762,5 @@ export default (function (props) {
     tyroUrl: tyroUrl,
     tyroVersion: tyroVersion,
     device: deviceItem
-  })), contextHolder);
+  })), contextHolder, pairModalHook.visible && /*#__PURE__*/React.createElement(PairModal, pairModalHook.modalProps));
 });

package/es/components/eftpos/index.less

@@ -88,7 +88,6 @@
   display: flex;
 }
 
-
 .pisell-lowcode__pos_drawer {
   transform: translateZ(0);
 }
@@ -204,3 +203,29 @@
   display: flex;
   flex-direction: column;
 }
+.pisell-lowcode__pos-device-pair-text {
+  padding: 0 24px 0 34px;
+  color: #101828;
+  font-size: 14px;
+  font-weight: 400;
+}
+
+.pisell-lowcode__pos_message
+  .pisell-lowcode__pos_message-notice-content
+  .pisell-lowcode__pos_message-success {
+  display: flex;
+  align-items: center;
+}
+
+.pisell-lowcode__pos_message-custom-content_mx51 {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  justify-content: center;
+
+  > span:last-child {
+    display: flex;
+    gap: 10px;
+    flex-wrap: wrap;
+  }
+}

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

@@ -15,6 +15,7 @@ declare const _default: {
         'page.eftpos.text.edit': string;
         'page.eftpos.text.delete': string;
         'page.eftpos.text.save': string;
+        'page.eftpos.text.pair': string;
         'page.eftpos.text.confim.delete': string;
         'page.eftpos.text.confirm_delete-message': (x: string) => string;
         'page.eftpos.text.confim.cancel': string;
@@ -27,9 +28,21 @@ declare const _default: {
         'page.eftpos.text.table.del.delete': string;
         'page.eftpos.text.table.del.cancel': string;
         'page.eftpos.text.log': string;
+        'page.eftpos.text.settlement': string;
+        'page.eftpos.text.settlement_enquiry': string;
         'page.eftpos.text.setting': string;
         'page.eftpos.text.setting.tip': string;
         'page.eftpos.text.setting.btn': string;
+        'page.eftpos.text.pair.modal.content.text-info': (status: string) => {
+            title: string;
+            description: string;
+            codeTitle: string;
+            cancenButtonText: string;
+            okButtonText: string;
+        } | undefined;
+        'page.eftpos.text.repair.message.warning': string;
+        'page.eftpos.text.settlement.failed': string;
+        'page.eftpos.text.settlement.button.done': string;
     };
     'zh-CN': {
         'page.eftpos.text.manufacturer': string;
@@ -47,6 +60,7 @@ declare const _default: {
         'page.eftpos.text.edit': string;
         'page.eftpos.text.delete': string;
         'page.eftpos.text.save': string;
+        'page.eftpos.text.pair': string;
         'page.eftpos.text.confim.delete': string;
         'page.eftpos.text.confirm_delete-message': (x: string) => string;
         'page.eftpos.text.confim.cancel': string;
@@ -59,9 +73,21 @@ declare const _default: {
         'page.eftpos.text.table.del.delete': string;
         'page.eftpos.text.table.del.cancel': string;
         'page.eftpos.text.log': string;
+        'page.eftpos.text.settlement': string;
+        'page.eftpos.text.settlement_enquiry': string;
         'page.eftpos.text.setting': string;
         'page.eftpos.text.setting.tip': string;
         'page.eftpos.text.setting.btn': string;
+        'page.eftpos.text.pair.modal.content.text-info': (status: string) => {
+            title: string;
+            description: string;
+            codeTitle: string;
+            cancenButtonText: string;
+            okButtonText: string;
+        } | undefined;
+        'page.eftpos.text.repair.message.warning': string;
+        'page.eftpos.text.settlement.failed': string;
+        'page.eftpos.text.settlement.button.done': string;
     };
     'zh-HK': {
         'page.eftpos.text.manufacturer': string;
@@ -79,6 +105,7 @@ declare const _default: {
         'page.eftpos.text.edit': string;
         'page.eftpos.text.delete': string;
         'page.eftpos.text.save': string;
+        'page.eftpos.text.pair': string;
         'page.eftpos.text.confim.delete': string;
         'page.eftpos.text.confirm_delete-message': (x: string) => string;
         'page.eftpos.text.confim.cancel': string;
@@ -91,73 +118,21 @@ declare const _default: {
         'page.eftpos.text.table.del.delete': string;
         'page.eftpos.text.table.del.cancel': string;
         'page.eftpos.text.log': string;
+        'page.eftpos.text.settlement': string;
+        'page.eftpos.text.settlement_enquiry': string;
         'page.eftpos.text.setting': string;
         'page.eftpos.text.setting.tip': string;
         'page.eftpos.text.setting.btn': string;
-    };
-    ja: {
-        'page.eftpos.text.manufacturer': string;
-        'page.eftpos.text.description': string;
-        'page.eftpos.text.status': string;
-        'page.eftpos.text.operation': string;
-        'page.eftpos.text.device': string;
-        'page.eftpos.text.device.add': (status?: string, name?: string) => string;
-        'page.eftpos.text.device.list': string;
-        'page.eftpos.text.device.name': string;
-        'page.eftpos.text.sucahrge': string;
-        'page.eftpos.text.paired': string;
-        'page.eftpos.text.unpaired': string;
-        'page.eftpos.text.repair': string;
-        'page.eftpos.text.edit': string;
-        'page.eftpos.text.delete': string;
-        'page.eftpos.text.save': string;
-        'page.eftpos.text.confim.delete': string;
-        'page.eftpos.text.confirm_delete-message': (x: string) => string;
-        'page.eftpos.text.confim.cancel': string;
-        'page.eftpos.text.table.name': string;
-        'page.eftpos.text.table.status': string;
-        'page.eftpos.text.table.surcharge': string;
-        'page.eftpos.text.table.opeartion': string;
-        'page.eftpos.text.table.del.title': string;
-        'page.eftpos.text.table.del.text': string;
-        'page.eftpos.text.table.del.delete': string;
-        'page.eftpos.text.table.del.cancel': string;
-        'page.eftpos.text.log': string;
-        'page.eftpos.text.setting': string;
-        'page.eftpos.text.setting.tip': string;
-        'page.eftpos.text.setting.btn': string;
-    };
-    pt: {
-        'page.eftpos.text.manufacturer': string;
-        'page.eftpos.text.description': string;
-        'page.eftpos.text.status': string;
-        'page.eftpos.text.operation': string;
-        'page.eftpos.text.device': string;
-        'page.eftpos.text.device.add': (status?: string, name?: string) => string;
-        'page.eftpos.text.device.list': string;
-        'page.eftpos.text.device.name': string;
-        'page.eftpos.text.sucahrge': string;
-        'page.eftpos.text.paired': string;
-        'page.eftpos.text.unpaired': string;
-        'page.eftpos.text.repair': string;
-        'page.eftpos.text.edit': string;
-        'page.eftpos.text.delete': string;
-        'page.eftpos.text.save': string;
-        'page.eftpos.text.confim.delete': string;
-        'page.eftpos.text.confirm_delete-message': (x: string) => string;
-        'page.eftpos.text.confim.cancel': string;
-        'page.eftpos.text.table.name': string;
-        'page.eftpos.text.table.status': string;
-        'page.eftpos.text.table.surcharge': string;
-        'page.eftpos.text.table.opeartion': string;
-        'page.eftpos.text.table.del.title': string;
-        'page.eftpos.text.table.del.text': string;
-        'page.eftpos.text.table.del.delete': string;
-        'page.eftpos.text.table.del.cancel': string;
-        'page.eftpos.text.log': string;
-        'page.eftpos.text.setting': string;
-        'page.eftpos.text.setting.tip': string;
-        'page.eftpos.text.setting.btn': string;
+        'page.eftpos.text.pair.modal.content.text-info': (status: string) => {
+            title: string;
+            description: string;
+            codeTitle: string;
+            cancenButtonText: string;
+            okButtonText: string;
+        } | undefined;
+        'page.eftpos.text.repair.message.warning': string;
+        'page.eftpos.text.settlement.failed': string;
+        'page.eftpos.text.settlement.button.done': string;
     };
 };
 export default _default;