冲突

Shuxia Ning

2024-10-15 6f932c727fe72e5c3417812234371a35e7225a93

冲突

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

@@ -34,11 +34,11 @@
            barManager1 = new DevExpress.XtraBars.BarManager(components);
            bar1 = new DevExpress.XtraBars.Bar();
            BtnAddProductProp = new DevExpress.XtraBars.BarButtonItem();
            barBtnDelete = new DevExpress.XtraBars.BarButtonItem();
            barDockControlTop = new DevExpress.XtraBars.BarDockControl();
            barDockControlBottom = new DevExpress.XtraBars.BarDockControl();
            barDockControlLeft = new DevExpress.XtraBars.BarDockControl();
            barDockControlRight = new DevExpress.XtraBars.BarDockControl();
            barBtnDelete = new DevExpress.XtraBars.BarButtonItem();
            ((System.ComponentModel.ISupportInitialize)listBoxControl1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)barManager1).BeginInit();
            SuspendLayout();
@@ -88,6 +88,15 @@
            BtnAddProductProp.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
            BtnAddProductProp.ItemClick += BtnAddProductProp_ItemClick;
            // 
            // barBtnDelete
            // 
            barBtnDelete.Caption = "删除属性";
            barBtnDelete.Id = 1;
            barBtnDelete.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnDelete.ImageOptions.SvgImage");
            barBtnDelete.Name = "barBtnDelete";
            barBtnDelete.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            barBtnDelete.ItemClick += barBtnDelete_ItemClick;
            // 
            // barDockControlTop
            // 
            barDockControlTop.CausesValidation = false;
@@ -119,14 +128,6 @@
            barDockControlRight.Location = new Point(247, 28);
            barDockControlRight.Manager = barManager1;
            barDockControlRight.Size = new Size(0, 459);
            // 
            // barBtnDelete
            // 
            barBtnDelete.Caption = "删除属性";
            barBtnDelete.Id = 1;
            barBtnDelete.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnDelete.ImageOptions.SvgImage");
            barBtnDelete.Name = "barBtnDelete";
            barBtnDelete.ItemClick += barBtnDelete_ItemClick;
            // 
            // PumpProductListBox
            // 

 WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/PumpProductMainPage.Designer.cs

@@ -80,116 +80,113 @@
            ((System.ComponentModel.ISupportInitialize)popupPump).BeginInit();
            ((System.ComponentModel.ISupportInitialize)svgImage32).BeginInit();
            SuspendLayout();
            //
            // 
            // ribbonControl1
            //
            // 
            ribbonControl1.DrawGroupsBorderMode = DevExpress.Utils.DefaultBoolean.True;
            ribbonControl1.EmptyAreaImageOptions.ImagePadding = new Padding(43, 47, 43, 47);
            ribbonControl1.ExpandCollapseItem.Id = 0;
            ribbonControl1.ItemPanelStyle = DevExpress.XtraBars.Ribbon.RibbonItemPanelStyle.Classic;
            ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, BtnAdd, BtnEdit, barBtnEditPumpCurve, BarBtnEidtPumpPart, barButtonItem1, BarBtnPumpinformation, BarBtnEidtPumpProp, BtnDeleteAssetsPumpSeries });
            ribbonControl1.Location = new Point(0, 0);
            ribbonControl1.Margin = new Padding(4, 5, 4, 5);
            ribbonControl1.MaxItemId = 26;
            ribbonControl1.Name = "ribbonControl1";
            ribbonControl1.OptionsMenuMinWidth = 471;
            ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage1 });
            ribbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.False;
            ribbonControl1.ShowExpandCollapseButton = DevExpress.Utils.DefaultBoolean.False;
            ribbonControl1.ShowPageHeadersInFormCaption = DevExpress.Utils.DefaultBoolean.True;
            ribbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.ShowOnMultiplePages;
            ribbonControl1.Size = new Size(1333, 148);
            ribbonControl1.Size = new Size(713, 101);
            ribbonControl1.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden;
            //
            // 
            // BtnAdd
            //
            // 
            BtnAdd.Caption = "添加型号";
            BtnAdd.Id = 1;
            BtnAdd.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("BtnAdd.ImageOptions.SvgImage");
            BtnAdd.Name = "BtnAdd";
            BtnAdd.ItemClick += BtnAdd_ItemClickAsync;
            //
            // 
            // BtnEdit
            //
            // 
            BtnEdit.Caption = "编辑型号";
            BtnEdit.Id = 2;
            BtnEdit.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("BtnEdit.ImageOptions.SvgImage");
            BtnEdit.Name = "BtnEdit";
            BtnEdit.ItemClick += BtnEdit_ItemClick;
            //
            // 
            // barBtnEditPumpCurve
            //
            // 
            barBtnEditPumpCurve.Caption = "泵曲线编辑";
            barBtnEditPumpCurve.Id = 13;
            barBtnEditPumpCurve.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnEditPumpCurve.ImageOptions.SvgImage");
            barBtnEditPumpCurve.Name = "barBtnEditPumpCurve";
            barBtnEditPumpCurve.ItemClick += barBtnEditPumpCurve_ItemClickAsync;
            //
            // 
            // BarBtnEidtPumpPart
            //
            // 
            BarBtnEidtPumpPart.Caption = "编辑泵产品属性";
            BarBtnEidtPumpPart.Id = 16;
            BarBtnEidtPumpPart.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("BarBtnEidtPumpPart.ImageOptions.SvgImage");
            BarBtnEidtPumpPart.Name = "BarBtnEidtPumpPart";
            BarBtnEidtPumpPart.ItemClick += BarBtnEidtPumpPart_ItemClick;
            //
            // 
            // barButtonItem1
            //
            // 
            barButtonItem1.Caption = "barButtonItem1";
            barButtonItem1.Id = 22;
            barButtonItem1.Name = "barButtonItem1";
            barButtonItem1.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            barButtonItem1.ItemClick += barButtonItem1_ItemClick;
            //
            // 
            // BarBtnPumpinformation
            //
            // 
            BarBtnPumpinformation.AllowHtmlText = DevExpress.Utils.DefaultBoolean.True;
            BarBtnPumpinformation.Caption = "查看泵信息";
            BarBtnPumpinformation.Id = 23;
            BarBtnPumpinformation.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("BarBtnPumpinformation.ImageOptions.SvgImage");
            BarBtnPumpinformation.Name = "BarBtnPumpinformation";
            BarBtnPumpinformation.ItemClick += BarBtnPumpinformation_ItemClick;
            //
            // 
            // BarBtnEidtPumpProp
            //
            // 
            BarBtnEidtPumpProp.Caption = "属性编辑";
            BarBtnEidtPumpProp.Id = 24;
            BarBtnEidtPumpProp.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("BarBtnEidtPumpProp.ImageOptions.SvgImage");
            BarBtnEidtPumpProp.Name = "BarBtnEidtPumpProp";
            BarBtnEidtPumpProp.ItemClick += BarBtnEidtPumpPart_ItemClick;
            //
            // 
            // BtnDeleteAssetsPumpSeries
            //
            // 
            BtnDeleteAssetsPumpSeries.Caption = "删除泵型号";
            BtnDeleteAssetsPumpSeries.Id = 25;
            BtnDeleteAssetsPumpSeries.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("BtnDeleteAssetsPumpSeries.ImageOptions.SvgImage");
            BtnDeleteAssetsPumpSeries.Name = "BtnDeleteAssetsPumpSeries";
            BtnDeleteAssetsPumpSeries.ItemClick += BtnDelete_ItemClick;
            //
            // 
            // ribbonPage1
            //
            // 
            ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { ribbonPageGroup1 });
            ribbonPage1.Name = "ribbonPage1";
            ribbonPage1.Text = "ribbonPage1";
            //
            // 
            // ribbonPageGroup1
            //
            // 
            ribbonPageGroup1.ItemLinks.Add(BtnAdd);
            ribbonPageGroup1.ItemLinks.Add(BtnEdit);
            ribbonPageGroup1.ItemLinks.Add(barBtnEditPumpCurve);
            ribbonPageGroup1.ItemLinks.Add(BarBtnEidtPumpProp);
            ribbonPageGroup1.Name = "ribbonPageGroup1";
            ribbonPageGroup1.Text = "基础功能";
            //
            // 
            // dockManager1
            //
            // 
            dockManager1.DockingOptions.ShowCloseButton = false;
            dockManager1.Form = this;
            dockManager1.RootPanels.AddRange(new DevExpress.XtraBars.Docking.DockPanel[] { dockPanel1 });
            dockManager1.TopZIndexControls.AddRange(new string[] { "DevExpress.XtraBars.BarDockControl", "DevExpress.XtraBars.StandaloneBarDockControl", "System.Windows.Forms.MenuStrip", "System.Windows.Forms.StatusStrip", "System.Windows.Forms.StatusBar", "DevExpress.XtraBars.Ribbon.RibbonStatusBar", "DevExpress.XtraBars.Ribbon.RibbonControl", "DevExpress.XtraBars.Navigation.OfficeNavigationBar", "DevExpress.XtraBars.Navigation.TileNavPane", "DevExpress.XtraBars.TabFormControl", "DevExpress.XtraBars.FluentDesignSystem.FluentDesignFormControl", "DevExpress.XtraBars.ToolbarForm.ToolbarFormControl" });
            //
            // 
            // dockPanel1
            //
            // 
            dockPanel1.Controls.Add(dockPanel1_Container);
            dockPanel1.Dock = DevExpress.XtraBars.Docking.DockingStyle.Left;
            dockPanel1.ID = new Guid("20cba9f0-4c76-45ad-a0f6-714fb6b14171");
