duheng
2024-08-28 6b728cd400122e160805caec5851fca70e4d8f9a
资产界面修改
已修改19个文件
已添加1个文件
已重命名1个文件
443 ■■■■■ 文件已修改
WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/AddPumpProductMainDlg.Designer.cs 81 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/AddPumpProductMainDlg.cs 28 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/EditPumpPartDlg.Designer.cs 98 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/EditPumpPartDlg.cs 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/EditPumpPartDlg.resx 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/PumpProductListBox.Designer.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/PumpProductMainPanel.Designer.cs 25 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/PumpProductSeriesTreeListCtrl.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/PumpProductSeriesTreeListCtrl.designer.cs 65 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Basic/00-SysTypeManage/SysModuleListBoxCtrl.cs 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Basic/00-SysTypeManage/SysModuleListBoxCtrl.designer.cs 43 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Basic/01-SysCatalogManage/SysTypeListBoxCtrl.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Basic/01-SysCatalogManage/SysTypeListBoxCtrl.designer.cs 41 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Basic/02-SysPropManage/SysTypeTreeListLookUpEdit.designer.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Core/HStation.WinFrmUI.Core.csproj.user 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Core/Resources/NotImport.png 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Core/Resources/series (2).png 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-scheme/03-hydraulic-simulation/XhsProjectSimulationPropertyCtrl.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/Hstation.WinFrmUI.Core/Lib/ImageLib.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/Hstation.WinFrmUI.Core/Lib/Resource1.Designer.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/Hstation.WinFrmUI.Core/Lib/Resource1.resx 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/AddPumpProductMainDlg.Designer.cs
@@ -44,7 +44,6 @@
            TextEditRatedSpeed = new DevExpress.XtraEditors.TextEdit();
            Root = new DevExpress.XtraLayout.LayoutControlGroup();
            layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
            emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
            layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -58,6 +57,7 @@
            layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
            dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
            layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
            imageComboBoxEdit1 = new DevExpress.XtraEditors.ImageComboBoxEdit();
@@ -81,7 +81,6 @@
            ((System.ComponentModel.ISupportInitialize)TextEditRatedSpeed.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)Root).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem2).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem3).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem4).BeginInit();
            ((System.ComponentModel.ISupportInitialize)emptySpaceItem1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem8).BeginInit();
@@ -95,6 +94,7 @@
            ((System.ComponentModel.ISupportInitialize)layoutControlItem9).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem12).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem6).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem3).BeginInit();
            ((System.ComponentModel.ISupportInitialize)dxErrorProvider1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem13).BeginInit();
            ((System.ComponentModel.ISupportInitialize)imageComboBoxEdit1.Properties).BeginInit();
@@ -163,17 +163,17 @@
            // 
            // DescriptionTextEdit
            // 
            DescriptionTextEdit.Location = new Point(84, 164);
            DescriptionTextEdit.Location = new Point(20, 164);
            DescriptionTextEdit.Name = "DescriptionTextEdit";
            DescriptionTextEdit.Size = new Size(577, 272);
            DescriptionTextEdit.Size = new Size(641, 272);
            DescriptionTextEdit.StyleController = layoutControl1;
            DescriptionTextEdit.TabIndex = 11;
            // 
            // TextEditErosion
            // 
            TextEditErosion.Location = new Point(451, 32);
            TextEditErosion.Location = new Point(442, 32);
            TextEditErosion.Name = "TextEditErosion";
            TextEditErosion.Size = new Size(222, 20);
            TextEditErosion.Size = new Size(231, 20);
            TextEditErosion.StyleController = layoutControl1;
            TextEditErosion.TabIndex = 3;
            // 
@@ -181,31 +181,31 @@
            // 
            TextEditRatedPower.Location = new Point(117, 104);
            TextEditRatedPower.Name = "TextEditRatedPower";
            TextEditRatedPower.Size = new Size(221, 20);
            TextEditRatedPower.Size = new Size(212, 20);
            TextEditRatedPower.StyleController = layoutControl1;
            TextEditRatedPower.TabIndex = 8;
            // 
            // TextEditRatedeffciency
            // 
            TextEditRatedeffciency.Location = new Point(451, 56);
            TextEditRatedeffciency.Location = new Point(442, 56);
            TextEditRatedeffciency.Name = "TextEditRatedeffciency";
            TextEditRatedeffciency.Size = new Size(222, 20);
            TextEditRatedeffciency.Size = new Size(231, 20);
            TextEditRatedeffciency.StyleController = layoutControl1;
            TextEditRatedeffciency.TabIndex = 5;
            // 
            // TextEditD2
            // 
            TextEditD2.Location = new Point(451, 80);
            TextEditD2.Location = new Point(442, 80);
            TextEditD2.Name = "TextEditD2";
            TextEditD2.Size = new Size(222, 20);
            TextEditD2.Size = new Size(231, 20);
            TextEditD2.StyleController = layoutControl1;
            TextEditD2.TabIndex = 7;
            // 
            // TextEditTagName
            // 
            TextEditTagName.Location = new Point(451, 104);
            TextEditTagName.Location = new Point(442, 104);
            TextEditTagName.Name = "TextEditTagName";
            TextEditTagName.Size = new Size(222, 20);
            TextEditTagName.Size = new Size(231, 20);
            TextEditTagName.StyleController = layoutControl1;
            TextEditTagName.TabIndex = 9;
            // 
@@ -213,7 +213,7 @@
            // 
            TextEditRatedHead.Location = new Point(117, 80);
            TextEditRatedHead.Name = "TextEditRatedHead";
            TextEditRatedHead.Size = new Size(221, 20);
            TextEditRatedHead.Size = new Size(212, 20);
            TextEditRatedHead.StyleController = layoutControl1;
            TextEditRatedHead.TabIndex = 6;
            // 
@@ -221,7 +221,7 @@
            // 
            TextEditRatedFlow.Location = new Point(117, 32);
            TextEditRatedFlow.Name = "TextEditRatedFlow";
            TextEditRatedFlow.Size = new Size(221, 20);
            TextEditRatedFlow.Size = new Size(212, 20);
            TextEditRatedFlow.StyleController = layoutControl1;
            TextEditRatedFlow.TabIndex = 2;
            // 
