@pisell/materials 1.0.434 → 1.0.436

package/es/components/iconfont/index.js

@@ -2,7 +2,7 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
 import { createFromIconfontCN } from '@ant-design/icons';
 import React from 'react';
 var MyIcon = createFromIconfontCN({
-  scriptUrl: 'https://unpkg.com/@pisell/materials@3.0.37/iconfont/iconfont.js' // 在 iconfont.cn 上生成
+  scriptUrl: 'https://static.pisellcdn.com/pisell2iconfont.js' // 在 iconfont.cn 上生成
 });
 
 var IconFont = function IconFont(props) {

package/es/components/pisellInformationEntry/constants.d.ts

@@ -1,3 +1,13 @@
 import { EntryModeType } from './index';
 export declare const entryModeTextIcon: Record<EntryModeType['type'], any>;
+export declare const entryModeErrorTextIcon: {
+    scanner: {
+        icon: string;
+        text: string;
+    };
+    nfc: {
+        icon: string;
+        text: string;
+    };
+};
 export declare const passiveModeType: string[];

package/es/components/pisellInformationEntry/constants.js

@@ -16,6 +16,16 @@ export var entryModeTextIcon = {
     text: 'NFC ready'
   }
 };
+export var entryModeErrorTextIcon = {
+  scanner: {
+    icon: 'pisell2-a-Scanner11',
+    text: 'Scanner'
+  },
+  nfc: {
+    icon: 'pisell2-a-NFC1',
+    text: 'NFC'
+  }
+};
 
 // 没有操作界面的输入模式
 export var passiveModeType = ['scanner', 'nfc'];

package/es/components/pisellInformationEntry/hooks/useTerminalPeripherals.d.ts

