From e890e224a673855f9f609de1094d1701e224e66c Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期四, 24 十月 2024 16:19:00 +0800
Subject: [PATCH] 修改阀门管理界面
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/AddPipeMainDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/10-exchanger/02-main/AddAssetsExchangerMainDlg.Designer.cs | 2
Dto/HStation.Dto.Assets.Core/01-ValveManage/03-ValveMain/AddValveMainInput.cs | 9
WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/ElbowViewModel.cs | 4
WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/ValveManageMainPage.resx | 20 +
WinFrmUI/HStation.WinFrmUI.Assets.Core/08-Nozzle/02-main/AddNozzleMainDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/02-main/EditFourLinkMainDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/01-viewmodel/ValveMatchingViewModel.cs | 2
Vmo/HStation.Vmo.Assets.Core/02-ValveManage/ValveMainVmo.cs | 11
WinFrmUI/HStation.WinFrmUI.Assets.Core/08-Nozzle/02-main/EditNozzleMainDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/EditPipeMainDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/10-exchanger/02-main/EditExchangerMainDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/AddElbowMainDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/02-main/AddValveMainDlg.Designer.cs | 72 ++++--
Service/HStation.Service.Assets.Core/00-core/eValveSeriesType.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/ThreeLinkManageMainPage.Designer.cs | 168 ++++++--------
Service/HStation.Service.Assets.Core/05-service/03-Valve/02-ValveMain/ValveMain.cs | 21 +
Service/HStation.Service.Assets.Core/01-entity/08-Valve/ValveMain.cs | 6
WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/00-viewmodel/ValveMainViewModel.cs | 24 +
WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/AddThreeLinkMainDlg.Designer.cs | 2
BLL/HStation.BLL.Assets.Core/01-interface/03-IValveManage/IValveMain.cs | 6
Service/HStation.Service.Assets.Core/02-model/08-ValveManage/ValveMain.cs | 11
WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/ValveManageMainPage.cs | 24 ++
WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/02-main/AddValveMainDlg.cs | 5
WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/02-main/EditValveMainDlg.Designer.cs | 64 ++++-
WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/02-main/AddFourLinkMainDlg.Designer.cs | 2
BLL/HStation.BLL.Assets.Core/04-bll/02-ValveMange/02-ValveMain/ValveMain.cs | 9
WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/02-main/EditValveMainDlg.cs | 8
WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/EditThreeLinkMainDlg.Designer.cs | 2
Dto/HStation.Dto.Assets.Core/01-ValveManage/03-ValveMain/UpdateValveMainInput.cs | 9
WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/ValveManageMainPage.Designer.cs | 101 +++++---
BLL/HStation.BLL.Assets.Core/03-localclient/03-ValveManage/ValveMain.cs | 17 +
WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/EditElbowMainDlg.Designer.cs | 2
Dto/HStation.Dto.Assets.Core/01-ValveManage/03-ValveMain/ValveMainDto.cs | 10
34 files changed, 418 insertions(+), 209 deletions(-)
diff --git a/BLL/HStation.BLL.Assets.Core/01-interface/03-IValveManage/IValveMain.cs b/BLL/HStation.BLL.Assets.Core/01-interface/03-IValveManage/IValveMain.cs
index 351acce..5a54daf 100644
--- a/BLL/HStation.BLL.Assets.Core/01-interface/03-IValveManage/IValveMain.cs
+++ b/BLL/HStation.BLL.Assets.Core/01-interface/03-IValveManage/IValveMain.cs
@@ -11,5 +11,11 @@
/// 閫氳繃 绯诲垪ID 鑾峰彇
/// </summary>
public Task<List<AssetsValveMainDto>> GetBySeriesID(long ID);
+
+ /// <summary>
+ /// 鏇存柊榛樿鍊肩姸鎬�
+ /// </summary>
+ /// <returns></returns>
+ public Task<bool> UpdateDefaultStatus(long ID, bool status);
}
}
\ No newline at end of file
diff --git a/BLL/HStation.BLL.Assets.Core/03-localclient/03-ValveManage/ValveMain.cs b/BLL/HStation.BLL.Assets.Core/03-localclient/03-ValveManage/ValveMain.cs
index 29513fb..7b66b52 100644
--- a/BLL/HStation.BLL.Assets.Core/03-localclient/03-ValveManage/ValveMain.cs
+++ b/BLL/HStation.BLL.Assets.Core/03-localclient/03-ValveManage/ValveMain.cs
@@ -109,6 +109,23 @@
});
}
+ /// <summary>
+ /// 鏇存柊榛樿鍊肩姸鎬�
+ /// </summary>
+ public async Task<bool> UpdateDefaultStatus(long ID, bool status)
+ {
+ return await Task.Factory.StartNew(() =>
+ {
+ var model = _service.GetByID(ID);
+ if (model == null)
+ {
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"ID:{ID} 鏁版嵁涓嶅瓨鍦�");
+ }
+ var bol = _service.UpdateDefaultStatus(ID, status);
+ return bol;
+ });
+ }
+
#endregion Insert
#region Update
diff --git a/BLL/HStation.BLL.Assets.Core/04-bll/02-ValveMange/02-ValveMain/ValveMain.cs b/BLL/HStation.BLL.Assets.Core/04-bll/02-ValveMange/02-ValveMain/ValveMain.cs
index 7a0fcc9..fbe7431 100644
--- a/BLL/HStation.BLL.Assets.Core/04-bll/02-ValveMange/02-ValveMain/ValveMain.cs
+++ b/BLL/HStation.BLL.Assets.Core/04-bll/02-ValveMange/02-ValveMain/ValveMain.cs
@@ -156,6 +156,15 @@
return await _cal.UpdateSorter(Sorters);
}
+ /// <summary>
+ /// 鏇存柊榛樿鍊肩姸鎬�
+ /// </summary>
+ public virtual async Task<bool> UpdateDefaultStatus(long Id, bool Status)
+ {
+ var bol = await _cal.UpdateDefaultStatus(Id, Status);
+ return bol;
+ }
+
#endregion Update
#region Delete
diff --git a/Dto/HStation.Dto.Assets.Core/01-ValveManage/03-ValveMain/AddValveMainInput.cs b/Dto/HStation.Dto.Assets.Core/01-ValveManage/03-ValveMain/AddValveMainInput.cs
index d9d6f4d..a08d5f9 100644
--- a/Dto/HStation.Dto.Assets.Core/01-ValveManage/03-ValveMain/AddValveMainInput.cs
+++ b/Dto/HStation.Dto.Assets.Core/01-ValveManage/03-ValveMain/AddValveMainInput.cs
@@ -15,9 +15,9 @@
public double? Caliber { get; set; }
/// <summary>
- /// 闃�闂ㄧ姸鎬�
+ /// 闃�闂ㄥ紑搴�
/// </summary>
- public int ValveLift { get; set; }
+ public int? ValveLift { get; set; }
/// <summary>
/// 鍚嶇О
@@ -25,6 +25,11 @@
public string Name { get; set; }
/// <summary>
+ /// 闃�闂ㄨ缃�
+ /// </summary>
+ public string ValveSetting { get; set; }
+
+ /// <summary>
/// 璇嗗埆鍏抽敭瀛�
/// </summary>
public string KeyWord { get; set; }
diff --git a/Dto/HStation.Dto.Assets.Core/01-ValveManage/03-ValveMain/UpdateValveMainInput.cs b/Dto/HStation.Dto.Assets.Core/01-ValveManage/03-ValveMain/UpdateValveMainInput.cs
index 8f837a9..3f924ca 100644
--- a/Dto/HStation.Dto.Assets.Core/01-ValveManage/03-ValveMain/UpdateValveMainInput.cs
+++ b/Dto/HStation.Dto.Assets.Core/01-ValveManage/03-ValveMain/UpdateValveMainInput.cs
@@ -27,14 +27,19 @@
public string Name { get; set; }
/// <summary>
+ /// 闃�闂ㄨ缃�
+ /// </summary>
+ public string ValveSetting { get; set; }
+
+ /// <summary>
/// 鏉愭枡
/// </summary>
public string MaterialName { get; set; }
/// <summary>
- /// 闃�闂ㄧ姸鎬�
+ /// 闃�闂ㄥ紑搴�
/// </summary>
- public int ValveLift { get; set; }
+ public int? ValveLift { get; set; }
/// <summary>
/// 绯绘暟
diff --git a/Dto/HStation.Dto.Assets.Core/01-ValveManage/03-ValveMain/ValveMainDto.cs b/Dto/HStation.Dto.Assets.Core/01-ValveManage/03-ValveMain/ValveMainDto.cs
index c41461b..cc71527 100644
--- a/Dto/HStation.Dto.Assets.Core/01-ValveManage/03-ValveMain/ValveMainDto.cs
+++ b/Dto/HStation.Dto.Assets.Core/01-ValveManage/03-ValveMain/ValveMainDto.cs
@@ -22,6 +22,7 @@
this.IsDefault = rhs.IsDefault;
this.ValveLift = rhs.ValveLift;
this.SortCode = rhs.SortCode;
+ this.ValveSetting = rhs.ValveSetting;
}
/// <summary>
@@ -40,9 +41,9 @@
public double? Caliber { get; set; }
/// <summary>
- /// 闃�闂ㄧ姸鎬�
+ /// 闃�闂ㄥ紑搴�
/// </summary>
- public int ValveLift { get; set; }
+ public int? ValveLift { get; set; }
/// <summary>
/// 鍚嶇О
@@ -60,6 +61,11 @@
public string CreateTime { get; set; }
/// <summary>
+ /// 闃�闂ㄨ缃�
+ /// </summary>
+ public string ValveSetting { get; set; }
+
+ /// <summary>
/// 鏉愭枡
/// </summary>
public string MaterialName { get; set; }
diff --git a/Service/HStation.Service.Assets.Core/00-core/eValveSeriesType.cs b/Service/HStation.Service.Assets.Core/00-core/eValveSeriesType.cs
index 99dfc64..a8df3ca 100644
--- a/Service/HStation.Service.Assets.Core/00-core/eValveSeriesType.cs
+++ b/Service/HStation.Service.Assets.Core/00-core/eValveSeriesType.cs
@@ -39,7 +39,7 @@
/// 甯歌闃�闂�
/// </summary>
[Display(Name = "甯歌闃�闂�")]
- GP锛� = 5,
+ GPV = 5,
/// <summary>
/// 姝㈠洖闃�
diff --git a/Service/HStation.Service.Assets.Core/01-entity/08-Valve/ValveMain.cs b/Service/HStation.Service.Assets.Core/01-entity/08-Valve/ValveMain.cs
index a5f626f..74a20db 100644
--- a/Service/HStation.Service.Assets.Core/01-entity/08-Valve/ValveMain.cs
+++ b/Service/HStation.Service.Assets.Core/01-entity/08-Valve/ValveMain.cs
@@ -27,6 +27,7 @@
this.Coefficient = rhs.Coefficient;
this.SeriesID = rhs.SeriesID;
this.Name = rhs.Name;
+ this.ValveSetting = rhs.ValveSetting;
this.SortCode = rhs.SortCode;
}
@@ -41,6 +42,11 @@
public string Name { get; set; }
/// <summary>
+ /// 闃�闂ㄨ缃�
+ /// </summary>
+ public string ValveSetting { get; set; }
+
+ /// <summary>
/// 鍙ｅ緞
/// </summary>
public double? Caliber { get; set; }
diff --git a/Service/HStation.Service.Assets.Core/02-model/08-ValveManage/ValveMain.cs b/Service/HStation.Service.Assets.Core/02-model/08-ValveManage/ValveMain.cs
index 58c331a..10a0e32 100644
--- a/Service/HStation.Service.Assets.Core/02-model/08-ValveManage/ValveMain.cs
+++ b/Service/HStation.Service.Assets.Core/02-model/08-ValveManage/ValveMain.cs
@@ -31,6 +31,7 @@
this.Name = rhs.Name;
this.ValveLift = rhs.ValveLift;
this.Coefficient = rhs.Coefficient;
+ this.ValveSetting = rhs.ValveSetting;
}
public void Reset(AssetsValveMain rhs)
@@ -46,6 +47,7 @@
this.Coefficient = rhs.Coefficient;
this.ValveLift = rhs.ValveLift;
this.SeriesID = rhs.SeriesID;
+ this.ValveSetting = rhs.ValveSetting;
}
/// <summary>
@@ -64,9 +66,9 @@
public double? Caliber { get; set; }
/// <summary>
- /// 闃�闂ㄧ姸鎬�
+ /// 闃�闂ㄥ紑搴�
/// </summary>
- public int ValveLift { get; set; }
+ public int? ValveLift { get; set; }
/// <summary>
/// 绫诲瀷
@@ -74,6 +76,11 @@
public eAssetsValveSeriesType Type { get; set; }
/// <summary>
+ /// 闃�闂ㄨ缃�
+ /// </summary>
+ public string ValveSetting { get; set; }
+
+ /// <summary>
/// 鏉愭枡
/// </summary>
public string MaterialName { get; set; }
diff --git a/Service/HStation.Service.Assets.Core/05-service/03-Valve/02-ValveMain/ValveMain.cs b/Service/HStation.Service.Assets.Core/05-service/03-Valve/02-ValveMain/ValveMain.cs
index cacff8e..af1f41d 100644
--- a/Service/HStation.Service.Assets.Core/05-service/03-Valve/02-ValveMain/ValveMain.cs
+++ b/Service/HStation.Service.Assets.Core/05-service/03-Valve/02-ValveMain/ValveMain.cs
@@ -268,6 +268,27 @@
return bol;
}
+ /// <summary>
+ /// 鏇存柊榛樿鍊肩姸鎬�
+ /// </summary>
+ public bool UpdateDefaultStatus(long ID, bool Status)
+ {
+ if (ID < 1)
+ {
+ return false;
+ }
+ var model = GetByID(ID);
+ model.IsDefault = Status;
+ var entity = Model2Entity(model);
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsValveMain>();
+ var bol = dal.Update(entity);
+ if (bol)
+ {
+ UpdateCache(model.ID);
+ }
+ return bol;
+ }
+
#endregion Update
#region Delete
diff --git a/Vmo/HStation.Vmo.Assets.Core/02-ValveManage/ValveMainVmo.cs b/Vmo/HStation.Vmo.Assets.Core/02-ValveManage/ValveMainVmo.cs
index cb8bba4..c8a19f4 100644
--- a/Vmo/HStation.Vmo.Assets.Core/02-ValveManage/ValveMainVmo.cs
+++ b/Vmo/HStation.Vmo.Assets.Core/02-ValveManage/ValveMainVmo.cs
@@ -1,6 +1,4 @@
-锘縰sing HStation.Assets;
-
-namespace HStation.Vmo
+锘縩amespace HStation.Vmo
{
public class AssetsValveMainVmo
{
@@ -22,7 +20,7 @@
/// <summary>
/// 闃�闂ㄥ紑搴�
/// </summary>
- public int ValveLift { get; set; }
+ public int? ValveLift { get; set; }
/// <summary>
/// 鍚嶇О
@@ -40,6 +38,11 @@
public double Coefficient { get; set; }
/// <summary>
+ /// 闃�闂ㄨ缃�
+ /// </summary>
+ public string ValveSetting { get; set; }
+
+ /// <summary>
/// 璇嗗埆鍏抽敭瀛�
/// </summary>
public string KeyWord { get; set; }
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/00-viewmodel/ValveMainViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/00-viewmodel/ValveMainViewModel.cs
index 31ba521..eff8cb3 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/00-viewmodel/ValveMainViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/00-viewmodel/ValveMainViewModel.cs
@@ -30,6 +30,8 @@
this.SeriesType = rhs.Type;
this.ValveLift = rhs.ValveLift;
this.SortCode = rhs.SortCode;
+ this.IsDefault = rhs.IsDefault;
+ this.KeyWord = rhs.KeyWord;
}
public void Reset(Vmo.AssetsValveMainVmo rhs)
@@ -59,6 +61,8 @@
this.SeriesType = rhs.Type;
this.SortCode = rhs.SortCode;
this.ValveLift = rhs.ValveLift;
+ this.IsDefault = rhs.IsDefault;
+ this.KeyWord = rhs.KeyWord;
}
[DisplayName("ID")]
@@ -112,7 +116,7 @@
/// </summary>
[DisplayName("闃�闂ㄥ紑搴�")]
[Browsable(true)]
- public int ValveLift { get; set; }
+ public int? ValveLift { get; set; }
/// <summary>
/// 鎺掑簭鐮�
@@ -132,14 +136,28 @@
/// 鍒涘缓浜�
/// </summary>
[DisplayName("鍒涘缓浜�")]
- [Browsable(true)]
+ [Browsable(false)]
public string CreateName { get; set; }
/// <summary>
/// 鍒涘缓鏃堕棿
/// </summary>
[DisplayName("鍒涘缓鏃堕棿")]
- [Browsable(true)]
+ [Browsable(false)]
public string CreateTime { get; set; }
+
+ /// <summary>
+ /// 璇嗗埆鍏抽敭瀛�
+ /// </summary>
+ [DisplayName("鍏抽敭瀛�")]
+ [Browsable(true)]
+ public string KeyWord { get; set; }
+
+ /// <summary>
+ /// 鏄惁榛樿
+ /// </summary>
+ [DisplayName("鏄惁榛樿")]
+ [Browsable(true)]
+ public bool IsDefault { get; set; }
}
}
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/02-main/AddValveMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/02-main/AddValveMainDlg.Designer.cs
index fd1cfcd..3a87031 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/02-main/AddValveMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/02-main/AddValveMainDlg.Designer.cs
@@ -37,6 +37,7 @@
TextEditCaliber = new DevExpress.XtraEditors.ImageComboBoxEdit();
TextEditCoefficient = new DevExpress.XtraEditors.TextEdit();
TextEditMaterial = new DevExpress.XtraEditors.ImageComboBoxEdit();
+ imageComboBoxEditValveType = new DevExpress.XtraEditors.TextEdit();
Root = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
@@ -58,7 +59,8 @@
layoutControlGroup3 = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlGroup4 = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
- imageComboBoxEditValveType = new DevExpress.XtraEditors.TextEdit();
+ TextEditKeyWord = new DevExpress.XtraEditors.TextEdit();
+ layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit();
layoutControl1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)TextEditName.Properties).BeginInit();
@@ -66,6 +68,7 @@
((System.ComponentModel.ISupportInitialize)TextEditCaliber.Properties).BeginInit();
((System.ComponentModel.ISupportInitialize)TextEditCoefficient.Properties).BeginInit();
((System.ComponentModel.ISupportInitialize)TextEditMaterial.Properties).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)imageComboBoxEditValveType.Properties).BeginInit();
((System.ComponentModel.ISupportInitialize)Root).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem4).BeginInit();
((System.ComponentModel.ISupportInitialize)emptySpaceItem1).BeginInit();
@@ -87,7 +90,8 @@
((System.ComponentModel.ISupportInitialize)layoutControlGroup3).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlGroup4).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem27).BeginInit();
- ((System.ComponentModel.ISupportInitialize)imageComboBoxEditValveType.Properties).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)TextEditKeyWord.Properties).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem9).BeginInit();
SuspendLayout();
//
// layoutControl1
@@ -100,6 +104,7 @@
layoutControl1.Controls.Add(TextEditCoefficient);
layoutControl1.Controls.Add(TextEditMaterial);
layoutControl1.Controls.Add(imageComboBoxEditValveType);
+ layoutControl1.Controls.Add(TextEditKeyWord);
layoutControl1.Dock = DockStyle.Fill;
layoutControl1.Location = new Point(0, 0);
layoutControl1.Name = "layoutControl1";
@@ -117,7 +122,7 @@
BtnOk.Name = "BtnOk";
BtnOk.Size = new Size(122, 22);
BtnOk.StyleController = layoutControl1;
- BtnOk.TabIndex = 7;
+ BtnOk.TabIndex = 9;
BtnOk.Text = "瀹屾垚";
BtnOk.Click += BtnOk_ClickAsync;
//
@@ -130,7 +135,7 @@
simpleButton1.Name = "simpleButton1";
simpleButton1.Size = new Size(121, 22);
simpleButton1.StyleController = layoutControl1;
- simpleButton1.TabIndex = 8;
+ simpleButton1.TabIndex = 10;
simpleButton1.Text = "鍙栨秷";
//
// TextEditName
@@ -143,11 +148,11 @@
//
// TextEditDescription
//
- TextEditDescription.Location = new Point(20, 164);
+ TextEditDescription.Location = new Point(20, 188);
TextEditDescription.Name = "TextEditDescription";
- TextEditDescription.Size = new Size(641, 272);
+ TextEditDescription.Size = new Size(641, 248);
TextEditDescription.StyleController = layoutControl1;
- TextEditDescription.TabIndex = 6;
+ TextEditDescription.TabIndex = 8;
//
// TextEditCaliber
//
@@ -156,7 +161,7 @@
TextEditCaliber.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
TextEditCaliber.Size = new Size(594, 20);
TextEditCaliber.StyleController = layoutControl1;
- TextEditCaliber.TabIndex = 3;
+ TextEditCaliber.TabIndex = 2;
//
// TextEditCoefficient
//
@@ -164,7 +169,7 @@
TextEditCoefficient.Name = "TextEditCoefficient";
TextEditCoefficient.Size = new Size(594, 20);
TextEditCoefficient.StyleController = layoutControl1;
- TextEditCoefficient.TabIndex = 2;
+ TextEditCoefficient.TabIndex = 4;
//
// TextEditMaterial
//
@@ -173,7 +178,15 @@
TextEditMaterial.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
TextEditMaterial.Size = new Size(594, 20);
TextEditMaterial.StyleController = layoutControl1;
- TextEditMaterial.TabIndex = 4;
+ TextEditMaterial.TabIndex = 3;
+ //
+ // imageComboBoxEditValveType
+ //
+ imageComboBoxEditValveType.Location = new Point(79, 128);
+ imageComboBoxEditValveType.Name = "imageComboBoxEditValveType";
+ imageComboBoxEditValveType.Size = new Size(594, 20);
+ imageComboBoxEditValveType.StyleController = layoutControl1;
+ imageComboBoxEditValveType.TabIndex = 6;
//
// Root
//
@@ -181,7 +194,7 @@
Root.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
Root.GroupBordersVisible = false;
- Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem4, emptySpaceItem1, layoutControlItem8, tabbedControlGroup1, layoutControlItem1, layoutControlItem7, layoutControlItem3, layoutControlItem2, layoutControlItem6 });
+ Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem4, emptySpaceItem1, layoutControlItem8, tabbedControlGroup1, layoutControlItem1, layoutControlItem7, layoutControlItem3, layoutControlItem2, layoutControlItem6, layoutControlItem9 });
Root.Name = "Root";
Root.Padding = new DevExpress.XtraLayout.Utils.Padding(6, 6, 6, 6);
Root.Size = new Size(681, 482);
@@ -215,10 +228,10 @@
//
// tabbedControlGroup1
//
- tabbedControlGroup1.Location = new Point(0, 120);
+ tabbedControlGroup1.Location = new Point(0, 144);
tabbedControlGroup1.Name = "tabbedControlGroup1";
tabbedControlGroup1.SelectedTabPage = layoutControlGroup1;
- tabbedControlGroup1.Size = new Size(669, 324);
+ tabbedControlGroup1.Size = new Size(669, 300);
tabbedControlGroup1.TabPages.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlGroup1 });
tabbedControlGroup1.Text = "璇存槑";
//
@@ -227,7 +240,7 @@
layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem5 });
layoutControlGroup1.Location = new Point(0, 0);
layoutControlGroup1.Name = "layoutControlGroup1";
- layoutControlGroup1.Size = new Size(645, 276);
+ layoutControlGroup1.Size = new Size(645, 252);
layoutControlGroup1.Text = "璇存槑";
//
// layoutControlItem5
@@ -235,7 +248,7 @@
layoutControlItem5.Control = TextEditDescription;
layoutControlItem5.Location = new Point(0, 0);
layoutControlItem5.Name = "layoutControlItem5";
- layoutControlItem5.Size = new Size(645, 276);
+ layoutControlItem5.Size = new Size(645, 252);
layoutControlItem5.Text = "璇存槑:";
layoutControlItem5.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.CustomSize;
layoutControlItem5.TextSize = new Size(0, 0);
@@ -286,7 +299,7 @@
//
layoutControlItem6.Control = imageComboBoxEditValveType;
layoutControlItem6.CustomizationFormText = "闃�闂�:";
- layoutControlItem6.Location = new Point(0, 96);
+ layoutControlItem6.Location = new Point(0, 120);
layoutControlItem6.Name = "layoutControlItem6";
layoutControlItem6.Size = new Size(669, 24);
layoutControlItem6.Text = "闃�闂ㄥ紑搴�:";
@@ -362,13 +375,22 @@
layoutControlItem27.Text = "璇存槑:";
layoutControlItem27.TextSize = new Size(59, 14);
//
- // imageComboBoxEditValveType
+ // TextEditKeyWord
//
- imageComboBoxEditValveType.Location = new Point(79, 104);
- imageComboBoxEditValveType.Name = "imageComboBoxEditValveType";
- imageComboBoxEditValveType.Size = new Size(594, 20);
- imageComboBoxEditValveType.StyleController = layoutControl1;
- imageComboBoxEditValveType.TabIndex = 3;
+ TextEditKeyWord.Location = new Point(79, 104);
+ TextEditKeyWord.Name = "TextEditKeyWorld";
+ TextEditKeyWord.Size = new Size(594, 20);
+ TextEditKeyWord.StyleController = layoutControl1;
+ TextEditKeyWord.TabIndex = 5;
+ //
+ // layoutControlItem9
+ //
+ layoutControlItem9.Control = TextEditKeyWord;
+ layoutControlItem9.Location = new Point(0, 96);
+ layoutControlItem9.Name = "layoutControlItem9";
+ layoutControlItem9.Size = new Size(669, 24);
+ layoutControlItem9.Text = "鍏抽敭瀛�:";
+ layoutControlItem9.TextSize = new Size(59, 14);
//
// AddAssetsValveMainDlg
//
@@ -386,6 +408,7 @@
((System.ComponentModel.ISupportInitialize)TextEditCaliber.Properties).EndInit();
((System.ComponentModel.ISupportInitialize)TextEditCoefficient.Properties).EndInit();
((System.ComponentModel.ISupportInitialize)TextEditMaterial.Properties).EndInit();
+ ((System.ComponentModel.ISupportInitialize)imageComboBoxEditValveType.Properties).EndInit();
((System.ComponentModel.ISupportInitialize)Root).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem4).EndInit();
((System.ComponentModel.ISupportInitialize)emptySpaceItem1).EndInit();
@@ -407,7 +430,8 @@
((System.ComponentModel.ISupportInitialize)layoutControlGroup3).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlGroup4).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem27).EndInit();
- ((System.ComponentModel.ISupportInitialize)imageComboBoxEditValveType.Properties).EndInit();
+ ((System.ComponentModel.ISupportInitialize)TextEditKeyWord.Properties).EndInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem9).EndInit();
ResumeLayout(false);
}
@@ -447,5 +471,7 @@
private DevExpress.XtraEditors.ImageComboBoxEdit TextEditMaterial;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
private DevExpress.XtraEditors.TextEdit imageComboBoxEditValveType;
+ private DevExpress.XtraEditors.TextEdit TextEditKeyWord;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
}
}
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/02-main/AddValveMainDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/02-main/AddValveMainDlg.cs
index 6762117..9a3cccd 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/02-main/AddValveMainDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/02-main/AddValveMainDlg.cs
@@ -36,7 +36,7 @@
TextEditMaterial.Properties.Items.Add(imageItem);
}
}
- TextEditCaliber.SelectedIndex = 0;
+ TextEditCaliber.SelectedIndex = 0;
TextEditMaterial.SelectedIndex = 0;
}
@@ -92,7 +92,8 @@
{
_AssetsValveMain.ValveLift = valveLift;
}
- if (await this.ReloadDataEvent.Invoke(_AssetsValveMain))
+ _AssetsValveMain.KeyWord = this.TextEditKeyWord.Text.Trim();
+ if (await this.ReloadDataEvent.Invoke(_AssetsValveMain))
{
TipFormHelper.ShowSucceed("娣诲姞鎴愬姛!");
}
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/02-main/EditValveMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/02-main/EditValveMainDlg.Designer.cs
index 0e732e3..00ac8ba 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/02-main/EditValveMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/02-main/EditValveMainDlg.Designer.cs
@@ -30,6 +30,7 @@
{
components = new System.ComponentModel.Container();
layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
+ TextEditKeyWord = new DevExpress.XtraEditors.TextEdit();
BtnOk = new DevExpress.XtraEditors.SimpleButton();
simpleButton1 = new DevExpress.XtraEditors.SimpleButton();
TextEditName = new DevExpress.XtraEditors.TextEdit();
@@ -37,6 +38,7 @@
TextEditCoefficient = new DevExpress.XtraEditors.TextEdit();
TextEditCaliber = new DevExpress.XtraEditors.ImageComboBoxEdit();
TextEditMaterial = new DevExpress.XtraEditors.ImageComboBoxEdit();
+ imageComboBoxEditValveType = new DevExpress.XtraEditors.TextEdit();
Root = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
@@ -49,6 +51,7 @@
layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
imageComboBoxEdit1 = new DevExpress.XtraEditors.ImageComboBoxEdit();
@@ -58,14 +61,15 @@
layoutControlGroup3 = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlGroup4 = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
- imageComboBoxEditValveType = new DevExpress.XtraEditors.TextEdit();
((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit();
layoutControl1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)TextEditKeyWord.Properties).BeginInit();
((System.ComponentModel.ISupportInitialize)TextEditName.Properties).BeginInit();
((System.ComponentModel.ISupportInitialize)TextEditDescription.Properties).BeginInit();
((System.ComponentModel.ISupportInitialize)TextEditCoefficient.Properties).BeginInit();
((System.ComponentModel.ISupportInitialize)TextEditCaliber.Properties).BeginInit();
((System.ComponentModel.ISupportInitialize)TextEditMaterial.Properties).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)imageComboBoxEditValveType.Properties).BeginInit();
((System.ComponentModel.ISupportInitialize)Root).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem4).BeginInit();
((System.ComponentModel.ISupportInitialize)emptySpaceItem1).BeginInit();
@@ -78,6 +82,7 @@
((System.ComponentModel.ISupportInitialize)layoutControlItem7).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem2).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem6).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem9).BeginInit();
((System.ComponentModel.ISupportInitialize)dxErrorProvider1).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem13).BeginInit();
((System.ComponentModel.ISupportInitialize)imageComboBoxEdit1.Properties).BeginInit();
@@ -87,11 +92,11 @@
((System.ComponentModel.ISupportInitialize)layoutControlGroup3).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlGroup4).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem27).BeginInit();
- ((System.ComponentModel.ISupportInitialize)imageComboBoxEditValveType.Properties).BeginInit();
SuspendLayout();
//
// layoutControl1
//
+ layoutControl1.Controls.Add(TextEditKeyWord);
layoutControl1.Controls.Add(BtnOk);
layoutControl1.Controls.Add(simpleButton1);
layoutControl1.Controls.Add(TextEditName);
@@ -108,6 +113,14 @@
layoutControl1.Size = new Size(681, 482);
layoutControl1.TabIndex = 0;
layoutControl1.Text = "layoutControl1";
+ //
+ // TextEditKeyWord
+ //
+ TextEditKeyWord.Location = new Point(79, 104);
+ TextEditKeyWord.Name = "TextEditKeyWord";
+ TextEditKeyWord.Size = new Size(594, 20);
+ TextEditKeyWord.StyleController = layoutControl1;
+ TextEditKeyWord.TabIndex = 7;
//
// BtnOk
//
@@ -143,9 +156,9 @@
//
// TextEditDescription
//
- TextEditDescription.Location = new Point(20, 164);
+ TextEditDescription.Location = new Point(20, 188);
TextEditDescription.Name = "TextEditDescription";
- TextEditDescription.Size = new Size(641, 272);
+ TextEditDescription.Size = new Size(641, 248);
TextEditDescription.StyleController = layoutControl1;
TextEditDescription.TabIndex = 6;
//
@@ -175,13 +188,21 @@
TextEditMaterial.StyleController = layoutControl1;
TextEditMaterial.TabIndex = 4;
//
+ // imageComboBoxEditValveType
+ //
+ imageComboBoxEditValveType.Location = new Point(79, 128);
+ imageComboBoxEditValveType.Name = "imageComboBoxEditValveType";
+ imageComboBoxEditValveType.Size = new Size(594, 20);
+ imageComboBoxEditValveType.StyleController = layoutControl1;
+ imageComboBoxEditValveType.TabIndex = 4;
+ //
// Root
//
Root.AppearanceItemCaption.Options.UseTextOptions = true;
Root.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
Root.GroupBordersVisible = false;
- Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem4, emptySpaceItem1, layoutControlItem8, tabbedControlGroup1, layoutControlItem1, layoutControlItem3, layoutControlItem7, layoutControlItem2, layoutControlItem6 });
+ Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem4, emptySpaceItem1, layoutControlItem8, tabbedControlGroup1, layoutControlItem1, layoutControlItem3, layoutControlItem7, layoutControlItem2, layoutControlItem6, layoutControlItem9 });
Root.Name = "Root";
Root.Padding = new DevExpress.XtraLayout.Utils.Padding(6, 6, 6, 6);
Root.Size = new Size(681, 482);
@@ -215,10 +236,10 @@
//
// tabbedControlGroup1
//
- tabbedControlGroup1.Location = new Point(0, 120);
+ tabbedControlGroup1.Location = new Point(0, 144);
tabbedControlGroup1.Name = "tabbedControlGroup1";
tabbedControlGroup1.SelectedTabPage = layoutControlGroup1;
- tabbedControlGroup1.Size = new Size(669, 324);
+ tabbedControlGroup1.Size = new Size(669, 300);
tabbedControlGroup1.TabPages.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlGroup1 });
tabbedControlGroup1.Text = "璇存槑";
//
@@ -227,7 +248,7 @@
layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem5 });
layoutControlGroup1.Location = new Point(0, 0);
layoutControlGroup1.Name = "layoutControlGroup1";
- layoutControlGroup1.Size = new Size(645, 276);
+ layoutControlGroup1.Size = new Size(645, 252);
layoutControlGroup1.Text = "璇存槑";
//
// layoutControlItem5
@@ -235,7 +256,7 @@
layoutControlItem5.Control = TextEditDescription;
layoutControlItem5.Location = new Point(0, 0);
layoutControlItem5.Name = "layoutControlItem5";
- layoutControlItem5.Size = new Size(645, 276);
+ layoutControlItem5.Size = new Size(645, 252);
layoutControlItem5.Text = "璇存槑:";
layoutControlItem5.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.CustomSize;
layoutControlItem5.TextSize = new Size(0, 0);
@@ -285,11 +306,20 @@
// layoutControlItem6
//
layoutControlItem6.Control = imageComboBoxEditValveType;
- layoutControlItem6.Location = new Point(0, 96);
+ layoutControlItem6.Location = new Point(0, 120);
layoutControlItem6.Name = "layoutControlItem6";
layoutControlItem6.Size = new Size(669, 24);
layoutControlItem6.Text = "闃�闂ㄥ紑搴�:";
layoutControlItem6.TextSize = new Size(59, 14);
+ //
+ // layoutControlItem9
+ //
+ layoutControlItem9.Control = TextEditKeyWord;
+ layoutControlItem9.Location = new Point(0, 96);
+ layoutControlItem9.Name = "layoutControlItem9";
+ layoutControlItem9.Size = new Size(669, 24);
+ layoutControlItem9.Text = "鍏抽敭瀛�:";
+ layoutControlItem9.TextSize = new Size(59, 14);
//
// dxErrorProvider1
//
@@ -361,14 +391,6 @@
layoutControlItem27.Text = "璇存槑:";
layoutControlItem27.TextSize = new Size(59, 14);
//
- // imageComboBoxEditValveType
- //
- imageComboBoxEditValveType.Location = new Point(79, 104);
- imageComboBoxEditValveType.Name = "imageComboBoxEditValveType";
- imageComboBoxEditValveType.Size = new Size(594, 20);
- imageComboBoxEditValveType.StyleController = layoutControl1;
- imageComboBoxEditValveType.TabIndex = 4;
- //
// EditAssetsValveMainDlg
//
AutoScaleDimensions = new SizeF(7F, 14F);
@@ -380,11 +402,13 @@
Text = "缂栬緫闃�闂�";
((System.ComponentModel.ISupportInitialize)layoutControl1).EndInit();
layoutControl1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)TextEditKeyWord.Properties).EndInit();
((System.ComponentModel.ISupportInitialize)TextEditName.Properties).EndInit();
((System.ComponentModel.ISupportInitialize)TextEditDescription.Properties).EndInit();
((System.ComponentModel.ISupportInitialize)TextEditCoefficient.Properties).EndInit();
((System.ComponentModel.ISupportInitialize)TextEditCaliber.Properties).EndInit();
((System.ComponentModel.ISupportInitialize)TextEditMaterial.Properties).EndInit();
+ ((System.ComponentModel.ISupportInitialize)imageComboBoxEditValveType.Properties).EndInit();
((System.ComponentModel.ISupportInitialize)Root).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem4).EndInit();
((System.ComponentModel.ISupportInitialize)emptySpaceItem1).EndInit();
@@ -397,6 +421,7 @@
((System.ComponentModel.ISupportInitialize)layoutControlItem7).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem2).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem6).EndInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem9).EndInit();
((System.ComponentModel.ISupportInitialize)dxErrorProvider1).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem13).EndInit();
((System.ComponentModel.ISupportInitialize)imageComboBoxEdit1.Properties).EndInit();
@@ -406,7 +431,6 @@
((System.ComponentModel.ISupportInitialize)layoutControlGroup3).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlGroup4).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem27).EndInit();
- ((System.ComponentModel.ISupportInitialize)imageComboBoxEditValveType.Properties).EndInit();
ResumeLayout(false);
}
@@ -446,5 +470,7 @@
private DevExpress.XtraEditors.ImageComboBoxEdit TextEditMaterial;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
private DevExpress.XtraEditors.TextEdit imageComboBoxEditValveType;
+ private DevExpress.XtraEditors.TextEdit TextEditKeyWord;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
}
}
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/02-main/EditValveMainDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/02-main/EditValveMainDlg.cs
index 70dde4b..cfa2eac 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/02-main/EditValveMainDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/02-main/EditValveMainDlg.cs
@@ -91,16 +91,20 @@
{
_AssetsValveMain.Coefficient = coefficient;
}
- _AssetsValveMain.MaterialName = TextEditMaterial.Text.Trim();
+ if (TextEditMaterial.Text != "榛樿")
+ {
+ _AssetsValveMain.MaterialName = TextEditMaterial.Text.Trim();
+ }
_AssetsValveMain.Description = TextEditDescription.Text.Trim();
if (double.TryParse(TextEditCaliber.Text, out double caliber))
{
_AssetsValveMain.Caliber = caliber;
}
- if (int.TryParse(this.imageComboBoxEditValveType.EditValue.ToString(), out int valveLift))
+ if (int.TryParse(this.imageComboBoxEditValveType.Text.ToString(), out int valveLift))
{
_AssetsValveMain.ValveLift = valveLift;
}
+ _AssetsValveMain.KeyWord = this.TextEditKeyWord.Text.Trim();
if (await this.ReloadDataEvent.Invoke(_AssetsValveMain))
{
TipFormHelper.ShowSucceed("淇敼鎴愬姛!");
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/ValveManageMainPage.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/ValveManageMainPage.Designer.cs
index fda5e6b..134f84b 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/ValveManageMainPage.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/ValveManageMainPage.Designer.cs
@@ -36,8 +36,10 @@
BtnDelete = new DevExpress.XtraBars.BarButtonItem();
BarBtnEidtPumpPart = new DevExpress.XtraBars.BarButtonItem();
barBtnValveLine = new DevExpress.XtraBars.BarButtonItem();
+ barBtnSetDefaultStatus = new DevExpress.XtraBars.BarButtonItem();
ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage();
ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
+ ribbonPageGroup2 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
svgImageCollection1 = new DevExpress.Utils.SvgImageCollection(components);
sidePanel1 = new DevExpress.XtraEditors.SidePanel();
gridControl1 = new DevExpress.XtraGrid.GridControl();
@@ -48,9 +50,10 @@
colMaterial = new DevExpress.XtraGrid.Columns.GridColumn();
colCoefficient = new DevExpress.XtraGrid.Columns.GridColumn();
colDescription = new DevExpress.XtraGrid.Columns.GridColumn();
- colCreateName = new DevExpress.XtraGrid.Columns.GridColumn();
- colCreateTime = new DevExpress.XtraGrid.Columns.GridColumn();
colValveLift = new DevExpress.XtraGrid.Columns.GridColumn();
+ colSeriesType = new DevExpress.XtraGrid.Columns.GridColumn();
+ colKeyWord = new DevExpress.XtraGrid.Columns.GridColumn();
+ colIsDefault = new DevExpress.XtraGrid.Columns.GridColumn();
dockManager1 = new DevExpress.XtraBars.Docking.DockManager(components);
dockPanel1 = new DevExpress.XtraBars.Docking.DockPanel();
dockPanel1_Container = new DevExpress.XtraBars.Docking.ControlContainer();
@@ -71,9 +74,9 @@
ribbonControl1.DrawGroupsBorderMode = DevExpress.Utils.DefaultBoolean.True;
ribbonControl1.ExpandCollapseItem.Id = 0;
ribbonControl1.ItemPanelStyle = DevExpress.XtraBars.Ribbon.RibbonItemPanelStyle.Classic;
- ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, BtnAdd, BtnEdit, BtnDelete, BarBtnEidtPumpPart, barBtnValveLine });
+ ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, BtnAdd, BtnEdit, BtnDelete, BarBtnEidtPumpPart, barBtnValveLine, barBtnSetDefaultStatus });
ribbonControl1.Location = new Point(0, 0);
- ribbonControl1.MaxItemId = 23;
+ ribbonControl1.MaxItemId = 24;
ribbonControl1.Name = "ribbonControl1";
ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage1 });
ribbonControl1.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonControlStyle.Office2010;
@@ -124,9 +127,17 @@
barBtnValveLine.Name = "barBtnValveLine";
barBtnValveLine.ItemClick += barBtnValveLine_ItemClick;
//
+ // barBtnSetDefaultStatus
+ //
+ barBtnSetDefaultStatus.Caption = "璁剧疆榛樿";
+ barBtnSetDefaultStatus.Id = 23;
+ barBtnSetDefaultStatus.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnSetDefaultStatus.ImageOptions.SvgImage");
+ barBtnSetDefaultStatus.Name = "barBtnSetDefaultStatus";
+ barBtnSetDefaultStatus.ItemClick += barBtnSetDefaultStatus_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";
//
@@ -135,9 +146,15 @@
ribbonPageGroup1.ItemLinks.Add(BtnAdd);
ribbonPageGroup1.ItemLinks.Add(BtnEdit);
ribbonPageGroup1.ItemLinks.Add(BtnDelete);
- ribbonPageGroup1.ItemLinks.Add(barBtnValveLine);
ribbonPageGroup1.Name = "ribbonPageGroup1";
ribbonPageGroup1.Text = "鍩虹鍔熻兘";
+ //
+ // ribbonPageGroup2
+ //
+ ribbonPageGroup2.ItemLinks.Add(barBtnValveLine);
+ ribbonPageGroup2.ItemLinks.Add(barBtnSetDefaultStatus);
+ ribbonPageGroup2.Name = "ribbonPageGroup2";
+ ribbonPageGroup2.Text = "鏇村";
//
// svgImageCollection1
//
@@ -177,7 +194,7 @@
gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
gridView1.Appearance.HeaderPanel.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
gridView1.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
- gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colCaliber, colMaterial, colCoefficient, colDescription, colCreateName, colCreateTime, colValveLift });
+ gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colCaliber, colMaterial, colCoefficient, colDescription, colValveLift, colSeriesType, colKeyWord, colIsDefault });
gridView1.GridControl = gridControl1;
gridView1.Name = "gridView1";
gridView1.OptionsView.ShowGroupPanel = false;
@@ -190,7 +207,7 @@
colName.Name = "colName";
colName.Visible = true;
colName.VisibleIndex = 0;
- colName.Width = 118;
+ colName.Width = 178;
//
// colCaliber
//
@@ -199,8 +216,8 @@
colCaliber.FieldName = "Caliber";
colCaliber.Name = "colCaliber";
colCaliber.Visible = true;
- colCaliber.VisibleIndex = 3;
- colCaliber.Width = 118;
+ colCaliber.VisibleIndex = 2;
+ colCaliber.Width = 123;
//
// colMaterial
//
@@ -209,8 +226,8 @@
colMaterial.FieldName = "Material";
colMaterial.Name = "colMaterial";
colMaterial.Visible = true;
- colMaterial.VisibleIndex = 4;
- colMaterial.Width = 96;
+ colMaterial.VisibleIndex = 3;
+ colMaterial.Width = 105;
//
// colCoefficient
//
@@ -219,8 +236,8 @@
colCoefficient.FieldName = "Coefficient";
colCoefficient.Name = "colCoefficient";
colCoefficient.Visible = true;
- colCoefficient.VisibleIndex = 6;
- colCoefficient.Width = 79;
+ colCoefficient.VisibleIndex = 5;
+ colCoefficient.Width = 85;
//
// colDescription
//
@@ -229,35 +246,38 @@
colDescription.FieldName = "Description";
colDescription.Name = "colDescription";
colDescription.Visible = true;
- colDescription.VisibleIndex = 7;
- colDescription.Width = 228;
- //
- // colCreateName
- //
- colCreateName.AppearanceCell.Options.UseTextOptions = true;
- colCreateName.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
- colCreateName.FieldName = "CreateName";
- colCreateName.Name = "colCreateName";
- colCreateName.Visible = true;
- colCreateName.VisibleIndex = 1;
- colCreateName.Width = 118;
- //
- // colCreateTime
- //
- colCreateTime.AppearanceCell.Options.UseTextOptions = true;
- colCreateTime.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
- colCreateTime.FieldName = "CreateTime";
- colCreateTime.Name = "colCreateTime";
- colCreateTime.Visible = true;
- colCreateTime.VisibleIndex = 2;
- colCreateTime.Width = 118;
+ colDescription.VisibleIndex = 6;
+ colDescription.Width = 266;
//
// colValveLift
//
colValveLift.FieldName = "ValveLift";
colValveLift.Name = "colValveLift";
colValveLift.Visible = true;
- colValveLift.VisibleIndex = 5;
+ colValveLift.VisibleIndex = 4;
+ colValveLift.Width = 82;
+ //
+ // colSeriesType
+ //
+ colSeriesType.FieldName = "SeriesType";
+ colSeriesType.Name = "colSeriesType";
+ colSeriesType.Visible = true;
+ colSeriesType.VisibleIndex = 7;
+ colSeriesType.Width = 119;
+ //
+ // colKeyWord
+ //
+ colKeyWord.FieldName = "KeyWord";
+ colKeyWord.Name = "colKeyWord";
+ colKeyWord.Visible = true;
+ colKeyWord.VisibleIndex = 1;
+ //
+ // colIsDefault
+ //
+ colIsDefault.FieldName = "IsDefault";
+ colIsDefault.Name = "colIsDefault";
+ colIsDefault.Visible = true;
+ colIsDefault.VisibleIndex = 8;
//
// dockManager1
//
@@ -344,9 +364,12 @@
private DevExpress.XtraGrid.Columns.GridColumn colCoefficient;
private DevExpress.XtraGrid.Columns.GridColumn colDescription;
private DevExpress.XtraGrid.Columns.GridColumn colName;
- private DevExpress.XtraGrid.Columns.GridColumn colCreateName;
- private DevExpress.XtraGrid.Columns.GridColumn colCreateTime;
private DevExpress.XtraBars.BarButtonItem barBtnValveLine;
private DevExpress.XtraGrid.Columns.GridColumn colValveLift;
+ private DevExpress.XtraGrid.Columns.GridColumn colSeriesType;
+ private DevExpress.XtraGrid.Columns.GridColumn colKeyWord;
+ private DevExpress.XtraGrid.Columns.GridColumn colIsDefault;
+ private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup2;
+ private DevExpress.XtraBars.BarButtonItem barBtnSetDefaultStatus;
}
}
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/ValveManageMainPage.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/ValveManageMainPage.cs
index e92fe5b..fcbfab8 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/ValveManageMainPage.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/ValveManageMainPage.cs
@@ -143,5 +143,29 @@
CreatePage(page, guid);
}
}
+
+ //璁剧疆榛樿鍊�
+ private void barBtnSetDefaultStatus_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ {
+ var dlg = new SetDefaultStatusDlg();
+ var vm = this.gridView1.GetCurrentViewModel(_allBindingList);
+ if (vm == null)
+ {
+ MessageBoxHelper.ShowWarning("璇烽�夋嫨鏁版嵁琛�!");
+ return;
+ }
+ dlg.SetBindingData(vm.IsDefault);
+ dlg.ReloadDataEvent += async (rhs) =>
+ {
+ if (await _bll.UpdateDefaultStatus(vm.ID, rhs))
+ {
+ vm.Reset(await _bll.GetByID(vm.ID));
+ this.AssetsValveMainViewModelBindingSource.ResetBindings(false);
+ return true;
+ }
+ return false;
+ };
+ dlg.ShowDialog();
+ }
}
}
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/ValveManageMainPage.resx b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/ValveManageMainPage.resx
index c885560..5342a70 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/ValveManageMainPage.resx
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/ValveManageMainPage.resx
@@ -218,6 +218,26 @@
LjYsMTIsMjcsMTJ6IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+Cw==
</value>
</data>
+ <data name="barBtnSetDefaultStatus.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
+ LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+ dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAPACAAAC77u/
+ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+ IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+ MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+ Y2U9InByZXNlcnZlIiBpZD0iRGVmaW5lX05hbWUiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcg
+ MCAwIDMyIDMyIj4NCiAgPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KCS5CbGFja3tmaWxsOiM3MjcyNzI7
+ fQoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQo8L3N0eWxlPg0KICA8cGF0aCBkPSJNMjIsMTZoLTh2LTJo
+ OFYxNnogTTE0LDIwaDh2LTJoLThWMjB6IE0yNy42LDE1LjRMMjcsMTQuOGwtMC42LDAuNkwyNiwxNS44
+ VjI0SDhsLTYtNnYtMmw2LTZoMTIuMmwwLjQtMC40ICBMMjEuMiw5bC0wLjYtMC42TDIwLjIsOEg3bC03
+ LDd2NGw3LDdsMjAsMGMwLjYsMCwxLTAuNCwxLTF2LTkuMkwyNy42LDE1LjR6IE02LDE3YzAsMS4xLDAu
+ OSwyLDIsMmMxLjEsMCwyLTAuOSwyLTJzLTAuOS0yLTItMiAgQzYuOSwxNSw2LDE1LjksNiwxN3oiIGNs
+ YXNzPSJCbGFjayIgLz4NCiAgPHBvbHlnb24gcG9pbnRzPSIyNyw2IDI5LDQgMjksNyAzMiw3IDMwLDkg
+ MzIsMTEgMjksMTEgMjksMTQgMjcsMTIgMjUsMTQgMjUsMTEgMjIsMTEgMjQsOSAyMiw3IDI1LDcgMjUs
+ NCAiIGNsYXNzPSJZZWxsb3ciIC8+DQo8L3N2Zz4L
+</value>
+ </data>
<metadata name="svgImageCollection1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/AddPipeMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/AddPipeMainDlg.Designer.cs
index f98b543..2d2f718 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/AddPipeMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/AddPipeMainDlg.Designer.cs
@@ -399,7 +399,7 @@
layoutControlItem27.Text = "璇存槑:";
layoutControlItem27.TextSize = new Size(59, 14);
//
- // TextEditKeyWorld
+ // TextEditKeyWord
//
TextEditKeyWorld.Location = new Point(403, 8);
TextEditKeyWorld.Name = "TextEditKeyWorld";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/EditPipeMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/EditPipeMainDlg.Designer.cs
index 35e7613..a38563f 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/EditPipeMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/EditPipeMainDlg.Designer.cs
@@ -404,7 +404,7 @@
layoutControlItem2.Text = "鍏抽敭瀛�:";
layoutControlItem2.TextSize = new Size(49, 14);
//
- // TextEditKeyWorld
+ // TextEditKeyWord
//
TextEditKeyWorld.Location = new Point(403, 8);
TextEditKeyWorld.Name = "TextEditKeyWorld";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/AddElbowMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/AddElbowMainDlg.Designer.cs
index df211f3..4bd5c37 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/AddElbowMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/AddElbowMainDlg.Designer.cs
@@ -184,7 +184,7 @@
TextEditCoefficient.StyleController = layoutControl1;
TextEditCoefficient.TabIndex = 7;
//
- // TextEditKeyWorld
+ // TextEditKeyWord
//
TextEditKeyWorld.Location = new Point(406, 8);
TextEditKeyWorld.Name = "TextEditKeyWorld";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/EditElbowMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/EditElbowMainDlg.Designer.cs
index 3645f95..868776f 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/EditElbowMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/EditElbowMainDlg.Designer.cs
@@ -188,7 +188,7 @@
TextEditCoefficient.StyleController = layoutControl1;
TextEditCoefficient.TabIndex = 7;
//
- // TextEditKeyWorld
+ // TextEditKeyWord
//
TextEditKeyWorld.Location = new Point(406, 8);
TextEditKeyWorld.Name = "TextEditKeyWorld";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/ElbowViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/ElbowViewModel.cs
index 870155c..7e03117 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/ElbowViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/ElbowViewModel.cs
@@ -122,9 +122,9 @@
public bool IsDefault { get; set; }
/// <summary>
- /// 绠¤矾杩炴帴闀垮害
+ /// 寮ご绫诲瀷
/// </summary>
- [DisplayName("杩炴帴闀垮害")]
+ [DisplayName("寮ご绫诲瀷")]
[Browsable(true)]
public eLengthType? ConnectionLength { get; set; }
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/AddThreeLinkMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/AddThreeLinkMainDlg.Designer.cs
index 1977f25..4adee0b 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/AddThreeLinkMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/AddThreeLinkMainDlg.Designer.cs
@@ -184,7 +184,7 @@
TextEditCoefficient.StyleController = layoutControl1;
TextEditCoefficient.TabIndex = 2;
//
- // TextEditKeyWorld
+ // TextEditKeyWord
//
TextEditKeyWorld.Location = new Point(454, 8);
TextEditKeyWorld.Name = "TextEditKeyWorld";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/EditThreeLinkMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/EditThreeLinkMainDlg.Designer.cs
index 8678614..aa42efc 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/EditThreeLinkMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/EditThreeLinkMainDlg.Designer.cs
@@ -188,7 +188,7 @@
TextEditCoefficient.StyleController = layoutControl1;
TextEditCoefficient.TabIndex = 7;
//
- // TextEditKeyWorld
+ // TextEditKeyWord
//
TextEditKeyWorld.Location = new Point(454, 8);
TextEditKeyWorld.Name = "TextEditKeyWorld";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/ThreeLinkManageMainPage.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/ThreeLinkManageMainPage.Designer.cs
index e6db060..ab47861 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/ThreeLinkManageMainPage.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/ThreeLinkManageMainPage.Designer.cs
@@ -42,32 +42,30 @@
svgImageCollection1 = new DevExpress.Utils.SvgImageCollection(components);
sidePanel1 = new DevExpress.XtraEditors.SidePanel();
gridControl1 = new DevExpress.XtraGrid.GridControl();
- gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
- dockManager1 = new DevExpress.XtraBars.Docking.DockManager(components);
- dockPanel1 = new DevExpress.XtraBars.Docking.DockPanel();
- dockPanel1_Container = new DevExpress.XtraBars.Docking.ControlContainer();
- threeLinkTreeListCtrl1 = new ThreeLinkTreeListCtrl();
threeLinkViewModelBindingSource = new BindingSource(components);
- colID = new DevExpress.XtraGrid.Columns.GridColumn();
+ gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
colName = new DevExpress.XtraGrid.Columns.GridColumn();
colCaliber = new DevExpress.XtraGrid.Columns.GridColumn();
colMaterialName = new DevExpress.XtraGrid.Columns.GridColumn();
colCoefficient = new DevExpress.XtraGrid.Columns.GridColumn();
colRunThroughCoefficient = new DevExpress.XtraGrid.Columns.GridColumn();
colBranchThroughCoefficient = new DevExpress.XtraGrid.Columns.GridColumn();
- colSortCode = new DevExpress.XtraGrid.Columns.GridColumn();
colKeyWord = new DevExpress.XtraGrid.Columns.GridColumn();
colIsDefault = new DevExpress.XtraGrid.Columns.GridColumn();
colDescription = new DevExpress.XtraGrid.Columns.GridColumn();
+ dockManager1 = new DevExpress.XtraBars.Docking.DockManager(components);
+ dockPanel1 = new DevExpress.XtraBars.Docking.DockPanel();
+ dockPanel1_Container = new DevExpress.XtraBars.Docking.ControlContainer();
+ threeLinkTreeListCtrl1 = new ThreeLinkTreeListCtrl();
((System.ComponentModel.ISupportInitialize)ribbonControl1).BeginInit();
((System.ComponentModel.ISupportInitialize)svgImageCollection1).BeginInit();
sidePanel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)gridControl1).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)threeLinkViewModelBindingSource).BeginInit();
((System.ComponentModel.ISupportInitialize)gridView1).BeginInit();
((System.ComponentModel.ISupportInitialize)dockManager1).BeginInit();
dockPanel1.SuspendLayout();
dockPanel1_Container.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)threeLinkViewModelBindingSource).BeginInit();
SuspendLayout();
//
// ribbonControl1
@@ -172,15 +170,82 @@
gridControl1.TabIndex = 1;
gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView1 });
//
+ // threeLinkViewModelBindingSource
+ //
+ threeLinkViewModelBindingSource.DataSource = typeof(ThreeLinkViewModel);
+ //
// gridView1
//
gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
gridView1.Appearance.HeaderPanel.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
gridView1.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
- gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colID, colName, colCaliber, colMaterialName, colCoefficient, colRunThroughCoefficient, colBranchThroughCoefficient, colSortCode, colKeyWord, colIsDefault, colDescription });
+ gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colCaliber, colMaterialName, colCoefficient, colRunThroughCoefficient, colBranchThroughCoefficient, colKeyWord, colIsDefault, colDescription });
gridView1.GridControl = gridControl1;
gridView1.Name = "gridView1";
gridView1.OptionsView.ShowGroupPanel = false;
+ //
+ // colName
+ //
+ colName.FieldName = "Name";
+ colName.Name = "colName";
+ colName.Visible = true;
+ colName.VisibleIndex = 0;
+ //
+ // colCaliber
+ //
+ colCaliber.FieldName = "Caliber";
+ colCaliber.Name = "colCaliber";
+ colCaliber.Visible = true;
+ colCaliber.VisibleIndex = 1;
+ //
+ // colMaterialName
+ //
+ colMaterialName.FieldName = "MaterialName";
+ colMaterialName.Name = "colMaterialName";
+ colMaterialName.Visible = true;
+ colMaterialName.VisibleIndex = 2;
+ //
+ // colCoefficient
+ //
+ colCoefficient.FieldName = "Coefficient";
+ colCoefficient.Name = "colCoefficient";
+ colCoefficient.Visible = true;
+ colCoefficient.VisibleIndex = 3;
+ //
+ // colRunThroughCoefficient
+ //
+ colRunThroughCoefficient.FieldName = "RunThroughCoefficient";
+ colRunThroughCoefficient.Name = "colRunThroughCoefficient";
+ colRunThroughCoefficient.Visible = true;
+ colRunThroughCoefficient.VisibleIndex = 4;
+ //
+ // colBranchThroughCoefficient
+ //
+ colBranchThroughCoefficient.FieldName = "BranchThroughCoefficient";
+ colBranchThroughCoefficient.Name = "colBranchThroughCoefficient";
+ colBranchThroughCoefficient.Visible = true;
+ colBranchThroughCoefficient.VisibleIndex = 5;
+ //
+ // colKeyWord
+ //
+ colKeyWord.FieldName = "KeyWord";
+ colKeyWord.Name = "colKeyWord";
+ colKeyWord.Visible = true;
+ colKeyWord.VisibleIndex = 6;
+ //
+ // colIsDefault
+ //
+ colIsDefault.FieldName = "IsDefault";
+ colIsDefault.Name = "colIsDefault";
+ colIsDefault.Visible = true;
+ colIsDefault.VisibleIndex = 8;
+ //
+ // colDescription
+ //
+ colDescription.FieldName = "Description";
+ colDescription.Name = "colDescription";
+ colDescription.Visible = true;
+ colDescription.VisibleIndex = 7;
//
// dockManager1
//
@@ -219,87 +284,6 @@
threeLinkTreeListCtrl1.Size = new Size(193, 491);
threeLinkTreeListCtrl1.TabIndex = 0;
//
- // threeLinkViewModelBindingSource
- //
- threeLinkViewModelBindingSource.DataSource = typeof(ThreeLinkViewModel);
- //
- // colID
- //
- colID.FieldName = "ID";
- colID.Name = "colID";
- colID.Visible = true;
- colID.VisibleIndex = 0;
- //
- // colName
- //
- colName.FieldName = "Name";
- colName.Name = "colName";
- colName.Visible = true;
- colName.VisibleIndex = 1;
- //
- // colCaliber
- //
- colCaliber.FieldName = "Caliber";
- colCaliber.Name = "colCaliber";
- colCaliber.Visible = true;
- colCaliber.VisibleIndex = 2;
- //
- // colMaterialName
- //
- colMaterialName.FieldName = "MaterialName";
- colMaterialName.Name = "colMaterialName";
- colMaterialName.Visible = true;
- colMaterialName.VisibleIndex = 3;
- //
- // colCoefficient
- //
- colCoefficient.FieldName = "Coefficient";
- colCoefficient.Name = "colCoefficient";
- colCoefficient.Visible = true;
- colCoefficient.VisibleIndex = 4;
- //
- // colRunThroughCoefficient
- //
- colRunThroughCoefficient.FieldName = "RunThroughCoefficient";
- colRunThroughCoefficient.Name = "colRunThroughCoefficient";
- colRunThroughCoefficient.Visible = true;
- colRunThroughCoefficient.VisibleIndex = 5;
- //
- // colBranchThroughCoefficient
- //
- colBranchThroughCoefficient.FieldName = "BranchThroughCoefficient";
- colBranchThroughCoefficient.Name = "colBranchThroughCoefficient";
- colBranchThroughCoefficient.Visible = true;
- colBranchThroughCoefficient.VisibleIndex = 6;
- //
- // colSortCode
- //
- colSortCode.FieldName = "SortCode";
- colSortCode.Name = "colSortCode";
- colSortCode.Visible = true;
- colSortCode.VisibleIndex = 7;
- //
- // colKeyWord
- //
- colKeyWord.FieldName = "KeyWord";
- colKeyWord.Name = "colKeyWord";
- colKeyWord.Visible = true;
- colKeyWord.VisibleIndex = 8;
- //
- // colIsDefault
- //
- colIsDefault.FieldName = "IsDefault";
- colIsDefault.Name = "colIsDefault";
- colIsDefault.Visible = true;
- colIsDefault.VisibleIndex = 9;
- //
- // colDescription
- //
- colDescription.FieldName = "Description";
- colDescription.Name = "colDescription";
- colDescription.Visible = true;
- colDescription.VisibleIndex = 10;
- //
// ThreeLinkManageMainPage
//
Appearance.BackColor = SystemColors.Control;
@@ -315,11 +299,11 @@
sidePanel1.ResumeLayout(false);
sidePanel1.PerformLayout();
((System.ComponentModel.ISupportInitialize)gridControl1).EndInit();
+ ((System.ComponentModel.ISupportInitialize)threeLinkViewModelBindingSource).EndInit();
((System.ComponentModel.ISupportInitialize)gridView1).EndInit();
((System.ComponentModel.ISupportInitialize)dockManager1).EndInit();
dockPanel1.ResumeLayout(false);
dockPanel1_Container.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)threeLinkViewModelBindingSource).EndInit();
ResumeLayout(false);
}
@@ -343,14 +327,12 @@
private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup2;
private ThreeLinkTreeListCtrl threeLinkTreeListCtrl1;
private BindingSource threeLinkViewModelBindingSource;
- private DevExpress.XtraGrid.Columns.GridColumn colID;
private DevExpress.XtraGrid.Columns.GridColumn colName;
private DevExpress.XtraGrid.Columns.GridColumn colCaliber;
private DevExpress.XtraGrid.Columns.GridColumn colMaterialName;
private DevExpress.XtraGrid.Columns.GridColumn colCoefficient;
private DevExpress.XtraGrid.Columns.GridColumn colRunThroughCoefficient;
private DevExpress.XtraGrid.Columns.GridColumn colBranchThroughCoefficient;
- private DevExpress.XtraGrid.Columns.GridColumn colSortCode;
private DevExpress.XtraGrid.Columns.GridColumn colKeyWord;
private DevExpress.XtraGrid.Columns.GridColumn colIsDefault;
private DevExpress.XtraGrid.Columns.GridColumn colDescription;
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/02-main/AddFourLinkMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/02-main/AddFourLinkMainDlg.Designer.cs
index 7c72d98..f217d36 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/02-main/AddFourLinkMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/02-main/AddFourLinkMainDlg.Designer.cs
@@ -174,7 +174,7 @@
TextEditCoefficient.StyleController = layoutControl1;
TextEditCoefficient.TabIndex = 2;
//
- // TextEditKeyWorld
+ // TextEditKeyWord
//
TextEditKeyWorld.Location = new Point(406, 8);
TextEditKeyWorld.Name = "TextEditKeyWorld";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/02-main/EditFourLinkMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/02-main/EditFourLinkMainDlg.Designer.cs
index 0d4eab3..e95fdcb 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/02-main/EditFourLinkMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/02-main/EditFourLinkMainDlg.Designer.cs
@@ -178,7 +178,7 @@
TextEditCoefficient.StyleController = layoutControl1;
TextEditCoefficient.TabIndex = 2;
//
- // TextEditKeyWorld
+ // TextEditKeyWord
//
TextEditKeyWorld.Location = new Point(406, 8);
TextEditKeyWorld.Name = "TextEditKeyWorld";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-Nozzle/02-main/AddNozzleMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-Nozzle/02-main/AddNozzleMainDlg.Designer.cs
index f61e923..0d89abc 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-Nozzle/02-main/AddNozzleMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-Nozzle/02-main/AddNozzleMainDlg.Designer.cs
@@ -200,7 +200,7 @@
TextEditCoefficient.StyleController = layoutControl1;
TextEditCoefficient.TabIndex = 5;
//
- // TextEditKeyWorld
+ // TextEditKeyWord
//
TextEditKeyWorld.Location = new Point(406, 8);
TextEditKeyWorld.Name = "TextEditKeyWorld";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-Nozzle/02-main/EditNozzleMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-Nozzle/02-main/EditNozzleMainDlg.Designer.cs
index c6b14db..a578e6d 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-Nozzle/02-main/EditNozzleMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-Nozzle/02-main/EditNozzleMainDlg.Designer.cs
@@ -188,7 +188,7 @@
TextEditCoefficient.StyleController = layoutControl1;
TextEditCoefficient.TabIndex = 5;
//
- // TextEditKeyWorld
+ // TextEditKeyWord
//
TextEditKeyWorld.Location = new Point(406, 8);
TextEditKeyWorld.Name = "TextEditKeyWorld";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/10-exchanger/02-main/AddAssetsExchangerMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/10-exchanger/02-main/AddAssetsExchangerMainDlg.Designer.cs
index 336b0f6..df9d22b 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/10-exchanger/02-main/AddAssetsExchangerMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/10-exchanger/02-main/AddAssetsExchangerMainDlg.Designer.cs
@@ -174,7 +174,7 @@
TextEditCoefficient.StyleController = layoutControl1;
TextEditCoefficient.TabIndex = 2;
//
- // TextEditKeyWorld
+ // TextEditKeyWord
//
TextEditKeyWorld.Location = new Point(406, 8);
TextEditKeyWorld.Name = "TextEditKeyWorld";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/10-exchanger/02-main/EditExchangerMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/10-exchanger/02-main/EditExchangerMainDlg.Designer.cs
index 5b120cb..b2149bc 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/10-exchanger/02-main/EditExchangerMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/10-exchanger/02-main/EditExchangerMainDlg.Designer.cs
@@ -178,7 +178,7 @@
TextEditCoefficient.StyleController = layoutControl1;
TextEditCoefficient.TabIndex = 2;
//
- // TextEditKeyWorld
+ // TextEditKeyWord
//
TextEditKeyWorld.Location = new Point(406, 8);
TextEditKeyWorld.Name = "TextEditKeyWorld";
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/01-viewmodel/ValveMatchingViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/01-viewmodel/ValveMatchingViewModel.cs
index 8cc13fd..f1c7034 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/01-viewmodel/ValveMatchingViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/01-viewmodel/ValveMatchingViewModel.cs
@@ -152,6 +152,6 @@
/// </summary>
[DisplayName("鍖归厤闃�闂ㄥ紑搴�")]
[Browsable(true)]
- public int MatchingValveLift { get; set; }
+ public int? MatchingValveLift { get; set; }
}
}
\ No newline at end of file
--
Gitblit v1.9.3