.justfile

@@ -15,14 +15,10 @@ clean:
   rm -rf "dist"
   rm -rf "wwwroot"
 
-update: update-node update-dotnet
+update:
-  git submodule update --init --remote --recursive
-
-update-node:
   npm install
-  
-update-dotnet:
   dotnet restore ./server/server.csproj
+  git submodule update --init --remote --recursive
 
 # 生成Restful API到网页客户端
 gen-api:

components.d.ts

@@ -9,8 +9,11 @@ export {}
 declare module 'vue' {
   export interface GlobalComponents {
     Alert: typeof import('./src/components/Alert/Alert.vue')['default']
+    AlertDemo: typeof import('./src/components/AlertDemo.vue')['default']
     BaseBoard: typeof import('./src/components/equipments/BaseBoard.vue')['default']
     BaseInputField: typeof import('./src/components/InputField/BaseInputField.vue')['default']
+    Canvas: typeof import('./src/components/Canvas.vue')['default']
+    ChannelConfig: typeof import('./src/components/LogicAnalyzer/ChannelConfig.vue')['default']
     CollapsibleSection: typeof import('./src/components/CollapsibleSection.vue')['default']
     ComponentSelector: typeof import('./src/components/LabCanvas/ComponentSelector.vue')['default']
     DDR: typeof import('./src/components/equipments/DDR.vue')['default']
@@ -19,10 +22,16 @@ declare module 'vue' {
     DiagramCanvas: typeof import('./src/components/LabCanvas/DiagramCanvas.vue')['default']
     Dialog: typeof import('./src/components/Dialog.vue')['default']
     ETH: typeof import('./src/components/equipments/ETH.vue')['default']
+    FunctionBar: typeof import('./src/components/FunctionBar.vue')['default']
     HDMI: typeof import('./src/components/equipments/HDMI.vue')['default']
     IpInputField: typeof import('./src/components/InputField/IpInputField.vue')['default']
     ItemList: typeof import('./src/components/LabCanvas/ItemList.vue')['default']
+    LabCanvas: typeof import('./src/components/LabCanvasNew/LabCanvas.vue')['default']
+    LabCanvasNew: typeof import('./src/components/LabCanvas/LabCanvasNew.vue')['default']
+    LabComponentsDrawer: typeof import('./src/components/LabCanvasNew/LabComponentsDrawer.vue')['default']
+    LabComponentsDrawerNew: typeof import('./src/components/LabCanvas/LabComponentsDrawerNew.vue')['default']
     LogicalWaveFormDisplay: typeof import('./src/components/LogicAnalyzer/LogicalWaveFormDisplay.vue')['default']
+    LoginCard: typeof import('./src/components/LoginCard.vue')['default']
     MarkdownRenderer: typeof import('./src/components/MarkdownRenderer.vue')['default']
     MechanicalButton: typeof import('./src/components/equipments/MechanicalButton.vue')['default']
     MotherBoard: typeof import('./src/components/equipments/MotherBoard.vue')['default']
@@ -34,15 +43,29 @@ declare module 'vue' {
     PortInputField: typeof import('./src/components/InputField/PortInputField.vue')['default']
     PropertyEditor: typeof import('./src/components/PropertyEditor.vue')['default']
     PropertyPanel: typeof import('./src/components/PropertyPanel.vue')['default']
+    RekaSplitterGroup: typeof import('reka-ui')['SplitterGroup']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
+    ScrollAreaCorner: typeof import('reka-ui')['ScrollAreaCorner']
+    ScrollAreaRoot: typeof import('reka-ui')['ScrollAreaRoot']
+    ScrollAreaScrollbar: typeof import('reka-ui')['ScrollAreaScrollbar']
+    ScrollAreaThumb: typeof import('reka-ui')['ScrollAreaThumb']
+    ScrollAreaViewport: typeof import('reka-ui')['ScrollAreaViewport']
     SD: typeof import('./src/components/equipments/SD.vue')['default']
     SevenSegmentDisplay: typeof import('./src/components/equipments/SevenSegmentDisplay.vue')['default']
     SFP: typeof import('./src/components/equipments/SFP.vue')['default']
     Sidebar: typeof import('./src/components/Sidebar.vue')['default']
     SMA: typeof import('./src/components/equipments/SMA.vue')['default']
     SMT_LED: typeof import('./src/components/equipments/SMT_LED.vue')['default']
+    SplitterGroup: typeof import('reka-ui')['SplitterGroup']
+    SplitterPanel: typeof import('reka-ui')['SplitterPanel']
+    SplitterResizeHandle: typeof import('reka-ui')['SplitterResizeHandle']
     Switch: typeof import('./src/components/equipments/Switch.vue')['default']
+    TabsContent: typeof import('reka-ui')['TabsContent']
+    TabsIndicator: typeof import('reka-ui')['TabsIndicator']
+    TabsList: typeof import('reka-ui')['TabsList']
+    TabsRoot: typeof import('reka-ui')['TabsRoot']
+    TabsTrigger: typeof import('reka-ui')['TabsTrigger']
     ThemeControlButton: typeof import('./src/components/ThemeControlButton.vue')['default']
     ThemeControlToggle: typeof import('./src/components/ThemeControlToggle.vue')['default']
     TriggerSettings: typeof import('./src/components/LogicAnalyzer/TriggerSettings.vue')['default']

flake.nix

@@ -23,7 +23,6 @@
             sqls
             sql-studio
             zlib
-            bash
             # Backend
             (dotnetCorePackages.combinePackages [
               dotnetCorePackages.sdk_9_0

server/src/ArpClient.cs

@@ -7,8 +7,6 @@ using System.Text.RegularExpressions;
 /// </summary>
 public static class Arp
 {
-    private static NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
-
     /// <summary>
     /// 读取所有 ARP 记录
     /// </summary>
@@ -43,28 +41,6 @@ public static class Arp
         return entries;
     }
 
-    /// <summary>
-    /// 通过 Ping 动态更新指定 IP 的 ARP 记录
-    /// </summary>
-    /// <param name="ipAddress">要更新的 IP 地址</param>
-    /// <returns>是否成功发送 Ping</returns>
-    public static async Task<bool> UpdateArpEntryByPingAsync(string ipAddress)
-    {
-        if (string.IsNullOrWhiteSpace(ipAddress))
-            throw new ArgumentException("IP 地址不能为空", nameof(ipAddress));
-
-        try
-        {
-            using var ping = new System.Net.NetworkInformation.Ping();
-            var reply = await ping.SendPingAsync(ipAddress, 100);
-            return reply.Status == System.Net.NetworkInformation.IPStatus.Success;
-        }
-        catch
-        {
-            return false;
-        }
-    }
-
     /// <summary>
     /// 添加 ARP 记录
     /// </summary>
@@ -72,7 +48,7 @@ public static class Arp
     /// <param name="macAddress">MAC 地址</param>
     /// <param name="interfaceName">网络接口名称（可选）</param>
     /// <returns>是否成功</returns>
-    public static async Task<bool> AddArpEntryAsync(string ipAddress, string macAddress, string? interfaceName = null)
+    public static async Task<bool> AddArpEntryAsync(string ipAddress, string macAddress, string interfaceName = null)
     {
         if (string.IsNullOrWhiteSpace(ipAddress))
             throw new ArgumentException("IP 地址不能为空", nameof(ipAddress));
@@ -98,7 +74,7 @@ public static class Arp
     /// <param name="ipAddress">要删除的 IP 地址</param>
     /// <param name="interfaceName">网络接口名称（可选）</param>
     /// <returns>是否成功</returns>
-    public static async Task<bool> DeleteArpEntryAsync(string ipAddress, string? interfaceName = null)
+    public static async Task<bool> DeleteArpEntryAsync(string ipAddress, string interfaceName = null)
     {
         if (string.IsNullOrWhiteSpace(ipAddress))
             throw new ArgumentException("IP 地址不能为空", nameof(ipAddress));
@@ -173,13 +149,15 @@ public static class Arp
     /// </summary>
     private static string GetArpListCommand()
     {
-        return "arp -a";
+        return RuntimeInformation.IsOSPlatform(OSPlatform.Windows)
+            ? "arp -a"
+            : "arp -a";
     }
 
     /// <summary>
     /// 获取 ARP 添加命令
     /// </summary>
-    private static string GetArpAddCommand(string ipAddress, string macAddress, string? interfaceName)
+    private static string GetArpAddCommand(string ipAddress, string macAddress, string interfaceName)
     {
         if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
         {
@@ -208,7 +186,7 @@ public static class Arp
     /// <summary>
     /// 获取 ARP 删除命令
     /// </summary>
-    private static string GetArpDeleteCommand(string ipAddress, string? interfaceName)
+    private static string GetArpDeleteCommand(string ipAddress, string interfaceName)
     {
         if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
         {
@@ -260,7 +238,14 @@ public static class Arp
     /// </summary>
     private static string GetArpQueryCommand(string ipAddress)
     {
-        return $"arp -a {ipAddress}";
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+        {
+            return $"arp -a {ipAddress}";
+        }
+        else
+        {
+            return $"arp -n {ipAddress}";
+        }
     }
 
     /// <summary>
@@ -299,8 +284,6 @@ public static class Arp
                 };
             }
 
-            logger.Debug($"Executing command: {processInfo.FileName} {processInfo.Arguments}");
-
             using var process = new Process { StartInfo = processInfo };
             process.Start();
 
@@ -309,11 +292,6 @@ public static class Arp
 
             await process.WaitForExitAsync();
 
-            logger.Debug($"Command output: {output}");
-            if (!string.IsNullOrWhiteSpace(error))
-                logger.Debug($"Command error: {error}");
-            logger.Debug($"Command exit code: {process.ExitCode}");
-
             return new CommandResult
             {
                 IsSuccess = process.ExitCode == 0,
@@ -324,7 +302,6 @@ public static class Arp
         }
         catch (Exception ex)
         {
-            logger.Error(ex, $"Command execution failed: {command}");
             return new CommandResult
             {
                 IsSuccess = false,
@@ -381,8 +358,8 @@ public static class Arp
     /// </summary>
     private static ArpEntry? ParseUnixArpEntry(string line)
     {
-        // Unix/Linux arp -a 输出格式: hostname (ip) at mac [ether] PERM on interface
+        // Unix/Linux arp -a 输出格式: hostname (ip) at mac [ether] on interface
-        var pattern = @"(\S+)\s+\((\d+\.\d+\.\d+\.\d+)\)\s+at\s+([a-fA-F0-9:]{17})\s+\[(\w+)\]\s+(\w+)\s+on\s+(\S+)";
+        var pattern = @"(\S+)\s+\((\d+\.\d+\.\d+\.\d+)\)\s+at\s+([a-fA-F0-9:]{17})\s+\[(\w+)\]\s+on\s+(\S+)";
         var match = Regex.Match(line, pattern);
 
         if (match.Success)
@@ -392,8 +369,8 @@ public static class Arp
                 Hostname = match.Groups[1].Value,
                 IpAddress = match.Groups[2].Value,
                 MacAddress = match.Groups[3].Value,
-                Type = match.Groups[5].Value,
+                Type = match.Groups[4].Value,
-                Interface = match.Groups[6].Value
+                Interface = match.Groups[5].Value
             };
         }
 
@@ -413,26 +390,6 @@ public static class Arp
 
         return null;
     }
-
-    /// <summary>
-    /// 判断当前进程是否具有管理员（或 root）权限
-    /// </summary>
-    /// <returns>如果有管理员权限返回 true，否则返回 false</returns>
-    public static bool IsAdministrator()
-    {
-        if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-        {
-            // Windows: 检查当前用户是否为管理员
-            using var identity = System.Security.Principal.WindowsIdentity.GetCurrent();
-            var principal = new System.Security.Principal.WindowsPrincipal(identity);
-            return principal.IsInRole(System.Security.Principal.WindowsBuiltInRole.Administrator);
-        }
-        else
-        {
-            // Unix/Linux/macOS: 检查是否为 root 用户
-            return Environment.UserName == "root" || (Environment.GetEnvironmentVariable("USER") == "root");
-        }
-    }
 }
 
 /// <summary>
@@ -440,30 +397,12 @@ public static class Arp
 /// </summary>
 public class ArpEntry
 {
-    /// <summary>
-    /// [TODO:description]
-    /// </summary>
     public string Hostname { get; set; } = string.Empty;
-    /// <summary>
-    /// [TODO:description]
-    /// </summary>
     public string IpAddress { get; set; } = string.Empty;
-    /// <summary>
-    /// [TODO:description]
-    /// </summary>
     public string MacAddress { get; set; } = string.Empty;
-    /// <summary>
-    /// [TODO:description]
-    /// </summary>
     public string Type { get; set; } = string.Empty;
-    /// <summary>
-    /// [TODO:description]
-    /// </summary>
     public string Interface { get; set; } = string.Empty;
 
-    /// <summary>
-    /// [TODO:description]
-    /// </summary>
     public override string ToString()
     {
         return $"{IpAddress} -> {MacAddress} ({Interface})";
@@ -475,20 +414,8 @@ public class ArpEntry
 /// </summary>
 public class CommandResult
 {
-    /// <summary>
-    /// [TODO:description]
-    /// </summary>
     public bool IsSuccess { get; set; }
-    /// <summary>
-    /// [TODO:description]
-    /// </summary>
     public string Output { get; set; } = string.Empty;
-    /// <summary>
-    /// [TODO:description]
-    /// </summary>
     public string Error { get; set; } = string.Empty;
-    /// <summary>
-    /// [TODO:description]
-    /// </summary>
     public int ExitCode { get; set; }
 }

server/src/Controllers/NetConfigController.cs

@@ -153,7 +153,7 @@ public class NetConfigController : ControllerBase
         try
         {
             var netConfig = new NetConfig(BOARD_IP, BOARD_PORT, 0);
-
+            
             var hostIPResult = await netConfig.GetHostIP();
             var boardIPResult = await netConfig.GetBoardIP();
             var hostMACResult = await netConfig.GetHostMAC();
@@ -345,8 +345,7 @@ public class NetConfigController : ControllerBase
     {
         try
         {
-            // 获取所有本机IPv4地址，并选择与实验板IP前三段相同的IP
+            // 获取本机第一个有效的IPv4地址
-            var boardIpSegments = BOARD_IP.Split('.').Take(3).ToArray();
             var ip = System.Net.NetworkInformation.NetworkInterface
                 .GetAllNetworkInterfaces()
                 .Where(nic => nic.OperationalStatus == System.Net.NetworkInformation.OperationalStatus.Up
@@ -354,14 +353,7 @@ public class NetConfigController : ControllerBase
                 .SelectMany(nic => nic.GetIPProperties().UnicastAddresses)
                 .Where(addr => addr.Address.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork)
                 .Select(addr => addr.Address)
-                .FirstOrDefault(addr =>
+                .FirstOrDefault();
-                {
-                    var segments = addr.ToString().Split('.');
-                    return segments.Length == 4 &&
-                           segments[0] == boardIpSegments[0] &&
-                           segments[1] == boardIpSegments[1] &&
-                           segments[2] == boardIpSegments[2];
-                });
 
             if (ip == null)
                 return StatusCode(StatusCodes.Status500InternalServerError, "无法获取本机IP地址");

server/src/MsgBus.cs

@@ -3,8 +3,6 @@
 /// </summary>
 public static class MsgBus
 {
-    private static NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
-
     private static readonly UDPServer udpServer = new UDPServer(1234, 12);
     /// <summary>
     /// 获取UDP服务器
@@ -21,13 +19,8 @@ public static class MsgBus
     /// 通信总线初始化
     /// </summary>
     /// <returns>无</returns>
-    public async static void Init()
+    public static void Init()
     {
-        if (!Arp.IsAdministrator())
-        {
-            logger.Error($"非管理员运行，ARP无法更新，请用管理员权限运行");
-            // throw new Exception($"非管理员运行，ARP无法更新，请用管理员权限运行");
-        }
         udpServer.Start();
         isRunning = true;
     }

server/src/Peripherals/NetConfigClient.cs

@@ -54,13 +54,6 @@ public class NetConfig
         // 清除UDP服务器接收缓冲区
         MsgBus.UDPServer.ClearUDPData(this.address, this.taskID);
 
-        // 刷新ARP
-        var refrshRet = await Arp.UpdateArpEntryByPingAsync(this.address);
-        if (!refrshRet)
-        {
-            logger.Warn($"Refrash Arp failed, but maybe not a big deal.");
-        }
-
         var ipBytes = ip.GetAddressBytes();
 
         var ret = await UDPClientPool.WriteAddrSeq(this.ep, this.taskID, NetConfigAddr.HOST_IP, ipBytes, this.timeout);
@@ -105,13 +98,6 @@ public class NetConfig
         // 清除UDP服务器接收缓冲区
         MsgBus.UDPServer.ClearUDPData(this.address, this.taskID);
 
-        // 刷新ARP
-        var refrshRet = await Arp.UpdateArpEntryByPingAsync(this.address);
-        if (!refrshRet)
-        {
-            logger.Warn($"Refrash Arp failed, but maybe not a big deal.");
-        }
-
         var ipBytes = ip.GetAddressBytes();
 
         var ret = await UDPClientPool.WriteAddrSeq(this.ep, this.taskID, NetConfigAddr.BOARD_IP, ipBytes, this.timeout);
@@ -160,13 +146,6 @@ public class NetConfig
 
         // 清除UDP服务器接收缓冲区
         MsgBus.UDPServer.ClearUDPData(this.address, this.taskID);
-        
-        // 刷新ARP
-        var refrshRet = await Arp.UpdateArpEntryByPingAsync(this.address);
-        if (!refrshRet)
-        {
-            logger.Warn($"Refrash Arp failed, but maybe not a big deal.");
-        }
 
         var ret = await UDPClientPool.WriteAddrSeq(this.ep, this.taskID, NetConfigAddr.HOST_MAC, macAddress, this.timeout);
         if (!ret.IsSuccessful)
@@ -214,13 +193,6 @@ public class NetConfig
 
         // 清除UDP服务器接收缓冲区
         MsgBus.UDPServer.ClearUDPData(this.address, this.taskID);
-        
-        // 刷新ARP
-        var refrshRet = await Arp.UpdateArpEntryByPingAsync(this.address);
-        if (!refrshRet)
-        {
-            logger.Warn($"Refrash Arp failed, but maybe not a big deal.");
-        }
 
         var ret = await UDPClientPool.WriteAddrSeq(this.ep, this.taskID, NetConfigAddr.BOARD_MAC, macAddress, this.timeout);
         if (!ret.IsSuccessful)
@@ -262,13 +234,6 @@ public class NetConfig
     {
         // 清除UDP服务器接收缓冲区
         MsgBus.UDPServer.ClearUDPData(this.address, this.taskID);
-        
-        // 刷新ARP
-        var refrshRet = await Arp.UpdateArpEntryByPingAsync(this.address);
-        if (!refrshRet)
-        {
-            logger.Warn($"Refrash Arp failed, but maybe not a big deal.");
-        }
 
         var ret = await UDPClientPool.ReadAddrSeq(this.ep, this.taskID, NetConfigAddr.HOST_IP, this.timeout);
         if (!ret.IsSuccessful)
@@ -296,13 +261,6 @@ public class NetConfig
     {
         // 清除UDP服务器接收缓冲区
         MsgBus.UDPServer.ClearUDPData(this.address, this.taskID);
-        
-        // 刷新ARP
-        var refrshRet = await Arp.UpdateArpEntryByPingAsync(this.address);
-        if (!refrshRet)
-        {
-            logger.Warn($"Refrash Arp failed, but maybe not a big deal.");
-        }
 
         var ret = await UDPClientPool.ReadAddrSeq(this.ep, this.taskID, NetConfigAddr.BOARD_IP, this.timeout);
         if (!ret.IsSuccessful)
@@ -331,13 +289,6 @@ public class NetConfig
         // 清除UDP服务器接收缓冲区
         MsgBus.UDPServer.ClearUDPData(this.address, this.taskID);
 
-        // 刷新ARP
-        var refrshRet = await Arp.UpdateArpEntryByPingAsync(this.address);
-        if (!refrshRet)
-        {
-            logger.Warn($"Refrash Arp failed, but maybe not a big deal.");
-        }
-
         var ret = await UDPClientPool.ReadAddrSeq(this.ep, this.taskID, NetConfigAddr.HOST_MAC, this.timeout);
         if (!ret.IsSuccessful)
         {
@@ -364,13 +315,6 @@ public class NetConfig
     {
         // 清除UDP服务器接收缓冲区
         MsgBus.UDPServer.ClearUDPData(this.address, this.taskID);
-        
-        // 刷新ARP
-        var refrshRet = await Arp.UpdateArpEntryByPingAsync(this.address);
-        if (!refrshRet)
-        {
-            logger.Warn($"Refrash Arp failed, but maybe not a big deal.");
-        }
 
         var ret = await UDPClientPool.ReadAddrSeq(this.ep, this.taskID, NetConfigAddr.BOARD_MAC, this.timeout);
         if (!ret.IsSuccessful)

server/src/UdpServer.cs

@@ -128,7 +128,7 @@ public class UDPServer
                 if (IsPortInUse(currentPort))
                 {
                     throw new ArgumentException(
-                        $"端口{currentPort}已被占用，无法启动UDP Server",
+                        $"Port {currentPort} is already in use.",
                         nameof(port)
                     );
                 }