From 330002911a64ea58d6834b64228870228eb75391 Mon Sep 17 00:00:00 2001
From: qin <a@163.com>
Date: 星期四, 20 三月 2025 16:12:33 +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 | 121 ++++++++++++++++++++++++++++------------
1 files changed, 84 insertions(+), 37 deletions(-)
diff --git a/WinFrmUI/PBS.WinFrmUI/01-place/PlaceMgrPage.Designer.cs b/WinFrmUI/PBS.WinFrmUI/01-place/PlaceMgrPage.Designer.cs
index 6712f31..cb4464a 100644
--- a/WinFrmUI/PBS.WinFrmUI/01-place/PlaceMgrPage.Designer.cs
+++ b/WinFrmUI/PBS.WinFrmUI/01-place/PlaceMgrPage.Designer.cs
@@ -40,9 +40,10 @@
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();
@@ -76,6 +77,8 @@
((ISupportInitialize)gridControl1).BeginInit();
((ISupportInitialize)placeViewModelBindingSource).BeginInit();
((ISupportInitialize)gridView1).BeginInit();
+ ((ISupportInitialize)repositoryItemTreeListLookUpEdit1).BeginInit();
+ ((ISupportInitialize)repositoryItemTreeListLookUpEdit1TreeList).BeginInit();
((ISupportInitialize)ribbonControl1).BeginInit();
((ISupportInitialize)behaviorManager1).BeginInit();
SuspendLayout();
@@ -84,10 +87,13 @@
//
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 });
//
@@ -98,109 +104,143 @@
// gridView1
//
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[] { colID, colRegionID, colName, colPlaceType, colPlaceInfo, colAddress, colParas, colFlags, colTagName, colUseStatus, colSortCode, colDescription });
+ 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, barBtnDetail, barBtnUpdateTagName, barBtnUpdateUseStatus, barCekSearch, barSubItem1, btnAddBuilding, btnAddschool, btnAddHospital, btnAddShop, barCkDrag, barBtnUp, barBtnDown });
ribbonControl1.Location = new Point(0, 0);
+ 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
@@ -209,6 +249,7 @@
barBtnEdit.Id = 17;
barBtnEdit.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnEdit.ImageOptions.SvgImage");
barBtnEdit.Name = "barBtnEdit";
+ barBtnEdit.ItemClick += barBtnEdit_ItemClick;
//
// barBtnRefresh
//
@@ -303,7 +344,7 @@
//
barBtnUp.Caption = "涓婄Щ";
barBtnUp.Id = 37;
- barBtnUp.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barButtonItem1.ImageOptions.SvgImage");
+ 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;
@@ -312,7 +353,7 @@
//
barBtnDown.Caption = "涓嬬Щ";
barBtnDown.Id = 38;
- barBtnDown.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barButtonItem2.ImageOptions.SvgImage");
+ 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;
@@ -352,15 +393,18 @@
//
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);
@@ -404,5 +448,8 @@
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