From 9eb94e9eec2e2e164698e34d0481d66093c8655b Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期三, 15 一月 2025 17:40:55 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

---
 WinFrmUI/HStation.WinFrmUI.Auth.Core/01-menu/MenuMgrPage.cs |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/WinFrmUI/HStation.WinFrmUI.Auth.Core/01-menu/MenuMgrPage.cs b/WinFrmUI/HStation.WinFrmUI.Auth.Core/01-menu/MenuMgrPage.cs
index 083b03a..24a0408 100644
--- a/WinFrmUI/HStation.WinFrmUI.Auth.Core/01-menu/MenuMgrPage.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Auth.Core/01-menu/MenuMgrPage.cs
@@ -21,6 +21,8 @@
         {
             InitializeComponent();
             this.treeList1.InitialMultiColSettings(30);
+            this.PageTitle.Caption = "鑿滃崟绠$悊";
+            this.PageTitle.SvgImageSize = new Size(24, 24);
         }
 
         private List<MenuViewModel> _allBindingList = null;//缁戝畾鍒楄〃
@@ -32,7 +34,7 @@
         /// </summary>
         public override async void InitialDataSource()
         {
-            var allList = await new Yw.BLL.ProjectMenu().GetByProjectID(1);
+            var allList = await new Yw.BLL.ProjectMenu().GetByProjectID(GlobalParas._GlobalParas.ProjectID);
             _allBindingList = new List<MenuViewModel>();
             if (allList != null)
             {
@@ -45,7 +47,12 @@
             this.menuViewModelBindingSource.DataSource = _allBindingList;
             this.menuViewModelBindingSource.ResetBindings(false);
             //  this.treeList1.ForceInitialize();
-            //this.treeList1.CollapseAll();
+            this.treeList1.ExpandAll();
+        }
+
+        public override void VerifyAuth()
+        {
+            this.AuthTree.VerifyAuth(this.ribbonControl1);
         }
 
         //娣诲姞
@@ -53,15 +60,16 @@
         {
             if (_allBindingList == null)
                 return;
+            var row = this.treeList1.GetCurrentViewModel(_allBindingList);
             var dlg = new AddMenuDlg();
-            dlg.SetBindingData();
+            dlg.SetBindingData(row != null ? row.ID : 0);
             dlg.ReloadDataEvent += async (rhs) =>
             {
-                var id = await _bll.Insert(rhs);
+                var id = await _bll.Insert(rhs.ProjectMenu);
                 if (id > 0)
                 {
-                    rhs.ID = id;
-                    this._allBindingList.Add(new MenuViewModel(rhs));
+                    rhs.ProjectMenu.ID = id;
+                    this._allBindingList.Add(new MenuViewModel(rhs.ProjectMenu));
                     this.menuViewModelBindingSource.ResetBindings(false);
                     //this.treeList1.Refresh();
                     return true;

--
Gitblit v1.9.3