WinFrmUI/PBS.WinFrmUI/00-home/00-core/HomePbsProjectPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WinFrmUI/PBS.WinFrmUI/00-home/02-map/MapProjectViewModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WinFrmUI/PBS.WinFrmUI/00-home/02-map/MapViewProjectListContainer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WinFrmUI/PBS.WinFrmUI/01-place/AddPlaceDlg.Designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WinFrmUI/PBS.WinFrmUI/01-place/EditPlaceDlg.Designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
WinFrmUI/PBS.WinFrmUI/00-home/00-core/HomePbsProjectPage.cs
@@ -18,7 +18,7 @@ this.homeXhsProjectPropertyCtrl2.SelectFacEvent += HomeXhsProjectPropertyCtrl2_SelectFacEvent; } private List<FacilityVmo> _allProjectList = null;//所有项目列表 private List<PlaceVmo> _allProjectList = null;//所有项目列表 /// <summary> /// 初始化数据源 @@ -26,7 +26,7 @@ public override async void InitialDataSource() { base.InitialDataSource(); _allProjectList = await new BLL.Facility().GetAll(); _allProjectList = await new BLL.Place().GetAll(); //this.xhsProjectHomeTitleCtrl1.SetBindingData(); await this.mapViewProjectListContainer2.InitialContainer(); } @@ -37,7 +37,7 @@ public override async void RefreshData() { base.RefreshData(); _allProjectList = await new BLL.Facility().GetAll(); _allProjectList = await new BLL.Place().GetAll(); // this.xhsProjectHomeTitleCtrl1.SetBindingData(); await this.mapViewProjectListContainer2.SetProjectList(_allProjectList); // this.homeXhsProjectTreeListCtrl1.SetBindingData(_allProjectList); @@ -51,20 +51,20 @@ } //选择项目事件 private void homeXhsProjectTreeListCtrl1_SelectProjectEvent(PlaceVmo obj) private async void homeXhsProjectTreeListCtrl1_SelectProjectEvent(PlaceVmo obj) { this.homeXhsProjectPropertyCtrl2.SetBindingData(obj); await this.mapViewProjectListContainer2.SelectProject(obj.ID); // var vm = new HomePbsProjectPropertyViewModel(obj); //this.homeXhsProjectPropertyCtrl2.SelectedObject = vm; /* await this.mapViewProjectListContainer1.SelectProject(obj.ID); var vm = new HomeXhsProjectPropertyViewModel(obj); this.homeXhsProjectPropertyCtrl1.SelectedObject = vm;*/ var vm = new HomeXhsProjectPropertyViewModel(obj); this.homeXhsProjectPropertyCtrl1.SelectedObject = vm;*/ } private async void HomeXhsProjectPropertyCtrl2_SelectFacEvent(FacilityVmo obj) private void HomeXhsProjectPropertyCtrl2_SelectFacEvent(FacilityVmo obj) { await this.mapViewProjectListContainer2.SelectProject(obj.ID); //await this.mapViewProjectListContainer2.SelectProject(obj.ID); } /* //导入完成事件 WinFrmUI/PBS.WinFrmUI/00-home/02-map/MapProjectViewModel.cs
@@ -14,7 +14,7 @@ /// <summary> /// /// </summary> public MapProjectViewModel(Vmo.FacilityVmo project, Yw.Vmo.MapInfoVmo mapInfo) public MapProjectViewModel(Vmo.PlaceVmo project, Yw.Vmo.MapInfoVmo mapInfo) { this.Id = project.ID.ToString(); this.Name = project.Name; @@ -23,8 +23,7 @@ var marker = Yw.Model.Map.Marker.ToModel(mapInfo.Position); this.Point = marker?.Point; this.Address = marker?.Address; //this.Customer = project.Customer; //this.Customer = project.Customer; } /// <summary> @@ -56,6 +55,7 @@ /// 坐标 /// </summary> public Yw.Model.Map.Point Point { get; set; } /// <summary> /// 详细位置 /// </summary> WinFrmUI/PBS.WinFrmUI/00-home/02-map/MapViewProjectListContainer.cs
@@ -1,4 +1,5 @@ using DevExpress.Mvvm.Native; using PBS.Vmo; using Yw.WebBrower; namespace PBS.WinFrmUI @@ -94,13 +95,13 @@ /// <summary> /// 设置项目列表 /// </summary> public async Task<bool> SetProjectList(List<PBS.Vmo.FacilityVmo> allProjectList) public async Task<bool> SetProjectList(List<PlaceVmo> allProjectList) { if (!_isInitialized) { return false; } var allProjectIds = allProjectList?.Select(x => x.PlaceID).Distinct().ToList(); var allProjectIds = allProjectList?.Select(x => x.ID).Distinct().ToList(); var allMapInfoList = await new Yw.BLL.MapInfo().GetByObjectTypeAndObjectIdsOfKindPurpose (PBS.DataType.PBSPlace, allProjectIds, Yw.Map.Kind.Gaodei, Yw.Map.Purpose.Location); var vmList = new List<MapProjectViewModel>(); @@ -108,7 +109,7 @@ { foreach (var mapInfo in allMapInfoList) { var project = allProjectList.Find(x => x.PlaceID == mapInfo.ObjectID); var project = allProjectList.Find(x => x.ID == mapInfo.ObjectID); if (project != null) { var vm = new MapProjectViewModel(project, mapInfo); WinFrmUI/PBS.WinFrmUI/01-place/AddPlaceDlg.Designer.cs
@@ -91,15 +91,15 @@ Root.GroupBordersVisible = false; Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem7, layoutControlItem8, layoutControlItem1, tabbedControlGroup1, layoutControlItem6, layoutControlItem9, layoutControlItem3 }); Root.Name = "Root"; Root.Size = new Size(811, 539); Root.Size = new Size(630, 552); Root.TextVisible = false; // // layoutControlItem7 // layoutControlItem7.Control = generalOkAndCancelCtrl1; layoutControlItem7.Location = new Point(0, 482); layoutControlItem7.Location = new Point(0, 494); layoutControlItem7.Name = "layoutControlItem7"; layoutControlItem7.Size = new Size(791, 37); layoutControlItem7.Size = new Size(610, 38); layoutControlItem7.TextSize = new Size(0, 0); layoutControlItem7.TextVisible = false; // @@ -109,10 +109,10 @@ generalOkAndCancelCtrl1.ButtonCancelMinSize = new Size(114, 33); generalOkAndCancelCtrl1.ButtonOkMaxSize = new Size(131, 42); generalOkAndCancelCtrl1.ButtonOkMinSize = new Size(114, 33); generalOkAndCancelCtrl1.Location = new Point(12, 494); generalOkAndCancelCtrl1.Location = new Point(12, 506); generalOkAndCancelCtrl1.Margin = new Padding(3, 5, 3, 5); generalOkAndCancelCtrl1.Name = "generalOkAndCancelCtrl1"; generalOkAndCancelCtrl1.Size = new Size(787, 33); generalOkAndCancelCtrl1.Size = new Size(606, 34); generalOkAndCancelCtrl1.TabIndex = 6; // // layoutControlItem8 @@ -121,7 +121,7 @@ layoutControlItem8.Control = txtEditName; layoutControlItem8.Location = new Point(0, 0); layoutControlItem8.Name = "layoutControlItem8"; layoutControlItem8.Size = new Size(791, 28); layoutControlItem8.Size = new Size(610, 28); layoutControlItem8.Text = "<color=red>*</color>名称:"; layoutControlItem8.TextSize = new Size(65, 18); // @@ -130,7 +130,7 @@ txtEditName.Location = new Point(89, 12); txtEditName.Margin = new Padding(3, 4, 3, 4); txtEditName.Name = "txtEditName"; txtEditName.Size = new Size(710, 24); txtEditName.Size = new Size(529, 24); txtEditName.StyleController = layoutControl1; txtEditName.TabIndex = 0; // @@ -151,7 +151,7 @@ layoutControl1.Name = "layoutControl1"; layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(826, 220, 650, 400); layoutControl1.Root = Root; layoutControl1.Size = new Size(811, 539); layoutControl1.Size = new Size(630, 552); layoutControl1.TabIndex = 2; layoutControl1.Text = "layoutControl1"; // @@ -160,15 +160,15 @@ setFlagsEditCtrl1.Location = new Point(89, 96); setFlagsEditCtrl1.Margin = new Padding(3, 5, 3, 5); setFlagsEditCtrl1.Name = "setFlagsEditCtrl1"; setFlagsEditCtrl1.Size = new Size(314, 24); setFlagsEditCtrl1.Size = new Size(224, 24); setFlagsEditCtrl1.TabIndex = 6; // // txtTagName // txtTagName.Location = new Point(484, 96); txtTagName.Location = new Point(394, 96); txtTagName.Margin = new Padding(3, 4, 3, 4); txtTagName.Name = "txtTagName"; txtTagName.Size = new Size(315, 24); txtTagName.Size = new Size(224, 24); txtTagName.StyleController = layoutControl1; txtTagName.TabIndex = 7; // @@ -176,7 +176,7 @@ // sidePanel1.Location = new Point(15, 157); sidePanel1.Name = "sidePanel1"; sidePanel1.Size = new Size(781, 330); sidePanel1.Size = new Size(600, 342); sidePanel1.TabIndex = 7; sidePanel1.Text = "sidePanel1"; // @@ -185,7 +185,7 @@ panelControl1.Location = new Point(15, 157); panelControl1.Margin = new Padding(3, 4, 3, 4); panelControl1.Name = "panelControl1"; panelControl1.Size = new Size(781, 330); panelControl1.Size = new Size(600, 342); panelControl1.TabIndex = 1; // // textEditAddress @@ -193,7 +193,7 @@ textEditAddress.Location = new Point(89, 68); textEditAddress.Margin = new Padding(3, 4, 3, 4); textEditAddress.Name = "textEditAddress"; textEditAddress.Size = new Size(710, 24); textEditAddress.Size = new Size(529, 24); textEditAddress.StyleController = layoutControl1; textEditAddress.TabIndex = 3; // @@ -202,7 +202,7 @@ memoEditDescription.Location = new Point(92, 157); memoEditDescription.Margin = new Padding(3, 4, 3, 4); memoEditDescription.Name = "memoEditDescription"; memoEditDescription.Size = new Size(704, 330); memoEditDescription.Size = new Size(523, 342); memoEditDescription.StyleController = layoutControl1; memoEditDescription.TabIndex = 5; // @@ -216,7 +216,7 @@ txtEditRegion.Properties.NullText = ""; txtEditRegion.Properties.TreeList = treeListLookUpEdit1TreeList; txtEditRegion.Properties.ValueMember = "ID"; txtEditRegion.Size = new Size(710, 24); txtEditRegion.Size = new Size(529, 24); txtEditRegion.StyleController = layoutControl1; txtEditRegion.TabIndex = 2; // @@ -250,7 +250,7 @@ layoutControlItem1.Control = txtEditRegion; layoutControlItem1.Location = new Point(0, 28); layoutControlItem1.Name = "layoutControlItem1"; layoutControlItem1.Size = new Size(791, 28); layoutControlItem1.Size = new Size(610, 28); layoutControlItem1.Text = "地区:"; layoutControlItem1.TextSize = new Size(65, 18); // @@ -260,7 +260,7 @@ tabbedControlGroup1.Name = "tabbedControlGroup1"; tabbedControlGroup1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0); tabbedControlGroup1.SelectedTabPage = layoutControlGroup3; tabbedControlGroup1.Size = new Size(791, 370); tabbedControlGroup1.Size = new Size(610, 382); tabbedControlGroup1.TabPages.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlGroup1, layoutControlGroup2, layoutControlGroup3 }); // // layoutControlGroup3 @@ -268,7 +268,7 @@ layoutControlGroup3.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem4 }); layoutControlGroup3.Location = new Point(0, 0); layoutControlGroup3.Name = "layoutControlGroup3"; layoutControlGroup3.Size = new Size(785, 334); layoutControlGroup3.Size = new Size(604, 346); layoutControlGroup3.Text = "说明"; // // layoutControlItem4 @@ -276,7 +276,7 @@ layoutControlItem4.Control = memoEditDescription; layoutControlItem4.Location = new Point(0, 0); layoutControlItem4.Name = "layoutControlItem4"; layoutControlItem4.Size = new Size(785, 334); layoutControlItem4.Size = new Size(604, 346); layoutControlItem4.Text = "说明"; layoutControlItem4.TextSize = new Size(65, 18); // @@ -285,7 +285,7 @@ layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem2 }); layoutControlGroup1.Location = new Point(0, 0); layoutControlGroup1.Name = "layoutControlGroup1"; layoutControlGroup1.Size = new Size(785, 334); layoutControlGroup1.Size = new Size(604, 346); layoutControlGroup1.Text = "属性"; // // layoutControlItem2 @@ -293,7 +293,7 @@ layoutControlItem2.Control = panelControl1; layoutControlItem2.Location = new Point(0, 0); layoutControlItem2.Name = "layoutControlItem2"; layoutControlItem2.Size = new Size(785, 334); layoutControlItem2.Size = new Size(604, 346); layoutControlItem2.TextSize = new Size(0, 0); layoutControlItem2.TextVisible = false; // @@ -302,7 +302,7 @@ layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem5 }); layoutControlGroup2.Location = new Point(0, 0); layoutControlGroup2.Name = "layoutControlGroup2"; layoutControlGroup2.Size = new Size(785, 334); layoutControlGroup2.Size = new Size(604, 346); layoutControlGroup2.Text = "地图"; // // layoutControlItem5 @@ -310,7 +310,7 @@ layoutControlItem5.Control = sidePanel1; layoutControlItem5.Location = new Point(0, 0); layoutControlItem5.Name = "layoutControlItem5"; layoutControlItem5.Size = new Size(785, 334); layoutControlItem5.Size = new Size(604, 346); layoutControlItem5.TextSize = new Size(0, 0); layoutControlItem5.TextVisible = false; // @@ -319,16 +319,16 @@ layoutControlItem6.Control = setFlagsEditCtrl1; layoutControlItem6.Location = new Point(0, 84); layoutControlItem6.Name = "layoutControlItem6"; layoutControlItem6.Size = new Size(395, 28); layoutControlItem6.Size = new Size(305, 28); layoutControlItem6.Text = "标签:"; layoutControlItem6.TextSize = new Size(65, 18); // // layoutControlItem9 // layoutControlItem9.Control = txtTagName; layoutControlItem9.Location = new Point(395, 84); layoutControlItem9.Location = new Point(305, 84); layoutControlItem9.Name = "layoutControlItem9"; layoutControlItem9.Size = new Size(396, 28); layoutControlItem9.Size = new Size(305, 28); layoutControlItem9.Text = "标志:"; layoutControlItem9.TextSize = new Size(65, 18); // @@ -337,7 +337,7 @@ layoutControlItem3.Control = textEditAddress; layoutControlItem3.Location = new Point(0, 56); layoutControlItem3.Name = "layoutControlItem3"; layoutControlItem3.Size = new Size(791, 28); layoutControlItem3.Size = new Size(610, 28); layoutControlItem3.Text = "详细地址:"; layoutControlItem3.TextSize = new Size(65, 18); // @@ -349,7 +349,7 @@ // AutoScaleDimensions = new SizeF(8F, 18F); AutoScaleMode = AutoScaleMode.Font; ClientSize = new Size(811, 539); ClientSize = new Size(630, 552); Controls.Add(layoutControl1); Margin = new Padding(3, 4, 3, 4); Name = "AddPlaceDlg"; WinFrmUI/PBS.WinFrmUI/01-place/EditPlaceDlg.Designer.cs
@@ -35,6 +35,8 @@ layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem(); txtEditName = new DevExpress.XtraEditors.TextEdit(); layoutControl1 = new DevExpress.XtraLayout.LayoutControl(); setFlagsEditCtrl1 = new Yw.WinFrmUI.SetFlagsEditCtrl(); txtTagName = new DevExpress.XtraEditors.TextEdit(); sidePanel1 = new DevExpress.XtraEditors.SidePanel(); txtEditRegion = new DevExpress.XtraEditors.TreeListLookUpEdit(); treeList1 = new DevExpress.XtraTreeList.TreeList(); @@ -52,17 +54,16 @@ layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem(); dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components); setFlagsEditCtrl1 = new Yw.WinFrmUI.SetFlagsEditCtrl(); txtTagName = new DevExpress.XtraEditors.TextEdit(); layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem(); dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components); ((System.ComponentModel.ISupportInitialize)Root).BeginInit(); ((System.ComponentModel.ISupportInitialize)layoutControlItem7).BeginInit(); ((System.ComponentModel.ISupportInitialize)layoutControlItem8).BeginInit(); ((System.ComponentModel.ISupportInitialize)txtEditName.Properties).BeginInit(); ((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit(); layoutControl1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)txtTagName.Properties).BeginInit(); ((System.ComponentModel.ISupportInitialize)txtEditRegion.Properties).BeginInit(); ((System.ComponentModel.ISupportInitialize)treeList1).BeginInit(); ((System.ComponentModel.ISupportInitialize)panelControl1).BeginInit(); @@ -77,10 +78,9 @@ ((System.ComponentModel.ISupportInitialize)layoutControlItem1).BeginInit(); ((System.ComponentModel.ISupportInitialize)layoutControlItem3).BeginInit(); ((System.ComponentModel.ISupportInitialize)layoutControlItem5).BeginInit(); ((System.ComponentModel.ISupportInitialize)dxErrorProvider1).BeginInit(); ((System.ComponentModel.ISupportInitialize)txtTagName.Properties).BeginInit(); ((System.ComponentModel.ISupportInitialize)layoutControlItem6).BeginInit(); ((System.ComponentModel.ISupportInitialize)layoutControlItem9).BeginInit(); ((System.ComponentModel.ISupportInitialize)dxErrorProvider1).BeginInit(); SuspendLayout(); // // Root @@ -91,15 +91,15 @@ Root.GroupBordersVisible = false; Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem7, layoutControlItem8, tabbedControlGroup1, layoutControlItem3, layoutControlItem5, layoutControlItem6, layoutControlItem9 }); Root.Name = "Root"; Root.Size = new Size(816, 443); Root.Size = new Size(639, 450); Root.TextVisible = false; // // layoutControlItem7 // layoutControlItem7.Control = generalOkAndCancelCtrl1; layoutControlItem7.Location = new Point(0, 358); layoutControlItem7.Location = new Point(0, 392); layoutControlItem7.Name = "layoutControlItem7"; layoutControlItem7.Size = new Size(796, 65); layoutControlItem7.Size = new Size(619, 38); layoutControlItem7.TextSize = new Size(0, 0); layoutControlItem7.TextVisible = false; // @@ -109,10 +109,10 @@ generalOkAndCancelCtrl1.ButtonCancelMinSize = new Size(114, 33); generalOkAndCancelCtrl1.ButtonOkMaxSize = new Size(131, 42); generalOkAndCancelCtrl1.ButtonOkMinSize = new Size(114, 33); generalOkAndCancelCtrl1.Location = new Point(12, 370); generalOkAndCancelCtrl1.Location = new Point(12, 404); generalOkAndCancelCtrl1.Margin = new Padding(3, 5, 3, 5); generalOkAndCancelCtrl1.Name = "generalOkAndCancelCtrl1"; generalOkAndCancelCtrl1.Size = new Size(792, 61); generalOkAndCancelCtrl1.Size = new Size(615, 34); generalOkAndCancelCtrl1.TabIndex = 5; // // layoutControlItem8 @@ -121,7 +121,7 @@ layoutControlItem8.Control = txtEditName; layoutControlItem8.Location = new Point(0, 0); layoutControlItem8.Name = "layoutControlItem8"; layoutControlItem8.Size = new Size(796, 28); layoutControlItem8.Size = new Size(619, 28); layoutControlItem8.Text = "<color=red>*</color>名称:"; layoutControlItem8.TextSize = new Size(65, 18); // @@ -130,7 +130,7 @@ txtEditName.Location = new Point(89, 12); txtEditName.Margin = new Padding(3, 4, 3, 4); txtEditName.Name = "txtEditName"; txtEditName.Size = new Size(715, 24); txtEditName.Size = new Size(538, 24); txtEditName.StyleController = layoutControl1; txtEditName.TabIndex = 0; // @@ -151,15 +151,32 @@ layoutControl1.Name = "layoutControl1"; layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(826, 220, 650, 400); layoutControl1.Root = Root; layoutControl1.Size = new Size(816, 443); layoutControl1.Size = new Size(639, 450); layoutControl1.TabIndex = 2; layoutControl1.Text = "layoutControl1"; // // setFlagsEditCtrl1 // setFlagsEditCtrl1.Location = new Point(89, 96); setFlagsEditCtrl1.Margin = new Padding(3, 5, 3, 5); setFlagsEditCtrl1.Name = "setFlagsEditCtrl1"; setFlagsEditCtrl1.Size = new Size(228, 24); setFlagsEditCtrl1.TabIndex = 8; // // txtTagName // txtTagName.Location = new Point(398, 96); txtTagName.Margin = new Padding(3, 4, 3, 4); txtTagName.Name = "txtTagName"; txtTagName.Size = new Size(229, 24); txtTagName.StyleController = layoutControl1; txtTagName.TabIndex = 9; // // sidePanel1 // sidePanel1.Location = new Point(15, 157); sidePanel1.Name = "sidePanel1"; sidePanel1.Size = new Size(786, 206); sidePanel1.Size = new Size(609, 240); sidePanel1.TabIndex = 3; sidePanel1.Text = "sidePanel1"; // @@ -173,7 +190,7 @@ txtEditRegion.Properties.NullText = ""; txtEditRegion.Properties.TreeList = treeList1; txtEditRegion.Properties.ValueMember = "ID"; txtEditRegion.Size = new Size(715, 24); txtEditRegion.Size = new Size(538, 24); txtEditRegion.StyleController = layoutControl1; txtEditRegion.TabIndex = 2; // @@ -207,7 +224,7 @@ panelControl1.Location = new Point(15, 157); panelControl1.Margin = new Padding(3, 4, 3, 4); panelControl1.Name = "panelControl1"; panelControl1.Size = new Size(786, 206); panelControl1.Size = new Size(609, 240); panelControl1.TabIndex = 1; // // textEditAddress @@ -215,7 +232,7 @@ textEditAddress.Location = new Point(89, 68); textEditAddress.Margin = new Padding(3, 4, 3, 4); textEditAddress.Name = "textEditAddress"; textEditAddress.Size = new Size(715, 24); textEditAddress.Size = new Size(538, 24); textEditAddress.StyleController = layoutControl1; textEditAddress.TabIndex = 3; // @@ -224,7 +241,7 @@ memoEditDescription.Location = new Point(92, 157); memoEditDescription.Margin = new Padding(3, 4, 3, 4); memoEditDescription.Name = "memoEditDescription"; memoEditDescription.Size = new Size(709, 206); memoEditDescription.Size = new Size(532, 240); memoEditDescription.StyleController = layoutControl1; memoEditDescription.TabIndex = 1; // @@ -234,7 +251,7 @@ tabbedControlGroup1.Name = "tabbedControlGroup1"; tabbedControlGroup1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0); tabbedControlGroup1.SelectedTabPage = layoutControlGroup3; tabbedControlGroup1.Size = new Size(796, 246); tabbedControlGroup1.Size = new Size(619, 280); tabbedControlGroup1.TabPages.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlGroup1, layoutControlGroup2, layoutControlGroup3 }); // // layoutControlGroup3 @@ -242,7 +259,7 @@ layoutControlGroup3.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem4 }); layoutControlGroup3.Location = new Point(0, 0); layoutControlGroup3.Name = "layoutControlGroup3"; layoutControlGroup3.Size = new Size(790, 210); layoutControlGroup3.Size = new Size(613, 244); layoutControlGroup3.Text = "说明"; // // layoutControlItem4 @@ -250,7 +267,7 @@ layoutControlItem4.Control = memoEditDescription; layoutControlItem4.Location = new Point(0, 0); layoutControlItem4.Name = "layoutControlItem4"; layoutControlItem4.Size = new Size(790, 210); layoutControlItem4.Size = new Size(613, 244); layoutControlItem4.Text = "说明"; layoutControlItem4.TextSize = new Size(65, 18); // @@ -259,7 +276,7 @@ layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem2 }); layoutControlGroup1.Location = new Point(0, 0); layoutControlGroup1.Name = "layoutControlGroup1"; layoutControlGroup1.Size = new Size(790, 210); layoutControlGroup1.Size = new Size(613, 244); layoutControlGroup1.Text = "属性"; // // layoutControlItem2 @@ -267,7 +284,7 @@ layoutControlItem2.Control = panelControl1; layoutControlItem2.Location = new Point(0, 0); layoutControlItem2.Name = "layoutControlItem2"; layoutControlItem2.Size = new Size(790, 210); layoutControlItem2.Size = new Size(613, 244); layoutControlItem2.TextSize = new Size(0, 0); layoutControlItem2.TextVisible = false; // @@ -276,7 +293,7 @@ layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1 }); layoutControlGroup2.Location = new Point(0, 0); layoutControlGroup2.Name = "layoutControlGroup2"; layoutControlGroup2.Size = new Size(790, 210); layoutControlGroup2.Size = new Size(613, 244); layoutControlGroup2.Text = "地图"; // // layoutControlItem1 @@ -284,7 +301,7 @@ layoutControlItem1.Control = sidePanel1; layoutControlItem1.Location = new Point(0, 0); layoutControlItem1.Name = "layoutControlItem1"; layoutControlItem1.Size = new Size(790, 210); layoutControlItem1.Size = new Size(613, 244); layoutControlItem1.TextSize = new Size(0, 0); layoutControlItem1.TextVisible = false; // @@ -293,7 +310,7 @@ layoutControlItem3.Control = textEditAddress; layoutControlItem3.Location = new Point(0, 56); layoutControlItem3.Name = "layoutControlItem3"; layoutControlItem3.Size = new Size(796, 28); layoutControlItem3.Size = new Size(619, 28); layoutControlItem3.Text = "详细地址:"; layoutControlItem3.TextSize = new Size(65, 18); // @@ -302,54 +319,37 @@ layoutControlItem5.Control = txtEditRegion; layoutControlItem5.Location = new Point(0, 28); layoutControlItem5.Name = "layoutControlItem5"; layoutControlItem5.Size = new Size(796, 28); layoutControlItem5.Size = new Size(619, 28); layoutControlItem5.Text = "地区:"; layoutControlItem5.TextSize = new Size(65, 18); // // dxErrorProvider1 // dxErrorProvider1.ContainerControl = this; // // setFlagsEditCtrl1 // setFlagsEditCtrl1.Location = new Point(89, 96); setFlagsEditCtrl1.Margin = new Padding(3, 5, 3, 5); setFlagsEditCtrl1.Name = "setFlagsEditCtrl1"; setFlagsEditCtrl1.Size = new Size(317, 24); setFlagsEditCtrl1.TabIndex = 8; // // txtTagName // txtTagName.Location = new Point(487, 96); txtTagName.Margin = new Padding(3, 4, 3, 4); txtTagName.Name = "txtTagName"; txtTagName.Size = new Size(317, 24); txtTagName.StyleController = layoutControl1; txtTagName.TabIndex = 9; // // layoutControlItem6 // layoutControlItem6.Control = setFlagsEditCtrl1; layoutControlItem6.Location = new Point(0, 84); layoutControlItem6.Name = "layoutControlItem6"; layoutControlItem6.Size = new Size(398, 28); layoutControlItem6.Size = new Size(309, 28); layoutControlItem6.Text = "标签:"; layoutControlItem6.TextSize = new Size(65, 18); // // layoutControlItem9 // layoutControlItem9.Control = txtTagName; layoutControlItem9.Location = new Point(398, 84); layoutControlItem9.Location = new Point(309, 84); layoutControlItem9.Name = "layoutControlItem9"; layoutControlItem9.Size = new Size(398, 28); layoutControlItem9.Size = new Size(310, 28); layoutControlItem9.Text = "标志:"; layoutControlItem9.TextSize = new Size(65, 18); // // dxErrorProvider1 // dxErrorProvider1.ContainerControl = this; // // EditPlaceDlg // AutoScaleDimensions = new SizeF(8F, 18F); AutoScaleMode = AutoScaleMode.Font; ClientSize = new Size(816, 443); ClientSize = new Size(639, 450); Controls.Add(layoutControl1); Margin = new Padding(3, 4, 3, 4); Name = "EditPlaceDlg"; @@ -361,6 +361,7 @@ ((System.ComponentModel.ISupportInitialize)txtEditName.Properties).EndInit(); ((System.ComponentModel.ISupportInitialize)layoutControl1).EndInit(); layoutControl1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)txtTagName.Properties).EndInit(); ((System.ComponentModel.ISupportInitialize)txtEditRegion.Properties).EndInit(); ((System.ComponentModel.ISupportInitialize)treeList1).EndInit(); ((System.ComponentModel.ISupportInitialize)panelControl1).EndInit(); @@ -375,10 +376,9 @@ ((System.ComponentModel.ISupportInitialize)layoutControlItem1).EndInit(); ((System.ComponentModel.ISupportInitialize)layoutControlItem3).EndInit(); ((System.ComponentModel.ISupportInitialize)layoutControlItem5).EndInit(); ((System.ComponentModel.ISupportInitialize)dxErrorProvider1).EndInit(); ((System.ComponentModel.ISupportInitialize)txtTagName.Properties).EndInit(); ((System.ComponentModel.ISupportInitialize)layoutControlItem6).EndInit(); ((System.ComponentModel.ISupportInitialize)layoutControlItem9).EndInit(); ((System.ComponentModel.ISupportInitialize)dxErrorProvider1).EndInit(); ResumeLayout(false); }