@@ -1,6 +1,6 @@
 declare type Peripherals = {
-    scanner: 'none' | 'connected' | 'notConnected';
-    nfc: 'none' | 'connected' | 'notConnected';
+    scanner: 'none' | 'connected' | 'disconnect';
+    nfc: 'none' | 'connected' | 'disconnect';
 };
 declare const useTerminalPeripherals: (onChange?: ((val: string) => void) | undefined) => {
     peripheralsStatus: Peripherals;

package/es/components/pisellInformationEntry/hooks/useTerminalPeripherals.js

@@ -21,8 +21,13 @@ var useTerminalPeripherals = function useTerminalPeripherals(onChange) {
   useEffect(function () {
     var _interaction$utils, _interaction$utils$mo, _interaction$utils2, _interaction$utils2$p, _interaction$utils3, _interaction$utils3$m;
     // 获取外部设备扫描结果
-    interaction === null || interaction === void 0 ? void 0 : (_interaction$utils = interaction.utils) === null || _interaction$utils === void 0 ? void 0 : (_interaction$utils$mo = _interaction$utils.mountFunction) === null || _interaction$utils$mo === void 0 ? void 0 : _interaction$utils$mo.call(_interaction$utils, 'global', 'peripheralsResult', function (val) {
-      onChange === null || onChange === void 0 ? void 0 : onChange(val.value);
+    interaction === null || interaction === void 0 ? void 0 : (_interaction$utils = interaction.utils) === null || _interaction$utils === void 0 ? void 0 : (_interaction$utils$mo = _interaction$utils.mountFunction) === null || _interaction$utils$mo === void 0 ? void 0 : _interaction$utils$mo.call(_interaction$utils, 'global', 'peripheralsResult', function (strVal) {
+      try {
+        var _val = JSON.parse(strVal);
+        onChange === null || onChange === void 0 ? void 0 : onChange(_val.value);
+      } catch (err) {
+        console.error(err);
+      }
     });
 
     // 主动获取设备连接状态
@@ -33,8 +38,13 @@ var useTerminalPeripherals = function useTerminalPeripherals(onChange) {
     });
 
     // 设备当前连接状态返回
-    interaction === null || interaction === void 0 ? void 0 : (_interaction$utils3 = interaction.utils) === null || _interaction$utils3 === void 0 ? void 0 : (_interaction$utils3$m = _interaction$utils3.mountFunction) === null || _interaction$utils3$m === void 0 ? void 0 : _interaction$utils3$m.call(_interaction$utils3, 'global', 'peripheralsStatus', function (peripherals) {
-      setPeripheralsStatus(peripherals);
+    interaction === null || interaction === void 0 ? void 0 : (_interaction$utils3 = interaction.utils) === null || _interaction$utils3 === void 0 ? void 0 : (_interaction$utils3$m = _interaction$utils3.mountFunction) === null || _interaction$utils3$m === void 0 ? void 0 : _interaction$utils3$m.call(_interaction$utils3, 'global', 'peripheralsStatus', function (strPeripherals) {
+      try {
+        var peripherals = JSON.parse(strPeripherals);
+        setPeripheralsStatus(peripherals);
+      } catch (err) {
+        console.error(err);
+      }
     });
   }, []);
   return {

package/es/components/pisellInformationEntry/index.js

@@ -19,7 +19,7 @@ import classNames from 'classnames';
 import usePisellConfig from "../pisell-config-provider/hooks/usePisellConfig";
 import PisellCard from "../pisellCard";
 import Iconfont from "../iconfont";
-import { entryModeTextIcon, passiveModeType } from "./constants";
+import { entryModeErrorTextIcon, entryModeTextIcon, passiveModeType } from "./constants";
 import Scan from "./Scan";
 import Button from "../button";
 import Input from "./Input";
@@ -176,10 +176,15 @@ var PisellInformationEntry = function PisellInformationEntry(props) {
     className: "pisell-information-entry-modes"
   }, availableEntryModes.map(function (item) {
     var detail = entryModeTextIcon[item.type];
+    var icon = detail.icon;
+    if (['scanner', 'nfc'].includes(item.type)) {
+      var disconnect = entryModeErrorTextIcon[item.type];
+      icon = peripheralsStatus[item.type] === 'connected' ? detail.icon : disconnect.icon;
+    }
     return /*#__PURE__*/React.createElement(CardButton, {
       bordered: !passiveModeType.includes(item.type),
       icon: /*#__PURE__*/React.createElement(Iconfont, {
-        type: detail.icon,
+        type: icon,
         className: "pisell-card-button-icon"
       }),
       className: classNames('pisell-information-entry-item', _defineProperty({}, 'pisell-entry-ready', passiveModeType.includes(item.type))),

package/es/components/pisellInformationEntry/index.less

@@ -23,7 +23,7 @@
       flex: 1;
       text-align: center;
       cursor: pointer;
-      min-width: 165px;
+      min-width: 140px;
       .pisell-card-button-icon {
         height: 48px;
         font-size: 36px;

package/lib/components/iconfont/index.js

@@ -35,7 +35,7 @@ module.exports = __toCommonJS(iconfont_exports);
 var import_icons = require("@ant-design/icons");
 var import_react = __toESM(require("react"));
 var MyIcon = (0, import_icons.createFromIconfontCN)({
-  scriptUrl: "https://unpkg.com/@pisell/materials@3.0.37/iconfont/iconfont.js"
+  scriptUrl: "https://static.pisellcdn.com/pisell2iconfont.js"
   // 在 iconfont.cn 上生成
 });
 var IconFont = (props) => {

package/lib/components/pisellInformationEntry/constants.d.ts

@@ -1,3 +1,13 @@
 import { EntryModeType } from './index';
 export declare const entryModeTextIcon: Record<EntryModeType['type'], any>;
+export declare const entryModeErrorTextIcon: {
+    scanner: {
+        icon: string;
+        text: string;
+    };
+    nfc: {
+        icon: string;
+        text: string;
+    };
+};
 export declare const passiveModeType: string[];

package/lib/components/pisellInformationEntry/constants.js

@@ -19,6 +19,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/components/pisellInformationEntry/constants.ts
 var constants_exports = {};
 __export(constants_exports, {
+  entryModeErrorTextIcon: () => entryModeErrorTextIcon,
   entryModeTextIcon: () => entryModeTextIcon,
   passiveModeType: () => passiveModeType
 });
@@ -41,9 +42,20 @@ var entryModeTextIcon = {
     text: "NFC ready"
   }
 };
+var entryModeErrorTextIcon = {
+  scanner: {
+    icon: "pisell2-a-Scanner11",
+    text: "Scanner"
+  },
+  nfc: {
+    icon: "pisell2-a-NFC1",
+    text: "NFC"
+  }
+};
 var passiveModeType = ["scanner", "nfc"];
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  entryModeErrorTextIcon,
   entryModeTextIcon,
   passiveModeType
 });

package/lib/components/pisellInformationEntry/hooks/useTerminalPeripherals.d.ts

@@ -1,6 +1,6 @@
 declare type Peripherals = {
-    scanner: 'none' | 'connected' | 'notConnected';
-    nfc: 'none' | 'connected' | 'notConnected';
+    scanner: 'none' | 'connected' | 'disconnect';
+    nfc: 'none' | 'connected' | 'disconnect';
 };
 declare const useTerminalPeripherals: (onChange?: ((val: string) => void) | undefined) => {
     peripheralsStatus: Peripherals;

package/lib/components/pisellInformationEntry/hooks/useTerminalPeripherals.js

@@ -48,8 +48,13 @@ var useTerminalPeripherals = (onChange) => {
       _a2,
       "global",
       "peripheralsResult",
-      (val) => {
-        onChange == null ? void 0 : onChange(val.value);
+      (strVal) => {
+        try {
+          const val = JSON.parse(strVal);
+          onChange == null ? void 0 : onChange(val.value);
+        } catch (err) {
+          console.error(err);
+        }
       }
     );
     (_d = (_c = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _c.postMessageToApp) == null ? void 0 : _d.call(_c, {
@@ -61,8 +66,13 @@ var useTerminalPeripherals = (onChange) => {
       _e,
       "global",
       "peripheralsStatus",
-      (peripherals) => {
-        setPeripheralsStatus(peripherals);
+      (strPeripherals) => {
+        try {
+          const peripherals = JSON.parse(strPeripherals);
+          setPeripheralsStatus(peripherals);
+        } catch (err) {
+          console.error(err);
+        }
       }
     );
   }, []);

package/lib/components/pisellInformationEntry/index.js

@@ -150,6 +150,11 @@ var PisellInformationEntry = (props) => {
     }
   ))), isShowEntryModes && /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-information-entry-modes" }, availableEntryModes.map((item) => {
     const detail = import_constants.entryModeTextIcon[item.type];
+    let icon = detail.icon;
+    if (["scanner", "nfc"].includes(item.type)) {
+      const disconnect = import_constants.entryModeErrorTextIcon[item.type];
+      icon = peripheralsStatus[item.type] === "connected" ? detail.icon : disconnect.icon;
+    }
     return /* @__PURE__ */ import_react.default.createElement(
       CardButton,
       {
@@ -157,7 +162,7 @@ var PisellInformationEntry = (props) => {
         icon: /* @__PURE__ */ import_react.default.createElement(
           import_iconfont.default,
           {
-            type: detail.icon,
+            type: icon,
             className: "pisell-card-button-icon"
           }
         ),

package/lib/components/pisellInformationEntry/index.less

@@ -23,7 +23,7 @@
       flex: 1;
       text-align: center;
       cursor: pointer;
-      min-width: 165px;
+      min-width: 140px;
       .pisell-card-button-icon {
         height: 48px;
         font-size: 36px;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/materials",
-  "version": "1.0.434",
+  "version": "1.0.436",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -64,9 +64,9 @@
     "react-virtualized-auto-sizer": "^1.0.20",
     "crypto-js": "^4.2.0",
     "@zxing/library": "0.21.2",
+    "@pisell/utils": "1.0.42",
     "@pisell/icon": "0.0.10",
-    "@pisell/date-picker": "1.0.111",
-    "@pisell/utils": "1.0.42"
+    "@pisell/date-picker": "1.0.111"
   },
   "peerDependencies": {
     "react": "^18.0.0",