From 7d49fe63d26ec26ebee525a7ee26d8ee1dfbbc60 Mon Sep 17 00:00:00 2001
From: yangyin <1850366751@qq.com>
Date: 星期四, 22 八月 2024 08:48:19 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/HomeXhsProjectPage.Designer.cs | 204 ++++++++++++++++++++++++++------------------------
1 files changed, 107 insertions(+), 97 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/HomeXhsProjectPage.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/HomeXhsProjectPage.Designer.cs
index 0889d5b..bc5bf09 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/HomeXhsProjectPage.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/HomeXhsProjectPage.Designer.cs
@@ -37,9 +37,13 @@
gridControl1 = new DevExpress.XtraGrid.GridControl();
layoutView1 = new DevExpress.XtraGrid.Views.Layout.LayoutView();
colName = new DevExpress.XtraGrid.Columns.LayoutViewColumn();
+ layoutViewField_colName = new DevExpress.XtraGrid.Views.Layout.LayoutViewField();
colCount = new DevExpress.XtraGrid.Columns.LayoutViewColumn();
+ layoutViewField_colCount = new DevExpress.XtraGrid.Views.Layout.LayoutViewField();
colPicture = new DevExpress.XtraGrid.Columns.LayoutViewColumn();
repPicEdit = new DevExpress.XtraEditors.Repository.RepositoryItemPictureEdit();
+ layoutViewField_colPicture = new DevExpress.XtraGrid.Views.Layout.LayoutViewField();
+ layoutViewCard1 = new DevExpress.XtraGrid.Views.Layout.LayoutViewCard();
gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
sidePanelBottom = new DevExpress.XtraEditors.SidePanel();
dockPanelFill = new DevExpress.XtraBars.Docking.DockPanel();
@@ -49,15 +53,15 @@
dockPanelLeft = new DevExpress.XtraBars.Docking.DockPanel();
dockPanel1_Container = new DevExpress.XtraBars.Docking.ControlContainer();
dockManager1 = new DevExpress.XtraBars.Docking.DockManager(components);
- layoutViewCard1 = new DevExpress.XtraGrid.Views.Layout.LayoutViewCard();
- layoutViewField_colCount = new DevExpress.XtraGrid.Views.Layout.LayoutViewField();
- layoutViewField_colPicture = new DevExpress.XtraGrid.Views.Layout.LayoutViewField();
- layoutViewField_colName = new DevExpress.XtraGrid.Views.Layout.LayoutViewField();
((ISupportInitialize)svgImg32).BeginInit();
sidePanel1.SuspendLayout();
((ISupportInitialize)gridControl1).BeginInit();
((ISupportInitialize)layoutView1).BeginInit();
+ ((ISupportInitialize)layoutViewField_colName).BeginInit();
+ ((ISupportInitialize)layoutViewField_colCount).BeginInit();
((ISupportInitialize)repPicEdit).BeginInit();
+ ((ISupportInitialize)layoutViewField_colPicture).BeginInit();
+ ((ISupportInitialize)layoutViewCard1).BeginInit();
((ISupportInitialize)gridView1).BeginInit();
sidePanelBottom.SuspendLayout();
dockPanelFill.SuspendLayout();
@@ -67,30 +71,26 @@
dockPanelLeft.SuspendLayout();
dockPanel1_Container.SuspendLayout();
((ISupportInitialize)dockManager1).BeginInit();
- ((ISupportInitialize)layoutViewCard1).BeginInit();
- ((ISupportInitialize)layoutViewField_colCount).BeginInit();
- ((ISupportInitialize)layoutViewField_colPicture).BeginInit();
- ((ISupportInitialize)layoutViewField_colName).BeginInit();
SuspendLayout();
//
// mapViewProjectListContainer1
//
mapViewProjectListContainer1.Dock = DockStyle.Fill;
mapViewProjectListContainer1.Location = new Point(0, 0);
- mapViewProjectListContainer1.Margin = new Padding(4, 3, 4, 3);
+ mapViewProjectListContainer1.Margin = new Padding(3, 2, 3, 2);
mapViewProjectListContainer1.Name = "mapViewProjectListContainer1";
- mapViewProjectListContainer1.Padding = new Padding(1, 2, 1, 2);
- mapViewProjectListContainer1.Size = new Size(926, 882);
+ mapViewProjectListContainer1.Padding = new Padding(1);
+ mapViewProjectListContainer1.Size = new Size(665, 560);
mapViewProjectListContainer1.TabIndex = 5;
//
// homeXhsProjectPropertyCtrl1
//
homeXhsProjectPropertyCtrl1.Dock = DockStyle.Fill;
homeXhsProjectPropertyCtrl1.Location = new Point(0, 0);
- homeXhsProjectPropertyCtrl1.Margin = new Padding(6, 8, 6, 8);
+ homeXhsProjectPropertyCtrl1.Margin = new Padding(4, 5, 4, 5);
homeXhsProjectPropertyCtrl1.Name = "homeXhsProjectPropertyCtrl1";
homeXhsProjectPropertyCtrl1.SelectedObject = null;
- homeXhsProjectPropertyCtrl1.Size = new Size(298, 882);
+ homeXhsProjectPropertyCtrl1.Size = new Size(206, 560);
homeXhsProjectPropertyCtrl1.TabIndex = 0;
homeXhsProjectPropertyCtrl1.JumpDirectEvent += homeXhsProjectPropertyCtrl1_JumpDirectEvent;
//
@@ -98,9 +98,9 @@
//
homeXhsProjectTreeListCtrl1.Dock = DockStyle.Fill;
homeXhsProjectTreeListCtrl1.Location = new Point(0, 0);
- homeXhsProjectTreeListCtrl1.Margin = new Padding(6, 8, 6, 8);
+ homeXhsProjectTreeListCtrl1.Margin = new Padding(4, 5, 4, 5);
homeXhsProjectTreeListCtrl1.Name = "homeXhsProjectTreeListCtrl1";
- homeXhsProjectTreeListCtrl1.Size = new Size(293, 882);
+ homeXhsProjectTreeListCtrl1.Size = new Size(190, 560);
homeXhsProjectTreeListCtrl1.TabIndex = 0;
homeXhsProjectTreeListCtrl1.SelectProjectEvent += homeXhsProjectTreeListCtrl1_SelectProjectEvent;
homeXhsProjectTreeListCtrl1.RefreshDataEvent += homeXhsProjectTreeListCtrl1_RefreshDataEvent;
@@ -116,20 +116,21 @@
sidePanel1.Controls.Add(gridControl1);
sidePanel1.Dock = DockStyle.Top;
sidePanel1.Location = new Point(0, 0);
- sidePanel1.Margin = new Padding(4, 5, 4, 5);
sidePanel1.Name = "sidePanel1";
- sidePanel1.Size = new Size(1519, 148);
+ sidePanel1.Size = new Size(1063, 94);
sidePanel1.TabIndex = 1;
sidePanel1.Text = "sidePanel1";
//
// gridControl1
//
gridControl1.Dock = DockStyle.Fill;
+ gridControl1.EmbeddedNavigator.Margin = new Padding(2);
gridControl1.Location = new Point(0, 0);
gridControl1.MainView = layoutView1;
+ gridControl1.Margin = new Padding(2);
gridControl1.Name = "gridControl1";
gridControl1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { repPicEdit });
- gridControl1.Size = new Size(1519, 147);
+ gridControl1.Size = new Size(1063, 93);
gridControl1.TabIndex = 0;
gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { layoutView1, gridView1 });
//
@@ -143,9 +144,10 @@
layoutView1.Appearance.FieldValue.Options.UseBackColor = true;
layoutView1.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
layoutView1.CardHorzInterval = 4;
- layoutView1.CardMinSize = new Size(300, 109);
+ layoutView1.CardMinSize = new Size(210, 69);
layoutView1.CardVertInterval = 0;
layoutView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.LayoutViewColumn[] { colName, colCount, colPicture });
+ layoutView1.DetailHeight = 223;
layoutView1.GridControl = gridControl1;
layoutView1.Name = "layoutView1";
layoutView1.OptionsBehavior.Editable = false;
@@ -163,6 +165,7 @@
layoutView1.OptionsView.ShowHeaderPanel = false;
layoutView1.OptionsView.ViewMode = DevExpress.XtraGrid.Views.Layout.LayoutViewMode.Row;
layoutView1.TemplateCard = layoutViewCard1;
+ layoutView1.FieldValueClick += layoutView1_FieldValueClick;
//
// colName
//
@@ -175,9 +178,21 @@
colName.Caption = "鍚嶇О";
colName.FieldName = "Name";
colName.LayoutViewField = layoutViewField_colName;
- colName.MinWidth = 30;
+ colName.MinWidth = 21;
colName.Name = "colName";
- colName.Width = 112;
+ colName.Width = 78;
+ //
+ // layoutViewField_colName
+ //
+ layoutViewField_colName.ContentHorzAlignment = DevExpress.Utils.HorzAlignment.Center;
+ layoutViewField_colName.ContentVertAlignment = DevExpress.Utils.VertAlignment.Center;
+ layoutViewField_colName.EditorPreferredWidth = 106;
+ layoutViewField_colName.Location = new Point(133, 0);
+ layoutViewField_colName.Name = "layoutViewField_colName";
+ layoutViewField_colName.Padding = new DevExpress.XtraLayout.Utils.Padding(3, 3, 3, 3);
+ layoutViewField_colName.Size = new Size(159, 36);
+ layoutViewField_colName.TextSize = new Size(0, 0);
+ layoutViewField_colName.TextVisible = false;
//
// colCount
//
@@ -189,9 +204,21 @@
colCount.Caption = "鏁伴噺";
colCount.FieldName = "Count";
colCount.LayoutViewField = layoutViewField_colCount;
- colCount.MinWidth = 30;
+ colCount.MinWidth = 21;
colCount.Name = "colCount";
- colCount.Width = 112;
+ colCount.Width = 78;
+ //
+ // layoutViewField_colCount
+ //
+ layoutViewField_colCount.ContentHorzAlignment = DevExpress.Utils.HorzAlignment.Center;
+ layoutViewField_colCount.ContentVertAlignment = DevExpress.Utils.VertAlignment.Center;
+ layoutViewField_colCount.EditorPreferredWidth = 106;
+ layoutViewField_colCount.Location = new Point(133, 36);
+ layoutViewField_colCount.Name = "layoutViewField_colCount";
+ layoutViewField_colCount.Padding = new DevExpress.XtraLayout.Utils.Padding(3, 3, 3, 3);
+ layoutViewField_colCount.Size = new Size(159, 65);
+ layoutViewField_colCount.TextSize = new Size(0, 0);
+ layoutViewField_colCount.TextVisible = false;
//
// colPicture
//
@@ -199,18 +226,43 @@
colPicture.ColumnEdit = repPicEdit;
colPicture.FieldName = "Image";
colPicture.LayoutViewField = layoutViewField_colPicture;
- colPicture.MinWidth = 30;
+ colPicture.MinWidth = 21;
colPicture.Name = "colPicture";
- colPicture.Width = 112;
+ colPicture.Width = 78;
//
// repPicEdit
//
repPicEdit.Name = "repPicEdit";
//
+ // layoutViewField_colPicture
+ //
+ layoutViewField_colPicture.EditorPreferredWidth = 87;
+ layoutViewField_colPicture.Location = new Point(0, 0);
+ layoutViewField_colPicture.Name = "layoutViewField_colPicture";
+ layoutViewField_colPicture.Padding = new DevExpress.XtraLayout.Utils.Padding(3, 3, 3, 3);
+ layoutViewField_colPicture.Size = new Size(133, 101);
+ layoutViewField_colPicture.StartNewLine = true;
+ layoutViewField_colPicture.TextSize = new Size(0, 0);
+ layoutViewField_colPicture.TextVisible = false;
+ //
+ // layoutViewCard1
+ //
+ layoutViewCard1.CustomizationFormText = "TemplateCard";
+ layoutViewCard1.GroupBordersVisible = false;
+ layoutViewCard1.GroupStyle = DevExpress.Utils.GroupStyle.Light;
+ layoutViewCard1.HeaderButtonsLocation = DevExpress.Utils.GroupElementLocation.AfterText;
+ layoutViewCard1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutViewField_colCount, layoutViewField_colPicture, layoutViewField_colName });
+ layoutViewCard1.Name = "layoutViewCard1";
+ layoutViewCard1.OptionsItemText.TextToControlDistance = 3;
+ layoutViewCard1.Padding = new DevExpress.XtraLayout.Utils.Padding(3, 3, 3, 3);
+ layoutViewCard1.Text = "TemplateCard";
+ //
// gridView1
//
+ gridView1.DetailHeight = 223;
gridView1.GridControl = gridControl1;
gridView1.Name = "gridView1";
+ gridView1.OptionsEditForm.PopupEditFormWidth = 560;
//
// sidePanelBottom
//
@@ -218,10 +270,9 @@
sidePanelBottom.Controls.Add(dockPanelRight);
sidePanelBottom.Controls.Add(dockPanelLeft);
sidePanelBottom.Dock = DockStyle.Fill;
- sidePanelBottom.Location = new Point(0, 148);
- sidePanelBottom.Margin = new Padding(4, 5, 4, 5);
+ sidePanelBottom.Location = new Point(0, 94);
sidePanelBottom.Name = "sidePanelBottom";
- sidePanelBottom.Size = new Size(1519, 916);
+ sidePanelBottom.Size = new Size(1063, 583);
sidePanelBottom.TabIndex = 7;
sidePanelBottom.Text = "sidePanel3";
//
@@ -234,19 +285,21 @@
dockPanelFill.Controls.Add(controlContainer2);
dockPanelFill.Dock = DevExpress.XtraBars.Docking.DockingStyle.Fill;
dockPanelFill.ID = new Guid("136389ea-6552-4166-8c2a-b2ffe8b01953");
- dockPanelFill.Location = new Point(294, 0);
+ dockPanelFill.Location = new Point(191, 0);
+ dockPanelFill.Margin = new Padding(2);
dockPanelFill.Name = "dockPanelFill";
dockPanelFill.Options.ShowCloseButton = false;
- dockPanelFill.OriginalSize = new Size(1525, 200);
- dockPanelFill.Size = new Size(926, 916);
+ dockPanelFill.OriginalSize = new Size(287, 200);
+ dockPanelFill.Size = new Size(665, 583);
dockPanelFill.Text = "鍦板浘";
//
// controlContainer2
//
controlContainer2.Controls.Add(mapViewProjectListContainer1);
- controlContainer2.Location = new Point(0, 34);
+ controlContainer2.Location = new Point(0, 23);
+ controlContainer2.Margin = new Padding(2);
controlContainer2.Name = "controlContainer2";
- controlContainer2.Size = new Size(926, 882);
+ controlContainer2.Size = new Size(665, 560);
controlContainer2.TabIndex = 0;
//
// dockPanelRight
@@ -254,19 +307,21 @@
dockPanelRight.Controls.Add(controlContainer1);
dockPanelRight.Dock = DevExpress.XtraBars.Docking.DockingStyle.Right;
dockPanelRight.ID = new Guid("18c9fca9-8ae9-473c-9cd2-0467d818af3f");
- dockPanelRight.Location = new Point(1220, 0);
+ dockPanelRight.Location = new Point(856, 0);
+ dockPanelRight.Margin = new Padding(2);
dockPanelRight.Name = "dockPanelRight";
dockPanelRight.Options.ShowCloseButton = false;
- dockPanelRight.OriginalSize = new Size(299, 200);
- dockPanelRight.Size = new Size(299, 916);
- dockPanelRight.Text = "灞炴�ч潰鏉�";
+ dockPanelRight.OriginalSize = new Size(207, 200);
+ dockPanelRight.Size = new Size(207, 583);
+ dockPanelRight.Text = "椤圭洰灞炴��";
//
// controlContainer1
//
controlContainer1.Controls.Add(homeXhsProjectPropertyCtrl1);
- controlContainer1.Location = new Point(1, 34);
+ controlContainer1.Location = new Point(1, 23);
+ controlContainer1.Margin = new Padding(2);
controlContainer1.Name = "controlContainer1";
- controlContainer1.Size = new Size(298, 882);
+ controlContainer1.Size = new Size(206, 560);
controlContainer1.TabIndex = 0;
//
// dockPanelLeft
@@ -275,18 +330,20 @@
dockPanelLeft.Dock = DevExpress.XtraBars.Docking.DockingStyle.Left;
dockPanelLeft.ID = new Guid("fba93cbc-dfe6-4982-8aee-be8baff1ea68");
dockPanelLeft.Location = new Point(0, 0);
+ dockPanelLeft.Margin = new Padding(2);
dockPanelLeft.Name = "dockPanelLeft";
dockPanelLeft.Options.ShowCloseButton = false;
- dockPanelLeft.OriginalSize = new Size(294, 200);
- dockPanelLeft.Size = new Size(294, 916);
+ dockPanelLeft.OriginalSize = new Size(191, 200);
+ dockPanelLeft.Size = new Size(191, 583);
dockPanelLeft.Text = "椤圭洰鍒楄〃";
//
// dockPanel1_Container
//
dockPanel1_Container.Controls.Add(homeXhsProjectTreeListCtrl1);
- dockPanel1_Container.Location = new Point(0, 34);
+ dockPanel1_Container.Location = new Point(0, 23);
+ dockPanel1_Container.Margin = new Padding(2);
dockPanel1_Container.Name = "dockPanel1_Container";
- dockPanel1_Container.Size = new Size(293, 882);
+ dockPanel1_Container.Size = new Size(190, 560);
dockPanel1_Container.TabIndex = 0;
//
// dockManager1
@@ -296,69 +353,26 @@
dockManager1.Style = DevExpress.XtraBars.Docking2010.Views.DockingViewStyle.Light;
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" });
//
- // layoutViewCard1
- //
- layoutViewCard1.CustomizationFormText = "TemplateCard";
- layoutViewCard1.GroupBordersVisible = false;
- layoutViewCard1.GroupStyle = DevExpress.Utils.GroupStyle.Light;
- layoutViewCard1.HeaderButtonsLocation = DevExpress.Utils.GroupElementLocation.AfterText;
- layoutViewCard1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutViewField_colCount, layoutViewField_colPicture, layoutViewField_colName });
- layoutViewCard1.Name = "layoutViewCard1";
- layoutViewCard1.OptionsItemText.TextToControlDistance = 3;
- layoutViewCard1.Padding = new DevExpress.XtraLayout.Utils.Padding(4, 4, 4, 4);
- layoutViewCard1.Text = "TemplateCard";
- //
- // layoutViewField_colCount
- //
- layoutViewField_colCount.ContentHorzAlignment = DevExpress.Utils.HorzAlignment.Center;
- layoutViewField_colCount.ContentVertAlignment = DevExpress.Utils.VertAlignment.Center;
- layoutViewField_colCount.EditorPreferredWidth = 151;
- layoutViewField_colCount.Location = new Point(133, 36);
- layoutViewField_colCount.Name = "layoutViewField_colCount";
- layoutViewField_colCount.Padding = new DevExpress.XtraLayout.Utils.Padding(4, 4, 4, 4);
- layoutViewField_colCount.Size = new Size(159, 65);
- layoutViewField_colCount.TextSize = new Size(0, 0);
- layoutViewField_colCount.TextVisible = false;
- //
- // layoutViewField_colPicture
- //
- layoutViewField_colPicture.EditorPreferredWidth = 125;
- layoutViewField_colPicture.Location = new Point(0, 0);
- layoutViewField_colPicture.Name = "layoutViewField_colPicture";
- layoutViewField_colPicture.Padding = new DevExpress.XtraLayout.Utils.Padding(4, 4, 4, 4);
- layoutViewField_colPicture.Size = new Size(133, 101);
- layoutViewField_colPicture.StartNewLine = true;
- layoutViewField_colPicture.TextSize = new Size(0, 0);
- layoutViewField_colPicture.TextVisible = false;
- //
- // layoutViewField_colName
- //
- layoutViewField_colName.ContentHorzAlignment = DevExpress.Utils.HorzAlignment.Center;
- layoutViewField_colName.ContentVertAlignment = DevExpress.Utils.VertAlignment.Center;
- layoutViewField_colName.EditorPreferredWidth = 151;
- layoutViewField_colName.Location = new Point(133, 0);
- layoutViewField_colName.Name = "layoutViewField_colName";
- layoutViewField_colName.Padding = new DevExpress.XtraLayout.Utils.Padding(4, 4, 4, 4);
- layoutViewField_colName.Size = new Size(159, 36);
- layoutViewField_colName.TextSize = new Size(0, 0);
- layoutViewField_colName.TextVisible = false;
- //
// HomeXhsProjectPage
//
Appearance.BackColor = SystemColors.Control;
Appearance.Options.UseBackColor = true;
- AutoScaleDimensions = new SizeF(10F, 22F);
+ AutoScaleDimensions = new SizeF(7F, 14F);
AutoScaleMode = AutoScaleMode.Font;
Controls.Add(sidePanelBottom);
Controls.Add(sidePanel1);
- Margin = new Padding(6, 8, 6, 8);
+ Margin = new Padding(4, 5, 4, 5);
Name = "HomeXhsProjectPage";
- Size = new Size(1519, 1064);
+ Size = new Size(1063, 677);
((ISupportInitialize)svgImg32).EndInit();
sidePanel1.ResumeLayout(false);
((ISupportInitialize)gridControl1).EndInit();
((ISupportInitialize)layoutView1).EndInit();
+ ((ISupportInitialize)layoutViewField_colName).EndInit();
+ ((ISupportInitialize)layoutViewField_colCount).EndInit();
((ISupportInitialize)repPicEdit).EndInit();
+ ((ISupportInitialize)layoutViewField_colPicture).EndInit();
+ ((ISupportInitialize)layoutViewCard1).EndInit();
((ISupportInitialize)gridView1).EndInit();
sidePanelBottom.ResumeLayout(false);
dockPanelFill.ResumeLayout(false);
@@ -368,10 +382,6 @@
dockPanelLeft.ResumeLayout(false);
dockPanel1_Container.ResumeLayout(false);
((ISupportInitialize)dockManager1).EndInit();
- ((ISupportInitialize)layoutViewCard1).EndInit();
- ((ISupportInitialize)layoutViewField_colCount).EndInit();
- ((ISupportInitialize)layoutViewField_colPicture).EndInit();
- ((ISupportInitialize)layoutViewField_colName).EndInit();
ResumeLayout(false);
}
--
Gitblit v1.9.3