lty-protocol 1.0.40 → 1.0.42

package/dist/models/collection.d.ts

@@ -12,7 +12,13 @@ declare enum ProtocolType {
     OPCUA_SERVER = "OPCUAServer",
     ETHER_CAT_MASTER = "EtherCatMaster",
     ETHER_CAT_SLAVE = "EtherCatSlave",
-    ETHER_CAT_MODULE = "EtherCatModule"
+    ETHER_CAT_MODULE = "EtherCatModule",
+    IO_BUS_D_SERIES = "IoBusDSeries",
+    IO_BUS_D_SERIES_DEVICE = "IO_Bus_D_Series_Device",
+    IO_BUS_D_SERIES_DEVICE_SUB_MODULE = "IO_Bus_D_Series_Device_Sub_Module",
+    LOCALBUS = "LocalBus",// localbus根节点
+    LOCALBUS_MODULE = "LocalBus_Module",// 子模块菜单
+    LOCALBUS_SUB_MODULE = "LocalBus_Sub_Module"
 }
 declare const protocolMap: {
     Pprogrammable: number;
@@ -41,21 +47,38 @@ declare const protocolMap: {
 };
 /**
  * 协议集合
- * @function init 初始化协议集合
- * @function build 编译协议集合
- * @function get 根据ID获取协议
- * @function add 添加协议
- * @function delete 删除协议
- * @function clear 清空协议集合
+ * 负责协议模型的注册、实例化和统一管理。
  */
 declare class ProtocolCollection implements ICollection<ProtocolItem> {
-    protected map: Map<number, ProtocolItem>;
+    protected map: Map<string | number, ProtocolItem>;
     constructor();
+    /**
+     * 用持久化数据重新构建协议实例集合。
+     */
     init(data: any[]): void;
+    /**
+     * 预留的协议集合编译出口，后续可在这里汇总生成设备配置。
+     */
     build(deviceId: number): any;
-    get(id: number | number[]): ProtocolItem | ProtocolItem[];
+    /**
+     * 按单个或多个 ID 获取协议实例。
+     */
+    get(id: string | number | Array<string | number>): ProtocolItem | ProtocolItem[];
+    /**
+     * 获取当前集合中的全部协议实例。
+     */
+    getAll(): ProtocolItem[];
+    /**
+     * 添加协议实例到集合中。
+     */
     add(data: ProtocolItem): void;
-    delete(id: number | number[]): void;
+    /**
+     * 删除单个或多个协议实例。
+     */
+    delete(id: string | number | Array<string | number>): void;
+    /**
+     * 清空当前协议集合。
+     */
     private clear;
 }
 export { ProtocolType, protocolMap, ProtocolCollection, ProtocolItem };

package/dist/models/modbus/EthernetProtocolItem.d.ts

@@ -0,0 +1,11 @@
+import { ProtocolItem } from '../collection';
+/**
+ * 以太网协议模型，当前主要负责装载默认配置。
+ */
+declare class EthernetProtocolItem extends ProtocolItem {
+    type: string;
+    moduleType: number;
+    constructor(data: any);
+    static fromPlain(data: any): EthernetProtocolItem;
+}
+export { EthernetProtocolItem };

package/dist/models/modbus/ModbusTCPClientProtocolItem.d.ts

@@ -0,0 +1,59 @@
+import { ProtocolItem } from '../collection';
+import { AddressStartConfig, IoMappingNode } from './types';
+/**
+ * Modbus TCP Client 协议模型，负责管理从站通道并生成对应的 IO 映射树。
+ */
+declare class ModbusTCPClientProtocolItem extends ProtocolItem {
+    type: string;
+    moduleType: number;
+    protected handleByteStartAddrChange(startAddress: AddressStartConfig): void;
+    constructor(data: any);
+    static fromPlain(data: any): ModbusTCPClientProtocolItem;
+    hasIoMappingChildren(node: IoMappingNode): boolean;
+    getIoMappingChildren(node: IoMappingNode): IoMappingNode[] | {
+        id: string;
+        name: string;
+        type: string;
+        channel: string;
+        address: string;
+        prefix: string;
+        length: number;
+        __byteOffset: number;
+        __elementIndex: number;
+    }[];
+    /**
+     * 设置客户端过程数据区的起始地址。
+     * 这里传入的是 byte 偏移，不是 %IW/%QW 的序号。
+     */
+    /**
+     * 获取当前客户端过程数据区的布局信息。
+     * 返回值中的起止位置和长度都使用 byte 偏移表示。
+     */
+    /**
+     * 新增从站通道后同步刷新 IO 映射。
+     */
+    addChannel(data: any): void;
+    /**
+     * 编辑从站通道后同步刷新 IO 映射。
+     */
+    editChannel(data: any): void;
+    /**
+     * 删除从站通道后同步刷新 IO 映射。
+     */
+    deleteChannel(ids: string[]): void;
+    /**
+     * 将通道配置转换为页面可展示的 IO 树结构。
+     */
+    /**
+     * 根据客户端通道配置重新生成 IO 映射树。
+     * startAddress 为可选的 byte 偏移起点。
+     */
+    /**
+     * 根据客户端通道配置重新生成 IO 映射树。
+     * startAddress 为可选的 byte 偏移起点。
+     * BYTE 类型的长度字段按 bit 数解释，例如长度 11 会生成 2 个 BYTE 节点，最后 1 个节点只展开 3 个 bit。
+     * WORD 类型的长度字段仍按 word 数量解释，不按 bit 长度折算。
+     */
+    updateIoData(startAddress?: AddressStartConfig): void;
+}
+export { ModbusTCPClientProtocolItem };

package/dist/models/modbus/ModbusTCPServerProtocolItem.d.ts

@@ -0,0 +1,11 @@
+import { ProtocolItem } from '../collection';
+/**
+ * Modbus TCP Server 协议模型，负责装载服务端默认配置。
+ */
+declare class ModbusTCPServerProtocolItem extends ProtocolItem {
+    type: string;
+    moduleType: number;
+    constructor(data: any);
+    static fromPlain(data: any): ModbusTCPServerProtocolItem;
+}
+export { ModbusTCPServerProtocolItem };

package/dist/models/modbus/ModbusTCPSlaveDeviceProtocolItem.d.ts

@@ -0,0 +1,48 @@
+import { ProtocolItem } from '../collection';
+import { AddressStartConfig, IoMappingNode } from './types';
+/**
+ * Modbus TCP 从站设备模型，负责根据配置动态生成 IO 映射和地址布局。
+ */
+declare class ModbusTCPSlaveDeviceProtocolItem extends ProtocolItem {
+    type: string;
+    moduleType: number;
+    protected handleByteStartAddrChange(startAddress: AddressStartConfig): void;
+    constructor(data: any);
+    static fromPlain(data: any): ModbusTCPSlaveDeviceProtocolItem;
+    hasIoMappingChildren(node: IoMappingNode): boolean;
+    getIoMappingChildren(node: IoMappingNode): IoMappingNode[] | {
+        id: string;
+        name: string;
+        type: string;
+        channel: string;
+        address: string;
+        prefix: string;
+        length: number;
+        __byteOffset: number;
+        __elementIndex: number;
+    }[];
+    /**
+     * 设置从站设备 IO 映射的起始地址。
+     * 这里传入的是 byte 偏移，不是 %IW/%QW 的序号。
+     */
+    /**
+     * 返回当前 I/Q 地址区的起始位置、占用长度和最终结束地址。
+     */
+    /**
+     * 返回当前 I/Q 地址区布局信息。
+     * 返回值中的起止位置和长度都使用 byte 偏移表示。
+     */
+    /**
+     * 监听关键配置项变化，并在变更时重新生成 IO 映射。
+     */
+    setupConfigListener(): void;
+    /**
+     * 根据保持寄存器、输入寄存器、线圈等配置生成完整 IO 映射树。
+     */
+    /**
+     * 根据从站配置生成完整 IO 映射树。
+     * startAddress 为可选的 byte 偏移起点。
+     */
+    updateIoDataFromConfig(startAddress?: AddressStartConfig): void;
+}
+export { ModbusTCPSlaveDeviceProtocolItem };

package/dist/models/modbus/addressAllocator.d.ts

@@ -0,0 +1,30 @@
+import { AddressStartConfig, IoMappingLayoutInfo, MemoryFamily } from './types';
+declare class IoMappingAddressAllocator {
+    private startAddress;
+    private cursor;
+    constructor(startAddress?: AddressStartConfig);
+    /**
+     * 重置地址分配游标。
+     * startAddress 使用 byte 偏移作为起点，不是 WORD 序号。
+     */
+    reset(startAddress?: AddressStartConfig): void;
+    /**
+     * 在指定 I/Q 区按 byte 长度推进游标，并返回本次分配的起始 byte 偏移。
+     */
+    advance(family: MemoryFamily, byteLength: number, alignment?: number): number;
+    /**
+     * 根据绝对 byte 偏移换算 WORD 序号。
+     */
+    getWordElementIndex(family: MemoryFamily, byteOffset: number): number;
+    /**
+     * BYTE 地址直接使用绝对 byte 偏移。
+     */
+    getByteElementIndex(byteOffset: number): number;
+    /**
+     * 返回当前地址布局信息。
+     * start/end/byteLength 都以 byte 偏移表示。
+     */
+    getLayoutInfo(): IoMappingLayoutInfo;
+    private alignOffset;
+}
+export { IoMappingAddressAllocator };

package/dist/models/modbus/configParser.d.ts

@@ -1,4 +1,5 @@
 declare class ConfigParser {
+    static processData(data: any[]): any[];
     static getDefaultConfig(data: any): {
         baseInfo: any;
         config: any;

package/dist/models/modbus/ethernet.json.d.ts

@@ -113,7 +113,15 @@ declare const _default: {
         },
         "dataType": "string",
         "componentType": "select",
-        "defaultValue": "-1"
+        "defaultValue": "-1",
+        "options": [
+          {
+            "label": {
+              "i18nKey": "defaultTask"
+            },
+            "value": "-1"
+          }
+        ]
       }
     ]
   }