@@ -197,257 +194,240 @@
            dockPanel1.Margin = new Padding(0);
            dockPanel1.Name = "dockPanel1";
            dockPanel1.Options.ShowAutoHideButton = false;
            dockPanel1.OriginalSize = new Size(200, 200);
            dockPanel1.Size = new Size(286, 860);
            dockPanel1.OriginalSize = new Size(202, 200);
            dockPanel1.Size = new Size(202, 526);
            dockPanel1.Text = "系列列表";
            //
            // 
            // dockPanel1_Container
            //
            // 
            dockPanel1_Container.Controls.Add(AssetsPumpSeriesTreeListCtrl1);
            dockPanel1_Container.Location = new Point(4, 38);
            dockPanel1_Container.Margin = new Padding(4, 5, 4, 5);
            dockPanel1_Container.Location = new Point(3, 26);
            dockPanel1_Container.Name = "dockPanel1_Container";
            dockPanel1_Container.Size = new Size(275, 818);
            dockPanel1_Container.Size = new Size(195, 497);
            dockPanel1_Container.TabIndex = 0;
            //
            // 
            // AssetsPumpSeriesTreeListCtrl1
            //
            // 
            AssetsPumpSeriesTreeListCtrl1.Appearance.BackColor = SystemColors.Control;
            AssetsPumpSeriesTreeListCtrl1.Appearance.Options.UseBackColor = true;
            AssetsPumpSeriesTreeListCtrl1.Dock = DockStyle.Fill;
            AssetsPumpSeriesTreeListCtrl1.Location = new Point(0, 0);
            AssetsPumpSeriesTreeListCtrl1.Margin = new Padding(6, 8, 6, 8);
            AssetsPumpSeriesTreeListCtrl1.Margin = new Padding(4, 5, 4, 5);
            AssetsPumpSeriesTreeListCtrl1.Name = "AssetsPumpSeriesTreeListCtrl1";
            AssetsPumpSeriesTreeListCtrl1.Size = new Size(275, 818);
            AssetsPumpSeriesTreeListCtrl1.Size = new Size(195, 497);
            AssetsPumpSeriesTreeListCtrl1.TabIndex = 0;
            //
            // 
            // gridControl1
            //
            // 
            gridControl1.DataSource = currentViewModelBindingSource;
            gridControl1.Dock = DockStyle.Fill;
            gridControl1.EmbeddedNavigator.Margin = new Padding(13, 20, 13, 20);
            gridControl1.Location = new Point(0, 148);
            gridControl1.Location = new Point(0, 101);
            gridControl1.MainView = gridView1;
            gridControl1.Margin = new Padding(4, 5, 4, 5);
            gridControl1.MenuManager = ribbonControl1;
            gridControl1.Name = "gridControl1";
            gridControl1.Size = new Size(1333, 712);
            gridControl1.Size = new Size(713, 425);
            gridControl1.TabIndex = 0;
            gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView1 });
            //
            // 
            // currentViewModelBindingSource
            //
            // 
            currentViewModelBindingSource.DataSource = typeof(AssetsPumpMainViewModel);
            //
            // 
            // gridView1
            //
            // 
            gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
            gridView1.Appearance.HeaderPanel.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
            gridView1.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
            gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colTagName, colSortCode, colDescription, colRatedFlow, colRatedHead, colD2, colErosion, colRatedEfficiency, colRatedPower, colRatedSpeed });
            gridView1.DetailHeight = 550;
            gridView1.GridControl = gridControl1;
            gridView1.Name = "gridView1";
            gridView1.OptionsEditForm.PopupEditFormWidth = 1143;
            gridView1.OptionsView.ShowGroupPanel = false;
            gridView1.MouseUp += gridView1_MouseUp;
            //
            // 
            // colName
            //
            // 
            colName.AppearanceCell.Options.UseTextOptions = true;
            colName.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
            colName.Caption = "型号";
            colName.FieldName = "Name";
            colName.MinWidth = 29;
            colName.Name = "colName";
            colName.Visible = true;
            colName.VisibleIndex = 0;
            colName.Width = 296;
            //
            colName.Width = 207;
            // 
            // colTagName
            //
            // 
            colTagName.AppearanceCell.Options.UseTextOptions = true;
            colTagName.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
            colTagName.Caption = "标签";
            colTagName.FieldName = "TagName";
            colTagName.MinWidth = 29;
            colTagName.Name = "colTagName";
            colTagName.Visible = true;
            colTagName.VisibleIndex = 8;
            colTagName.Width = 191;
            //
            colTagName.Width = 134;
            // 
            // colSortCode
            //
            // 
            colSortCode.AppearanceCell.Options.UseTextOptions = true;
            colSortCode.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
            colSortCode.Caption = "排序码";
            colSortCode.FieldName = "SortCode";
            colSortCode.MinWidth = 29;
            colSortCode.Name = "colSortCode";
            colSortCode.Visible = true;
            colSortCode.VisibleIndex = 9;
            colSortCode.Width = 43;
            //
            colSortCode.Width = 30;
            // 
            // colDescription
            //
            // 
            colDescription.AppearanceCell.Options.UseTextOptions = true;
            colDescription.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
            colDescription.Caption = "说明";
            colDescription.FieldName = "Description";
            colDescription.MinWidth = 29;
            colDescription.Name = "colDescription";
            colDescription.Visible = true;
            colDescription.VisibleIndex = 10;
            colDescription.Width = 191;
            //
            colDescription.Width = 134;
            // 
            // colRatedFlow
            //
            // 
            colRatedFlow.AppearanceCell.Options.UseTextOptions = true;
            colRatedFlow.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
            colRatedFlow.Caption = "额定流量(m³/h)";
            colRatedFlow.FieldName = "RatedFlow";
            colRatedFlow.MinWidth = 29;
            colRatedFlow.Name = "colRatedFlow";
            colRatedFlow.Visible = true;
            colRatedFlow.VisibleIndex = 1;
            colRatedFlow.Width = 136;
            //
            colRatedFlow.Width = 95;
            // 
            // colRatedHead
            //
            // 
            colRatedHead.AppearanceCell.Options.UseTextOptions = true;
            colRatedHead.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
            colRatedHead.Caption = "额定扬程(m)";
            colRatedHead.FieldName = "RatedHead";
            colRatedHead.MinWidth = 29;
            colRatedHead.Name = "colRatedHead";
            colRatedHead.Visible = true;
            colRatedHead.VisibleIndex = 2;
            colRatedHead.Width = 136;
            //
            colRatedHead.Width = 95;
            // 
            // colD2
            //
            // 
            colD2.AppearanceCell.Options.UseTextOptions = true;
            colD2.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
            colD2.Caption = "叶轮外径(mm)";
            colD2.FieldName = "D2";
            colD2.MinWidth = 29;
            colD2.Name = "colD2";
            colD2.Visible = true;
            colD2.VisibleIndex = 3;
            colD2.Width = 136;
            //
            colD2.Width = 95;
            // 
            // colErosion
            //
            // 
            colErosion.AppearanceCell.Options.UseTextOptions = true;
            colErosion.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
            colErosion.Caption = "气蚀(m)";
            colErosion.FieldName = "Erosion";
            colErosion.MinWidth = 29;
            colErosion.Name = "colErosion";
            colErosion.Visible = true;
            colErosion.VisibleIndex = 4;
            colErosion.Width = 136;
            //
            colErosion.Width = 95;
            // 
            // colRatedEfficiency
            //
            // 
            colRatedEfficiency.AppearanceCell.Options.UseTextOptions = true;
            colRatedEfficiency.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
            colRatedEfficiency.Caption = "额定效率(%)";
            colRatedEfficiency.FieldName = "RatedEfficiency";
            colRatedEfficiency.MinWidth = 29;
            colRatedEfficiency.Name = "colRatedEfficiency";
            colRatedEfficiency.Visible = true;
            colRatedEfficiency.VisibleIndex = 5;
            colRatedEfficiency.Width = 136;
            //
            colRatedEfficiency.Width = 95;
            // 
            // colRatedPower
            //
            // 
            colRatedPower.AppearanceCell.Options.UseTextOptions = true;
            colRatedPower.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
            colRatedPower.Caption = "额定功率(KW)";
            colRatedPower.FieldName = "RatedPower";
            colRatedPower.MinWidth = 29;
            colRatedPower.Name = "colRatedPower";
            colRatedPower.Visible = true;
            colRatedPower.VisibleIndex = 6;
            colRatedPower.Width = 136;
            //
            colRatedPower.Width = 95;
            // 
            // colRatedSpeed
            //
            // 
            colRatedSpeed.Caption = "额定转速(r/min)";
            colRatedSpeed.FieldName = "RatedSpeed";
            colRatedSpeed.MinWidth = 29;
            colRatedSpeed.Name = "colRatedSpeed";
            colRatedSpeed.Visible = true;
            colRatedSpeed.VisibleIndex = 7;
            colRatedSpeed.Width = 136;
            //
            colRatedSpeed.Width = 95;
            // 
            // layoutControl1
            //
            // 
            layoutControl1.Controls.Add(sidePanel1);
            layoutControl1.Dock = DockStyle.Fill;
            layoutControl1.Location = new Point(286, 0);
            layoutControl1.Margin = new Padding(4, 5, 4, 5);
            layoutControl1.Location = new Point(202, 0);
            layoutControl1.Name = "layoutControl1";
            layoutControl1.Root = Root;
            layoutControl1.Size = new Size(1333, 860);
            layoutControl1.Size = new Size(713, 526);
            layoutControl1.TabIndex = 6;
            layoutControl1.Text = "layoutControl1";
            //
            // 
            // sidePanel1
            //
            // 
            sidePanel1.Controls.Add(gridControl1);
            sidePanel1.Controls.Add(ribbonControl1);
            sidePanel1.Location = new Point(0, 0);
            sidePanel1.Margin = new Padding(4, 5, 4, 5);
            sidePanel1.Name = "sidePanel1";
            sidePanel1.Size = new Size(1333, 860);
            sidePanel1.Size = new Size(713, 526);
            sidePanel1.TabIndex = 3;
            sidePanel1.Text = "sidePanel1";
            //
            // 
            // Root
            //
            // 
            Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
            Root.GroupBordersVisible = false;
            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1 });
            Root.Name = "Root";
            Root.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
            Root.Size = new Size(1333, 860);
            Root.Size = new Size(713, 526);
            Root.TextVisible = false;
            //
            // 
            // layoutControlItem1
            //
            // 
            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(1333, 860);
            layoutControlItem1.Size = new Size(713, 526);
            layoutControlItem1.TextSize = new Size(0, 0);
            layoutControlItem1.TextVisible = false;
            //
            // 
            // popupPump
            //
            // 
            popupPump.ItemLinks.Add(BarBtnPumpinformation);
            popupPump.ItemLinks.Add(BarBtnEidtPumpPart);
            popupPump.ItemLinks.Add(BtnDeleteAssetsPumpSeries);
            popupPump.Name = "popupPump";
            popupPump.Ribbon = ribbonControl1;
            //
            // 
            // svgImage32
            //
            // 
            svgImage32.ImageSize = new Size(32, 32);
            svgImage32.Add("propertiespanel", "image://svgimages/diagramicons/propertiespanel.svg");
            //
            // 
            // PumpProductMainPage
            //
            // 
            Appearance.BackColor = SystemColors.Control;
            Appearance.Options.UseBackColor = true;
            AutoScaleDimensions = new SizeF(10F, 22F);
            AutoScaleDimensions = new SizeF(7F, 14F);
            AutoScaleMode = AutoScaleMode.Font;
            Controls.Add(layoutControl1);
            Controls.Add(dockPanel1);
            Name = "PumpProductMainPanel";
            Size = new Size(1133, 547);
            Margin = new Padding(2);
            Name = "PumpProductMainPage";
            Size = new Size(915, 526);
            ((System.ComponentModel.ISupportInitialize)ribbonControl1).EndInit();
            ((System.ComponentModel.ISupportInitialize)dockManager1).EndInit();
            dockPanel1.ResumeLayout(false);

 WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/PumpProductMainPage.resx

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
  <!--
    Microsoft ResX Schema
    Microsoft ResX Schema 

    Version 2.0