@@ -229,7 +229,7 @@
            // 
            TextEditRatedSpeed.Location = new Point(117, 56);
            TextEditRatedSpeed.Name = "TextEditRatedSpeed";
            TextEditRatedSpeed.Size = new Size(221, 20);
            TextEditRatedSpeed.Size = new Size(212, 20);
            TextEditRatedSpeed.StyleController = layoutControl1;
            TextEditRatedSpeed.TabIndex = 4;
            // 
@@ -251,19 +251,9 @@
            layoutControlItem2.Control = TextEditRatedSpeed;
            layoutControlItem2.Location = new Point(0, 48);
            layoutControlItem2.Name = "layoutControlItem2";
            layoutControlItem2.Size = new Size(334, 24);
            layoutControlItem2.Size = new Size(325, 24);
            layoutControlItem2.Text = "<color=red>*</color>额定转速:";
            layoutControlItem2.TextSize = new Size(97, 14);
            //
            // layoutControlItem3
            //
            layoutControlItem3.AllowHtmlStringInCaption = true;
            layoutControlItem3.Control = TextEditRatedFlow;
            layoutControlItem3.Location = new Point(0, 24);
            layoutControlItem3.Name = "layoutControlItem3";
            layoutControlItem3.Size = new Size(334, 24);
            layoutControlItem3.Text = "<color=red>*</color>额定流量(m³/h):";
            layoutControlItem3.TextSize = new Size(97, 14);
            // 
            // layoutControlItem4
            // 
@@ -297,7 +287,7 @@
            layoutControlItem7.Control = TextEditRatedHead;
            layoutControlItem7.Location = new Point(0, 72);
            layoutControlItem7.Name = "layoutControlItem7";
            layoutControlItem7.Size = new Size(334, 24);
            layoutControlItem7.Size = new Size(325, 24);
            layoutControlItem7.Text = "<color=red>*</color>额定扬程(m):";
            layoutControlItem7.TextSize = new Size(97, 14);
            // 
@@ -326,8 +316,9 @@
            layoutControlItem5.Size = new Size(645, 276);
            layoutControlItem5.Text = "说明:";
            layoutControlItem5.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.CustomSize;
            layoutControlItem5.TextSize = new Size(59, 14);
            layoutControlItem5.TextToControlDistance = 5;
            layoutControlItem5.TextSize = new Size(0, 0);
            layoutControlItem5.TextToControlDistance = 0;
            layoutControlItem5.TextVisible = false;
            // 
            // layoutControlItem1
            // 
@@ -345,45 +336,55 @@
            layoutControlItem10.Control = TextEditRatedPower;
            layoutControlItem10.Location = new Point(0, 96);
            layoutControlItem10.Name = "layoutControlItem10";
            layoutControlItem10.Size = new Size(334, 24);
            layoutControlItem10.Size = new Size(325, 24);
            layoutControlItem10.Text = "<color=red>*</color>额定功率:";
            layoutControlItem10.TextSize = new Size(97, 14);
            // 
            // layoutControlItem11
            // 
            layoutControlItem11.Control = TextEditErosion;
            layoutControlItem11.Location = new Point(334, 24);
            layoutControlItem11.Location = new Point(325, 24);
            layoutControlItem11.Name = "layoutControlItem11";
            layoutControlItem11.Size = new Size(335, 24);
            layoutControlItem11.Size = new Size(344, 24);
            layoutControlItem11.Text = "气蚀:";
            layoutControlItem11.TextSize = new Size(97, 14);
            // 
            // layoutControlItem9
            // 
            layoutControlItem9.Control = TextEditRatedeffciency;
            layoutControlItem9.Location = new Point(334, 48);
            layoutControlItem9.Location = new Point(325, 48);
            layoutControlItem9.Name = "layoutControlItem9";
            layoutControlItem9.Size = new Size(335, 24);
            layoutControlItem9.Size = new Size(344, 24);
            layoutControlItem9.Text = "额定效率:";
            layoutControlItem9.TextSize = new Size(97, 14);
            // 
            // layoutControlItem12
            // 
            layoutControlItem12.Control = TextEditD2;
            layoutControlItem12.Location = new Point(334, 72);
            layoutControlItem12.Location = new Point(325, 72);
            layoutControlItem12.Name = "layoutControlItem12";
            layoutControlItem12.Size = new Size(335, 24);
            layoutControlItem12.Size = new Size(344, 24);
            layoutControlItem12.Text = "叶轮外径(mm):";
            layoutControlItem12.TextSize = new Size(97, 14);
            // 
            // layoutControlItem6
            // 
            layoutControlItem6.Control = TextEditTagName;
            layoutControlItem6.Location = new Point(334, 96);
            layoutControlItem6.Location = new Point(325, 96);
            layoutControlItem6.Name = "layoutControlItem6";
            layoutControlItem6.Size = new Size(335, 24);
            layoutControlItem6.Size = new Size(344, 24);
            layoutControlItem6.Text = "标签名称:";
            layoutControlItem6.TextSize = new Size(97, 14);
            //
            // layoutControlItem3
            //
            layoutControlItem3.AllowHtmlStringInCaption = true;
            layoutControlItem3.Control = TextEditRatedFlow;
            layoutControlItem3.Location = new Point(0, 24);
            layoutControlItem3.Name = "layoutControlItem3";
            layoutControlItem3.Size = new Size(325, 24);
            layoutControlItem3.Text = "<color=red>*</color>额定流量(m³/h):";
            layoutControlItem3.TextSize = new Size(97, 14);
            // 
            // dxErrorProvider1
            // 
@@ -478,7 +479,6 @@
            ((System.ComponentModel.ISupportInitialize)TextEditRatedSpeed.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)Root).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem2).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem3).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem4).EndInit();
            ((System.ComponentModel.ISupportInitialize)emptySpaceItem1).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem8).EndInit();
@@ -492,6 +492,7 @@
            ((System.ComponentModel.ISupportInitialize)layoutControlItem9).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem12).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem6).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem3).EndInit();
            ((System.ComponentModel.ISupportInitialize)dxErrorProvider1).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem13).EndInit();
            ((System.ComponentModel.ISupportInitialize)imageComboBoxEdit1.Properties).EndInit();
WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/AddPumpProductMainDlg.cs
@@ -81,14 +81,26 @@
            _PumpMain.RatedSpeed = ratedSpeed;
            _PumpMain.Description = DescriptionTextEdit.Text.Trim();
            double d2;
            double.TryParse(TextEditD2.Text.Trim(), out d2);
            _PumpMain.D2 = d2;
            double erosion;
            double.TryParse(TextEditErosion.Text.Trim(), out erosion);
            _PumpMain.Erosion = erosion;
            double ratedPower;
            double.TryParse(TextEditRatedPower.Text.Trim(), out ratedPower);
            _PumpMain.RatedPower = ratedPower;
            if (double.TryParse(TextEditD2.Text.Trim(), out d2))
            {
                _PumpMain.D2 = d2;
            }
            else
            {
                _PumpMain.D2 = null;
            }
            if (double.TryParse(TextEditErosion.Text.Trim(), out double erosion))
            {
                _PumpMain.Erosion = erosion;
            }
            else
            {
                _PumpMain.Erosion = null;
            }
            if (double.TryParse(TextEditRatedPower.Text.Trim(), out double ratedPower))
            {
                _PumpMain.RatedPower = ratedPower;
            }
            double ratedEfficiency;
            double.TryParse(TextEditRatedeffciency.Text.Trim(), out ratedEfficiency);
            _PumpMain.RatedEfficiency = ratedEfficiency;
WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/EditPumpPartDlg.Designer.cs
@@ -30,6 +30,11 @@
        {
            components = new System.ComponentModel.Container();
            layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
            barManager1 = new DevExpress.XtraBars.BarManager(components);
            barDockControlTop = new DevExpress.XtraBars.BarDockControl();
            barDockControlBottom = new DevExpress.XtraBars.BarDockControl();
            barDockControlLeft = new DevExpress.XtraBars.BarDockControl();
            barDockControlRight = new DevExpress.XtraBars.BarDockControl();
            pumpProductListBox1 = new Assets.PumpProductListBox();
            BtnAddPumpPart = new DevExpress.XtraEditors.SimpleButton();
            BtnOk = new DevExpress.XtraEditors.SimpleButton();
@@ -54,13 +59,9 @@
            layoutControAddPart = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
            popupPumpPartMenu = new DevExpress.XtraBars.PopupMenu(components);
            barManager1 = new DevExpress.XtraBars.BarManager(components);
            barDockControlTop = new DevExpress.XtraBars.BarDockControl();
            barDockControlBottom = new DevExpress.XtraBars.BarDockControl();
            barDockControlLeft = new DevExpress.XtraBars.BarDockControl();
            barDockControlRight = new DevExpress.XtraBars.BarDockControl();
            ((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit();
            layoutControl1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)barManager1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)gridControl1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)propGroupChoiceViewModelBindingSource).BeginInit();
            ((System.ComponentModel.ISupportInitialize)gridView1).BeginInit();
@@ -78,7 +79,6 @@
            ((System.ComponentModel.ISupportInitialize)layoutControAddPart).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem8).BeginInit();
            ((System.ComponentModel.ISupportInitialize)popupPumpPartMenu).BeginInit();
            ((System.ComponentModel.ISupportInitialize)barManager1).BeginInit();
            SuspendLayout();
            // 
            // layoutControl1
@@ -99,6 +99,46 @@
            layoutControl1.TabIndex = 0;
            layoutControl1.Text = "layoutControl1";
            // 
            // barManager1
            //
            barManager1.DockControls.Add(barDockControlTop);
            barManager1.DockControls.Add(barDockControlBottom);
            barManager1.DockControls.Add(barDockControlLeft);
            barManager1.DockControls.Add(barDockControlRight);
            barManager1.Form = this;
            //
            // barDockControlTop
            //
            barDockControlTop.CausesValidation = false;
            barDockControlTop.Dock = DockStyle.Top;
            barDockControlTop.Location = new Point(0, 0);
            barDockControlTop.Manager = barManager1;
            barDockControlTop.Size = new Size(1001, 0);
            //
            // barDockControlBottom
            //
            barDockControlBottom.CausesValidation = false;
            barDockControlBottom.Dock = DockStyle.Bottom;
            barDockControlBottom.Location = new Point(0, 536);
            barDockControlBottom.Manager = barManager1;
            barDockControlBottom.Size = new Size(1001, 0);
            //
            // barDockControlLeft
            //
            barDockControlLeft.CausesValidation = false;
            barDockControlLeft.Dock = DockStyle.Left;
            barDockControlLeft.Location = new Point(0, 0);
            barDockControlLeft.Manager = barManager1;
            barDockControlLeft.Size = new Size(0, 536);
            //
            // barDockControlRight
            //
            barDockControlRight.CausesValidation = false;
            barDockControlRight.Dock = DockStyle.Right;
            barDockControlRight.Location = new Point(1001, 0);
            barDockControlRight.Manager = barManager1;
            barDockControlRight.Size = new Size(0, 536);
            //
            // pumpProductListBox1
            // 
            pumpProductListBox1.Location = new Point(12, 12);
@@ -115,7 +155,7 @@
            BtnAddPumpPart.Size = new Size(85, 22);
            BtnAddPumpPart.StyleController = layoutControl1;
            BtnAddPumpPart.TabIndex = 5;
            BtnAddPumpPart.Text = "添加产品";
            BtnAddPumpPart.Text = "添加属性";
            BtnAddPumpPart.Click += BtnAddPumpPart_Click;
            // 
            // BtnOk