package/dist/models/modbus/index.d.ts

@@ -1,29 +1,7 @@
-import { ProtocolItem } from '../collection';
-declare class EthernetProtocolItem extends ProtocolItem {
-    type: string;
-    moduleType: number;
-    baseInfo: any;
-    config: any;
-    tab: any;
-    constructor(data: any);
-    static fromPlain(data: any): EthernetProtocolItem;
-}
-declare class ModbusTCPServerProtocolItem extends ProtocolItem {
-    type: string;
-    moduleType: number;
-    constructor(data: any);
-    static fromPlain(data: any): ModbusTCPServerProtocolItem;
-}
-declare class ModbusTCPClientProtocolItem extends ProtocolItem {
-    type: string;
-    moduleType: number;
-    constructor(data: any);
-    static fromPlain(data: any): ModbusTCPClientProtocolItem;
-}
-declare class ModbusTCPSlaveDeviceProtocolItem extends ProtocolItem {
-    type: string;
-    moduleType: number;
-    constructor(data: any);
-    static fromPlain(data: any): ModbusTCPSlaveDeviceProtocolItem;
-}
-export { EthernetProtocolItem, ModbusTCPServerProtocolItem, ModbusTCPClientProtocolItem, ModbusTCPSlaveDeviceProtocolItem };
+export * from './types';
+export * from './ioMapping';
+export * from './addressAllocator';
+export * from './EthernetProtocolItem';
+export * from './ModbusTCPServerProtocolItem';
+export * from './ModbusTCPClientProtocolItem';
+export * from './ModbusTCPSlaveDeviceProtocolItem';