@@ -48,7 +48,7 @@
    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

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/01-property/XhsProjectSimulationPropertyCtrl.cs

@@ -20,8 +20,6 @@
            this.hydroParterPropertyCtrl1.MatchingDbEvent += HydroParterPropertyCtrl1_MatchingDbEvent;
        }



        //水力信息方法
        private Func<Yw.Model.HydroModelInfo> _hydroInfoFunc = null;

@@ -117,11 +115,12 @@
                        dlg.ShowDialog();
                    }
                    break;

                case Yw.WinFrmUI.HydroCurve.Valve:
                    {

                    }
                    break;

                default: break;
            }
        }
@@ -236,11 +235,11 @@

                        if (input.DbId != string.Empty)
                        {
                            var detailDlg = new DetailInfo4DsDlg();
                            var detailDlg = new PumpFullInfoViewDlg();
                            detailDlg.SetBindindData(input);
                            detailDlg.ShowDialog();
                            return;
                        }
                        return;
                        var dlg = new PumpSingleMatchingDlg();
                        dlg.SetBindingData(input);
                        dlg.ReloadDataEvent += (rhs) =>
@@ -319,7 +318,5 @@
                    break;
            }
        }


    }
}

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs

@@ -93,7 +93,7 @@
            ribbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.ShowOnMultiplePages;
            ribbonControl1.ShowQatLocationSelector = false;
            ribbonControl1.ShowToolbarCustomizeItem = false;
            ribbonControl1.Size = new Size(967, 128);
            ribbonControl1.Size = new Size(967, 101);
            ribbonControl1.Toolbar.ShowCustomizeItem = false;
            ribbonControl1.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden;
            // 