@@ -325,46 +365,6 @@
            popupPumpPartMenu.Manager = barManager1;
            popupPumpPartMenu.Name = "popupPumpPartMenu";
            // 
            // barManager1
            //
            barManager1.DockControls.Add(barDockControlTop);
            barManager1.DockControls.Add(barDockControlBottom);
            barManager1.DockControls.Add(barDockControlLeft);
            barManager1.DockControls.Add(barDockControlRight);
            barManager1.Form = this;
            //
            // barDockControlTop
            //
            barDockControlTop.CausesValidation = false;
            barDockControlTop.Dock = DockStyle.Top;
            barDockControlTop.Location = new Point(0, 0);
            barDockControlTop.Manager = barManager1;
            barDockControlTop.Size = new Size(1001, 0);
            //
            // barDockControlBottom
            //
            barDockControlBottom.CausesValidation = false;
            barDockControlBottom.Dock = DockStyle.Bottom;
            barDockControlBottom.Location = new Point(0, 536);
            barDockControlBottom.Manager = barManager1;
            barDockControlBottom.Size = new Size(1001, 0);
            //
            // barDockControlLeft
            //
            barDockControlLeft.CausesValidation = false;
            barDockControlLeft.Dock = DockStyle.Left;
            barDockControlLeft.Location = new Point(0, 0);
            barDockControlLeft.Manager = barManager1;
            barDockControlLeft.Size = new Size(0, 536);
            //
            // barDockControlRight
            //
            barDockControlRight.CausesValidation = false;
            barDockControlRight.Dock = DockStyle.Right;
            barDockControlRight.Location = new Point(1001, 0);
            barDockControlRight.Manager = barManager1;
            barDockControlRight.Size = new Size(0, 536);
            //
            // EditPumpPartDlg
            // 
            AutoScaleDimensions = new SizeF(7F, 14F);
@@ -377,9 +377,10 @@
            Controls.Add(barDockControlTop);
            Name = "EditPumpPartDlg";
            StartPosition = FormStartPosition.CenterScreen;
            Text = "编辑产品";
            Text = "编辑属性";
            ((System.ComponentModel.ISupportInitialize)layoutControl1).EndInit();
            layoutControl1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)barManager1).EndInit();
            ((System.ComponentModel.ISupportInitialize)gridControl1).EndInit();
            ((System.ComponentModel.ISupportInitialize)propGroupChoiceViewModelBindingSource).EndInit();
            ((System.ComponentModel.ISupportInitialize)gridView1).EndInit();
@@ -397,7 +398,6 @@
            ((System.ComponentModel.ISupportInitialize)layoutControAddPart).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem8).EndInit();
            ((System.ComponentModel.ISupportInitialize)popupPumpPartMenu).EndInit();
            ((System.ComponentModel.ISupportInitialize)barManager1).EndInit();
            ResumeLayout(false);
            PerformLayout();
        }
WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/EditPumpPartDlg.cs
@@ -1,6 +1,4 @@
using DevExpress.XtraEditors;
using HStation.WinFrmUI.Xhs.PumpProduct;
using Mapster;
using HStation.WinFrmUI.Xhs.PumpProduct;
namespace HStation.WinFrmUI
{
@@ -93,6 +91,7 @@
                _proplist.Find(x => x.ID == item.PropID).Value = item.PropValue;
            }
            this.propGroupChoiceViewModelBindingSource.ResetBindings(false);
            this.gridView1.ExpandAllGroups();
        }
        //产品列表聚焦改变
@@ -200,6 +199,13 @@
            catch
            {
            }
            this.TextEditProductName.Properties.NullText = "在此输入产品名称";
            // 尝试改变焦点以触发控件更新
            this.TextEditProductName.Focus();
            //  this.TextEditProductName.SelectAll();
            this.TextEditNo.Properties.NullText = "在此输入产品编号";
            this.TextEditProductCode.Properties.NullText = "在此输入产品图号";
        }
        //  删除产品
WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/EditPumpPartDlg.resx
@@ -120,10 +120,10 @@
  <metadata name="propGroupChoiceViewModelBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>17, 17</value>
  </metadata>
  <metadata name="popupPumpPartMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>326, 17</value>
  </metadata>
  <metadata name="barManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>509, 17</value>
  </metadata>
  <metadata name="popupPumpPartMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>326, 17</value>
  </metadata>
</root>
WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/PumpProductListBox.Designer.cs
@@ -78,11 +78,12 @@
            // 
            // BtnAddProductProp
            // 
            BtnAddProductProp.Caption = "添加";
            BtnAddProductProp.Caption = "添加属性";
            BtnAddProductProp.Id = 0;
            BtnAddProductProp.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("BtnAddProductProp.ImageOptions.SvgImage");
            BtnAddProductProp.ImageOptions.SvgImageSize = new Size(20, 20);
            BtnAddProductProp.Name = "BtnAddProductProp";
            BtnAddProductProp.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
            BtnAddProductProp.ItemClick += BtnAddProductProp_ItemClick;
            // 
            // barDockControlTop
WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/PumpProductMainPanel.Designer.cs
@@ -37,6 +37,7 @@
            BtnDelete = new DevExpress.XtraBars.BarButtonItem();
            barBtnEditPumpCurve = new DevExpress.XtraBars.BarButtonItem();
            BarBtnEidtPumpPart = new DevExpress.XtraBars.BarButtonItem();
            barButtonItem1 = new DevExpress.XtraBars.BarButtonItem();
            ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage();
            ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
            dockManager1 = new DevExpress.XtraBars.Docking.DockManager(components);
@@ -63,7 +64,6 @@
            layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            popupPump = new DevExpress.XtraBars.PopupMenu(components);
            svgImage32 = new DevExpress.Utils.SvgImageCollection(components);
            barButtonItem1 = new DevExpress.XtraBars.BarButtonItem();
            ((System.ComponentModel.ISupportInitialize)ribbonControl1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)dockManager1).BeginInit();
            dockPanel1.SuspendLayout();
@@ -94,7 +94,7 @@
            ribbonControl1.ShowExpandCollapseButton = DevExpress.Utils.DefaultBoolean.False;
            ribbonControl1.ShowPageHeadersInFormCaption = DevExpress.Utils.DefaultBoolean.True;
            ribbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.ShowOnMultiplePages;
            ribbonControl1.Size = new Size(929, 101);
            ribbonControl1.Size = new Size(933, 101);
            ribbonControl1.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden;
            // 
            // BtnAdd
