迁移系统配置界面

duheng

2024-08-29 fb98441d18634dd73233b943eade8768193ca7a3

迁移系统配置界面

 Desktop/HStation.DeskTop.Xhs.Main/GuideMain.cs

@@ -267,10 +267,10 @@
            };
            if (!IsExistPage(guid, true))
            {
                var page = new MenuMgrMainPanel();
                page.PageTitle.Caption = guid.Function;
                page.PageGuid = guid;
                CreatePage(page, guid);
                /* var page = new MenuMgrMainPanel();
                 page.PageTitle.Caption = guid.Function;
                 page.PageGuid = guid;
                 CreatePage(page, guid);*/
            }
        }


 Desktop/HStation.Desktop.Xhs.Core/HStation.Desktop.Xhs.Core.csproj

@@ -61,11 +61,12 @@

  <ItemGroup>
    <PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
    <PackageReference Include="Yw.BLL.Auth.Core" Version="3.1.6" />
    <PackageReference Include="Yw.BLL.Auth.Core" Version="3.1.8" />
  </ItemGroup>

  <ItemGroup>
    <ProjectReference Include="..\..\WinFrmUI\HStation.WinFrmUI.Assets.Core\HStation.WinFrmUI.Assets.Core.csproj" />
    <ProjectReference Include="..\..\WinFrmUI\HStation.WinFrmUI.Auth.Core\HStation.WinFrmUI.Auth.Core.csproj" />
    <ProjectReference Include="..\..\WinFrmUI\HStation.WinFrmUI.Basic\HStation.WinFrmUI.Basic.csproj" />
    <ProjectReference Include="..\..\WinFrmUI\HStation.WinFrmUI.Xhs.Core\HStation.WinFrmUI.Xhs.Core.csproj" />
  </ItemGroup>

 Desktop/HStation.Desktop.Xhs.Core/MainForm.Designer.cs

@@ -34,6 +34,7 @@
            nbTitle = new DevExpress.XtraBars.Navigation.NavButton();
            nbProjectMgr = new DevExpress.XtraBars.Navigation.NavButton();
            nbModelMgr = new DevExpress.XtraBars.Navigation.NavButton();
            nbProductManage = new DevExpress.XtraBars.Navigation.NavButton();
            nbSystemConfig = new DevExpress.XtraBars.Navigation.NavButton();
            nbMin = new DevExpress.XtraBars.Navigation.NavButton();
            nbNormal = new DevExpress.XtraBars.Navigation.NavButton();
@@ -70,6 +71,7 @@
            tileNavPane.Buttons.Add(nbTitle);
            tileNavPane.Buttons.Add(nbProjectMgr);
            tileNavPane.Buttons.Add(nbModelMgr);
            tileNavPane.Buttons.Add(nbProductManage);
            tileNavPane.Buttons.Add(nbSystemConfig);
            tileNavPane.Buttons.Add(nbMin);
            tileNavPane.Buttons.Add(nbNormal);
@@ -116,6 +118,14 @@
            nbModelMgr.ImageOptions.SvgImageSize = new Size(24, 24);
            nbModelMgr.Name = "nbModelMgr";
            nbModelMgr.ElementClick += nbModelMgr_ElementClick;
            // 
            // nbProductManage
            // 
            nbProductManage.Alignment = DevExpress.XtraBars.Navigation.NavButtonAlignment.Right;
            nbProductManage.Caption = "产品管理";
            nbProductManage.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("nbProductManage.ImageOptions.SvgImage");
            nbProductManage.Name = "nbProductManage";
            nbProductManage.ElementClick += nbProductManage_ElementClick;
            // 
            // nbSystemConfig
            // 
@@ -345,6 +355,7 @@
        private DevExpress.Utils.FlyoutPanel flyoutPanel1;
        private DevExpress.Utils.FlyoutPanelControl flyoutPanelControl1;
        private DevExpress.Utils.SvgImageCollection svgImg32Model;
        private DevExpress.XtraBars.Navigation.NavButton nbProductManage;
        private DevExpress.XtraBars.Navigation.NavButton nbSystemConfig;
    }
}

 Desktop/HStation.Desktop.Xhs.Core/MainForm.cs

@@ -1,5 +1,3 @@
using DevExpress.CodeParser;
using DevExpress.Utils;
using DevExpress.XtraBars.Docking;
using DevExpress.XtraBars.Docking2010.Views;
using DevExpress.XtraBars.Navigation;
@@ -7,12 +5,12 @@
using DevExpress.XtraEditors;
using HStation.WinFrmUI;
using HStation.WinFrmUI.Assets;
using HStation.WinFrmUI.Auth.Core._02_User;
using HStation.WinFrmUI.Basic;
using HStation.WinFrmUI.Xhs.PumpProduct;
using System.IO;
using Yw.WinFrmUI;
using Yw.WinFrmUI.Page;
using static DevExpress.XtraPrinting.BarCode.DataBarExpandedPatternProcessor;

