From cec8d92bdca1da0b2eafe6eb3130f4bf6f03028b Mon Sep 17 00:00:00 2001
From: duheng <2286773002@qq.com>
Date: 星期三, 12 三月 2025 10:21:09 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/03-factor/AssetsPipeFactorMgrPage.Designer.cs | 99 ++++++++++++++++++++++++++++++++-----------------
1 files changed, 64 insertions(+), 35 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/03-factor/AssetsPipeFactorMgrPage.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/03-factor/AssetsPipeFactorMgrPage.Designer.cs
index e8797fd..0bce4b8 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/03-factor/AssetsPipeFactorMgrPage.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/03-factor/AssetsPipeFactorMgrPage.Designer.cs
@@ -51,6 +51,7 @@
ribPageGroupForMore = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
panelControl1 = new DevExpress.XtraEditors.PanelControl();
gridControl1 = new DevExpress.XtraGrid.GridControl();
+ assetsPipeFactorMgrViewModelBindingSource = new BindingSource(components);
gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
colID = new DevExpress.XtraGrid.Columns.GridColumn();
colName = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -59,33 +60,37 @@
colDescription = new DevExpress.XtraGrid.Columns.GridColumn();
colDetail = new DevExpress.XtraGrid.Columns.GridColumn();
repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ colMaterial = new DevExpress.XtraGrid.Columns.GridColumn();
+ colCaliber = new DevExpress.XtraGrid.Columns.GridColumn();
behaviorManager1 = new DevExpress.Utils.Behaviors.BehaviorManager(components);
dragDropEvents1 = new DevExpress.Utils.DragDrop.DragDropEvents(components);
- assetsPipeFactorMgrViewModelBindingSource = new BindingSource(components);
((ISupportInitialize)ribbonControl1).BeginInit();
((ISupportInitialize)panelControl1).BeginInit();
panelControl1.SuspendLayout();
((ISupportInitialize)gridControl1).BeginInit();
+ ((ISupportInitialize)assetsPipeFactorMgrViewModelBindingSource).BeginInit();
((ISupportInitialize)gridView1).BeginInit();
((ISupportInitialize)repositoryItemButtonEdit1).BeginInit();
((ISupportInitialize)behaviorManager1).BeginInit();
- ((ISupportInitialize)assetsPipeFactorMgrViewModelBindingSource).BeginInit();
SuspendLayout();
//
// ribbonControl1
//
+ ribbonControl1.EmptyAreaImageOptions.ImagePadding = new Padding(34, 39, 34, 39);
ribbonControl1.ExpandCollapseItem.Id = 0;
ribbonControl1.ItemPanelStyle = DevExpress.XtraBars.Ribbon.RibbonItemPanelStyle.Classic;
ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnAdd, barBtnEdit, barBtnDelete, barBtnInfo, barBtnSearch, barBtnRefresh, barBtnUp, barBtnDown, barCkDrag });
ribbonControl1.Location = new Point(1, 1);
+ ribbonControl1.Margin = new Padding(3, 4, 3, 4);
ribbonControl1.MaxItemId = 18;
ribbonControl1.Name = "ribbonControl1";
+ ribbonControl1.OptionsMenuMinWidth = 377;
ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage1 });
ribbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.False;
ribbonControl1.ShowExpandCollapseButton = DevExpress.Utils.DefaultBoolean.False;
ribbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.ShowOnMultiplePages;
ribbonControl1.ShowToolbarCustomizeItem = false;
- ribbonControl1.Size = new Size(996, 128);
+ ribbonControl1.Size = new Size(1139, 157);
ribbonControl1.Toolbar.ShowCustomizeItem = false;
ribbonControl1.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden;
//
@@ -198,88 +203,95 @@
panelControl1.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
panelControl1.Controls.Add(gridControl1);
panelControl1.Dock = DockStyle.Fill;
- panelControl1.Location = new Point(1, 129);
+ panelControl1.Location = new Point(1, 158);
+ panelControl1.Margin = new Padding(3, 4, 3, 4);
panelControl1.Name = "panelControl1";
panelControl1.Padding = new Padding(0, 1, 0, 0);
- panelControl1.Size = new Size(996, 540);
+ panelControl1.Size = new Size(1139, 702);
panelControl1.TabIndex = 3;
//
// gridControl1
//
gridControl1.DataSource = assetsPipeFactorMgrViewModelBindingSource;
gridControl1.Dock = DockStyle.Fill;
+ gridControl1.EmbeddedNavigator.Margin = new Padding(3, 4, 3, 4);
gridControl1.Location = new Point(0, 1);
gridControl1.MainView = gridView1;
+ gridControl1.Margin = new Padding(3, 4, 3, 4);
gridControl1.MenuManager = ribbonControl1;
gridControl1.Name = "gridControl1";
gridControl1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { repositoryItemButtonEdit1 });
- gridControl1.Size = new Size(996, 539);
+ gridControl1.Size = new Size(1139, 701);
gridControl1.TabIndex = 0;
gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView1 });
+ //
+ // assetsPipeFactorMgrViewModelBindingSource
+ //
+ assetsPipeFactorMgrViewModelBindingSource.DataSource = typeof(AssetsPipeFactorMgrViewModel);
//
// gridView1
//
behaviorManager1.SetBehaviors(gridView1, new DevExpress.Utils.Behaviors.Behavior[] { DevExpress.Utils.DragDrop.DragDropBehavior.Create(typeof(DevExpress.XtraGrid.Extensions.ColumnViewDragDropSource), true, true, true, true, dragDropEvents1) });
- gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colID, colName, colMinorLoss, colSortCode, colDescription, colDetail });
+ gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colID, colName, colMinorLoss, colSortCode, colDescription, colDetail, colMaterial, colCaliber });
+ gridView1.DetailHeight = 450;
gridView1.GridControl = gridControl1;
gridView1.Name = "gridView1";
+ gridView1.OptionsEditForm.PopupEditFormWidth = 914;
gridView1.RowCellClick += gridView1_RowCellClick;
//
// colID
//
colID.FieldName = "ID";
- colID.MaxWidth = 100;
- colID.MinWidth = 150;
+ colID.MaxWidth = 114;
+ colID.MinWidth = 171;
colID.Name = "colID";
- colID.Width = 100;
+ colID.Width = 114;
//
// colName
//
colName.FieldName = "Name";
- colName.MaxWidth = 100;
- colName.MinWidth = 250;
+ colName.MaxWidth = 114;
+ colName.MinWidth = 286;
colName.Name = "colName";
colName.Visible = true;
colName.VisibleIndex = 0;
- colName.Width = 250;
+ colName.Width = 286;
//
// colMinorLoss
//
colMinorLoss.FieldName = "MinorLoss";
- colMinorLoss.MaxWidth = 100;
- colMinorLoss.MinWidth = 100;
+ colMinorLoss.MaxWidth = 114;
+ colMinorLoss.MinWidth = 114;
colMinorLoss.Name = "colMinorLoss";
colMinorLoss.Visible = true;
- colMinorLoss.VisibleIndex = 1;
- colMinorLoss.Width = 100;
+ colMinorLoss.VisibleIndex = 3;
+ colMinorLoss.Width = 114;
//
// colSortCode
//
colSortCode.FieldName = "SortCode";
- colSortCode.MaxWidth = 100;
- colSortCode.MinWidth = 100;
+ colSortCode.MaxWidth = 114;
+ colSortCode.MinWidth = 114;
colSortCode.Name = "colSortCode";
- colSortCode.Width = 100;
+ colSortCode.Width = 114;
//
// colDescription
//
colDescription.FieldName = "Description";
- colDescription.MinWidth = 100;
+ colDescription.MinWidth = 114;
colDescription.Name = "colDescription";
colDescription.Visible = true;
- colDescription.VisibleIndex = 2;
- colDescription.Width = 100;
+ colDescription.VisibleIndex = 4;
+ colDescription.Width = 114;
//
// colDetail
//
colDetail.Caption = "璇︾粏淇℃伅";
colDetail.ColumnEdit = repositoryItemButtonEdit1;
- colDetail.MaxWidth = 60;
- colDetail.MinWidth = 60;
+ colDetail.MaxWidth = 69;
+ colDetail.MinWidth = 69;
colDetail.Name = "colDetail";
- colDetail.Visible = true;
- colDetail.VisibleIndex = 3;
- colDetail.Width = 60;
+ colDetail.Width = 69;
//
// repositoryItemButtonEdit1
//
@@ -290,33 +302,48 @@
repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
//
+ // colMaterial
+ //
+ colMaterial.FieldName = "Material";
+ colMaterial.MinWidth = 23;
+ colMaterial.Name = "colMaterial";
+ colMaterial.Visible = true;
+ colMaterial.VisibleIndex = 2;
+ colMaterial.Width = 86;
+ //
+ // colCaliber
+ //
+ colCaliber.FieldName = "Caliber";
+ colCaliber.MinWidth = 23;
+ colCaliber.Name = "colCaliber";
+ colCaliber.Visible = true;
+ colCaliber.VisibleIndex = 1;
+ colCaliber.Width = 86;
+ //
// dragDropEvents1
//
dragDropEvents1.DragDrop += dragDropEvents1_DragDrop;
- //
- // assetsPipeFactorMgrViewModelBindingSource
- //
- assetsPipeFactorMgrViewModelBindingSource.DataSource = typeof(AssetsPipeFactorMgrViewModel);
//
// AssetsPipeFactorMgrPage
//
Appearance.BackColor = SystemColors.Control;
Appearance.Options.UseBackColor = true;
- AutoScaleDimensions = new SizeF(7F, 14F);
+ AutoScaleDimensions = new SizeF(8F, 18F);
AutoScaleMode = AutoScaleMode.Font;
Controls.Add(panelControl1);
Controls.Add(ribbonControl1);
+ Margin = new Padding(3, 5, 3, 5);
Name = "AssetsPipeFactorMgrPage";
Padding = new Padding(1);
- Size = new Size(998, 670);
+ Size = new Size(1141, 861);
((ISupportInitialize)ribbonControl1).EndInit();
((ISupportInitialize)panelControl1).EndInit();
panelControl1.ResumeLayout(false);
((ISupportInitialize)gridControl1).EndInit();
+ ((ISupportInitialize)assetsPipeFactorMgrViewModelBindingSource).EndInit();
((ISupportInitialize)gridView1).EndInit();
((ISupportInitialize)repositoryItemButtonEdit1).EndInit();
((ISupportInitialize)behaviorManager1).EndInit();
- ((ISupportInitialize)assetsPipeFactorMgrViewModelBindingSource).EndInit();
ResumeLayout(false);
PerformLayout();
}
@@ -350,5 +377,7 @@
private DevExpress.Utils.DragDrop.DragDropEvents dragDropEvents1;
private DevExpress.XtraGrid.Columns.GridColumn colMinorLoss;
private BindingSource assetsPipeFactorMgrViewModelBindingSource;
+ private DevExpress.XtraGrid.Columns.GridColumn colMaterial;
+ private DevExpress.XtraGrid.Columns.GridColumn colCaliber;
}
}
--
Gitblit v1.9.3