refactor: 完善 Browse 功能

Author: ArgoZhang

src/extensions/BootstrapBlazor.OpcDa/IOpcDaServer.cs

@@ -69,7 +69,7 @@ public interface IOpcDaServer : IDisposable
     /// <param name="filters"></param>
     /// <param name="position"></param>
     /// <returns></returns>
-    OpcBrowseElement[] Browse(string name, OpcBrowseFilters filters, out OpcBrowsePosition position);
+    OpcBrowseElement[] Browse(string name, OpcBrowseFilters filters, out OpcBrowsePosition? position);
 
     /// <summary>
     /// 浏览 OPC Server 中的位号 (即数据项或者标签)

src/extensions/BootstrapBlazor.OpcDa/Mock/MockOpcDaServer.cs

@@ -73,7 +73,20 @@ public HashSet<OpcWriteItem> Write(params HashSet<OpcWriteItem> items)
     public OpcBrowseElement[] Browse(string name, OpcBrowseFilters filters, out OpcBrowsePosition? position)
     {
         position = null;
-        return [];
+        return [
+            new OpcBrowseElement()
+            {
+                Name ="Channel1",
+                IsItem = false,
+                HasChildren = true
+            },
+            new OpcBrowseElement()
+            {
+                Name ="Channel2",
+                IsItem = false,
+                HasChildren = true
+            }
+        ];
     }
 
     /// <summary>

src/extensions/BootstrapBlazor.OpcDa/OpcBrowseElement.cs

@@ -14,22 +14,30 @@ public class OpcBrowseElement
     /// <summary>
     /// 获得/设置 节点名称
     /// </summary>
-    public string Name => _element.Name;
+    public string Name { get; set; }
 
     /// <summary>
     /// 获得/设置 是否是数据项
     /// </summary>
-    public bool IsItem => _element.IsItem;
+    public bool IsItem { get; set; }
 
     /// <summary>
     /// 获得/设置 是否有子节点
     /// </summary>
-    public bool HasChildren => _element.HasChildren;
+    public bool HasChildren { get; set; }
 
-    internal OpcBrowseElement(BrowseElement element)
+    /// <summary>
+    /// 构造函数
+    /// </summary>
+    public OpcBrowseElement()
     {
-        _element = element;
+        Name = "";
     }
 
-    private readonly BrowseElement _element;
+    internal OpcBrowseElement(BrowseElement element)
+    {
+        Name = element.Name;
+        IsItem = element.IsItem;
+        HasChildren = element.HasChildren;
+    }
 }

src/extensions/BootstrapBlazor.OpcDa/OpcDaServer.cs

@@ -46,41 +46,6 @@ public bool Connect(string serverName)
         return IsConnected;
     }
 
-    /// <summary>
-    /// <inheritdoc/>
-    /// </summary>
-    /// <param name="name"></param>
-    /// <param name="filters"></param>
-    /// <param name="position"></param>
-    /// <returns></returns>
-    public OpcBrowseElement[] Browse(string name, OpcBrowseFilters filters, out OpcBrowsePosition position)
-    {
-        if (_server is not { IsConnected: true })
-        {
-            throw new InvalidOperationException("OPC Server is not connected.");
-        }
-
-        var results = _server.Browse(new ItemIdentifier(name), filters.ToFilters(), out var pos);
-        position = new OpcBrowsePosition(pos);
-        return results.Select(element => new OpcBrowseElement(element)).ToArray();
-    }
-
-    /// <summary>
-    /// <inheritdoc/>
-    /// </summary>
-    /// <param name="position"></param>
-    /// <returns></returns>
-    public OpcBrowseElement[] BrowseNext(OpcBrowsePosition position)
-    {
-        if (_server is not { IsConnected: true })
-        {
-            throw new InvalidOperationException("OPC Server is not connected.");
-        }
-
-        var pos = position.Position;
-        return _server.BrowseNext(ref pos).Select(element => new OpcBrowseElement(element)).ToArray();
-    }
-
     /// <summary>
     /// 断开连接方法
     /// </summary>
@@ -176,6 +141,33 @@ private Opc.Da.Server GetOpcServer()
         return _server;
     }
 
+    /// <summary>
+    /// <inheritdoc/>
+    /// </summary>
+    /// <param name="name"></param>
+    /// <param name="filters"></param>
+    /// <param name="position"></param>
+    /// <returns></returns>
+    public OpcBrowseElement[] Browse(string name, OpcBrowseFilters filters, out OpcBrowsePosition? position)
+    {
+        var server = GetOpcServer();
+        var results = server.Browse(new ItemIdentifier(name), filters.ToFilters(), out var pos);
+        position = new OpcBrowsePosition(pos);
+        return results.Select(element => new OpcBrowseElement(element)).ToArray();
+    }
+
+    /// <summary>
+    /// <inheritdoc/>
+    /// </summary>
+    /// <param name="position"></param>
+    /// <returns></returns>
+    public OpcBrowseElement[] BrowseNext(OpcBrowsePosition position)
+    {
+        var server = GetOpcServer();
+        var pos = position.Position;
+        return server.BrowseNext(ref pos).Select(element => new OpcBrowseElement(element)).ToArray();
+    }
+
     /// <summary>
     /// Dispose 方法
     /// </summary>