namespace HStation.Desktop
{
@@ -197,15 +195,18 @@
        }

        private Control _bimfaceMgrBeakCtrl = null;//bimface管理弹出界面
        private Control _SystemProductManageCtrl = null;//产品管理弹出界面

        //系统配置
        private void nbSystemConfig_ElementClick(object sender, NavElementEventArgs e)
        private Control _SystemSystemConfigCtrl = null;//系统配置弹出界面

        //产品管理
        private void nbProductManage_ElementClick(object sender, NavElementEventArgs e)
        {
            var pt = this.tileNavPane.PointToClient(MousePosition);
            var hitInfo = this.tileNavPane.CalcHitInfo(pt);
            if (hitInfo.ButtonInfo != null)
            {
                if (_SystemConfigBeakCtrl == null)
                if (_SystemProductManageCtrl == null)
                {
                    var peakItemList = new List<Yw.WinFrmUI.TilePeekItem>()
                    {
@@ -299,17 +300,91 @@
                            }
                         }
                    };
                    _SystemConfigBeakCtrl = peakItemList.CreatePeekCtrl();
                    _SystemProductManageCtrl = peakItemList.CreatePeekCtrl();
                }
                this.flyoutPanel1.Size = _SystemConfigBeakCtrl.Size;
                this.flyoutPanel1.Size = _SystemProductManageCtrl.Size;
                this.flyoutPanelControl1.Controls.Clear();
                this.flyoutPanelControl1.Controls.Add(_SystemConfigBeakCtrl);
                this.flyoutPanelControl1.Controls.Add(_SystemProductManageCtrl);
                var rectangle = this.RectangleToScreen(hitInfo.ButtonInfo.Bounds);
                this.flyoutPanel1.ShowBeakForm(rectangle);
            }
        }

        private Control _SystemConfigBeakCtrl = null;//系统配置弹出界面
        //系统配置
        private void nbSystemConfig_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 ValveManageMainPanel();
                                    CreatePage(page,guid);
                                }
                            }
                        },
                        new TilePeekItem(){
                            Caption="菜单管理",
                            SvgImage=svgImg32Model[4],
                            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 ç›¸å…³å¤„理


 Desktop/HStation.Desktop.Xhs.Core/MainForm.resx

@@ -196,6 +196,30 @@
        IGNsYXNzPSJZZWxsb3ciIC8+DQogICAgPC9nPg0KICA8L2c+DQo8L3N2Zz4L
</value>
  </data>
  <data name="nbProductManage.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAOsDAAAC77u/
        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJs
        YWNre2ZpbGw6IzcyNzI3Mjt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAzOUMy
        Mzt9CgkuWWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
        Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQo8L3N0eWxl
        Pg0KICA8ZyBpZD0iU2V0dGluZyI+DQogICAgPHBhdGggZD0iTTMwLDE4di00bC00LjQtMC43Yy0wLjIt
        MC44LTAuNS0xLjUtMC45LTIuMWwyLjYtMy42bC0yLjgtMi44bC0zLjYsMi42Yy0wLjctMC40LTEuNC0w
        LjctMi4xLTAuOUwxOCwyaC00ICAgbC0wLjcsNC40Yy0wLjgsMC4yLTEuNSwwLjUtMi4xLDAuOUw3LjUs
        NC43TDQuNyw3LjVsMi42LDMuNmMtMC40LDAuNy0wLjcsMS40LTAuOSwyLjFMMiwxNHY0bDQuNCwwLjdj
        MC4yLDAuOCwwLjUsMS41LDAuOSwyLjEgICBsLTIuNiwzLjZsMi44LDIuOGwzLjYtMi42YzAuNywwLjQs
        MS40LDAuNywyLjEsMC45TDE0LDMwaDRsMC43LTQuNGMwLjgtMC4yLDEuNS0wLjUsMi4xLTAuOWwzLjYs
        Mi42bDIuOC0yLjhsLTIuNi0zLjYgICBjMC40LTAuNywwLjctMS40LDAuOS0yLjFMMzAsMTh6IE0xNiwy
        MGMtMi4yLDAtNC0xLjgtNC00YzAtMi4yLDEuOC00LDQtNHM0LDEuOCw0LDRDMjAsMTguMiwxOC4yLDIw
        LDE2LDIweiIgY2xhc3M9IkJsdWUiIC8+DQogIDwvZz4NCjwvc3ZnPgs=
</value>
  </data>
  <data name="nbSystemConfig.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40

 HStation.Xhs.Core.sln

@@ -121,6 +121,8 @@
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yw.WinFrmUI.Hydro.L2d.Core", "WinFrmUI\Yw.WinFrmUI.Hydro.L2d.Core\Yw.WinFrmUI.Hydro.L2d.Core.csproj", "{AE2775AE-3C2D-49CB-BD3C-2FF5D4AE5B53}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HStation.WinFrmUI.Auth.Core", "WinFrmUI\HStation.WinFrmUI.Auth.Core\HStation.WinFrmUI.Auth.Core.csproj", "{62B68CCE-1FDA-42EB-8BBC-2053EB0E04CA}"
EndProject
Global
    GlobalSection(SolutionConfigurationPlatforms) = preSolution
        Debug|Any CPU = Debug|Any CPU
@@ -998,6 +1000,24 @@
        {AE2775AE-3C2D-49CB-BD3C-2FF5D4AE5B53}.Release|x64.Build.0 = Release|Any CPU
        {AE2775AE-3C2D-49CB-BD3C-2FF5D4AE5B53}.Release|x86.ActiveCfg = Release|Any CPU
        {AE2775AE-3C2D-49CB-BD3C-2FF5D4AE5B53}.Release|x86.Build.0 = Release|Any CPU
        {62B68CCE-1FDA-42EB-8BBC-2053EB0E04CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
        {62B68CCE-1FDA-42EB-8BBC-2053EB0E04CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
        {62B68CCE-1FDA-42EB-8BBC-2053EB0E04CA}.Debug|x64.ActiveCfg = Debug|Any CPU
        {62B68CCE-1FDA-42EB-8BBC-2053EB0E04CA}.Debug|x64.Build.0 = Debug|Any CPU
        {62B68CCE-1FDA-42EB-8BBC-2053EB0E04CA}.Debug|x86.ActiveCfg = Debug|Any CPU
        {62B68CCE-1FDA-42EB-8BBC-2053EB0E04CA}.Debug|x86.Build.0 = Debug|Any CPU
        {62B68CCE-1FDA-42EB-8BBC-2053EB0E04CA}.dll_test|Any CPU.ActiveCfg = Debug|Any CPU
        {62B68CCE-1FDA-42EB-8BBC-2053EB0E04CA}.dll_test|Any CPU.Build.0 = Debug|Any CPU
        {62B68CCE-1FDA-42EB-8BBC-2053EB0E04CA}.dll_test|x64.ActiveCfg = Debug|Any CPU
        {62B68CCE-1FDA-42EB-8BBC-2053EB0E04CA}.dll_test|x64.Build.0 = Debug|Any CPU
        {62B68CCE-1FDA-42EB-8BBC-2053EB0E04CA}.dll_test|x86.ActiveCfg = Debug|Any CPU
        {62B68CCE-1FDA-42EB-8BBC-2053EB0E04CA}.dll_test|x86.Build.0 = Debug|Any CPU
        {62B68CCE-1FDA-42EB-8BBC-2053EB0E04CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
        {62B68CCE-1FDA-42EB-8BBC-2053EB0E04CA}.Release|Any CPU.Build.0 = Release|Any CPU
        {62B68CCE-1FDA-42EB-8BBC-2053EB0E04CA}.Release|x64.ActiveCfg = Release|Any CPU
        {62B68CCE-1FDA-42EB-8BBC-2053EB0E04CA}.Release|x64.Build.0 = Release|Any CPU
        {62B68CCE-1FDA-42EB-8BBC-2053EB0E04CA}.Release|x86.ActiveCfg = Release|Any CPU
        {62B68CCE-1FDA-42EB-8BBC-2053EB0E04CA}.Release|x86.Build.0 = Release|Any CPU
    EndGlobalSection
    GlobalSection(SolutionProperties) = preSolution
        HideSolutionNode = FALSE
@@ -1051,6 +1071,7 @@
        {DBC6DC37-8BA8-4CFC-A98C-E6D34EE2E5D7} = {4F0A7BA1-6ED6-4F4F-A3B4-B9B3A133D869}
        {2F469712-C0AB-405C-BCA3-410612141D49} = {E956660D-6E09-417B-9A3C-27888AF69266}
        {AE2775AE-3C2D-49CB-BD3C-2FF5D4AE5B53} = {4F0A7BA1-6ED6-4F4F-A3B4-B9B3A133D869}
        {62B68CCE-1FDA-42EB-8BBC-2053EB0E04CA} = {4F0A7BA1-6ED6-4F4F-A3B4-B9B3A133D869}
    EndGlobalSection
    GlobalSection(ExtensibilityGlobals) = postSolution
        SolutionGuid = {E02989A8-9B6F-43E5-AACA-790328215089}

 WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/01-EditPumpPartProp/EditPumpPartPropDlg.Designer.cs

ÎļþÃû´Ó WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/EditPumpPartDlg.Designer.cs ÐÞ¸Ä
@@ -1,6 +1,6 @@
namespace HStation.WinFrmUI { 

    partial class EditPumpPartDlg
    partial class EditPumpPartPropDlg
    {
        /// <summary>
        /// Required designer variable.
@@ -365,7 +365,7 @@
            popupPumpPartMenu.Manager = barManager1;
            popupPumpPartMenu.Name = "popupPumpPartMenu";
            // 
            // EditPumpPartDlg
            // EditPumpPartPropDlg
            // 
            AutoScaleDimensions = new SizeF(7F, 14F);
            AutoScaleMode = AutoScaleMode.Font;

 WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/01-EditPumpPartProp/EditPumpPartPropDlg.cs

ÎļþÃû´Ó WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/EditPumpPartDlg.cs ÐÞ¸Ä
@@ -2,9 +2,9 @@

namespace HStation.WinFrmUI
{
    public partial class EditPumpPartDlg : DevExpress.XtraEditors.XtraForm
    public partial class EditPumpPartPropDlg : DevExpress.XtraEditors.XtraForm
    {
        public EditPumpPartDlg()
        public EditPumpPartPropDlg()
        {
            InitializeComponent();
            this.gridView1.Columns["PropGroupName"].Group();

 WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/01-EditPumpPartProp/EditPumpPartPropDlg.resx

 WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/01-EditPumpPartProp/PumpProductListBox.Designer.cs

 WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/01-EditPumpPartProp/PumpProductListBox.cs

 WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/01-EditPumpPartProp/PumpProductListBox.resx

 WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/02-ViewPumpInformation/ViewPumpInformationDlg.Designer.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,45 @@
namespace HStation.WinFrmUI.Assets 
{
    partial class ViewPumpInformationDlg
    {
        /// <summary>
        /// Required designer variable.
        /// </summary>
        private System.ComponentModel.IContainer components = null;

        /// <summary>
        /// Clean up any resources being used.
        /// </summary>
        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
        protected override void Dispose(bool disposing)
        {
            if (disposing && (components != null))
            {
                components.Dispose();
            }
            base.Dispose(disposing);
        }

        #region Windows Form Designer generated code

        /// <summary>
        /// Required method for Designer support - do not modify
        /// the contents of this method with the code editor.
        /// </summary>
        private void InitializeComponent()
        {
            SuspendLayout();
            // 
            // ViewPumpInformationDlg
            // 
            AutoScaleDimensions = new SizeF(7F, 14F);
            AutoScaleMode = AutoScaleMode.Font;
            ClientSize = new Size(722, 474);
            Name = "ViewPumpInformationDlg";
            Text = "查看泵信息";
            ResumeLayout(false);
        }

        #endregion
    }
}

 WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/02-ViewPumpInformation/ViewPumpInformationDlg.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,10 @@
namespace HStation.WinFrmUI.Assets
{
    public partial class ViewPumpInformationDlg : DevExpress.XtraEditors.XtraForm
    {
        public ViewPumpInformationDlg()
        {
            InitializeComponent();
        }
    }
}

 WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/02-ViewPumpInformation/ViewPumpInformationDlg.resx

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
  <!--
    Microsoft ResX Schema 

    Version 2.0

    The primary goals of this format is to allow a simple XML format
    that is mostly human readable. The generation and parsing of the
    various data types are done through the TypeConverter classes
    associated with the data types.

    Example:

    ... ado.net/XML headers & schema ...
    <resheader name="resmimetype">text/microsoft-resx</resheader>
    <resheader name="version">2.0</resheader>
    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
        <value>[base64 mime encoded serialized .NET Framework object]</value>
    </data>
    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
        <comment>This is a comment</comment>
    </data>

    There are any number of "resheader" rows that contain simple
    name/value pairs.

    Each data row contains a name, and value. The row also contains a
    type or mimetype. Type corresponds to a .NET class that support
    text/value conversion through the TypeConverter architecture.
    Classes that don't support this are serialized and stored with the
    mimetype set.

    The mimetype is used for serialized objects, and tells the
    ResXResourceReader how to depersist the object. This is currently not
    extensible. For a given mimetype the value must be set accordingly:

    Note - application/x-microsoft.net.object.binary.base64 is the format
    that the ResXResourceWriter will generate, however the reader can
    read any of the formats listed below.

    mimetype: application/x-microsoft.net.object.binary.base64
    value   : The object must be serialized with
            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
            : and then encoded with base64 encoding.
    
    mimetype: application/x-microsoft.net.object.soap.base64
    value   : The object must be serialized with
            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
            : and then encoded with base64 encoding.

    mimetype: application/x-microsoft.net.object.bytearray.base64
    value   : The object must be serialized into a byte array
            : using a System.ComponentModel.TypeConverter
            : and then encoded with base64 encoding.
    -->
  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
    <xsd:element name="root" msdata:IsDataSet="true">
      <xsd:complexType>
        <xsd:choice maxOccurs="unbounded">
          <xsd:element name="metadata">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" />
              </xsd:sequence>
              <xsd:attribute name="name" use="required" type="xsd:string" />
              <xsd:attribute name="type" type="xsd:string" />
              <xsd:attribute name="mimetype" type="xsd:string" />
              <xsd:attribute ref="xml:space" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="assembly">
            <xsd:complexType>
              <xsd:attribute name="alias" type="xsd:string" />
              <xsd:attribute name="name" type="xsd:string" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="data">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
              </xsd:sequence>
              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
              <xsd:attribute ref="xml:space" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="resheader">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
              </xsd:sequence>
              <xsd:attribute name="name" type="xsd:string" use="required" />
            </xsd:complexType>
          </xsd:element>
        </xsd:choice>
      </xsd:complexType>
    </xsd:element>
  </xsd:schema>
  <resheader name="resmimetype">
    <value>text/microsoft-resx</value>
  </resheader>
  <resheader name="version">
    <value>2.0</value>
  </resheader>
  <resheader name="reader">
    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
</root>

 WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/PumpProductMainPanel.Designer.cs

@@ -64,6 +64,7 @@
            layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            popupPump = new DevExpress.XtraBars.PopupMenu(components);
            svgImage32 = new DevExpress.Utils.SvgImageCollection(components);
            BarBtnPumpinformation = new DevExpress.XtraBars.BarButtonItem();
            ((System.ComponentModel.ISupportInitialize)ribbonControl1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)dockManager1).BeginInit();
            dockPanel1.SuspendLayout();
@@ -85,9 +86,9 @@
            ribbonControl1.DrawGroupsBorderMode = DevExpress.Utils.DefaultBoolean.True;
            ribbonControl1.ExpandCollapseItem.Id = 0;
            ribbonControl1.ItemPanelStyle = DevExpress.XtraBars.Ribbon.RibbonItemPanelStyle.Classic;
            ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, BtnAdd, BtnEdit, BtnDelete, barBtnEditPumpCurve, BarBtnEidtPumpPart, barButtonItem1 });
            ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, BtnAdd, BtnEdit, BtnDelete, barBtnEditPumpCurve, BarBtnEidtPumpPart, barButtonItem1, BarBtnPumpinformation });
            ribbonControl1.Location = new Point(0, 0);
            ribbonControl1.MaxItemId = 23;
            ribbonControl1.MaxItemId = 24;
            ribbonControl1.Name = "ribbonControl1";
            ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage1 });
            ribbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.False;
@@ -375,6 +376,7 @@
            // popupPump
            // 
            popupPump.ItemLinks.Add(BarBtnEidtPumpPart);
            popupPump.ItemLinks.Add(BarBtnPumpinformation);
            popupPump.Name = "popupPump";
            popupPump.Ribbon = ribbonControl1;
            // 
@@ -382,6 +384,13 @@
            // 
            svgImage32.ImageSize = new Size(32, 32);
            svgImage32.Add("propertiespanel", "image://svgimages/diagramicons/propertiespanel.svg");
            // 
            // BarBtnPumpinformation
            // 
            BarBtnPumpinformation.Caption = "查看泵信息";
            BarBtnPumpinformation.Id = 23;
            BarBtnPumpinformation.Name = "BarBtnPumpinformation";
            BarBtnPumpinformation.ItemClick += BarBtnPumpinformation_ItemClick;
            // 
            // PumpProductMainPanel
            // 
@@ -411,7 +420,7 @@
            ResumeLayout(false);
        }

        #endregion
         #endregion

        private DevExpress.XtraBars.Ribbon.RibbonControl ribbonControl1;
        private DevExpress.XtraBars.BarButtonItem BtnAdd;
@@ -446,5 +455,6 @@
        private DevExpress.XtraEditors.SidePanel sidePanel1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
        private DevExpress.XtraBars.BarButtonItem barButtonItem1;
        private DevExpress.XtraBars.BarButtonItem BarBtnPumpinformation;
    }
}

 WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/PumpProductMainPanel.cs

