From fced74f58759c8252108a7c8fdaaa86ac87b2004 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期四, 21 十一月 2024 17:47:52 +0800
Subject: [PATCH] 增加分区管理和行政区域管理
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/01-info/InputXhsProjectInfoWizardPage.cs | 32 ++++++++++----------------------
1 files changed, 10 insertions(+), 22 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/01-info/InputXhsProjectInfoWizardPage.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/01-info/InputXhsProjectInfoWizardPage.cs
index e9951ab..d0d257e 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/01-info/InputXhsProjectInfoWizardPage.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/01-info/InputXhsProjectInfoWizardPage.cs
@@ -1,7 +1,4 @@
-锘縰sing DevExpress.XtraBars.Customization;
-using Yw.CAL.HttpClient;
-
-namespace HStation.WinFrmUI
+锘縩amespace HStation.WinFrmUI
{
public partial class InputXhsProjectInfoWizardPage : DevExpress.XtraEditors.XtraUserControl, Yw.WinFrmUI.IWizardPage<ImportXhsProjectViewModel>
{
@@ -36,7 +33,9 @@
_isInitialize = true;
var allFlagList = await _bllFlag.Value.GetBySysType(HStation.Xhs.DataType.XhsProject);
if (allFlagList == null)
+ {
return;
+ }
this.setFlagsEditCtrl1.SetBindingData(allFlagList.Select(x => x.Name).ToList(), null);
}
@@ -58,17 +57,6 @@
{
get
{
- _vm.ZipFile = this.btnEditSelectModelFile.Text.Trim();
- /* if (_vm.ZipFile != string.Empty)
- {
- AllowImport = true;
- AutoAddItem.Invoke();
- }
- else
- {
- AllowImport = false;
- DeleteItem.Invoke();
- }*/
return _isInitialize;
}
}
@@ -94,7 +82,7 @@
/// </summary>
public bool CanPrev()
{
- return true;
+ return false;
}
/// <summary>
@@ -123,8 +111,7 @@
}
_vm.Name = this.txtName.Text.Trim();
_vm.Customer = this.txtCustomer.Text.Trim();
- // _vm.Address = this.txtAddress.Text.Trim();
- _vm.Flags = null;
+ _vm.Flags = this.setFlagsEditCtrl1.SelectedFlagList;
_vm.TagName = tagName;
_vm.Description = this.txtDescription.Text.Trim();
return true;
@@ -158,6 +145,8 @@
{
var fileName = dlg.FileName;
this.btnEditSelectModelFile.EditValue = fileName;
+ _vm.IsLocal = true;
+ _vm.LocalZipFile = fileName;
}
}
else
@@ -166,10 +155,9 @@
dlg.SetBindingData();
dlg.ReloadDataEvent += async (rhs) =>
{
- var fileName = await BLLFactory<HStation.BLL.TransferRevitFile>.Instance.Download(rhs.StorageHouse, rhs.StorageCode);
-
-
- this.btnEditSelectModelFile.EditValue = fileName;
+ this.btnEditSelectModelFile.EditValue = rhs.FileName;
+ _vm.IsLocal = false;
+ _vm.TransferRevitFile = rhs;
};
dlg.ShowDialog();
}
--
Gitblit v1.9.3