package/dist/models/modbus/ioMapping.d.ts

@@ -0,0 +1,33 @@
+import { AddressCursorState, AddressStartConfig, IoMappingNode, MemoryFamily } from './types';
+export declare const getElementType: (type: string) => "WORD" | "BYTE" | null;
+export declare const getMemoryFamily: (prefix: string) => MemoryFamily;
+export declare const getBitPrefix: (family: MemoryFamily) => "%QX" | "%IX";
+export declare const getElementPrefix: (family: MemoryFamily, elementType: "WORD" | "BYTE") => "%QW" | "%IW" | "%QB" | "%IB";
+export declare const normalizeStartConfig: (startAddress?: AddressStartConfig) => AddressCursorState;
+export declare const cloneCursorState: (state: AddressCursorState) => AddressCursorState;
+export declare const formatFinalBitAddress: (family: MemoryFamily, endByteOffset: number, startByteOffset: number) => string | null;
+export declare const createBitChildren: (parent: IoMappingNode, bitCount: number) => {
+    id: string;
+    name: string;
+    type: string;
+    channel: string;
+    address: string;
+    prefix: string;
+    length: number;
+    __byteOffset: number;
+    __elementIndex: number;
+}[];
+export declare const createElementChildren: (parent: IoMappingNode) => IoMappingNode[];
+export declare const hasIoTreeChildren: (node: IoMappingNode) => boolean;
+export declare const getIoTreeChildren: (node: IoMappingNode) => IoMappingNode[] | {
+    id: string;
+    name: string;
+    type: string;
+    channel: string;
+    address: string;
+    prefix: string;
+    length: number;
+    __byteOffset: number;
+    __elementIndex: number;
+}[];
+export declare const buildIoTree: (row: Omit<IoMappingNode, "children">) => IoMappingNode;

package/dist/models/modbus/modbusTcpClient.json.d.ts