@@ -304,12 +304,12 @@
            tabPane1.Controls.Add(tabPageBimface);
            tabPane1.Controls.Add(tabPageQ3d);
            tabPane1.Dock = DockStyle.Fill;
            tabPane1.Location = new Point(0, 128);
            tabPane1.Location = new Point(0, 101);
            tabPane1.Name = "tabPane1";
            tabPane1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { tabPageBimface, tabPageQ3d });
            tabPane1.RegularSize = new Size(692, 340);
            tabPane1.RegularSize = new Size(692, 367);
            tabPane1.SelectedPage = tabPageBimface;
            tabPane1.Size = new Size(692, 340);
            tabPane1.Size = new Size(692, 367);
            tabPane1.TabIndex = 1;
            tabPane1.Text = "tabPane1";
            // 
@@ -317,7 +317,7 @@
            // 
            tabPageBimface.Caption = "三维模型";
            tabPageBimface.Name = "tabPageBimface";
            tabPageBimface.Size = new Size(692, 307);
            tabPageBimface.Size = new Size(692, 334);
            // 
            // tabPageQ3d
            // 
@@ -336,17 +336,17 @@
            docPnlRight.Controls.Add(controlContainerRight);
            docPnlRight.Dock = DevExpress.XtraBars.Docking.DockingStyle.Right;
            docPnlRight.ID = new Guid("cffe2560-3445-4488-83cf-b9e4b936ff18");
            docPnlRight.Location = new Point(692, 128);
            docPnlRight.Location = new Point(692, 101);
            docPnlRight.Name = "docPnlRight";
            docPnlRight.OriginalSize = new Size(275, 200);
            docPnlRight.Size = new Size(275, 505);
            docPnlRight.Size = new Size(275, 532);
            docPnlRight.Text = "属性";
            // 
            // controlContainerRight
            // 
            controlContainerRight.Location = new Point(4, 26);
            controlContainerRight.Name = "controlContainerRight";
            controlContainerRight.Size = new Size(268, 476);
            controlContainerRight.Size = new Size(268, 503);
            controlContainerRight.TabIndex = 0;
            // 
            // docPnlBottom
@@ -395,8 +395,8 @@
            AutoScaleDimensions = new SizeF(7F, 14F);
            AutoScaleMode = AutoScaleMode.Font;
            Controls.Add(tabPane1);
            Controls.Add(docPnlBottom);
            Controls.Add(docPnlRight);
            Controls.Add(docPnlBottom);
            Controls.Add(ribbonControl1);
            Margin = new Padding(2);
            Name = "XhsProjectSimulationCorePage";

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs

@@ -11,7 +11,7 @@
            InitializeComponent();
            this.PageTitle.Caption = "水力模拟";
            this.PageTitle.HeaderSvgImage = this.svgImg32[0];
            this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden; 
            this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
        }

        private HStation.Vmo.XhsProjectVmo _project = null;//项目
@@ -111,6 +111,7 @@
            }
            return _bimfaceCtrl;
        }

        //bimface控件
        private XhsProjectSimulationBimfaceCtrl _bimfaceCtrl = null;

@@ -175,7 +176,7 @@
            }
        }

        #endregion
        #endregion Bimface

        #region Q3d

@@ -199,10 +200,11 @@
            }
            return _q3dCtrl;
        }

        //Q3d控件
        private XhsProjectSimulationQ3dCtrl _q3dCtrl = null;

        #endregion
        #endregion Q3d

        #region å±žæ€§é¢æ¿

@@ -216,10 +218,10 @@
            }
            return _propertyCtrl;
        }

        private XhsProjectSimulationPropertyCtrl _propertyCtrl = null;//属性控件


        #endregion
        #endregion å±žæ€§é¢æ¿

        #region è‡ªåŠ¨åŒ¹é…

@@ -258,6 +260,7 @@
            }
            return _matchingListCtrl;
        }

        //匹配列表控件
        private XhsProjectSimulationMatchingListCtrl _matchingListCtrl = null;

@@ -278,8 +281,7 @@
            this.docPnlBottom.Height = 350;
        }


        #endregion
        #endregion è‡ªåŠ¨åŒ¹é…

        #region æœªåŒ¹é…åˆ—表

@@ -317,6 +319,7 @@
            }
            return _unMatchingListCtrl;
        }

        private XhsProjectSimulationUnMatchingListCtrl _unMatchingListCtrl = null;//未匹配列表

        //未匹配列表
@@ -335,9 +338,7 @@
            this.docPnlBottom.Height = 350;
        }



        #endregion
        #endregion æœªåŒ¹é…åˆ—表

        #region ä¸€é”®æ˜¾éš

@@ -367,7 +368,7 @@
            }
        }

        #endregion
        #endregion ä¸€é”®æ˜¾éš

        #region æ°´åŠ›æ ¡éªŒ

@@ -405,6 +406,7 @@
            }
            return _checkResultCtrl;
        }

        //校验结果控件
        private XhsProjectSimulationHydroCheckResultCtrl _checkResultCtrl = null;

@@ -425,7 +427,7 @@
            this.docPnlBottom.Height = 350;
        }

        #endregion
        #endregion æ°´åŠ›æ ¡éªŒ

        #region ä¿å­˜æ°´åŠ›ä¿¡æ¯

@@ -446,7 +448,7 @@
            TipFormHelper.ShowSucceed("保存成功！");
        }

        #endregion
        #endregion ä¿å­˜æ°´åŠ›ä¿¡æ¯

        #region æž„件明细

@@ -472,6 +474,7 @@
            }
            return _parterListCtrl;
        }

        //构件明细控件
        private Yw.WinFrmUI.HydroParterListCtrl _parterListCtrl = null;

@@ -491,8 +494,7 @@
            this.docPnlBottom.Height = 350;
        }


        #endregion
        #endregion æž„件明细

        #region INP导出

@@ -514,7 +516,7 @@
            TipFormHelper.ShowSucceed("导出成功");
        }

        #endregion
        #endregion INP导出

        #region ä¸šåŠ¡æ–¹æ³•

