From 3b08b5c772ffc0c10644c1aaa9f7b2447582c858 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期一, 14 十月 2024 17:50:24 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Basic/00-SysTypeManage/SysTypeManageMainPanel.Designer.cs | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Basic/00-SysTypeManage/SysTypeManageMainPanel.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Basic/00-SysTypeManage/SysTypeManageMainPanel.Designer.cs
index 0d4efe7..273bdde 100644
--- a/WinFrmUI/HStation.WinFrmUI.Basic/00-SysTypeManage/SysTypeManageMainPanel.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Basic/00-SysTypeManage/SysTypeManageMainPanel.Designer.cs
@@ -39,7 +39,7 @@
dockManager1 = new DevExpress.XtraBars.Docking.DockManager(components);
dockPanel1 = new DevExpress.XtraBars.Docking.DockPanel();
dockPanel1_Container = new DevExpress.XtraBars.Docking.ControlContainer();
- moduleTreeListCtrl1 = new SysModuleTreeListCtrl();
+ moduleTreeListCtrl1 = new SysModuleListBoxCtrl();
gridControl1 = new DevExpress.XtraGrid.GridControl();
typeViewModelBindingSource = new BindingSource(components);
gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -119,6 +119,8 @@
//
// dockManager1
//
+ dockManager1.DockingOptions.ShowAutoHideButton = false;
+ dockManager1.DockingOptions.ShowCloseButton = false;
dockManager1.Form = this;
dockManager1.RootPanels.AddRange(new DevExpress.XtraBars.Docking.DockPanel[] { dockPanel1 });
dockManager1.TopZIndexControls.AddRange(new string[] { "DevExpress.XtraBars.BarDockControl", "DevExpress.XtraBars.StandaloneBarDockControl", "System.Windows.Forms.MenuStrip", "System.Windows.Forms.StatusStrip", "System.Windows.Forms.StatusBar", "DevExpress.XtraBars.Ribbon.RibbonStatusBar", "DevExpress.XtraBars.Ribbon.RibbonControl", "DevExpress.XtraBars.Navigation.OfficeNavigationBar", "DevExpress.XtraBars.Navigation.TileNavPane", "DevExpress.XtraBars.TabFormControl", "DevExpress.XtraBars.FluentDesignSystem.FluentDesignFormControl", "DevExpress.XtraBars.ToolbarForm.ToolbarFormControl" });
@@ -172,6 +174,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, colCode, colExtendTypeDisPlayName, colSortCode, colDescription });
gridView1.GridControl = gridControl1;
gridView1.Name = "gridView1";
@@ -215,7 +218,7 @@
colSortCode.FieldName = "SortCode";
colSortCode.Name = "colSortCode";
colSortCode.Visible = true;
- colSortCode.VisibleIndex = 3;
+ colSortCode.VisibleIndex = 4;
//
// colDescription
//
@@ -225,7 +228,7 @@
colDescription.FieldName = "Description";
colDescription.Name = "colDescription";
colDescription.Visible = true;
- colDescription.VisibleIndex = 4;
+ colDescription.VisibleIndex = 3;
//
// barButtonItem1
//
@@ -236,8 +239,7 @@
// svgImage32
//
svgImage32.ImageSize = new Size(32, 32);
- svgImage32.Add("bletter", "image://svgimages/outlook inspired/bletter.svg");
- svgImage32.Add("bold", "image://svgimages/outlook inspired/bold.svg");
+ svgImage32.Add("columntotalsposition", "image://svgimages/dashboards/columntotalsposition.svg");
//
// sidePanel1
//
@@ -293,7 +295,7 @@
private DevExpress.XtraGrid.Columns.GridColumn colCode;
private DevExpress.XtraGrid.Columns.GridColumn colSortCode;
private DevExpress.XtraGrid.Columns.GridColumn colDescription;
- private SysModuleTreeListCtrl moduleTreeListCtrl1;
+ private SysModuleListBoxCtrl moduleTreeListCtrl1;
private DevExpress.XtraGrid.Columns.GridColumn colExtendTypeDisPlayName;
private DevExpress.Utils.SvgImageCollection svgImage32;
private DevExpress.XtraEditors.SidePanel sidePanel1;
--
Gitblit v1.9.3