From f7d479db638f3d9e3aeb05ec82dc2818f14bf903 Mon Sep 17 00:00:00 2001
From: ningshuxia <ningshuxia0927@outlook.com>
Date: 星期一, 24 三月 2025 17:25:20 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/PBS.WinFrmUI/01-place/PlaceMgrPage.Designer.cs | 202 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 154 insertions(+), 48 deletions(-)
diff --git a/WinFrmUI/PBS.WinFrmUI/01-place/PlaceMgrPage.Designer.cs b/WinFrmUI/PBS.WinFrmUI/01-place/PlaceMgrPage.Designer.cs
index 3151fbe..d5cc7ad 100644
--- a/WinFrmUI/PBS.WinFrmUI/01-place/PlaceMgrPage.Designer.cs
+++ b/WinFrmUI/PBS.WinFrmUI/01-place/PlaceMgrPage.Designer.cs
@@ -5,7 +5,7 @@
using System.Drawing;
using System.Windows.Forms;
-namespace HStation.WinFrmUI.PBS
+namespace PBS.WinFrmUI
{
partial class PlaceMgrPage
{
@@ -36,12 +36,14 @@
private void InitializeComponent()
{
components = new Container();
+ ComponentResourceManager resources = new ComponentResourceManager(typeof(PlaceMgrPage));
gridControl1 = new DevExpress.XtraGrid.GridControl();
placeViewModelBindingSource = new BindingSource(components);
gridView1 = new GridView();
- colID = new DevExpress.XtraGrid.Columns.GridColumn();
- colRegionID = new DevExpress.XtraGrid.Columns.GridColumn();
colName = new DevExpress.XtraGrid.Columns.GridColumn();
+ gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+ repositoryItemTreeListLookUpEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemTreeListLookUpEdit();
+ repositoryItemTreeListLookUpEdit1TreeList = new DevExpress.XtraTreeList.TreeList();
colPlaceType = new DevExpress.XtraGrid.Columns.GridColumn();
colPlaceInfo = new DevExpress.XtraGrid.Columns.GridColumn();
colAddress = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -55,7 +57,6 @@
barBtnEdit = new DevExpress.XtraBars.BarButtonItem();
barBtnRefresh = new DevExpress.XtraBars.BarButtonItem();
barBtnDelete = new DevExpress.XtraBars.BarButtonItem();
- barBtnUpdateSortCode = new DevExpress.XtraBars.BarButtonItem();
barBtnDetail = new DevExpress.XtraBars.BarButtonItem();
barBtnUpdateTagName = new DevExpress.XtraBars.BarButtonItem();
barBtnUpdateUseStatus = new DevExpress.XtraBars.BarButtonItem();
@@ -65,22 +66,34 @@
btnAddschool = new DevExpress.XtraBars.BarButtonItem();
btnAddHospital = new DevExpress.XtraBars.BarButtonItem();
btnAddShop = new DevExpress.XtraBars.BarButtonItem();
+ barCkDrag = new DevExpress.XtraBars.BarCheckItem();
+ barBtnUp = new DevExpress.XtraBars.BarButtonItem();
+ barBtnDown = new DevExpress.XtraBars.BarButtonItem();
ribbonPage = new DevExpress.XtraBars.Ribbon.RibbonPage();
ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
+ ribbonPageGroup2 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
+ behaviorManager1 = new DevExpress.Utils.Behaviors.BehaviorManager(components);
+ dragDropEvents1 = new DevExpress.Utils.DragDrop.DragDropEvents(components);
((ISupportInitialize)gridControl1).BeginInit();
((ISupportInitialize)placeViewModelBindingSource).BeginInit();
((ISupportInitialize)gridView1).BeginInit();
+ ((ISupportInitialize)repositoryItemTreeListLookUpEdit1).BeginInit();
+ ((ISupportInitialize)repositoryItemTreeListLookUpEdit1TreeList).BeginInit();
((ISupportInitialize)ribbonControl1).BeginInit();
+ ((ISupportInitialize)behaviorManager1).BeginInit();
SuspendLayout();
//
// gridControl1
//
gridControl1.DataSource = placeViewModelBindingSource;
gridControl1.Dock = DockStyle.Fill;
- gridControl1.Location = new Point(0, 104);
+ gridControl1.EmbeddedNavigator.Margin = new Padding(3, 4, 3, 4);
+ gridControl1.Location = new Point(0, 128);
gridControl1.MainView = gridView1;
+ gridControl1.Margin = new Padding(3, 4, 3, 4);
gridControl1.Name = "gridControl1";
- gridControl1.Size = new Size(818, 577);
+ gridControl1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { repositoryItemTreeListLookUpEdit1 });
+ gridControl1.Size = new Size(935, 748);
gridControl1.TabIndex = 18;
gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView1 });
//
@@ -90,163 +103,206 @@
//
// gridView1
//
- gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colID, colRegionID, colName, colPlaceType, colPlaceInfo, colAddress, colParas, colFlags, colTagName, colUseStatus, colSortCode, colDescription });
+ behaviorManager1.SetBehaviors(gridView1, new DevExpress.Utils.Behaviors.Behavior[] { DevExpress.Utils.DragDrop.DragDropBehavior.Create(typeof(DevExpress.XtraGrid.Extensions.ColumnViewDragDropSource), true, true, true, true, dragDropEvents1) });
+ gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, gridColumn1, colPlaceType, colPlaceInfo, colAddress, colParas, colFlags, colTagName, colUseStatus, colSortCode, colDescription });
+ gridView1.DetailHeight = 450;
gridView1.GridControl = gridControl1;
gridView1.Name = "gridView1";
gridView1.OptionsDetail.EnableMasterViewMode = false;
- //
- // colID
- //
- colID.FieldName = "ID";
- colID.Name = "colID";
- colID.Visible = true;
- colID.VisibleIndex = 0;
- //
- // colRegionID
- //
- colRegionID.FieldName = "RegionID";
- colRegionID.Name = "colRegionID";
- colRegionID.Visible = true;
- colRegionID.VisibleIndex = 1;
+ gridView1.OptionsEditForm.PopupEditFormWidth = 914;
+ gridView1.OptionsView.ShowGroupPanel = false;
//
// colName
//
colName.FieldName = "Name";
+ colName.MinWidth = 23;
colName.Name = "colName";
colName.Visible = true;
- colName.VisibleIndex = 2;
+ colName.VisibleIndex = 0;
+ colName.Width = 114;
+ //
+ // gridColumn1
+ //
+ gridColumn1.Caption = "鍦板尯";
+ gridColumn1.ColumnEdit = repositoryItemTreeListLookUpEdit1;
+ gridColumn1.FieldName = "RegionID";
+ gridColumn1.MinWidth = 25;
+ gridColumn1.Name = "gridColumn1";
+ gridColumn1.Visible = true;
+ gridColumn1.VisibleIndex = 2;
+ gridColumn1.Width = 57;
+ //
+ // repositoryItemTreeListLookUpEdit1
+ //
+ repositoryItemTreeListLookUpEdit1.AutoHeight = false;
+ repositoryItemTreeListLookUpEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
+ repositoryItemTreeListLookUpEdit1.DisplayMember = "Name";
+ repositoryItemTreeListLookUpEdit1.Name = "repositoryItemTreeListLookUpEdit1";
+ repositoryItemTreeListLookUpEdit1.TreeList = repositoryItemTreeListLookUpEdit1TreeList;
+ repositoryItemTreeListLookUpEdit1.ValueMember = "ID";
+ //
+ // repositoryItemTreeListLookUpEdit1TreeList
+ //
+ repositoryItemTreeListLookUpEdit1TreeList.Location = new Point(0, 0);
+ repositoryItemTreeListLookUpEdit1TreeList.Name = "repositoryItemTreeListLookUpEdit1TreeList";
+ repositoryItemTreeListLookUpEdit1TreeList.OptionsView.ShowIndentAsRowStyle = true;
+ repositoryItemTreeListLookUpEdit1TreeList.Size = new Size(400, 200);
+ repositoryItemTreeListLookUpEdit1TreeList.TabIndex = 0;
//
// colPlaceType
//
colPlaceType.FieldName = "PlaceType";
+ colPlaceType.MinWidth = 23;
colPlaceType.Name = "colPlaceType";
colPlaceType.Visible = true;
- colPlaceType.VisibleIndex = 3;
+ colPlaceType.VisibleIndex = 1;
+ colPlaceType.Width = 74;
//
// colPlaceInfo
//
colPlaceInfo.FieldName = "PlaceInfo";
+ colPlaceInfo.MinWidth = 23;
colPlaceInfo.Name = "colPlaceInfo";
- colPlaceInfo.Visible = true;
- colPlaceInfo.VisibleIndex = 4;
+ colPlaceInfo.Width = 86;
//
// colAddress
//
colAddress.FieldName = "Address";
+ colAddress.MinWidth = 23;
colAddress.Name = "colAddress";
colAddress.Visible = true;
- colAddress.VisibleIndex = 5;
+ colAddress.VisibleIndex = 3;
+ colAddress.Width = 239;
//
// colParas
//
colParas.FieldName = "Paras";
+ colParas.MinWidth = 23;
colParas.Name = "colParas";
- colParas.Visible = true;
- colParas.VisibleIndex = 6;
+ colParas.Width = 86;
//
// colFlags
//
colFlags.FieldName = "Flags";
+ colFlags.MinWidth = 23;
colFlags.Name = "colFlags";
colFlags.Visible = true;
- colFlags.VisibleIndex = 7;
+ colFlags.VisibleIndex = 4;
+ colFlags.Width = 108;
//
// colTagName
//
colTagName.FieldName = "TagName";
+ colTagName.MinWidth = 23;
colTagName.Name = "colTagName";
colTagName.Visible = true;
- colTagName.VisibleIndex = 8;
+ colTagName.VisibleIndex = 5;
+ colTagName.Width = 108;
//
// colUseStatus
//
colUseStatus.FieldName = "UseStatus";
+ colUseStatus.MinWidth = 23;
colUseStatus.Name = "colUseStatus";
colUseStatus.Visible = true;
- colUseStatus.VisibleIndex = 9;
+ colUseStatus.VisibleIndex = 6;
+ colUseStatus.Width = 108;
//
// colSortCode
//
colSortCode.FieldName = "SortCode";
+ colSortCode.MinWidth = 23;
colSortCode.Name = "colSortCode";
- colSortCode.Visible = true;
- colSortCode.VisibleIndex = 10;
+ colSortCode.Width = 86;
//
// colDescription
//
colDescription.FieldName = "Description";
+ colDescription.MinWidth = 23;
colDescription.Name = "colDescription";
colDescription.Visible = true;
- colDescription.VisibleIndex = 11;
+ colDescription.VisibleIndex = 7;
+ colDescription.Width = 119;
//
// ribbonControl1
//
ribbonControl1.DrawGroupsBorderMode = DefaultBoolean.False;
+ ribbonControl1.EmptyAreaImageOptions.ImagePadding = new Padding(34, 39, 34, 39);
ribbonControl1.ExpandCollapseItem.Id = 0;
ribbonControl1.ItemPanelStyle = DevExpress.XtraBars.Ribbon.RibbonItemPanelStyle.Classic;
- ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnEdit, barBtnRefresh, barBtnDelete, barBtnUpdateSortCode, barBtnDetail, barBtnUpdateTagName, barBtnUpdateUseStatus, barCekSearch, barSubItem1, btnAddBuilding, btnAddschool, btnAddHospital, btnAddShop });
+ ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnEdit, barBtnRefresh, barBtnDelete, barBtnDetail, barBtnUpdateTagName, barBtnUpdateUseStatus, barCekSearch, barSubItem1, btnAddBuilding, btnAddschool, btnAddHospital, btnAddShop, barCkDrag, barBtnUp, barBtnDown });
ribbonControl1.Location = new Point(0, 0);
- ribbonControl1.MaxItemId = 36;
+ ribbonControl1.Margin = new Padding(3, 4, 3, 4);
+ ribbonControl1.MaxItemId = 39;
ribbonControl1.Name = "ribbonControl1";
+ ribbonControl1.OptionsMenuMinWidth = 377;
ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage });
ribbonControl1.ShowApplicationButton = DefaultBoolean.False;
ribbonControl1.ShowExpandCollapseButton = DefaultBoolean.False;
ribbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide;
- ribbonControl1.Size = new Size(818, 104);
+ ribbonControl1.Size = new Size(935, 128);
ribbonControl1.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden;
//
// barBtnEdit
//
barBtnEdit.Caption = "缂栬緫";
barBtnEdit.Id = 17;
+ barBtnEdit.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnEdit.ImageOptions.SvgImage");
barBtnEdit.Name = "barBtnEdit";
+ barBtnEdit.ItemClick += barBtnEdit_ItemClick;
//
// barBtnRefresh
//
barBtnRefresh.Caption = "鍒锋柊";
barBtnRefresh.Id = 18;
+ barBtnRefresh.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnRefresh.ImageOptions.SvgImage");
barBtnRefresh.Name = "barBtnRefresh";
+ barBtnRefresh.ItemClick += barBtnRefresh_ItemClick;
//
// barBtnDelete
//
barBtnDelete.Caption = "鍒犻櫎";
barBtnDelete.Id = 19;
+ barBtnDelete.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnDelete.ImageOptions.SvgImage");
barBtnDelete.Name = "barBtnDelete";
- //
- // barBtnUpdateSortCode
- //
- barBtnUpdateSortCode.Caption = "鎺掑簭鐮�";
- barBtnUpdateSortCode.Id = 20;
- barBtnUpdateSortCode.Name = "barBtnUpdateSortCode";
+ barBtnDelete.ItemClick += barBtnDelete_ItemClick;
//
// barBtnDetail
//
barBtnDetail.Caption = "璇︽儏";
barBtnDetail.Id = 22;
+ barBtnDetail.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnDetail.ImageOptions.SvgImage");
barBtnDetail.Name = "barBtnDetail";
//
// barBtnUpdateTagName
//
barBtnUpdateTagName.Caption = "鏍囩鍚嶇О";
barBtnUpdateTagName.Id = 23;
+ barBtnUpdateTagName.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnUpdateTagName.ImageOptions.SvgImage");
barBtnUpdateTagName.Name = "barBtnUpdateTagName";
+ barBtnUpdateTagName.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
// barBtnUpdateUseStatus
//
barBtnUpdateUseStatus.Caption = "浣跨敤鐘舵��";
barBtnUpdateUseStatus.Id = 24;
+ barBtnUpdateUseStatus.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnUpdateUseStatus.ImageOptions.SvgImage");
barBtnUpdateUseStatus.Name = "barBtnUpdateUseStatus";
+ barBtnUpdateUseStatus.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
// barCekSearch
//
barCekSearch.Caption = "妫�绱�";
barCekSearch.Id = 25;
+ barCekSearch.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barCekSearch.ImageOptions.SvgImage");
barCekSearch.Name = "barCekSearch";
+ barCekSearch.CheckedChanged += barCekSearch_CheckedChanged;
//
// barSubItem1
//
barSubItem1.Caption = "娣诲姞";
barSubItem1.Id = 31;
+ barSubItem1.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barSubItem1.ImageOptions.SvgImage");
barSubItem1.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] { new DevExpress.XtraBars.LinkPersistInfo(btnAddBuilding), new DevExpress.XtraBars.LinkPersistInfo(btnAddschool), new DevExpress.XtraBars.LinkPersistInfo(btnAddHospital), new DevExpress.XtraBars.LinkPersistInfo(btnAddShop) });
barSubItem1.Name = "barSubItem1";
//
@@ -276,10 +332,37 @@
btnAddShop.Caption = "鍟嗛摵";
btnAddShop.Id = 35;
btnAddShop.Name = "btnAddShop";
+ btnAddShop.ItemClick += btnAddShop_ItemClick;
+ //
+ // barCkDrag
+ //
+ barCkDrag.Caption = "鎷栨嫿鎺掑簭";
+ barCkDrag.Id = 36;
+ barCkDrag.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barCkDrag.ImageOptions.SvgImage");
+ barCkDrag.Name = "barCkDrag";
+ barCkDrag.CheckedChanged += barCkDrag_CheckedChanged;
+ //
+ // barBtnUp
+ //
+ barBtnUp.Caption = "涓婄Щ";
+ barBtnUp.Id = 37;
+ barBtnUp.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnUp.ImageOptions.SvgImage");
+ barBtnUp.Name = "barBtnUp";
+ barBtnUp.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
+ barBtnUp.ItemClick += barButtonItem1_ItemClick;
+ //
+ // barBtnDown
+ //
+ barBtnDown.Caption = "涓嬬Щ";
+ barBtnDown.Id = 38;
+ barBtnDown.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnDown.ImageOptions.SvgImage");
+ barBtnDown.Name = "barBtnDown";
+ barBtnDown.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
+ barBtnDown.ItemClick += barBtnDown_ItemClick;
//
// ribbonPage
//
- ribbonPage.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { ribbonPageGroup1 });
+ ribbonPage.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { ribbonPageGroup1, ribbonPageGroup2 });
ribbonPage.Name = "ribbonPage";
ribbonPage.Text = "鍩虹鎿嶄綔";
//
@@ -290,27 +373,42 @@
ribbonPageGroup1.ItemLinks.Add(barBtnDelete);
ribbonPageGroup1.ItemLinks.Add(barBtnDetail);
ribbonPageGroup1.ItemLinks.Add(barBtnUpdateTagName, true);
- ribbonPageGroup1.ItemLinks.Add(barBtnUpdateSortCode);
ribbonPageGroup1.ItemLinks.Add(barBtnUpdateUseStatus);
ribbonPageGroup1.ItemLinks.Add(barCekSearch);
ribbonPageGroup1.ItemLinks.Add(barBtnRefresh);
ribbonPageGroup1.Name = "ribbonPageGroup1";
ribbonPageGroup1.Text = "鍩虹";
//
+ // ribbonPageGroup2
+ //
+ ribbonPageGroup2.ItemLinks.Add(barCkDrag);
+ ribbonPageGroup2.ItemLinks.Add(barBtnUp);
+ ribbonPageGroup2.ItemLinks.Add(barBtnDown);
+ ribbonPageGroup2.Name = "ribbonPageGroup2";
+ ribbonPageGroup2.Text = "ribbonPageGroup2";
+ //
+ // dragDropEvents1
+ //
+ dragDropEvents1.DragDrop += dragDropEvents1_DragDrop;
+ //
// PlaceMgrPage
//
Appearance.BackColor = SystemColors.Control;
Appearance.Options.UseBackColor = true;
- AutoScaleDimensions = new SizeF(7F, 14F);
+ AutoScaleDimensions = new SizeF(8F, 18F);
AutoScaleMode = AutoScaleMode.Font;
Controls.Add(gridControl1);
Controls.Add(ribbonControl1);
+ Margin = new Padding(3, 5, 3, 5);
Name = "PlaceMgrPage";
- Size = new Size(818, 681);
+ Size = new Size(935, 876);
((ISupportInitialize)gridControl1).EndInit();
((ISupportInitialize)placeViewModelBindingSource).EndInit();
((ISupportInitialize)gridView1).EndInit();
+ ((ISupportInitialize)repositoryItemTreeListLookUpEdit1).EndInit();
+ ((ISupportInitialize)repositoryItemTreeListLookUpEdit1TreeList).EndInit();
((ISupportInitialize)ribbonControl1).EndInit();
+ ((ISupportInitialize)behaviorManager1).EndInit();
ResumeLayout(false);
PerformLayout();
}
@@ -324,7 +422,6 @@
private DevExpress.XtraBars.BarButtonItem barBtnDelete;
private DevExpress.XtraBars.Ribbon.RibbonPage ribbonPage;
private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup1;
- private DevExpress.XtraBars.BarButtonItem barBtnUpdateSortCode;
private DevExpress.XtraBars.BarButtonItem barBtnDetail;
private DevExpress.XtraBars.BarButtonItem barBtnUpdateTagName;
private DevExpress.XtraBars.BarButtonItem barBtnUpdateUseStatus;
@@ -347,5 +444,14 @@
private DevExpress.XtraBars.BarButtonItem btnAddschool;
private DevExpress.XtraBars.BarButtonItem btnAddHospital;
private DevExpress.XtraBars.BarButtonItem btnAddShop;
+ private DevExpress.XtraBars.BarCheckItem barCkDrag;
+ private DevExpress.XtraBars.BarButtonItem barBtnUp;
+ private DevExpress.XtraBars.BarButtonItem barBtnDown;
+ private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup2;
+ private DevExpress.Utils.Behaviors.BehaviorManager behaviorManager1;
+ private DevExpress.Utils.DragDrop.DragDropEvents dragDropEvents1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+ private DevExpress.XtraEditors.Repository.RepositoryItemTreeListLookUpEdit repositoryItemTreeListLookUpEdit1;
+ private DevExpress.XtraTreeList.TreeList repositoryItemTreeListLookUpEdit1TreeList;
}
}
--
Gitblit v1.9.3