@@ -568,10 +570,9 @@
                    }
                }
            }

        }

        #endregion
        #endregion ä¸šåŠ¡æ–¹æ³•

        #region é…ç½®

@@ -581,7 +582,7 @@
            this.rmSet.ShowPopup(MousePosition, true);
        }

        #endregion
        #endregion é…ç½®

        #region æ€§èƒ½æ›²çº¿

@@ -648,10 +649,9 @@
            dlg.ShowDialog();
        }

        #endregion
        #endregion æ€§èƒ½æ›²çº¿

        #region æ°´åŠ›è®¡ç®—


        //获取计算控件
        private XhsProjectSimulationCalcuCtrl GetCalcuCtrl()
@@ -724,11 +724,11 @@
                            this.docPnlBottom.Height = 350;
                            TipFormHelper.ShowError("计算失败");
                        }

                    };
            }
            return _calcuCtrl;
        }

        private XhsProjectSimulationCalcuCtrl _calcuCtrl = null;//计算控件

        //水力计算
@@ -748,9 +748,7 @@
            this.docPnlBottom.Height = 350;
        }



        #endregion
        #endregion æ°´åŠ›è®¡ç®—

        #region æž„件查询

@@ -787,6 +785,7 @@
            }
            return _searchCtrl;
        }

        private XhsProjectSimulationSearchCtrl _searchCtrl = null;//查询组件

        //查询
@@ -805,9 +804,7 @@
            this.docPnlBottom.Height = 350;
        }

        #endregion


        #endregion æž„件查询

        #region æ ‡æ³¨

@@ -879,6 +876,6 @@
            dlg.ShowDialog();
        }

        #endregion
        #endregion æ ‡æ³¨
    }
}

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/XhsProjectSimulationMgrPage.cs

@@ -19,6 +19,7 @@
            this.xhsProjectSimulationFunctionMgrCtrl1.ShowXhsProjectSimulationEvent += XhsProjectSimulationFunctionMgrCtrl1_ShowXhsProjectSimulationEvent;
            this.xhsProjectSimulationFunctionMgrCtrl1.CreateXhsProjectSchemeEvent += XhsProjectSimulationFunctionMgrCtrl1_CreateXhsProjectSchemeEvent;
            this.xhsProjectSimulationFunctionMgrCtrl1.CompareXhsProjectSchemeEvent += XhsProjectSimulationFunctionMgrCtrl1_CompareXhsProjectSchemeEvent;
            PumpFullInfoViewDlg.JumpPumpFullInfoCtrl += ShowPumpInfo;
        }

        private long _projectId;//项目id
@@ -88,7 +89,6 @@
                await page.SetBindingData(_project, _projectSite, _hydroInfo);
                CreatePage(page, guid);
            }

        }

        //显示水力模拟事件
@@ -130,7 +130,7 @@
            TipFormHelper.ShowWarn("正在开发中，敬请期待...");
        }

        #endregion
        #endregion åŠŸèƒ½é¢æ¿

        #region TabbedView ç›¸å…³äº‹ä»¶å¤„理程序

@@ -412,5 +412,19 @@
        }

        #endregion Page

        private void ShowPumpInfo(PumpFullInfoCtrl pumpFullInfoCtrl)
        {
            var guid = new PageGuid()
            {
                Modular = this.PageGuid.Modular,
                MoudingType = eMoudingType.Tab,
                Function = "xhs-project-pump-info",
            };
            if (!IsExistPage(guid, true))
            {
                CreatePage(pumpFullInfoCtrl, guid);
            }
        }
    }
}

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoCtrl.resx

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
  <!--
    Microsoft ResX Schema
    Microsoft ResX Schema 

    Version 2.0

@@ -48,7 +48,7 @@
    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
@@ -504,6 +504,9 @@
        1J24lI4fCunS9ofxhwM6/wUkzQ+9YILa5wAAAABJRU5ErkJggg==
</value>
  </data>
  <metadata name="svgImageCollection1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>496, 12</value>
  </metadata>
  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>70</value>
  </metadata>

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoViewDlg.Designer.cs

