From 2049f3b9eaaea83c58a0d498bc6d998e29f41ac6 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期一, 23 九月 2024 11:37:08 +0800
Subject: [PATCH] 优化basic界面
---
WinFrmUI/HStation.WinFrmUI.Basic/00-SysTypeManage/SysTypeManageMainPanel.Designer.cs | 4
WinFrmUI/HStation.WinFrmUI.Assets.Core/01-PumpProductManage/PumpProductSeriesTreeListCtrl.resx | 26 +--
WinFrmUI/HStation.WinFrmUI.Basic/01-SysCatalogManage/SysTypeListBoxCtrl.resx | 82 +++++++++++--
WinFrmUI/HStation.WinFrmUI.Basic/02-SysPropManage/SysPropGroupTreeListCtrl.designer.cs | 18 +-
WinFrmUI/HStation.WinFrmUI.Dict.Core/DictManageMainPanel.Designer.cs | 6
WinFrmUI/HStation.WinFrmUI.Basic/00-SysTypeManage/SysModuleListBoxCtrl.resx | 26 +--
WinFrmUI/HStation.WinFrmUI.Basic/01-SysCatalogManage/SysTypeListBoxCtrl.cs | 23 +++
WinFrmUI/HStation.WinFrmUI.Basic/01-SysCatalogManage/SysTypeListBoxCtrl.designer.cs | 103 +++++++++++------
WinFrmUI/HStation.WinFrmUI.Basic/00-SysTypeManage/AddSysTypeDlg.Designer.cs | 5
WinFrmUI/HStation.WinFrmUI.Basic/02-SysPropManage/SysPropGroupTreeListCtrl.resx | 26 +--
10 files changed, 202 insertions(+), 117 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-PumpProductManage/PumpProductSeriesTreeListCtrl.resx b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-PumpProductManage/PumpProductSeriesTreeListCtrl.resx
index a32f55a..75191a4 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-PumpProductManage/PumpProductSeriesTreeListCtrl.resx
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-PumpProductManage/PumpProductSeriesTreeListCtrl.resx
@@ -249,26 +249,20 @@
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAFQEAAAC77u/
+ dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAANoCAAAC77u/
PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
- MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkdyZWVue2ZpbGw6IzAzOUMyMzt9Cgku
- QmxhY2t7ZmlsbDojNzI3MjcyO30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5ZZWxsb3d7ZmlsbDojRkZC
- MTE1O30KCS5CbHVle2ZpbGw6IzExNzdENzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
- Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8ZyBpZD0iRW5hYmxlU2Vh
- cmNoIj4NCiAgICA8cGF0aCBkPSJNMTQuNSwxNy44QzEwLjgsMTcuMSw4LDEzLjksOCwxMGMwLTQuNCwz
- LjYtOCw4LThzOCwzLjYsOCw4YzAsMS41LTAuNCwyLjgtMS4xLDRjMCwwLDAuMSwwLDAuMSwwICAgYzAu
- NywwLDEuNCwwLjEsMi4xLDAuMmMwLjYtMS4zLDAuOS0yLjcsMC45LTQuMmMwLTUuNS00LjUtMTAtMTAt
- MTBDMTAuNSwwLDYsNC41LDYsMTBjMCwyLjEsMC43LDQuMSwxLjgsNS43bC03LjUsNy42ICAgYy0wLjQs
- MC4zLTAuNCwwLjksMCwxLjNsMS4yLDEuMmMwLjMsMC4zLDAuOSwwLjMsMS4yLDBsNy42LTcuNmMwLjks
- MC42LDEuOSwxLjEsMi45LDEuNEMxMy42LDE5LDE0LDE4LjQsMTQuNSwxNy44eiIgY2xhc3M9IkJsdWUi
- IC8+DQogICAgPHBhdGggZD0iTTIzLDE2Yy00LjQsMC04LjEsMy05LDdjMC45LDQsNC42LDcsOSw3YzQu
- NCwwLDguMS0zLDktN0MzMS4xLDE5LDI3LjQsMTYsMjMsMTZ6IE0yMywyOGMtMy4zLDAtNi4xLTItNy01
- ICAgYzAuOS0zLDMuNy01LDctNXM2LjEsMiw3LDVDMjkuMSwyNiwyNi4zLDI4LDIzLDI4eiBNMjMsMjZj
- LTEuNywwLTMtMS4zLTMtM3MxLjMtMywzLTNzMywxLjMsMywzUzI0LjcsMjYsMjMsMjZ6IiBjbGFzcz0i
- QmxhY2siIC8+DQogIDwvZz4NCjwvc3ZnPgs=
+ MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z
+ ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz
+ OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp
+ dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9Ilpvb20iPg0KICAgIDxwYXRoIGQ9Ik0yNy43LDI1LjNM
+ MjAuNSwxOGMxLTEuNCwxLjUtMy4yLDEuNS01YzAtNS00LTktOS05cy05LDQtOSw5YzAsNSw0LDksOSw5
+ YzEuOSwwLDMuNi0wLjYsNS0xLjVsNy4zLDcuMyAgIGMwLjMsMC4zLDAuOSwwLjMsMS4yLDBsMS4yLTEu
+ MkMyOC4xLDI2LjIsMjguMSwyNS42LDI3LjcsMjUuM3ogTTYsMTNjMC0zLjksMy4xLTcsNy03czcsMy4x
+ LDcsN2MwLDMuOS0zLjEsNy03LDdTNiwxNi45LDYsMTN6IiBjbGFzcz0iQmxhY2siIC8+DQogIDwvZz4N
+ Cjwvc3ZnPgs=
</value>
</data>
<data name="BtnAddGroup.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
diff --git a/WinFrmUI/HStation.WinFrmUI.Basic/00-SysTypeManage/AddSysTypeDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Basic/00-SysTypeManage/AddSysTypeDlg.Designer.cs
index ee7c1ec..680d08e 100644
--- a/WinFrmUI/HStation.WinFrmUI.Basic/00-SysTypeManage/AddSysTypeDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Basic/00-SysTypeManage/AddSysTypeDlg.Designer.cs
@@ -128,6 +128,7 @@
//
// TextEditExtendType
//
+ TextEditExtendType.EditValue = "0";
TextEditExtendType.Location = new Point(79, 56);
TextEditExtendType.Name = "TextEditExtendType";
TextEditExtendType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
@@ -217,13 +218,13 @@
//
dxErrorProvider1.ContainerControl = this;
//
- // AddTypeDlg
+ // AddSysTypeDlg
//
AutoScaleDimensions = new SizeF(7F, 14F);
AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(511, 275);
Controls.Add(layoutControl1);
- Name = "AddTypeDlg";
+ Name = "AddSysTypeDlg";
StartPosition = FormStartPosition.CenterScreen;
Text = "娣诲姞绫诲瀷";
((System.ComponentModel.ISupportInitialize)layoutControl1).EndInit();
diff --git a/WinFrmUI/HStation.WinFrmUI.Basic/00-SysTypeManage/SysModuleListBoxCtrl.resx b/WinFrmUI/HStation.WinFrmUI.Basic/00-SysTypeManage/SysModuleListBoxCtrl.resx
index fa6066c..e14c609 100644
--- a/WinFrmUI/HStation.WinFrmUI.Basic/00-SysTypeManage/SysModuleListBoxCtrl.resx
+++ b/WinFrmUI/HStation.WinFrmUI.Basic/00-SysTypeManage/SysModuleListBoxCtrl.resx
@@ -194,26 +194,20 @@
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAFQEAAAC77u/
+ dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAANoCAAAC77u/
PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
- MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkdyZWVue2ZpbGw6IzAzOUMyMzt9Cgku
- QmxhY2t7ZmlsbDojNzI3MjcyO30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5ZZWxsb3d7ZmlsbDojRkZC
- MTE1O30KCS5CbHVle2ZpbGw6IzExNzdENzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
- Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8ZyBpZD0iRW5hYmxlU2Vh
- cmNoIj4NCiAgICA8cGF0aCBkPSJNMTQuNSwxNy44QzEwLjgsMTcuMSw4LDEzLjksOCwxMGMwLTQuNCwz
- LjYtOCw4LThzOCwzLjYsOCw4YzAsMS41LTAuNCwyLjgtMS4xLDRjMCwwLDAuMSwwLDAuMSwwICAgYzAu
- NywwLDEuNCwwLjEsMi4xLDAuMmMwLjYtMS4zLDAuOS0yLjcsMC45LTQuMmMwLTUuNS00LjUtMTAtMTAt
- MTBDMTAuNSwwLDYsNC41LDYsMTBjMCwyLjEsMC43LDQuMSwxLjgsNS43bC03LjUsNy42ICAgYy0wLjQs
- MC4zLTAuNCwwLjksMCwxLjNsMS4yLDEuMmMwLjMsMC4zLDAuOSwwLjMsMS4yLDBsNy42LTcuNmMwLjks
- MC42LDEuOSwxLjEsMi45LDEuNEMxMy42LDE5LDE0LDE4LjQsMTQuNSwxNy44eiIgY2xhc3M9IkJsdWUi
- IC8+DQogICAgPHBhdGggZD0iTTIzLDE2Yy00LjQsMC04LjEsMy05LDdjMC45LDQsNC42LDcsOSw3YzQu
- NCwwLDguMS0zLDktN0MzMS4xLDE5LDI3LjQsMTYsMjMsMTZ6IE0yMywyOGMtMy4zLDAtNi4xLTItNy01
- ICAgYzAuOS0zLDMuNy01LDctNXM2LjEsMiw3LDVDMjkuMSwyNiwyNi4zLDI4LDIzLDI4eiBNMjMsMjZj
- LTEuNywwLTMtMS4zLTMtM3MxLjMtMywzLTNzMywxLjMsMywzUzI0LjcsMjYsMjMsMjZ6IiBjbGFzcz0i
- QmxhY2siIC8+DQogIDwvZz4NCjwvc3ZnPgs=
+ MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z
+ ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz
+ OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp
+ dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9Ilpvb20iPg0KICAgIDxwYXRoIGQ9Ik0yNy43LDI1LjNM
+ MjAuNSwxOGMxLTEuNCwxLjUtMy4yLDEuNS01YzAtNS00LTktOS05cy05LDQtOSw5YzAsNSw0LDksOSw5
+ YzEuOSwwLDMuNi0wLjYsNS0xLjVsNy4zLDcuMyAgIGMwLjMsMC4zLDAuOSwwLjMsMS4yLDBsMS4yLTEu
+ MkMyOC4xLDI2LjIsMjguMSwyNS42LDI3LjcsMjUuM3ogTTYsMTNjMC0zLjksMy4xLTcsNy03czcsMy4x
+ LDcsN2MwLDMuOS0zLjEsNy03LDdTNiwxNi45LDYsMTN6IiBjbGFzcz0iQmxhY2siIC8+DQogIDwvZz4N
+ Cjwvc3ZnPgs=
</value>
</data>
<metadata name="moduleViewModelBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
diff --git a/WinFrmUI/HStation.WinFrmUI.Basic/00-SysTypeManage/SysTypeManageMainPanel.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Basic/00-SysTypeManage/SysTypeManageMainPanel.Designer.cs
index cce3477..66c5cdf 100644
--- a/WinFrmUI/HStation.WinFrmUI.Basic/00-SysTypeManage/SysTypeManageMainPanel.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Basic/00-SysTypeManage/SysTypeManageMainPanel.Designer.cs
@@ -217,7 +217,7 @@
colSortCode.FieldName = "SortCode";
colSortCode.Name = "colSortCode";
colSortCode.Visible = true;
- colSortCode.VisibleIndex = 3;
+ colSortCode.VisibleIndex = 4;
//
// colDescription
//
@@ -227,7 +227,7 @@
colDescription.FieldName = "Description";
colDescription.Name = "colDescription";
colDescription.Visible = true;
- colDescription.VisibleIndex = 4;
+ colDescription.VisibleIndex = 3;
//
// barButtonItem1
//
diff --git a/WinFrmUI/HStation.WinFrmUI.Basic/01-SysCatalogManage/SysTypeListBoxCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Basic/01-SysCatalogManage/SysTypeListBoxCtrl.cs
index a656ae5..275b258 100644
--- a/WinFrmUI/HStation.WinFrmUI.Basic/01-SysCatalogManage/SysTypeListBoxCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Basic/01-SysCatalogManage/SysTypeListBoxCtrl.cs
@@ -1,4 +1,5 @@
-锘縰sing DevExpress.XtraEditors;
+锘縰sing DevExpress.Utils;
+using DevExpress.XtraEditors;
using Yw.Basic;
namespace HStation.WinFrmUI.Basic
@@ -73,7 +74,7 @@
//妫�绱�
private void barCkSearch_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
- if (this.barCkSearch.Checked)
+ if (this.barBtnSearchBox.Checked)
layoutControlItemSearch.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always;
else
layoutControlItemSearch.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
@@ -109,5 +110,23 @@
{
this.treeList1.ExpandAll();
}
+
+ //鍏ㄩ儴灞曞紑
+ private void barBtnExpandAll_ItemClick_1(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ {
+ this.treeList1.ExpandAll();
+ }
+
+ //鍏ㄩ儴鎶樺彔
+ private void barBtnCollpseAll_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ {
+ this.treeList1.CollapseAll();
+ }
+
+ //灞曠ず鏍戠嚎
+ private void barCkTreeLine_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ {
+ this.treeList1.OptionsView.ShowTreeLines = this.barCkTreeLine.Checked ? DefaultBoolean.True : DefaultBoolean.False;
+ }
}
}
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Basic/01-SysCatalogManage/SysTypeListBoxCtrl.designer.cs b/WinFrmUI/HStation.WinFrmUI.Basic/01-SysCatalogManage/SysTypeListBoxCtrl.designer.cs
index 6cf8f52..2e65215 100644
--- a/WinFrmUI/HStation.WinFrmUI.Basic/01-SysCatalogManage/SysTypeListBoxCtrl.designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Basic/01-SysCatalogManage/SysTypeListBoxCtrl.designer.cs
@@ -32,7 +32,9 @@
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SysTypeListBoxCtrl));
barManager1 = new DevExpress.XtraBars.BarManager(components);
bar1 = new DevExpress.XtraBars.Bar();
- barCkSearch = new DevExpress.XtraBars.BarCheckItem();
+ barBtnExpandAll = new DevExpress.XtraBars.BarButtonItem();
+ barBtnCollpseAll = new DevExpress.XtraBars.BarButtonItem();
+ barBtnSearchBox = new DevExpress.XtraBars.BarCheckItem();
barDockControlTop = new DevExpress.XtraBars.BarDockControl();
barDockControlBottom = new DevExpress.XtraBars.BarDockControl();
barDockControlLeft = new DevExpress.XtraBars.BarDockControl();
@@ -42,11 +44,13 @@
barButtonItem3 = new DevExpress.XtraBars.BarButtonItem();
barRoot = new DevExpress.XtraBars.BarSubItem();
layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
+ searchControl1 = new DevExpress.XtraEditors.SearchControl();
treeList1 = new DevExpress.XtraTreeList.TreeList();
colName = new DevExpress.XtraTreeList.Columns.TreeListColumn();
moduleViewModelBindingSource = new BindingSource(components);
Root = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItemSearch = new DevExpress.XtraLayout.LayoutControlItem();
colAppearance = new DevExpress.XtraTreeList.Columns.TreeListColumn();
colAutoScrollMargin = new DevExpress.XtraTreeList.Columns.TreeListColumn();
colAutoScrollMinSize = new DevExpress.XtraTreeList.Columns.TreeListColumn();
@@ -79,19 +83,18 @@
barRootBasicInfoMgr = new DevExpress.XtraBars.BarSubItem();
popupMenu1 = new DevExpress.XtraBars.PopupMenu(components);
popupMenu2 = new DevExpress.XtraBars.PopupMenu(components);
- searchControl1 = new DevExpress.XtraEditors.SearchControl();
- layoutControlItemSearch = new DevExpress.XtraLayout.LayoutControlItem();
+ barCkTreeLine = new DevExpress.XtraBars.BarCheckItem();
((System.ComponentModel.ISupportInitialize)barManager1).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit();
layoutControl1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)searchControl1.Properties).BeginInit();
((System.ComponentModel.ISupportInitialize)treeList1).BeginInit();
((System.ComponentModel.ISupportInitialize)moduleViewModelBindingSource).BeginInit();
((System.ComponentModel.ISupportInitialize)Root).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem1).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItemSearch).BeginInit();
((System.ComponentModel.ISupportInitialize)popupMenu1).BeginInit();
((System.ComponentModel.ISupportInitialize)popupMenu2).BeginInit();
- ((System.ComponentModel.ISupportInitialize)searchControl1.Properties).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItemSearch).BeginInit();
SuspendLayout();
//
// barManager1
@@ -103,8 +106,8 @@
barManager1.DockControls.Add(barDockControlLeft);
barManager1.DockControls.Add(barDockControlRight);
barManager1.Form = this;
- barManager1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { barCkSearch, barButtonItem1, barButtonItem2, barButtonItem3 });
- barManager1.MaxItemId = 55;
+ barManager1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { barBtnSearchBox, barButtonItem1, barButtonItem2, barButtonItem3, barBtnExpandAll, barBtnCollpseAll, barCkTreeLine });
+ barManager1.MaxItemId = 59;
//
// bar1
//
@@ -113,7 +116,7 @@
bar1.DockCol = 0;
bar1.DockRow = 0;
bar1.DockStyle = DevExpress.XtraBars.BarDockStyle.Top;
- bar1.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] { new DevExpress.XtraBars.LinkPersistInfo(barCkSearch) });
+ bar1.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] { new DevExpress.XtraBars.LinkPersistInfo(barBtnExpandAll), new DevExpress.XtraBars.LinkPersistInfo(barBtnCollpseAll), new DevExpress.XtraBars.LinkPersistInfo(barBtnSearchBox), new DevExpress.XtraBars.LinkPersistInfo(barCkTreeLine) });
bar1.OptionsBar.AllowQuickCustomization = false;
bar1.OptionsBar.DrawBorder = false;
bar1.OptionsBar.DrawDragBorder = false;
@@ -121,14 +124,30 @@
bar1.OptionsBar.UseWholeRow = true;
bar1.Text = "Custom 2";
//
- // barCkSearch
+ // barBtnExpandAll
//
- barCkSearch.Caption = "妫�绱�";
- barCkSearch.Id = 37;
- barCkSearch.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barCkSearch.ImageOptions.SvgImage");
- barCkSearch.ImageOptions.SvgImageSize = new Size(22, 22);
- barCkSearch.Name = "barCkSearch";
- barCkSearch.CheckedChanged += barCkSearch_CheckedChanged;
+ barBtnExpandAll.Caption = "鍏ㄩ儴灞曞紑";
+ barBtnExpandAll.Id = 55;
+ barBtnExpandAll.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnExpandAll.ImageOptions.SvgImage");
+ barBtnExpandAll.Name = "barBtnExpandAll";
+ barBtnExpandAll.ItemClick += barBtnExpandAll_ItemClick_1;
+ //
+ // barBtnCollpseAll
+ //
+ barBtnCollpseAll.Caption = "鍏ㄩ儴鎶樺彔";
+ barBtnCollpseAll.Id = 56;
+ barBtnCollpseAll.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnCollpseAll.ImageOptions.SvgImage");
+ barBtnCollpseAll.Name = "barBtnCollpseAll";
+ barBtnCollpseAll.ItemClick += barBtnCollpseAll_ItemClick;
+ //
+ // barBtnSearchBox
+ //
+ barBtnSearchBox.Caption = "妫�绱�";
+ barBtnSearchBox.Id = 37;
+ barBtnSearchBox.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnSearchBox.ImageOptions.SvgImage");
+ barBtnSearchBox.ImageOptions.SvgImageSize = new Size(22, 22);
+ barBtnSearchBox.Name = "barBtnSearchBox";
+ barBtnSearchBox.CheckedChanged += barCkSearch_CheckedChanged;
//
// barDockControlTop
//
@@ -198,6 +217,16 @@
layoutControl1.TabIndex = 6;
layoutControl1.Text = "layoutControl1";
//
+ // searchControl1
+ //
+ searchControl1.Location = new Point(0, 0);
+ searchControl1.MenuManager = barManager1;
+ searchControl1.Name = "searchControl1";
+ searchControl1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Repository.ClearButton(), new DevExpress.XtraEditors.Repository.SearchButton() });
+ searchControl1.Size = new Size(276, 20);
+ searchControl1.StyleController = layoutControl1;
+ searchControl1.TabIndex = 5;
+ //
// treeList1
//
treeList1.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
@@ -244,6 +273,17 @@
layoutControlItem1.Size = new Size(276, 519);
layoutControlItem1.TextSize = new Size(0, 0);
layoutControlItem1.TextVisible = false;
+ //
+ // layoutControlItemSearch
+ //
+ layoutControlItemSearch.Control = searchControl1;
+ layoutControlItemSearch.Location = new Point(0, 0);
+ layoutControlItemSearch.Name = "layoutControlItemSearch";
+ layoutControlItemSearch.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
+ layoutControlItemSearch.Size = new Size(276, 20);
+ layoutControlItemSearch.TextSize = new Size(0, 0);
+ layoutControlItemSearch.TextVisible = false;
+ layoutControlItemSearch.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
//
// colAppearance
//
@@ -467,26 +507,12 @@
popupMenu2.Manager = barManager1;
popupMenu2.Name = "popupMenu2";
//
- // searchControl1
+ // barCkTreeLine
//
- searchControl1.Location = new Point(0, 0);
- searchControl1.MenuManager = barManager1;
- searchControl1.Name = "searchControl1";
- searchControl1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Repository.ClearButton(), new DevExpress.XtraEditors.Repository.SearchButton() });
- searchControl1.Size = new Size(276, 20);
- searchControl1.StyleController = layoutControl1;
- searchControl1.TabIndex = 5;
- //
- // layoutControlItemSearch
- //
- layoutControlItemSearch.Control = searchControl1;
- layoutControlItemSearch.Location = new Point(0, 0);
- layoutControlItemSearch.Name = "layoutControlItemSearch";
- layoutControlItemSearch.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- layoutControlItemSearch.Size = new Size(276, 20);
- layoutControlItemSearch.TextSize = new Size(0, 0);
- layoutControlItemSearch.TextVisible = false;
- layoutControlItemSearch.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
+ barCkTreeLine.Caption = "barCheckItem1";
+ barCkTreeLine.Id = 58;
+ barCkTreeLine.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barCkTreeLine.ImageOptions.SvgImage");
+ barCkTreeLine.Name = "barCkTreeLine";
//
// SysTypeListBoxCtrl
//
@@ -504,14 +530,14 @@
((System.ComponentModel.ISupportInitialize)barManager1).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControl1).EndInit();
layoutControl1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)searchControl1.Properties).EndInit();
((System.ComponentModel.ISupportInitialize)treeList1).EndInit();
((System.ComponentModel.ISupportInitialize)moduleViewModelBindingSource).EndInit();
((System.ComponentModel.ISupportInitialize)Root).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem1).EndInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItemSearch).EndInit();
((System.ComponentModel.ISupportInitialize)popupMenu1).EndInit();
((System.ComponentModel.ISupportInitialize)popupMenu2).EndInit();
- ((System.ComponentModel.ISupportInitialize)searchControl1.Properties).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItemSearch).EndInit();
ResumeLayout(false);
PerformLayout();
}
@@ -527,7 +553,7 @@
private DevExpress.XtraLayout.LayoutControlGroup Root;
private DevExpress.XtraBars.BarSubItem barRoot;
private DevExpress.XtraBars.BarSubItem barRootBasicInfoMgr;
- private DevExpress.XtraBars.BarCheckItem barCkSearch;
+ private DevExpress.XtraBars.BarCheckItem barBtnSearchBox;
private DevExpress.XtraBars.PopupMenu popupMenu1;
private DevExpress.XtraBars.PopupMenu popupMenu2;
private DevExpress.XtraBars.BarButtonItem barButtonItem1;
@@ -568,5 +594,8 @@
private DevExpress.XtraTreeList.Columns.TreeListColumn colName;
private DevExpress.XtraEditors.SearchControl searchControl1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItemSearch;
+ private DevExpress.XtraBars.BarButtonItem barBtnExpandAll;
+ private DevExpress.XtraBars.BarButtonItem barBtnCollpseAll;
+ private DevExpress.XtraBars.BarCheckItem barCkTreeLine;
}
}
diff --git a/WinFrmUI/HStation.WinFrmUI.Basic/01-SysCatalogManage/SysTypeListBoxCtrl.resx b/WinFrmUI/HStation.WinFrmUI.Basic/01-SysCatalogManage/SysTypeListBoxCtrl.resx
index f6867cf..4c05220 100644
--- a/WinFrmUI/HStation.WinFrmUI.Basic/01-SysCatalogManage/SysTypeListBoxCtrl.resx
+++ b/WinFrmUI/HStation.WinFrmUI.Basic/01-SysCatalogManage/SysTypeListBoxCtrl.resx
@@ -121,11 +121,68 @@
<value>17, 17</value>
</metadata>
<assembly alias="DevExpress.Data.v23.2" name="DevExpress.Data.v23.2, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
- <data name="barCkSearch.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <data name="barBtnExpandAll.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAFQEAAAC77u/
+ dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAALACAAAC77u/
+ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+ IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+ MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+ Y2U9InByZXNlcnZlIiBpZD0iRXhwYW5kX0ZpZWxkIiBzdHlsZT0iZW5hYmxlLWJhY2tncm91bmQ6bmV3
+ IDAgMCAzMiAzMiI+DQogIDxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+CgkuQmxhY2t7ZmlsbDojNzI3Mjcy
+ O30KCS5HcmVlbntmaWxsOiMwMzlDMjM7fQoJLnN0MHtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8
+ cG9seWdvbiBwb2ludHM9IjE0LDYgMTAsNiAxMCwyIDYsMiA2LDYgMiw2IDIsMTAgNiwxMCA2LDE0IDEw
+ LDE0IDEwLDEwIDE0LDEwICIgY2xhc3M9IkdyZWVuIiAvPg0KICA8ZyBjbGFzcz0ic3QwIj4NCiAgICA8
+ cGF0aCBkPSJNMjIsNmgxMHYySDIyVjZ6IE0yMiwxMmgxMHYtMkgyMlYxMnogTTIyLDIwaDEwdi0ySDIy
+ VjIweiBNMjIsMjRoMTB2LTJIMjJWMjR6IiBjbGFzcz0iQmxhY2siIC8+DQogIDwvZz4NCiAgPHBhdGgg
+ ZD0iTTE4LDJoMTR2MkgxOFYyeiBNMTgsMTZoMTR2LTJIMThWMTZ6IE0xOCwyOGgxNHYtMkgxOFYyOHoi
+ IGNsYXNzPSJCbGFjayIgLz4NCjwvc3ZnPgs=
+</value>
+ </data>
+ <data name="barBtnCollpseAll.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
+ LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+ dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAIcCAAAC77u/
+ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+ IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+ MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+ Y2U9InByZXNlcnZlIiBpZD0iQ29sbGFwc2VfRmllbGQiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpu
+ ZXcgMCAwIDMyIDMyIj4NCiAgPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KCS5CbGFja3tmaWxsOiM3Mjcy
+ NzI7fQoJLlJlZHtmaWxsOiNEMTFDMUM7fQoJLnN0MHtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8
+ cmVjdCB4PSIyIiB5PSI2IiB3aWR0aD0iMTIiIGhlaWdodD0iNCIgY2xhc3M9IlJlZCIgLz4NCiAgPGcg
+ Y2xhc3M9InN0MCI+DQogICAgPHBhdGggZD0iTTIyLDZoMTB2MkgyMlY2eiBNMjIsMTJoMTB2LTJIMjJW
+ MTJ6IE0yMiwyMGgxMHYtMkgyMlYyMHogTTIyLDI0aDEwdi0ySDIyVjI0eiIgY2xhc3M9IkJsYWNrIiAv
+ Pg0KICA8L2c+DQogIDxwYXRoIGQ9Ik0xOCwyaDE0djJIMThWMnogTTE4LDE2aDE0di0ySDE4VjE2eiBN
+ MTgsMjhoMTR2LTJIMThWMjh6IiBjbGFzcz0iQmxhY2siIC8+DQo8L3N2Zz4L
+</value>
+ </data>
+ <data name="barBtnSearchBox.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
+ LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+ dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAANoCAAAC77u/
+ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+ IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+ MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+ Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+ MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z
+ ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz
+ OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp
+ dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9Ilpvb20iPg0KICAgIDxwYXRoIGQ9Ik0yNy43LDI1LjNM
+ MjAuNSwxOGMxLTEuNCwxLjUtMy4yLDEuNS01YzAtNS00LTktOS05cy05LDQtOSw5YzAsNSw0LDksOSw5
+ YzEuOSwwLDMuNi0wLjYsNS0xLjVsNy4zLDcuMyAgIGMwLjMsMC4zLDAuOSwwLjMsMS4yLDBsMS4yLTEu
+ MkMyOC4xLDI2LjIsMjguMSwyNS42LDI3LjcsMjUuM3ogTTYsMTNjMC0zLjksMy4xLTcsNy03czcsMy4x
+ LDcsN2MwLDMuOS0zLjEsNy03LDdTNiwxNi45LDYsMTN6IiBjbGFzcz0iQmxhY2siIC8+DQogIDwvZz4N
+ Cjwvc3ZnPgs=
+</value>
+ </data>
+ <data name="barCkTreeLine.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
+ LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+ dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAIkDAAAC77u/
PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
@@ -133,18 +190,15 @@
MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkdyZWVue2ZpbGw6IzAzOUMyMzt9Cgku
QmxhY2t7ZmlsbDojNzI3MjcyO30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5ZZWxsb3d7ZmlsbDojRkZC
MTE1O30KCS5CbHVle2ZpbGw6IzExNzdENzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
- Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8ZyBpZD0iRW5hYmxlU2Vh
- cmNoIj4NCiAgICA8cGF0aCBkPSJNMTQuNSwxNy44QzEwLjgsMTcuMSw4LDEzLjksOCwxMGMwLTQuNCwz
- LjYtOCw4LThzOCwzLjYsOCw4YzAsMS41LTAuNCwyLjgtMS4xLDRjMCwwLDAuMSwwLDAuMSwwICAgYzAu
- NywwLDEuNCwwLjEsMi4xLDAuMmMwLjYtMS4zLDAuOS0yLjcsMC45LTQuMmMwLTUuNS00LjUtMTAtMTAt
- MTBDMTAuNSwwLDYsNC41LDYsMTBjMCwyLjEsMC43LDQuMSwxLjgsNS43bC03LjUsNy42ICAgYy0wLjQs
- MC4zLTAuNCwwLjksMCwxLjNsMS4yLDEuMmMwLjMsMC4zLDAuOSwwLjMsMS4yLDBsNy42LTcuNmMwLjks
- MC42LDEuOSwxLjEsMi45LDEuNEMxMy42LDE5LDE0LDE4LjQsMTQuNSwxNy44eiIgY2xhc3M9IkJsdWUi
- IC8+DQogICAgPHBhdGggZD0iTTIzLDE2Yy00LjQsMC04LjEsMy05LDdjMC45LDQsNC42LDcsOSw3YzQu
- NCwwLDguMS0zLDktN0MzMS4xLDE5LDI3LjQsMTYsMjMsMTZ6IE0yMywyOGMtMy4zLDAtNi4xLTItNy01
- ICAgYzAuOS0zLDMuNy01LDctNXM2LjEsMiw3LDVDMjkuMSwyNiwyNi4zLDI4LDIzLDI4eiBNMjMsMjZj
- LTEuNywwLTMtMS4zLTMtM3MxLjMtMywzLTNzMywxLjMsMywzUzI0LjcsMjYsMjMsMjZ6IiBjbGFzcz0i
- QmxhY2siIC8+DQogIDwvZz4NCjwvc3ZnPgs=
+ Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8ZyBpZD0iSW5zZXJ0VHJl
+ ZVZpZXciPg0KICAgIDxwYXRoIGQ9Ik0xMyw4SDVDNC40LDgsNCw3LjYsNCw3VjNjMC0wLjUsMC40LTEs
+ MS0xaDhjMC42LDAsMSwwLjUsMSwxdjRDMTQsNy42LDEzLjYsOCwxMyw4eiBNMjYsMTd2LTQgICBjMC0w
+ LjYtMC41LTEtMS0xaC04Yy0wLjUsMC0xLDAuNC0xLDF2NGMwLDAuNSwwLjUsMSwxLDFoOEMyNS41LDE4
+ LDI2LDE3LjUsMjYsMTd6IE0yNiwyN3YtNGMwLTAuNS0wLjUtMS0xLTFoLThjLTAuNSwwLTEsMC41LTEs
+ MSAgIHY0YzAsMC41LDAuNSwxLDEsMWg4QzI1LjUsMjgsMjYsMjcuNSwyNiwyN3oiIGNsYXNzPSJZZWxs
+ b3ciIC8+DQogICAgPHBvbHlnb24gcG9pbnRzPSIxNCwxNiAxNCwxNCAxMCwxNCAxMCwxMCA4LDEwIDgs
+ MjYgMTQsMjYgMTQsMjQgMTAsMjQgMTAsMTYgICIgY2xhc3M9IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2
+ Zz4L
</value>
</data>
<metadata name="moduleViewModelBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
diff --git a/WinFrmUI/HStation.WinFrmUI.Basic/02-SysPropManage/SysPropGroupTreeListCtrl.designer.cs b/WinFrmUI/HStation.WinFrmUI.Basic/02-SysPropManage/SysPropGroupTreeListCtrl.designer.cs
index 38e304b..f8cc91c 100644
--- a/WinFrmUI/HStation.WinFrmUI.Basic/02-SysPropManage/SysPropGroupTreeListCtrl.designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Basic/02-SysPropManage/SysPropGroupTreeListCtrl.designer.cs
@@ -48,6 +48,7 @@
typeTreeListLookUpEdit1 = new SysTypeTreeListLookUpEdit();
treeList1 = new DevExpress.XtraTreeList.TreeList();
colName = new DevExpress.XtraTreeList.Columns.TreeListColumn();
+ propGroupTreeListViewModelBindingSource = new BindingSource(components);
Root = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -83,17 +84,16 @@
barRootBasicInfoMgr = new DevExpress.XtraBars.BarSubItem();
popupMenu1 = new DevExpress.XtraBars.PopupMenu(components);
popupMenu2 = new DevExpress.XtraBars.PopupMenu(components);
- propGroupTreeListViewModelBindingSource = new BindingSource(components);
((System.ComponentModel.ISupportInitialize)barManager1).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit();
layoutControl1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)treeList1).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)propGroupTreeListViewModelBindingSource).BeginInit();
((System.ComponentModel.ISupportInitialize)Root).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem1).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem2).BeginInit();
((System.ComponentModel.ISupportInitialize)popupMenu1).BeginInit();
((System.ComponentModel.ISupportInitialize)popupMenu2).BeginInit();
- ((System.ComponentModel.ISupportInitialize)propGroupTreeListViewModelBindingSource).BeginInit();
SuspendLayout();
//
// barManager1
@@ -255,6 +255,10 @@
colName.Name = "colName";
colName.Visible = true;
colName.VisibleIndex = 0;
+ //
+ // propGroupTreeListViewModelBindingSource
+ //
+ propGroupTreeListViewModelBindingSource.DataSource = typeof(SysPropGroupTreeListViewModel);
//
// Root
//
@@ -508,11 +512,7 @@
popupMenu2.Manager = barManager1;
popupMenu2.Name = "popupMenu2";
//
- // propGroupTreeListViewModelBindingSource
- //
- propGroupTreeListViewModelBindingSource.DataSource = typeof(SysPropGroupTreeListViewModel);
- //
- // PropGroupTreeListCtrl
+ // SysPropGroupTreeListCtrl
//
Appearance.BackColor = SystemColors.Control;
Appearance.Options.UseBackColor = true;
@@ -523,18 +523,18 @@
Controls.Add(barDockControlRight);
Controls.Add(barDockControlBottom);
Controls.Add(barDockControlTop);
- Name = "PropGroupTreeListCtrl";
+ Name = "SysPropGroupTreeListCtrl";
Size = new Size(276, 569);
((System.ComponentModel.ISupportInitialize)barManager1).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControl1).EndInit();
layoutControl1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)treeList1).EndInit();
+ ((System.ComponentModel.ISupportInitialize)propGroupTreeListViewModelBindingSource).EndInit();
((System.ComponentModel.ISupportInitialize)Root).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem1).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem2).EndInit();
((System.ComponentModel.ISupportInitialize)popupMenu1).EndInit();
((System.ComponentModel.ISupportInitialize)popupMenu2).EndInit();
- ((System.ComponentModel.ISupportInitialize)propGroupTreeListViewModelBindingSource).EndInit();
ResumeLayout(false);
PerformLayout();
}
diff --git a/WinFrmUI/HStation.WinFrmUI.Basic/02-SysPropManage/SysPropGroupTreeListCtrl.resx b/WinFrmUI/HStation.WinFrmUI.Basic/02-SysPropManage/SysPropGroupTreeListCtrl.resx
index fa3768b..7d17aba 100644
--- a/WinFrmUI/HStation.WinFrmUI.Basic/02-SysPropManage/SysPropGroupTreeListCtrl.resx
+++ b/WinFrmUI/HStation.WinFrmUI.Basic/02-SysPropManage/SysPropGroupTreeListCtrl.resx
@@ -194,26 +194,20 @@
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAFQEAAAC77u/
+ dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAANoCAAAC77u/
PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
- MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkdyZWVue2ZpbGw6IzAzOUMyMzt9Cgku
- QmxhY2t7ZmlsbDojNzI3MjcyO30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5ZZWxsb3d7ZmlsbDojRkZC
- MTE1O30KCS5CbHVle2ZpbGw6IzExNzdENzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
- Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8ZyBpZD0iRW5hYmxlU2Vh
- cmNoIj4NCiAgICA8cGF0aCBkPSJNMTQuNSwxNy44QzEwLjgsMTcuMSw4LDEzLjksOCwxMGMwLTQuNCwz
- LjYtOCw4LThzOCwzLjYsOCw4YzAsMS41LTAuNCwyLjgtMS4xLDRjMCwwLDAuMSwwLDAuMSwwICAgYzAu
- NywwLDEuNCwwLjEsMi4xLDAuMmMwLjYtMS4zLDAuOS0yLjcsMC45LTQuMmMwLTUuNS00LjUtMTAtMTAt
- MTBDMTAuNSwwLDYsNC41LDYsMTBjMCwyLjEsMC43LDQuMSwxLjgsNS43bC03LjUsNy42ICAgYy0wLjQs
- MC4zLTAuNCwwLjksMCwxLjNsMS4yLDEuMmMwLjMsMC4zLDAuOSwwLjMsMS4yLDBsNy42LTcuNmMwLjks
- MC42LDEuOSwxLjEsMi45LDEuNEMxMy42LDE5LDE0LDE4LjQsMTQuNSwxNy44eiIgY2xhc3M9IkJsdWUi
- IC8+DQogICAgPHBhdGggZD0iTTIzLDE2Yy00LjQsMC04LjEsMy05LDdjMC45LDQsNC42LDcsOSw3YzQu
- NCwwLDguMS0zLDktN0MzMS4xLDE5LDI3LjQsMTYsMjMsMTZ6IE0yMywyOGMtMy4zLDAtNi4xLTItNy01
- ICAgYzAuOS0zLDMuNy01LDctNXM2LjEsMiw3LDVDMjkuMSwyNiwyNi4zLDI4LDIzLDI4eiBNMjMsMjZj
- LTEuNywwLTMtMS4zLTMtM3MxLjMtMywzLTNzMywxLjMsMywzUzI0LjcsMjYsMjMsMjZ6IiBjbGFzcz0i
- QmxhY2siIC8+DQogIDwvZz4NCjwvc3ZnPgs=
+ MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z
+ ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz
+ OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp
+ dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9Ilpvb20iPg0KICAgIDxwYXRoIGQ9Ik0yNy43LDI1LjNM
+ MjAuNSwxOGMxLTEuNCwxLjUtMy4yLDEuNS01YzAtNS00LTktOS05cy05LDQtOSw5YzAsNSw0LDksOSw5
+ YzEuOSwwLDMuNi0wLjYsNS0xLjVsNy4zLDcuMyAgIGMwLjMsMC4zLDAuOSwwLjMsMS4yLDBsMS4yLTEu
+ MkMyOC4xLDI2LjIsMjguMSwyNS42LDI3LjcsMjUuM3ogTTYsMTNjMC0zLjksMy4xLTcsNy03czcsMy4x
+ LDcsN2MwLDMuOS0zLjEsNy03LDdTNiwxNi45LDYsMTN6IiBjbGFzcz0iQmxhY2siIC8+DQogIDwvZz4N
+ Cjwvc3ZnPgs=
</value>
</data>
<metadata name="propGroupTreeListViewModelBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
diff --git a/WinFrmUI/HStation.WinFrmUI.Dict.Core/DictManageMainPanel.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Dict.Core/DictManageMainPanel.Designer.cs
index f36e70b..a424d75 100644
--- a/WinFrmUI/HStation.WinFrmUI.Dict.Core/DictManageMainPanel.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Dict.Core/DictManageMainPanel.Designer.cs
@@ -167,7 +167,7 @@
//
gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
gridView1.Appearance.HeaderPanel.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
- gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colCode, colDescription, colSortCode, colDictValue });
+ gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colCode, colDescription, colDictValue, colSortCode });
gridView1.GridControl = gridControl1;
gridView1.Name = "gridView1";
gridView1.OptionsView.ShowGroupPanel = false;
@@ -194,7 +194,7 @@
colDescription.FieldName = "Description";
colDescription.Name = "colDescription";
colDescription.Visible = true;
- colDescription.VisibleIndex = 3;
+ colDescription.VisibleIndex = 2;
colDescription.Width = 380;
//
// colSortCode
@@ -202,7 +202,7 @@
colSortCode.FieldName = "SortCode";
colSortCode.Name = "colSortCode";
colSortCode.Visible = true;
- colSortCode.VisibleIndex = 2;
+ colSortCode.VisibleIndex = 3;
colSortCode.Width = 123;
//
// colDictValue
--
Gitblit v1.9.3