合并lybxhm分支

DHSoftware/Views/SettingWindow.cs

@@ -31,7 +31,7 @@ namespace DHSoftware.Views
             tooltip.SetTip(btnAdd, "新增工位");
 
 
-
+         
 
         }
 
@@ -49,7 +49,7 @@ namespace DHSoftware.Views
                 {
                     // 显示节点名称弹窗
                     //MessageBox.Show($"右键点击的节点: {clickedItem.Text}");
-
+                
                     var menulist = new AntdUI.IContextMenuStripItem[]
                     {
                     new AntdUI.ContextMenuStripItem("关联相机", "")
@@ -61,7 +61,7 @@ namespace DHSoftware.Views
                     {
                         if (it.Text == "关联相机")
                         {
-                            using (var dlg = new AddCameraWindow(cameras))
+                            using (var dlg = new AddCameraWindow())
                             {
                                 if (dlg.ShowDialog() == DialogResult.OK)
                                 {
@@ -94,7 +94,12 @@ namespace DHSoftware.Views
                     return item;
                 }
 
-
+                // 递归检查子项（如果展开）
+                if (item.Expand && item.Sub != null)
+                {
+                    var childResult = FindClickedItem(item.Sub, clickPoint);
+                    if (childResult != null) return childResult;
+                }
             }
             return null;
         }
@@ -131,7 +136,7 @@ namespace DHSoftware.Views
             //    }
 
             //}
-        }
+       }
 
         private void btnSave_Click(object sender, EventArgs e)
         {