@@ -184,6 +184,8 @@
            }
        }

        #region å³å‡»èœå•åŠŸèƒ½åˆ—表

        //泵产品编辑
        private void BarBtnEidtPumpPart_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        {
@@ -193,7 +195,7 @@
                MessageBoxHelper.ShowWarning("请选择数据行！");
                return;
            }
            var dlg = new EditPumpPartDlg();
            var dlg = new EditPumpPartPropDlg();
            //    var pumpmain = currentVm.Model as Vmo.PumpMain;
            dlg.SetBindingData(currentVm.Model);
            dlg.ReloadEvent += async (part, content, map) =>
@@ -210,6 +212,13 @@
            dlg.ShowDialog();
        }

        //查看泵信息
        private void BarBtnPumpinformation_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        {
        }

        #endregion å³å‡»èœå•åŠŸèƒ½åˆ—表

        //表格右击菜单
        private void gridView1_MouseUp(object sender, MouseEventArgs e)
        {

 WinFrmUI/HStation.WinFrmUI.Assets.Core/01-ValveManage/ValveTypeTreeListCtrl.designer.cs

@@ -31,17 +31,19 @@
            components = new System.ComponentModel.Container();
            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ValveTypeTreeListCtrl));
            barManager1 = new DevExpress.XtraBars.BarManager(components);
            barBtnAdd = new DevExpress.XtraBars.BarButtonItem();
            barBtnAddChild = new DevExpress.XtraBars.BarButtonItem();
            barBtnEdit = new DevExpress.XtraBars.BarButtonItem();
            barBtnDelete = new DevExpress.XtraBars.BarButtonItem();
            barCkSearch = new DevExpress.XtraBars.BarCheckItem();
            barBtnExpandAll = new DevExpress.XtraBars.BarButtonItem();
            barBtnCollapseAll = new DevExpress.XtraBars.BarButtonItem();
            bar1 = new DevExpress.XtraBars.Bar();
            BtnAdd = new DevExpress.XtraBars.BarButtonItem();
            barDockControlTop = new DevExpress.XtraBars.BarDockControl();
            barDockControlBottom = new DevExpress.XtraBars.BarDockControl();
            barDockControlLeft = new DevExpress.XtraBars.BarDockControl();
            barDockControlRight = new DevExpress.XtraBars.BarDockControl();
            barCkSearch = new DevExpress.XtraBars.BarCheckItem();
            barBtnAdd = new DevExpress.XtraBars.BarButtonItem();
            barBtnEdit = new DevExpress.XtraBars.BarButtonItem();
            barBtnDelete = new DevExpress.XtraBars.BarButtonItem();
            barBtnExpandAll = new DevExpress.XtraBars.BarButtonItem();
            barBtnCollapseAll = new DevExpress.XtraBars.BarButtonItem();
            barBtnAddChild = new DevExpress.XtraBars.BarButtonItem();
            barRoot = new DevExpress.XtraBars.BarSubItem();
            layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
            treeList1 = new DevExpress.XtraTreeList.TreeList();
