From 1fe41eb1c9f2b2914b4a66a145f1ad0a75b9c915 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期五, 18 十月 2024 11:18:33 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Basic/01-SysCatalogManage/SysCatalogManageMainPanel.Designer.cs | 191 ++++++++++++++++++++++-------------------------
1 files changed, 89 insertions(+), 102 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Basic/01-SysCatalogManage/SysCatalogManageMainPanel.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Basic/01-SysCatalogManage/SysCatalogManageMainPanel.Designer.cs
index 3220c54..5eef868 100644
--- a/WinFrmUI/HStation.WinFrmUI.Basic/01-SysCatalogManage/SysCatalogManageMainPanel.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Basic/01-SysCatalogManage/SysCatalogManageMainPanel.Designer.cs
@@ -34,58 +34,55 @@
barBtnEditPumpCurve = new DevExpress.XtraBars.BarButtonItem();
BtnAdd = new DevExpress.XtraBars.BarButtonItem();
BtnDelete = new DevExpress.XtraBars.BarButtonItem();
- BtnAddChild = new DevExpress.XtraBars.BarButtonItem();
BtnPropEdit = new DevExpress.XtraBars.BarButtonItem();
+ barBtnUpdateParent = 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();
- typeTreeListCtrl2 = new SysTypeTreeListCtrl();
- layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
+ typeTreeListCtrl2 = new SysTypeListBoxCtrl();
treeList1 = new DevExpress.XtraTreeList.TreeList();
colName = new DevExpress.XtraTreeList.Columns.TreeListColumn();
colCode = new DevExpress.XtraTreeList.Columns.TreeListColumn();
- colSortCode = new DevExpress.XtraTreeList.Columns.TreeListColumn();
colDescription = new DevExpress.XtraTreeList.Columns.TreeListColumn();
- catlogViewModelBindingSource = new BindingSource(components);
- Root = new DevExpress.XtraLayout.LayoutControlGroup();
- layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+ catalogViewModelBindingSource = new BindingSource(components);
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();
dockPanel1_Container.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit();
- layoutControl1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)treeList1).BeginInit();
- ((System.ComponentModel.ISupportInitialize)catlogViewModelBindingSource).BeginInit();
- ((System.ComponentModel.ISupportInitialize)Root).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem1).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)catalogViewModelBindingSource).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, BtnAddChild, BtnPropEdit });
+ ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnEditPumpCurve, BtnAdd, BtnDelete, BtnPropEdit, barBtnUpdateParent, barCheckSorter });
ribbonControl1.Location = new Point(0, 0);
- ribbonControl1.MaxItemId = 19;
+ ribbonControl1.MaxItemId = 23;
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";
@@ -93,7 +90,7 @@
//
// BtnAdd
//
- BtnAdd.Caption = "澧炲姞鐖剁骇鍒嗙被";
+ BtnAdd.Caption = "澧炲姞";
BtnAdd.Id = 15;
BtnAdd.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("BtnAdd.ImageOptions.SvgImage");
BtnAdd.Name = "BtnAdd";
@@ -101,46 +98,62 @@
//
// 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;
//
- // BtnAddChild
- //
- BtnAddChild.Caption = "澧炲姞瀛愮骇鍒嗙被";
- BtnAddChild.Id = 17;
- BtnAddChild.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("BtnAddChild.ImageOptions.SvgImage");
- BtnAddChild.Name = "BtnAddChild";
- BtnAddChild.ItemClick += BtnAddChild_ItemClick;
- //
// BtnPropEdit
//
- BtnPropEdit.Caption = "鐩稿簲灞炴�х紪杈�";
+ BtnPropEdit.Caption = "灞炴�у垎閰�";
BtnPropEdit.Id = 18;
BtnPropEdit.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("BtnPropEdit.ImageOptions.SvgImage");
BtnPropEdit.Name = "BtnPropEdit";
BtnPropEdit.ItemClick += BtnPropEdit_ItemClick;
//
+ // barBtnUpdateParent
+ //
+ barBtnUpdateParent.Caption = "璁剧疆鐖剁骇";
+ barBtnUpdateParent.Id = 20;
+ barBtnUpdateParent.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnUpdateParent.ImageOptions.SvgImage");
+ barBtnUpdateParent.Name = "barBtnUpdateParent";
+ barBtnUpdateParent.ItemClick += barBtnUpdateParent_ItemClick;
+ //
+ // barCheckSorter
+ //
+ barCheckSorter.Caption = "鎺掑簭";
+ barCheckSorter.Id = 22;
+ barCheckSorter.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barCheckSorter.ImageOptions.SvgImage");
+ barCheckSorter.Name = "barCheckSorter";
+ barCheckSorter.CheckedChanged += barCheckSorter_CheckedChanged;
+ //
// 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";
//
// ribbonPageGroup1
//
ribbonPageGroup1.ItemLinks.Add(BtnAdd);
- ribbonPageGroup1.ItemLinks.Add(BtnAddChild);
ribbonPageGroup1.ItemLinks.Add(barBtnEditPumpCurve);
ribbonPageGroup1.ItemLinks.Add(BtnDelete);
- ribbonPageGroup1.ItemLinks.Add(BtnPropEdit);
ribbonPageGroup1.Name = "ribbonPageGroup1";
- ribbonPageGroup1.Text = "ribbonPageGroup1";
+ ribbonPageGroup1.Text = "鍩虹鍔熻兘";
+ //
+ // ribbonPageGroup2
+ //
+ ribbonPageGroup2.ItemLinks.Add(BtnPropEdit);
+ ribbonPageGroup2.ItemLinks.Add(barBtnUpdateParent);
+ 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" });
@@ -150,10 +163,10 @@
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.Name = "dockPanel1";
dockPanel1.OriginalSize = new Size(200, 200);
- dockPanel1.Size = new Size(200, 470);
+ dockPanel1.Size = new Size(200, 547);
dockPanel1.Text = "绫诲瀷鍒楄〃";
//
// dockPanel1_Container
@@ -161,7 +174,7 @@
dockPanel1_Container.Controls.Add(typeTreeListCtrl2);
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;
//
// typeTreeListCtrl2
@@ -171,43 +184,36 @@
typeTreeListCtrl2.Dock = DockStyle.Fill;
typeTreeListCtrl2.Location = new Point(0, 0);
typeTreeListCtrl2.Name = "typeTreeListCtrl2";
- typeTreeListCtrl2.Size = new Size(193, 441);
+ typeTreeListCtrl2.Size = new Size(193, 518);
typeTreeListCtrl2.TabIndex = 0;
- //
- // layoutControl1
- //
- layoutControl1.Controls.Add(treeList1);
- layoutControl1.Dock = DockStyle.Fill;
- layoutControl1.Location = new Point(200, 77);
- layoutControl1.Name = "layoutControl1";
- layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(523, 367, 650, 364);
- layoutControl1.Root = Root;
- layoutControl1.Size = new Size(933, 470);
- layoutControl1.TabIndex = 6;
- layoutControl1.Text = "layoutControl1";
//
// treeList1
//
treeList1.Appearance.HeaderPanel.Options.UseTextOptions = true;
treeList1.Appearance.HeaderPanel.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
- treeList1.Columns.AddRange(new DevExpress.XtraTreeList.Columns.TreeListColumn[] { colName, colCode, colSortCode, colDescription });
- treeList1.DataSource = catlogViewModelBindingSource;
- treeList1.Location = new Point(2, 2);
+ treeList1.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
+ treeList1.Columns.AddRange(new DevExpress.XtraTreeList.Columns.TreeListColumn[] { colName, colCode, colDescription });
+ treeList1.DataSource = catalogViewModelBindingSource;
+ treeList1.Dock = DockStyle.Fill;
+ treeList1.Location = new Point(0, 101);
treeList1.MenuManager = ribbonControl1;
treeList1.Name = "treeList1";
treeList1.OptionsBehavior.Editable = false;
- treeList1.Size = new Size(929, 466);
+ treeList1.OptionsBehavior.PopulateServiceColumns = true;
+ treeList1.OptionsView.ShowTreeLines = DevExpress.Utils.DefaultBoolean.True;
+ treeList1.Size = new Size(933, 446);
treeList1.TabIndex = 4;
//
// colName
//
colName.AppearanceCell.Options.UseTextOptions = true;
- colName.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
+ colName.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Near;
colName.Caption = "鍚嶇О";
colName.FieldName = "Name";
colName.Name = "colName";
colName.Visible = true;
colName.VisibleIndex = 0;
+ colName.Width = 212;
//
// colCode
//
@@ -218,16 +224,7 @@
colCode.Name = "colCode";
colCode.Visible = true;
colCode.VisibleIndex = 1;
- //
- // 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 = 2;
+ colCode.Width = 211;
//
// colDescription
//
@@ -237,30 +234,12 @@
colDescription.FieldName = "Description";
colDescription.Name = "colDescription";
colDescription.Visible = true;
- colDescription.VisibleIndex = 3;
+ colDescription.VisibleIndex = 2;
+ colDescription.Width = 322;
//
- // catlogViewModelBindingSource
+ // catalogViewModelBindingSource
//
- catlogViewModelBindingSource.DataSource = typeof(SysCatalogViewModel);
- //
- // 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 = treeList1;
- layoutControlItem1.Location = new Point(0, 0);
- layoutControlItem1.Name = "layoutControlItem1";
- layoutControlItem1.Size = new Size(933, 470);
- layoutControlItem1.TextSize = new Size(0, 0);
- layoutControlItem1.TextVisible = false;
+ catalogViewModelBindingSource.DataSource = typeof(SysCatalogViewModel);
//
// barButtonItem1
//
@@ -271,8 +250,19 @@
// svgImage32
//
svgImage32.ImageSize = new Size(32, 32);
- svgImage32.Add("bletter", "image://svgimages/outlook inspired/bletter.svg");
- svgImage32.Add("bold", "image://svgimages/outlook inspired/bold.svg");
+ svgImage32.Add("bo_category", "image://svgimages/business objects/bo_category.svg");
+ //
+ // sidePanel1
+ //
+ sidePanel1.BorderThickness = 0;
+ sidePanel1.Controls.Add(treeList1);
+ 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";
//
// SysCatalogManageMainPanel
//
@@ -280,24 +270,21 @@
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 = "SysCatalogManageMainPanel";
Size = new Size(1133, 547);
((System.ComponentModel.ISupportInitialize)ribbonControl1).EndInit();
((System.ComponentModel.ISupportInitialize)dockManager1).EndInit();
dockPanel1.ResumeLayout(false);
dockPanel1_Container.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)layoutControl1).EndInit();
- layoutControl1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)treeList1).EndInit();
- ((System.ComponentModel.ISupportInitialize)catlogViewModelBindingSource).EndInit();
- ((System.ComponentModel.ISupportInitialize)Root).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem1).EndInit();
+ ((System.ComponentModel.ISupportInitialize)catalogViewModelBindingSource).EndInit();
((System.ComponentModel.ISupportInitialize)svgImage32).EndInit();
+ sidePanel1.ResumeLayout(false);
+ sidePanel1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)behaviorManager1).EndInit();
ResumeLayout(false);
- PerformLayout();
}
#endregion
@@ -308,8 +295,6 @@
private DevExpress.XtraBars.Docking.DockManager dockManager1;
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.XtraBars.BarButtonItem barBtnEditPumpCurve;
private DevExpress.XtraBars.BarButtonItem BtnAdd;
private DevExpress.XtraBars.BarButtonItem BtnDelete;
@@ -317,13 +302,15 @@
private DevExpress.XtraTreeList.TreeList treeList1;
private DevExpress.XtraTreeList.Columns.TreeListColumn colName;
private DevExpress.XtraTreeList.Columns.TreeListColumn colCode;
- private DevExpress.XtraTreeList.Columns.TreeListColumn colSortCode;
private DevExpress.XtraTreeList.Columns.TreeListColumn colDescription;
- private BindingSource catlogViewModelBindingSource;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
- private SysTypeTreeListCtrl typeTreeListCtrl2;
- private DevExpress.XtraBars.BarButtonItem BtnAddChild;
+ private BindingSource catalogViewModelBindingSource;
+ private SysTypeListBoxCtrl typeTreeListCtrl2;
private DevExpress.XtraBars.BarButtonItem BtnPropEdit;
private DevExpress.Utils.SvgImageCollection svgImage32;
+ private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup2;
+ private DevExpress.XtraEditors.SidePanel sidePanel1;
+ private DevExpress.XtraBars.BarButtonItem barBtnUpdateParent;
+ private DevExpress.Utils.Behaviors.BehaviorManager behaviorManager1;
+ private DevExpress.XtraBars.BarCheckItem barCheckSorter;
}
}
--
Gitblit v1.9.3