@@ -0,0 +1,112 @@
+declare const _default: {
+  "type": "ModbusTCPClient",
+  "baseInfo": [
+    {
+      "key": "name",
+      "name": {
+        "i18nKey": "name"
+      },
+      "defaultValue": "ModbusTCPClient"
+    },
+    {
+      "key": "supplier",
+      "name": {
+        "i18nKey": "supplier"
+      },
+      "defaultValue": {
+        "i18nKey": "company"
+      }
+    },
+    {
+      "key": "version",
+      "name": {
+        "i18nKey": "verison"
+      },
+      "defaultValue": "1.0.0.0"
+    },
+    {
+      "key": "description",
+      "name": {
+        "i18nKey": "description"
+      },
+      "defaultValue": {
+        "i18nKey": "descriptionMap.modbusTcpClient"
+      }
+    },
+    {
+      "key": "category",
+      "name": {
+        "i18nKey": "category"
+      },
+      "defaultValue": {
+        "i18nKey": "modbusTcpClient"
+      }
+    }
+  ],
+  "tab": [
+    {
+      "name": {
+        "i18nKey": "general"
+      },
+      "key": "general"
+    },
+    {
+      "name": {
+        "i18nKey": "modbusSlaveChannel"
+      },
+      "key": "modbusSlaveChannel"
+    },
+    {
+      "name": {
+        "i18nKey": "ioMapping"
+      },
+      "key": "ioMapping"
+    },
+    {
+      "name": {
+        "i18nKey": "status"
+      },
+      "key": "status"
+    }
+  ],
+  "configuration": {
+    "general": [
+      {
+        "key": "slaveIpAddress",
+        "name": {
+          "i18nKey": "slaveIpAddress"
+        },
+        "dataType": "string",
+        "componentType": "ipInput",
+        "defaultValue": "192.168.0.1"
+      },
+      {
+        "key": "port",
+        "name": {
+          "i18nKey": "port"
+        },
+        "dataType": "number",
+        "max": 65535,
+        "min": 0,
+        "componentType": "numInput",
+        "defaultValue": 502
+      },
+      {
+        "key": "responseTimeout",
+        "name": {
+          "i18nKey": "responseTimeout"
+        },
+        "dataType": "number",
+        "max": 4294967295,
+        "min": 0,
+        "componentType": "numInput",
+        "defaultValue": 1000
+      }
+    ],
+    "modbusSlaveChannel": [],
+    "ioMapping": [],
+    "status": []
+  }
+};
+
+export default _default;

package/dist/models/modbus/modbusTcpServer.json.d.ts

@@ -0,0 +1,108 @@
+declare const _default: {
+  "type": "ModbusTCPServer",
+  "baseInfo": [
+    {
+      "key": "name",
+      "name": {
+        "i18nKey": "name"
+      },
+      "defaultValue": "ModbusTCPServer"
+    },
+    {
+      "key": "supplier",
+      "name": {
+        "i18nKey": "supplier"
+      },
+      "defaultValue": {
+        "i18nKey": "company"
+      }
+    },
+    {
+      "key": "version",
+      "name": {
+        "i18nKey": "verison"
+      },
+      "defaultValue": "1.0.0.0"
+    },
+    {
+      "key": "description",
+      "name": {
+        "i18nKey": "description"
+      },
+      "defaultValue": {
+        "i18nKey": "descriptionMap.modbusTcpServer"
+      }
+    },
+    {
+      "key": "category",
+      "name": {
+        "i18nKey": "category"
+      },
+      "defaultValue": {
+        "i18nKey": "modbusTcpServer"
+      }
+    }
+  ],
+  "tab": [
+    {
+      "name": {
+        "i18nKey": "general"
+      },
+      "key": "general"
+    },
+    {
+      "name": {
+        "i18nKey": "ioMapping"
+      },
+      "key": "ioMapping"
+    }
+  ],
+  "configuration": {
+    "general": [
+      {
+        "key": "responseTimeout",
+        "name": {
+          "i18nKey": "responseTimeout"
+        },
+        "dataType": "number",
+        "max": 4294967295,
+        "min": 0,
+        "componentType": "numInput",
+        "defaultValue": 1000
+      },
+      {
+        "key": "socketTimeout",
+        "name": {
+          "i18nKey": "socketTimeout"
+        },
+        "dataType": "number",
+        "max": 4294967295,
+        "min": 0,
+        "componentType": "numInput",
+        "defaultValue": 10
+      },
+      {
+        "key": "reconnect",
+        "name": {
+          "i18nKey": "reconnect"
+        },
+        "dataType": "boolean",
+        "componentType": "switch",
+        "defaultValue": true
+      }
+    ],
+    "ioMapping": [
+      {
+        "key": "busCycleTask",
+        "name": {
+          "i18nKey": "busCycleTask"
+        },
+        "dataType": "string",
+        "componentType": "select",
+        "defaultValue": "-1"
+      }
+    ]
+  }
+};
+
+export default _default;