@@ -1,6 +1,6 @@
namespace HStation.WinFrmUI
{
    partial class DetailInfo4DsDlg
    partial class PumpFullInfoViewDlg
    {
        /// <summary>
        /// Required designer variable.
@@ -29,15 +29,18 @@
        private void InitializeComponent()
        {
            components = new Container();
            ComponentResourceManager resources = new ComponentResourceManager(typeof(DetailInfo4DsDlg));
            DevExpress.Utils.SuperToolTip superToolTip1 = new DevExpress.Utils.SuperToolTip();
            DevExpress.Utils.ToolTipItem toolTipItem1 = new DevExpress.Utils.ToolTipItem();
            ComponentResourceManager resources = new ComponentResourceManager(typeof(PumpFullInfoViewDlg));
            DevExpress.Utils.SuperToolTip superToolTip2 = new DevExpress.Utils.SuperToolTip();
            DevExpress.Utils.ToolTipItem toolTipItem2 = new DevExpress.Utils.ToolTipItem();
            DevExpress.Utils.SuperToolTip superToolTip3 = new DevExpress.Utils.SuperToolTip();
            DevExpress.Utils.ToolTipItem toolTipItem3 = new DevExpress.Utils.ToolTipItem();
            DevExpress.Utils.SuperToolTip superToolTip4 = new DevExpress.Utils.SuperToolTip();
            DevExpress.Utils.ToolTipItem toolTipItem4 = new DevExpress.Utils.ToolTipItem();
            DevExpress.Utils.SuperToolTip superToolTip1 = new DevExpress.Utils.SuperToolTip();
            DevExpress.Utils.ToolTipItem toolTipItem1 = new DevExpress.Utils.ToolTipItem();
            DevExpress.Utils.SuperToolTip superToolTip5 = new DevExpress.Utils.SuperToolTip();
            DevExpress.Utils.ToolTipItem toolTipItem5 = new DevExpress.Utils.ToolTipItem();
            PageTitle pageTitle1 = new PageTitle();
            tileNavPaneTop = new DevExpress.XtraBars.Navigation.TileNavPane();
            navBtnTitle = new DevExpress.XtraBars.Navigation.NavButton();
            navBtn手机页面 = new DevExpress.XtraBars.Navigation.NavButton();
@@ -46,6 +49,7 @@
            navButton8 = new DevExpress.XtraBars.Navigation.NavButton();
            navBtnbutton9 = new DevExpress.XtraBars.Navigation.NavButton();
            navBtnbutton10 = new DevExpress.XtraBars.Navigation.NavButton();
            navBtnDock = new DevExpress.XtraBars.Navigation.NavButton();
            popupMenu1 = new DevExpress.XtraBars.PopupMenu(components);
            bbi导出安装图 = new DevExpress.XtraBars.BarButtonItem();
            bbi导出性能曲线 = new DevExpress.XtraBars.BarButtonItem();
@@ -100,6 +104,7 @@
            tileNavPaneTop.Buttons.Add(navBtn手机页面);
            tileNavPaneTop.Buttons.Add(navBtn寿命成本计算);
            tileNavPaneTop.Buttons.Add(navBtn导出);
            tileNavPaneTop.Buttons.Add(navBtnDock);
            tileNavPaneTop.Buttons.Add(navButton8);
            tileNavPaneTop.Buttons.Add(navBtnbutton9);
            tileNavPaneTop.Buttons.Add(navBtnbutton10);
@@ -144,12 +149,14 @@
            navBtn手机页面.Alignment = DevExpress.XtraBars.Navigation.NavButtonAlignment.Right;
            navBtn手机页面.Caption = "手机页面";
            navBtn手机页面.Name = "navBtn手机页面";
            navBtn手机页面.Visible = false;
            navBtn手机页面.ElementClick += navBtn手机页面_ElementClick;
            // 
            // navBtn寿命成本计算
            // 
            navBtn寿命成本计算.Alignment = DevExpress.XtraBars.Navigation.NavButtonAlignment.Right;
            navBtn寿命成本计算.Caption = "寿命成本计算";
            navBtn寿命成本计算.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("navBtn寿命成本计算.ImageOptions.SvgImage");
            navBtn寿命成本计算.Name = "navBtn寿命成本计算";
            navBtn寿命成本计算.ElementClick += navBtn寿命成本计算_ElementClick;
            // 
@@ -157,6 +164,7 @@
            // 
            navBtn导出.Alignment = DevExpress.XtraBars.Navigation.NavButtonAlignment.Right;
            navBtn导出.Caption = "下载";
            navBtn导出.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("navBtn导出.ImageOptions.SvgImage");
            navBtn导出.Name = "navBtn导出";
            navBtn导出.ElementClick += navBtn导出_ElementClick;
            // 
@@ -166,9 +174,9 @@
            navButton8.Caption = null;
            navButton8.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("navButton8.ImageOptions.SvgImage");
            navButton8.Name = "navButton8";
            toolTipItem1.Text = "最小化";
            superToolTip1.Items.Add(toolTipItem1);
            navButton8.SuperTip = superToolTip1;
            toolTipItem2.Text = "最小化";
            superToolTip2.Items.Add(toolTipItem2);
            navButton8.SuperTip = superToolTip2;
            navButton8.ElementClick += navBtnMin_ElementClick;
            // 
            // navBtnbutton9
@@ -176,9 +184,9 @@
            navBtnbutton9.Alignment = DevExpress.XtraBars.Navigation.NavButtonAlignment.Right;
            navBtnbutton9.Caption = null;
            navBtnbutton9.Name = "navBtnbutton9";
            toolTipItem2.Text = "向下还原";
            superToolTip2.Items.Add(toolTipItem2);
            navBtnbutton9.SuperTip = superToolTip2;
            toolTipItem3.Text = "向下还原";
            superToolTip3.Items.Add(toolTipItem3);
            navBtnbutton9.SuperTip = superToolTip3;
            navBtnbutton9.ElementClick += navBtnSize_ElementClick;
            // 
            // navBtnbutton10
@@ -187,10 +195,21 @@
            navBtnbutton10.Caption = null;
            navBtnbutton10.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("navBtnbutton10.ImageOptions.SvgImage");
            navBtnbutton10.Name = "navBtnbutton10";
            toolTipItem3.Text = "关闭";
            superToolTip3.Items.Add(toolTipItem3);
            navBtnbutton10.SuperTip = superToolTip3;
            toolTipItem4.Text = "关闭";
            superToolTip4.Items.Add(toolTipItem4);
            navBtnbutton10.SuperTip = superToolTip4;
            navBtnbutton10.ElementClick += navBtnClose_ElementClick;
            // 
            // navBtnDock
            // 
            navBtnDock.Alignment = DevExpress.XtraBars.Navigation.NavButtonAlignment.Right;
            navBtnDock.Caption = "停靠";
            navBtnDock.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("navBtnDock.ImageOptions.SvgImage");
            navBtnDock.Name = "navBtnDock";
            toolTipItem1.Text = "停靠";
            superToolTip1.Items.Add(toolTipItem1);
            navBtnDock.SuperTip = superToolTip1;
            navBtnDock.ElementClick += navBtnDock_ElementClick;
            // 
            // popupMenu1
            // 
@@ -353,9 +372,9 @@
            navButton6.AppearanceSelected.Options.UseForeColor = true;
            navButton6.Caption = null;
            navButton6.Name = "navButton6";
            toolTipItem4.Text = "最小化";
            superToolTip4.Items.Add(toolTipItem4);
            navButton6.SuperTip = superToolTip4;
            toolTipItem5.Text = "最小化";
            superToolTip5.Items.Add(toolTipItem5);
            navButton6.SuperTip = superToolTip5;
            // 
            // panelMain
            // 
@@ -371,6 +390,13 @@
            pumpFullInfoCtrl1.Dock = DockStyle.Fill;
            pumpFullInfoCtrl1.Location = new Point(0, 0);
            pumpFullInfoCtrl1.Name = "pumpFullInfoCtrl1";
            pumpFullInfoCtrl1.PageGuid = null;
            pageTitle1.AllowClose = true;
            pageTitle1.Caption = "水泵信息";
            pageTitle1.HeaderImage = null;
            pageTitle1.HeaderSvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("pageTitle1.HeaderSvgImage");
            pageTitle1.SvgImageSize = new Size(0, 0);
            pumpFullInfoCtrl1.PageTitle = pageTitle1;
            pumpFullInfoCtrl1.Size = new Size(1274, 659);
            pumpFullInfoCtrl1.TabIndex = 0;
            // 
@@ -453,6 +479,7 @@
            navButton询价.AppearanceSelected.Options.UseFont = true;
            navButton询价.Caption = "询价";
            navButton询价.Name = "navButton询价";
            navButton询价.Visible = false;
            navButton询价.ElementClick += navButton询价_ElementClick;
            // 
            // bbi添加收藏
@@ -467,6 +494,7 @@
            bbi添加收藏.Caption = "添加收藏";
            bbi添加收藏.Name = "bbi添加收藏";
            bbi添加收藏.Padding = new Padding(5, 0, 10, 0);
            bbi添加收藏.Visible = false;
            // 
            // bbi添加比较
            // 
@@ -480,6 +508,7 @@
            bbi添加比较.Caption = "添加比较";
            bbi添加比较.Name = "bbi添加比较";
            bbi添加比较.Padding = new Padding(10, 0, 10, 0);
            bbi添加比较.Visible = false;
            // 
            // bbi添加串并联
            // 
@@ -493,6 +522,7 @@
            bbi添加串并联.Caption = "添加串并联";
            bbi添加串并联.Name = "bbi添加串并联";
            bbi添加串并联.Padding = new Padding(10, 0, 10, 0);
            bbi添加串并联.Visible = false;
            // 
            // barManager2
            // 
@@ -552,7 +582,7 @@
            popupMenu2.Manager = barManager2;
            popupMenu2.Name = "popupMenu2";
            // 
            // DetailInfo4DsDlg
            // PumpFullInfoViewDlg
            // 
            AutoScaleDimensions = new SizeF(7F, 14F);
            AutoScaleMode = AutoScaleMode.Font;
@@ -571,7 +601,7 @@
            FormBorderEffect = FormBorderEffect.Shadow;
            FormBorderStyle = FormBorderStyle.None;
            IconOptions.ShowIcon = false;
            Name = "DetailInfo4DsDlg";
            Name = "PumpFullInfoViewDlg";
            Padding = new Padding(2);
            StartPosition = FormStartPosition.CenterScreen;
            Text = "选型步骤";
@@ -634,5 +664,6 @@
        private DevExpress.XtraBars.PopupMenu popupMenu2;
        private DevExpress.XtraBars.Navigation.NavButton navButton8;
        private PumpFullInfoCtrl pumpFullInfoCtrl1;
        private DevExpress.XtraBars.Navigation.NavButton navBtnDock;
    }
}

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoViewDlg.cs

@@ -1,16 +1,15 @@
using DevExpress.XtraBars;
using HStation.WinFrmUI.Xhs.Core.Properties;

namespace HStation.WinFrmUI
{
    public partial class DetailInfo4DsDlg : XtraForm
    public partial class PumpFullInfoViewDlg : XtraForm
    {
        private bool _isMaxWindowStatus = true;//最大化窗体覆盖任务栏
        private PumpFullInfoCtrl thePumpCtrl = null;

