From ca5f300a7cef85d22b5e0f9d59d117c49f9909b3 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期二, 19 十一月 2024 09:42:16 +0800
Subject: [PATCH] 完善资产界面
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/01-info/InputXhsProjectInfoWizardPage.cs | 53 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 32 insertions(+), 21 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 fb47f8d..f07e612 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,4 +1,5 @@
锘縰sing DevExpress.XtraBars.Customization;
+using Yw.CAL.HttpClient;
namespace HStation.WinFrmUI
{
@@ -35,7 +36,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);
}
@@ -57,17 +60,6 @@
{
get
{
- _vm.ZipFile = this.btnEditSelectModelFile.Text.Trim();
- /* if (_vm.ZipFile != string.Empty)
- {
- AllowImport = true;
- AutoAddItem.Invoke();
- }
- else
- {
- AllowImport = false;
- DeleteItem.Invoke();
- }*/
return _isInitialize;
}
}
@@ -93,7 +85,7 @@
/// </summary>
public bool CanPrev()
{
- return true;
+ return false;
}
/// <summary>
@@ -122,8 +114,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;
@@ -147,15 +138,35 @@
private void btnEditSelectModelFile_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
{
- var suffix = Settings.XhsParasHelper.Xhs.File.Suffix;
- var dlg = new OpenFileDialog();
- dlg.Filter = $"妯″瀷鏂囦欢(*{suffix})|*{suffix}";
- dlg.FilterIndex = 1;
- if (dlg.ShowDialog() == DialogResult.OK)
+ if (e.Button.Tag.ToString() == "Local")
{
- var fileName = dlg.FileName;
- this.btnEditSelectModelFile.EditValue = fileName;
+ var suffix = Settings.XhsParasHelper.Xhs.File.Suffix;
+ var dlg = new OpenFileDialog();
+ dlg.Filter = $"妯″瀷鏂囦欢(*{suffix})|*{suffix}";
+ dlg.FilterIndex = 1;
+ if (dlg.ShowDialog() == DialogResult.OK)
+ {
+ var fileName = dlg.FileName;
+ this.btnEditSelectModelFile.EditValue = fileName;
+ _vm.IsLocal = true;
+ _vm.LocalZipFile = fileName;
+ }
}
+ else
+ {
+ var dlg = new SelectXhsProjectTransferFileDlg();
+ dlg.SetBindingData();
+ dlg.ReloadDataEvent += async (rhs) =>
+ {
+ this.btnEditSelectModelFile.EditValue = rhs.FileName;
+ _vm.IsLocal = false;
+ _vm.TransferRevitFile = rhs;
+ };
+ dlg.ShowDialog();
+ }
+
}
+
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3