@@ -49,8 +51,8 @@
            Root = new DevExpress.XtraLayout.LayoutControlGroup();
            layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            barRootBasicInfoMgr = new DevExpress.XtraBars.BarSubItem();
            bar1 = new DevExpress.XtraBars.Bar();
            BtnAdd = new DevExpress.XtraBars.BarButtonItem();
            barButtonItem1 = new DevExpress.XtraBars.BarButtonItem();
            barButtonItem2 = new DevExpress.XtraBars.BarButtonItem();
            ((System.ComponentModel.ISupportInitialize)barManager1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit();
            layoutControl1.SuspendLayout();
@@ -68,44 +70,29 @@
            barManager1.DockControls.Add(barDockControlLeft);
            barManager1.DockControls.Add(barDockControlRight);
            barManager1.Form = this;
            barManager1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { barCkSearch, barBtnAdd, barBtnEdit, barBtnDelete, barBtnExpandAll, barBtnCollapseAll, barBtnAddChild, BtnAdd });
            barManager1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { barCkSearch, barBtnAdd, barBtnEdit, barBtnDelete, barBtnExpandAll, barBtnCollapseAll, barBtnAddChild, BtnAdd, barButtonItem1, barButtonItem2 });
            barManager1.MainMenu = bar1;
            barManager1.MaxItemId = 60;
            barManager1.MaxItemId = 62;
            // 
            // barBtnAdd
            // bar1
            // 
            barBtnAdd.Id = 53;
            barBtnAdd.Name = "barBtnAdd";
            bar1.BarName = "Custom 2";
            bar1.DockCol = 0;
            bar1.DockRow = 0;
            bar1.DockStyle = DevExpress.XtraBars.BarDockStyle.Top;
            bar1.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] { new DevExpress.XtraBars.LinkPersistInfo(BtnAdd), new DevExpress.XtraBars.LinkPersistInfo(barButtonItem1), new DevExpress.XtraBars.LinkPersistInfo(barButtonItem2) });
            bar1.OptionsBar.DrawDragBorder = false;
            bar1.OptionsBar.MultiLine = true;
            bar1.OptionsBar.UseWholeRow = true;
            bar1.Text = "Custom 2";
            // 
            // barBtnAddChild
            // BtnAdd
            // 
            barBtnAddChild.Id = 58;
            barBtnAddChild.Name = "barBtnAddChild";
            // 
            // barBtnEdit
            // 
            barBtnEdit.Id = 54;
            barBtnEdit.Name = "barBtnEdit";
            // 
            // barBtnDelete
            // 
            barBtnDelete.Id = 55;
            barBtnDelete.Name = "barBtnDelete";
            // 
            // barCkSearch
            // 
            barCkSearch.Id = 52;
            barCkSearch.Name = "barCkSearch";
            // 
            // barBtnExpandAll
            // 
            barBtnExpandAll.Id = 56;
            barBtnExpandAll.Name = "barBtnExpandAll";
            // 
            // barBtnCollapseAll
            // 
            barBtnCollapseAll.Id = 57;
            barBtnCollapseAll.Name = "barBtnCollapseAll";
            BtnAdd.Caption = "添加类型";
            BtnAdd.Id = 59;
            BtnAdd.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("BtnAdd.ImageOptions.SvgImage");
            BtnAdd.ImageOptions.SvgImageSize = new Size(20, 20);
            BtnAdd.Name = "BtnAdd";
            // 
            // barDockControlTop
            // 