@@ -135,6 +135,13 @@
            BarBtnEidtPumpPart.Id = 16;
            BarBtnEidtPumpPart.Name = "BarBtnEidtPumpPart";
            BarBtnEidtPumpPart.ItemClick += BarBtnEidtPumpPart_ItemClick;
            //
            // barButtonItem1
            //
            barButtonItem1.Caption = "barButtonItem1";
            barButtonItem1.Id = 22;
            barButtonItem1.Name = "barButtonItem1";
            barButtonItem1.ItemClick += barButtonItem1_ItemClick;
            // 
            // ribbonPage1
            // 
@@ -198,7 +205,7 @@
            gridControl1.MainView = gridView1;
            gridControl1.MenuManager = ribbonControl1;
            gridControl1.Name = "gridControl1";
            gridControl1.Size = new Size(929, 442);
            gridControl1.Size = new Size(933, 446);
            gridControl1.TabIndex = 0;
            gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView1 });
            // 
@@ -339,9 +346,9 @@
            // 
            sidePanel1.Controls.Add(gridControl1);
            sidePanel1.Controls.Add(ribbonControl1);
            sidePanel1.Location = new Point(2, 2);
            sidePanel1.Location = new Point(0, 0);
            sidePanel1.Name = "sidePanel1";
            sidePanel1.Size = new Size(929, 543);
            sidePanel1.Size = new Size(933, 547);
            sidePanel1.TabIndex = 3;
            sidePanel1.Text = "sidePanel1";
            // 
@@ -360,6 +367,7 @@
            layoutControlItem1.Control = sidePanel1;
            layoutControlItem1.Location = new Point(0, 0);
            layoutControlItem1.Name = "layoutControlItem1";
            layoutControlItem1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
            layoutControlItem1.Size = new Size(933, 547);
            layoutControlItem1.TextSize = new Size(0, 0);
            layoutControlItem1.TextVisible = false;
@@ -374,13 +382,6 @@
            // 
            svgImage32.ImageSize = new Size(32, 32);
            svgImage32.Add("propertiespanel", "image://svgimages/diagramicons/propertiespanel.svg");
            //
            // barButtonItem1
            //
            barButtonItem1.Caption = "barButtonItem1";
            barButtonItem1.Id = 22;
            barButtonItem1.Name = "barButtonItem1";
            barButtonItem1.ItemClick += barButtonItem1_ItemClick;
            // 
            // PumpProductMainPanel
            // 
WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/PumpProductSeriesTreeListCtrl.cs
@@ -87,9 +87,9 @@
        private void barCkSearch_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        {
            if (this.barCkSearch.Checked)
                this.treeList1.ShowFindPanel();
                this.layoutControlItemSearch.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always;
            else
                this.treeList1.HideFindPanel();
                this.layoutControlItemSearch.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
        }
        #endregion 菜单事件
WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/PumpProductSeriesTreeListCtrl.designer.cs
@@ -33,29 +33,33 @@
            barManager1 = new DevExpress.XtraBars.BarManager(components);
            bar1 = new DevExpress.XtraBars.Bar();
            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();
            barBtnAddChild = new DevExpress.XtraBars.BarButtonItem();
            barDockControlTop = new DevExpress.XtraBars.BarDockControl();
            barDockControlBottom = new DevExpress.XtraBars.BarDockControl();
            barDockControlLeft = new DevExpress.XtraBars.BarDockControl();
            barDockControlRight = new DevExpress.XtraBars.BarDockControl();
            barRoot = new DevExpress.XtraBars.BarSubItem();
            layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
            searchControl1 = new DevExpress.XtraEditors.SearchControl();
            treeList1 = new DevExpress.XtraTreeList.TreeList();
            colName = new DevExpress.XtraTreeList.Columns.TreeListColumn();
            Root = new DevExpress.XtraLayout.LayoutControlGroup();
            layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItemSearch = new DevExpress.XtraLayout.LayoutControlItem();
            barRootBasicInfoMgr = new DevExpress.XtraBars.BarSubItem();
            ((System.ComponentModel.ISupportInitialize)barManager1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit();
            layoutControl1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)searchControl1.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)treeList1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)Root).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem2).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItemSearch).BeginInit();
            SuspendLayout();
            // 
            // barManager1
@@ -93,6 +97,14 @@
            barBtnAdd.ImageOptions.SvgImageSize = new Size(22, 22);
            barBtnAdd.Name = "barBtnAdd";
            barBtnAdd.ItemClick += barBtnAdd_ItemClick;
            //
            // barBtnAddChild
            //
            barBtnAddChild.Caption = "增加子项";
            barBtnAddChild.Id = 50;
            barBtnAddChild.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnAddChild.ImageOptions.SvgImage");
            barBtnAddChild.Name = "barBtnAddChild";
            barBtnAddChild.ItemClick += barBtnAddChild_ItemClick;
            // 
            // barBtnEdit
            // 
@@ -141,14 +153,6 @@
            barBtnCollapseAll.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            barBtnCollapseAll.ItemClick += barBtnCollapseAll_ItemClick;
            // 
            // barBtnAddChild
            //
            barBtnAddChild.Caption = "增加子项";
            barBtnAddChild.Id = 50;
            barBtnAddChild.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnAddChild.ImageOptions.SvgImage");
            barBtnAddChild.Name = "barBtnAddChild";
            barBtnAddChild.ItemClick += barBtnAddChild_ItemClick;
            //
            // barDockControlTop
            // 
            barDockControlTop.CausesValidation = false;
@@ -189,6 +193,7 @@
            // 
            // layoutControl1
            // 
            layoutControl1.Controls.Add(searchControl1);
            layoutControl1.Controls.Add(treeList1);
            layoutControl1.Dock = DockStyle.Fill;
            layoutControl1.Location = new Point(0, 50);
