From 687a3dfd095bc8c099b7fa6e65f0dc699fdc8f1d Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期三, 08 一月 2025 13:57:33 +0800
Subject: [PATCH] 冲突
---
Desktop/HStation.Desktop.Xhs.Core/MainForm.cs | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/Desktop/HStation.Desktop.Xhs.Core/MainForm.cs b/Desktop/HStation.Desktop.Xhs.Core/MainForm.cs
index eb2ad48..2d42e5d 100644
--- a/Desktop/HStation.Desktop.Xhs.Core/MainForm.cs
+++ b/Desktop/HStation.Desktop.Xhs.Core/MainForm.cs
@@ -4,7 +4,7 @@
using DevExpress.XtraBars.Ribbon;
using DevExpress.XtraEditors;
using HStation.WinFrmUI;
-using HStation.WinFrmUI.Auth.Core._02_User;
+using HStation.WinFrmUI.Assets;
using HStation.WinFrmUI.Basic;
using HStation.WinFrmUI.Xhs.PumpProduct;
using System.IO;
@@ -696,11 +696,11 @@
var guid=new PageGuid(){
Modular="Auth",
MoudingType=eMoudingType.Tab,
- Function="UserManageMgr",
+ Function="RoleManageMgr",
};
if(!IsExistPage(guid,true))
{
- var page=new UserMgrMainPanel();
+ var page=new RoleMgrPage();
CreatePage(page,guid);
}
}
@@ -714,12 +714,12 @@
var guid=new PageGuid(){
Modular="Auth",
MoudingType=eMoudingType.Tab,
- Function="ValveMgr",
+ Function="UserMgr",
};
if(!IsExistPage(guid,true))
{
- /* var page=new ValveManageMainPage();
- CreatePage(page,guid);*/
+ var page=new UserMgrPage();
+ CreatePage(page,guid);
}
}
},
@@ -736,7 +736,7 @@
};
if(!IsExistPage(guid,true))
{
- var page=new SysTypeManageMainPanel();
+ var page=new MenuMgrPage();
CreatePage(page,guid);
}
}
@@ -758,6 +758,25 @@
}
}
},*/
+
+ new TilePeekItem(){
+ Caption="角色菜单",
+ SvgImage=svgImg32Model[2],
+ SvgImageSize=new Size(24,24),
+ Click=()=>{
+ this.flyoutPanel1.HideBeakForm();
+ var guid=new PageGuid(){
+ Modular="Auth",
+ MoudingType=eMoudingType.Tab,
+ Function="RoleMenu",
+ };
+ if(!IsExistPage(guid,true))
+ {
+ var page=new RoleProjectMenuPage();
+ CreatePage(page,guid);
+ }
+ }
+ },
};
_AuthConfigCtrl = peakItemList.CreatePeekCtrl();
}
--
Gitblit v1.9.3