@@ -138,6 +125,41 @@
            barDockControlRight.Location = new Point(239, 28);
            barDockControlRight.Manager = barManager1;
            barDockControlRight.Size = new Size(0, 541);
            // 
            // barCkSearch
            // 
            barCkSearch.Id = 52;
            barCkSearch.Name = "barCkSearch";
            // 
            // barBtnAdd
            // 
            barBtnAdd.Id = 53;
            barBtnAdd.Name = "barBtnAdd";
            // 
            // barBtnEdit
            // 
            barBtnEdit.Id = 54;
            barBtnEdit.Name = "barBtnEdit";
            // 
            // barBtnDelete
            // 
            barBtnDelete.Id = 55;
            barBtnDelete.Name = "barBtnDelete";
            // 
            // barBtnExpandAll
            // 
            barBtnExpandAll.Id = 56;
            barBtnExpandAll.Name = "barBtnExpandAll";
            // 
            // barBtnCollapseAll
            // 
            barBtnCollapseAll.Id = 57;
            barBtnCollapseAll.Name = "barBtnCollapseAll";
            // 
            // barBtnAddChild
            // 
            barBtnAddChild.Id = 58;
            barBtnAddChild.Name = "barBtnAddChild";
            // 
            // barRoot
            // 
@@ -207,25 +229,19 @@
            barRootBasicInfoMgr.Id = 20;
            barRootBasicInfoMgr.Name = "barRootBasicInfoMgr";
            // 
            // bar1
            // barButtonItem1
            // 
            bar1.BarName = "Custom 2";
            bar1.DockCol = 0;
            bar1.DockRow = 0;
            bar1.DockStyle = DevExpress.XtraBars.BarDockStyle.Top;
            bar1.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] { new DevExpress.XtraBars.LinkPersistInfo(BtnAdd) });
            bar1.OptionsBar.DrawDragBorder = false;
            bar1.OptionsBar.MultiLine = true;
            bar1.OptionsBar.UseWholeRow = true;
            bar1.Text = "Custom 2";
            barButtonItem1.Caption = "编辑";
            barButtonItem1.Id = 60;
            barButtonItem1.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barButtonItem1.ImageOptions.SvgImage");
            barButtonItem1.Name = "barButtonItem1";
            // 
            // BtnAdd
            // barButtonItem2
            // 
            BtnAdd.Caption = "添加类型";
            BtnAdd.Id = 59;
            BtnAdd.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("BtnAdd.ImageOptions.SvgImage");
            BtnAdd.ImageOptions.SvgImageSize = new Size(20, 20);
            BtnAdd.Name = "BtnAdd";
            barButtonItem2.Caption = "删除";
            barButtonItem2.Id = 61;
            barButtonItem2.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barButtonItem2.ImageOptions.SvgImage");
            barButtonItem2.Name = "barButtonItem2";
            // 
            // ValveTypeTreeListCtrl
            // 
