From facdda630bc2a16c2a61e5db6e4387e257202d44 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期三, 15 一月 2025 11:40:38 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectDlg.cs | 97 +++++++++++++++++-------------------------------
1 files changed, 35 insertions(+), 62 deletions(-)
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 5155937..32bdef4 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,7 +1,4 @@
-锘縰sing DevExpress.XtraEditors;
-using DevExpress.XtraLayout.Utils;
-using HStation.WinFrmUI.Xhs;
-using HStation.WinFrmUI.Xhs.Core.Properties;
+锘縰sing DevExpress.XtraLayout.Utils;
namespace HStation.WinFrmUI
{
@@ -10,12 +7,11 @@
public ImportXhsProjectDlg()
{
InitializeComponent();
+ this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon;
}
- private readonly ImportXhsProjectViewModel _vm = new();
- private ImportXhsProjectManager _wizard;
-
- private static bool IsAddItem = true;
+ private ImportXhsProjectViewModel _vm = null;//鎿嶄綔瀵硅薄
+ private ImportXhsProjectManager _wizard;//姝ラ
/// <summary>
///
@@ -26,76 +22,53 @@
}
/// <summary>
- ///
+ /// 缁戝畾鏁版嵁
/// </summary>
public void SetBindingData()
{
+ _vm = new ImportXhsProjectViewModel();
_wizard = new ImportXhsProjectManager(_vm);
_wizard.SelectedPageChangedEvent += _wizard_SelectedPageChangedEvent;
_wizard.SelectedPageStateChangedEvent += _wizard_SelectedPageStateChangedEvent; ;
- InputXhsProjectInfoWizardPage.AutoAddItem += AutoAddItem;
- InputXhsProjectInfoWizardPage.DeleteItem += DeleteItem;
- _wizard.InitialManager(new IWizardPage<ImportXhsProjectViewModel>[] {
+ _wizard.InitialManager(new IWizardPageAsync<ImportXhsProjectViewModel>[] {
this.inputXhsProjectInfoWizardPage,
this.setXhsProjectMapLocationWizardPage,
this.generateXhsProjectWizardPage,
- this.importXhsProjectCompletedWizardPage,
- this.projectResultShowPanel1
+ this.projectResultShowPanel1
});
}
- //澧炲姞瀵艰埅鏉tem
- private void AutoAddItem()
+ /// <summary>
+ /// 缁戝畾鏁版嵁
+ /// </summary>
+ public void SetBindingData(XhsProjectExtensionsVmo project, Yw.Vmo.MapInfoVmo mapInfo)
{
- if (stepProgressBar1.Items.Count >= 5)
- {
- for (int i = 0; i < 3; i++)
- {
- stepProgressBar1.Items.RemoveAt(2);
- }
- }
- StepProgressBarItem stepPbInputProjectInfo = new StepProgressBarItem();
- stepPbInputProjectInfo.ContentBlock1.ActiveStateImageOptions.SvgImage = DevExpress.Images.ImageResourceCache.Default.GetSvgImageById("productquickshippments");
- stepPbInputProjectInfo.ContentBlock1.InactiveStateImageOptions.SvgImage = DevExpress.Images.ImageResourceCache.Default.GetSvgImageById("productquickshippments");
- stepPbInputProjectInfo.ContentBlock2.Caption = "鑷姩鐢熸垚椤圭洰";
- StepProgressBarItem stepPbImportComleted = new StepProgressBarItem();
- stepPbImportComleted.ContentBlock2.Caption = "椤圭洰瀵煎叆瀹屾垚";
- stepPbImportComleted.ContentBlock1.ActiveStateImageOptions.SvgImage = DevExpress.Images.ImageResourceCache.Default.GetSvgImageById("check");
- stepPbImportComleted.ContentBlock1.InactiveStateImageOptions.SvgImage = DevExpress.Images.ImageResourceCache.Default.GetSvgImageById("check");
- StepProgressBarItem stepGenerateProject = new StepProgressBarItem();
- stepGenerateProject.ContentBlock1.ActiveStateImageOptions.SvgImage = DevExpress.Images.ImageResourceCache.Default.GetSvgImageById("showallfieldresults");
- stepGenerateProject.ContentBlock1.InactiveStateImageOptions.SvgImage = DevExpress.Images.ImageResourceCache.Default.GetSvgImageById("showallfieldresults");
- stepGenerateProject.ContentBlock2.Caption = "椤圭洰灞曠ず缁撴灉";
- this.stepProgressBar1.Items.Add(stepPbInputProjectInfo);
- this.stepProgressBar1.Items.Add(stepPbImportComleted);
- this.stepProgressBar1.Items.Add(stepGenerateProject);
- }
-
- //鍒犻櫎瀵艰埅鏉tem
- private void DeleteItem()
- {
- if (stepProgressBar1.Items.Count >= 5)
- {
- for (int i = 0; i < 3; i++)
- {
- stepProgressBar1.Items.RemoveAt(2);
- }
- }
+ _vm = new ImportXhsProjectViewModel(project, mapInfo);
+ _wizard = new ImportXhsProjectManager(_vm);
+ _wizard.SelectedPageChangedEvent += _wizard_SelectedPageChangedEvent;
+ _wizard.SelectedPageStateChangedEvent += _wizard_SelectedPageStateChangedEvent; ;
+ _wizard.InitialManager(new IWizardPageAsync<ImportXhsProjectViewModel>[] {
+ this.inputXhsProjectInfoWizardPage,
+ this.setXhsProjectMapLocationWizardPage,
+ this.generateXhsProjectWizardPage,
+ this.projectResultShowPanel1
+ });
}
//閫夋嫨椤甸潰鏀瑰彉
- private void _wizard_SelectedPageChangedEvent(IWizardPage<ImportXhsProjectViewModel> page, int index)
+ private void _wizard_SelectedPageChangedEvent(IWizardPageAsync<ImportXhsProjectViewModel> page, int index)
{
this.itemForPrev.Visibility = page.AllowPrev ? LayoutVisibility.Always : LayoutVisibility.Never;
this.itemForNext.Visibility = page.AllowNext ? LayoutVisibility.Always : LayoutVisibility.Never;
this.itemForCancel.Visibility = page.AllowCancel ? LayoutVisibility.Always : LayoutVisibility.Never;
this.itemForComplete.Visibility = page.AllowComplete ? LayoutVisibility.Always : LayoutVisibility.Never;
+
this.navigationFrame1.SelectedPageIndex = index;
this.stepProgressBar1.SelectedItemIndex = index;
}
//閫夋嫨椤甸潰鐘舵�佹敼鍙�
- private void _wizard_SelectedPageStateChangedEvent(IWizardPage<ImportXhsProjectViewModel> page, int index)
+ private void _wizard_SelectedPageStateChangedEvent(IWizardPageAsync<ImportXhsProjectViewModel> page, int index)
{
this.itemForPrev.Visibility = page.AllowPrev ? LayoutVisibility.Always : LayoutVisibility.Never;
this.itemForNext.Visibility = page.AllowNext ? LayoutVisibility.Always : LayoutVisibility.Never;
@@ -104,29 +77,29 @@
}
//涓婁竴姝�
- private void btnPrev_Click(object sender, EventArgs e)
+ private async void btnPrev_Click(object sender, EventArgs e)
{
if (_wizard != null)
{
- _wizard.Prev();
+ await _wizard.Prev();
}
}
//涓嬩竴姝�
- private void btnNext_Click(object sender, EventArgs e)
+ private async void btnNext_Click(object sender, EventArgs e)
{
if (_wizard != null)
{
- _wizard.Next();
+ await _wizard.Next();
}
}
//鍙栨秷
- private void btnCancel_Click(object sender, EventArgs e)
+ private async void btnCancel_Click(object sender, EventArgs e)
{
if (_wizard != null)
{
- var bol = _wizard.Cancel();
+ var bol = await _wizard.Cancel();
if (bol)
{
this.DialogResult = DialogResult.Cancel;
@@ -136,11 +109,11 @@
}
//瀹屾垚
- private void btnComplete_Click(object sender, EventArgs e)
+ private async void btnComplete_Click(object sender, EventArgs e)
{
if (_wizard != null)
{
- var bol = _wizard.Complete();
+ var bol = await _wizard.Complete();
if (bol)
{
this.DialogResult = DialogResult.OK;
@@ -150,7 +123,7 @@
}
//姝ｅ湪鍏抽棴
- private void ImportXhsProjectDlg_FormClosing(object sender, FormClosingEventArgs e)
+ private async void ImportXhsProjectDlg_FormClosing(object sender, FormClosingEventArgs e)
{
if (_wizard != null)
{
@@ -163,7 +136,7 @@
}
else if (this.DialogResult == DialogResult.Cancel)
{
- if (!_wizard.Cancel())
+ if (!await _wizard.Cancel())
{
e.Cancel = true;
}
--
Gitblit v1.9.3