项目管理整改

lixiaojun

2024-12-21 9b08736cc1346d71a43603b690324cf1d33a16e4

项目管理整改

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectDlg.cs

@@ -24,13 +24,13 @@
        /// <summary>
        /// ç»‘定数据
        /// </summary>
        public async void SetBindingData()
        public void SetBindingData()
        {
            _vm = new ImportXhsProjectViewModel();
            _wizard = new ImportXhsProjectManager(_vm);
            _wizard.SelectedPageChangedEvent += _wizard_SelectedPageChangedEvent;
            _wizard.SelectedPageStateChangedEvent += _wizard_SelectedPageStateChangedEvent; ;
            await _wizard.InitialManager(new IWizardPageAsync<ImportXhsProjectViewModel>[] {
            _wizard.InitialManager(new IWizardPageAsync<ImportXhsProjectViewModel>[] {
                this.inputXhsProjectInfoWizardPage,
                this.setXhsProjectMapLocationWizardPage,
                this.generateXhsProjectWizardPage,
@@ -41,13 +41,13 @@
        /// <summary>
        /// ç»‘定数据
        /// </summary>
        public async void SetBindingData(XhsProjectExtensionsVmo project, Yw.Vmo.MapInfoVmo mapInfo)
        public void SetBindingData(XhsProjectExtensionsVmo project, Yw.Vmo.MapInfoVmo mapInfo)
        {
            _vm = new ImportXhsProjectViewModel(project, mapInfo);
            _wizard = new ImportXhsProjectManager(_vm);
            _wizard.SelectedPageChangedEvent += _wizard_SelectedPageChangedEvent;
            _wizard.SelectedPageStateChangedEvent += _wizard_SelectedPageStateChangedEvent; ;
            await _wizard.InitialManager(new IWizardPageAsync<ImportXhsProjectViewModel>[] {
            _wizard.InitialManager(new IWizardPageAsync<ImportXhsProjectViewModel>[] {
                this.inputXhsProjectInfoWizardPage,
                this.setXhsProjectMapLocationWizardPage,
                this.generateXhsProjectWizardPage,

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/01-info/InputXhsProjectInfoWizardPage.cs

@@ -15,19 +15,17 @@
        public event Action PageStateChangedEvent;

        private ImportXhsProjectViewModel _vm = null;//操作对象
        private bool _isInitialize = false;//是否初始化

        /// <summary>
        /// åˆå§‹åŒ–
        /// </summary>
        public async Task InitialPage(ImportXhsProjectViewModel vm)
        public async void InitialPage(ImportXhsProjectViewModel vm)
        {
            if (_isInitialize)
            if (vm == null)
            {
                return;
            }
            _vm = vm;
            _isInitialize = true;
            if (vm.Project == null)
            {
                vm.Project = new XhsProjectExtensionsVmo()
@@ -41,7 +39,7 @@
            this.txtName.EditValue = vm.Project.Name;
            this.txtCustomer.EditValue = vm.Project.Customer;
            var allFlagList = await BLLFactory<Yw.BLL.SysFlag>.Instance.GetBySysType(HStation.Xhs.DataType.XhsProject);
            this.setFlagsEditCtrl1.SetBindingData(allFlagList.Select(x => x.Name).ToList(), vm.Project.Flags);
            this.setFlagsEditCtrl1.SetBindingData(allFlagList?.Select(x => x.Name).ToList(), vm.Project.Flags);
            this.txtTagNme.EditValue = vm.Project.TagName;
            this.txtDescription.EditValue = vm.Project.Description;
        }
@@ -64,7 +62,7 @@
        {
            get
            {
                return _isInitialize;
                return true;
            }
        }

@@ -103,7 +101,7 @@
        /// </summary>
        public async Task<bool> CanNext()
        {
            if (!_isInitialize)
            if (_vm == null)
            {
                return false;
            }

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/02-map/SetXhsProjectMapLocationWizardPage.cs

@@ -21,7 +21,7 @@
        /// <summary>
        /// åˆå§‹åŒ–
        /// </summary>
        public async Task InitialPage(ImportXhsProjectViewModel vm)
        public async void InitialPage(ImportXhsProjectViewModel vm)
        {
            if (_isInitialize)
            {
@@ -31,7 +31,6 @@
            _isInitialize = true;
            this.txtAddress.EditValue = vm.Project.Address;
            await this.mapSetSimpleMarkerContainer1.InitialContainer();
            PageStateChangedEvent.Invoke();
        }



 WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/03-generate/GenerateXhsProjectWizardPage.cs

@@ -14,7 +14,6 @@
        public event Action PageStateChangedEvent;

        private ImportXhsProjectViewModel _vm = null;//操作对象
        private bool _isInitialize = false;//是否初始化
        private bool _importResult = false;//导入结果


@@ -42,12 +41,15 @@
        }

        /// <summary>
        ///
        /// åˆå§‹åŒ–页面
        /// </summary>
        public async Task InitialPage(ImportXhsProjectViewModel vm)
        public async void InitialPage(ImportXhsProjectViewModel vm)
        {
            if (vm == null)
            {
                return;
            }
            _vm = vm;
            _isInitialize = false;
            _importResult = false;
            this.listBoxControl1.Items.Clear();
            _importResult = await ImportXhsProjectHelper.Import(vm, (msg, color) =>
@@ -71,7 +73,6 @@
                this.progressBarControl1.Position = 0;
                this.itemForProgress.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
            }
            _isInitialize = true;
            this.PageStateChangedEvent?.Invoke();
        }

@@ -82,12 +83,9 @@
        {
            get
            {
                if (_isInitialize)
                if (!_importResult)
                {
                    if (!_importResult)
                    {
                        return true;
                    }
                    return true;
                }
                return false;
            }
@@ -100,12 +98,9 @@
        {
            get
            {
                if (_isInitialize)
                if (_importResult)
                {
                    if (_importResult)
                    {
                        return true;
                    }
                    return true;
                }
                return false;
            }
@@ -118,12 +113,9 @@
        {
            get
            {
                if (_isInitialize)
                if (!_importResult)
                {
                    if (!_importResult)
                    {
                        return true;
                    }
                    return true;
                }
                return false;
            }

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/04-completed/00-core/XhsProjectResultWizardPage.Designer.cs

@@ -30,17 +30,19 @@
        {
            tabPane1 = new DevExpress.XtraBars.Navigation.TabPane();
            tabNavigationPageBasic = new DevExpress.XtraBars.Navigation.TabNavigationPage();
            xhsProjectInfoCtrl1 = new XhsProjectResultInfoCtrl();
            infoCtrl1 = new XhsProjectResultInfoCtrl();
            tabNavigationPageLocation = new DevExpress.XtraBars.Navigation.TabNavigationPage();
            tabNavigationPageBimface = new DevExpress.XtraBars.Navigation.TabNavigationPage();
            xhsProjectBimfaceInfoCtrl1 = new XhsProjectResultBimfaceCtrl();
            bimfaceCtrl1 = new XhsProjectResultBimfaceCtrl();
            tabNavigationPageBuild = new DevExpress.XtraBars.Navigation.TabNavigationPage();
            xhsProjectHydroInfoCtrl1 = new XhsProjectResultHydroCtrl();
            hydroCtrl1 = new XhsProjectResultHydroCtrl();
            tabNavigationPageAnalysis = new DevExpress.XtraBars.Navigation.TabNavigationPage();
            revitAnalysisResultCtrl = new XhsProjectImportRevitAnalysisResultCtrl();
            revitCtrl1 = new XhsProjectResultRevitCtrl();
            mapCtrl1 = new XhsProjectResultMapCtrl();
            ((ISupportInitialize)tabPane1).BeginInit();
            tabPane1.SuspendLayout();
            tabNavigationPageBasic.SuspendLayout();
            tabNavigationPageLocation.SuspendLayout();
            tabNavigationPageBimface.SuspendLayout();
            tabNavigationPageBuild.SuspendLayout();
            tabNavigationPageAnalysis.SuspendLayout();
@@ -66,68 +68,77 @@
            // tabNavigationPageBasic
            // 
            tabNavigationPageBasic.Caption = "基础信息";
            tabNavigationPageBasic.Controls.Add(xhsProjectInfoCtrl1);
            tabNavigationPageBasic.Controls.Add(infoCtrl1);
            tabNavigationPageBasic.Name = "tabNavigationPageBasic";
            tabNavigationPageBasic.Size = new Size(916, 520);
            // 
            // xhsProjectInfoCtrl1
            // infoCtrl1
            // 
            xhsProjectInfoCtrl1.Dock = DockStyle.Fill;
            xhsProjectInfoCtrl1.Location = new Point(0, 0);
            xhsProjectInfoCtrl1.Name = "xhsProjectInfoCtrl1";
            xhsProjectInfoCtrl1.Size = new Size(916, 520);
            xhsProjectInfoCtrl1.TabIndex = 5;
            infoCtrl1.Dock = DockStyle.Fill;
            infoCtrl1.Location = new Point(0, 0);
            infoCtrl1.Name = "infoCtrl1";
            infoCtrl1.Size = new Size(916, 520);
            infoCtrl1.TabIndex = 5;
            // 
            // tabNavigationPageLocation
            // 
            tabNavigationPageLocation.Caption = "位置展示";
            tabNavigationPageLocation.Controls.Add(mapCtrl1);
            tabNavigationPageLocation.Name = "tabNavigationPageLocation";
            tabNavigationPageLocation.Size = new Size(916, 520);
            // 
            // tabNavigationPageBimface
            // 
            tabNavigationPageBimface.Caption = "三维模型";
            tabNavigationPageBimface.Controls.Add(xhsProjectBimfaceInfoCtrl1);
            tabNavigationPageBimface.Controls.Add(bimfaceCtrl1);
            tabNavigationPageBimface.Name = "tabNavigationPageBimface";
            tabNavigationPageBimface.Size = new Size(916, 520);
            // 
            // xhsProjectBimfaceInfoCtrl1
            // bimfaceCtrl1
            // 
            xhsProjectBimfaceInfoCtrl1.Dock = DockStyle.Fill;
            xhsProjectBimfaceInfoCtrl1.Location = new Point(0, 0);
            xhsProjectBimfaceInfoCtrl1.Name = "xhsProjectBimfaceInfoCtrl1";
            xhsProjectBimfaceInfoCtrl1.Size = new Size(916, 520);
            xhsProjectBimfaceInfoCtrl1.TabIndex = 0;
            bimfaceCtrl1.Dock = DockStyle.Fill;
            bimfaceCtrl1.Location = new Point(0, 0);
            bimfaceCtrl1.Name = "bimfaceCtrl1";
            bimfaceCtrl1.Size = new Size(916, 520);
            bimfaceCtrl1.TabIndex = 0;
            // 
            // tabNavigationPageBuild
            // 
            tabNavigationPageBuild.Caption = "构建明细";
            tabNavigationPageBuild.Controls.Add(xhsProjectHydroInfoCtrl1);
            tabNavigationPageBuild.Controls.Add(hydroCtrl1);
            tabNavigationPageBuild.Name = "tabNavigationPageBuild";
            tabNavigationPageBuild.Size = new Size(916, 520);
            // 
            // xhsProjectHydroInfoCtrl1
            // hydroCtrl1
            // 
            xhsProjectHydroInfoCtrl1.Dock = DockStyle.Fill;
            xhsProjectHydroInfoCtrl1.Location = new Point(0, 0);
            xhsProjectHydroInfoCtrl1.Name = "xhsProjectHydroInfoCtrl1";
            xhsProjectHydroInfoCtrl1.Size = new Size(916, 520);
            xhsProjectHydroInfoCtrl1.TabIndex = 0;
            hydroCtrl1.Dock = DockStyle.Fill;
            hydroCtrl1.Location = new Point(0, 0);
            hydroCtrl1.Name = "hydroCtrl1";
            hydroCtrl1.Size = new Size(916, 520);
            hydroCtrl1.TabIndex = 0;
            // 
            // tabNavigationPageAnalysis
            // 
            tabNavigationPageAnalysis.Caption = "解析明细";
            tabNavigationPageAnalysis.Controls.Add(revitAnalysisResultCtrl);
            tabNavigationPageAnalysis.Controls.Add(revitCtrl1);
            tabNavigationPageAnalysis.Name = "tabNavigationPageAnalysis";
            tabNavigationPageAnalysis.Size = new Size(916, 520);
            // 
            // revitAnalysisResultCtrl
            // revitCtrl1
            // 
            revitAnalysisResultCtrl.Dock = DockStyle.Fill;
            revitAnalysisResultCtrl.Location = new Point(0, 0);
            revitAnalysisResultCtrl.Name = "revitAnalysisResultCtrl";
            revitAnalysisResultCtrl.Size = new Size(916, 520);
            revitAnalysisResultCtrl.TabIndex = 0;
            revitCtrl1.Dock = DockStyle.Fill;
            revitCtrl1.Location = new Point(0, 0);
            revitCtrl1.Name = "revitCtrl1";
            revitCtrl1.Size = new Size(916, 520);
            revitCtrl1.TabIndex = 0;
            // 
            // mapCtrl1
            // 
            mapCtrl1.Dock = DockStyle.Fill;
            mapCtrl1.Location = new Point(0, 0);
            mapCtrl1.Name = "mapCtrl1";
            mapCtrl1.Size = new Size(916, 520);
            mapCtrl1.TabIndex = 0;
            // 
            // XhsProjectResultWizardPage
            // 
@@ -139,6 +150,7 @@
            ((ISupportInitialize)tabPane1).EndInit();
            tabPane1.ResumeLayout(false);
            tabNavigationPageBasic.ResumeLayout(false);
            tabNavigationPageLocation.ResumeLayout(false);
            tabNavigationPageBimface.ResumeLayout(false);
            tabNavigationPageBuild.ResumeLayout(false);
            tabNavigationPageAnalysis.ResumeLayout(false);
@@ -152,10 +164,11 @@
        private DevExpress.XtraBars.Navigation.TabNavigationPage tabNavigationPageLocation;
        private DevExpress.XtraBars.Navigation.TabNavigationPage tabNavigationPageBimface;
        private DevExpress.XtraBars.Navigation.TabNavigationPage tabNavigationPageBuild;
        private XhsProjectResultInfoCtrl xhsProjectInfoCtrl1;
        private XhsProjectResultHydroCtrl xhsProjectHydroInfoCtrl1;
        private XhsProjectResultBimfaceCtrl xhsProjectBimfaceInfoCtrl1;
        private XhsProjectResultInfoCtrl infoCtrl1;
        private XhsProjectResultHydroCtrl hydroCtrl1;
        private XhsProjectResultBimfaceCtrl bimfaceCtrl1;
        private DevExpress.XtraBars.Navigation.TabNavigationPage tabNavigationPageAnalysis;
        private XhsProjectImportRevitAnalysisResultCtrl revitAnalysisResultCtrl;
        private XhsProjectResultRevitCtrl revitCtrl1;
        private XhsProjectResultMapCtrl mapCtrl1;
    }
}

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/04-completed/00-core/XhsProjectResultWizardPage.cs

@@ -12,20 +12,22 @@
        public event Action PageStateChangedEvent;

        private ImportXhsProjectViewModel _vm = null;//操作对象
        private bool _isInitialize = false;//是否初始化

        /// <summary>
        /// åˆå§‹åŒ–页面
        /// </summary>
        public Task InitialPage(ImportXhsProjectViewModel vm)
        public void InitialPage(ImportXhsProjectViewModel vm)
        {
            if (_isInitialize)
            if (vm == null)
            {
                return default;
                return;
            }
            _vm = vm;
            _isInitialize = true;
            return default;
            this.infoCtrl1.SetBindingData(vm);
            this.mapCtrl1.SetBindingData(vm);
            this.revitCtrl1.SetBindingData(vm);
            this.hydroCtrl1.SetBindingData(vm);
            this.bimfaceCtrl1.SetBindingData(vm);
        }


@@ -104,7 +106,7 @@
        {
            return Task.Run(() =>
            {
                if (!_isInitialize)
                if (_vm == null)
                {
                    return false;
                }

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/04-completed/05-revit/XhsProjectResultRevitCtrl.Designer.cs

ÎļþÃû´Ó WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/04-completed/02-analysis/XhsProjectImportRevitAnalysisResultCtrl.Designer.cs ÐÞ¸Ä
@@ -1,6 +1,6 @@
namespace HStation.WinFrmUI
{
    partial class XhsProjectImportRevitAnalysisResultCtrl
    partial class XhsProjectResultRevitCtrl
    {
        /// <summary> 
        /// Required designer variable.
@@ -32,7 +32,6 @@
            DevExpress.XtraGrid.GridFormatRule gridFormatRule1 = new DevExpress.XtraGrid.GridFormatRule();
            FormatConditionRule2ColorScale formatConditionRule2ColorScale1 = new FormatConditionRule2ColorScale();
            gridControl1 = new DevExpress.XtraGrid.GridControl();
            xhsProjectImportRevitAnalysisResultViewModelBindingSource = new BindingSource(components);
            gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            colCatalog = new DevExpress.XtraGrid.Columns.GridColumn();
            colName = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -54,8 +53,8 @@
            layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
            xhsProjectResultRevitViewModelBindingSource = new BindingSource(components);
            ((ISupportInitialize)gridControl1).BeginInit();
            ((ISupportInitialize)xhsProjectImportRevitAnalysisResultViewModelBindingSource).BeginInit();
            ((ISupportInitialize)gridView1).BeginInit();
            ((ISupportInitialize)layoutControl1).BeginInit();
            layoutControl1.SuspendLayout();
@@ -71,21 +70,18 @@
            ((ISupportInitialize)layoutControlItem3).BeginInit();
            ((ISupportInitialize)layoutControlItem5).BeginInit();
            ((ISupportInitialize)layoutControlItem6).BeginInit();
            ((ISupportInitialize)xhsProjectResultRevitViewModelBindingSource).BeginInit();
            SuspendLayout();
            // 
            // gridControl1
            // 
            gridControl1.DataSource = xhsProjectImportRevitAnalysisResultViewModelBindingSource;
            gridControl1.DataSource = xhsProjectResultRevitViewModelBindingSource;
            gridControl1.Location = new Point(2, 71);
            gridControl1.MainView = gridView1;
            gridControl1.Name = "gridControl1";
            gridControl1.Size = new Size(1120, 625);
            gridControl1.TabIndex = 0;
            gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView1 });
            // 
            // xhsProjectImportRevitAnalysisResultViewModelBindingSource
            // 
            xhsProjectImportRevitAnalysisResultViewModelBindingSource.DataSource = typeof(XhsProjectImportRevitAnalysisResultViewModel);
            // 
            // gridView1
            // 
@@ -298,15 +294,18 @@
            layoutControlItem6.TextSize = new Size(0, 0);
            layoutControlItem6.TextVisible = false;
            // 
            // XhsProjectImportRevitAnalysisResultCtrl
            // xhsProjectResultRevitViewModelBindingSource
            // 
            xhsProjectResultRevitViewModelBindingSource.DataSource = typeof(XhsProjectResultRevitViewModel);
            // 
            // XhsProjectResultRevitCtrl
            // 
            AutoScaleDimensions = new SizeF(7F, 14F);
            AutoScaleMode = AutoScaleMode.Font;
            Controls.Add(layoutControl1);
            Name = "XhsProjectImportRevitAnalysisResultCtrl";
            Name = "XhsProjectResultRevitCtrl";
            Size = new Size(1124, 698);
            ((ISupportInitialize)gridControl1).EndInit();
            ((ISupportInitialize)xhsProjectImportRevitAnalysisResultViewModelBindingSource).EndInit();
            ((ISupportInitialize)gridView1).EndInit();
            ((ISupportInitialize)layoutControl1).EndInit();
            layoutControl1.ResumeLayout(false);
@@ -322,6 +321,7 @@
            ((ISupportInitialize)layoutControlItem3).EndInit();
            ((ISupportInitialize)layoutControlItem5).EndInit();
            ((ISupportInitialize)layoutControlItem6).EndInit();
            ((ISupportInitialize)xhsProjectResultRevitViewModelBindingSource).EndInit();
            ResumeLayout(false);
        }

@@ -332,7 +332,6 @@
        private DevExpress.XtraGrid.Columns.GridColumn colName;
        private DevExpress.XtraGrid.Columns.GridColumn colCode;
        private DevExpress.XtraGrid.Columns.GridColumn colPropStatus;
        private BindingSource xhsProjectImportRevitAnalysisResultViewModelBindingSource;
        private DevExpress.XtraGrid.Columns.GridColumn colCatalog;
        private DevExpress.XtraGrid.Columns.GridColumn colPropName;
        private DevExpress.XtraGrid.Columns.GridColumn colStatusInfo;
@@ -350,5 +349,6 @@
        private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1;
        private GeneralSearchAndExportCtrl generalSearchAndExportCtrl1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
        private BindingSource xhsProjectResultRevitViewModelBindingSource;
    }
}

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/04-completed/05-revit/XhsProjectResultRevitCtrl.cs

ÎļþÃû´Ó WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/04-completed/02-analysis/XhsProjectImportRevitAnalysisResultCtrl.cs ÐÞ¸Ä
@@ -2,9 +2,12 @@

namespace HStation.WinFrmUI
{
    public partial class XhsProjectImportRevitAnalysisResultCtrl : DevExpress.XtraEditors.XtraUserControl
    /// <summary>
    /// 
    /// </summary>
    public partial class XhsProjectResultRevitCtrl : DevExpress.XtraEditors.XtraUserControl
    {
        public XhsProjectImportRevitAnalysisResultCtrl()
        public XhsProjectResultRevitCtrl()
        {
            InitializeComponent();
            this.gridView1.SetNormalView(30);
@@ -15,12 +18,22 @@
            this.generalSearchAndExportCtrl1.ExportEvent += Export;
        }

        private ImportXhsProjectViewModel _vm = null;//操作对象
        private List<XhsProjectResultRevitViewModel> _allList = null;//所有列表
        private List<XhsProjectResultRevitViewModel> _allBindingList;//绑定列表




        private List<XhsProjectImportRevitAnalysisResultViewModel> _allList = null;
        private List<XhsProjectImportRevitAnalysisResultViewModel> _allBindingList;
        /// <summary>
        /// ç»‘定数据
        /// </summary>
        public void SetBindingData(ImportXhsProjectViewModel vm)
        {
            if (vm == null)
            {
                return;
            }
            _vm = vm;
            SetBindingData(vm.RevitModel);
        }

        /// <summary>
        /// ç»‘定数据
@@ -31,7 +44,7 @@
            {
                return;
            }
            _allList = new List<XhsProjectImportRevitAnalysisResultViewModel>();
            _allList = new List<XhsProjectResultRevitViewModel>();
            var allParterList = revitModel.GetAllParters();
            foreach (var parter in allParterList)
            {
@@ -43,7 +56,7 @@
                        {
                            continue;
                        }
                        _allList.Add(new XhsProjectImportRevitAnalysisResultViewModel(parter, propStatus));
                        _allList.Add(new XhsProjectResultRevitViewModel(parter, propStatus));
                    }
                }
            }
@@ -74,8 +87,8 @@
            {
                _allBindingList = _allBindingList?.Where(x => x.PropStatus == propStatus.Value).ToList();
            }
            this.xhsProjectImportRevitAnalysisResultViewModelBindingSource.DataSource = _allBindingList;
            this.xhsProjectImportRevitAnalysisResultViewModelBindingSource.ResetBindings(false);
            this.xhsProjectResultRevitViewModelBindingSource.DataSource = _allBindingList;
            this.xhsProjectResultRevitViewModelBindingSource.ResetBindings(false);
        }

        //清理
@@ -97,9 +110,11 @@
            if (dlg.ShowDialog() == DialogResult.OK)
            {
                this.gridView1.ExportToXls(dlg.FileName);
                TipFormHelper.ShowSucceed("导出成功！");
            }
        }

        //初始化属性状态
        private void InitialPropStatus()
        {
            this.imgCmbPropStatus.Properties.BeginUpdate();
@@ -114,7 +129,7 @@
        //自定义单元格颜色
        private void gridView1_CustomDrawCell(object sender, DevExpress.XtraGrid.Views.Base.RowCellCustomDrawEventArgs e)
        {
            var row = this.gridView1.GetRow(e.RowHandle) as XhsProjectImportRevitAnalysisResultViewModel;
            var row = this.gridView1.GetRow(e.RowHandle) as XhsProjectResultRevitViewModel;
            if (row == null)
            {
                return;

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/04-completed/05-revit/XhsProjectResultRevitCtrl.resx

ÎļþÃû´Ó WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/04-completed/02-analysis/XhsProjectImportRevitAnalysisResultCtrl.resx ÐÞ¸Ä
@@ -117,7 +117,7 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <metadata name="xhsProjectImportRevitAnalysisResultViewModelBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
  <metadata name="xhsProjectResultRevitViewModelBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>17, 17</value>
  </metadata>
</root>

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/04-completed/05-revit/XhsProjectResultRevitViewModel.cs

ÎļþÃû´Ó WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/04-completed/02-analysis/XhsProjectImportRevitAnalysisResultViewModel.cs ÐÞ¸Ä
@@ -2,12 +2,20 @@

namespace HStation.WinFrmUI
{
    public class XhsProjectImportRevitAnalysisResultViewModel
    /// <summary>
    /// 
    /// </summary>
    public class XhsProjectResultRevitViewModel
    {
        public XhsProjectImportRevitAnalysisResultViewModel() { }
        /// <summary>
        /// 
        /// </summary>
        public XhsProjectResultRevitViewModel() { }


        public XhsProjectImportRevitAnalysisResultViewModel(HStation.Model.RevitParter parter, HStation.Model.RevitPropStatus propStatus)
        /// <summary>
        /// 
        /// </summary>
        public XhsProjectResultRevitViewModel(HStation.Model.RevitParter parter, HStation.Model.RevitPropStatus propStatus)
        {
            this.Catalog = parter.Catalog;
            this.Name = parter.Name;

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/03-mgr/XhsProjectMgrPage.Designer.cs

@@ -44,7 +44,7 @@
            repositoryItemImageComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemImageComboBox();
            svgImg16 = new DevExpress.Utils.SvgImageCollection(components);
            ribbonControl1 = new DevExpress.XtraBars.Ribbon.RibbonControl();
            barBtnAdd = new DevExpress.XtraBars.BarButtonItem();
            barBtnImport = new DevExpress.XtraBars.BarButtonItem();
            barBtnEdit = new DevExpress.XtraBars.BarButtonItem();
            barBtnDelete = new DevExpress.XtraBars.BarButtonItem();
            barBtnInfo = new DevExpress.XtraBars.BarButtonItem();
@@ -55,7 +55,7 @@
            barBtnCollpseAll = new DevExpress.XtraBars.BarButtonItem();
            barBtnSearch = new DevExpress.XtraBars.BarButtonItem();
            barBtnRefresh = new DevExpress.XtraBars.BarButtonItem();
            BtnAddBimfaceFile = new DevExpress.XtraBars.BarButtonItem();
            btnUploadBimface = new DevExpress.XtraBars.BarButtonItem();
            barBtnSetMap = new DevExpress.XtraBars.BarButtonItem();
            ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage();
            ribPageGroupForBasic = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
@@ -127,7 +127,7 @@
            // 
            ribbonControl1.ExpandCollapseItem.Id = 0;
            ribbonControl1.ItemPanelStyle = DevExpress.XtraBars.Ribbon.RibbonItemPanelStyle.Classic;
            ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnAdd, barBtnEdit, barBtnDelete, barBtnInfo, barBtnViewHydro, barBtnViewBimface, barCkTreeLine, barBtnExpandAll, barBtnCollpseAll, barBtnSearch, barBtnRefresh, BtnAddBimfaceFile, barBtnSetMap });
            ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnImport, barBtnEdit, barBtnDelete, barBtnInfo, barBtnViewHydro, barBtnViewBimface, barCkTreeLine, barBtnExpandAll, barBtnCollpseAll, barBtnSearch, barBtnRefresh, btnUploadBimface, barBtnSetMap });
            ribbonControl1.Location = new Point(0, 0);
            ribbonControl1.MaxItemId = 16;
            ribbonControl1.Name = "ribbonControl1";
@@ -142,13 +142,13 @@
            ribbonControl1.Toolbar.ShowCustomizeItem = false;
            ribbonControl1.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden;
            // 
            // barBtnAdd
            // barBtnImport
            // 
            barBtnAdd.Caption = "添加";
            barBtnAdd.Id = 1;
            barBtnAdd.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnAdd.ImageOptions.SvgImage");
            barBtnAdd.Name = "barBtnAdd";
            barBtnAdd.ItemClick += barBtnAdd_ItemClick;
            barBtnImport.Caption = "导入项目";
            barBtnImport.Id = 1;
            barBtnImport.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnAdd.ImageOptions.SvgImage");
            barBtnImport.Name = "barBtnImport";
            barBtnImport.ItemClick += barBtnImport_ItemClick;
            // 
            // barBtnEdit
            // 
@@ -234,19 +234,19 @@
            barBtnRefresh.Name = "barBtnRefresh";
            barBtnRefresh.ItemClick += barBtnRefresh_ItemClick;
            // 
            // BtnAddBimfaceFile
            // btnUploadBimface
            // 
            BtnAddBimfaceFile.Caption = "导入文件";
            BtnAddBimfaceFile.Id = 14;
            BtnAddBimfaceFile.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("BtnAddBimfaceFile.ImageOptions.SvgImage");
            BtnAddBimfaceFile.Name = "BtnAddBimfaceFile";
            BtnAddBimfaceFile.ItemClick += BtnAddBimfaceFile_ItemClick;
            btnUploadBimface.Caption = "上传模型";
            btnUploadBimface.Id = 14;
            btnUploadBimface.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("BtnAddBimfaceFile.ImageOptions.SvgImage");
            btnUploadBimface.Name = "btnUploadBimface";
            btnUploadBimface.ItemClick += barBtnUploadBimface_ItemClick;
            // 
            // barBtnSetMap
            // 
            barBtnSetMap.Caption = "位置";
            barBtnSetMap.Id = 15;
            barBtnSetMap.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnMap.ImageOptions.SvgImage");
            barBtnSetMap.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnSetMap.ImageOptions.SvgImage");
            barBtnSetMap.Name = "barBtnSetMap";
            barBtnSetMap.ItemClick += barBtnSetMap_ItemClick;
            // 
@@ -258,10 +258,10 @@
            // 
            // ribPageGroupForBasic
            // 
            ribPageGroupForBasic.ItemLinks.Add(barBtnAdd);
            ribPageGroupForBasic.ItemLinks.Add(barBtnImport);
            ribPageGroupForBasic.ItemLinks.Add(btnUploadBimface);
            ribPageGroupForBasic.ItemLinks.Add(barBtnEdit);
            ribPageGroupForBasic.ItemLinks.Add(barBtnSetMap);
            ribPageGroupForBasic.ItemLinks.Add(BtnAddBimfaceFile);
            ribPageGroupForBasic.ItemLinks.Add(barBtnDelete);
            ribPageGroupForBasic.ItemLinks.Add(barBtnInfo);
            ribPageGroupForBasic.Name = "ribPageGroupForBasic";
@@ -443,7 +443,7 @@
        private DevExpress.XtraBars.Ribbon.RibbonPage ribbonPage1;
        private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribPageGroupForBasic;
        private DevExpress.XtraTreeList.TreeList treeList1;
        private DevExpress.XtraBars.BarButtonItem barBtnAdd;
        private DevExpress.XtraBars.BarButtonItem barBtnImport;
        private DevExpress.XtraBars.BarButtonItem barBtnEdit;
        private DevExpress.XtraBars.BarButtonItem barBtnDelete;
        private DevExpress.XtraBars.BarButtonItem barBtnInfo;
@@ -471,7 +471,7 @@
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
        private DevExpress.XtraEditors.Repository.RepositoryItemImageComboBox repositoryItemImageComboBox1;
        private DevExpress.Utils.SvgImageCollection svgImg16;
        private DevExpress.XtraBars.BarButtonItem BtnAddBimfaceFile;
        private DevExpress.XtraBars.BarButtonItem btnUploadBimface;
        private DevExpress.XtraBars.BarButtonItem barBtnSetMap;
    }
}

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/03-mgr/XhsProjectMgrPage.cs

@@ -34,10 +34,6 @@

        private List<XhsProjectMgrViewModel> _allBindingList = null;

        private BLL.XhsProjectExtensions _bll = null;

        private event Action ImportProjectCompletedEvent = null;

        /// <summary>
        /// åˆå§‹åŒ–数据源
        /// </summary>
@@ -120,23 +116,71 @@

        #region åŸºç¡€æ“ä½œ

        //添加
        private void barBtnAdd_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        //导入项目
        private void barBtnImport_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        {
            if (_allBindingList == null)
            {
                TipFormHelper.ShowError("数据初始化失败！");
                return;
            }
            var dlg = new AddXhsProjectDlg();
            dlg.ReloadDataEvent += (project) =>
            var dlg = new ImportXhsProjectDlg();
            dlg.SetBindingData();
            if (dlg.ShowDialog() == DialogResult.OK)
            {
                var vm = new XhsProjectMgrViewModel(project, null, null);
                var viewModel = dlg.ViewModel;
                var vm = new XhsProjectMgrViewModel(viewModel.Project, viewModel.MapInfo, viewModel.BimfaceFile);
                _allBindingList.Add(vm);
                this.treeList1.RefreshDataSource();
            };
            dlg.SetBindingData();
            dlg.ShowDialog();
            }
        }

        //上传模型
        private void barBtnUploadBimface_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        {
            var vm = GetCurrentViewModel();
            if (vm == null)
            {
                return;
            }
            if (vm.BimfaceFile != null)
            {
                TipFormHelper.ShowWarn("模型已上传，不能重复上传！");
                return;
            }
            var dlg = new ImportXhsProjectDlg();
            dlg.SetBindingData(vm.Project, vm.MapInfo);
            if (dlg.ShowDialog() == DialogResult.OK)
            {
                var viewModel = dlg.ViewModel;
                var project = viewModel.Project;
                if (project == null)
                {
                    return;
                }
                if (project.ID < 1)
                {
                    return;
                }
                var mapInfo = viewModel.MapInfo;
                if (mapInfo != null)
                {
                    if (mapInfo.ID < 1)
                    {
                        mapInfo = null;
                    }
                }
                var bimfaceFile = viewModel.BimfaceFile;
                if (bimfaceFile != null)
                {
                    if (bimfaceFile.ID < 1)
                    {
                        bimfaceFile = null;
                    }
                }
                vm.Reset(project, mapInfo, bimfaceFile);
                this.treeList1.RefreshDataSource();
            }
        }

        //编辑
@@ -275,50 +319,6 @@
            var dlg = new ViewXhsProjectDlg();
            dlg.SetBindingData(vm.Project);
            dlg.ShowDialog();
        }

        //导入文件
        private void BtnAddBimfaceFile_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        {
            if (_allBindingList == null)
            {
                TipFormHelper.ShowError("数据初始化失败！");
                return;
            }
            var dlg = new ImportXhsProjectDlg();
            dlg.SetBindingData();
            if (dlg.ShowDialog() == DialogResult.OK)
            {
                var viewModel = dlg.ViewModel;
                var project = viewModel.Project;
                if (project == null)
                {
                    return;
                }
                if (project.ID < 1)
                {
                    return;
                }
                var mapInfo = viewModel.MapInfo;
                if (mapInfo != null)
                {
                    if (mapInfo.ID < 1)
                    {
                        mapInfo = null;
                    }
                }
                var bimfaceFile = viewModel.BimfaceFile;
                if (bimfaceFile != null)
                {
                    if (bimfaceFile.ID < 1)
                    {
                        bimfaceFile = null;
                    }
                }
                var vm = new XhsProjectMgrViewModel(project, mapInfo, bimfaceFile);
                _allBindingList.Add(vm);
                this.treeList1.RefreshDataSource();
            }
        }

        #endregion

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/03-mgr/XhsProjectMgrPage.resx

@@ -125,19 +125,27 @@
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAKcCAAAC77u/
        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAIQEAAAC77u/
        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z
        ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz
        OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp
        dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IkFkZCI+DQogICAgPHBhdGggZD0iTTI3LDE0aC05VjVj
        MC0wLjUtMC41LTEtMS0xaC0yYy0wLjUsMC0xLDAuNS0xLDF2OUg1Yy0wLjUsMC0xLDAuNS0xLDF2MmMw
        LDAuNSwwLjUsMSwxLDFoOXY5ICAgYzAsMC41LDAuNSwxLDEsMWgyYzAuNSwwLDEtMC41LDEtMXYtOWg5
        YzAuNSwwLDEtMC41LDEtMXYtMkMyOCwxNC41LDI3LjUsMTQsMjcsMTR6IiBjbGFzcz0iR3JlZW4iIC8+
        DQogIDwvZz4NCjwvc3ZnPgs=
        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJs
        YWNre2ZpbGw6IzcyNzI3Mjt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAzOUMy
        Mzt9CgkuWWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
        Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQo8L3N0eWxl
        Pg0KICA8ZyBpZD0iT3V0bG9va0ltcG9ydCI+DQogICAgPHBvbHlnb24gcG9pbnRzPSIzMiw0IDI0LDQg
        MjQsMCAxNiw2IDI0LDEyIDI0LDggMzIsOCAgIiBjbGFzcz0iR3JlZW4iIC8+DQogICAgPHBhdGggZD0i
        TTI1LDE0SDE0VjhMMCwxMi4yVjI4bDE0LDR2LTZoMTFjMC41LDAsMS0wLjUsMS0xVjE1QzI2LDE0LjUs
        MjUuNSwxNCwyNSwxNHogTTkuMiwyMi45QzguNiwyMy42LDcuOSwyNCw3LDI0ICAgYy0wLjksMC0xLjYt
        MC40LTIuMi0xLjFDNC4zLDIyLjIsNCwyMS4zLDQsMjAuMWMwLTEuMiwwLjMtMi4yLDAuOC0zQzUuNCwx
        Ni40LDYuMSwxNiw3LjEsMTZjMC45LDAsMS42LDAuNCwyLjEsMS4xICAgYzAuNSwwLjcsMC44LDEuNyww
        LjgsMi44QzEwLDIxLjIsOS43LDIyLjIsOS4yLDIyLjl6IE0xNCwxNmg5bC02LDRsLTMtMlYxNnogTTI0
        LDI0SDE0di00bDMsMmw3LTQuNlYyNHogTTguNCwxNy45ICAgYzAuMywwLjUsMC41LDEuMiwwLjUsMi4x
        YzAsMC45LTAuMiwxLjYtMC41LDIuMWMtMC4zLDAuNS0wLjgsMC44LTEuNCwwLjhjLTAuNiwwLTEtMC4z
        LTEuNC0wLjhTNS4xLDIwLjksNS4xLDIwICAgYzAtMC45LDAuMi0xLjYsMC41LTIuMUM2LDE3LjQsNi41
        LDE3LjEsNywxNy4xQzcuNiwxNy4xLDguMSwxNy40LDguNCwxNy45eiIgY2xhc3M9IkJsdWUiIC8+DQog
        IDwvZz4NCjwvc3ZnPgs=
</value>
  </data>
  <data name="barBtnEdit.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -384,23 +392,27 @@
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAOsCAAAC77u/
        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAPADAAAC77u/
        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJs
        YWNre2ZpbGw6IzcyNzI3Mjt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAzOUMy
        Mzt9CgkuWWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
        Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQo8L3N0eWxl
        Pg0KICA8ZyBpZD0iSW1wb3J0Ij4NCiAgICA8cGF0aCBkPSJNMTAsMTJINlY2aDRWMTJ6IE0yMiwxN3Yx
        djljMCwwLjYtMC40LDEtMSwxSDFjLTAuNiwwLTEtMC40LTEtMVY3YzAtMC42LDAuNC0xLDEtMWgzdjho
        MTRMMjIsMTd6IE0xOCwxOEg0ICAgdjZoMTRWMTh6IiBjbGFzcz0iQmxhY2siIC8+DQogICAgPHBvbHln
        b24gcG9pbnRzPSIzMCw2IDIyLDYgMjIsMiAxNCw4IDIyLDE0IDIyLDEwIDMwLDEwICAiIGNsYXNzPSJH
        cmVlbiIgLz4NCiAgPC9nPg0KPC9zdmc+Cw==
        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku
        WWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLlJlZHtmaWxsOiNEMTFD
        MUM7fQoJLldoaXRle2ZpbGw6I0ZGRkZGRjt9CgkuR3JlZW57ZmlsbDojMDM5QzIzO30KCS5zdDB7Zmls
        bDojNzI3MjcyO30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuNzU7fQo8L3N0eWxl
        Pg0KICA8ZyBpZD0iQiI+DQogICAgPHBhdGggZD0iTTE2LjQsMTMuN2gtMS4zdi0zLjRoMS4xYzEuNCww
        LDIuMSwwLjUsMi4xLDEuNmMwLDAuNS0wLjIsMC45LTAuNSwxLjNDMTcuNCwxMy41LDE2LjksMTMuNywx
        Ni40LDEzLjd6ICAgIE0xNi43LDE2aC0xLjZ2My43aDEuNmMwLjcsMCwxLjItMC4yLDEuNS0wLjVjMC40
        LTAuMywwLjUtMC44LDAuNS0xLjRjMC0wLjYtMC4yLTEtMC42LTEuM0MxNy44LDE2LjEsMTcuMywxNiwx
        Ni43LDE2eiBNMzAsMTYgICBjMCw3LjctNi4zLDE0LTE0LDE0UzIsMjMuNywyLDE2UzguMywyLDE2LDJT
        MzAsOC4zLDMwLDE2eiBNMjIsMTcuOGMwLTAuOC0wLjMtMS42LTAuOS0yLjJzLTEuMy0xLTIuMi0xLjF2
        MCAgIGMwLjgtMC4yLDEuNC0wLjYsMS45LTEuMWMwLjUtMC42LDAuNy0xLjIsMC43LTJDMjEuNSw5LjEs
        MjAsOCwxNi45LDhIMTJ2MTRoNS4yYzEuNSwwLDIuNy0wLjQsMy42LTEuMUMyMS42LDIwLjEsMjIsMTku
        MSwyMiwxNy44eiAgICIgY2xhc3M9IlJlZCIgLz4NCiAgPC9nPg0KPC9zdmc+Cw==
</value>
  </data>
  <data name="barBtnMap.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
  <data name="barBtnSetMap.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj.user

@@ -34,7 +34,7 @@
    <Compile Update="02-project\01-import\04-completed\00-core\XhsProjectResultWizardPage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="02-project\01-import\04-completed\02-analysis\XhsProjectImportRevitAnalysisResultCtrl.cs">
    <Compile Update="02-project\01-import\04-completed\05-revit\XhsProjectResultRevitCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="02-project\01-import\04-completed\02-bimface\XhsProjectResultBimfaceCtrl.cs">

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/Properties/DataSources/HStation.WinFrmUI.XhsProjectImportRevitAnalysisResultViewModel.datasource

ÎļþÒÑɾ³ý

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/Properties/DataSources/HStation.WinFrmUI.XhsProjectResultRevitViewModel.datasource

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
    This file is automatically generated by Visual Studio. It is 
    used to store generic object data source configuration information.  
    Renaming the file extension or editing the content of this file may   
    cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="XhsProjectResultRevitViewModel" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
  <TypeInfo>HStation.WinFrmUI.XhsProjectResultRevitViewModel, HStation.WinFrmUI.Xhs.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
</GenericObjectDataSource>

 WinFrmUI/Yw.WinFrmUI.Core/08-wizard/01-syn/WizardManager.cs

@@ -51,8 +51,8 @@
                    };
                }
                _selectedIndex = 0;
                this.SelectedPage.InitialPage(_vm);
                TriggerSelectedPageChangedEvent();
                this.SelectedPage.InitialPage(_vm);
            }
            else
            {
@@ -127,8 +127,8 @@
            if (this.SelectedPage.CanPrev())
            {
                --_selectedIndex;
                this.SelectedPage.InitialPage(_vm);
                TriggerSelectedPageChangedEvent();
                this.SelectedPage.InitialPage(_vm);
                return true;
            }
            return false;
@@ -150,8 +150,8 @@
            if (this.SelectedPage.CanNext())
            {
                ++_selectedIndex;
                this.SelectedPage.InitialPage(_vm);
                TriggerSelectedPageChangedEvent();
                this.SelectedPage.InitialPage(_vm);
                return true;
            }
            return false;

 WinFrmUI/Yw.WinFrmUI.Core/08-wizard/02-async/IWizardManagerAsync.cs

@@ -29,7 +29,7 @@
        /// åˆå§‹åŒ–管理器
        /// </summary>
        /// <param name="pages">步骤页面数组</param>
        Task InitialManager(IWizardPageAsync<T>[] pages);
        void InitialManager(IWizardPageAsync<T>[] pages);

        #endregion


 WinFrmUI/Yw.WinFrmUI.Core/08-wizard/02-async/IWizardPageAsync.cs

@@ -19,7 +19,7 @@
        /// <summary>
        /// åˆå§‹åŒ–
        /// </summary>
        Task InitialPage(T t);
        void InitialPage(T t);

        #endregion 


 WinFrmUI/Yw.WinFrmUI.Core/08-wizard/02-async/WizardManagerAsync.cs

@@ -34,7 +34,7 @@
        /// åˆå§‹åŒ–管理器
        /// </summary>
        /// <param name="pages">步骤页面数组</param>
        public virtual async Task InitialManager(IWizardPageAsync<T>[] pages)
        public virtual void InitialManager(IWizardPageAsync<T>[] pages)
        {
            _pages = pages;
            if (_pages != null && _pages.Length > 0)
@@ -51,8 +51,8 @@
                    };
                }
                _selectedIndex = 0;
                await this.SelectedPage.InitialPage(_vm);
                TriggerSelectedPageChangedEvent();
                this.SelectedPage.InitialPage(_vm);
            }
            else
            {
@@ -127,8 +127,8 @@
            if (await this.SelectedPage.CanPrev())
            {
                --_selectedIndex;
                await this.SelectedPage.InitialPage(_vm);
                TriggerSelectedPageChangedEvent();
                this.SelectedPage.InitialPage(_vm);
                return true;
            }
            return false;
@@ -150,8 +150,8 @@
            if (await this.SelectedPage.CanNext())
            {
                ++_selectedIndex;
                await this.SelectedPage.InitialPage(_vm);
                TriggerSelectedPageChangedEvent();
                this.SelectedPage.InitialPage(_vm);
                return true;
            }
            return false;