@@ -272,5 +288,7 @@
        private DevExpress.XtraBars.BarButtonItem barBtnAddChild;
        private DevExpress.XtraBars.Bar bar1;
        private DevExpress.XtraBars.BarButtonItem BtnAdd;
        private DevExpress.XtraBars.BarButtonItem barButtonItem1;
        private DevExpress.XtraBars.BarButtonItem barButtonItem2;
    }
}

 WinFrmUI/HStation.WinFrmUI.Assets.Core/01-ValveManage/ValveTypeTreeListCtrl.resx

@@ -139,4 +139,52 @@
        Cjwvc3ZnPgs=
</value>
  </data>
  <data name="barButtonItem1.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAABwFAAAC77u/
        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ
        LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuQmx1ZXtmaWxsOiMxMTc3
        RDc7fQoJLldoaXRle2ZpbGw6I0ZGRkZGRjt9CgkuR3JlZW57ZmlsbDojMDM5QzIzO30KCS5zdDB7b3Bh
        Y2l0eTowLjc1O30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQoJLnN0M3tm
        aWxsOiNGRkIxMTU7fQo8L3N0eWxlPg0KICA8ZyAvPg0KICA8ZyBpZD0iUmVuYW1lXzFfIj4NCiAgICA8
        cGF0aCBkPSJNMi4xLDE2aDIuMmwwLjYtMi4zaDMuMkw4LjgsMTZIMTFMNy44LDZINS40TDIuMSwxNnog
        TTYuNCw4LjdjMC4xLTAuMywwLjEtMC42LDAuMS0wLjloMC4xICAgYzAsMC4zLDAuMSwwLjYsMC4xLDAu
        OWwxLDMuM0g1LjRMNi40LDguN3ogTTE3LjUsMTAuNmMwLjYtMC4yLDEuMS0wLjUsMS41LTAuOWMwLjQt
        MC40LDAuNi0wLjksMC42LTEuNGMwLTAuNy0wLjMtMS4zLTAuOS0xLjcgICBDMTguMSw2LjIsMTcuMSw2
        LDE1LjksNkgxMnY5LjlWMTZoNGMxLjIsMCwyLjItMC4yLDIuOS0wLjhDMTkuNywxNC42LDIwLDE0LDIw
        LDEzYzAtMC42LTAuMi0xLjItMC43LTEuNiAgIEMxOC45LDExLDE4LjMsMTAuNywxNy41LDEwLjZ6IE0x
        NC40LDcuN2gwLjljMS4xLDAsMS43LDAuNCwxLjcsMS4xYzAsMC40LTAuMSwwLjctMC40LDAuOUMxNi40
        LDkuOSwxNiwxMCwxNS41LDEwaC0xLjFWNy43eiAgICBNMTcsMTMuOGMtMC4zLDAuMi0wLjgsMC40LTEu
        MywwLjRoLTEuM3YtMi42aDEuM2MwLjUsMCwwLjksMC4xLDEuMywwLjNjMC4zLDAuMiwwLjUsMC42LDAu
        NSwwLjlDMTcuNSwxMy4zLDE3LjQsMTMuNiwxNywxMy44eiIgY2xhc3M9IkJsYWNrIiAvPg0KICAgIDxw
        YXRoIGQ9Ik0yNywxOWwtOCw4bC00LTRsOC04TDI3LDE5eiBNMjgsMThsMS43LTEuN2MwLjQtMC40LDAu
        NC0xLDAtMS4zTDI3LDEyLjNjLTAuNC0wLjQtMS0wLjQtMS4zLDBMMjQsMTRMMjgsMTh6ICAgIE0xNCwy
        NHY0aDRMMTQsMjR6IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+Cw==
</value>
  </data>
  <data name="barButtonItem2.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAALMCAAAC77u/
        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z
        ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz
        OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp
        dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IkRlbGV0ZUNpcmNsZWQiPg0KICAgIDxwYXRoIGQ9Ik0x
        Niw0QzkuNCw0LDQsOS40LDQsMTZzNS40LDEyLDEyLDEyczEyLTUuNCwxMi0xMlMyMi42LDQsMTYsNHog
        TTIzLjEsMjAuMmwtMi44LDIuOEwxNiwxOC44bC00LjIsNC4yICAgbC0yLjgtMi44bDQuMi00LjJsLTQu
        Mi00LjJsMi44LTIuOGw0LjIsNC4ybDQuMi00LjJsMi44LDIuOEwxOC44LDE2TDIzLjEsMjAuMnoiIGNs
        YXNzPSJSZWQiIC8+DQogIDwvZz4NCjwvc3ZnPgs=
