From 185565a8eb30c0546746aad52aac0926d395a76d Mon Sep 17 00:00:00 2001
From: qin <a@163.com>
Date: 星期五, 14 三月 2025 11:01:41 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/PBS.WinFrmUI.WE/WaterWE/EditWaterUtensilDlg.designer.cs | 90 +++++++++++++++++++++++++++-----------------
1 files changed, 55 insertions(+), 35 deletions(-)
diff --git a/WinFrmUI/PBS.WinFrmUI.WE/WaterWE/EditWaterUtensilDlg.designer.cs b/WinFrmUI/PBS.WinFrmUI.WE/WaterWE/EditWaterUtensilDlg.designer.cs
index 2c7e27f..ad7ab18 100644
--- a/WinFrmUI/PBS.WinFrmUI.WE/WaterWE/EditWaterUtensilDlg.designer.cs
+++ b/WinFrmUI/PBS.WinFrmUI.WE/WaterWE/EditWaterUtensilDlg.designer.cs
@@ -35,12 +35,12 @@
private void InitializeComponent()
{
components = new Container();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
ComponentResourceManager resources = new ComponentResourceManager(typeof(EditWaterWEDlg));
- SerializableAppearanceObject serializableAppearanceObject1 = new SerializableAppearanceObject();
- SerializableAppearanceObject serializableAppearanceObject2 = new SerializableAppearanceObject();
- SerializableAppearanceObject serializableAppearanceObject3 = new SerializableAppearanceObject();
- SerializableAppearanceObject serializableAppearanceObject4 = new SerializableAppearanceObject();
+ SerializableAppearanceObject serializableAppearanceObject5 = new SerializableAppearanceObject();
+ SerializableAppearanceObject serializableAppearanceObject6 = new SerializableAppearanceObject();
+ SerializableAppearanceObject serializableAppearanceObject7 = new SerializableAppearanceObject();
+ SerializableAppearanceObject serializableAppearanceObject8 = new SerializableAppearanceObject();
dataLayoutControl1 = new DevExpress.XtraDataLayout.DataLayoutControl();
gridControl1 = new DevExpress.XtraGrid.GridControl();
itemViewModelBindingSource = new BindingSource(components);
@@ -92,21 +92,24 @@
dataLayoutControl1.Controls.Add(textEditName);
dataLayoutControl1.Dock = DockStyle.Fill;
dataLayoutControl1.Location = new Point(0, 0);
+ dataLayoutControl1.Margin = new Padding(3, 4, 3, 4);
dataLayoutControl1.Name = "dataLayoutControl1";
dataLayoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(900, 230, 650, 400);
dataLayoutControl1.Root = Root;
- dataLayoutControl1.Size = new Size(672, 392);
+ dataLayoutControl1.Size = new Size(768, 504);
dataLayoutControl1.TabIndex = 0;
dataLayoutControl1.Text = "dataLayoutControl1";
//
// gridControl1
//
gridControl1.DataSource = itemViewModelBindingSource;
- gridControl1.Location = new Point(12, 36);
+ gridControl1.EmbeddedNavigator.Margin = new Padding(3, 5, 3, 5);
+ gridControl1.Location = new Point(13, 46);
gridControl1.MainView = gridView1;
+ gridControl1.Margin = new Padding(3, 4, 3, 4);
gridControl1.Name = "gridControl1";
gridControl1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { repositoryItemTreeListLookUpEdit1, repositoryItemButtonEdit1 });
- gridControl1.Size = new Size(648, 318);
+ gridControl1.Size = new Size(742, 409);
gridControl1.TabIndex = 6;
gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView1 });
//
@@ -119,6 +122,7 @@
gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
gridView1.Appearance.HeaderPanel.TextOptions.HAlignment = HorzAlignment.Center;
gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { gridColumn2, gridColumn1, colPumpID, colUserCount, ColDelete });
+ gridView1.DetailHeight = 450;
gridView1.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
gridView1.GridControl = gridControl1;
gridView1.Name = "gridView1";
@@ -126,6 +130,7 @@
gridView1.OptionsCustomization.AllowFilter = false;
gridView1.OptionsCustomization.AllowQuickHideColumns = false;
gridView1.OptionsCustomization.AllowSort = false;
+ gridView1.OptionsEditForm.PopupEditFormWidth = 914;
gridView1.OptionsMenu.EnableColumnMenu = false;
gridView1.OptionsMenu.EnableFooterMenu = false;
gridView1.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
@@ -136,19 +141,21 @@
//
gridColumn2.Caption = "鏈�灏忛瀹氭祦閲�";
gridColumn2.FieldName = "MinRatedFlow";
+ gridColumn2.MinWidth = 23;
gridColumn2.Name = "gridColumn2";
gridColumn2.Visible = true;
gridColumn2.VisibleIndex = 2;
- gridColumn2.Width = 164;
+ gridColumn2.Width = 187;
//
// gridColumn1
//
gridColumn1.Caption = "棰濆畾娴侀噺";
gridColumn1.FieldName = "RatedFlow";
+ gridColumn1.MinWidth = 23;
gridColumn1.Name = "gridColumn1";
gridColumn1.Visible = true;
gridColumn1.VisibleIndex = 1;
- gridColumn1.Width = 139;
+ gridColumn1.Width = 159;
//
// colPumpID
//
@@ -157,10 +164,11 @@
colPumpID.Caption = "鐢ㄦ按鍣ㄥ叿";
colPumpID.ColumnEdit = repositoryItemTreeListLookUpEdit1;
colPumpID.FieldName = "UtensilID";
+ colPumpID.MinWidth = 23;
colPumpID.Name = "colPumpID";
colPumpID.Visible = true;
colPumpID.VisibleIndex = 0;
- colPumpID.Width = 305;
+ colPumpID.Width = 349;
//
// repositoryItemTreeListLookUpEdit1
//
@@ -172,23 +180,28 @@
repositoryItemTreeListLookUpEdit1.NullText = "";
repositoryItemTreeListLookUpEdit1.TreeList = treeList1;
repositoryItemTreeListLookUpEdit1.ValueMember = "ID";
+ repositoryItemTreeListLookUpEdit1.EditValueChanged += repositoryItemTreeListLookUpEdit1_EditValueChanged;
//
// treeList1
//
treeList1.Columns.AddRange(new DevExpress.XtraTreeList.Columns.TreeListColumn[] { treeListColumn1 });
treeList1.Location = new Point(-111, -28);
+ treeList1.MinWidth = 23;
treeList1.Name = "treeList1";
treeList1.OptionsView.ShowIndentAsRowStyle = true;
treeList1.Size = new Size(400, 200);
treeList1.TabIndex = 0;
+ treeList1.TreeLevelWidth = 21;
//
// treeListColumn1
//
treeListColumn1.Caption = "鐢ㄦ按鍣ㄥ叿";
treeListColumn1.FieldName = "Name";
+ treeListColumn1.MinWidth = 23;
treeListColumn1.Name = "treeListColumn1";
treeListColumn1.Visible = true;
treeListColumn1.VisibleIndex = 0;
+ treeListColumn1.Width = 86;
//
// colUserCount
//
@@ -196,10 +209,11 @@
colUserCount.AppearanceCell.TextOptions.HAlignment = HorzAlignment.Center;
colUserCount.Caption = "浣跨敤鏁伴噺";
colUserCount.FieldName = "UtensilCount";
+ colUserCount.MinWidth = 23;
colUserCount.Name = "colUserCount";
colUserCount.Visible = true;
colUserCount.VisibleIndex = 3;
- colUserCount.Width = 123;
+ colUserCount.Width = 141;
//
// ColDelete
//
@@ -207,17 +221,19 @@
ColDelete.AppearanceCell.TextOptions.HAlignment = HorzAlignment.Center;
ColDelete.Caption = "鍒犻櫎";
ColDelete.ColumnEdit = repositoryItemButtonEdit1;
+ ColDelete.MinWidth = 23;
ColDelete.Name = "ColDelete";
ColDelete.OptionsColumn.AllowEdit = false;
ColDelete.Visible = true;
ColDelete.VisibleIndex = 4;
- ColDelete.Width = 126;
+ ColDelete.Width = 144;
//
// repositoryItemButtonEdit1
//
repositoryItemButtonEdit1.AutoHeight = false;
- 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 KeyShortcut(Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, ToolTipAnchor.Default) });
+ editorButtonImageOptions2.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("editorButtonImageOptions2.SvgImage");
+ editorButtonImageOptions2.SvgImageSize = new Size(25, 25);
+ repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions2, new KeyShortcut(Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, ToolTipAnchor.Default) });
repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
//
@@ -225,9 +241,10 @@
//
btnOk.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
btnOk.Appearance.Options.UseBackColor = true;
- btnOk.Location = new Point(483, 358);
+ btnOk.Location = new Point(552, 461);
+ btnOk.Margin = new Padding(3, 4, 3, 4);
btnOk.Name = "btnOk";
- btnOk.Size = new Size(91, 22);
+ btnOk.Size = new Size(105, 27);
btnOk.StyleController = dataLayoutControl1;
btnOk.TabIndex = 7;
btnOk.Text = "纭畾";
@@ -238,18 +255,20 @@
btnCancel.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
btnCancel.Appearance.Options.UseBackColor = true;
btnCancel.DialogResult = DialogResult.Cancel;
- btnCancel.Location = new Point(578, 358);
+ btnCancel.Location = new Point(661, 461);
+ btnCancel.Margin = new Padding(3, 4, 3, 4);
btnCancel.Name = "btnCancel";
- btnCancel.Size = new Size(82, 22);
+ btnCancel.Size = new Size(94, 27);
btnCancel.StyleController = dataLayoutControl1;
btnCancel.TabIndex = 8;
btnCancel.Text = "鍙栨秷";
//
// textEditName
//
- textEditName.Location = new Point(83, 12);
+ textEditName.Location = new Point(100, 16);
+ textEditName.Margin = new Padding(3, 4, 3, 4);
textEditName.Name = "textEditName";
- textEditName.Size = new Size(577, 20);
+ textEditName.Size = new Size(655, 24);
textEditName.StyleController = dataLayoutControl1;
textEditName.TabIndex = 10;
//
@@ -261,7 +280,7 @@
Root.GroupBordersVisible = false;
Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlGroup1 });
Root.Name = "Root";
- Root.Size = new Size(672, 392);
+ Root.Size = new Size(768, 504);
Root.TextVisible = false;
//
// layoutControlGroup1
@@ -271,32 +290,32 @@
layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem2, emptySpaceItem1, layoutControlItem4, layoutControlItem3 });
layoutControlGroup1.Location = new Point(0, 0);
layoutControlGroup1.Name = "autoGeneratedGroup0";
- layoutControlGroup1.Size = new Size(652, 372);
+ layoutControlGroup1.Size = new Size(746, 478);
//
// layoutControlItem1
//
layoutControlItem1.Control = btnCancel;
- layoutControlItem1.Location = new Point(566, 346);
+ layoutControlItem1.Location = new Point(648, 445);
layoutControlItem1.Name = "layoutControlItem1";
- layoutControlItem1.Size = new Size(86, 26);
+ layoutControlItem1.Size = new Size(98, 33);
layoutControlItem1.TextSize = new Size(0, 0);
layoutControlItem1.TextVisible = false;
//
// layoutControlItem2
//
layoutControlItem2.Control = btnOk;
- layoutControlItem2.Location = new Point(471, 346);
+ layoutControlItem2.Location = new Point(539, 445);
layoutControlItem2.Name = "layoutControlItem2";
- layoutControlItem2.Size = new Size(95, 26);
+ layoutControlItem2.Size = new Size(109, 33);
layoutControlItem2.TextSize = new Size(0, 0);
layoutControlItem2.TextVisible = false;
//
// emptySpaceItem1
//
emptySpaceItem1.AllowHotTrack = false;
- emptySpaceItem1.Location = new Point(0, 346);
+ emptySpaceItem1.Location = new Point(0, 445);
emptySpaceItem1.Name = "emptySpaceItem1";
- emptySpaceItem1.Size = new Size(471, 26);
+ emptySpaceItem1.Size = new Size(539, 33);
emptySpaceItem1.TextSize = new Size(0, 0);
//
// layoutControlItem4
@@ -305,16 +324,16 @@
layoutControlItem4.Control = textEditName;
layoutControlItem4.Location = new Point(0, 0);
layoutControlItem4.Name = "layoutControlItem4";
- layoutControlItem4.Size = new Size(652, 24);
+ layoutControlItem4.Size = new Size(746, 30);
layoutControlItem4.Text = "<color=red>*</color>鍣ㄥ叿鍚嶇О:";
- layoutControlItem4.TextSize = new Size(59, 14);
+ layoutControlItem4.TextSize = new Size(73, 18);
//
// layoutControlItem3
//
layoutControlItem3.Control = gridControl1;
- layoutControlItem3.Location = new Point(0, 24);
+ layoutControlItem3.Location = new Point(0, 30);
layoutControlItem3.Name = "layoutControlItem3";
- layoutControlItem3.Size = new Size(652, 322);
+ layoutControlItem3.Size = new Size(746, 415);
layoutControlItem3.TextSize = new Size(0, 0);
layoutControlItem3.TextVisible = false;
//
@@ -324,10 +343,11 @@
//
// EditWaterWEDlg
//
- AutoScaleDimensions = new SizeF(7F, 14F);
+ AutoScaleDimensions = new SizeF(8F, 18F);
AutoScaleMode = AutoScaleMode.Font;
- ClientSize = new Size(672, 392);
+ ClientSize = new Size(768, 504);
Controls.Add(dataLayoutControl1);
+ Margin = new Padding(3, 4, 3, 4);
Name = "EditWaterWEDlg";
StartPosition = FormStartPosition.CenterParent;
Text = "缂栬緫";
--
Gitblit v1.9.3