From e2f996ecf706e0870744ae25886b8443c1a59132 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期三, 14 八月 2024 17:17:41 +0800
Subject: [PATCH] 修改导入逻辑
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectDlg.cs | 11
WinFrmUI/Yw.WinFrmUI.Core/08-wizard/IWizardPage.cs | 14 -
WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/04-dlg/EditProjectDlg.Designer.cs | 1
WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/04-dlg/EditProjectDlg.cs | 7
WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectDlg.Designer.cs | 6
WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/04-dlg/AddProjectDlg.Designer.cs | 47 +++--
WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/02-ProjectInfo/InputXhsProjectInfoWizardPage.cs | 11 +
WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/04-GeneralProject/GenerateXhsProjectWizardPage.cs | 12 -
WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/03-mgr/XhsProjectMgrPage.cs | 2
WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/HomeXhsProjectPage.Designer.cs | 93 ++++++-----
WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/03-MapLocation/SetXhsProjectMapLocationWizardPage.cs | 107 +++++++++++-
WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/02-ProjectInfo/InputXhsProjectInfoWizardPage.Designer.cs | 110 +++++--------
12 files changed, 241 insertions(+), 180 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/HomeXhsProjectPage.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/HomeXhsProjectPage.Designer.cs
index e95ae98..f24a901 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/HomeXhsProjectPage.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/HomeXhsProjectPage.Designer.cs
@@ -79,20 +79,20 @@
//
mapViewProjectListContainer1.Dock = DockStyle.Fill;
mapViewProjectListContainer1.Location = new Point(0, 0);
- mapViewProjectListContainer1.Margin = new Padding(4, 3, 4, 3);
+ mapViewProjectListContainer1.Margin = new Padding(3, 2, 3, 2);
mapViewProjectListContainer1.Name = "mapViewProjectListContainer1";
- mapViewProjectListContainer1.Padding = new Padding(1, 2, 1, 2);
- mapViewProjectListContainer1.Size = new Size(926, 882);
+ mapViewProjectListContainer1.Padding = new Padding(1, 1, 1, 1);
+ mapViewProjectListContainer1.Size = new Size(648, 560);
mapViewProjectListContainer1.TabIndex = 5;
//
// homeXhsProjectPropertyCtrl1
//
homeXhsProjectPropertyCtrl1.Dock = DockStyle.Fill;
homeXhsProjectPropertyCtrl1.Location = new Point(0, 0);
- homeXhsProjectPropertyCtrl1.Margin = new Padding(6, 8, 6, 8);
+ homeXhsProjectPropertyCtrl1.Margin = new Padding(4, 5, 4, 5);
homeXhsProjectPropertyCtrl1.Name = "homeXhsProjectPropertyCtrl1";
homeXhsProjectPropertyCtrl1.SelectedObject = null;
- homeXhsProjectPropertyCtrl1.Size = new Size(298, 882);
+ homeXhsProjectPropertyCtrl1.Size = new Size(208, 560);
homeXhsProjectPropertyCtrl1.TabIndex = 0;
homeXhsProjectPropertyCtrl1.JumpDirectEvent += homeXhsProjectPropertyCtrl1_JumpDirectEvent;
//
@@ -100,9 +100,9 @@
//
homeXhsProjectTreeListCtrl1.Dock = DockStyle.Fill;
homeXhsProjectTreeListCtrl1.Location = new Point(0, 0);
- homeXhsProjectTreeListCtrl1.Margin = new Padding(6, 8, 6, 8);
+ homeXhsProjectTreeListCtrl1.Margin = new Padding(4, 5, 4, 5);
homeXhsProjectTreeListCtrl1.Name = "homeXhsProjectTreeListCtrl1";
- homeXhsProjectTreeListCtrl1.Size = new Size(293, 882);
+ homeXhsProjectTreeListCtrl1.Size = new Size(205, 560);
homeXhsProjectTreeListCtrl1.TabIndex = 0;
homeXhsProjectTreeListCtrl1.SelectProjectEvent += homeXhsProjectTreeListCtrl1_SelectProjectEvent;
homeXhsProjectTreeListCtrl1.RefreshDataEvent += homeXhsProjectTreeListCtrl1_RefreshDataEvent;
@@ -118,20 +118,21 @@
sidePanel1.Controls.Add(gridControl1);
sidePanel1.Dock = DockStyle.Top;
sidePanel1.Location = new Point(0, 0);
- sidePanel1.Margin = new Padding(4, 5, 4, 5);
sidePanel1.Name = "sidePanel1";
- sidePanel1.Size = new Size(1519, 148);
+ sidePanel1.Size = new Size(1063, 94);
sidePanel1.TabIndex = 1;
sidePanel1.Text = "sidePanel1";
//
// gridControl1
//
gridControl1.Dock = DockStyle.Fill;
+ gridControl1.EmbeddedNavigator.Margin = new Padding(2, 2, 2, 2);
gridControl1.Location = new Point(0, 0);
gridControl1.MainView = layoutView1;
+ gridControl1.Margin = new Padding(2, 2, 2, 2);
gridControl1.Name = "gridControl1";
gridControl1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { repPicEdit });
- gridControl1.Size = new Size(1519, 147);
+ gridControl1.Size = new Size(1063, 93);
gridControl1.TabIndex = 0;
gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { layoutView1, gridView1 });
//
@@ -139,9 +140,10 @@
//
layoutView1.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
layoutView1.CardHorzInterval = 4;
- layoutView1.CardMinSize = new Size(356, 94);
+ layoutView1.CardMinSize = new Size(249, 60);
layoutView1.CardVertInterval = 0;
layoutView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.LayoutViewColumn[] { colName, colCount, colPicture });
+ layoutView1.DetailHeight = 223;
layoutView1.GridControl = gridControl1;
layoutView1.Name = "layoutView1";
layoutView1.OptionsBehavior.Editable = false;
@@ -171,18 +173,18 @@
colName.Caption = "鍚嶇О";
colName.FieldName = "Name";
colName.LayoutViewField = layoutViewField_layoutViewColumn1;
- colName.MinWidth = 30;
+ colName.MinWidth = 21;
colName.Name = "colName";
- colName.Width = 112;
+ colName.Width = 78;
//
// layoutViewField_layoutViewColumn1
//
layoutViewField_layoutViewColumn1.ContentHorzAlignment = DevExpress.Utils.HorzAlignment.Center;
layoutViewField_layoutViewColumn1.ContentVertAlignment = DevExpress.Utils.VertAlignment.Center;
- layoutViewField_layoutViewColumn1.EditorPreferredWidth = 173;
+ layoutViewField_layoutViewColumn1.EditorPreferredWidth = 121;
layoutViewField_layoutViewColumn1.Location = new Point(0, 0);
layoutViewField_layoutViewColumn1.Name = "layoutViewField_layoutViewColumn1";
- layoutViewField_layoutViewColumn1.Padding = new DevExpress.XtraLayout.Utils.Padding(4, 4, 4, 4);
+ layoutViewField_layoutViewColumn1.Padding = new DevExpress.XtraLayout.Utils.Padding(3, 3, 3, 3);
layoutViewField_layoutViewColumn1.Size = new Size(181, 36);
layoutViewField_layoutViewColumn1.TextSize = new Size(0, 0);
layoutViewField_layoutViewColumn1.TextVisible = false;
@@ -197,18 +199,18 @@
colCount.Caption = "鏁伴噺";
colCount.FieldName = "Count";
colCount.LayoutViewField = layoutViewField_layoutViewColumn1_1;
- colCount.MinWidth = 30;
+ colCount.MinWidth = 21;
colCount.Name = "colCount";
- colCount.Width = 112;
+ colCount.Width = 78;
//
// layoutViewField_layoutViewColumn1_1
//
layoutViewField_layoutViewColumn1_1.ContentHorzAlignment = DevExpress.Utils.HorzAlignment.Center;
layoutViewField_layoutViewColumn1_1.ContentVertAlignment = DevExpress.Utils.VertAlignment.Center;
- layoutViewField_layoutViewColumn1_1.EditorPreferredWidth = 173;
+ layoutViewField_layoutViewColumn1_1.EditorPreferredWidth = 121;
layoutViewField_layoutViewColumn1_1.Location = new Point(0, 36);
layoutViewField_layoutViewColumn1_1.Name = "layoutViewField_layoutViewColumn1_1";
- layoutViewField_layoutViewColumn1_1.Padding = new DevExpress.XtraLayout.Utils.Padding(4, 4, 4, 4);
+ layoutViewField_layoutViewColumn1_1.Padding = new DevExpress.XtraLayout.Utils.Padding(3, 3, 3, 3);
layoutViewField_layoutViewColumn1_1.Size = new Size(181, 36);
layoutViewField_layoutViewColumn1_1.TextSize = new Size(0, 0);
layoutViewField_layoutViewColumn1_1.TextVisible = false;
@@ -219,9 +221,9 @@
colPicture.ColumnEdit = repPicEdit;
colPicture.FieldName = "Image";
colPicture.LayoutViewField = layoutViewField_layoutViewColumn2;
- colPicture.MinWidth = 30;
+ colPicture.MinWidth = 21;
colPicture.Name = "colPicture";
- colPicture.Width = 112;
+ colPicture.Width = 78;
//
// repPicEdit
//
@@ -229,10 +231,10 @@
//
// layoutViewField_layoutViewColumn2
//
- layoutViewField_layoutViewColumn2.EditorPreferredWidth = 145;
+ layoutViewField_layoutViewColumn2.EditorPreferredWidth = 101;
layoutViewField_layoutViewColumn2.Location = new Point(0, 0);
layoutViewField_layoutViewColumn2.Name = "layoutViewField_layoutViewColumn2";
- layoutViewField_layoutViewColumn2.Padding = new DevExpress.XtraLayout.Utils.Padding(4, 4, 4, 4);
+ layoutViewField_layoutViewColumn2.Padding = new DevExpress.XtraLayout.Utils.Padding(3, 3, 3, 3);
layoutViewField_layoutViewColumn2.Size = new Size(153, 86);
layoutViewField_layoutViewColumn2.TextSize = new Size(0, 0);
layoutViewField_layoutViewColumn2.TextVisible = false;
@@ -246,7 +248,7 @@
layoutViewCard1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutViewField_layoutViewColumn2, Group1 });
layoutViewCard1.Name = "layoutViewCard1";
layoutViewCard1.OptionsItemText.TextToControlDistance = 3;
- layoutViewCard1.Padding = new DevExpress.XtraLayout.Utils.Padding(4, 4, 4, 4);
+ layoutViewCard1.Padding = new DevExpress.XtraLayout.Utils.Padding(3, 3, 3, 3);
layoutViewCard1.Text = "TemplateCard";
//
// Group1
@@ -257,7 +259,7 @@
Group1.Location = new Point(153, 0);
Group1.Name = "Group1";
Group1.OptionsItemText.TextToControlDistance = 3;
- Group1.Padding = new DevExpress.XtraLayout.Utils.Padding(6, 6, 6, 6);
+ Group1.Padding = new DevExpress.XtraLayout.Utils.Padding(4, 4, 4, 4);
Group1.Size = new Size(195, 86);
Group1.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
Group1.TextLocation = DevExpress.Utils.Locations.Default;
@@ -265,8 +267,10 @@
//
// gridView1
//
+ gridView1.DetailHeight = 223;
gridView1.GridControl = gridControl1;
gridView1.Name = "gridView1";
+ gridView1.OptionsEditForm.PopupEditFormWidth = 560;
//
// sidePanelBottom
//
@@ -274,10 +278,9 @@
sidePanelBottom.Controls.Add(dockPanelRight);
sidePanelBottom.Controls.Add(dockPanelLeft);
sidePanelBottom.Dock = DockStyle.Fill;
- sidePanelBottom.Location = new Point(0, 148);
- sidePanelBottom.Margin = new Padding(4, 5, 4, 5);
+ sidePanelBottom.Location = new Point(0, 94);
sidePanelBottom.Name = "sidePanelBottom";
- sidePanelBottom.Size = new Size(1519, 916);
+ sidePanelBottom.Size = new Size(1063, 583);
sidePanelBottom.TabIndex = 7;
sidePanelBottom.Text = "sidePanel3";
//
@@ -290,19 +293,21 @@
dockPanelFill.Controls.Add(controlContainer2);
dockPanelFill.Dock = DevExpress.XtraBars.Docking.DockingStyle.Fill;
dockPanelFill.ID = new Guid("136389ea-6552-4166-8c2a-b2ffe8b01953");
- dockPanelFill.Location = new Point(294, 0);
+ dockPanelFill.Location = new Point(206, 0);
+ dockPanelFill.Margin = new Padding(2, 2, 2, 2);
dockPanelFill.Name = "dockPanelFill";
dockPanelFill.Options.ShowCloseButton = false;
dockPanelFill.OriginalSize = new Size(1525, 200);
- dockPanelFill.Size = new Size(926, 916);
+ dockPanelFill.Size = new Size(648, 583);
dockPanelFill.Text = "鍦板浘";
//
// controlContainer2
//
controlContainer2.Controls.Add(mapViewProjectListContainer1);
- controlContainer2.Location = new Point(0, 34);
+ controlContainer2.Location = new Point(0, 23);
+ controlContainer2.Margin = new Padding(2, 2, 2, 2);
controlContainer2.Name = "controlContainer2";
- controlContainer2.Size = new Size(926, 882);
+ controlContainer2.Size = new Size(648, 560);
controlContainer2.TabIndex = 0;
//
// dockPanelRight
@@ -310,19 +315,21 @@
dockPanelRight.Controls.Add(controlContainer1);
dockPanelRight.Dock = DevExpress.XtraBars.Docking.DockingStyle.Right;
dockPanelRight.ID = new Guid("18c9fca9-8ae9-473c-9cd2-0467d818af3f");
- dockPanelRight.Location = new Point(1220, 0);
+ dockPanelRight.Location = new Point(854, 0);
+ dockPanelRight.Margin = new Padding(2, 2, 2, 2);
dockPanelRight.Name = "dockPanelRight";
dockPanelRight.Options.ShowCloseButton = false;
dockPanelRight.OriginalSize = new Size(299, 200);
- dockPanelRight.Size = new Size(299, 916);
+ dockPanelRight.Size = new Size(209, 583);
dockPanelRight.Text = "灞炴�ч潰鏉�";
//
// controlContainer1
//
controlContainer1.Controls.Add(homeXhsProjectPropertyCtrl1);
- controlContainer1.Location = new Point(1, 34);
+ controlContainer1.Location = new Point(1, 23);
+ controlContainer1.Margin = new Padding(2, 2, 2, 2);
controlContainer1.Name = "controlContainer1";
- controlContainer1.Size = new Size(298, 882);
+ controlContainer1.Size = new Size(208, 560);
controlContainer1.TabIndex = 0;
//
// dockPanelLeft
@@ -331,18 +338,20 @@
dockPanelLeft.Dock = DevExpress.XtraBars.Docking.DockingStyle.Left;
dockPanelLeft.ID = new Guid("fba93cbc-dfe6-4982-8aee-be8baff1ea68");
dockPanelLeft.Location = new Point(0, 0);
+ dockPanelLeft.Margin = new Padding(2, 2, 2, 2);
dockPanelLeft.Name = "dockPanelLeft";
dockPanelLeft.Options.ShowCloseButton = false;
dockPanelLeft.OriginalSize = new Size(294, 200);
- dockPanelLeft.Size = new Size(294, 916);
+ dockPanelLeft.Size = new Size(206, 583);
dockPanelLeft.Text = "椤圭洰鍒楄〃";
//
// dockPanel1_Container
//
dockPanel1_Container.Controls.Add(homeXhsProjectTreeListCtrl1);
- dockPanel1_Container.Location = new Point(0, 34);
+ dockPanel1_Container.Location = new Point(0, 23);
+ dockPanel1_Container.Margin = new Padding(2, 2, 2, 2);
dockPanel1_Container.Name = "dockPanel1_Container";
- dockPanel1_Container.Size = new Size(293, 882);
+ dockPanel1_Container.Size = new Size(205, 560);
dockPanel1_Container.TabIndex = 0;
//
// dockManager1
@@ -356,13 +365,13 @@
//
Appearance.BackColor = SystemColors.Control;
Appearance.Options.UseBackColor = true;
- AutoScaleDimensions = new SizeF(10F, 22F);
+ AutoScaleDimensions = new SizeF(7F, 14F);
AutoScaleMode = AutoScaleMode.Font;
Controls.Add(sidePanelBottom);
Controls.Add(sidePanel1);
- Margin = new Padding(6, 8, 6, 8);
+ Margin = new Padding(4, 5, 4, 5);
Name = "HomeXhsProjectPage";
- Size = new Size(1519, 1064);
+ Size = new Size(1063, 677);
((ISupportInitialize)svgImg32).EndInit();
sidePanel1.ResumeLayout(false);
((ISupportInitialize)gridControl1).EndInit();
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectDlg.Designer.cs
index accba89..b5d4b48 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectDlg.Designer.cs
@@ -179,6 +179,8 @@
//
// setXhsProjectMapLocationWizardPage
//
+ setXhsProjectMapLocationWizardPage.AllowComplete = false;
+ setXhsProjectMapLocationWizardPage.AllowNext = false;
setXhsProjectMapLocationWizardPage.Dock = DockStyle.Fill;
setXhsProjectMapLocationWizardPage.Location = new Point(0, 0);
setXhsProjectMapLocationWizardPage.Name = "setXhsProjectMapLocationWizardPage";
@@ -227,10 +229,11 @@
stepProgressBar1.Items.Add(stepPbImportCompleted);
stepProgressBar1.Location = new Point(12, 12);
stepProgressBar1.Name = "stepProgressBar1";
- stepProgressBar1.SelectedItemIndex = 0;
+ stepProgressBar1.SelectedItemIndex = 1;
stepProgressBar1.Size = new Size(1089, 104);
stepProgressBar1.StyleController = layoutControl1;
stepProgressBar1.TabIndex = 4;
+ stepProgressBar1.Visible = false;
//
// stepPbSelectModelFile
//
@@ -242,6 +245,7 @@
//
stepPbInputProjectInfo.ContentBlock2.Caption = "璁剧疆鍦板浘浣嶇疆";
stepPbInputProjectInfo.Name = "stepPbInputProjectInfo";
+ stepPbInputProjectInfo.State = DevExpress.XtraEditors.StepProgressBarItemState.Active;
//
// stepPbSetMapLocation
//
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectDlg.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectDlg.cs
index cf45f7e..3f87997 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectDlg.cs
@@ -1,4 +1,5 @@
-锘縰sing DevExpress.XtraLayout.Utils;
+锘縰sing DevExpress.XtraEditors;
+using DevExpress.XtraLayout.Utils;
namespace HStation.WinFrmUI
{
@@ -109,10 +110,10 @@
{
if (this.DialogResult == DialogResult.OK)
{
- if (!_wizard.Complete())
- {
- e.Cancel = true;
- }
+ /* if (!_wizard.Complete())
+ {
+ e.Cancel = true;
+ }*/
}
else if (this.DialogResult == DialogResult.Cancel)
{
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/02-ProjectInfo/InputXhsProjectInfoWizardPage.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/02-ProjectInfo/InputXhsProjectInfoWizardPage.Designer.cs
index 1b7d044..1de23a2 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/02-ProjectInfo/InputXhsProjectInfoWizardPage.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/02-ProjectInfo/InputXhsProjectInfoWizardPage.Designer.cs
@@ -36,18 +36,16 @@
txtAddress = new DevExpress.XtraEditors.TextEdit();
txtCustomer = new DevExpress.XtraEditors.TextEdit();
txtName = new DevExpress.XtraEditors.TextEdit();
- txtNO = new DevExpress.XtraEditors.TextEdit();
+ btnEditSelectModelFile = new DevExpress.XtraEditors.ButtonEdit();
Root = new DevExpress.XtraLayout.LayoutControlGroup();
- layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
- dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
- btnEditSelectModelFile = new DevExpress.XtraEditors.ButtonEdit();
layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+ dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
((ISupportInitialize)layoutControl1).BeginInit();
layoutControl1.SuspendLayout();
((ISupportInitialize)txtDescription.Properties).BeginInit();
@@ -55,18 +53,16 @@
((ISupportInitialize)txtAddress.Properties).BeginInit();
((ISupportInitialize)txtCustomer.Properties).BeginInit();
((ISupportInitialize)txtName.Properties).BeginInit();
- ((ISupportInitialize)txtNO.Properties).BeginInit();
+ ((ISupportInitialize)btnEditSelectModelFile.Properties).BeginInit();
((ISupportInitialize)Root).BeginInit();
- ((ISupportInitialize)layoutControlItem1).BeginInit();
((ISupportInitialize)layoutControlItem2).BeginInit();
((ISupportInitialize)layoutControlItem3).BeginInit();
((ISupportInitialize)layoutControlItem4).BeginInit();
((ISupportInitialize)layoutControlItem6).BeginInit();
((ISupportInitialize)layoutControlItem7).BeginInit();
((ISupportInitialize)layoutControlItem5).BeginInit();
- ((ISupportInitialize)dxErrorProvider1).BeginInit();
- ((ISupportInitialize)btnEditSelectModelFile.Properties).BeginInit();
((ISupportInitialize)layoutControlItem8).BeginInit();
+ ((ISupportInitialize)dxErrorProvider1).BeginInit();
SuspendLayout();
//
// layoutControl1
@@ -77,7 +73,6 @@
layoutControl1.Controls.Add(txtAddress);
layoutControl1.Controls.Add(txtCustomer);
layoutControl1.Controls.Add(txtName);
- layoutControl1.Controls.Add(txtNO);
layoutControl1.Controls.Add(btnEditSelectModelFile);
layoutControl1.Dock = DockStyle.Fill;
layoutControl1.Location = new Point(0, 0);
@@ -90,34 +85,34 @@
//
// setFlagsEditCtrl1
//
- setFlagsEditCtrl1.Location = new Point(113, 60);
+ setFlagsEditCtrl1.Location = new Point(532, 60);
setFlagsEditCtrl1.Name = "setFlagsEditCtrl1";
- setFlagsEditCtrl1.Size = new Size(314, 20);
+ setFlagsEditCtrl1.Size = new Size(315, 20);
setFlagsEditCtrl1.TabIndex = 5;
//
// txtDescription
//
- txtDescription.Location = new Point(113, 108);
+ txtDescription.Location = new Point(113, 84);
txtDescription.Name = "txtDescription";
- txtDescription.Size = new Size(734, 344);
+ txtDescription.Size = new Size(734, 368);
txtDescription.StyleController = layoutControl1;
- txtDescription.TabIndex = 8;
+ txtDescription.TabIndex = 7;
//
// txtTagNme
//
- txtTagNme.Location = new Point(532, 60);
+ txtTagNme.Location = new Point(532, 36);
txtTagNme.Name = "txtTagNme";
txtTagNme.Size = new Size(315, 20);
txtTagNme.StyleController = layoutControl1;
- txtTagNme.TabIndex = 6;
+ txtTagNme.TabIndex = 4;
//
// txtAddress
//
- txtAddress.Location = new Point(532, 36);
+ txtAddress.Location = new Point(532, 12);
txtAddress.Name = "txtAddress";
txtAddress.Size = new Size(315, 20);
txtAddress.StyleController = layoutControl1;
- txtAddress.TabIndex = 4;
+ txtAddress.TabIndex = 2;
//
// txtCustomer
//
@@ -129,19 +124,22 @@
//
// txtName
//
- txtName.Location = new Point(532, 12);
+ txtName.Location = new Point(113, 12);
txtName.Name = "txtName";
- txtName.Size = new Size(315, 20);
+ txtName.Size = new Size(314, 20);
txtName.StyleController = layoutControl1;
- txtName.TabIndex = 2;
+ txtName.TabIndex = 0;
//
- // txtNO
+ // btnEditSelectModelFile
//
- txtNO.Location = new Point(113, 12);
- txtNO.Name = "txtNO";
- txtNO.Size = new Size(314, 20);
- txtNO.StyleController = layoutControl1;
- txtNO.TabIndex = 0;
+ btnEditSelectModelFile.EditValue = "";
+ btnEditSelectModelFile.Location = new Point(113, 60);
+ btnEditSelectModelFile.Name = "btnEditSelectModelFile";
+ btnEditSelectModelFile.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton() });
+ btnEditSelectModelFile.Size = new Size(314, 20);
+ btnEditSelectModelFile.StyleController = layoutControl1;
+ btnEditSelectModelFile.TabIndex = 6;
+ btnEditSelectModelFile.ButtonClick += btnEditSelectModelFile_ButtonClick;
//
// Root
//
@@ -149,27 +147,18 @@
Root.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
Root.GroupBordersVisible = false;
- Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem2, layoutControlItem3, layoutControlItem4, layoutControlItem6, layoutControlItem7, layoutControlItem5, layoutControlItem8 });
+ Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem2, layoutControlItem3, layoutControlItem6, layoutControlItem7, layoutControlItem5, layoutControlItem4, layoutControlItem8 });
Root.Name = "Root";
Root.Size = new Size(859, 464);
Root.TextVisible = false;
- //
- // layoutControlItem1
- //
- layoutControlItem1.Control = txtNO;
- layoutControlItem1.Location = new Point(0, 0);
- layoutControlItem1.Name = "layoutControlItem1";
- layoutControlItem1.Size = new Size(419, 24);
- layoutControlItem1.Text = "缂栧彿锛�";
- layoutControlItem1.TextSize = new Size(89, 14);
//
// layoutControlItem2
//
layoutControlItem2.AllowHtmlStringInCaption = true;
layoutControlItem2.Control = txtName;
- layoutControlItem2.Location = new Point(419, 0);
+ layoutControlItem2.Location = new Point(0, 0);
layoutControlItem2.Name = "layoutControlItem2";
- layoutControlItem2.Size = new Size(420, 24);
+ layoutControlItem2.Size = new Size(419, 24);
layoutControlItem2.Text = "<color=red>*</color>鍚嶇О锛�";
layoutControlItem2.TextSize = new Size(89, 14);
//
@@ -185,7 +174,7 @@
// layoutControlItem4
//
layoutControlItem4.Control = txtAddress;
- layoutControlItem4.Location = new Point(419, 24);
+ layoutControlItem4.Location = new Point(419, 0);
layoutControlItem4.Name = "layoutControlItem4";
layoutControlItem4.Size = new Size(420, 24);
layoutControlItem4.Text = "鍦板潃锛�";
@@ -194,7 +183,7 @@
// layoutControlItem6
//
layoutControlItem6.Control = txtTagNme;
- layoutControlItem6.Location = new Point(419, 48);
+ layoutControlItem6.Location = new Point(419, 24);
layoutControlItem6.Name = "layoutControlItem6";
layoutControlItem6.Size = new Size(420, 24);
layoutControlItem6.Text = "鏍囧織锛�";
@@ -203,46 +192,35 @@
// layoutControlItem7
//
layoutControlItem7.Control = txtDescription;
- layoutControlItem7.Location = new Point(0, 96);
+ layoutControlItem7.Location = new Point(0, 72);
layoutControlItem7.Name = "layoutControlItem7";
- layoutControlItem7.Size = new Size(839, 348);
+ layoutControlItem7.Size = new Size(839, 372);
layoutControlItem7.Text = "璇存槑";
layoutControlItem7.TextSize = new Size(89, 14);
//
// layoutControlItem5
//
layoutControlItem5.Control = setFlagsEditCtrl1;
- layoutControlItem5.Location = new Point(0, 48);
+ layoutControlItem5.Location = new Point(419, 48);
layoutControlItem5.Name = "layoutControlItem5";
- layoutControlItem5.Size = new Size(419, 24);
+ layoutControlItem5.Size = new Size(420, 24);
layoutControlItem5.Text = "鏍囩锛�";
layoutControlItem5.TextSize = new Size(89, 14);
- //
- // dxErrorProvider1
- //
- dxErrorProvider1.ContainerControl = this;
- //
- // btnEditSelectModelFile
- //
- btnEditSelectModelFile.EditValue = "";
- btnEditSelectModelFile.Location = new Point(113, 84);
- btnEditSelectModelFile.Name = "btnEditSelectModelFile";
- btnEditSelectModelFile.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton() });
- btnEditSelectModelFile.Size = new Size(734, 20);
- btnEditSelectModelFile.StyleController = layoutControl1;
- btnEditSelectModelFile.TabIndex = 7;
- btnEditSelectModelFile.ButtonClick += btnEditSelectModelFile_ButtonClick;
//
// layoutControlItem8
//
layoutControlItem8.AppearanceItemCaption.FontSizeDelta = 1;
layoutControlItem8.AppearanceItemCaption.Options.UseFont = true;
layoutControlItem8.Control = btnEditSelectModelFile;
- layoutControlItem8.Location = new Point(0, 72);
+ layoutControlItem8.Location = new Point(0, 48);
layoutControlItem8.Name = "layoutControlItem8";
- layoutControlItem8.Size = new Size(839, 24);
+ layoutControlItem8.Size = new Size(419, 24);
layoutControlItem8.Text = "閫夋嫨妯″瀷鏂囦欢:";
layoutControlItem8.TextSize = new Size(89, 17);
+ //
+ // dxErrorProvider1
+ //
+ dxErrorProvider1.ContainerControl = this;
//
// InputXhsProjectInfoWizardPage
//
@@ -258,18 +236,16 @@
((ISupportInitialize)txtAddress.Properties).EndInit();
((ISupportInitialize)txtCustomer.Properties).EndInit();
((ISupportInitialize)txtName.Properties).EndInit();
- ((ISupportInitialize)txtNO.Properties).EndInit();
+ ((ISupportInitialize)btnEditSelectModelFile.Properties).EndInit();
((ISupportInitialize)Root).EndInit();
- ((ISupportInitialize)layoutControlItem1).EndInit();
((ISupportInitialize)layoutControlItem2).EndInit();
((ISupportInitialize)layoutControlItem3).EndInit();
((ISupportInitialize)layoutControlItem4).EndInit();
((ISupportInitialize)layoutControlItem6).EndInit();
((ISupportInitialize)layoutControlItem7).EndInit();
((ISupportInitialize)layoutControlItem5).EndInit();
- ((ISupportInitialize)dxErrorProvider1).EndInit();
- ((ISupportInitialize)btnEditSelectModelFile.Properties).EndInit();
((ISupportInitialize)layoutControlItem8).EndInit();
+ ((ISupportInitialize)dxErrorProvider1).EndInit();
ResumeLayout(false);
}
@@ -278,8 +254,6 @@
private DevExpress.XtraLayout.LayoutControl layoutControl1;
private DevExpress.XtraLayout.LayoutControlGroup Root;
private DevExpress.XtraEditors.TextEdit txtName;
- private DevExpress.XtraEditors.TextEdit txtNO;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider dxErrorProvider1;
private DevExpress.XtraEditors.TextEdit txtCustomer;
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/02-ProjectInfo/InputXhsProjectInfoWizardPage.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/02-ProjectInfo/InputXhsProjectInfoWizardPage.cs
index 0182908..3bb6298 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/02-ProjectInfo/InputXhsProjectInfoWizardPage.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/02-ProjectInfo/InputXhsProjectInfoWizardPage.cs
@@ -17,6 +17,8 @@
private Lazy<HStation.BLL.XhsProject> _bllProject = new(() => new HStation.BLL.XhsProject());//椤圭洰bll
private Lazy<Yw.BLL.SysFlagStd> _bllFlag = new(() => new Yw.BLL.SysFlagStd());//鏍囩bll
+ public static bool AllowImport = false;
+
/// <summary>
/// 鍒濆鍖�
/// </summary>
@@ -51,6 +53,14 @@
get
{
_vm.ZipFile = this.btnEditSelectModelFile.Text.Trim();
+ if (_vm.ZipFile != string.Empty)
+ {
+ AllowImport = true;
+ }
+ else
+ {
+ AllowImport = false;
+ }
return _isInitialize;
}
}
@@ -103,7 +113,6 @@
return false;
}
}
- _vm.NO = this.txtNO.Text.Trim();
_vm.Name = this.txtName.Text.Trim();
_vm.Customer = this.txtCustomer.Text.Trim();
_vm.Address = this.txtAddress.Text.Trim();
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/03-MapLocation/SetXhsProjectMapLocationWizardPage.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/03-MapLocation/SetXhsProjectMapLocationWizardPage.cs
index 2eb39da..eee6078 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/03-MapLocation/SetXhsProjectMapLocationWizardPage.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/03-MapLocation/SetXhsProjectMapLocationWizardPage.cs
@@ -1,5 +1,4 @@
-锘�
-namespace HStation.WinFrmUI
+锘縩amespace HStation.WinFrmUI
{
public partial class SetXhsProjectMapLocationWizardPage : DevExpress.XtraEditors.XtraUserControl, Yw.WinFrmUI.IWizardPage<ImportXhsProjectViewModel>
{
@@ -16,18 +15,27 @@
/// </summary>
public async void InitialPage(ImportXhsProjectViewModel t)
{
- if (_isInitialize)
- {
- return;
- }
+ /* if (_isInitialize)
+ {
+ return;
+ }*/
_vm = t;
- _isInitialize = true;
+ //_isInitialize = true;
this.mapSetSimpleMarkerContainer1.LoadCompletedEvent += MapSetSimpleMarkerContainer1_LoadCompletedEvent;
this.mapSetSimpleMarkerContainer1.SetMarkerEvent += MapSetSimpleMarkerContainer1_SetMarkerEvent;
await this.mapSetSimpleMarkerContainer1.InitialContainer();
+ if (!InputXhsProjectInfoWizardPage.AllowImport)
+ {
+ AllowNext = false;
+ AllowComplete = true;
+ PageStateChangedEvent.Invoke();
+ }
+ else
+ {
+ AllowNext = true;
+ AllowComplete = false;
+ }
}
-
-
/// <summary>
/// 鏄惁鍒濆鍖�
@@ -36,6 +44,7 @@
{
get { return _isInitialize; }
}
+
private bool _isInitialize = false;
public event Action PageStateChangedEvent;
@@ -53,7 +62,8 @@
/// </summary>
public bool AllowNext
{
- get { return true; }
+ get;
+ set;
}
/// <summary>
@@ -69,7 +79,8 @@
/// </summary>
public bool AllowComplete
{
- get { return false; }
+ get;
+ set;
}
/// <summary>
@@ -101,7 +112,75 @@
/// </summary>
public bool CanComplete()
{
- return false;
+ Task.Run(() => InsertProject());
+ return true;
+ }
+
+ private async void InsertProject()
+ {
+ var bllXhsProjectExtensions = new BLL.XhsProjectExtensions();
+ var project = new Vmo.Xhs.XhsProjectExtensions();
+ project.NO = _vm.NO;
+ project.Name = _vm.Name;
+ project.Address = _vm.Address;
+ project.Customer = _vm.Customer;
+ project.Flags = _vm.Flags;
+ project.TagName = _vm.TagName;
+ project.Description = _vm.Description;
+ project.SiteList = new List<Vmo.Xhs.XhsProjectSite>() {
+ new Vmo.Xhs.XhsProjectSite(){
+ Name=_vm.Name,
+ Description=_vm.Description
+ }
+ };
+ var projectId = await bllXhsProjectExtensions.Insert(project);
+ if (projectId > 1)
+ {
+ if (_vm.Location != null)
+ {
+ var mapInfo = new Yw.Vmo.Map.MapInfo();
+ mapInfo.ObjectType = HStation.Xhs.DataType.XhsProject;
+ mapInfo.ObjectID = projectId;
+ mapInfo.ObjectName = project.Name;
+ mapInfo.Purpose = Yw.Map.Purpose.Location;
+ mapInfo.Kind = Yw.Map.Kind.Gaodei;
+ mapInfo.Shape = Yw.Map.Shape.Marker;
+ mapInfo.Position = _vm.Location.ToJson();
+ var mapInfoId = await new Yw.BLL.MapInfo().Insert(mapInfo);
+ if (mapInfoId < 1)
+ {
+ if (this.InvokeRequired)
+ {
+ this.Invoke(new Action(() =>
+ {
+ // 鏇存柊UI鎺т欢
+ MessageBoxHelper.ShowError("瀵煎叆閿欒!");
+ }));
+ }
+ else
+ {
+ // 鐩存帴鏇存柊UI鎺т欢
+ MessageBoxHelper.ShowError("瀵煎叆閿欒!");
+ }
+ }
+ else
+ {
+ if (this.InvokeRequired)
+ {
+ this.Invoke(new Action(() =>
+ {
+ // 鏇存柊UI鎺т欢
+ MessageBoxHelper.ShowError("瀵煎叆閿欒!");
+ }));
+ }
+ else
+ {
+ // 鐩存帴鏇存柊UI鎺т欢
+ MessageBoxHelper.ShowError("瀵煎叆閿欒!");
+ }
+ }
+ }
+ }
}
//鍦板浘鍔犺浇瀹屾垚
@@ -126,7 +205,5 @@
}
this.txtAddress.EditValue = obj.Address;
}
-
-
}
-}
+}
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/04-GeneralProject/GenerateXhsProjectWizardPage.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/04-GeneralProject/GenerateXhsProjectWizardPage.cs
index cadf451..8f0d40a 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/04-GeneralProject/GenerateXhsProjectWizardPage.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/04-GeneralProject/GenerateXhsProjectWizardPage.cs
@@ -12,13 +12,13 @@
/// 鐘舵�佹敼鍙樹簨浠�
/// </summary>
public event Action PageStateChangedEvent;
+
private bool _isInitialize = false;//鏄惁鍒濆鍖�
private bool _importResult = false;//瀵煎叆缁撴灉
private ImportXhsProjectViewModel _vm = null;//鎿嶄綔瀵硅薄
-
/// <summary>
- ///
+ ///
/// </summary>
public async void InitialPage(ImportXhsProjectViewModel vm)
{
@@ -139,11 +139,5 @@
{
return false;
}
-
-
-
-
-
-
}
-}
+}
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/03-mgr/XhsProjectMgrPage.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/03-mgr/XhsProjectMgrPage.cs
index c0b9493..af6bae1 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/03-mgr/XhsProjectMgrPage.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/03-mgr/XhsProjectMgrPage.cs
@@ -178,7 +178,7 @@
var bol = await new Yw.BLL.MapInfo().Update(mapinfo);
if (!bol)
{
- TipFormHelper.ShowError("鍦板浘淇℃伅娣诲姞閿欒");
+ TipFormHelper.ShowError("鍦板浘淇℃伅缂栬緫閿欒");
}
}
return true;
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/04-dlg/AddProjectDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/04-dlg/AddProjectDlg.Designer.cs
index 85f6989..6a2fc74 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/04-dlg/AddProjectDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/04-dlg/AddProjectDlg.Designer.cs
@@ -47,10 +47,10 @@
layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
tabbedControlGroup1 = new DevExpress.XtraLayout.TabbedControlGroup();
- layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
- layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
+ layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
((ISupportInitialize)layoutControl1).BeginInit();
layoutControl1.SuspendLayout();
@@ -68,10 +68,10 @@
((ISupportInitialize)layoutControlItem7).BeginInit();
((ISupportInitialize)layoutControlItem2).BeginInit();
((ISupportInitialize)tabbedControlGroup1).BeginInit();
- ((ISupportInitialize)layoutControlGroup1).BeginInit();
- ((ISupportInitialize)layoutControlItem5).BeginInit();
((ISupportInitialize)layoutControlGroup2).BeginInit();
((ISupportInitialize)layoutControlItem8).BeginInit();
+ ((ISupportInitialize)layoutControlGroup1).BeginInit();
+ ((ISupportInitialize)layoutControlItem5).BeginInit();
((ISupportInitialize)dxErrorProvider1).BeginInit();
SuspendLayout();
//
@@ -141,6 +141,7 @@
//
BtnCancel.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
BtnCancel.Appearance.Options.UseBackColor = true;
+ BtnCancel.DialogResult = DialogResult.Cancel;
BtnCancel.Location = new Point(583, 422);
BtnCancel.Name = "BtnCancel";
BtnCancel.Size = new Size(92, 22);
@@ -250,6 +251,23 @@
tabbedControlGroup1.TabPages.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlGroup2, layoutControlGroup1 });
tabbedControlGroup1.Text = "璇存槑";
//
+ // layoutControlGroup2
+ //
+ layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem8 });
+ layoutControlGroup2.Location = new Point(0, 0);
+ layoutControlGroup2.Name = "layoutControlGroup2";
+ layoutControlGroup2.Size = new Size(643, 266);
+ layoutControlGroup2.Text = "鍦板浘閫夋嫨";
+ //
+ // layoutControlItem8
+ //
+ layoutControlItem8.Control = mapSetSimpleMarkerContainer1;
+ layoutControlItem8.Location = new Point(0, 0);
+ layoutControlItem8.Name = "layoutControlItem8";
+ layoutControlItem8.Size = new Size(643, 266);
+ layoutControlItem8.TextSize = new Size(0, 0);
+ layoutControlItem8.TextVisible = false;
+ //
// layoutControlGroup1
//
layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem5 });
@@ -267,23 +285,6 @@
layoutControlItem5.Text = "璇存槑:";
layoutControlItem5.TextSize = new Size(0, 0);
layoutControlItem5.TextVisible = false;
- //
- // layoutControlGroup2
- //
- layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem8 });
- layoutControlGroup2.Location = new Point(0, 0);
- layoutControlGroup2.Name = "layoutControlGroup2";
- layoutControlGroup2.Size = new Size(643, 266);
- layoutControlGroup2.Text = "鍦板浘閫夋嫨";
- //
- // layoutControlItem8
- //
- layoutControlItem8.Control = mapSetSimpleMarkerContainer1;
- layoutControlItem8.Location = new Point(0, 0);
- layoutControlItem8.Name = "layoutControlItem8";
- layoutControlItem8.Size = new Size(643, 266);
- layoutControlItem8.TextSize = new Size(0, 0);
- layoutControlItem8.TextVisible = false;
//
// dxErrorProvider1
//
@@ -314,10 +315,10 @@
((ISupportInitialize)layoutControlItem7).EndInit();
((ISupportInitialize)layoutControlItem2).EndInit();
((ISupportInitialize)tabbedControlGroup1).EndInit();
- ((ISupportInitialize)layoutControlGroup1).EndInit();
- ((ISupportInitialize)layoutControlItem5).EndInit();
((ISupportInitialize)layoutControlGroup2).EndInit();
((ISupportInitialize)layoutControlItem8).EndInit();
+ ((ISupportInitialize)layoutControlGroup1).EndInit();
+ ((ISupportInitialize)layoutControlItem5).EndInit();
((ISupportInitialize)dxErrorProvider1).EndInit();
ResumeLayout(false);
}
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/04-dlg/EditProjectDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/04-dlg/EditProjectDlg.Designer.cs
index 4d47df3..3c7b928 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/04-dlg/EditProjectDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/04-dlg/EditProjectDlg.Designer.cs
@@ -141,6 +141,7 @@
//
BtnCancel.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
BtnCancel.Appearance.Options.UseBackColor = true;
+ BtnCancel.DialogResult = DialogResult.Cancel;
BtnCancel.Location = new Point(583, 422);
BtnCancel.Name = "BtnCancel";
BtnCancel.Size = new Size(92, 22);
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/04-dlg/EditProjectDlg.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/04-dlg/EditProjectDlg.cs
index 99f4726..fd0711f 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/04-dlg/EditProjectDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/04-dlg/EditProjectDlg.cs
@@ -34,7 +34,7 @@
this.TextDescription.Text = _xhsProjectExtensions.Description;
this.TextAddress.Text = _xhsProjectExtensions.Address;
this.TextTagName.Text = _xhsProjectExtensions.TagName;
- var mapinfo = await new Yw.BLL.MapInfo().Get(HStation.Xhs.DataType.XhsProject, ID, Yw.Map.Purpose.Location, Yw.Map.Kind.Gaodei);
+ var mapinfo = await new Yw.BLL.MapInfo().Get(HStation.Xhs.DataType.XhsProject, ID, Yw.Map.Kind.Gaodei, Yw.Map.Purpose.Location);
if (mapinfo != null)
{
_mapinfo = mapinfo;
@@ -94,11 +94,6 @@
};
if (_maker != null)
{
- _mapinfo = new Yw.Vmo.Map.MapInfo();
- _mapinfo.ObjectType = HStation.Xhs.DataType.XhsProject;
- _mapinfo.Purpose = Yw.Map.Purpose.Location;
- _mapinfo.Kind = Yw.Map.Kind.Gaodei;
- _mapinfo.Shape = Yw.Map.Shape.Marker;
_mapinfo.Position = _maker.ToJson();
}
if (await this.ReloadDataEvent.Invoke(_xhsProjectExtensions, _mapinfo))
diff --git a/WinFrmUI/Yw.WinFrmUI.Core/08-wizard/IWizardPage.cs b/WinFrmUI/Yw.WinFrmUI.Core/08-wizard/IWizardPage.cs
index 6c809ca..e6a5f07 100644
--- a/WinFrmUI/Yw.WinFrmUI.Core/08-wizard/IWizardPage.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Core/08-wizard/IWizardPage.cs
@@ -12,7 +12,7 @@
/// </summary>
event Action PageStateChangedEvent;
- #endregion
+ #endregion 浜嬩欢
#region 鍒濆鍖�
@@ -21,7 +21,7 @@
/// </summary>
void InitialPage(T t);
- #endregion
+ #endregion 鍒濆鍖�
#region 鍏佽灞炴��
@@ -45,7 +45,7 @@
/// </summary>
bool AllowComplete { get; }
- #endregion
+ #endregion 鍏佽灞炴��
#region 鍒ゆ柇鏂规硶
@@ -69,10 +69,6 @@
/// </summary>
bool CanComplete();
- #endregion
-
-
-
-
+ #endregion 鍒ゆ柇鏂规硶
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3