</value>
  </data>
</root>

 WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj.user

@@ -2,6 +2,9 @@
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup />
  <ItemGroup>
    <Compile Update="00-PumpProductManage\02-ViewPumpInformation\ViewPumpInformationDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="00-PumpProductManage\AddPumpProductGroupDlg.cs">
      <SubType>Form</SubType>
    </Compile>
@@ -11,7 +14,7 @@
    <Compile Update="00-PumpProductManage\AddPumpProductSeriesDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="00-PumpProductManage\EditPumpPartDlg.cs">
    <Compile Update="00-PumpProductManage\01-EditPumpPartProp\EditPumpPartPropDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="00-PumpProductManage\EditPumpProductGroupDlg.cs">
@@ -23,7 +26,7 @@
    <Compile Update="00-PumpProductManage\EditPumpProductSeriesDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="00-PumpProductManage\PumpProductListBox.cs">
    <Compile Update="00-PumpProductManage\01-EditPumpPartProp\PumpProductListBox.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="00-PumpProductManage\PumpProductMainPanel.cs">

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-scheme/03-hydraulic-simulation/01-PumpMainCurveChoice/PumpMainChoicePage.Designer.cs

@@ -59,7 +59,7 @@
            layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
            layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
            emptySpaceItem2 = new DevExpress.XtraLayout.EmptySpaceItem();
            layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
            simpleLabelItem1 = new DevExpress.XtraLayout.SimpleLabelItem();
@@ -88,7 +88,7 @@
            ((ISupportInitialize)layoutControlItem1).BeginInit();
            ((ISupportInitialize)layoutControlItem2).BeginInit();
            ((ISupportInitialize)layoutControlGroup1).BeginInit();
            ((ISupportInitialize)layoutControlItem6).BeginInit();
            ((ISupportInitialize)layoutControlItem5).BeginInit();
            ((ISupportInitialize)emptySpaceItem2).BeginInit();
            ((ISupportInitialize)layoutControlItem4).BeginInit();
            ((ISupportInitialize)simpleLabelItem1).BeginInit();
@@ -122,25 +122,25 @@
            // 
            xtrPerform2dChart1.DefinePointVisible = false;
            xtrPerform2dChart1.LineVisible = false;
            xtrPerform2dChart1.Location = new Point(10, 210);
            xtrPerform2dChart1.Location = new Point(12, 211);
            xtrPerform2dChart1.Margin = new Padding(2, 2, 2, 2);
            xtrPerform2dChart1.Name = "xtrPerform2dChart1";
            xtrPerform2dChart1.Size = new Size(940, 315);
            xtrPerform2dChart1.TabIndex = 4;
            xtrPerform2dChart1.Size = new Size(936, 312);
            xtrPerform2dChart1.TabIndex = 6;
            // 
            // pumpMainCurveForm1
            // 
            pumpMainCurveForm1.Location = new Point(2, 30);
            pumpMainCurveForm1.Name = "pumpMainCurveForm1";
            pumpMainCurveForm1.Size = new Size(956, 147);
            pumpMainCurveForm1.Size = new Size(956, 146);
            pumpMainCurveForm1.TabIndex = 3;
            // 
            // popupContainerControl1
            // 
            popupContainerControl1.Controls.Add(treeList1);
            popupContainerControl1.Location = new Point(655, 54);
            popupContainerControl1.Location = new Point(501, 40);
            popupContainerControl1.Name = "popupContainerControl1";
            popupContainerControl1.Size = new Size(200, 100);
            popupContainerControl1.Size = new Size(307, 153);
            popupContainerControl1.TabIndex = 1;
            // 
            // treeList1
@@ -151,7 +151,7 @@
            treeList1.Name = "treeList1";
            treeList1.OptionsBehavior.Editable = false;
            treeList1.OptionsView.ShowTreeLines = DevExpress.Utils.DefaultBoolean.True;
            treeList1.Size = new Size(200, 100);
            treeList1.Size = new Size(307, 153);
            treeList1.TabIndex = 0;
            treeList1.SelectionChanged += treeList1_SelectionChanged;
            // 
@@ -190,9 +190,9 @@
            // popupContainerControl2
            // 
            popupContainerControl2.Controls.Add(gridControl1);
            popupContainerControl2.Location = new Point(242, 252);
            popupContainerControl2.Location = new Point(299, 37);
            popupContainerControl2.Name = "popupContainerControl2";
            popupContainerControl2.Size = new Size(692, 99);
            popupContainerControl2.Size = new Size(621, 218);
            popupContainerControl2.TabIndex = 1;
            // 
            // gridControl1
@@ -201,7 +201,7 @@
            gridControl1.Location = new Point(0, 0);
            gridControl1.MainView = gridView1;
            gridControl1.Name = "gridControl1";
            gridControl1.Size = new Size(692, 99);
            gridControl1.Size = new Size(621, 218);
            gridControl1.TabIndex = 0;
            gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView1 });
            // 
@@ -211,6 +211,7 @@
            gridView1.GridControl = gridControl1;
            gridView1.Name = "gridView1";
            gridView1.OptionsView.ShowGroupPanel = false;
            gridView1.RowClick += gridView1_RowClick;
            // 
            // colName
            // 