@@ -198,21 +203,33 @@
            layoutControl1.TabIndex = 6;
            layoutControl1.Text = "layoutControl1";
            // 
            // searchControl1
            //
            searchControl1.Client = treeList1;
            searchControl1.Location = new Point(2, 2);
            searchControl1.MenuManager = barManager1;
            searchControl1.Name = "searchControl1";
            searchControl1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Repository.ClearButton(), new DevExpress.XtraEditors.Repository.SearchButton() });
            searchControl1.Properties.Client = treeList1;
            searchControl1.Size = new Size(235, 20);
            searchControl1.StyleController = layoutControl1;
            searchControl1.TabIndex = 8;
            //
            // treeList1
            // 
            treeList1.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
            treeList1.Columns.AddRange(new DevExpress.XtraTreeList.Columns.TreeListColumn[] { colName });
            treeList1.Location = new Point(0, 0);
            treeList1.Location = new Point(0, 24);
            treeList1.Name = "treeList1";
            treeList1.OptionsBehavior.Editable = false;
            treeList1.OptionsBehavior.ReadOnly = true;
            treeList1.OptionsMenu.EnableNodeMenu = false;
            treeList1.OptionsSelection.EnableAppearanceFocusedCell = false;
            treeList1.OptionsView.FocusRectStyle = DevExpress.XtraTreeList.DrawFocusRectStyle.None;
            treeList1.Size = new Size(239, 519);
            treeList1.Size = new Size(239, 495);
            treeList1.TabIndex = 7;
            treeList1.ViewStyle = DevExpress.XtraTreeList.TreeListViewStyle.TreeView;
             treeList1.FocusedNodeChanged += treeList1_FocusedNodeChanged;
            treeList1.FocusedNodeChanged += treeList1_FocusedNodeChanged;
            // 
            // colName
            // 
@@ -228,7 +245,7 @@
            // 
            Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
            Root.GroupBordersVisible = false;
            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem2 });
            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem2, layoutControlItemSearch });
            Root.Name = "Root";
            Root.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
            Root.Size = new Size(239, 519);
@@ -237,12 +254,22 @@
            // layoutControlItem2
            // 
            layoutControlItem2.Control = treeList1;
            layoutControlItem2.Location = new Point(0, 0);
            layoutControlItem2.Location = new Point(0, 24);
            layoutControlItem2.Name = "layoutControlItem2";
            layoutControlItem2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
            layoutControlItem2.Size = new Size(239, 519);
            layoutControlItem2.Size = new Size(239, 495);
            layoutControlItem2.TextSize = new Size(0, 0);
            layoutControlItem2.TextVisible = false;
            //
            // layoutControlItemSearch
            //
            layoutControlItemSearch.Control = searchControl1;
            layoutControlItemSearch.Location = new Point(0, 0);
            layoutControlItemSearch.Name = "layoutControlItemSearch";
            layoutControlItemSearch.Size = new Size(239, 24);
            layoutControlItemSearch.TextSize = new Size(0, 0);
            layoutControlItemSearch.TextVisible = false;
            layoutControlItemSearch.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
            // 
            // barRootBasicInfoMgr
            // 
@@ -250,7 +277,7 @@
            barRootBasicInfoMgr.Id = 20;
            barRootBasicInfoMgr.Name = "barRootBasicInfoMgr";
            // 
            // PumpSeriesTreeListCtrl
            // PumpProductSeriesTreeListCtrl
            // 
            Appearance.BackColor = SystemColors.Control;
            Appearance.Options.UseBackColor = true;
@@ -261,14 +288,16 @@
            Controls.Add(barDockControlRight);
            Controls.Add(barDockControlBottom);
            Controls.Add(barDockControlTop);
            Name = "PumpSeriesTreeListCtrl";
            Name = "PumpProductSeriesTreeListCtrl";
            Size = new Size(239, 569);
            ((System.ComponentModel.ISupportInitialize)barManager1).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControl1).EndInit();
            layoutControl1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)searchControl1.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)treeList1).EndInit();
            ((System.ComponentModel.ISupportInitialize)Root).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem2).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItemSearch).EndInit();
            ResumeLayout(false);
            PerformLayout();
        }
@@ -294,5 +323,7 @@
        private DevExpress.XtraBars.BarButtonItem barBtnExpandAll;
        private DevExpress.XtraBars.BarButtonItem barBtnCollapseAll;
        private DevExpress.XtraBars.BarButtonItem barBtnAddChild;
        private DevExpress.XtraEditors.SearchControl searchControl1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItemSearch;
    }
}
WinFrmUI/HStation.WinFrmUI.Basic/00-SysTypeManage/SysModuleListBoxCtrl.cs
@@ -50,9 +50,8 @@
        private void listBoxControl1_SelectedIndexChanged(object sender, EventArgs e)
        {
            var currentID = this.GetCurrentID();
            if (currentID == null)
            if (currentID <= 0)
            {
                MessageBoxHelper.ShowWarning("请选择数据行!");
                return;
            }
            FocusedChangedEvent.Invoke(currentID);
@@ -63,10 +62,10 @@
        //检索
        private void barCkSearch_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        {
            /*    if (this.barCkSearch.Checked)
                    this.listBoxControl1.ShowFindPanel();
                else
                    this.listBoxControl1.HideFindPanel();*/
            if (this.barCkSearch.Checked)
                layoutControlItemSearch.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always;
            else
                layoutControlItemSearch.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
        }
        #endregion 菜单事件
WinFrmUI/HStation.WinFrmUI.Basic/00-SysTypeManage/SysModuleListBoxCtrl.designer.cs
@@ -81,6 +81,8 @@
            barRootBasicInfoMgr = new DevExpress.XtraBars.BarSubItem();
            popupMenu1 = new DevExpress.XtraBars.PopupMenu(components);
            popupMenu2 = new DevExpress.XtraBars.PopupMenu(components);
            searchControl1 = new DevExpress.XtraEditors.SearchControl();
            layoutControlItemSearch = new DevExpress.XtraLayout.LayoutControlItem();
            ((System.ComponentModel.ISupportInitialize)barManager1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit();
            layoutControl1.SuspendLayout();
@@ -90,6 +92,8 @@
            ((System.ComponentModel.ISupportInitialize)moduleViewModelBindingSource).BeginInit();
            ((System.ComponentModel.ISupportInitialize)popupMenu1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)popupMenu2).BeginInit();
            ((System.ComponentModel.ISupportInitialize)searchControl1.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItemSearch).BeginInit();
            SuspendLayout();
            // 
            // barManager1
@@ -213,6 +217,7 @@
            // 
            // layoutControl1
            // 
            layoutControl1.Controls.Add(searchControl1);
            layoutControl1.Controls.Add(listBoxControl1);
            layoutControl1.Dock = DockStyle.Fill;
            layoutControl1.Location = new Point(0, 30);
@@ -224,9 +229,9 @@
            // 
            // listBoxControl1
            // 
            listBoxControl1.Location = new Point(2, 2);
            listBoxControl1.Location = new Point(0, 20);
            listBoxControl1.Name = "listBoxControl1";
            listBoxControl1.Size = new Size(272, 535);
            listBoxControl1.Size = new Size(276, 519);
            listBoxControl1.StyleController = layoutControl1;
            listBoxControl1.TabIndex = 4;
            listBoxControl1.SelectedIndexChanged += listBoxControl1_SelectedIndexChanged;
@@ -235,7 +240,7 @@
            // 
            Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
            Root.GroupBordersVisible = false;
            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1 });
            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItemSearch });
            Root.Name = "Root";
            Root.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
            Root.Size = new Size(276, 539);