        #region æž„造

        public DetailInfo4DsDlg()
        public PumpFullInfoViewDlg()
        {
            InitializeComponent();
            this._isMaxWindowStatus = true;//最大化窗体覆盖任务栏
@@ -314,5 +313,14 @@
        }

        #endregion åŠŸèƒ½ç‚¹å‡»äº‹ä»¶

        public static event Action<PumpFullInfoCtrl> JumpPumpFullInfoCtrl;

        //停靠
        private void navBtnDock_ElementClick(object sender, DevExpress.XtraBars.Navigation.NavElementEventArgs e)
        {
            this.Close();
            JumpPumpFullInfoCtrl.Invoke(this.pumpFullInfoCtrl1);
        }
    }
}

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoViewDlg.resx

@@ -138,6 +138,81 @@
</value>
  </data>
  <assembly alias="DevExpress.Data.v23.2" name="DevExpress.Data.v23.2, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
  <data name="navBtn寿命成本计算.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAADYGAAAC77u/
        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
        Y2U9InByZXNlcnZlIiBpZD0iRmluYW5jaWFsIiBzdHlsZT0iZW5hYmxlLWJhY2tncm91bmQ6bmV3IDAg
        MCAzMiAzMiI+DQogIDxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+CgkuR3JlZW57ZmlsbDojMDM5QzIzO30K
        PC9zdHlsZT4NCiAgPHBhdGggZD0iTTE0LDE2LjNjLTAuMi0wLjEtMC4zLTAuMS0wLjQtMC4yYy0wLjMt
        MC4xLTAuNC0wLjItMC41LTAuNGMtMC4xLTAuMS0wLjEtMC4zLTAuMS0wLjVjMC0wLjIsMC4xLTAuNSww
        LjItMC42ICBjMC4xLTAuMiwwLjMtMC4zLDAuNC0wLjRjMC4xLTAuMSwwLjMtMC4xLDAuNS0wLjJWMTYu
        M3ogTTQsNWMwLDAuNiwwLjQsMSwxLDFoMjN2MjNjMCwwLjYtMC40LDEtMSwxSDRjLTEuMSwwLTItMC45
        LTItMlY0ICBjMC0xLjEsMC45LTIsMi0yaDIzYzAuNiwwLDEsMC40LDEsMXYxSDVDNC40LDQsNCw0LjQs
        NCw1eiBNMTQsMTguN2wwLDMuMWMtMC4zLTAuMS0wLjUtMC4yLTAuNy0wLjNjLTAuMi0wLjItMC40LTAu
        NC0wLjYtMC42ICBjLTAuMS0wLjMtMC4yLTAuNS0wLjItMC45TDEwLDIwYzAsMC43LDAuMSwxLjMsMC40
        LDEuOGMwLjMsMC41LDAuNiwwLjksMS4xLDEuM2MwLjUsMC4zLDEsMC42LDEuNiwwLjdjMC4zLDAuMSww
        LjYsMC4xLDAuOCwwLjJWMjYgIGgydi0yLjFjMC40LDAsMC44LTAuMSwxLjItMC4yYzAuNi0wLjIsMS4x
        LTAuNCwxLjUtMC44YzAuNC0wLjMsMC43LTAuNywwLjktMS4yYzAuMi0wLjUsMC4zLTAuOSwwLjMtMS41
        YzAtMC42LTAuMS0xLjItMC40LTEuNiAgYy0wLjMtMC40LTAuNi0wLjctMS0xYy0wLjQtMC4yLTAuOC0w
        LjQtMS4yLTAuNUMxNywxNy4xLDE2LjcsMTcsMTYuNSwxN2MtMC4yLDAtMC4zLTAuMS0wLjUtMC4xdi0y
        LjdjMC4xLDAsMC4yLDAuMSwwLjMsMC4xICBjMC4yLDAuMSwwLjQsMC4zLDAuNSwwLjVjMC4xLDAuMiww
        LjIsMC44LDAuMiwxLjJsMi41LDBjMC0wLjctMC4xLTEuNS0wLjQtMmMtMC4zLTAuNS0wLjYtMC44LTEu
        MS0xLjFjLTAuNC0wLjMtMS0wLjUtMS41LTAuNiAgYy0wLjIsMC0wLjQtMC4xLTAuNi0wLjFWMTBoLTJ2
        Mi4xYy0wLjMsMC0wLjUsMC4xLTAuOCwwLjFjLTAuNSwwLjEtMSwwLjQtMS40LDAuNmMtMC40LDAuMy0w
        LjgsMC43LTEsMS4xYy0wLjMsMC40LTAuNCwwLjktMC40LDEuNSAgYzAsMC41LDAuMSwxLDAuMywxLjNj
        MC4yLDAuNCwwLjUsMC43LDAuOCwwLjljMC4zLDAuMiwwLjcsMC40LDEuMSwwLjZDMTMuMSwxOC41LDEz
        LjUsMTguNiwxNCwxOC43eiBNMTcuMiwyMS4zICBjMC4yLTAuMiwwLjItMC40LDAuMi0wLjdjMC0wLjMt
        MC4xLTAuNi0wLjMtMC44Yy0wLjItMC4yLTAuNS0wLjQtMC44LTAuNWMtMC4xLDAtMC4yLTAuMS0wLjQt
        MC4xVjIyYzAuMiwwLDAuNS0wLjEsMC43LTAuMiAgQzE2LjksMjEuNywxNy4xLDIxLjUsMTcuMiwyMS4z
        eiIgY2xhc3M9IkdyZWVuIiAvPg0KPC9zdmc+Cw==
</value>
  </data>
  <data name="navBtn导出.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAFcCAAAC77u/
        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ
        LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD
        MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
        Y2l0eTowLjc1O30KPC9zdHlsZT4NCiAgPGcgaWQ9Ik5leHQiPg0KICAgIDxwYXRoIGQ9Ik0xNiwyQzgu
        MywyLDIsOC4zLDIsMTZzNi4zLDE0LDE0LDE0czE0LTYuMywxNC0xNFMyMy43LDIsMTYsMnogTTE2LDI0
        bC04LThoNlY4aDR2OGg2TDE2LDI0eiIgY2xhc3M9IkdyZWVuIiAvPg0KICA8L2c+DQo8L3N2Zz4L
</value>
  </data>
  <data name="navBtnDock.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAANcDAAAC77u/
        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ
        LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuQmx1ZXtmaWxsOiMxMTc3
        RDc7fQoJLldoaXRle2ZpbGw6I0ZGRkZGRjt9CgkuR3JlZW57ZmlsbDojMDM5QzIzO30KCS5zdDB7b3Bh
        Y2l0eTowLjc1O30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQoJLnN0M3tm
        aWxsOiNGRkIxMTU7fQo8L3N0eWxlPg0KICA8ZyAvPg0KICA8ZyBpZD0iU2hvd0xlZ2VuZEluc2lkZVZl
        cnRpY2FsVG9wUmlnaHQiPg0KICAgIDxwYXRoIGQ9Ik0zMSwwSDFDMC41LDAsMCwwLjUsMCwxdjMwYzAs
        MC41LDAuNSwxLDEsMWgzMGMwLjUsMCwxLTAuNSwxLTFWMUMzMiwwLjUsMzEuNSwwLDMxLDB6IE0zMCwz
        MEgyVjJoMjhWMzB6IiBjbGFzcz0iQmxhY2siIC8+DQogICAgPGcgY2xhc3M9InN0MCI+DQogICAgICA8
        cG9seWdvbiBwb2ludHM9IjYsMjQgNiw2IDQsNiA0LDI2IDI4LDI2IDI4LDI0ICAgIiBjbGFzcz0iQmxh
        Y2siIC8+DQogICAgPC9nPg0KICAgIDxnIGNsYXNzPSJzdDEiPg0KICAgICAgPHBvbHlnb24gcG9pbnRz
        PSI2LDYgNiw4IDI2LDggMjYsMjQgMjgsMjQgMjgsNiAgICIgY2xhc3M9IkJsYWNrIiAvPg0KICAgIDwv
        Zz4NCiAgICA8cmVjdCB4PSIyMiIgeT0iNiIgd2lkdGg9IjYiIGhlaWdodD0iMTIiIGNsYXNzPSJCbHVl
        IiAvPg0KICA8L2c+DQo8L3N2Zz4L
</value>
  </data>
  <data name="navButton8.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
@@ -182,6 +257,25 @@
  <metadata name="barManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>17, 17</value>
  </metadata>
  <data name="pageTitle1.HeaderSvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAALkCAAAC77u/
        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
        Y2U9InByZXNlcnZlIiBpZD0iQ3JlYXRlX0xpbmVfQ2hhcnRfTm9fTWFya2VycyIgc3R5bGU9ImVuYWJs
        ZS1iYWNrZ3JvdW5kOm5ldyAwIDAgMzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJs
        dWV7ZmlsbDojMTE3N0Q3O30KCS5ZZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5SZWR7ZmlsbDojRDExQzFD
        O30KPC9zdHlsZT4NCiAgPHBvbHlnb24gcG9pbnRzPSIyLjgsNS44IDIuOCw1LjggMy43LDQgMTUuMyw5
        LjcgMjguOCwyIDI5LjgsMy43IDE1LjMsMTIgMi44LDUuOCAiIGNsYXNzPSJSZWQiIC8+DQogIDxwb2x5
        Z29uIHBvaW50cz0iMi43LDE3LjYgMi43LDE3LjYgMy45LDE2LjEgMTUuMiwyNS41IDI4LjYsMTIuMiAz
        MCwxMy42IDE1LjQsMjguMiAyLjcsMTcuNiAiIGNsYXNzPSJZZWxsb3ciIC8+DQogIDxwb2x5Z29uIHBv
        aW50cz0iMi43LDI4LjEgMTUuMSwxNy44IDI5LjYsMjEuOSAyOSwyMy44IDE1LjUsMjAgMy45LDI5LjYg
        Mi43LDI4LjEgIiBjbGFzcz0iQmx1ZSIgLz4NCjwvc3ZnPgs=
</value>
  </data>
  <metadata name="barManager2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>435, 17</value>
  </metadata>

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/XtraUserControl1.Designer.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,118 @@
namespace HStation.WinFrmUI
{
    partial class XtraUserControl1
    {
        /// <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 Component 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()
        {
            components = new Container();
            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();
            bar2 = new DevExpress.XtraBars.Bar();
            ((ISupportInitialize)barManager1).BeginInit();
            SuspendLayout();
            // 
            // barManager1
            // 
            barManager1.Bars.AddRange(new DevExpress.XtraBars.Bar[] { bar2 });
            barManager1.DockControls.Add(barDockControlTop);
            barManager1.DockControls.Add(barDockControlBottom);
            barManager1.DockControls.Add(barDockControlLeft);
            barManager1.DockControls.Add(barDockControlRight);
            barManager1.Form = this;
            barManager1.MainMenu = bar2;
            // 
            // barDockControlTop
            // 
            barDockControlTop.CausesValidation = false;
            barDockControlTop.Dock = DockStyle.Top;
            barDockControlTop.Location = new Point(0, 0);
            barDockControlTop.Manager = barManager1;
            barDockControlTop.Size = new Size(357, 20);
            // 
            // barDockControlBottom
            // 
            barDockControlBottom.CausesValidation = false;
            barDockControlBottom.Dock = DockStyle.Bottom;
            barDockControlBottom.Location = new Point(0, 109);
            barDockControlBottom.Manager = barManager1;
            barDockControlBottom.Size = new Size(357, 0);
            // 
            // barDockControlLeft
            // 
            barDockControlLeft.CausesValidation = false;
            barDockControlLeft.Dock = DockStyle.Left;
            barDockControlLeft.Location = new Point(0, 20);
            barDockControlLeft.Manager = barManager1;
            barDockControlLeft.Size = new Size(0, 89);
            // 
            // barDockControlRight
            // 
            barDockControlRight.CausesValidation = false;
            barDockControlRight.Dock = DockStyle.Right;
            barDockControlRight.Location = new Point(357, 20);
            barDockControlRight.Manager = barManager1;
            barDockControlRight.Size = new Size(0, 89);
            // 
            // bar2
            // 
            bar2.BarName = "Main menu";
            bar2.CanDockStyle = DevExpress.XtraBars.BarCanDockStyle.Top;
            bar2.DockCol = 0;
            bar2.DockRow = 0;
            bar2.DockStyle = DevExpress.XtraBars.BarDockStyle.Top;
            bar2.OptionsBar.MultiLine = true;
            bar2.OptionsBar.UseWholeRow = true;
            bar2.Text = "Main menu";
            // 
            // XtraUserControl1
            // 
            AutoScaleDimensions = new SizeF(7F, 14F);
            AutoScaleMode = AutoScaleMode.Font;
            Controls.Add(barDockControlLeft);
            Controls.Add(barDockControlRight);
            Controls.Add(barDockControlBottom);
            Controls.Add(barDockControlTop);
            Name = "XtraUserControl1";
            Size = new Size(357, 109);
            ((ISupportInitialize)barManager1).EndInit();
            ResumeLayout(false);
            PerformLayout();
        }

        #endregion

        private DevExpress.XtraBars.BarManager barManager1;
        private DevExpress.XtraBars.Bar bar2;
        private DevExpress.XtraBars.BarDockControl barDockControlTop;
        private DevExpress.XtraBars.BarDockControl barDockControlBottom;
        private DevExpress.XtraBars.BarDockControl barDockControlLeft;
        private DevExpress.XtraBars.BarDockControl barDockControlRight;
    }
}

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/XtraUserControl1.cs

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

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/XtraUserControl1.resx

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,123 @@
<?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>
  <metadata name="barManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>17, 17</value>
  </metadata>
</root>

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj.user

@@ -103,5 +103,8 @@
    <Compile Update="04-pump\PumpPropViewCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-pump\XtraUserControl1.cs">
      <SubType>UserControl</SubType>
    </Compile>
  </ItemGroup>
</Project>