@@ -366,28 +367,27 @@
            layoutControlItem2.Control = pumpMainCurveForm1;
            layoutControlItem2.Location = new Point(0, 28);
            layoutControlItem2.Name = "layoutControlItem2";
            layoutControlItem2.Size = new Size(960, 151);
            layoutControlItem2.Size = new Size(960, 150);
            layoutControlItem2.TextSize = new Size(0, 0);
            layoutControlItem2.TextVisible = false;
            // 
            // layoutControlGroup1
            // 
            layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem6 });
            layoutControlGroup1.Location = new Point(0, 179);
            layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem5 });
            layoutControlGroup1.Location = new Point(0, 178);
            layoutControlGroup1.Name = "layoutControlGroup1";
            layoutControlGroup1.Padding = new DevExpress.XtraLayout.Utils.Padding(7, 7, 7, 7);
            layoutControlGroup1.Size = new Size(960, 356);
            layoutControlGroup1.Size = new Size(960, 357);
            layoutControlGroup1.Text = "曲线视图";
            // 
            // layoutControlItem6
            // layoutControlItem5
            // 
            layoutControlItem6.Control = xtrPerform2dChart1;
            layoutControlItem6.Location = new Point(0, 0);
            layoutControlItem6.Name = "layoutControlItem6";
            layoutControlItem6.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
            layoutControlItem6.Size = new Size(940, 315);
            layoutControlItem6.TextSize = new Size(0, 0);
            layoutControlItem6.TextVisible = false;
            layoutControlItem5.Control = xtrPerform2dChart1;
            layoutControlItem5.Location = new Point(0, 0);
            layoutControlItem5.Name = "layoutControlItem5";
            layoutControlItem5.Size = new Size(940, 316);
            layoutControlItem5.TextSize = new Size(0, 0);
            layoutControlItem5.TextVisible = false;
            // 
            // emptySpaceItem2
            // 
@@ -494,7 +494,7 @@
            ((ISupportInitialize)layoutControlItem1).EndInit();
            ((ISupportInitialize)layoutControlItem2).EndInit();
            ((ISupportInitialize)layoutControlGroup1).EndInit();
            ((ISupportInitialize)layoutControlItem6).EndInit();
            ((ISupportInitialize)layoutControlItem5).EndInit();
            ((ISupportInitialize)emptySpaceItem2).EndInit();
            ((ISupportInitialize)layoutControlItem4).EndInit();
            ((ISupportInitialize)simpleLabelItem1).EndInit();
@@ -533,6 +533,11 @@
        private DevExpress.XtraTreeList.TreeList treeList1;
        private DevExpress.XtraTreeList.Columns.TreeListColumn treeListColumn1;
        private DevExpress.XtraEditors.PopupContainerControl popupContainerControl2;
        private PumpMainCurveForm pumpMainCurveForm1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
        private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1;
        private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem2;
        private Yw.WinFrmUI.Phart.XtrPerform2dChart xtrPerform2dChart1;
        private DevExpress.XtraGrid.GridControl gridControl1;
        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
        private DevExpress.XtraGrid.Columns.GridColumn colName;
@@ -545,11 +550,6 @@
        private DevExpress.XtraGrid.Columns.GridColumn colRatedEfficiency;
        private DevExpress.XtraGrid.Columns.GridColumn colRatedPower;
        private DevExpress.XtraGrid.Columns.GridColumn colRatedSpeed;
        private Yw.WinFrmUI.Phart.XtrPerform2dChart xtrPerform2dChart1;
        private PumpMainCurveForm pumpMainCurveForm1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
        private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1;
        private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem2;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
    }
}

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-scheme/03-hydraulic-simulation/01-PumpMainCurveChoice/PumpMainChoicePage.cs

@@ -7,6 +7,7 @@
        public PumpMainCurveChoicePage()
        {
            InitializeComponent();
            this.gridView1.SetNormalView();
        }

        private List<PumpMainChoieViewModel> _allBindingList = null;
@@ -245,5 +246,18 @@
            var dlg = new AddPumpMainDlg();
            dlg.ShowDialog();
        }

        private async void gridView1_RowClick(object sender, DevExpress.XtraGrid.Views.Grid.RowClickEventArgs e)
        {
            var vm = this.gridView1.GetCurrentViewModel(_allBindingList);
            if (vm != null)
            {
                var model = await _pumpBll.GetByID(vm.ID);
                if (model == null)
                    return;
                _DbID = vm.ID;
                pumpMainCurveForm1.SetBindingData(model);
            }
        }
    }
}

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-scheme/03-hydraulic-simulation/XhsProjectSimulationPropertyCtrl.cs

@@ -19,7 +19,6 @@
            this.hydroParterPropertyCtrl1.SelectPatternEvent += HydroParterPropertyCtrl1_SelectPatternEvent;
        }


        private Yw.Model.HydroModelInfo _hydro = null;

        /// <summary>
@@ -137,29 +136,29 @@
            {
                case Yw.WinFrmUI.HydroCurve.PumpQH:
                    {
                        //var pumpPropertyViewModel = propViewModel as HydroPumpPropertyViewModel;
                        //var dbId = pumpPropertyViewModel.DbId;
                        //var modelType = pumpPropertyViewModel.ModelType;
                        //var dlg = new PumpMainCurveChoiceDlg();
                        //dlg.SetBindingData(dbId, modelType);
                        //dlg.CurveinfoEvent += (dbid, curveid, curveinfo) =>
                        //{
                        //};
                        //dlg.ShowDialog();
                        var pumpPropertyViewModel = propViewModel as HydroPumpPropertyViewModel;
                        var dbId = pumpPropertyViewModel.DbId;
                        var modelType = pumpPropertyViewModel.ModelType;
                        var dlg = new PumpMainCurveChoiceDlg();
                        dlg.SetBindingData(dbId, modelType);
                        dlg.CurveinfoEvent += (dbid, curveid, curveinfo) =>
                        {
                        };
                        dlg.ShowDialog();
                    }
                    break;

                case Yw.WinFrmUI.HydroCurve.PumpQE:
                    {
                        //var pumpPropertyViewModel = propViewModel as HydroPumpPropertyViewModel;
                        //var dbId = pumpPropertyViewModel.DbId;
                        //var modelType = pumpPropertyViewModel.ModelType;
                        //var dlg = new PumpMainCurveChoiceDlg();
                        //dlg.SetBindingData(dbId, modelType);
                        //dlg.CurveinfoEvent += (dbid, curveid, curveinfo) =>
                        //{
                        //};
                        //dlg.ShowDialog();
                        var pumpPropertyViewModel = propViewModel as HydroPumpPropertyViewModel;
                        var dbId = pumpPropertyViewModel.DbId;
                        var modelType = pumpPropertyViewModel.ModelType;
                        var dlg = new PumpMainCurveChoiceDlg();
                        dlg.SetBindingData(dbId, modelType);
                        dlg.CurveinfoEvent += (dbid, curveid, curveinfo) =>
                        {
                        };
                        dlg.ShowDialog();
                    }
                    break;