From 8ff15111d5e6c9e8f7ef7f10ac81df28c6ef7014 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期五, 21 二月 2025 13:13:37 +0800
Subject: [PATCH] 修复基础排序问题
---
Desktop/PBS.Desktop.Core/MainForm.cs | 121 +++++++++++++++++++++++++++++++++++-----
1 files changed, 106 insertions(+), 15 deletions(-)
diff --git a/Desktop/PBS.Desktop.Core/MainForm.cs b/Desktop/PBS.Desktop.Core/MainForm.cs
index 9780d9e..2a6f92a 100644
--- a/Desktop/PBS.Desktop.Core/MainForm.cs
+++ b/Desktop/PBS.Desktop.Core/MainForm.cs
@@ -6,6 +6,9 @@
using DevExpress.XtraBars.Ribbon;
using DevExpress.XtraEditors;
using DevExpress.XtraTab;
+using HStation.WinFrmUI;
+using HStation.WinFrmUI.Basic;
+using HStation.WinFrmUI.Dict;
using HStation.WinFrmUI.Xhs.PumpProduct;
using System.IO;
using Yw.WinFrmUI;
@@ -37,15 +40,14 @@
//this.tabbedView1.AppearancePage.Header.BackColor = Color.White;
this.tabbedView1.AppearancePage.HeaderSelected.Font = new Font("微软雅黑", 10f, FontStyle.Bold);
- // this.tabbedView1.CustomDrawTabHeader += OnCustomDrawTabHeader;
-
+ // this.tabbedView1.CustomDrawTabHeader += OnCustomDrawTabHeader;
}
private void OnCustomDrawTabHeader(object sender, TabHeaderCustomDrawEventArgs e)
{
// 获取 TabbedView 实例
var tabbedView = sender as TabbedView;
-
+
bool isSelected = false;
// 设置抗锯齿模式以确保绘制质量
@@ -67,12 +69,11 @@
Alignment = StringAlignment.Center,
LineAlignment = StringAlignment.Center
};
- e.Cache.Graphics.DrawString(e.TabHeaderInfo.ViewInfo.GetSelectablePage().Text , this.Font, Brushes.Black, e.Bounds, stringFormat);
+ e.Cache.Graphics.DrawString(e.TabHeaderInfo.ViewInfo.GetSelectablePage().Text, this.Font, Brushes.Black, e.Bounds, stringFormat);
// 表示已自行处理绘制
e.Handled = true;
}
-
//HatchBrush myHatchBrush1 = new HatchBrush(HatchStyle.BackwardDiagonal, Color.LightGray, Color.AliceBlue);
//private void TabbedView1_CustomDrawTabHeader(object sender, DevExpress.XtraTab.TabHeaderCustomDrawEventArgs e)
@@ -83,8 +84,6 @@
// e.DefaultDrawButtons();
// e.Handled = true;
//}
-
-
#region TileNavPane 相关处理
@@ -446,7 +445,7 @@
{
this.tabbedView1.BeginUpdate();
var doc = this.tabbedView1.AddDocument(page);
- doc.Footer = Directory.GetCurrentDirectory();
+ doc.Footer = Directory.GetCurrentDirectory();
if (page.PageTitle != null)
{
doc.Caption = page.PageTitle.Caption;
@@ -616,7 +615,6 @@
return false;
}
-
//获取
private List<AccordionElement> GetAccordionElementList(string modular)
@@ -736,7 +734,7 @@
}, svgImgItem32[6], new Size(18, 18), (caption,guid,svg,size) =>
{
if (!IsExistPage(guid, true))
- {
+ {
var page = new DocumentPage();
page.PageGuid = guid;
page.PageTitle.Caption = caption;
@@ -793,7 +791,13 @@
{
if (!IsExistPage(guid, true))
{
- }
+ var page=new SysTypeManageMainPanel();
+ page.PageGuid = guid;
+ page.PageTitle.Caption = caption;
+ page.PageTitle.HeaderSvgImage = svg;
+ page.PageTitle.SvgImageSize = size;
+ CreatePage(page,guid);
+ }
}),
Get("分类管理",new PageGuid()
{
@@ -804,6 +808,12 @@
{
if (!IsExistPage(guid, true))
{
+ var page=new SysCatalogManageMainPanel();
+ page.PageGuid = guid;
+ page.PageTitle.Caption = caption;
+ page.PageTitle.HeaderSvgImage = svg;
+ page.PageTitle.SvgImageSize = size;
+ CreatePage(page,guid);
}
}),
Get("属性管理",new PageGuid()
@@ -815,6 +825,29 @@
{
if (!IsExistPage(guid, true))
{
+ var page=new SysPropManageMainPanel();
+ page.PageGuid = guid;
+ page.PageTitle.Caption = caption;
+ page.PageTitle.HeaderSvgImage = svg;
+ page.PageTitle.SvgImageSize = size;
+ CreatePage(page,guid);
+ }
+ }),
+ Get("标签管理",new PageGuid()
+ {
+ Modular = "BasicData",
+ MoudingType = eMoudingType.Tab,
+ Function = "SystemFlagMgr",
+ }, svgImgItem32[16], new Size(18, 18), (caption,guid,svg,size) =>
+ {
+ if (!IsExistPage(guid, true))
+ {
+ var page=new SysFlagManageMainPanel();
+ page.PageGuid = guid;
+ page.PageTitle.Caption = caption;
+ page.PageTitle.HeaderSvgImage = svg;
+ page.PageTitle.SvgImageSize = size;
+ CreatePage(page,guid);
}
}),
Get("字典类型",new PageGuid()
@@ -826,6 +859,12 @@
{
if (!IsExistPage(guid, true))
{
+ var page=new DictManageMainPanel();
+ page.PageGuid = guid;
+ page.PageTitle.Caption = caption;
+ page.PageTitle.HeaderSvgImage = svg;
+ page.PageTitle.SvgImageSize = size;
+ CreatePage(page,guid);
}
}),
}
@@ -848,7 +887,13 @@
{
if (!IsExistPage(guid, true))
{
- }
+ var page=new RoleMgrPage();
+ page.PageGuid = guid;
+ page.PageTitle.Caption = caption;
+ page.PageTitle.HeaderSvgImage = svg;
+ page.PageTitle.SvgImageSize = size;
+ CreatePage(page,guid);
+ }
}),
Get("用户管理",new PageGuid()
{
@@ -859,7 +904,13 @@
{
if (!IsExistPage(guid, true))
{
- }
+ var page=new UserMgrPage();
+ page.PageGuid = guid;
+ page.PageTitle.Caption = caption;
+ page.PageTitle.HeaderSvgImage = svg;
+ page.PageTitle.SvgImageSize = size;
+ CreatePage(page,guid);
+ }
}),
Get("菜单管理",new PageGuid()
{
@@ -870,9 +921,49 @@
{
if (!IsExistPage(guid, true))
{
- }
+ var page=new MenuMgrPage();
+ page.PageGuid = guid;
+ page.PageTitle.Caption = caption;
+ page.PageTitle.HeaderSvgImage = svg;
+ page.PageTitle.SvgImageSize = size;
+ CreatePage(page,guid);
+ }
}),
- }
+ Get("角色菜单",new PageGuid()
+ {
+ Modular = "BasicData",
+ MoudingType = eMoudingType.Tab,
+ Function = "ProjectMenuMgr",
+ }, svgImgItem32[17], new Size(18, 18), (caption,guid,svg,size) =>
+ {
+ if (!IsExistPage(guid, true))
+ {
+ var page=new RoleProjectMenuPage();
+ page.PageGuid = guid;
+ page.PageTitle.Caption = caption;
+ page.PageTitle.HeaderSvgImage = svg;
+ page.PageTitle.SvgImageSize = size;
+ CreatePage(page,guid);
+ }
+ }),
+ Get("用户日志",new PageGuid()
+ {
+ Modular = "BasicData",
+ MoudingType = eMoudingType.Tab,
+ Function = "UserLogMgr",
+ }, svgImgItem32[18], new Size(18, 18), (caption,guid,svg,size) =>
+ {
+ if (!IsExistPage(guid, true))
+ {
+ var page=new UserLoginLogPage();
+ page.PageGuid = guid;
+ page.PageTitle.Caption = caption;
+ page.PageTitle.HeaderSvgImage = svg;
+ page.PageTitle.SvgImageSize = size;
+ CreatePage(page,guid);
+ }
+ }),
+ }
};
list.Add(place_mgr_ele);
--
Gitblit v1.9.3