feat: 增加 OpcBrowseFilterType 枚举

Author: ArgoZhang

src/extensions/BootstrapBlazor.OpcDa/Extensions/Extensions.cs

@@ -25,14 +25,25 @@ public static IOpcSubscription ToOpcSubscription(this ISubscription subscription
 
     public static ISubscription CreateSubscription(this Server server, string name, int updateRate = 1000, bool active = true) => server.CreateSubscription(new SubscriptionState { Name = name, Deadband = 0, UpdateRate = updateRate, Active = active });
 
-    public static BrowseFilters ToFilters(this OpcBrowseFilters filtes)
+    public static BrowseFilters ToFilters(this OpcBrowseFilters filters)
     {
         return new BrowseFilters
         {
-            ReturnAllProperties = filtes.ReturnAllProperties,
-            ReturnPropertyValues = filtes.ReturnPropertyValues,
-            MaxElementsReturned = filtes.MaxElementsReturned,
-            ElementNameFilter = filtes.ElementNameFilter
+            ReturnAllProperties = filters.ReturnAllProperties,
+            ReturnPropertyValues = filters.ReturnPropertyValues,
+            MaxElementsReturned = filters.MaxElementsReturned,
+            ElementNameFilter = filters.ElementNameFilter,
+            BrowseFilter = filters.BrowseFilter.ToBrowseFilter()
+        };
+    }
+
+    public static browseFilter ToBrowseFilter(this OpcBrowseFilterType filterType)
+    {
+        return filterType switch
+        {
+            OpcBrowseFilterType.All => browseFilter.all,
+            OpcBrowseFilterType.Branch => browseFilter.branch,
+            _ => browseFilter.item
         };
     }
 }

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

@@ -3,6 +3,7 @@
 // Website: https://www.blazor.zone or https://argozhang.github.io/
 
 using Opc.Da;
+using System.Net.Http.Headers;
 
 namespace BootstrapBlazor.OpcDa;
 
@@ -73,20 +74,60 @@ public HashSet<OpcWriteItem> Write(params HashSet<OpcWriteItem> items)
     public OpcBrowseElement[] Browse(string name, OpcBrowseFilters filters, out OpcBrowsePosition? position)
     {
         position = null;
-        return [
-            new OpcBrowseElement()
-            {
-                Name ="Channel1",
-                IsItem = false,
-                HasChildren = true
-            },
-            new OpcBrowseElement()
-            {
-                Name ="Channel2",
-                IsItem = false,
-                HasChildren = true
-            }
-        ];
+        if (string.IsNullOrEmpty(name))
+        {
+            return [
+                new OpcBrowseElement()
+                {
+                    Name ="Channel1",
+                    ItemName = "Channel1",
+                    IsItem = false,
+                    HasChildren = true
+                },
+                new OpcBrowseElement()
+                {
+                    Name ="Channel2",
+                    ItemName = "Channel2",
+                    IsItem = false,
+                    HasChildren = true
+                }
+            ];
+        }
+
+        if (name == "Channel1")
+        {
+            return [
+                new OpcBrowseElement()
+                {
+                    Name ="Device1",
+                    ItemName = "Channel1.Device1",
+                    IsItem = false,
+                    HasChildren = true
+                }
+            ];
+        }
+
+        if (name == "Channel1.Device1")
+        {
+            return [
+                new OpcBrowseElement()
+                {
+                    Name ="Tag1",
+                    ItemName = "Channel1.Device1.Tag1",
+                    IsItem = true,
+                    HasChildren = false
+                },
+                new OpcBrowseElement()
+                {
+                    Name ="Tag2",
+                    ItemName = "Channel1.Device1.Tag2",
+                    IsItem = true,
+                    HasChildren = false
+                }
+            ];
+        }
+
+        return [];
     }
 
     /// <summary>

src/extensions/BootstrapBlazor.OpcDa/OpcBrowseElement.cs

@@ -16,6 +16,11 @@ public class OpcBrowseElement
     /// </summary>
     public string Name { get; set; }
 
+    /// <summary>
+    /// 获得/设置 Item 名称
+    /// </summary>
+    public string ItemName { get; set; }
+
     /// <summary>
     /// 获得/设置 是否是数据项
     /// </summary>
@@ -32,11 +37,13 @@ public class OpcBrowseElement
     public OpcBrowseElement()
     {
         Name = "";
+        ItemName = "";
     }
 
     internal OpcBrowseElement(BrowseElement element)
     {
         Name = element.Name;
+        ItemName = element.ItemName;
         IsItem = element.IsItem;
         HasChildren = element.HasChildren;
     }

src/extensions/BootstrapBlazor.OpcDa/OpcBrowseFilterType.cs

@@ -0,0 +1,26 @@
+// Copyright (c) Argo Zhang (argo@163.com). All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+// Website: https://www.blazor.zone or https://argozhang.github.io/
+
+namespace BootstrapBlazor.OpcDa;
+
+/// <summary>
+/// OpcDa 浏览过滤器类型枚举
+/// </summary>
+public enum OpcBrowseFilterType
+{
+    /// <summary>
+    /// 全部
+    /// </summary>
+    All,
+
+    /// <summary>
+    /// 分支
+    /// </summary>
+    Branch,
+
+    /// <summary>
+    /// 数据项
+    /// </summary>
+    Item
+}

src/extensions/BootstrapBlazor.OpcDa/OpcBrowseFilters.cs

@@ -28,4 +28,9 @@ public class OpcBrowseFilters
     /// 获得/设置 是否返回属性值
     /// </summary>
     public bool ReturnPropertyValues { get; set; }
+
+    /// <summary>
+    /// 获得/设置 浏览过滤器类型
+    /// </summary>
+    public OpcBrowseFilterType BrowseFilter { get; set; }
 }

src/extensions/BootstrapBlazor.OpcDa/OpcBrowsePosition.cs

@@ -9,10 +9,10 @@ namespace BootstrapBlazor.OpcDa;
 /// </summary>
 public class OpcBrowsePosition
 {
-    internal OpcBrowsePosition(Opc.Da.BrowsePosition position)
+    internal OpcBrowsePosition(Opc.Da.BrowsePosition? position)
     {
         Position = position;
     }
 
-    internal Opc.Da.BrowsePosition Position { get; set; }
+    internal Opc.Da.BrowsePosition? Position { get; set; }
 }

src/extensions/BootstrapBlazor.OpcDa/OpcDaServer.cs

@@ -151,9 +151,9 @@ private Opc.Da.Server GetOpcServer()
     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();
+        var results = server.Browse(new ItemIdentifier(name), filters.ToFilters(), out var pos) ?? [];
+        position = pos == null ? null : new OpcBrowsePosition(pos);
+        return [.. results.Select(element => new OpcBrowseElement(element))];
     }
 
     /// <summary>
@@ -165,7 +165,8 @@ public OpcBrowseElement[] BrowseNext(OpcBrowsePosition position)
     {
         var server = GetOpcServer();
         var pos = position.Position;
-        return server.BrowseNext(ref pos).Select(element => new OpcBrowseElement(element)).ToArray();
+        var results = server.BrowseNext(ref pos) ?? [];
+        return [.. results.Select(element => new OpcBrowseElement(element))];
     }
 
     /// <summary>