From 6f932c727fe72e5c3417812234371a35e7225a93 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期二, 15 十月 2024 14:20:40 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/PumpProductMainPage.Designer.cs | 222 +++++++++++++++++++++++++------------------------------
1 files changed, 101 insertions(+), 121 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/PumpProductMainPage.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/PumpProductMainPage.Designer.cs
index 6cc8c2b..eba09e0 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/PumpProductMainPage.Designer.cs
+++ b/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);
--
Gitblit v1.9.3