From 24d256b229a5193e14b95f0f79f1c0c1aefae7bf Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期四, 17 十月 2024 15:03:27 +0800
Subject: [PATCH] 修改资产表读取文件名
---
Desktop/HStation.Desktop.Xhs.Core/MainForm.resx | 32 ++++++++++
Service/HStation.Service.Assets.Core/03-settings/00-core/AssetsFileHelper.cs | 2
Desktop/HStation.Desktop.Xhs.Core/MainForm.Designer.cs | 31 +++++++---
Desktop/HStation.Desktop.Xhs.Core/MainForm.cs | 80 ++++++++++++++++++++++++++
4 files changed, 134 insertions(+), 11 deletions(-)
diff --git a/Desktop/HStation.Desktop.Xhs.Core/MainForm.Designer.cs b/Desktop/HStation.Desktop.Xhs.Core/MainForm.Designer.cs
index 7a81199..a6649bc 100644
--- a/Desktop/HStation.Desktop.Xhs.Core/MainForm.Designer.cs
+++ b/Desktop/HStation.Desktop.Xhs.Core/MainForm.Designer.cs
@@ -30,10 +30,10 @@
{
components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm));
- DevExpress.Utils.SuperToolTip superToolTip1 = new DevExpress.Utils.SuperToolTip();
- DevExpress.Utils.ToolTipItem toolTipItem1 = new DevExpress.Utils.ToolTipItem();
- DevExpress.Utils.SuperToolTip superToolTip2 = new DevExpress.Utils.SuperToolTip();
- DevExpress.Utils.ToolTipItem toolTipItem2 = new DevExpress.Utils.ToolTipItem();
+ DevExpress.Utils.SuperToolTip superToolTip3 = new DevExpress.Utils.SuperToolTip();
+ DevExpress.Utils.ToolTipItem toolTipItem3 = new DevExpress.Utils.ToolTipItem();
+ DevExpress.Utils.SuperToolTip superToolTip4 = new DevExpress.Utils.SuperToolTip();
+ DevExpress.Utils.ToolTipItem toolTipItem4 = new DevExpress.Utils.ToolTipItem();
tileNavPane = new DevExpress.XtraBars.Navigation.TileNavPane();
nbTitle = new DevExpress.XtraBars.Navigation.NavButton();
navBtnPrevious = new DevExpress.XtraBars.Navigation.NavButton();
@@ -62,6 +62,7 @@
flyoutPanel1 = new DevExpress.Utils.FlyoutPanel();
flyoutPanelControl1 = new DevExpress.Utils.FlyoutPanelControl();
svgImg32Model = new DevExpress.Utils.SvgImageCollection(components);
+ nbAuthConfig = new DevExpress.XtraBars.Navigation.NavButton();
((System.ComponentModel.ISupportInitialize)tileNavPane).BeginInit();
((System.ComponentModel.ISupportInitialize)documentManager1).BeginInit();
((System.ComponentModel.ISupportInitialize)barManager1).BeginInit();
@@ -85,6 +86,7 @@
tileNavPane.Buttons.Add(nbProductManage);
tileNavPane.Buttons.Add(navButton2);
tileNavPane.Buttons.Add(nbSystemConfig);
+ tileNavPane.Buttons.Add(nbAuthConfig);
tileNavPane.Buttons.Add(nbMin);
tileNavPane.Buttons.Add(nbNormal);
tileNavPane.Buttons.Add(nbClose);
@@ -119,9 +121,9 @@
navBtnPrevious.Caption = null;
navBtnPrevious.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("navBtnPrevious.ImageOptions.SvgImage");
navBtnPrevious.Name = "navBtnPrevious";
- toolTipItem1.Text = "鍚庨��";
- superToolTip1.Items.Add(toolTipItem1);
- navBtnPrevious.SuperTip = superToolTip1;
+ toolTipItem3.Text = "鍚庨��";
+ superToolTip3.Items.Add(toolTipItem3);
+ navBtnPrevious.SuperTip = superToolTip3;
navBtnPrevious.Visible = false;
navBtnPrevious.ElementClick += navBtnPrevious_ElementClick;
//
@@ -154,9 +156,9 @@
navBtnNext.Caption = null;
navBtnNext.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("navBtnNext.ImageOptions.SvgImage");
navBtnNext.Name = "navBtnNext";
- toolTipItem2.Text = "鍓嶈繘";
- superToolTip2.Items.Add(toolTipItem2);
- navBtnNext.SuperTip = superToolTip2;
+ toolTipItem4.Text = "鍓嶈繘";
+ superToolTip4.Items.Add(toolTipItem4);
+ navBtnNext.SuperTip = superToolTip4;
navBtnNext.Visible = false;
navBtnNext.ElementClick += navBtnNext_ElementClick;
//
@@ -367,6 +369,14 @@
svgImg32Model.Add("gaugestylelinearhorizontal", "image://svgimages/dashboards/gaugestylelinearhorizontal.svg");
svgImg32Model.Add("createlinechartnomarkers", "image://svgimages/spreadsheet/createlinechartnomarkers.svg");
//
+ // nbAuthConfig
+ //
+ nbAuthConfig.Alignment = DevExpress.XtraBars.Navigation.NavButtonAlignment.Right;
+ nbAuthConfig.Caption = "鏉冮檺閰嶇疆";
+ nbAuthConfig.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("navButton3.ImageOptions.SvgImage");
+ nbAuthConfig.Name = "nbAuthConfig";
+ nbAuthConfig.ElementClick += nbAuthConfig_ElementClick;
+ //
// MainForm
//
AutoScaleDimensions = new SizeF(7F, 14F);
@@ -430,5 +440,6 @@
private DevExpress.XtraBars.Navigation.NavButton navBtnCurrent;
private DevExpress.XtraBars.Navigation.NavButton navBtnPrevious;
private DevExpress.XtraBars.Navigation.NavButton navBtnNext;
+ private DevExpress.XtraBars.Navigation.NavButton nbAuthConfig;
}
}
diff --git a/Desktop/HStation.Desktop.Xhs.Core/MainForm.cs b/Desktop/HStation.Desktop.Xhs.Core/MainForm.cs
index 13c9b51..5ba15f5 100644
--- a/Desktop/HStation.Desktop.Xhs.Core/MainForm.cs
+++ b/Desktop/HStation.Desktop.Xhs.Core/MainForm.cs
@@ -529,6 +529,86 @@
}
}
+ /// <summary>
+ /// 权限配置
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void nbAuthConfig_ElementClick(object sender, NavElementEventArgs e)
+ {
+ var pt = this.tileNavPane.PointToClient(MousePosition);
+ var hitInfo = this.tileNavPane.CalcHitInfo(pt);
+ if (hitInfo.ButtonInfo != null)
+ {
+ if (_SystemSystemConfigCtrl == null)
+ {
+ var peakItemList = new List<Yw.WinFrmUI.TilePeekItem>()
+ {
+ new TilePeekItem(){
+ Caption="角色管理",
+ SvgImage=svgImg32Model[3],
+ SvgImageSize=new Size(24,24),
+ Click=()=>{
+ this.flyoutPanel1.HideBeakForm();
+ var guid=new PageGuid(){
+ Modular="Auth",
+ MoudingType=eMoudingType.Tab,
+ Function="UserManageMgr",
+ };
+ if(!IsExistPage(guid,true))
+ {
+ var page=new UserMgrMainPanel();
+ CreatePage(page,guid);
+ }
+ }
+ },
+ new TilePeekItem(){
+ Caption="用户管理",
+ SvgImage=svgImg32Model[7],
+ SvgImageSize=new Size(24,24),
+ Click=()=>{
+ this.flyoutPanel1.HideBeakForm();
+ var guid=new PageGuid(){
+ Modular="Auth",
+ MoudingType=eMoudingType.Tab,
+ Function="ValveMgr",
+ };
+ if(!IsExistPage(guid,true))
+ {
+ var page=new ValveManageMainPage();
+ CreatePage(page,guid);
+ }
+ }
+ },
+ 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="TypeMgr",
+ };
+ if(!IsExistPage(guid,true))
+ {
+ var page=new SysTypeManageMainPanel();
+ CreatePage(page,guid);
+ }
+ }
+ },
+ };
+ _SystemSystemConfigCtrl = peakItemList.CreatePeekCtrl();
+ }
+ this.flyoutPanel1.Size = _SystemSystemConfigCtrl.Size;
+ this.flyoutPanelControl1.Controls.Clear();
+ this.flyoutPanelControl1.Controls.Add(_SystemSystemConfigCtrl);
+ var rectangle = this.RectangleToScreen(hitInfo.ButtonInfo.Bounds);
+ this.flyoutPanel1.ShowBeakForm(rectangle);
+ }
+ }
+
#endregion TileNavPane 相关处理
#region 窗体事件
diff --git a/Desktop/HStation.Desktop.Xhs.Core/MainForm.resx b/Desktop/HStation.Desktop.Xhs.Core/MainForm.resx
index 7afd9ae..673247c 100644
--- a/Desktop/HStation.Desktop.Xhs.Core/MainForm.resx
+++ b/Desktop/HStation.Desktop.Xhs.Core/MainForm.resx
@@ -301,6 +301,38 @@
LjEsMjguMSwyNy42LDI3LjZ6IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+Cw==
</value>
</data>
+ <data name="navButton3.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
+ LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+ dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAMgFAAAC77u/
+ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+ IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+ MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+ Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+ MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z
+ ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5HcmVlbntmaWxsOiMwMzlD
+ MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
+ Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntkaXNwbGF5Om5vbmU7fQoJLnN0M3tk
+ aXNwbGF5OmlubGluZTtmaWxsOiNGRkIxMTU7fQoJLnN0NHtkaXNwbGF5OmlubGluZTt9Cgkuc3Q1e2Rp
+ c3BsYXk6aW5saW5lO29wYWNpdHk6MC43NTt9Cgkuc3Q2e2Rpc3BsYXk6aW5saW5lO29wYWNpdHk6MC41
+ O30KCS5zdDd7ZGlzcGxheTppbmxpbmU7ZmlsbDojMDM5QzIzO30KCS5zdDh7ZGlzcGxheTppbmxpbmU7
+ ZmlsbDojRDExQzFDO30KCS5zdDl7ZGlzcGxheTppbmxpbmU7ZmlsbDojMTE3N0Q3O30KCS5zdDEwe2Rp
+ c3BsYXk6aW5saW5lO2ZpbGw6I0ZGRkZGRjt9Cjwvc3R5bGU+DQogIDxnIGlkPSJVc2VyIj4NCiAgICA8
+ cGF0aCBkPSJNMTYuMiwyNkgydi0xLjVjMC03LjUsNS43LTUsOC04LjVjMC44LDEuNSwyLjEsNCw0LDRz
+ My4yLTIuNSw0LTRjMC43LDEsMS43LDEuNSwyLjcsMS45bDAsMCAgIGMtMC41LDAuOS0wLjcsMi0wLjcs
+ My4xYzAsMC40LDAsMC43LDAuMSwxLjFMMTYuMiwyNkwxNi4yLDI2eiBNOS4zLDEwLjljMCwwLDAsMC4x
+ LDAsMC4yYzAuNiwyLjMsMiw0LjksNC43LDQuOXM0LjItMi42LDQuNy00LjkgICBWMTFjMSwwLjEsMC42
+ LTEuMSwwLjktMS42QzE5LjgsOC45LDIwLDguNSwxOS45LDhjLTAuMS0wLjQtMC40LTAuNC0wLjUtMC4z
+ QzIxLjIsMi44LDE4LjMsMywxOC4zLDNTMTgsMCwxMi44LDBDOCwwLDcuNCw0LDguNSw3LjYgICBDOC40
+ LDcuNiw4LjEsNy43LDgsNy45QzcuOSw4LjQsOC4yLDguOCw4LjQsOS4zQzguNiw5LjgsOC4zLDExLDku
+ MywxMC45eiIgY2xhc3M9IkJsYWNrIiAvPg0KICAgIDxwYXRoIGQ9Ik0yNywxNmMtMi44LDAtNSwyLjIt
+ NSw1YzAsMC42LDAuMSwxLjIsMC4zLDEuN0wxNiwyOXYzaDR2LTJoMnYtMmgybDIuMS0yLjFDMjYuNCwy
+ NiwyNi43LDI2LDI3LDI2ICAgYzIuOCwwLDUtMi4yLDUtNVMyOS44LDE2LDI3LDE2eiBNMjcsMjJjLTAu
+ NiwwLTEtMC40LTEtMWMwLTAuNiwwLjQtMSwxLTFzMSwwLjQsMSwxQzI4LDIxLjYsMjcuNiwyMiwyNywy
+ MnoiIGNsYXNzPSJZZWxsb3ciIC8+DQogIDwvZz4NCjwvc3ZnPgs=
+</value>
+ </data>
<data name="nbMin.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
diff --git a/Service/HStation.Service.Assets.Core/03-settings/00-core/AssetsFileHelper.cs b/Service/HStation.Service.Assets.Core/03-settings/00-core/AssetsFileHelper.cs
index 658c145..91d50d0 100644
--- a/Service/HStation.Service.Assets.Core/03-settings/00-core/AssetsFileHelper.cs
+++ b/Service/HStation.Service.Assets.Core/03-settings/00-core/AssetsFileHelper.cs
@@ -13,7 +13,7 @@
{
if (string.IsNullOrEmpty(_jsonFileName))
{
- _jsonFileName = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "paras_assets_settings.json");
+ _jsonFileName = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "paras_hstation_assets_settings.json");
}
return _jsonFileName;
}
--
Gitblit v1.9.3