@@ -244,9 +249,10 @@
            // layoutControlItem1
            // 
            layoutControlItem1.Control = listBoxControl1;
            layoutControlItem1.Location = new Point(0, 0);
            layoutControlItem1.Location = new Point(0, 20);
            layoutControlItem1.Name = "layoutControlItem1";
            layoutControlItem1.Size = new Size(276, 539);
            layoutControlItem1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
            layoutControlItem1.Size = new Size(276, 519);
            layoutControlItem1.TextSize = new Size(0, 0);
            layoutControlItem1.TextVisible = false;
            // 
@@ -476,6 +482,29 @@
            popupMenu2.Manager = barManager1;
            popupMenu2.Name = "popupMenu2";
            // 
            // searchControl1
            //
            searchControl1.Client = listBoxControl1;
            searchControl1.Location = new Point(0, 0);
            searchControl1.MenuManager = barManager1;
            searchControl1.Name = "searchControl1";
            searchControl1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Repository.ClearButton(), new DevExpress.XtraEditors.Repository.SearchButton() });
            searchControl1.Properties.Client = listBoxControl1;
            searchControl1.Size = new Size(276, 20);
            searchControl1.StyleController = layoutControl1;
            searchControl1.TabIndex = 5;
            //
            // layoutControlItemSearch
            //
            layoutControlItemSearch.Control = searchControl1;
            layoutControlItemSearch.Location = new Point(0, 0);
            layoutControlItemSearch.Name = "layoutControlItemSearch";
            layoutControlItemSearch.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
            layoutControlItemSearch.Size = new Size(276, 20);
            layoutControlItemSearch.TextSize = new Size(0, 0);
            layoutControlItemSearch.TextVisible = false;
            layoutControlItemSearch.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
            //
            // SysModuleListBoxCtrl
            // 
            Appearance.BackColor = SystemColors.Control;
@@ -498,6 +527,8 @@
            ((System.ComponentModel.ISupportInitialize)moduleViewModelBindingSource).EndInit();
            ((System.ComponentModel.ISupportInitialize)popupMenu1).EndInit();
            ((System.ComponentModel.ISupportInitialize)popupMenu2).EndInit();
            ((System.ComponentModel.ISupportInitialize)searchControl1.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItemSearch).EndInit();
            ResumeLayout(false);
            PerformLayout();
        }
@@ -554,5 +585,7 @@
        private BindingSource moduleViewModelBindingSource;
        private DevExpress.XtraEditors.ListBoxControl listBoxControl1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
        private DevExpress.XtraEditors.SearchControl searchControl1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItemSearch;
    }
}
WinFrmUI/HStation.WinFrmUI.Basic/01-SysCatalogManage/SysTypeListBoxCtrl.cs
@@ -74,9 +74,9 @@
        private void barCkSearch_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        {
            if (this.barCkSearch.Checked)
                this.treeList1.ShowFindPanel();
                layoutControlItemSearch.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always;
            else
                this.treeList1.HideFindPanel();
                layoutControlItemSearch.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
        }
        #endregion 菜单事件
WinFrmUI/HStation.WinFrmUI.Basic/01-SysCatalogManage/SysTypeListBoxCtrl.designer.cs
@@ -79,6 +79,8 @@
            barRootBasicInfoMgr = new DevExpress.XtraBars.BarSubItem();
            popupMenu1 = new DevExpress.XtraBars.PopupMenu(components);
            popupMenu2 = new DevExpress.XtraBars.PopupMenu(components);
            searchControl1 = new DevExpress.XtraEditors.SearchControl();
            layoutControlItemSearch = new DevExpress.XtraLayout.LayoutControlItem();
            ((System.ComponentModel.ISupportInitialize)barManager1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit();
            layoutControl1.SuspendLayout();
@@ -88,6 +90,8 @@
            ((System.ComponentModel.ISupportInitialize)layoutControlItem1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)popupMenu1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)popupMenu2).BeginInit();
            ((System.ComponentModel.ISupportInitialize)searchControl1.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItemSearch).BeginInit();
            SuspendLayout();
            // 
            // barManager1
@@ -184,6 +188,7 @@
            // 
            // layoutControl1
            // 
            layoutControl1.Controls.Add(searchControl1);
            layoutControl1.Controls.Add(treeList1);
            layoutControl1.Dock = DockStyle.Fill;
            layoutControl1.Location = new Point(0, 30);
@@ -198,13 +203,13 @@
            treeList1.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
            treeList1.Columns.AddRange(new DevExpress.XtraTreeList.Columns.TreeListColumn[] { colName });
            treeList1.DataSource = moduleViewModelBindingSource;
            treeList1.Location = new Point(2, 2);
            treeList1.Location = new Point(0, 20);
            treeList1.MenuManager = barManager1;
            treeList1.Name = "treeList1";
            treeList1.OptionsBehavior.Editable = false;
            treeList1.OptionsBehavior.ReadOnly = true;
            treeList1.OptionsView.ShowTreeLines = DevExpress.Utils.DefaultBoolean.True;
            treeList1.Size = new Size(272, 535);
            treeList1.Size = new Size(276, 519);
            treeList1.TabIndex = 4;
            treeList1.ViewStyle = DevExpress.XtraTreeList.TreeListViewStyle.TreeView;
            treeList1.FocusedNodeChanged += treeList1_FocusedNodeChanged;
