From 1d8832e8e8e862a296f80c18ae2f1dac40419b68 Mon Sep 17 00:00:00 2001 From: lixiaojun <1287241240@qq.com> Date: 星期二, 29 十月 2024 18:09:01 +0800 Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0 --- WinFrmUI/HStation.WinFrmUI.Basic/02-SysPropManage/SysPropManageMainPanel.Designer.cs | 202 ++++++++++++++++++++++++-------------------------- 1 files changed, 98 insertions(+), 104 deletions(-) diff --git a/WinFrmUI/HStation.WinFrmUI.Basic/02-SysPropManage/SysPropManageMainPanel.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Basic/02-SysPropManage/SysPropManageMainPanel.Designer.cs index d955d30..bde1fd0 100644 --- a/WinFrmUI/HStation.WinFrmUI.Basic/02-SysPropManage/SysPropManageMainPanel.Designer.cs +++ b/WinFrmUI/HStation.WinFrmUI.Basic/02-SysPropManage/SysPropManageMainPanel.Designer.cs @@ -39,8 +39,10 @@ barBtnEditPumpCurve = new DevExpress.XtraBars.BarButtonItem(); BtnAdd = new DevExpress.XtraBars.BarButtonItem(); BtnDelete = new DevExpress.XtraBars.BarButtonItem(); + barCheckSorter = new DevExpress.XtraBars.BarCheckItem(); ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage(); ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup(); + ribbonPageGroup2 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup(); dockManager1 = new DevExpress.XtraBars.Docking.DockManager(components); dockPanel1 = new DevExpress.XtraBars.Docking.DockPanel(); dockPanel1_Container = new DevExpress.XtraBars.Docking.ControlContainer(); @@ -50,19 +52,17 @@ gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView(); colName = new DevExpress.XtraGrid.Columns.GridColumn(); colCode = new DevExpress.XtraGrid.Columns.GridColumn(); - colExtendTypeDisPlayName = new DevExpress.XtraGrid.Columns.GridColumn(); - colSortCode = new DevExpress.XtraGrid.Columns.GridColumn(); colDescription = new DevExpress.XtraGrid.Columns.GridColumn(); colDefaultValue = new DevExpress.XtraGrid.Columns.GridColumn(); colFormat = new DevExpress.XtraGrid.Columns.GridColumn(); colIsNull = new DevExpress.XtraGrid.Columns.GridColumn(); colUnitName = new DevExpress.XtraGrid.Columns.GridColumn(); - layoutControl1 = new DevExpress.XtraLayout.LayoutControl(); - Root = new DevExpress.XtraLayout.LayoutControlGroup(); - layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); - barButtonItem1 = new DevExpress.XtraBars.BarButtonItem(); ColPropEdit = new DevExpress.XtraGrid.Columns.GridColumn(); repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); + barButtonItem1 = new DevExpress.XtraBars.BarButtonItem(); + svgImage32 = new DevExpress.Utils.SvgImageCollection(components); + sidePanel1 = new DevExpress.XtraEditors.SidePanel(); + behaviorManager1 = new DevExpress.Utils.Behaviors.BehaviorManager(components); ((System.ComponentModel.ISupportInitialize)ribbonControl1).BeginInit(); ((System.ComponentModel.ISupportInitialize)dockManager1).BeginInit(); dockPanel1.SuspendLayout(); @@ -70,33 +70,31 @@ ((System.ComponentModel.ISupportInitialize)gridControl1).BeginInit(); ((System.ComponentModel.ISupportInitialize)propViewModelBindingSource).BeginInit(); ((System.ComponentModel.ISupportInitialize)gridView1).BeginInit(); - ((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit(); - layoutControl1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)Root).BeginInit(); - ((System.ComponentModel.ISupportInitialize)layoutControlItem1).BeginInit(); ((System.ComponentModel.ISupportInitialize)repositoryItemButtonEdit1).BeginInit(); + ((System.ComponentModel.ISupportInitialize)svgImage32).BeginInit(); + sidePanel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)behaviorManager1).BeginInit(); SuspendLayout(); // // ribbonControl1 // - ribbonControl1.DrawGroupsBorderMode = DevExpress.Utils.DefaultBoolean.False; ribbonControl1.ExpandCollapseItem.Id = 0; ribbonControl1.ItemPanelStyle = DevExpress.XtraBars.Ribbon.RibbonItemPanelStyle.Classic; - ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnEditPumpCurve, BtnAdd, BtnDelete }); + ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnEditPumpCurve, BtnAdd, BtnDelete, barCheckSorter }); ribbonControl1.Location = new Point(0, 0); - ribbonControl1.MaxItemId = 17; + ribbonControl1.MaxItemId = 20; ribbonControl1.Name = "ribbonControl1"; 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.Hide; - ribbonControl1.Size = new Size(1133, 77); + ribbonControl1.Size = new Size(933, 101); ribbonControl1.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden; // // barBtnEditPumpCurve // - barBtnEditPumpCurve.Caption = "缂栬緫灞炴��"; + barBtnEditPumpCurve.Caption = "缂栬緫"; barBtnEditPumpCurve.Id = 13; barBtnEditPumpCurve.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnEditPumpCurve.ImageOptions.SvgImage"); barBtnEditPumpCurve.Name = "barBtnEditPumpCurve"; @@ -104,7 +102,7 @@ // // BtnAdd // - BtnAdd.Caption = "澧炲姞灞炴��"; + BtnAdd.Caption = "澧炲姞"; BtnAdd.Id = 15; BtnAdd.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("BtnAdd.ImageOptions.SvgImage"); BtnAdd.Name = "BtnAdd"; @@ -112,15 +110,23 @@ // // BtnDelete // - BtnDelete.Caption = "鍒犻櫎灞炴��"; + BtnDelete.Caption = "鍒犻櫎"; BtnDelete.Id = 16; BtnDelete.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("BtnDelete.ImageOptions.SvgImage"); BtnDelete.Name = "BtnDelete"; BtnDelete.ItemClick += BtnDelete_ItemClick; // + // barCheckSorter + // + barCheckSorter.Caption = "鎺掑簭"; + barCheckSorter.Id = 19; + barCheckSorter.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barCheckSorter.ImageOptions.SvgImage"); + barCheckSorter.Name = "barCheckSorter"; + barCheckSorter.ItemClick += barCheckItemSorter_ItemClick; + // // ribbonPage1 // - ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { ribbonPageGroup1 }); + ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { ribbonPageGroup1, ribbonPageGroup2 }); ribbonPage1.Name = "ribbonPage1"; ribbonPage1.Text = "ribbonPage1"; // @@ -130,10 +136,18 @@ ribbonPageGroup1.ItemLinks.Add(barBtnEditPumpCurve); ribbonPageGroup1.ItemLinks.Add(BtnDelete); ribbonPageGroup1.Name = "ribbonPageGroup1"; - ribbonPageGroup1.Text = "ribbonPageGroup1"; + ribbonPageGroup1.Text = "鍩虹鍔熻兘"; + // + // ribbonPageGroup2 + // + ribbonPageGroup2.ItemLinks.Add(barCheckSorter); + ribbonPageGroup2.Name = "ribbonPageGroup2"; + ribbonPageGroup2.Text = "鏇村"; // // dockManager1 // + dockManager1.DockingOptions.ShowAutoHideButton = false; + 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" }); @@ -143,10 +157,11 @@ dockPanel1.Controls.Add(dockPanel1_Container); dockPanel1.Dock = DevExpress.XtraBars.Docking.DockingStyle.Left; dockPanel1.ID = new Guid("20cba9f0-4c76-45ad-a0f6-714fb6b14171"); - dockPanel1.Location = new Point(0, 77); + dockPanel1.Location = new Point(0, 0); + dockPanel1.Margin = new Padding(0); dockPanel1.Name = "dockPanel1"; dockPanel1.OriginalSize = new Size(200, 200); - dockPanel1.Size = new Size(200, 470); + dockPanel1.Size = new Size(200, 547); dockPanel1.Text = "灞炴�х粍鍒楄〃"; // // dockPanel1_Container @@ -154,7 +169,7 @@ dockPanel1_Container.Controls.Add(propGroupTreeListCtrl1); dockPanel1_Container.Location = new Point(3, 26); dockPanel1_Container.Name = "dockPanel1_Container"; - dockPanel1_Container.Size = new Size(193, 441); + dockPanel1_Container.Size = new Size(193, 518); dockPanel1_Container.TabIndex = 0; // // propGroupTreeListCtrl1 @@ -164,18 +179,19 @@ propGroupTreeListCtrl1.Dock = DockStyle.Fill; propGroupTreeListCtrl1.Location = new Point(0, 0); propGroupTreeListCtrl1.Name = "propGroupTreeListCtrl1"; - propGroupTreeListCtrl1.Size = new Size(193, 441); + propGroupTreeListCtrl1.Size = new Size(193, 518); propGroupTreeListCtrl1.TabIndex = 0; // // gridControl1 // gridControl1.DataSource = propViewModelBindingSource; - gridControl1.Location = new Point(2, 2); + gridControl1.Dock = DockStyle.Fill; + gridControl1.Location = new Point(0, 101); gridControl1.MainView = gridView1; gridControl1.MenuManager = ribbonControl1; gridControl1.Name = "gridControl1"; gridControl1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { repositoryItemButtonEdit1 }); - gridControl1.Size = new Size(929, 466); + gridControl1.Size = new Size(933, 446); gridControl1.TabIndex = 3; gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView1 }); // @@ -187,10 +203,12 @@ // gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true; gridView1.Appearance.HeaderPanel.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; - gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colCode, colExtendTypeDisPlayName, colSortCode, colDescription, colDefaultValue, colFormat, colIsNull, colUnitName, ColPropEdit }); + gridView1.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder; + gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colCode, colDescription, colDefaultValue, colFormat, colIsNull, colUnitName, ColPropEdit }); gridView1.GridControl = gridControl1; gridView1.Name = "gridView1"; gridView1.OptionsView.ShowGroupPanel = false; + gridView1.RowCellClick += gridView1_RowCellClick; // // colName // @@ -201,6 +219,7 @@ colName.Name = "colName"; colName.Visible = true; colName.VisibleIndex = 0; + colName.Width = 197; // // colCode // @@ -211,26 +230,7 @@ colCode.Name = "colCode"; colCode.Visible = true; colCode.VisibleIndex = 1; - // - // colExtendTypeDisPlayName - // - colExtendTypeDisPlayName.AppearanceCell.Options.UseTextOptions = true; - colExtendTypeDisPlayName.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; - colExtendTypeDisPlayName.Caption = "鎷撳睍绫诲瀷"; - colExtendTypeDisPlayName.FieldName = "ExtendTypeDisPlayName"; - colExtendTypeDisPlayName.Name = "colExtendTypeDisPlayName"; - colExtendTypeDisPlayName.Visible = true; - colExtendTypeDisPlayName.VisibleIndex = 2; - // - // colSortCode - // - colSortCode.AppearanceCell.Options.UseTextOptions = true; - colSortCode.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; - colSortCode.Caption = "鎺掑簭鐮�"; - colSortCode.FieldName = "SortCode"; - colSortCode.Name = "colSortCode"; - colSortCode.Visible = true; - colSortCode.VisibleIndex = 7; + colCode.Width = 178; // // colDescription // @@ -240,7 +240,8 @@ colDescription.FieldName = "Description"; colDescription.Name = "colDescription"; colDescription.Visible = true; - colDescription.VisibleIndex = 8; + colDescription.VisibleIndex = 6; + colDescription.Width = 207; // // colDefaultValue // @@ -248,15 +249,17 @@ colDefaultValue.FieldName = "DefaultValue"; colDefaultValue.Name = "colDefaultValue"; colDefaultValue.Visible = true; - colDefaultValue.VisibleIndex = 3; + colDefaultValue.VisibleIndex = 2; + colDefaultValue.Width = 92; // // colFormat // colFormat.Caption = "鏍煎紡"; - colFormat.FieldName = "Format"; + colFormat.FieldName = "FormatDisPlayName"; colFormat.Name = "colFormat"; colFormat.Visible = true; - colFormat.VisibleIndex = 4; + colFormat.VisibleIndex = 3; + colFormat.Width = 86; // // colIsNull // @@ -264,7 +267,8 @@ colIsNull.FieldName = "IsNull"; colIsNull.Name = "colIsNull"; colIsNull.Visible = true; - colIsNull.VisibleIndex = 6; + colIsNull.VisibleIndex = 5; + colIsNull.Width = 91; // // colUnitName // @@ -272,43 +276,8 @@ colUnitName.FieldName = "UnitName"; colUnitName.Name = "colUnitName"; colUnitName.Visible = true; - colUnitName.VisibleIndex = 5; - // - // layoutControl1 - // - layoutControl1.Controls.Add(gridControl1); - layoutControl1.Dock = DockStyle.Fill; - layoutControl1.Location = new Point(200, 77); - layoutControl1.Name = "layoutControl1"; - layoutControl1.Root = Root; - layoutControl1.Size = new Size(933, 470); - layoutControl1.TabIndex = 6; - layoutControl1.Text = "layoutControl1"; - // - // 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(933, 470); - Root.TextVisible = false; - // - // layoutControlItem1 - // - layoutControlItem1.Control = gridControl1; - layoutControlItem1.Location = new Point(0, 0); - layoutControlItem1.Name = "layoutControlItem1"; - layoutControlItem1.Size = new Size(933, 470); - layoutControlItem1.TextSize = new Size(0, 0); - layoutControlItem1.TextVisible = false; - // - // barButtonItem1 - // - barButtonItem1.Caption = "barButtonItem1"; - barButtonItem1.Id = 14; - barButtonItem1.Name = "barButtonItem1"; + colUnitName.VisibleIndex = 4; + colUnitName.Width = 95; // // ColPropEdit // @@ -317,7 +286,8 @@ ColPropEdit.Name = "ColPropEdit"; ColPropEdit.OptionsColumn.AllowEdit = false; ColPropEdit.Visible = true; - ColPropEdit.VisibleIndex = 9; + ColPropEdit.VisibleIndex = 7; + ColPropEdit.Width = 62; // // repositoryItemButtonEdit1 // @@ -325,15 +295,40 @@ editorButtonImageOptions1.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("editorButtonImageOptions1.SvgImage"); repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default) }); repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1"; + repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; // - // PropManageCtrl + // barButtonItem1 // + barButtonItem1.Caption = "barButtonItem1"; + barButtonItem1.Id = 14; + barButtonItem1.Name = "barButtonItem1"; + // + // svgImage32 + // + svgImage32.ImageSize = new Size(32, 32); + svgImage32.Add("documentproperties", "image://svgimages/richedit/documentproperties.svg"); + // + // sidePanel1 + // + sidePanel1.BorderThickness = 0; + sidePanel1.Controls.Add(gridControl1); + sidePanel1.Controls.Add(ribbonControl1); + sidePanel1.Dock = DockStyle.Fill; + sidePanel1.Location = new Point(200, 0); + sidePanel1.Name = "sidePanel1"; + sidePanel1.Size = new Size(933, 547); + sidePanel1.TabIndex = 9; + sidePanel1.Text = "sidePanel1"; + // + // SysPropManageMainPanel + // + Appearance.BackColor = SystemColors.Control; + Appearance.Options.UseBackColor = true; AutoScaleDimensions = new SizeF(7F, 14F); AutoScaleMode = AutoScaleMode.Font; - Controls.Add(layoutControl1); + Controls.Add(sidePanel1); Controls.Add(dockPanel1); - Controls.Add(ribbonControl1); - Name = "PropManageCtrl"; + Name = "SysPropManageMainPanel"; Size = new Size(1133, 547); ((System.ComponentModel.ISupportInitialize)ribbonControl1).EndInit(); ((System.ComponentModel.ISupportInitialize)dockManager1).EndInit(); @@ -342,13 +337,12 @@ ((System.ComponentModel.ISupportInitialize)gridControl1).EndInit(); ((System.ComponentModel.ISupportInitialize)propViewModelBindingSource).EndInit(); ((System.ComponentModel.ISupportInitialize)gridView1).EndInit(); - ((System.ComponentModel.ISupportInitialize)layoutControl1).EndInit(); - layoutControl1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)Root).EndInit(); - ((System.ComponentModel.ISupportInitialize)layoutControlItem1).EndInit(); ((System.ComponentModel.ISupportInitialize)repositoryItemButtonEdit1).EndInit(); + ((System.ComponentModel.ISupportInitialize)svgImage32).EndInit(); + sidePanel1.ResumeLayout(false); + sidePanel1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)behaviorManager1).EndInit(); ResumeLayout(false); - PerformLayout(); } #endregion @@ -361,25 +355,25 @@ private DevExpress.XtraGrid.Views.Grid.GridView gridView1; private DevExpress.XtraBars.Docking.DockPanel dockPanel1; private DevExpress.XtraBars.Docking.ControlContainer dockPanel1_Container; - private DevExpress.XtraLayout.LayoutControl layoutControl1; - private DevExpress.XtraLayout.LayoutControlGroup Root; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1; private DevExpress.XtraBars.BarButtonItem barBtnEditPumpCurve; private DevExpress.XtraBars.BarButtonItem BtnAdd; private DevExpress.XtraBars.BarButtonItem BtnDelete; private DevExpress.XtraBars.BarButtonItem barButtonItem1; private DevExpress.XtraGrid.Columns.GridColumn colName; private DevExpress.XtraGrid.Columns.GridColumn colCode; - private DevExpress.XtraGrid.Columns.GridColumn colSortCode; private DevExpress.XtraGrid.Columns.GridColumn colDescription; - private DevExpress.XtraGrid.Columns.GridColumn colExtendTypeDisPlayName; private BindingSource propViewModelBindingSource; private DevExpress.XtraGrid.Columns.GridColumn colDefaultValue; private DevExpress.XtraGrid.Columns.GridColumn colFormat; private DevExpress.XtraGrid.Columns.GridColumn colIsNull; private DevExpress.XtraGrid.Columns.GridColumn colUnitName; - private SysPropGroupTreeListCtrl propGroupTreeListCtrl1; + public SysPropGroupTreeListCtrl propGroupTreeListCtrl1; private DevExpress.XtraGrid.Columns.GridColumn ColPropEdit; private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1; + private DevExpress.Utils.SvgImageCollection svgImage32; + private DevExpress.XtraEditors.SidePanel sidePanel1; + private DevExpress.XtraBars.BarCheckItem barCheckSorter; + private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup2; + private DevExpress.Utils.Behaviors.BehaviorManager behaviorManager1; } } -- Gitblit v1.9.3