From d9b8c4b8639e5239cea8fbb88fa2ae6fa1ac706b Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期一, 23 九月 2024 09:48:29 +0800
Subject: [PATCH] 提交修改
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/06-pipelineManage/PipelineManageMainPanel.cs | 0
WinFrmUI/HStation.WinFrmUI.Assets.Core/06-pipelineManage/pipelineManageMainPanel.resx | 0
WinFrmUI/HStation.WinFrmUI.Basic/01-SysCatalogManage/SetSysPropForCatalogDlg.cs | 40 +++++++++---
WinFrmUI/HStation.WinFrmUI.Dict.Core/DictManageMainPanel.resx | 0
WinFrmUI/HStation.WinFrmUI.Assets.Core/05-ValveManage/ValveTypeTreeListCtrl.designer.cs | 3 +
WinFrmUI/HStation.WinFrmUI.Dict.Core/DictManageMainPanel.Designer.cs | 0
WinFrmUI/HStation.WinFrmUI.Assets.Core/02-AdaptingManage/AddAdaptingMainDlg.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/02-AdaptingManage/EditAdaptingMainDlg.cs | 6 +
WinFrmUI/HStation.WinFrmUI.Dict.Core/DictManageMainPanel.cs | 0
WinFrmUI/HStation.WinFrmUI.Dict.Core/DictGroupTreeListCtrl.cs | 0
WinFrmUI/HStation.WinFrmUI.Dict.Core/DictGroupTreeListCtrl.resx | 0
WinFrmUI/HStation.WinFrmUI.Assets.Core/02-AdaptingManage/EditAdaptingMainDlg.Designer.cs | 60 ++++++++++----------
WinFrmUI/HStation.WinFrmUI.Assets.Core/06-pipelineManage/pipelineManageMainPanel.Designer.cs | 31 +++-------
WinFrmUI/HStation.WinFrmUI.Dict.Core/DictGroupTreeListCtrl.designer.cs | 4 +
WinFrmUI/HStation.WinFrmUI.Basic/01-SysCatalogManage/SetSysPropForCatalogDlg.Designer.cs | 1
WinFrmUI/HStation.WinFrmUI.Dict.Core/HStation.WinFrmUI.Dict.Core.csproj | 4
WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj | 2
17 files changed, 85 insertions(+), 68 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/02-AdaptingManage/AddAdaptingMainDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/02-AdaptingManage/AddAdaptingMainDlg.cs
index d176617..623d7dd 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/02-AdaptingManage/AddAdaptingMainDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/02-AdaptingManage/AddAdaptingMainDlg.cs
@@ -58,7 +58,7 @@
if (!(Valid()))
return;
_AdaptingVmo.Material = TextEditMaterial.Text.Trim();
- if (double.TryParse(TextEditAdaptingType.Text.Trim(), out double coeffcient))
+ if (double.TryParse(TextEditCoefficient.Text.Trim(), out double coeffcient))
{
_AdaptingVmo.Coefficient = coeffcient;
}
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/02-AdaptingManage/EditAdaptingMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/02-AdaptingManage/EditAdaptingMainDlg.Designer.cs
index a71f3fa..2caa98f 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/02-AdaptingManage/EditAdaptingMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/02-AdaptingManage/EditAdaptingMainDlg.Designer.cs
@@ -37,6 +37,7 @@
TextEditCoefficient = new DevExpress.XtraEditors.TextEdit();
TextEditCaliber = new DevExpress.XtraEditors.ImageComboBoxEdit();
TextEditMaterial = new DevExpress.XtraEditors.ImageComboBoxEdit();
+ TextEditAdaptingType = new DevExpress.XtraEditors.ImageComboBoxEdit();
Root = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
@@ -48,6 +49,7 @@
layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
imageComboBoxEdit1 = new DevExpress.XtraEditors.ImageComboBoxEdit();
@@ -57,8 +59,6 @@
layoutControlGroup3 = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlGroup4 = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
- TextEditAdaptingType = new DevExpress.XtraEditors.ImageComboBoxEdit();
- layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit();
layoutControl1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)TextEditName.Properties).BeginInit();
@@ -66,6 +66,7 @@
((System.ComponentModel.ISupportInitialize)TextEditCoefficient.Properties).BeginInit();
((System.ComponentModel.ISupportInitialize)TextEditCaliber.Properties).BeginInit();
((System.ComponentModel.ISupportInitialize)TextEditMaterial.Properties).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)TextEditAdaptingType.Properties).BeginInit();
((System.ComponentModel.ISupportInitialize)Root).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem4).BeginInit();
((System.ComponentModel.ISupportInitialize)emptySpaceItem1).BeginInit();
@@ -77,6 +78,7 @@
((System.ComponentModel.ISupportInitialize)layoutControlItem11).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem9).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem12).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem2).BeginInit();
((System.ComponentModel.ISupportInitialize)dxErrorProvider1).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem13).BeginInit();
((System.ComponentModel.ISupportInitialize)imageComboBoxEdit1.Properties).BeginInit();
@@ -86,8 +88,6 @@
((System.ComponentModel.ISupportInitialize)layoutControlGroup3).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlGroup4).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem27).BeginInit();
- ((System.ComponentModel.ISupportInitialize)TextEditAdaptingType.Properties).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem2).BeginInit();
SuspendLayout();
//
// layoutControl1
@@ -151,7 +151,7 @@
//
// TextEditCoefficient
//
- TextEditCoefficient.Location = new Point(72, 32);
+ TextEditCoefficient.Location = new Point(72, 56);
TextEditCoefficient.Name = "TextEditCoefficient";
TextEditCoefficient.Size = new Size(601, 20);
TextEditCoefficient.StyleController = layoutControl1;
@@ -159,7 +159,7 @@
//
// TextEditCaliber
//
- TextEditCaliber.Location = new Point(72, 56);
+ TextEditCaliber.Location = new Point(72, 80);
TextEditCaliber.Name = "TextEditCaliber";
TextEditCaliber.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
TextEditCaliber.Size = new Size(601, 20);
@@ -168,12 +168,21 @@
//
// TextEditMaterial
//
- TextEditMaterial.Location = new Point(72, 80);
+ TextEditMaterial.Location = new Point(72, 104);
TextEditMaterial.Name = "TextEditMaterial";
TextEditMaterial.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
TextEditMaterial.Size = new Size(601, 20);
TextEditMaterial.StyleController = layoutControl1;
TextEditMaterial.TabIndex = 7;
+ //
+ // TextEditAdaptingType
+ //
+ TextEditAdaptingType.Location = new Point(72, 32);
+ TextEditAdaptingType.Name = "TextEditAdaptingType";
+ TextEditAdaptingType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
+ TextEditAdaptingType.Size = new Size(601, 20);
+ TextEditAdaptingType.StyleController = layoutControl1;
+ TextEditAdaptingType.TabIndex = 14;
//
// Root
//
@@ -255,7 +264,7 @@
// layoutControlItem11
//
layoutControlItem11.Control = TextEditCoefficient;
- layoutControlItem11.Location = new Point(0, 24);
+ layoutControlItem11.Location = new Point(0, 48);
layoutControlItem11.Name = "layoutControlItem11";
layoutControlItem11.Size = new Size(669, 24);
layoutControlItem11.Text = "绯绘暟:";
@@ -264,7 +273,7 @@
// layoutControlItem9
//
layoutControlItem9.Control = TextEditCaliber;
- layoutControlItem9.Location = new Point(0, 48);
+ layoutControlItem9.Location = new Point(0, 72);
layoutControlItem9.Name = "layoutControlItem9";
layoutControlItem9.Size = new Size(669, 24);
layoutControlItem9.Text = "鍙ｅ緞:";
@@ -273,11 +282,20 @@
// layoutControlItem12
//
layoutControlItem12.Control = TextEditMaterial;
- layoutControlItem12.Location = new Point(0, 72);
+ layoutControlItem12.Location = new Point(0, 96);
layoutControlItem12.Name = "layoutControlItem12";
layoutControlItem12.Size = new Size(669, 24);
layoutControlItem12.Text = "鏉愭枡:";
layoutControlItem12.TextSize = new Size(52, 14);
+ //
+ // layoutControlItem2
+ //
+ layoutControlItem2.Control = TextEditAdaptingType;
+ layoutControlItem2.Location = new Point(0, 24);
+ layoutControlItem2.Name = "layoutControlItem2";
+ layoutControlItem2.Size = new Size(669, 24);
+ layoutControlItem2.Text = "闄勪欢绫诲瀷:";
+ layoutControlItem2.TextSize = new Size(52, 14);
//
// dxErrorProvider1
//
@@ -349,24 +367,6 @@
layoutControlItem27.Text = "璇存槑:";
layoutControlItem27.TextSize = new Size(59, 14);
//
- // TextEditAdaptingType
- //
- TextEditAdaptingType.Location = new Point(72, 104);
- TextEditAdaptingType.Name = "TextEditAdaptingType";
- TextEditAdaptingType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
- TextEditAdaptingType.Size = new Size(601, 20);
- TextEditAdaptingType.StyleController = layoutControl1;
- TextEditAdaptingType.TabIndex = 14;
- //
- // layoutControlItem2
- //
- layoutControlItem2.Control = TextEditAdaptingType;
- layoutControlItem2.Location = new Point(0, 96);
- layoutControlItem2.Name = "layoutControlItem2";
- layoutControlItem2.Size = new Size(669, 24);
- layoutControlItem2.Text = "闄勪欢绫诲瀷:";
- layoutControlItem2.TextSize = new Size(52, 14);
- //
// EditAdaptingMainDlg
//
AutoScaleDimensions = new SizeF(7F, 14F);
@@ -383,6 +383,7 @@
((System.ComponentModel.ISupportInitialize)TextEditCoefficient.Properties).EndInit();
((System.ComponentModel.ISupportInitialize)TextEditCaliber.Properties).EndInit();
((System.ComponentModel.ISupportInitialize)TextEditMaterial.Properties).EndInit();
+ ((System.ComponentModel.ISupportInitialize)TextEditAdaptingType.Properties).EndInit();
((System.ComponentModel.ISupportInitialize)Root).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem4).EndInit();
((System.ComponentModel.ISupportInitialize)emptySpaceItem1).EndInit();
@@ -394,6 +395,7 @@
((System.ComponentModel.ISupportInitialize)layoutControlItem11).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem9).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem12).EndInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem2).EndInit();
((System.ComponentModel.ISupportInitialize)dxErrorProvider1).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem13).EndInit();
((System.ComponentModel.ISupportInitialize)imageComboBoxEdit1.Properties).EndInit();
@@ -403,8 +405,6 @@
((System.ComponentModel.ISupportInitialize)layoutControlGroup3).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlGroup4).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem27).EndInit();
- ((System.ComponentModel.ISupportInitialize)TextEditAdaptingType.Properties).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem2).EndInit();
ResumeLayout(false);
}
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/02-AdaptingManage/EditAdaptingMainDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/02-AdaptingManage/EditAdaptingMainDlg.cs
index 11e238f..aae873b 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/02-AdaptingManage/EditAdaptingMainDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/02-AdaptingManage/EditAdaptingMainDlg.cs
@@ -19,6 +19,7 @@
this.TextEditCoefficient.Text = _AdaptingVmo.Coefficient.ToString();
this.TextEditMaterial.Text = _AdaptingVmo.Material;
this.TextEditDescription.Text = _AdaptingVmo.Description;
+ this.TextEditAdaptingType.Properties.AddEnum(typeof(HStation.Assets.eAdaptingType));
var allCaliber = await new Yw.BLL.SysDictData().GetByTypeCode("1");
if (allCaliber != null)
{
@@ -46,7 +47,10 @@
}
}
TextEditMaterial.EditValue = adaptingManageVmo.Material;
- TextEditAdaptingType.EditValue = adaptingManageVmo.AdaptingType;
+ if (Enum.TryParse(Convert.ToString(adaptingManageVmo.AdaptingType), true, out HStation.Assets.eAdaptingType adaptingtype))
+ {
+ TextEditAdaptingType.EditValue = adaptingtype;
+ }
}
public event Func<Vmo.AdaptingManageVmo, Task<bool>> ReloadDataEvent = null;
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-ValveManage/ValveTypeTreeListCtrl.designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-ValveManage/ValveTypeTreeListCtrl.designer.cs
index d6f1c4d..3a7c878 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-ValveManage/ValveTypeTreeListCtrl.designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-ValveManage/ValveTypeTreeListCtrl.designer.cs
@@ -75,10 +75,13 @@
// bar1
//
bar1.BarName = "Custom 2";
+ bar1.CanDockStyle = DevExpress.XtraBars.BarCanDockStyle.Top;
bar1.DockCol = 0;
bar1.DockRow = 0;
bar1.DockStyle = DevExpress.XtraBars.BarDockStyle.Top;
bar1.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] { new DevExpress.XtraBars.LinkPersistInfo(BtnAdd), new DevExpress.XtraBars.LinkPersistInfo(barBtnEdit), new DevExpress.XtraBars.LinkPersistInfo(barBtnDelete) });
+ bar1.OptionsBar.AllowQuickCustomization = false;
+ bar1.OptionsBar.DrawBorder = false;
bar1.OptionsBar.DrawDragBorder = false;
bar1.OptionsBar.MultiLine = true;
bar1.OptionsBar.UseWholeRow = true;
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-pipelineManage/pipelineManage.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-pipelineManage/PipelineManageMainPanel.cs
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Assets.Core/06-pipelineManage/pipelineManage.cs
rename to WinFrmUI/HStation.WinFrmUI.Assets.Core/06-pipelineManage/PipelineManageMainPanel.cs
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-pipelineManage/pipelineManage.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-pipelineManage/pipelineManageMainPanel.Designer.cs
similarity index 93%
rename from WinFrmUI/HStation.WinFrmUI.Assets.Core/06-pipelineManage/pipelineManage.Designer.cs
rename to WinFrmUI/HStation.WinFrmUI.Assets.Core/06-pipelineManage/pipelineManageMainPanel.Designer.cs
index 9190f1d..be8ceea 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-pipelineManage/pipelineManage.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-pipelineManage/pipelineManageMainPanel.Designer.cs
@@ -50,7 +50,6 @@
colHazen = new DevExpress.XtraGrid.Columns.GridColumn();
colDarcy = new DevExpress.XtraGrid.Columns.GridColumn();
colManning = new DevExpress.XtraGrid.Columns.GridColumn();
- colSortCode = new DevExpress.XtraGrid.Columns.GridColumn();
colDescription = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)ribbonControl1).BeginInit();
((System.ComponentModel.ISupportInitialize)svgImageCollection1).BeginInit();
@@ -170,10 +169,11 @@
//
gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
gridView1.Appearance.HeaderPanel.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
- gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colCaliber, colMaterial, colHazen, colDarcy, colManning, colSortCode, colDescription });
+ gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colCaliber, colMaterial, colHazen, colDarcy, colManning, colDescription });
gridView1.GridControl = gridControl1;
gridView1.Name = "gridView1";
gridView1.OptionsView.ShowGroupPanel = false;
+ gridView1.SortInfo.AddRange(new DevExpress.XtraGrid.Columns.GridColumnSortInfo[] { new DevExpress.XtraGrid.Columns.GridColumnSortInfo(colManning, DevExpress.Data.ColumnSortOrder.Ascending) });
//
// colName
//
@@ -183,7 +183,7 @@
colName.Name = "colName";
colName.Visible = true;
colName.VisibleIndex = 0;
- colName.Width = 186;
+ colName.Width = 169;
//
// colCaliber
//
@@ -193,7 +193,7 @@
colCaliber.Name = "colCaliber";
colCaliber.Visible = true;
colCaliber.VisibleIndex = 1;
- colCaliber.Width = 132;
+ colCaliber.Width = 86;
//
// colMaterial
//
@@ -203,7 +203,7 @@
colMaterial.Name = "colMaterial";
colMaterial.Visible = true;
colMaterial.VisibleIndex = 2;
- colMaterial.Width = 121;
+ colMaterial.Width = 72;
//
// colHazen
//
@@ -214,7 +214,7 @@
colHazen.Name = "colHazen";
colHazen.Visible = true;
colHazen.VisibleIndex = 3;
- colHazen.Width = 136;
+ colHazen.Width = 109;
//
// colDarcy
//
@@ -225,7 +225,7 @@
colDarcy.Name = "colDarcy";
colDarcy.Visible = true;
colDarcy.VisibleIndex = 4;
- colDarcy.Width = 147;
+ colDarcy.Width = 92;
//
// colManning
//
@@ -236,17 +236,7 @@
colManning.Name = "colManning";
colManning.Visible = true;
colManning.VisibleIndex = 5;
- colManning.Width = 125;
- //
- // colSortCode
- //
- colSortCode.AppearanceCell.Options.UseTextOptions = true;
- colSortCode.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
- colSortCode.FieldName = "SortCode";
- colSortCode.Name = "colSortCode";
- colSortCode.Visible = true;
- colSortCode.VisibleIndex = 7;
- colSortCode.Width = 95;
+ colManning.Width = 104;
//
// colDescription
//
@@ -256,7 +246,7 @@
colDescription.Name = "colDescription";
colDescription.Visible = true;
colDescription.VisibleIndex = 6;
- colDescription.Width = 228;
+ colDescription.Width = 206;
//
// PipeLineManageMainPanel
//
@@ -297,9 +287,8 @@
private DevExpress.XtraGrid.Columns.GridColumn colHazen;
private DevExpress.XtraGrid.Columns.GridColumn colDarcy;
private DevExpress.XtraGrid.Columns.GridColumn colManning;
- private DevExpress.XtraGrid.Columns.GridColumn colSortCode;
- private DevExpress.XtraGrid.Columns.GridColumn colDescription;
private DevExpress.XtraBars.BarButtonItem BtnDescription;
private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup2;
+ private DevExpress.XtraGrid.Columns.GridColumn colDescription;
}
}
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-pipelineManage/pipelineManage.resx b/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-pipelineManage/pipelineManageMainPanel.resx
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Assets.Core/06-pipelineManage/pipelineManage.resx
rename to WinFrmUI/HStation.WinFrmUI.Assets.Core/06-pipelineManage/pipelineManageMainPanel.resx
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj b/WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj
index fcc0619..ec02099 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj
@@ -80,7 +80,7 @@
<Compile Update="06-pipelineManage\AddPipeLineMainDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="06-pipelineManage\pipelineManage.cs">
+ <Compile Update="06-pipelineManage\PipelineManageMainPanel.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Update="Properties\Resources.Designer.cs">
diff --git a/WinFrmUI/HStation.WinFrmUI.Basic/01-SysCatalogManage/SetSysPropForCatalogDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Basic/01-SysCatalogManage/SetSysPropForCatalogDlg.Designer.cs
index 392d799..7556fc8 100644
--- a/WinFrmUI/HStation.WinFrmUI.Basic/01-SysCatalogManage/SetSysPropForCatalogDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Basic/01-SysCatalogManage/SetSysPropForCatalogDlg.Designer.cs
@@ -107,6 +107,7 @@
gridView1.GridControl = gridControl1;
gridView1.Name = "gridView1";
gridView1.OptionsView.ShowGroupPanel = false;
+ gridView1.CustomDrawCell += gridView1_CustomDrawCell;
gridView1.ShowingEditor += gridView1_ShowingEditor;
//
// colGroupName
diff --git a/WinFrmUI/HStation.WinFrmUI.Basic/01-SysCatalogManage/SetSysPropForCatalogDlg.cs b/WinFrmUI/HStation.WinFrmUI.Basic/01-SysCatalogManage/SetSysPropForCatalogDlg.cs
index d36babd..10236aa 100644
--- a/WinFrmUI/HStation.WinFrmUI.Basic/01-SysCatalogManage/SetSysPropForCatalogDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Basic/01-SysCatalogManage/SetSysPropForCatalogDlg.cs
@@ -1,10 +1,4 @@
-锘縰sing DevExpress.XtraEditors;
-using DevExpress.XtraEditors.Repository;
-using System.Data;
-using System.Windows.Controls;
-using System.Windows.Forms;
-
-namespace HStation.WinFrmUI.Basic
+锘縩amespace HStation.WinFrmUI.Basic
{
public partial class SetSysPropForCatalogDlg : Form
{
@@ -81,10 +75,34 @@
private void gridView1_ShowingEditor(object sender, System.ComponentModel.CancelEventArgs e)
{
- /* if (quDaily.StatusEnum != QuDailyStatus.鎻愪氦)
- {
- e.Cancel = true;
- }*/
+ var vm = this.gridView1.GetCurrentViewModel(_allBindingList);
+ if (vm != null)
+ {
+ if (vm.Inherit)
+ {
+ e.Cancel = true;
+ }
+ }
+ }
+
+ private void gridView1_CustomDrawCell(object sender, DevExpress.XtraGrid.Views.Base.RowCellCustomDrawEventArgs e)
+ {
+ var gridView = sender as DevExpress.XtraGrid.Views.Grid.GridView;
+ if (gridView != null)
+ {
+ foreach (var item in _allBindingList)
+ {
+ int index = _allBindingList.IndexOf(item);
+ if (gridView.GetRowHandle(index) == e.RowHandle)
+ {
+ if (item.Inherit)
+ {
+ e.Appearance.BackColor = Color.Gray;
+ }
+ break;
+ }
+ }
+ }
}
}
}
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Dict.Core/ValveTypeTreeListCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Dict.Core/DictGroupTreeListCtrl.cs
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Dict.Core/ValveTypeTreeListCtrl.cs
rename to WinFrmUI/HStation.WinFrmUI.Dict.Core/DictGroupTreeListCtrl.cs
diff --git a/WinFrmUI/HStation.WinFrmUI.Dict.Core/ValveTypeTreeListCtrl.designer.cs b/WinFrmUI/HStation.WinFrmUI.Dict.Core/DictGroupTreeListCtrl.designer.cs
similarity index 98%
rename from WinFrmUI/HStation.WinFrmUI.Dict.Core/ValveTypeTreeListCtrl.designer.cs
rename to WinFrmUI/HStation.WinFrmUI.Dict.Core/DictGroupTreeListCtrl.designer.cs
index 054525c..a444759 100644
--- a/WinFrmUI/HStation.WinFrmUI.Dict.Core/ValveTypeTreeListCtrl.designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Dict.Core/DictGroupTreeListCtrl.designer.cs
@@ -79,6 +79,8 @@
bar1.DockRow = 0;
bar1.DockStyle = DevExpress.XtraBars.BarDockStyle.Top;
bar1.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] { new DevExpress.XtraBars.LinkPersistInfo(BtnAdd), new DevExpress.XtraBars.LinkPersistInfo(barBtnEdit), new DevExpress.XtraBars.LinkPersistInfo(barBtnDelete) });
+ bar1.OptionsBar.AllowQuickCustomization = false;
+ bar1.OptionsBar.DrawBorder = false;
bar1.OptionsBar.DrawDragBorder = false;
bar1.OptionsBar.MultiLine = true;
bar1.OptionsBar.UseWholeRow = true;
@@ -246,7 +248,7 @@
Controls.Add(barDockControlRight);
Controls.Add(barDockControlBottom);
Controls.Add(barDockControlTop);
- Name = "ValveTypeTreeListCtrl";
+ Name = "DictGroupTreeListCtrl";
Size = new Size(239, 569);
((System.ComponentModel.ISupportInitialize)barManager1).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControl1).EndInit();
diff --git a/WinFrmUI/HStation.WinFrmUI.Dict.Core/ValveTypeTreeListCtrl.resx b/WinFrmUI/HStation.WinFrmUI.Dict.Core/DictGroupTreeListCtrl.resx
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Dict.Core/ValveTypeTreeListCtrl.resx
rename to WinFrmUI/HStation.WinFrmUI.Dict.Core/DictGroupTreeListCtrl.resx
diff --git a/WinFrmUI/HStation.WinFrmUI.Dict.Core/ValveManageMainPanel.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Dict.Core/DictManageMainPanel.Designer.cs
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Dict.Core/ValveManageMainPanel.Designer.cs
rename to WinFrmUI/HStation.WinFrmUI.Dict.Core/DictManageMainPanel.Designer.cs
diff --git a/WinFrmUI/HStation.WinFrmUI.Dict.Core/ValveManageMainPanel.cs b/WinFrmUI/HStation.WinFrmUI.Dict.Core/DictManageMainPanel.cs
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Dict.Core/ValveManageMainPanel.cs
rename to WinFrmUI/HStation.WinFrmUI.Dict.Core/DictManageMainPanel.cs
diff --git a/WinFrmUI/HStation.WinFrmUI.Dict.Core/ValveManageMainPanel.resx b/WinFrmUI/HStation.WinFrmUI.Dict.Core/DictManageMainPanel.resx
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Dict.Core/ValveManageMainPanel.resx
rename to WinFrmUI/HStation.WinFrmUI.Dict.Core/DictManageMainPanel.resx
diff --git a/WinFrmUI/HStation.WinFrmUI.Dict.Core/HStation.WinFrmUI.Dict.Core.csproj b/WinFrmUI/HStation.WinFrmUI.Dict.Core/HStation.WinFrmUI.Dict.Core.csproj
index 3b2115a..e6a6c7a 100644
--- a/WinFrmUI/HStation.WinFrmUI.Dict.Core/HStation.WinFrmUI.Dict.Core.csproj
+++ b/WinFrmUI/HStation.WinFrmUI.Dict.Core/HStation.WinFrmUI.Dict.Core.csproj
@@ -36,10 +36,10 @@
<Compile Update="SetSysPropChoiceDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="ValveManageMainPanel.cs">
+ <Compile Update="DictManageMainPanel.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="ValveTypeTreeListCtrl.cs">
+ <Compile Update="DictGroupTreeListCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
</ItemGroup>
--
Gitblit v1.9.3