@@ -224,7 +229,7 @@
            // 
            Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
            Root.GroupBordersVisible = false;
            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1 });
            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItemSearch });
            Root.Name = "Root";
            Root.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
            Root.Size = new Size(276, 539);
@@ -233,9 +238,10 @@
            // layoutControlItem1
            // 
            layoutControlItem1.Control = treeList1;
            layoutControlItem1.Location = new Point(0, 0);
            layoutControlItem1.Location = new Point(0, 20);
            layoutControlItem1.Name = "layoutControlItem1";
            layoutControlItem1.Size = new Size(276, 539);
            layoutControlItem1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
            layoutControlItem1.Size = new Size(276, 519);
            layoutControlItem1.TextSize = new Size(0, 0);
            layoutControlItem1.TextVisible = false;
            // 
@@ -461,6 +467,27 @@
            popupMenu2.Manager = barManager1;
            popupMenu2.Name = "popupMenu2";
            // 
            // searchControl1
            //
            searchControl1.Location = new Point(0, 0);
            searchControl1.MenuManager = barManager1;
            searchControl1.Name = "searchControl1";
            searchControl1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Repository.ClearButton(), new DevExpress.XtraEditors.Repository.SearchButton() });
            searchControl1.Size = new Size(276, 20);
            searchControl1.StyleController = layoutControl1;
            searchControl1.TabIndex = 5;
            //
            // layoutControlItemSearch
            //
            layoutControlItemSearch.Control = searchControl1;
            layoutControlItemSearch.Location = new Point(0, 0);
            layoutControlItemSearch.Name = "layoutControlItemSearch";
            layoutControlItemSearch.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
            layoutControlItemSearch.Size = new Size(276, 20);
            layoutControlItemSearch.TextSize = new Size(0, 0);
            layoutControlItemSearch.TextVisible = false;
            layoutControlItemSearch.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
            //
            // SysTypeListBoxCtrl
            // 
            Appearance.BackColor = SystemColors.Control;
@@ -483,6 +510,8 @@
            ((System.ComponentModel.ISupportInitialize)layoutControlItem1).EndInit();
            ((System.ComponentModel.ISupportInitialize)popupMenu1).EndInit();
            ((System.ComponentModel.ISupportInitialize)popupMenu2).EndInit();
            ((System.ComponentModel.ISupportInitialize)searchControl1.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItemSearch).EndInit();
            ResumeLayout(false);
            PerformLayout();
        }
@@ -537,5 +566,7 @@
        private DevExpress.XtraTreeList.Columns.TreeListColumn colImeMode;
        private BindingSource moduleViewModelBindingSource;
        private DevExpress.XtraTreeList.Columns.TreeListColumn colName;
        private DevExpress.XtraEditors.SearchControl searchControl1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItemSearch;
    }
}
WinFrmUI/HStation.WinFrmUI.Basic/02-SysPropManage/SysTypeTreeListLookUpEdit.designer.cs
@@ -84,12 +84,12 @@
            colName.Visible = true;
            colName.VisibleIndex = 0;
            // 
            // TypeTreeListLookUpEdit
            // SysTypeTreeListLookUpEdit
            // 
            AutoScaleDimensions = new SizeF(7F, 14F);
            AutoScaleMode = AutoScaleMode.Font;
            Controls.Add(treeListLookUpEdit1);
            Name = "TypeTreeListLookUpEdit";
            Name = "SysTypeTreeListLookUpEdit";
            Size = new Size(275, 19);
            ((ISupportInitialize)treeListLookUpEdit1.Properties).EndInit();
            ((ISupportInitialize)treeListLookUpEdit1TreeList).EndInit();
WinFrmUI/HStation.WinFrmUI.Core/HStation.WinFrmUI.Core.csproj.user
@@ -1,4 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup />
  <ItemGroup>
    <EmbeddedResource Update="Lib\Resource1.resx">
      <SubType>Designer</SubType>
    </EmbeddedResource>
  </ItemGroup>
</Project>
WinFrmUI/HStation.WinFrmUI.Core/Resources/NotImport.png

WinFrmUI/HStation.WinFrmUI.Core/Resources/series (2).png
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-scheme/03-hydraulic-simulation/XhsProjectSimulationPropertyCtrl.cs
@@ -19,6 +19,7 @@
            this.hydroParterPropertyCtrl1.SelectPatternEvent += HydroParterPropertyCtrl1_SelectPatternEvent;
        }
        private Yw.Model.HydroModelInfo _hydro = null;
        /// <summary>
WinFrmUI/Hstation.WinFrmUI.Core/Lib/ImageLib.cs
@@ -22,7 +22,7 @@
                    _lib.Images.Add(Resource1.Group, "Group");
                    _lib.Images.Add(Resource1.Series, "Series");
                    _lib.Images.Add(Resource1.Question, "Question");
                    _lib.Images.Add(Resource1.NotImported, "NotImported");
                    _lib.Images.Add(Resource1.Notlmported, "NotImported");
                }
                return _lib;
            }
WinFrmUI/Hstation.WinFrmUI.Core/Lib/Resource1.Designer.cs
@@ -73,9 +73,9 @@
        /// <summary>
        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
        /// </summary>
        internal static System.Drawing.Bitmap NotImported {
        internal static System.Drawing.Bitmap Notlmported {
            get {
                object obj = ResourceManager.GetObject("NotImported", resourceCulture);
                object obj = ResourceManager.GetObject("Notlmported", resourceCulture);
                return ((System.Drawing.Bitmap)(obj));
            }
        }
WinFrmUI/Hstation.WinFrmUI.Core/Lib/Resource1.resx
@@ -121,8 +121,8 @@
  <data name="Group" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\Group.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="NotImported" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\未导入提示.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="Notlmported" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\NotImport.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="Project" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\Project.svg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
@@ -134,7 +134,7 @@
    <value>..\Resources\Question.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="Series" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\Series.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
    <value>..\Resources\series (2).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="Valve" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\Valve.svg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>