主界面修改

Shuxia Ning

2024-08-13 3e4fa61e398cb7c6fa3d0173ebaf740a14992e8c

主界面修改

 BLL/HStation.BLL.Xhs.Core/04-bll/01-project/XhsProjectExtensions.cs

@@ -1,22 +1,36 @@
using HStation.CAL;
using AutoMapper;
using Yw.Basic;

namespace HStation.BLL
{
    /// <summary>
    ///
    /// </summary>
    public class XhsProjectExtensions : IXhsProjectExtensions
    public class XhsProjectExtensions
    {
        private readonly HStation.CAL.IXhsProjectExtensions _cal = CALCreateHelper.CreateCAL<HStation.CAL.IXhsProjectExtensions>();

        public Task<bool> BulkInserts(List<AddXhsProjectExtensionsInput> list)
        public async Task<bool> BulkInserts(List<Vmo.Xhs.XhsProjectExtensions> list)
        {
            return _cal.BulkInserts(list);
            var mapper = new MapperConfiguration(cfg =>
            {
                cfg.CreateMap<Vmo.Xhs.XhsProjectSite, AddXhsProjectSiteExtensionsInput>();
                cfg.CreateMap<Vmo.Xhs.XhsProjectExtensions, AddXhsProjectExtensionsInput>();
            }).CreateMapper();
            var vmoList = mapper.Map<List<Vmo.Xhs.XhsProjectExtensions>, List<AddXhsProjectExtensionsInput>>(list);
            return await _cal.BulkInserts(vmoList); ;
        }

        public Task<bool> BulkUpdates(List<UpdateXhsProjectExtensionsInput> list)
        public Task<bool> BulkUpdates(List<Vmo.Xhs.XhsProjectExtensions> list)
        {
            return _cal.BulkUpdates(list);
            var mapper = new MapperConfiguration(cfg =>
            {
                cfg.CreateMap<Vmo.Xhs.XhsProjectSite, UpdateXhsProjectSiteInput>();
                cfg.CreateMap<Vmo.Xhs.XhsProjectExtensions, UpdateXhsProjectExtensionsInput>();
            }).CreateMapper();
            var vmoList = mapper.Map<List<Vmo.Xhs.XhsProjectExtensions>, List<UpdateXhsProjectExtensionsInput>>(list);

            return _cal.BulkUpdates(vmoList);
        }

        public Task<bool> DeleteAll()
@@ -34,39 +48,94 @@
            return _cal.DeleteByIds(Ids);
        }

        public Task<List<XhsProjectExtensionsDto>> GetAll()
        public async Task<List<Vmo.Xhs.XhsProjectExtensions>> GetAll()
        {
            return _cal.GetAll();
            var DtoList = await _cal.GetAll();
            var mapper = new MapperConfiguration(
                cfg =>
                {
                    cfg.CreateMap<XhsProjectExtensionsDto, Vmo.Xhs.XhsProjectExtensions>();
                    cfg.CreateMap<XhsProjectSiteDto, Vmo.Xhs.XhsProjectSite>();
                }
).CreateMapper();
            var vmoList = mapper.Map<List<XhsProjectExtensionsDto>, List<Vmo.Xhs.XhsProjectExtensions>>(DtoList);
            return vmoList;
        }

        public Task<XhsProjectExtensionsDto> GetByID(long ID)
        public async Task<Vmo.Xhs.XhsProjectExtensions> GetByID(long ID)
        {
            return _cal.GetByID(ID);
            var Dto = await _cal.GetByID(ID);
            var mapper = new MapperConfiguration(
                cfg =>
                {
                    cfg.CreateMap<XhsProjectExtensionsDto, Vmo.Xhs.XhsProjectExtensions>();
                    cfg.CreateMap<XhsProjectSiteDto, Vmo.Xhs.XhsProjectSite>();
                }
).CreateMapper();
            var vmo = mapper.Map<XhsProjectExtensionsDto, Vmo.Xhs.XhsProjectExtensions>(Dto);
            return vmo;
        }

        public Task<List<XhsProjectExtensionsDto>> GetByIds(List<long> Ids)
        public async Task<List<Vmo.Xhs.XhsProjectExtensions>> GetByIds(List<long> Ids)
        {
            return _cal.GetByIds(Ids);
            var DtoList = await _cal.GetByIds(Ids);
            var mapper = new MapperConfiguration(
                cfg =>
                {
                    cfg.CreateMap<XhsProjectExtensionsDto, Vmo.Xhs.XhsProjectExtensions>();
                    cfg.CreateMap<XhsProjectSiteDto, Vmo.Xhs.XhsProjectSite>();
                }
).CreateMapper();
            var vmoList = mapper.Map<List<XhsProjectExtensionsDto>, List<Vmo.Xhs.XhsProjectExtensions>>(DtoList);

            return vmoList;
        }

        public Task<long> Insert(AddXhsProjectExtensionsInput model)
        public Task<long> Insert(Vmo.Xhs.XhsProjectExtensions model)
        {
            return _cal.Insert(model);
            var mapper = new MapperConfiguration(cfg =>
           {
               cfg.CreateMap<Vmo.Xhs.XhsProjectSite, AddXhsProjectSiteExtensionsInput>();
               cfg.CreateMap<Vmo.Xhs.XhsProjectExtensions, AddXhsProjectExtensionsInput>();
           }).CreateMapper();
            var vmo = mapper.Map<Vmo.Xhs.XhsProjectExtensions, AddXhsProjectExtensionsInput>(model);
            return _cal.Insert(vmo);
        }

        public Task<bool> Inserts(List<AddXhsProjectExtensionsInput> list)
        public Task<bool> Inserts(List<Vmo.Xhs.XhsProjectExtensions> list)
        {
            return _cal.Inserts(list);
            var mapper = new MapperConfiguration(cfg =>
            {
                cfg.CreateMap<Vmo.Xhs.XhsProjectSite, AddXhsProjectSiteExtensionsInput>();
                cfg.CreateMap<Vmo.Xhs.XhsProjectExtensions, AddXhsProjectExtensionsInput>();
            }).CreateMapper();
            var vmoList = mapper.Map<List<Vmo.Xhs.XhsProjectExtensions>, List<AddXhsProjectExtensionsInput>>(list);

            return _cal.Inserts(vmoList);
        }

        public Task<bool> Update(UpdateXhsProjectExtensionsInput model)
        public Task<bool> Update(Vmo.Xhs.XhsProjectExtensions model)
        {
            return _cal.Update(model);
            var mapper = new MapperConfiguration(cfg =>
            {
                cfg.CreateMap<Vmo.Xhs.XhsProjectSite, UpdateXhsProjectSiteInput>();
                cfg.CreateMap<Vmo.Xhs.XhsProjectExtensions, UpdateXhsProjectExtensionsInput>();
            }).CreateMapper();
            var vmo = mapper.Map<Vmo.Xhs.XhsProjectExtensions, UpdateXhsProjectExtensionsInput>(model);

            return _cal.Update(vmo);
        }

        public Task<bool> Updates(List<UpdateXhsProjectExtensionsInput> list)
        public Task<bool> Updates(List<Vmo.Xhs.XhsProjectExtensions> list)
        {
            return _cal.Updates(list);
            var mapper = new MapperConfiguration(cfg =>
            {
                cfg.CreateMap<Vmo.Xhs.XhsProjectSite, UpdateXhsProjectSiteInput>();
                cfg.CreateMap<Vmo.Xhs.XhsProjectExtensions, UpdateXhsProjectExtensionsInput>();
            }).CreateMapper();
            var vmoList = mapper.Map<List<Vmo.Xhs.XhsProjectExtensions>, List<UpdateXhsProjectExtensionsInput>>(list);

            return _cal.Updates(vmoList);
        }
    }
}

 BLL/HStation.BLL.Xhs.Core/HStation.BLL.Xhs.Core.csproj

@@ -38,6 +38,7 @@

    <ItemGroup>
      <ProjectReference Include="..\..\Dto\HStation.Dto.Xhs.Core\HStation.Dto.Xhs.Core.csproj" />
      <ProjectReference Include="..\..\Vmo\HStation.Vmo.Xhs.Core\HStation.Vmo.Xhs.Core.csproj" />
      <ProjectReference Include="..\HStation.BLL.Core\HStation.BLL.Core.csproj" />
    </ItemGroup>


 Desktop/HStation.Desktop.Xhs.Core/MainForm.Designer.cs

@@ -122,6 +122,7 @@
            // 
            nbSystemConfig.Alignment = DevExpress.XtraBars.Navigation.NavButtonAlignment.Right;
            nbSystemConfig.Caption = "系统配置";
            nbSystemConfig.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("nbSystemConfig.ImageOptions.SvgImage");
            nbSystemConfig.Name = "nbSystemConfig";
            nbSystemConfig.ElementClick += nbSystemConfig_ElementClick;
            // 

 Desktop/HStation.Desktop.Xhs.Core/MainForm.cs

@@ -193,7 +193,6 @@
                var rectangle = this.RectangleToScreen(hitInfo.ButtonInfo.Bounds);
                this.flyoutPanel1.ShowBeakForm(rectangle);
            }

        }

        private Control _bimfaceMgrBeakCtrl = null;//bimface管理弹出界面

 Desktop/HStation.Desktop.Xhs.Core/MainForm.resx

@@ -196,6 +196,36 @@
        IGNsYXNzPSJZZWxsb3ciIC8+DQogICAgPC9nPg0KICA8L2c+DQo8L3N2Zz4L
</value>
  </data>
  <data name="nbSystemConfig.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAACwFAAAC77u/
        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzczNzM3NDt9Cgku
        WWVsbG93e2ZpbGw6I0ZDQjAxQjt9CgkuR3JlZW57ZmlsbDojMTI5QzQ5O30KCS5CbHVle2ZpbGw6IzM4
        N0NCNzt9CgkuUmVke2ZpbGw6I0QwMjEyNzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
        Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQoJLnN0M3tk
        aXNwbGF5Om5vbmU7ZmlsbDojNzM3Mzc0O30KPC9zdHlsZT4NCiAgPHBhdGggZD0iTTI0LDhoMlYzYzAt
        MC41LTAuNS0xLTEtMUgzQzIuNSwyLDIsMi41LDIsM3Y1aDJIMjR6IiBjbGFzcz0iQmx1ZSIgLz4NCiAg
        PHBhdGggZD0iTTIyLDEySDEydi0yaDEwVjEyeiBNMjIsMTZ2LTJIMTJ2MkgyMnogTTYsMjBoNHYtMkg2
        VjIweiBNMTYsMThoLTR2Mmg0VjE4eiBNNiwxNmg0di0ySDZWMTZ6IE02LDEyaDR2LTJINiAgVjEyeiIg
        Y2xhc3M9IkJsYWNrIiAvPg0KICA8ZyBjbGFzcz0ic3QwIj4NCiAgICA8cGF0aCBkPSJNMjQsMTRWOGgy
        djZIMjR6IE0xNCwyMkg0VjhIMnYxNWMwLDAuNSwwLjUsMSwxLDFoMTFWMjJ6IiBjbGFzcz0iQmxhY2si
        IC8+DQogIDwvZz4NCiAgPHBhdGggZD0iTTMyLDI1di0ybC0yLjUtMC42Yy0wLjEtMC40LTAuMy0wLjgt
        MC41LTEuMmwxLjUtMi4xbC0xLjYtMS42TDI2LjgsMTljLTAuNC0wLjItMC44LTAuNC0xLjItMC41TDI1
        LDE2aC0yICBsLTAuNiwyLjVjLTAuNCwwLjEtMC44LDAuMy0xLjIsMC41bC0yLTEuNWwtMS43LDEuN2wx
        LjUsMmMtMC4yLDAuNC0wLjQsMC44LTAuNSwxLjJMMTYsMjN2MmwyLjUsMC42YzAuMSwwLjQsMC4zLDAu
        OCwwLjUsMS4yICBsLTEuNSwyLjFsMS42LDEuNmwyLjEtMS41YzAuNCwwLjIsMC44LDAuNCwxLjIsMC41
        TDIzLDMyaDJsMC42LTIuNWMwLjQtMC4xLDAuOC0wLjMsMS4yLTAuNWwyLjEsMS41bDEuNi0xLjZMMjks
        MjYuOCAgYzAuMi0wLjQsMC40LTAuOCwwLjUtMS4yTDMyLDI1eiBNMjQsMjZjLTEuMSwwLTItMC45LTIt
        MnMwLjktMiwyLTJzMiwwLjksMiwyUzI1LjEsMjYsMjQsMjZ6IiBjbGFzcz0iQmx1ZSIgLz4NCjwvc3Zn
        Pgs=
</value>
  </data>
  <data name="nbMin.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40

 HStation.Xhs.Core.sln

@@ -119,6 +119,8 @@
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HStation.WinFrmUI.PhartRelation.Core", "WinFrmUI\HStation.WinFrmUI.PhartRelation.Core\HStation.WinFrmUI.PhartRelation.Core.csproj", "{DBC6DC37-8BA8-4CFC-A98C-E6D34EE2E5D7}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HStation.Vmo.Xhs.Core", "Vmo\HStation.Vmo.Xhs.Core\HStation.Vmo.Xhs.Core.csproj", "{2F469712-C0AB-405C-BCA3-410612141D49}"
EndProject
Global
    GlobalSection(SolutionConfigurationPlatforms) = preSolution
        Debug|Any CPU = Debug|Any CPU
@@ -978,6 +980,24 @@
        {DBC6DC37-8BA8-4CFC-A98C-E6D34EE2E5D7}.Release|x64.Build.0 = Release|Any CPU
        {DBC6DC37-8BA8-4CFC-A98C-E6D34EE2E5D7}.Release|x86.ActiveCfg = Release|Any CPU
        {DBC6DC37-8BA8-4CFC-A98C-E6D34EE2E5D7}.Release|x86.Build.0 = Release|Any CPU
        {2F469712-C0AB-405C-BCA3-410612141D49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
        {2F469712-C0AB-405C-BCA3-410612141D49}.Debug|Any CPU.Build.0 = Debug|Any CPU
        {2F469712-C0AB-405C-BCA3-410612141D49}.Debug|x64.ActiveCfg = Debug|Any CPU
        {2F469712-C0AB-405C-BCA3-410612141D49}.Debug|x64.Build.0 = Debug|Any CPU
        {2F469712-C0AB-405C-BCA3-410612141D49}.Debug|x86.ActiveCfg = Debug|Any CPU
        {2F469712-C0AB-405C-BCA3-410612141D49}.Debug|x86.Build.0 = Debug|Any CPU
        {2F469712-C0AB-405C-BCA3-410612141D49}.dll_test|Any CPU.ActiveCfg = Debug|Any CPU
        {2F469712-C0AB-405C-BCA3-410612141D49}.dll_test|Any CPU.Build.0 = Debug|Any CPU
        {2F469712-C0AB-405C-BCA3-410612141D49}.dll_test|x64.ActiveCfg = Debug|Any CPU
        {2F469712-C0AB-405C-BCA3-410612141D49}.dll_test|x64.Build.0 = Debug|Any CPU
        {2F469712-C0AB-405C-BCA3-410612141D49}.dll_test|x86.ActiveCfg = Debug|Any CPU
        {2F469712-C0AB-405C-BCA3-410612141D49}.dll_test|x86.Build.0 = Debug|Any CPU
        {2F469712-C0AB-405C-BCA3-410612141D49}.Release|Any CPU.ActiveCfg = Release|Any CPU
        {2F469712-C0AB-405C-BCA3-410612141D49}.Release|Any CPU.Build.0 = Release|Any CPU
        {2F469712-C0AB-405C-BCA3-410612141D49}.Release|x64.ActiveCfg = Release|Any CPU
        {2F469712-C0AB-405C-BCA3-410612141D49}.Release|x64.Build.0 = Release|Any CPU
        {2F469712-C0AB-405C-BCA3-410612141D49}.Release|x86.ActiveCfg = Release|Any CPU
        {2F469712-C0AB-405C-BCA3-410612141D49}.Release|x86.Build.0 = Release|Any CPU
    EndGlobalSection
    GlobalSection(SolutionProperties) = preSolution
        HideSolutionNode = FALSE
@@ -1030,6 +1050,7 @@
        {68588934-269E-4ADB-B0CB-7C48B0F08130} = {E956660D-6E09-417B-9A3C-27888AF69266}
        {0A0F9D7E-87C9-4276-823D-495355A01E8C} = {9F4F9ECE-9C4C-4796-91A1-69805F823EA5}
        {DBC6DC37-8BA8-4CFC-A98C-E6D34EE2E5D7} = {4F0A7BA1-6ED6-4F4F-A3B4-B9B3A133D869}
        {2F469712-C0AB-405C-BCA3-410612141D49} = {E956660D-6E09-417B-9A3C-27888AF69266}
    EndGlobalSection
    GlobalSection(ExtensibilityGlobals) = postSolution
        SolutionGuid = {E02989A8-9B6F-43E5-AACA-790328215089}

 Hydro/Yw.Hydro.Core/ParseHelper.cs

@@ -191,6 +191,23 @@
                }
            }

            //换热器
            if (model.Exchangers != null && model.Exchangers.Count > 0)
            {
                foreach (var exchanger in model.Exchangers)
                {
                    var exchangerModel = new Junction();
                    exchangerModel.Id = exchanger.Code;
                    exchangerModel.Name = exchanger.Name;
                    exchangerModel.Quality = exchanger.Quality;
                    exchangerModel.Position = new Position2d(exchanger.Position2d.X, exchanger.Position2d.Y);
                    exchangerModel.Elev = exchanger.Elev;
                    exchangerModel.Demand = exchanger.Demand;
                    exchangerModel.DemandPattern = exchanger.DemandPattern;
                    netWork.Junctions.Add(exchangerModel);
                }
            }

            //水库
            if (model.Reservoirs != null && model.Reservoirs.Count > 0)
            {
@@ -291,25 +308,6 @@
                    translationModel.Roughness = translation.Roughness;
                    translationModel.MinorLoss = translation.MinorLoss;
                    netWork.Pipes.Add(translationModel);
                }
            }

            //换热器
            if (model.Exchangers != null && model.Exchangers.Count > 0)
            {
                foreach (var exchanger in model.Exchangers)
                {
                    var exchangerModel = new Pipe();
                    exchangerModel.Id = exchanger.Code;
                    exchangerModel.Name = exchanger.Name;
                    exchangerModel.StartNode = allNodes.Find(x => x.Id == exchanger.StartCode);
                    exchangerModel.EndNode = allNodes.Find(x => x.Id == exchanger.EndCode);
                    //还有一个状态
                    exchangerModel.Length = exchanger.Length;
                    exchangerModel.Diameter = exchanger.Diameter;
                    exchangerModel.Roughness = exchanger.Roughness;
                    exchangerModel.MinorLoss = exchanger.MinorLoss;
                    netWork.Pipes.Add(exchangerModel);
                }
            }


 Hydro/Yw.Hydro.Core/Yw.Hydro.Core.csproj

@@ -7,7 +7,7 @@
  </PropertyGroup>

  <ItemGroup>
    <PackageReference Include="Yw.Service.Hydro.Core" Version="3.2.5" />
    <PackageReference Include="Yw.Service.Hydro.Core" Version="3.2.6" />
  </ItemGroup>

  <ItemGroup>

 Service/HStation.Service.Revit.Core/01-model/RevitModel.cs

@@ -146,6 +146,11 @@
        /// </summary>
        public List<RevitPressmeter> Pressmeters { get; set; }

        /// <summary>
        /// æ¢çƒ­å™¨åˆ—表
        /// </summary>
        public List<RevitExchanger> Exchangers { get; set; }

        #endregion

        #region Link
@@ -170,10 +175,7 @@
        /// </summary>
        public List<RevitTranslation> Translations { get; set; }

        /// <summary>
        /// æ¢çƒ­å™¨åˆ—表
        /// </summary>
        public List<RevitExchanger> Exchangers { get; set; }


        #endregion


 Service/HStation.Service.Revit.Core/01-model/RevitModel_Method.cs

@@ -63,6 +63,10 @@
            {
                list.AddRange(this.Bluntheads);
            }
            if (this.Exchangers != null && this.Exchangers.Count > 0)
            {
                list.AddRange(this.Exchangers);
            }

            if (this.Pipes != null && this.Pipes.Count > 0)
            {
@@ -71,10 +75,6 @@
            if (this.Translations != null && this.Translations.Count > 0)
            {
                list.AddRange(this.Translations);
            }
            if (this.Exchangers != null && this.Exchangers.Count > 0)
            {
                list.AddRange(this.Exchangers);
            }
            if (this.Pumps != null && this.Pumps.Count > 0)
            {
@@ -148,7 +148,10 @@
            {
                list.AddRange(this.Bluntheads);
            }

            if (this.Exchangers != null && this.Exchangers.Count > 0)
            {
                list.AddRange(this.Exchangers);
            }

            return list;
        }
@@ -190,10 +193,6 @@
            if (this.Translations != null && this.Translations.Count > 0)
            {
                list.AddRange(this.Translations);
            }
            if (this.Exchangers != null && this.Exchangers.Count > 0)
            {
                list.AddRange(this.Exchangers);
            }
            if (this.Pumps != null && this.Pumps.Count > 0)
            {
@@ -255,7 +254,10 @@
            {
                list.AddRange(this.Bluntheads);
            }

            if (this.Exchangers != null && this.Exchangers.Count > 0)
            {
                list.AddRange(this.Exchangers);
            }

            return list;
        }
@@ -306,10 +308,6 @@
            if (this.Translations != null && this.Translations.Count > 0)
            {
                list.AddRange(this.Translations);
            }
            if (this.Exchangers != null && this.Exchangers.Count > 0)
            {
                list.AddRange(this.Exchangers);
            }

            return list;

 Service/HStation.Service.Revit.Core/02-parter/02-node/RevitExchanger.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,52 @@
namespace HStation.Model
{
    /// <summary>
    /// æ¢çƒ­å™¨
    /// </summary>
    public class RevitExchanger : RevitParter, IRevitJunction
    {
        /// <summary>
        /// 
        /// </summary>
        public RevitExchanger() { }

        /// <summary>
        /// 
        /// </summary>
        public RevitExchanger(RevitExchanger rhs) : base(rhs)
        {
            this.Quality = rhs.Quality;
            this.Position = rhs.Position;
            this.Elev = rhs.Elev;
            this.Demand = rhs.Demand;
            this.DemandPattern = rhs.DemandPattern;
        }


        /// <summary>
        /// åˆå§‹æ°´è´¨
        /// </summary>
        public double Quality { get; set; }

        /// <summary>
        /// ä½ç½®
        /// </summary>
        public RevitPosition Position { get; set; }

        /// <summary>
        /// æ ‡é«˜
        /// </summary>
        public double Elev { get; set; }

        /// <summary>
        /// éœ€æ°´é‡
        /// </summary>
        public double? Demand { get; set; }

        /// <summary>
        /// éœ€æ°´æ¨¡å¼
        /// </summary>
        public string DemandPattern { get; set; }

    }
}

 Service/HStation.Service.Revit.Core/02-parter/03-link/RevitExchanger.cs

ÎļþÒÑɾ³ý

 Service/HStation.Service.Revit.Core/04-service/01-json/RevitJsonHelper.cs

@@ -550,6 +550,43 @@
                                model.Hydrants.Add(hydrant);
                            }
                            break;
                        case RevitJsonCatalog.Exchanger:
                            {
                                var exchanger = new Model.RevitExchanger();
                                exchanger.Id = jobject[RevitJsonProp.Id].ToString();
                                exchanger.Code = jobject[RevitJsonProp.Code].ToString();
                                if (string.IsNullOrEmpty(exchanger.Code))
                                {
                                    exchanger.Code = exchanger.Id;
                                }
                                exchanger.Name = jobject[RevitJsonProp.Name].ToString();
                                exchanger.ModelType = jobject[RevitJsonProp.ModelType].ToString();
                                exchanger.Flags = Yw.Untity.FlagsHelper.ToList(jobject[RevitJsonProp.Flags].ToString());
                                exchanger.Description = jobject[RevitJsonProp.Description].ToString();
                                if (jobject[RevitJsonProp.Quality].MatchNumeric(out double quality))
                                {
                                    exchanger.Quality = quality;
                                }
                                var linkList = JsonHelper.Json2Object<List<RevitJsonLinkerModel>>(jobject[RevitJsonProp.Links].ToString());
                                var centerPoint = linkList.GetCenterPoint();
                                exchanger.Position = new Model.RevitPosition()
                                {
                                    X = centerPoint.X,
                                    Y = centerPoint.Y,
                                    Z = centerPoint.Z
                                };
                                if (jobject[RevitJsonProp.Elev].MatchNumeric(out double elev))
                                {
                                    exchanger.Elev = elev;
                                }
                                if (jobject[RevitJsonProp.Demand].MatchNumeric(out double demand))
                                {
                                    exchanger.Demand = demand;
                                }
                                exchanger.DemandPattern = jobject[RevitJsonProp.DemandPattern].ToString();
                                model.Exchangers.Add(exchanger);
                            }
                            break;
                        case RevitJsonCatalog.Pipe:
                            {
                                var pipe = new Model.RevitPipe();
@@ -690,77 +727,6 @@
                                    translation.Roughness = roughness;
                                }
                                model.Translations.Add(translation);
                            }
                            break;
                        case RevitJsonCatalog.Exchanger:
                            {
                                var exchanger = new Model.RevitExchanger();
                                exchanger.Id = jobject[RevitJsonProp.Id].ToString();
                                exchanger.Code = jobject[RevitJsonProp.Code].ToString();
                                if (string.IsNullOrEmpty(exchanger.Code))
                                {
                                    exchanger.Code = exchanger.Id;
                                }
                                exchanger.Name = jobject[RevitJsonProp.Name].ToString();
                                exchanger.ModelType = jobject[RevitJsonProp.ModelType].ToString();
                                exchanger.Flags = Yw.Untity.FlagsHelper.ToList(jobject[RevitJsonProp.Flags].ToString());
                                exchanger.Description = jobject[RevitJsonProp.Description].ToString();
                                var linkList = JsonHelper.Json2Object<List<RevitJsonLinkerModel>>(jobject[RevitJsonProp.Links].ToString());
                                var startLinker = linkList.GetStartLinker();
                                var endLinker = linkList.GetEndLinker();
                                exchanger.StartCode = startLinker.ConnectId;
                                exchanger.EndCode = endLinker.ConnectId;
                                exchanger.StartPosition = new Model.RevitPosition()
                                {
                                    X = startLinker.Point.X,
                                    Y = startLinker.Point.Y,
                                    Z = startLinker.Point.Z
                                };
                                exchanger.EndPosition = new Model.RevitPosition()
                                {
                                    X = endLinker.Point.X,
                                    Y = endLinker.Point.Y,
                                    Z = endLinker.Point.Z
                                };
                                exchanger.LinkStatus = jobject[RevitJsonProp.LinkStatusPipe].ToString();
                                if (jobject[RevitJsonProp.StartElev].MatchNumeric(out double startElev))
                                {
                                    exchanger.StartElev = startElev;
                                }
                                if (jobject[RevitJsonProp.EndElev].MatchNumeric(out double endElev))
                                {
                                    exchanger.EndElev = endElev;
                                }
                                if (jobject[RevitJsonProp.StartQuality].MatchNumeric(out double startQuality))
                                {
                                    exchanger.StartQuality = startQuality;
                                }
                                if (jobject[RevitJsonProp.EndQuality].MatchNumeric(out double endQuality))
                                {
                                    exchanger.EndQuality = endQuality;
                                }

                                if (jobject[RevitJsonProp.Length].MatchNumeric(out double length))
                                {
                                    exchanger.Length = length;
                                }
                                if (jobject[RevitJsonProp.Diameter].MatchNumeric(out double diameter))
                                {
                                    exchanger.Diameter = diameter;
                                }
                                else if (jobject[RevitJsonProp.InternalDiameter].MatchNumeric(out double internalDiameter))
                                {
                                    exchanger.Diameter = internalDiameter;
                                }
                                if (jobject[RevitJsonProp.MinorLoss].MatchNumeric(out double minorLoss))
                                {
                                    exchanger.MinorLoss = minorLoss;
                                }
                                if (jobject[RevitJsonProp.Roughness].MatchNumeric(out double roughness))
                                {
                                    exchanger.Roughness = roughness;
                                }
                                model.Exchangers.Add(exchanger);
                            }
                            break;
                        case RevitJsonCatalog.Pump:

 Vmo/HStation.Vmo.Xhs.Core/HStation.Vmo.Xhs.Core.csproj

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
    <TargetFramework>net6.0</TargetFramework>
    <ImplicitUsings>enable</ImplicitUsings>
    <Nullable>enable</Nullable>
  </PropertyGroup>

  <ItemGroup>
    <ProjectReference Include="..\Yw.Vmo.Core\Yw.Vmo.Core.csproj" />
  </ItemGroup>

</Project>

 Vmo/HStation.Vmo.Xhs.Core/XhsProjectExtensions.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,65 @@
namespace HStation.Vmo.Xhs
{
    public class XhsProjectExtensions
    {
        /// <summary>
        /// id
        /// </summary>
        public long ID { get; set; }

        /// <summary>
        /// çˆ¶çº§id
        /// </summary>
        public long ParentID { get; set; }

        /// <summary>
        /// ç¼–号
        /// </summary>
        public string NO { get; set; }

        /// <summary>
        /// åç§°
        /// </summary>
        public string Name { get; set; }

        /// <summary>
        /// è¯¦ç»†åœ°å€
        /// </summary>
        public string Address { get; set; }

        /// <summary>
        /// å®¢æˆ·
        /// </summary>
        public string Customer { get; set; }

        /// <summary>
        /// å‚æ•°
        /// </summary>
        public Dictionary<string, string> Paras { get; set; }

        /// <summary>
        /// æ ‡ç­¾
        /// </summary>
        public List<string> Flags { get; set; }

        /// <summary>
        /// æ ‡å¿—
        /// </summary>
        public string TagName { get; set; }

        /// <summary>
        /// æŽ’序码
        /// </summary>
        public int SortCode { get; set; }

        /// <summary>
        /// è¯´æ˜Ž
        /// </summary>
        public string Description { get; set; }

        /// <summary>
        /// ç«™ç‚¹åˆ—表
        /// </summary>
        public List<XhsProjectSite> SiteList { get; set; }
    }
}

 Vmo/HStation.Vmo.Xhs.Core/XhsProjectSite.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,47 @@
using Yw.Vmo;

namespace HStation.Vmo.Xhs
{
    public class XhsProjectSite
    {
        /// <summary>
        /// id
        /// </summary>
        public long ID { get; set; }

        /// <summary>
        /// é¡¹ç›®id
        /// </summary>
        public long ProjectID { get; set; }

        /// <summary>
        /// åç§°
        /// </summary>
        public string Name { get; set; }

        /// <summary>
        /// å‚æ•°
        /// </summary>
        public Dictionary<string, string> Paras { get; set; }

        /// <summary>
        /// æ ‡ç­¾
        /// </summary>
        public List<string> Flags { get; set; }

        /// <summary>
        /// ä½¿ç”¨çŠ¶æ€
        /// </summary>
        public eUseStatus UseStatus { get; set; }

        /// <summary>
        /// æŽ’序码
        /// </summary>
        public int SortCode { get; set; }

        /// <summary>
        /// è¯´æ˜Ž
        /// </summary>
        public string Description { get; set; }
    }
}

 WinFrmUI/HStation.WinFrmUI.Basic/01-SysCatalogManage/AddSysCatalogDlg.cs

@@ -46,13 +46,15 @@
            _AddCatlogDto.Code = TextEditCode.Text.Trim();
            if (await this.ReloadDataEvent.Invoke(_AddCatlogDto))
            {
                MessageBoxHelper.ShowSuccess("添加成功!");
                //  TipFormHelper TipFormHelper = new TipFormHelper();
                TipFormHelper.ShowInfo("添加成功!!");
                //   MessageBoxHelper.ShowSuccess("添加成功!");
            }
            else
            {
                MessageBoxHelper.ShowError("添加失败!");
            }
            this.DialogResult = DialogResult.OK;
            //  this.DialogResult = DialogResult.OK;
            this.Close();
        }
    }

 WinFrmUI/HStation.WinFrmUI.Basic/01-SysCatalogManage/SysCatalogManageMainPanel.Designer.cs

@@ -43,28 +43,23 @@
            dockPanel1 = new DevExpress.XtraBars.Docking.DockPanel();
            dockPanel1_Container = new DevExpress.XtraBars.Docking.ControlContainer();
            typeTreeListCtrl2 = new SysTypeTreeListCtrl();
            layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
            treeList1 = new DevExpress.XtraTreeList.TreeList();
            colName = new DevExpress.XtraTreeList.Columns.TreeListColumn();
            colCode = new DevExpress.XtraTreeList.Columns.TreeListColumn();
            colSortCode = new DevExpress.XtraTreeList.Columns.TreeListColumn();
            colDescription = new DevExpress.XtraTreeList.Columns.TreeListColumn();
            catlogViewModelBindingSource = new BindingSource(components);
            Root = new DevExpress.XtraLayout.LayoutControlGroup();
            layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            barButtonItem1 = new DevExpress.XtraBars.BarButtonItem();
            svgImage32 = new DevExpress.Utils.SvgImageCollection(components);
            sidePanel1 = new DevExpress.XtraEditors.SidePanel();
            ((System.ComponentModel.ISupportInitialize)ribbonControl1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)dockManager1).BeginInit();
            dockPanel1.SuspendLayout();
            dockPanel1_Container.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit();
            layoutControl1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)treeList1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)catlogViewModelBindingSource).BeginInit();
            ((System.ComponentModel.ISupportInitialize)Root).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)svgImage32).BeginInit();
            sidePanel1.SuspendLayout();
            SuspendLayout();
            // 
            // ribbonControl1
@@ -80,7 +75,7 @@
            ribbonControl1.ShowExpandCollapseButton = DevExpress.Utils.DefaultBoolean.False;
            ribbonControl1.ShowPageHeadersInFormCaption = DevExpress.Utils.DefaultBoolean.True;
            ribbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide;
            ribbonControl1.Size = new Size(1133, 128);
            ribbonControl1.Size = new Size(933, 101);
            ribbonControl1.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden;
            // 
            // barBtnEditPumpCurve
@@ -117,7 +112,7 @@
            // 
            // BtnPropEdit
            // 
            BtnPropEdit.Caption = "相应属性编辑";
            BtnPropEdit.Caption = "属性分配";
            BtnPropEdit.Id = 18;
            BtnPropEdit.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("BtnPropEdit.ImageOptions.SvgImage");
            BtnPropEdit.Name = "BtnPropEdit";
@@ -155,10 +150,10 @@
            dockPanel1.Controls.Add(dockPanel1_Container);
            dockPanel1.Dock = DevExpress.XtraBars.Docking.DockingStyle.Left;
            dockPanel1.ID = new Guid("20cba9f0-4c76-45ad-a0f6-714fb6b14171");
            dockPanel1.Location = new Point(0, 128);
            dockPanel1.Location = new Point(0, 0);
            dockPanel1.Name = "dockPanel1";
            dockPanel1.OriginalSize = new Size(200, 200);
            dockPanel1.Size = new Size(200, 419);
            dockPanel1.Size = new Size(200, 547);
            dockPanel1.Text = "类型列表";
            // 
            // dockPanel1_Container
@@ -166,7 +161,7 @@
            dockPanel1_Container.Controls.Add(typeTreeListCtrl2);
            dockPanel1_Container.Location = new Point(3, 26);
            dockPanel1_Container.Name = "dockPanel1_Container";
            dockPanel1_Container.Size = new Size(193, 390);
            dockPanel1_Container.Size = new Size(193, 518);
            dockPanel1_Container.TabIndex = 0;
            // 
            // typeTreeListCtrl2
@@ -176,20 +171,8 @@
            typeTreeListCtrl2.Dock = DockStyle.Fill;
            typeTreeListCtrl2.Location = new Point(0, 0);
            typeTreeListCtrl2.Name = "typeTreeListCtrl2";
            typeTreeListCtrl2.Size = new Size(193, 390);
            typeTreeListCtrl2.Size = new Size(193, 518);
            typeTreeListCtrl2.TabIndex = 0;
            // 
            // layoutControl1
            // 
            layoutControl1.Controls.Add(treeList1);
            layoutControl1.Dock = DockStyle.Fill;
            layoutControl1.Location = new Point(200, 128);
            layoutControl1.Name = "layoutControl1";
            layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(523, 367, 650, 364);
            layoutControl1.Root = Root;
            layoutControl1.Size = new Size(933, 419);
            layoutControl1.TabIndex = 6;
            layoutControl1.Text = "layoutControl1";
            // 
            // treeList1
            // 
@@ -197,11 +180,13 @@
            treeList1.Appearance.HeaderPanel.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
            treeList1.Columns.AddRange(new DevExpress.XtraTreeList.Columns.TreeListColumn[] { colName, colCode, colSortCode, colDescription });
            treeList1.DataSource = catlogViewModelBindingSource;
            treeList1.Location = new Point(2, 2);
            treeList1.Dock = DockStyle.Fill;
            treeList1.Location = new Point(0, 101);
            treeList1.MenuManager = ribbonControl1;
            treeList1.Name = "treeList1";
            treeList1.OptionsBehavior.Editable = false;
            treeList1.Size = new Size(929, 415);
            treeList1.OptionsView.ShowTreeLines = DevExpress.Utils.DefaultBoolean.True;
            treeList1.Size = new Size(933, 446);
            treeList1.TabIndex = 4;
            // 
            // colName
@@ -248,25 +233,6 @@
            // 
            catlogViewModelBindingSource.DataSource = typeof(SysCatalogViewModel);
            // 
            // Root
            // 
            Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
            Root.GroupBordersVisible = false;
            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1 });
            Root.Name = "Root";
            Root.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
            Root.Size = new Size(933, 419);
            Root.TextVisible = false;
            // 
            // layoutControlItem1
            // 
            layoutControlItem1.Control = treeList1;
            layoutControlItem1.Location = new Point(0, 0);
            layoutControlItem1.Name = "layoutControlItem1";
            layoutControlItem1.Size = new Size(933, 419);
            layoutControlItem1.TextSize = new Size(0, 0);
            layoutControlItem1.TextVisible = false;
            // 
            // barButtonItem1
            // 
            barButtonItem1.Caption = "barButtonItem1";
@@ -279,30 +245,38 @@
            svgImage32.Add("bletter", "image://svgimages/outlook inspired/bletter.svg");
            svgImage32.Add("bold", "image://svgimages/outlook inspired/bold.svg");
            // 
            // sidePanel1
            // 
            sidePanel1.BorderThickness = 0;
            sidePanel1.Controls.Add(treeList1);
            sidePanel1.Controls.Add(ribbonControl1);
            sidePanel1.Dock = DockStyle.Fill;
            sidePanel1.Location = new Point(200, 0);
            sidePanel1.Name = "sidePanel1";
            sidePanel1.Size = new Size(933, 547);
            sidePanel1.TabIndex = 9;
            sidePanel1.Text = "sidePanel1";
            // 
            // SysCatalogManageMainPanel
            // 
            Appearance.BackColor = SystemColors.Control;
            Appearance.Options.UseBackColor = true;
            AutoScaleDimensions = new SizeF(7F, 14F);
            AutoScaleMode = AutoScaleMode.Font;
            Controls.Add(layoutControl1);
            Controls.Add(sidePanel1);
            Controls.Add(dockPanel1);
            Controls.Add(ribbonControl1);
            Name = "SysCatalogManageMainPanel";
            Size = new Size(1133, 547);
            ((System.ComponentModel.ISupportInitialize)ribbonControl1).EndInit();
            ((System.ComponentModel.ISupportInitialize)dockManager1).EndInit();
            dockPanel1.ResumeLayout(false);
            dockPanel1_Container.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)layoutControl1).EndInit();
            layoutControl1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)treeList1).EndInit();
            ((System.ComponentModel.ISupportInitialize)catlogViewModelBindingSource).EndInit();
            ((System.ComponentModel.ISupportInitialize)Root).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem1).EndInit();
            ((System.ComponentModel.ISupportInitialize)svgImage32).EndInit();
            sidePanel1.ResumeLayout(false);
            sidePanel1.PerformLayout();
            ResumeLayout(false);
            PerformLayout();
        }

        #endregion
@@ -313,8 +287,6 @@
        private DevExpress.XtraBars.Docking.DockManager dockManager1;
        private DevExpress.XtraBars.Docking.DockPanel dockPanel1;
        private DevExpress.XtraBars.Docking.ControlContainer dockPanel1_Container;
        private DevExpress.XtraLayout.LayoutControl layoutControl1;
        private DevExpress.XtraLayout.LayoutControlGroup Root;
        private DevExpress.XtraBars.BarButtonItem barBtnEditPumpCurve;
        private DevExpress.XtraBars.BarButtonItem BtnAdd;
        private DevExpress.XtraBars.BarButtonItem BtnDelete;
@@ -325,11 +297,11 @@
        private DevExpress.XtraTreeList.Columns.TreeListColumn colSortCode;
        private DevExpress.XtraTreeList.Columns.TreeListColumn colDescription;
        private BindingSource catlogViewModelBindingSource;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
        private SysTypeTreeListCtrl typeTreeListCtrl2;
        private DevExpress.XtraBars.BarButtonItem BtnAddChild;
        private DevExpress.XtraBars.BarButtonItem BtnPropEdit;
        private DevExpress.Utils.SvgImageCollection svgImage32;
        private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup2;
        private DevExpress.XtraEditors.SidePanel sidePanel1;
    }
}

 WinFrmUI/HStation.WinFrmUI.Basic/01-SysCatalogManage/SysCatalogManageMainPanel.cs

@@ -9,6 +9,7 @@
            this.PageTitle.HeaderSvgImage = this.svgImage32[1];
            this.PageTitle.SvgImageSize = new Size(24, 24);
            this.typeTreeListCtrl2.FocusedChangedEvent += TypeTreeListCtrl2_FocusedChangedEvent;
        
        }

        private List<SysCatalogViewModel> _allBindingList = null;

 WinFrmUI/HStation.WinFrmUI.Basic/01-SysCatalogManage/SysTypeTreeListCtrl.designer.cs

@@ -203,6 +203,7 @@
            treeList1.Name = "treeList1";
            treeList1.OptionsBehavior.Editable = false;
            treeList1.OptionsBehavior.ReadOnly = true;
            treeList1.OptionsView.ShowTreeLines = DevExpress.Utils.DefaultBoolean.True;
            treeList1.Size = new Size(272, 535);
            treeList1.TabIndex = 4;
            treeList1.ViewStyle = DevExpress.XtraTreeList.TreeListViewStyle.TreeView;
@@ -460,7 +461,7 @@
            popupMenu2.Manager = barManager1;
            popupMenu2.Name = "popupMenu2";
            // 
            // TypeTreeListCtrl
            // SysTypeTreeListCtrl
            // 
            Appearance.BackColor = SystemColors.Control;
            Appearance.Options.UseBackColor = true;
@@ -471,7 +472,7 @@
            Controls.Add(barDockControlRight);
            Controls.Add(barDockControlBottom);
            Controls.Add(barDockControlTop);
            Name = "TypeTreeListCtrl";
            Name = "SysTypeTreeListCtrl";
            Size = new Size(276, 569);
            ((System.ComponentModel.ISupportInitialize)barManager1).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControl1).EndInit();

 WinFrmUI/HStation.WinFrmUI.Basic/02-SysPropManage/SysPropManageMainPanel.Designer.cs

@@ -58,11 +58,9 @@
            colUnitName = new DevExpress.XtraGrid.Columns.GridColumn();
            ColPropEdit = new DevExpress.XtraGrid.Columns.GridColumn();
            repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
            Root = new DevExpress.XtraLayout.LayoutControlGroup();
            layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            barButtonItem1 = new DevExpress.XtraBars.BarButtonItem();
            svgImage32 = new DevExpress.Utils.SvgImageCollection(components);
            sidePanel1 = new DevExpress.XtraEditors.SidePanel();
            ((System.ComponentModel.ISupportInitialize)ribbonControl1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)dockManager1).BeginInit();
            dockPanel1.SuspendLayout();
@@ -71,11 +69,8 @@
            ((System.ComponentModel.ISupportInitialize)propViewModelBindingSource).BeginInit();
            ((System.ComponentModel.ISupportInitialize)gridView1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)repositoryItemButtonEdit1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit();
            layoutControl1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)Root).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)svgImage32).BeginInit();
            sidePanel1.SuspendLayout();
            SuspendLayout();
            // 
            // ribbonControl1
@@ -91,7 +86,7 @@
            ribbonControl1.ShowExpandCollapseButton = DevExpress.Utils.DefaultBoolean.False;
            ribbonControl1.ShowPageHeadersInFormCaption = DevExpress.Utils.DefaultBoolean.True;
            ribbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide;
            ribbonControl1.Size = new Size(1133, 101);
            ribbonControl1.Size = new Size(933, 101);
            ribbonControl1.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden;
            // 
            // barBtnEditPumpCurve
@@ -143,10 +138,10 @@
            dockPanel1.Controls.Add(dockPanel1_Container);
            dockPanel1.Dock = DevExpress.XtraBars.Docking.DockingStyle.Left;
            dockPanel1.ID = new Guid("20cba9f0-4c76-45ad-a0f6-714fb6b14171");
            dockPanel1.Location = new Point(0, 101);
            dockPanel1.Location = new Point(0, 0);
            dockPanel1.Name = "dockPanel1";
            dockPanel1.OriginalSize = new Size(200, 200);
            dockPanel1.Size = new Size(200, 446);
            dockPanel1.Size = new Size(200, 547);
            dockPanel1.Text = "属性组列表";
            // 
            // dockPanel1_Container
@@ -154,7 +149,7 @@
            dockPanel1_Container.Controls.Add(propGroupTreeListCtrl1);
            dockPanel1_Container.Location = new Point(3, 26);
            dockPanel1_Container.Name = "dockPanel1_Container";
            dockPanel1_Container.Size = new Size(193, 417);
            dockPanel1_Container.Size = new Size(193, 518);
            dockPanel1_Container.TabIndex = 0;
            // 
            // propGroupTreeListCtrl1
@@ -164,18 +159,19 @@
            propGroupTreeListCtrl1.Dock = DockStyle.Fill;
            propGroupTreeListCtrl1.Location = new Point(0, 0);
            propGroupTreeListCtrl1.Name = "propGroupTreeListCtrl1";
            propGroupTreeListCtrl1.Size = new Size(193, 417);
            propGroupTreeListCtrl1.Size = new Size(193, 518);
            propGroupTreeListCtrl1.TabIndex = 0;
            // 
            // gridControl1
            // 
            gridControl1.DataSource = propViewModelBindingSource;
            gridControl1.Location = new Point(2, 2);
            gridControl1.Dock = DockStyle.Fill;
            gridControl1.Location = new Point(0, 101);
            gridControl1.MainView = gridView1;
            gridControl1.MenuManager = ribbonControl1;
            gridControl1.Name = "gridControl1";
            gridControl1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { repositoryItemButtonEdit1 });
            gridControl1.Size = new Size(929, 442);
            gridControl1.Size = new Size(933, 446);
            gridControl1.TabIndex = 3;
            gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView1 });
            // 
@@ -282,36 +278,6 @@
            repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
            repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            // 
            // layoutControl1
            // 
            layoutControl1.Controls.Add(gridControl1);
            layoutControl1.Dock = DockStyle.Fill;
            layoutControl1.Location = new Point(200, 101);
            layoutControl1.Name = "layoutControl1";
            layoutControl1.Root = Root;
            layoutControl1.Size = new Size(933, 446);
            layoutControl1.TabIndex = 6;
            layoutControl1.Text = "layoutControl1";
            // 
            // Root
            // 
            Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
            Root.GroupBordersVisible = false;
            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1 });
            Root.Name = "Root";
            Root.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
            Root.Size = new Size(933, 446);
            Root.TextVisible = false;
            // 
            // layoutControlItem1
            // 
            layoutControlItem1.Control = gridControl1;
            layoutControlItem1.Location = new Point(0, 0);
            layoutControlItem1.Name = "layoutControlItem1";
            layoutControlItem1.Size = new Size(933, 446);
            layoutControlItem1.TextSize = new Size(0, 0);
            layoutControlItem1.TextVisible = false;
            // 
            // barButtonItem1
            // 
            barButtonItem1.Caption = "barButtonItem1";
@@ -324,15 +290,26 @@
            svgImage32.Add("bletter", "image://svgimages/outlook inspired/bletter.svg");
            svgImage32.Add("bold", "image://svgimages/outlook inspired/bold.svg");
            // 
            // sidePanel1
            // 
            sidePanel1.BorderThickness = 0;
            sidePanel1.Controls.Add(gridControl1);
            sidePanel1.Controls.Add(ribbonControl1);
            sidePanel1.Dock = DockStyle.Fill;
            sidePanel1.Location = new Point(200, 0);
            sidePanel1.Name = "sidePanel1";
            sidePanel1.Size = new Size(933, 547);
            sidePanel1.TabIndex = 9;
            sidePanel1.Text = "sidePanel1";
            // 
            // SysPropManageMainPanel
            // 
            Appearance.BackColor = SystemColors.Control;
            Appearance.Options.UseBackColor = true;
            AutoScaleDimensions = new SizeF(7F, 14F);
            AutoScaleMode = AutoScaleMode.Font;
            Controls.Add(layoutControl1);
            Controls.Add(sidePanel1);
            Controls.Add(dockPanel1);
            Controls.Add(ribbonControl1);
            Name = "SysPropManageMainPanel";
            Size = new Size(1133, 547);
            ((System.ComponentModel.ISupportInitialize)ribbonControl1).EndInit();
@@ -343,13 +320,10 @@
            ((System.ComponentModel.ISupportInitialize)propViewModelBindingSource).EndInit();
            ((System.ComponentModel.ISupportInitialize)gridView1).EndInit();
            ((System.ComponentModel.ISupportInitialize)repositoryItemButtonEdit1).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControl1).EndInit();
            layoutControl1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)Root).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem1).EndInit();
            ((System.ComponentModel.ISupportInitialize)svgImage32).EndInit();
            sidePanel1.ResumeLayout(false);
            sidePanel1.PerformLayout();
            ResumeLayout(false);
            PerformLayout();
        }

        #endregion
@@ -362,9 +336,6 @@
        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
        private DevExpress.XtraBars.Docking.DockPanel dockPanel1;
        private DevExpress.XtraBars.Docking.ControlContainer dockPanel1_Container;
        private DevExpress.XtraLayout.LayoutControl layoutControl1;
        private DevExpress.XtraLayout.LayoutControlGroup Root;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
        private DevExpress.XtraBars.BarButtonItem barBtnEditPumpCurve;
        private DevExpress.XtraBars.BarButtonItem BtnAdd;
        private DevExpress.XtraBars.BarButtonItem BtnDelete;
@@ -382,5 +353,6 @@
        private DevExpress.XtraGrid.Columns.GridColumn ColPropEdit;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
        private DevExpress.Utils.SvgImageCollection svgImage32;
        private DevExpress.XtraEditors.SidePanel sidePanel1;
    }
}

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectDlg - ¸´ÖÆ.Designer.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,405 @@
namespace HStation.WinFrmUI
{
    partial class ImportXhsProjectDlg
    {
        /// <summary>
        /// Required designer variable.
        /// </summary>
        private System.ComponentModel.IContainer components = null;

        /// <summary>
        /// Clean up any resources being used.
        /// </summary>
        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
        protected override void Dispose(bool disposing)
        {
            if (disposing && (components != null))
            {
                components.Dispose();
            }
            base.Dispose(disposing);
        }

        #region Windows Form Designer generated code

        /// <summary>
        /// Required method for Designer support - do not modify
        /// the contents of this method with the code editor.
        /// </summary>
        private void InitializeComponent()
        {
            ComponentResourceManager resources = new ComponentResourceManager(typeof(ImportXhsProjectDlg));
            layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
            btnComplete = new DevExpress.XtraEditors.SimpleButton();
            btnPrev = new DevExpress.XtraEditors.SimpleButton();
            btnNext = new DevExpress.XtraEditors.SimpleButton();
            btnCancel = new DevExpress.XtraEditors.SimpleButton();
            navigationFrame1 = new DevExpress.XtraBars.Navigation.NavigationFrame();
            navPageInputProjectInfo = new DevExpress.XtraBars.Navigation.NavigationPage();
            inputXhsProjectInfoWizardPage = new InputXhsProjectInfoWizardPage();
            navPageSetMapLocation = new DevExpress.XtraBars.Navigation.NavigationPage();
            setXhsProjectMapLocationWizardPage = new SetXhsProjectMapLocationWizardPage();
            navPageGenerateProject = new DevExpress.XtraBars.Navigation.NavigationPage();
            generateXhsProjectWizardPage = new GenerateXhsProjectWizardPage();
            navPageImportCompleted = new DevExpress.XtraBars.Navigation.NavigationPage();
            importXhsProjectCompletedWizardPage = new ImportXhsProjectCompletedCtrl();
            stepProgressBar1 = new DevExpress.XtraEditors.StepProgressBar();
            stepPbSelectModelFile = new DevExpress.XtraEditors.StepProgressBarItem();
            stepPbInputProjectInfo = new DevExpress.XtraEditors.StepProgressBarItem();
            stepPbSetMapLocation = new DevExpress.XtraEditors.StepProgressBarItem();
            stepPbGenerateProject = new DevExpress.XtraEditors.StepProgressBarItem();
            stepPbImportCompleted = new DevExpress.XtraEditors.StepProgressBarItem();
            Root = new DevExpress.XtraLayout.LayoutControlGroup();
            layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            itemForCancel = new DevExpress.XtraLayout.LayoutControlItem();
            itemForNext = new DevExpress.XtraLayout.LayoutControlItem();
            itemForPrev = new DevExpress.XtraLayout.LayoutControlItem();
            emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
            itemForComplete = new DevExpress.XtraLayout.LayoutControlItem();
            ((ISupportInitialize)layoutControl1).BeginInit();
            layoutControl1.SuspendLayout();
            ((ISupportInitialize)navigationFrame1).BeginInit();
            navigationFrame1.SuspendLayout();
            navPageInputProjectInfo.SuspendLayout();
            navPageSetMapLocation.SuspendLayout();
            navPageGenerateProject.SuspendLayout();
            navPageImportCompleted.SuspendLayout();
            ((ISupportInitialize)stepProgressBar1).BeginInit();
            ((ISupportInitialize)Root).BeginInit();
            ((ISupportInitialize)layoutControlItem1).BeginInit();
            ((ISupportInitialize)layoutControlItem2).BeginInit();
            ((ISupportInitialize)itemForCancel).BeginInit();
            ((ISupportInitialize)itemForNext).BeginInit();
            ((ISupportInitialize)itemForPrev).BeginInit();
            ((ISupportInitialize)emptySpaceItem1).BeginInit();
            ((ISupportInitialize)itemForComplete).BeginInit();
            SuspendLayout();
            // 
            // layoutControl1
            // 
            layoutControl1.Controls.Add(btnComplete);
            layoutControl1.Controls.Add(btnPrev);
            layoutControl1.Controls.Add(btnNext);
            layoutControl1.Controls.Add(btnCancel);
            layoutControl1.Controls.Add(navigationFrame1);
            layoutControl1.Controls.Add(stepProgressBar1);
            layoutControl1.Dock = DockStyle.Fill;
            layoutControl1.Location = new Point(0, 0);
            layoutControl1.Name = "layoutControl1";
            layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(1247, 349, 650, 400);
            layoutControl1.Root = Root;
            layoutControl1.Size = new Size(1113, 695);
            layoutControl1.TabIndex = 0;
            layoutControl1.Text = "layoutControl1";
            // 
            // btnComplete
            // 
            btnComplete.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
            btnComplete.Appearance.Options.UseBackColor = true;
            btnComplete.Location = new Point(985, 661);
            btnComplete.Name = "btnComplete";
            btnComplete.Size = new Size(116, 22);
            btnComplete.StyleController = layoutControl1;
            btnComplete.TabIndex = 10;
            btnComplete.Text = "完成";
            btnComplete.Click += btnComplete_Click;
            // 
            // btnPrev
            // 
            btnPrev.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Question;
            btnPrev.Appearance.Options.UseBackColor = true;
            btnPrev.Location = new Point(625, 661);
            btnPrev.Name = "btnPrev";
            btnPrev.Size = new Size(116, 22);
            btnPrev.StyleController = layoutControl1;
            btnPrev.TabIndex = 7;
            btnPrev.Text = "<上一步";
            btnPrev.Click += btnPrev_Click;
            // 
            // btnNext
            // 
            btnNext.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Success;
            btnNext.Appearance.Options.UseBackColor = true;
            btnNext.Location = new Point(745, 661);
            btnNext.Name = "btnNext";
            btnNext.Size = new Size(116, 22);
            btnNext.StyleController = layoutControl1;
            btnNext.TabIndex = 8;
            btnNext.Text = "下一步>";
            btnNext.Click += btnNext_Click;
            // 
            // btnCancel
            // 
            btnCancel.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
            btnCancel.Appearance.Options.UseBackColor = true;
            btnCancel.Location = new Point(865, 661);
            btnCancel.Name = "btnCancel";
            btnCancel.Size = new Size(116, 22);
            btnCancel.StyleController = layoutControl1;
            btnCancel.TabIndex = 9;
            btnCancel.Text = "取消";
            btnCancel.Click += btnCancel_Click;
            // 
            // navigationFrame1
            // 
            navigationFrame1.Controls.Add(navPageInputProjectInfo);
            navigationFrame1.Controls.Add(navPageSetMapLocation);
            navigationFrame1.Controls.Add(navPageGenerateProject);
            navigationFrame1.Controls.Add(navPageImportCompleted);
            navigationFrame1.Location = new Point(12, 120);
            navigationFrame1.Name = "navigationFrame1";
            navigationFrame1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { navPageInputProjectInfo, navPageSetMapLocation, navPageGenerateProject, navPageImportCompleted });
            navigationFrame1.SelectedPage = navPageInputProjectInfo;
            navigationFrame1.Size = new Size(1089, 537);
            navigationFrame1.TabIndex = 5;
            navigationFrame1.Text = "navigationFrame1";
            // 
            // navPageInputProjectInfo
            // 
            navPageInputProjectInfo.Caption = "navPageInputProjectInfo";
            navPageInputProjectInfo.Controls.Add(inputXhsProjectInfoWizardPage);
            navPageInputProjectInfo.Name = "navPageInputProjectInfo";
            navPageInputProjectInfo.Size = new Size(1089, 537);
            // 
            // inputXhsProjectInfoWizardPage
            // 
            inputXhsProjectInfoWizardPage.Dock = DockStyle.Fill;
            inputXhsProjectInfoWizardPage.Location = new Point(0, 0);
            inputXhsProjectInfoWizardPage.Name = "inputXhsProjectInfoWizardPage";
            inputXhsProjectInfoWizardPage.Size = new Size(1089, 537);
            inputXhsProjectInfoWizardPage.TabIndex = 0;
            // 
            // navPageSetMapLocation
            // 
            navPageSetMapLocation.Caption = "navPageSetMapLocation";
            navPageSetMapLocation.Controls.Add(setXhsProjectMapLocationWizardPage);
            navPageSetMapLocation.Name = "navPageSetMapLocation";
            navPageSetMapLocation.Size = new Size(1089, 537);
            // 
            // setXhsProjectMapLocationWizardPage
            // 
            setXhsProjectMapLocationWizardPage.Dock = DockStyle.Fill;
            setXhsProjectMapLocationWizardPage.Location = new Point(0, 0);
            setXhsProjectMapLocationWizardPage.Name = "setXhsProjectMapLocationWizardPage";
            setXhsProjectMapLocationWizardPage.Size = new Size(1089, 537);
            setXhsProjectMapLocationWizardPage.TabIndex = 0;
            // 
            // navPageGenerateProject
            // 
            navPageGenerateProject.Caption = "navPageGenerateProject";
            navPageGenerateProject.Controls.Add(generateXhsProjectWizardPage);
            navPageGenerateProject.Name = "navPageGenerateProject";
            navPageGenerateProject.Size = new Size(1089, 537);
            // 
            // generateXhsProjectWizardPage
            // 
            generateXhsProjectWizardPage.Dock = DockStyle.Fill;
            generateXhsProjectWizardPage.Location = new Point(0, 0);
            generateXhsProjectWizardPage.Name = "generateXhsProjectWizardPage";
            generateXhsProjectWizardPage.Size = new Size(1089, 537);
            generateXhsProjectWizardPage.TabIndex = 0;
            // 
            // navPageImportCompleted
            // 
            navPageImportCompleted.Caption = "navPageImportCompleted";
            navPageImportCompleted.Controls.Add(importXhsProjectCompletedWizardPage);
            navPageImportCompleted.Name = "navPageImportCompleted";
            navPageImportCompleted.Size = new Size(1089, 537);
            // 
            // importXhsProjectCompletedWizardPage
            // 
            importXhsProjectCompletedWizardPage.Dock = DockStyle.Fill;
            importXhsProjectCompletedWizardPage.Location = new Point(0, 0);
            importXhsProjectCompletedWizardPage.Name = "importXhsProjectCompletedWizardPage";
            importXhsProjectCompletedWizardPage.Size = new Size(1089, 537);
            importXhsProjectCompletedWizardPage.TabIndex = 0;
            // 
            // stepProgressBar1
            // 
            stepProgressBar1.ContentAlignment = ContentAlignment.MiddleLeft;
            stepProgressBar1.ItemOptions.Indicator.ActiveStateImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("stepProgressBar1.ItemOptions.Indicator.ActiveStateImageOptions.SvgImage");
            stepProgressBar1.ItemOptions.Indicator.ActiveStateImageOptions.SvgImageSize = new Size(20, 20);
            stepProgressBar1.Items.Add(stepPbSelectModelFile);
            stepProgressBar1.Items.Add(stepPbInputProjectInfo);
            stepProgressBar1.Items.Add(stepPbSetMapLocation);
            stepProgressBar1.Items.Add(stepPbGenerateProject);
            stepProgressBar1.Items.Add(stepPbImportCompleted);
            stepProgressBar1.Location = new Point(12, 12);
            stepProgressBar1.Name = "stepProgressBar1";
            stepProgressBar1.SelectedItemIndex = 0;
            stepProgressBar1.Size = new Size(1089, 104);
            stepProgressBar1.StyleController = layoutControl1;
            stepProgressBar1.TabIndex = 4;
            // 
            // stepPbSelectModelFile
            // 
            stepPbSelectModelFile.ContentBlock2.Caption = "录入项目信息";
            stepPbSelectModelFile.Name = "stepPbSelectModelFile";
            stepPbSelectModelFile.State = DevExpress.XtraEditors.StepProgressBarItemState.Active;
            // 
            // stepPbInputProjectInfo
            // 
            stepPbInputProjectInfo.ContentBlock2.Caption = "设置地图位置";
            stepPbInputProjectInfo.Name = "stepPbInputProjectInfo";
            // 
            // stepPbSetMapLocation
            // 
            stepPbSetMapLocation.ContentBlock2.Caption = "自动生成项目";
            stepPbSetMapLocation.Name = "stepPbSetMapLocation";
            // 
            // stepPbGenerateProject
            // 
            stepPbGenerateProject.ContentBlock2.Caption = "项目导入完成";
            stepPbGenerateProject.Name = "stepPbGenerateProject";
            // 
            // stepPbImportCompleted
            // 
            stepPbImportCompleted.ContentBlock2.Caption = "项目展示结果";
            stepPbImportCompleted.Name = "stepPbImportCompleted";
            // 
            // Root
            // 
            Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
            Root.GroupBordersVisible = false;
            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem2, itemForCancel, itemForNext, itemForPrev, emptySpaceItem1, itemForComplete });
            Root.Name = "Root";
            Root.Size = new Size(1113, 695);
            Root.TextVisible = false;
            // 
            // layoutControlItem1
            // 
            layoutControlItem1.Control = stepProgressBar1;
            layoutControlItem1.Location = new Point(0, 0);
            layoutControlItem1.Name = "layoutControlItem1";
            layoutControlItem1.Size = new Size(1093, 108);
            layoutControlItem1.TextSize = new Size(0, 0);
            layoutControlItem1.TextVisible = false;
            // 
            // layoutControlItem2
            // 
            layoutControlItem2.Control = navigationFrame1;
            layoutControlItem2.Location = new Point(0, 108);
            layoutControlItem2.Name = "layoutControlItem2";
            layoutControlItem2.Size = new Size(1093, 541);
            layoutControlItem2.TextSize = new Size(0, 0);
            layoutControlItem2.TextVisible = false;
            // 
            // itemForCancel
            // 
            itemForCancel.Control = btnCancel;
            itemForCancel.Location = new Point(853, 649);
            itemForCancel.MaxSize = new Size(120, 26);
            itemForCancel.MinSize = new Size(120, 26);
            itemForCancel.Name = "itemForCancel";
            itemForCancel.Size = new Size(120, 26);
            itemForCancel.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
            itemForCancel.TextSize = new Size(0, 0);
            itemForCancel.TextVisible = false;
            // 
            // itemForNext
            // 
            itemForNext.Control = btnNext;
            itemForNext.Location = new Point(733, 649);
            itemForNext.MaxSize = new Size(120, 26);
            itemForNext.MinSize = new Size(120, 26);
            itemForNext.Name = "itemForNext";
            itemForNext.Size = new Size(120, 26);
            itemForNext.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
            itemForNext.TextSize = new Size(0, 0);
            itemForNext.TextVisible = false;
            // 
            // itemForPrev
            // 
            itemForPrev.Control = btnPrev;
            itemForPrev.Location = new Point(613, 649);
            itemForPrev.MaxSize = new Size(120, 26);
            itemForPrev.MinSize = new Size(120, 26);
            itemForPrev.Name = "itemForPrev";
            itemForPrev.Size = new Size(120, 26);
            itemForPrev.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
            itemForPrev.TextSize = new Size(0, 0);
            itemForPrev.TextVisible = false;
            // 
            // emptySpaceItem1
            // 
            emptySpaceItem1.AllowHotTrack = false;
            emptySpaceItem1.Location = new Point(0, 649);
            emptySpaceItem1.Name = "emptySpaceItem1";
            emptySpaceItem1.Size = new Size(613, 26);
            emptySpaceItem1.TextSize = new Size(0, 0);
            // 
            // itemForComplete
            // 
            itemForComplete.Control = btnComplete;
            itemForComplete.Location = new Point(973, 649);
            itemForComplete.MaxSize = new Size(120, 26);
            itemForComplete.MinSize = new Size(120, 26);
            itemForComplete.Name = "itemForComplete";
            itemForComplete.Size = new Size(120, 26);
            itemForComplete.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
            itemForComplete.TextSize = new Size(0, 0);
            itemForComplete.TextVisible = false;
            // 
            // ImportXhsProjectDlg
            // 
            AutoScaleDimensions = new SizeF(7F, 14F);
            AutoScaleMode = AutoScaleMode.Font;
            ClientSize = new Size(1113, 695);
            Controls.Add(layoutControl1);
            Name = "ImportXhsProjectDlg";
            StartPosition = FormStartPosition.CenterParent;
            Text = "项目导入";
            FormClosing += ImportXhsProjectDlg_FormClosing;
            ((ISupportInitialize)layoutControl1).EndInit();
            layoutControl1.ResumeLayout(false);
            ((ISupportInitialize)navigationFrame1).EndInit();
            navigationFrame1.ResumeLayout(false);
            navPageInputProjectInfo.ResumeLayout(false);
            navPageSetMapLocation.ResumeLayout(false);
            navPageGenerateProject.ResumeLayout(false);
            navPageImportCompleted.ResumeLayout(false);
            ((ISupportInitialize)stepProgressBar1).EndInit();
            ((ISupportInitialize)Root).EndInit();
            ((ISupportInitialize)layoutControlItem1).EndInit();
            ((ISupportInitialize)layoutControlItem2).EndInit();
            ((ISupportInitialize)itemForCancel).EndInit();
            ((ISupportInitialize)itemForNext).EndInit();
            ((ISupportInitialize)itemForPrev).EndInit();
            ((ISupportInitialize)emptySpaceItem1).EndInit();
            ((ISupportInitialize)itemForComplete).EndInit();
            ResumeLayout(false);
        }

        #endregion

        private DevExpress.XtraLayout.LayoutControl layoutControl1;
        private DevExpress.XtraEditors.StepProgressBar stepProgressBar1;
        private DevExpress.XtraLayout.LayoutControlGroup Root;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
        private DevExpress.XtraEditors.StepProgressBarItem stepPbSelectModelFile;
        private DevExpress.XtraEditors.StepProgressBarItem stepPbInputProjectInfo;
        private DevExpress.XtraEditors.StepProgressBarItem stepPbSetMapLocation;
        private DevExpress.XtraEditors.StepProgressBarItem stepPbGenerateProject;
        private DevExpress.XtraEditors.StepProgressBarItem stepPbImportCompleted;
        private DevExpress.XtraBars.Navigation.NavigationFrame navigationFrame1;
        private DevExpress.XtraBars.Navigation.NavigationPage navPageInputProjectInfo;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
        private DevExpress.XtraEditors.SimpleButton btnPrev;
        private DevExpress.XtraEditors.SimpleButton btnNext;
        private DevExpress.XtraEditors.SimpleButton btnCancel;
        private DevExpress.XtraLayout.LayoutControlItem itemForCancel;
        private DevExpress.XtraLayout.LayoutControlItem itemForNext;
        private DevExpress.XtraLayout.LayoutControlItem itemForPrev;
        private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1;
        private DevExpress.XtraBars.Navigation.NavigationPage navPageSetMapLocation;
        private DevExpress.XtraBars.Navigation.NavigationPage navPageGenerateProject;
        private DevExpress.XtraBars.Navigation.NavigationPage navPageImportCompleted;
        private InputXhsProjectInfoWizardPage inputXhsProjectInfoWizardPage;
        private SetXhsProjectMapLocationWizardPage setXhsProjectMapLocationWizardPage;
        private GenerateXhsProjectWizardPage generateXhsProjectWizardPage;
        private ImportXhsProjectCompletedCtrl importXhsProjectCompletedWizardPage;
        private DevExpress.XtraEditors.SimpleButton btnComplete;
        private DevExpress.XtraLayout.LayoutControlItem itemForComplete;
    }
}

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectDlg - ¸´ÖÆ.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,131 @@
using DevExpress.XtraLayout.Utils;

namespace HStation.WinFrmUI
{
    public partial class ImportXhsProjectDlg : DevExpress.XtraEditors.XtraForm
    {
        public ImportXhsProjectDlg()
        {
            InitializeComponent();
        }

        private readonly ImportXhsProjectViewModel _vm = new();
        private ImportXhsProjectManager _wizard;

        /// <summary>
        ///
        /// </summary>
        public ImportXhsProjectViewModel ViewModel
        {
            get { return _vm; }
        }

        /// <summary>
        ///
        /// </summary>
        public void SetBindingData()
        {
            _wizard = new ImportXhsProjectManager(_vm);
            _wizard.SelectedPageChangedEvent += _wizard_SelectedPageChangedEvent;
            _wizard.SelectedPageStateChangedEvent += _wizard_SelectedPageStateChangedEvent; ;
            _wizard.InitialManager(new IWizardPage<ImportXhsProjectViewModel>[] {
                this.inputXhsProjectInfoWizardPage,
                this.setXhsProjectMapLocationWizardPage,
                this.generateXhsProjectWizardPage,
                this.importXhsProjectCompletedWizardPage
            });
        }

        //选择页面改变
        private void _wizard_SelectedPageChangedEvent(IWizardPage<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)
        {
            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;
        }

        //上一步
        private void btnPrev_Click(object sender, EventArgs e)
        {
            if (_wizard != null)
            {
                _wizard.Prev();
            }
        }

        //下一步
        private void btnNext_Click(object sender, EventArgs e)
        {
            if (_wizard != null)
            {
                _wizard.Next();
            }
        }

        //取消
        private void btnCancel_Click(object sender, EventArgs e)
        {
            if (_wizard != null)
            {
                var bol = _wizard.Cancel();
                if (bol)
                {
                    this.DialogResult = DialogResult.Cancel;
                    this.Close();
                }
            }
        }

        //完成
        private void btnComplete_Click(object sender, EventArgs e)
        {
            if (_wizard != null)
            {
                var bol = _wizard.Complete();
                if (bol)
                {
                    this.DialogResult = DialogResult.OK;
                    this.Close();
                }
            }
        }

        //正在关闭
        private void ImportXhsProjectDlg_FormClosing(object sender, FormClosingEventArgs e)
        {
            if (_wizard != null)
            {
                if (this.DialogResult == DialogResult.OK)
                {
                    if (!_wizard.Complete())
                    {
                        e.Cancel = true;
                    }
                }
                else if (this.DialogResult == DialogResult.Cancel)
                {
                    if (!_wizard.Cancel())
                    {
                        e.Cancel = true;
                    }
                }
                else
                {
                    e.Cancel = true;
                }
            }
        }
    }
}

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectDlg - ¸´ÖÆ.resx

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,140 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
  <!--
    Microsoft ResX Schema 

    Version 2.0

    The primary goals of this format is to allow a simple XML format
    that is mostly human readable. The generation and parsing of the
    various data types are done through the TypeConverter classes
    associated with the data types.

    Example:

    ... ado.net/XML headers & schema ...
    <resheader name="resmimetype">text/microsoft-resx</resheader>
    <resheader name="version">2.0</resheader>
    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
        <value>[base64 mime encoded serialized .NET Framework object]</value>
    </data>
    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
        <comment>This is a comment</comment>
    </data>

    There are any number of "resheader" rows that contain simple
    name/value pairs.

    Each data row contains a name, and value. The row also contains a
    type or mimetype. Type corresponds to a .NET class that support
    text/value conversion through the TypeConverter architecture.
    Classes that don't support this are serialized and stored with the
    mimetype set.

    The mimetype is used for serialized objects, and tells the
    ResXResourceReader how to depersist the object. This is currently not
    extensible. For a given mimetype the value must be set accordingly:

    Note - application/x-microsoft.net.object.binary.base64 is the format
    that the ResXResourceWriter will generate, however the reader can
    read any of the formats listed below.

    mimetype: application/x-microsoft.net.object.binary.base64
    value   : The object must be serialized with
            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
            : and then encoded with base64 encoding.
    
    mimetype: application/x-microsoft.net.object.soap.base64
    value   : The object must be serialized with
            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
            : and then encoded with base64 encoding.

    mimetype: application/x-microsoft.net.object.bytearray.base64
    value   : The object must be serialized into a byte array
            : using a System.ComponentModel.TypeConverter
            : and then encoded with base64 encoding.
    -->
  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
    <xsd:element name="root" msdata:IsDataSet="true">
      <xsd:complexType>
        <xsd:choice maxOccurs="unbounded">
          <xsd:element name="metadata">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" />
              </xsd:sequence>
              <xsd:attribute name="name" use="required" type="xsd:string" />
              <xsd:attribute name="type" type="xsd:string" />
              <xsd:attribute name="mimetype" type="xsd:string" />
              <xsd:attribute ref="xml:space" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="assembly">
            <xsd:complexType>
              <xsd:attribute name="alias" type="xsd:string" />
              <xsd:attribute name="name" type="xsd:string" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="data">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
              </xsd:sequence>
              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
              <xsd:attribute ref="xml:space" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="resheader">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
              </xsd:sequence>
              <xsd:attribute name="name" type="xsd:string" use="required" />
            </xsd:complexType>
          </xsd:element>
        </xsd:choice>
      </xsd:complexType>
    </xsd:element>
  </xsd:schema>
  <resheader name="resmimetype">
    <value>text/microsoft-resx</value>
  </resheader>
  <resheader name="version">
    <value>2.0</value>
  </resheader>
  <resheader name="reader">
    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <assembly alias="DevExpress.Data.v23.2" name="DevExpress.Data.v23.2, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
  <data name="stepProgressBar1.ItemOptions.Indicator.ActiveStateImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAK4CAAAC77u/
        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ
        LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD
        MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
        Y2l0eTowLjU7fQoJLnN0MXtkaXNwbGF5Om5vbmU7fQoJLnN0MntkaXNwbGF5OmlubGluZTtmaWxsOiMw
        MzlDMjM7fQoJLnN0M3tkaXNwbGF5OmlubGluZTtmaWxsOiNEMTFDMUM7fQoJLnN0NHtkaXNwbGF5Omlu
        bGluZTtmaWxsOiM3MjcyNzI7fQo8L3N0eWxlPg0KICA8ZyBpZD0iTWFya0NvbXBsZXRlIj4NCiAgICA8
        cG9seWdvbiBwb2ludHM9IjI3LDQgMTEsMjAgNSwxNCAyLDE3IDExLDI2IDMwLDcgICIgY2xhc3M9Ikdy
        ZWVuIiAvPg0KICA8L2c+DQo8L3N2Zz4L
</value>
  </data>
</root>

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

@@ -5,12 +5,11 @@
namespace HStation.WinFrmUI
{
    /// <summary>
    /// 
    ///
    /// </summary>
    public class ImportXhsProjectHelper
    {
        private const string _tempFolder = "ImportProjectTemp";//导入项目临时文件夹


        /// <summary>
        /// å¯¼å…¥
@@ -40,7 +39,7 @@

            feedBackProgress?.Invoke(100, 5);

            #endregion
            #endregion ç¬¬ä¸€æ­¥ ä¸´æ—¶æ–‡ä»¶å¤„理（进度5%）

            #region ç¬¬äºŒæ­¥ åŽ‹ç¼©æ–‡ä»¶è§£æž ï¼ˆè¿›åº¦10%）

@@ -65,7 +64,7 @@

            feedBackProgress?.Invoke(100, 10);

            #endregion
            #endregion ç¬¬äºŒæ­¥ åŽ‹ç¼©æ–‡ä»¶è§£æž ï¼ˆè¿›åº¦10%）

            #region ç¬¬ä¸‰æ­¥ è§£æžæ°´åŠ›ç»“构文件 ï¼ˆè¿›åº¦15%）

@@ -105,7 +104,7 @@

            vm.HydroID = hydroId;

            #endregion
            #endregion ç¬¬ä¸‰æ­¥ è§£æžæ°´åŠ›ç»“构文件 ï¼ˆè¿›åº¦15%）

            #region ç¬¬å››æ­¥ åˆ›å»ºé¡¹ç›®ï¼ˆè¿›åº¦ 20%）

@@ -113,7 +112,7 @@

            var bllXhsProjectExtensions = new Lazy<BLL.XhsProjectExtensions>(() => new BLL.XhsProjectExtensions());

            var project = new AddXhsProjectExtensionsInput();
            var project = new Vmo.Xhs.XhsProjectExtensions();
            project.NO = vm.NO;
            project.Name = vm.Name;
            project.Address = vm.Address;
@@ -122,8 +121,8 @@
            project.TagName = vm.TagName;
            project.Description = vm.Description;

            project.SiteList = new List<AddXhsProjectSiteExtensionsInput>() {
                new AddXhsProjectSiteExtensionsInput(){
            project.SiteList = new List<Vmo.Xhs.XhsProjectSite>() {
                new Vmo.Xhs.XhsProjectSite(){
                    Name=vm.Name,
                    Description=vm.Description
                }
@@ -142,7 +141,7 @@

            feedBackProgress?.Invoke(100, 20);

            #endregion
            #endregion ç¬¬å››æ­¥ åˆ›å»ºé¡¹ç›®ï¼ˆè¿›åº¦ 20%）

            #region ç¬¬äº”æ­¥ å…³è”水力结构模型（进度 25%）

@@ -181,7 +180,7 @@

            feedBackProgress?.Invoke(100, 25);

            #endregion
            #endregion ç¬¬äº”æ­¥ å…³è”水力结构模型（进度 25%）

            #region ç¬¬å…­æ­¥ è®¾ç½®åœ°å›¾ä½ç½®ï¼ˆè¿›åº¦ 30%）

@@ -214,10 +213,9 @@
                feedBackMsg?.Invoke("未设置地图位置信息！！！");
            }


            feedBackProgress?.Invoke(100, 30);

            #endregion
            #endregion ç¬¬å…­æ­¥ è®¾ç½®åœ°å›¾ä½ç½®ï¼ˆè¿›åº¦ 30%）

            #region ç¬¬ä¸ƒæ­¥ ä¸Šä¼ Revit模型文件（进度 45%）

@@ -231,7 +229,7 @@
            }

            //var bimfaceId = await Yw.WinFrmUI.BimfaceHelper.UploadFile(rvtFileInfo.FullName);//上传
            var bimfaceId = 10000870453147; //测试用例
            var bimfaceId = 10000872561364; //测试用例
            if (bimfaceId < 1)
            {
                feedBackMsg?.Invoke("Revit模型文件上传失败！！！");
@@ -245,7 +243,7 @@

            feedBackProgress?.Invoke(100, 45);

            #endregion
            #endregion ç¬¬ä¸ƒæ­¥ ä¸Šä¼ Revit模型文件（进度 45%）

            #region ç¬¬å…«æ­¥ ä¿å­˜Bimface文件 ï¼ˆè¿›åº¦ 50%）

@@ -274,7 +272,7 @@

            feedBackProgress?.Invoke(100, 50);

            #endregion
            #endregion ç¬¬å…«æ­¥ ä¿å­˜Bimface文件 ï¼ˆè¿›åº¦ 50%）

            #region ç¬¬ä¹æ­¥ å…³è”Bimface文件（进度 55%）

@@ -299,7 +297,7 @@
            feedBackMsg?.Invoke("Bimface文件关联成功。。。");
            feedBackProgress?.Invoke(100, 55);

            #endregion
            #endregion ç¬¬ä¹æ­¥ å…³è”Bimface文件（进度 55%）

            #region ç¬¬ä¹æ­¥ å‘èµ·bimface转换（进度 80%）

@@ -329,7 +327,7 @@

            feedBackProgress?.Invoke(100, 80);

            #endregion
            #endregion ç¬¬ä¹æ­¥ å‘èµ·bimface转换（进度 80%）

            #region ç¬¬åæ­¥ æ›´æ–°Bimface文件状态（进度 90%）

@@ -348,7 +346,7 @@

            feedBackProgress?.Invoke(100, 90);

            #endregion
            #endregion ç¬¬åæ­¥ æ›´æ–°Bimface文件状态（进度 90%）

            #region ç¬¬åä¸€æ­¥ é¡¹ç›®å‘布（进度 100%）

@@ -368,12 +366,8 @@
            feedBackProgress?.Invoke(100, 100);
            feedBackMsg?.Invoke("项目导入结束。。。");
            return true;
            #endregion



            #endregion ç¬¬åä¸€æ­¥ é¡¹ç›®å‘布（进度 100%）
        }


    }
}
}

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/01-ModelFile/SelectXhsProjectModelFileWizardPage.Designer.cs

@@ -29,22 +29,34 @@
        private void InitializeComponent()
        {
            components = new Container();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
            layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
            btnEditSelectModelFile = new DevExpress.XtraEditors.ButtonEdit();
            dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
            layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
            Root = new DevExpress.XtraLayout.LayoutControlGroup();
            layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
            ((ISupportInitialize)btnEditSelectModelFile.Properties).BeginInit();
            ((ISupportInitialize)dxErrorProvider1).BeginInit();
            ((ISupportInitialize)layoutControl1).BeginInit();
            layoutControl1.SuspendLayout();
            ((ISupportInitialize)btnEditSelectModelFile.Properties).BeginInit();
            ((ISupportInitialize)Root).BeginInit();
            ((ISupportInitialize)layoutControlItem1).BeginInit();
            ((ISupportInitialize)dxErrorProvider1).BeginInit();
            SuspendLayout();
            // 
            // btnEditSelectModelFile
            // 
            btnEditSelectModelFile.EditValue = "";
            btnEditSelectModelFile.Location = new Point(66, 2);
            btnEditSelectModelFile.Name = "btnEditSelectModelFile";
            btnEditSelectModelFile.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton() });
            btnEditSelectModelFile.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
            btnEditSelectModelFile.Size = new Size(249, 20);
            btnEditSelectModelFile.StyleController = layoutControl1;
            btnEditSelectModelFile.TabIndex = 4;
            btnEditSelectModelFile.ButtonClick += btnEditSelectModelFile_ButtonClick;
            // 
            // dxErrorProvider1
            // 
            dxErrorProvider1.ContainerControl = this;
            // 
            // layoutControl1
            // 
@@ -52,61 +64,29 @@
            layoutControl1.Dock = DockStyle.Fill;
            layoutControl1.Location = new Point(0, 0);
            layoutControl1.Name = "layoutControl1";
            layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(1208, 302, 650, 400);
            layoutControl1.Root = Root;
            layoutControl1.Size = new Size(941, 591);
            layoutControl1.TabIndex = 0;
            layoutControl1.Size = new Size(317, 25);
            layoutControl1.TabIndex = 5;
            layoutControl1.Text = "layoutControl1";
            // 
            // btnEditSelectModelFile
            // 
            btnEditSelectModelFile.Location = new Point(30, 232);
            btnEditSelectModelFile.Name = "btnEditSelectModelFile";
            btnEditSelectModelFile.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton() });
            btnEditSelectModelFile.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
            btnEditSelectModelFile.Size = new Size(881, 20);
            btnEditSelectModelFile.StyleController = layoutControl1;
            btnEditSelectModelFile.TabIndex = 4;
            btnEditSelectModelFile.ButtonClick += btnEditSelectModelFile_ButtonClick;
            // 
            // Root
            // 
            Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
            Root.GroupBordersVisible = false;
            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1 });
            Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            Root.Name = "Root";
            columnDefinition1.SizeType = SizeType.Percent;
            columnDefinition1.Width = 100D;
            Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { columnDefinition1 });
            rowDefinition1.Height = 40D;
            rowDefinition1.SizeType = SizeType.Percent;
            rowDefinition2.Height = 65D;
            rowDefinition2.SizeType = SizeType.Absolute;
            rowDefinition3.Height = 60D;
            rowDefinition3.SizeType = SizeType.Percent;
            Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { rowDefinition1, rowDefinition2, rowDefinition3 });
            Root.Size = new Size(941, 591);
            Root.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
            Root.Size = new Size(317, 25);
            Root.TextVisible = false;
            // 
            // layoutControlItem1
            // 
            layoutControlItem1.AppearanceItemCaption.FontSizeDelta = 6;
            layoutControlItem1.AppearanceItemCaption.Options.UseFont = true;
            layoutControlItem1.Control = btnEditSelectModelFile;
            layoutControlItem1.Location = new Point(0, 202);
            layoutControlItem1.Location = new Point(0, 0);
            layoutControlItem1.Name = "layoutControlItem1";
            layoutControlItem1.OptionsTableLayoutItem.RowIndex = 1;
            layoutControlItem1.Padding = new DevExpress.XtraLayout.Utils.Padding(20, 20, 20, 2);
            layoutControlItem1.Size = new Size(921, 65);
            layoutControlItem1.Text = "选择模型文件";
            layoutControlItem1.TextLocation = DevExpress.Utils.Locations.Top;
            layoutControlItem1.TextSize = new Size(0, 0);
            layoutControlItem1.TextVisible = false;
            // 
            // dxErrorProvider1
            // 
            dxErrorProvider1.ContainerControl = this;
            layoutControlItem1.Size = new Size(317, 25);
            layoutControlItem1.Text = "选择文件:";
            layoutControlItem1.TextSize = new Size(52, 14);
            // 
            // SelectXhsProjectModelFileWizardPage
            // 
@@ -114,22 +94,21 @@
            AutoScaleMode = AutoScaleMode.Font;
            Controls.Add(layoutControl1);
            Name = "SelectXhsProjectModelFileWizardPage";
            Size = new Size(941, 591);
            Size = new Size(317, 25);
            ((ISupportInitialize)btnEditSelectModelFile.Properties).EndInit();
            ((ISupportInitialize)dxErrorProvider1).EndInit();
            ((ISupportInitialize)layoutControl1).EndInit();
            layoutControl1.ResumeLayout(false);
            ((ISupportInitialize)btnEditSelectModelFile.Properties).EndInit();
            ((ISupportInitialize)Root).EndInit();
            ((ISupportInitialize)layoutControlItem1).EndInit();
            ((ISupportInitialize)dxErrorProvider1).EndInit();
            ResumeLayout(false);
        }

        #endregion

        private DevExpress.XtraLayout.LayoutControl layoutControl1;
        private DevExpress.XtraEditors.ButtonEdit btnEditSelectModelFile;
        private DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider dxErrorProvider1;
        private DevExpress.XtraLayout.LayoutControl layoutControl1;
        private DevExpress.XtraLayout.LayoutControlGroup Root;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
        private DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider dxErrorProvider1;
    }
}

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/01-ModelFile/SelectXhsProjectModelFileWizardPage.cs

@@ -8,7 +8,7 @@
        public SelectXhsProjectModelFileWizardPage()
        {
            InitializeComponent();
            this.layoutControl1.SetupLayoutControl();
            //   this.layoutControl1.SetupLayoutControl();
        }

        /// <summary>
@@ -31,7 +31,6 @@
            _vm = t;
            _isInitialize = true;
        }


        /// <summary>
        /// å…è®¸ä¸Šä¸€æ­¥
@@ -111,7 +110,6 @@
            return false;
        }


        //选择模型文件
        private void btnEditSelectModelFile_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
        {
@@ -125,7 +123,5 @@
                this.btnEditSelectModelFile.EditValue = fileName;
            }
        }


    }
}
}

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

@@ -30,6 +30,7 @@
        {
            components = new Container();
            layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
            setFlagsEditCtrl1 = new SetFlagsEditCtrl();
            txtDescription = new DevExpress.XtraEditors.MemoEdit();
            txtTagNme = new DevExpress.XtraEditors.TextEdit();
            txtAddress = new DevExpress.XtraEditors.TextEdit();
@@ -43,9 +44,10 @@
            layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
            dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
            setFlagsEditCtrl1 = new SetFlagsEditCtrl();
            layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
            dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
            btnEditSelectModelFile = new DevExpress.XtraEditors.ButtonEdit();
            layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
            ((ISupportInitialize)layoutControl1).BeginInit();
            layoutControl1.SuspendLayout();
            ((ISupportInitialize)txtDescription.Properties).BeginInit();
@@ -61,8 +63,10 @@
            ((ISupportInitialize)layoutControlItem4).BeginInit();
            ((ISupportInitialize)layoutControlItem6).BeginInit();
            ((ISupportInitialize)layoutControlItem7).BeginInit();
            ((ISupportInitialize)dxErrorProvider1).BeginInit();
            ((ISupportInitialize)layoutControlItem5).BeginInit();
            ((ISupportInitialize)dxErrorProvider1).BeginInit();
            ((ISupportInitialize)btnEditSelectModelFile.Properties).BeginInit();
            ((ISupportInitialize)layoutControlItem8).BeginInit();
            SuspendLayout();
            // 
            // layoutControl1
@@ -74,6 +78,7 @@
            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);
            layoutControl1.Name = "layoutControl1";
@@ -83,53 +88,60 @@
            layoutControl1.TabIndex = 0;
            layoutControl1.Text = "layoutControl1";
            // 
            // setFlagsEditCtrl1
            // 
            setFlagsEditCtrl1.Location = new Point(113, 60);
            setFlagsEditCtrl1.Name = "setFlagsEditCtrl1";
            setFlagsEditCtrl1.Size = new Size(314, 20);
            setFlagsEditCtrl1.TabIndex = 5;
            // 
            // txtDescription
            // 
            txtDescription.Location = new Point(67, 84);
            txtDescription.Location = new Point(113, 108);
            txtDescription.Name = "txtDescription";
            txtDescription.Size = new Size(780, 368);
            txtDescription.Size = new Size(734, 344);
            txtDescription.StyleController = layoutControl1;
            txtDescription.TabIndex = 10;
            txtDescription.TabIndex = 8;
            // 
            // txtTagNme
            // 
            txtTagNme.Location = new Point(486, 60);
            txtTagNme.Location = new Point(532, 60);
            txtTagNme.Name = "txtTagNme";
            txtTagNme.Size = new Size(361, 20);
            txtTagNme.Size = new Size(315, 20);
            txtTagNme.StyleController = layoutControl1;
            txtTagNme.TabIndex = 9;
            txtTagNme.TabIndex = 6;
            // 
            // txtAddress
            // 
            txtAddress.Location = new Point(486, 36);
            txtAddress.Location = new Point(532, 36);
            txtAddress.Name = "txtAddress";
            txtAddress.Size = new Size(361, 20);
            txtAddress.Size = new Size(315, 20);
            txtAddress.StyleController = layoutControl1;
            txtAddress.TabIndex = 7;
            txtAddress.TabIndex = 4;
            // 
            // txtCustomer
            // 
            txtCustomer.Location = new Point(67, 36);
            txtCustomer.Location = new Point(113, 36);
            txtCustomer.Name = "txtCustomer";
            txtCustomer.Size = new Size(360, 20);
            txtCustomer.Size = new Size(314, 20);
            txtCustomer.StyleController = layoutControl1;
            txtCustomer.TabIndex = 6;
            txtCustomer.TabIndex = 3;
            // 
            // txtName
            // 
            txtName.Location = new Point(486, 12);
            txtName.Location = new Point(532, 12);
            txtName.Name = "txtName";
            txtName.Size = new Size(361, 20);
            txtName.Size = new Size(315, 20);
            txtName.StyleController = layoutControl1;
            txtName.TabIndex = 5;
            txtName.TabIndex = 2;
            // 
            // txtNO
            // 
            txtNO.Location = new Point(67, 12);
            txtNO.Location = new Point(113, 12);
            txtNO.Name = "txtNO";
            txtNO.Size = new Size(360, 20);
            txtNO.Size = new Size(314, 20);
            txtNO.StyleController = layoutControl1;
            txtNO.TabIndex = 4;
            txtNO.TabIndex = 0;
            // 
            // Root
            // 
@@ -137,7 +149,7 @@
            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 });
            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem2, layoutControlItem3, layoutControlItem4, layoutControlItem6, layoutControlItem7, layoutControlItem5, layoutControlItem8 });
            Root.Name = "Root";
            Root.Size = new Size(859, 464);
            Root.TextVisible = false;
@@ -149,7 +161,7 @@
            layoutControlItem1.Name = "layoutControlItem1";
            layoutControlItem1.Size = new Size(419, 24);
            layoutControlItem1.Text = "编号：";
            layoutControlItem1.TextSize = new Size(43, 14);
            layoutControlItem1.TextSize = new Size(89, 14);
            // 
            // layoutControlItem2
            // 
@@ -159,7 +171,7 @@
            layoutControlItem2.Name = "layoutControlItem2";
            layoutControlItem2.Size = new Size(420, 24);
            layoutControlItem2.Text = "<color=red>*</color>名称：";
            layoutControlItem2.TextSize = new Size(43, 14);
            layoutControlItem2.TextSize = new Size(89, 14);
            // 
            // layoutControlItem3
            // 
@@ -168,7 +180,7 @@
            layoutControlItem3.Name = "layoutControlItem3";
            layoutControlItem3.Size = new Size(419, 24);
            layoutControlItem3.Text = "客户：";
            layoutControlItem3.TextSize = new Size(43, 14);
            layoutControlItem3.TextSize = new Size(89, 14);
            // 
            // layoutControlItem4
            // 
@@ -177,7 +189,7 @@
            layoutControlItem4.Name = "layoutControlItem4";
            layoutControlItem4.Size = new Size(420, 24);
            layoutControlItem4.Text = "地址：";
            layoutControlItem4.TextSize = new Size(43, 14);
            layoutControlItem4.TextSize = new Size(89, 14);
            // 
            // layoutControlItem6
            // 
@@ -186,27 +198,16 @@
            layoutControlItem6.Name = "layoutControlItem6";
            layoutControlItem6.Size = new Size(420, 24);
            layoutControlItem6.Text = "标志：";
            layoutControlItem6.TextSize = new Size(43, 14);
            layoutControlItem6.TextSize = new Size(89, 14);
            // 
            // layoutControlItem7
            // 
            layoutControlItem7.Control = txtDescription;
            layoutControlItem7.Location = new Point(0, 72);
            layoutControlItem7.Location = new Point(0, 96);
            layoutControlItem7.Name = "layoutControlItem7";
            layoutControlItem7.Size = new Size(839, 372);
            layoutControlItem7.Size = new Size(839, 348);
            layoutControlItem7.Text = "说明";
            layoutControlItem7.TextSize = new Size(43, 14);
            // 
            // dxErrorProvider1
            // 
            dxErrorProvider1.ContainerControl = this;
            // 
            // setFlagsEditCtrl1
            // 
            setFlagsEditCtrl1.Location = new Point(67, 60);
            setFlagsEditCtrl1.Name = "setFlagsEditCtrl1";
            setFlagsEditCtrl1.Size = new Size(360, 20);
            setFlagsEditCtrl1.TabIndex = 11;
            layoutControlItem7.TextSize = new Size(89, 14);
            // 
            // layoutControlItem5
            // 
@@ -215,7 +216,33 @@
            layoutControlItem5.Name = "layoutControlItem5";
            layoutControlItem5.Size = new Size(419, 24);
            layoutControlItem5.Text = "标签：";
            layoutControlItem5.TextSize = new Size(43, 14);
            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.Name = "layoutControlItem8";
            layoutControlItem8.Size = new Size(839, 24);
            layoutControlItem8.Text = "选择模型文件:";
            layoutControlItem8.TextSize = new Size(89, 17);
            // 
            // InputXhsProjectInfoWizardPage
            // 
@@ -239,8 +266,10 @@
            ((ISupportInitialize)layoutControlItem4).EndInit();
            ((ISupportInitialize)layoutControlItem6).EndInit();
            ((ISupportInitialize)layoutControlItem7).EndInit();
            ((ISupportInitialize)dxErrorProvider1).EndInit();
            ((ISupportInitialize)layoutControlItem5).EndInit();
            ((ISupportInitialize)dxErrorProvider1).EndInit();
            ((ISupportInitialize)btnEditSelectModelFile.Properties).EndInit();
            ((ISupportInitialize)layoutControlItem8).EndInit();
            ResumeLayout(false);
        }

@@ -263,5 +292,7 @@
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
        private SetFlagsEditCtrl setFlagsEditCtrl1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
        private DevExpress.XtraEditors.ButtonEdit btnEditSelectModelFile;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
    }
}

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

@@ -39,7 +39,7 @@
        {
            get
            {
                return true;
                return false;
            }
        }

@@ -128,5 +128,17 @@
            return false;
        }

        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)
            {
                var fileName = dlg.FileName;
                this.btnEditSelectModelFile.EditValue = fileName;
            }
        }
    }
}
}

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

@@ -29,7 +29,7 @@
        private void InitializeComponent()
        {
            components = new Container();
            ComponentResourceManager resources = new ComponentResourceManager(typeof(XhsSchemeMultiMgrPage));
            ComponentResourceManager resources = new ComponentResourceManager(typeof(XhsProjectMgrPage));
            ribbonControl1 = new DevExpress.XtraBars.Ribbon.RibbonControl();
            barBtnAdd = new DevExpress.XtraBars.BarButtonItem();
            barBtnEdit = new DevExpress.XtraBars.BarButtonItem();
@@ -94,6 +94,7 @@
            barBtnAdd.Id = 1;
            barBtnAdd.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnAdd.ImageOptions.SvgImage");
            barBtnAdd.Name = "barBtnAdd";
            barBtnAdd.ItemClick += barBtnAdd_ItemClick;
            // 
            // barBtnEdit
            // 
@@ -101,6 +102,7 @@
            barBtnEdit.Id = 2;
            barBtnEdit.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnEdit.ImageOptions.SvgImage");
            barBtnEdit.Name = "barBtnEdit";
            barBtnEdit.ItemClick += barBtnEdit_ItemClick;
            // 
            // barBtnDelete
            // 
@@ -108,6 +110,7 @@
            barBtnDelete.Id = 3;
            barBtnDelete.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnDelete.ImageOptions.SvgImage");
            barBtnDelete.Name = "barBtnDelete";
            barBtnDelete.ItemClick += barBtnDelete_ItemClick;
            // 
            // barBtnInfo
            // 

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

@@ -1,5 +1,5 @@
using DevExpress.Utils;
using NetTaste;
using HStation.WinFrmUI.Xhs;

namespace HStation.WinFrmUI
{
@@ -16,14 +16,16 @@

        private List<XhsProjectMgrViewModel> _allProjectList = null;

        private BLL.XhsProject _Bll = null;

        /// <summary>
        /// åˆå§‹åŒ–数据源
        /// </summary>
        public override async void InitialDataSource()
        {
            base.InitialDataSource();

            var allProjectList = await new BLL.XhsProject().GetAll();
            _Bll = new BLL.XhsProject();
            var allProjectList = await _Bll.GetAll();
            _allProjectList = new List<XhsProjectMgrViewModel>();
            if (allProjectList != null && allProjectList.Count > 0)
            {
@@ -44,7 +46,7 @@
        //查看bimface模型
        private async void barBtnViewBimface_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        {
            var vm = this.treeList1.GetCurrentViewModel(_allProjectList);
            var vm = GetCurrentViewModel();
            if (vm == null)
            {
                return;
@@ -115,12 +117,33 @@
            var vm = this.treeList1.GetCurrentViewModel(_allProjectList);
            if (vm == null)
            {
                Yw.WinFrmUI.MessageBoxHelper.ShowInfo("请选择数据行");
                Yw.WinFrmUI.MessageBoxHelper.ShowInfo("请选择数据行!");
                return null;
            }
            return vm;
        }

        #endregion å½“前

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

        //添加
        private void barBtnAdd_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        {
            var dlg = new AddProjectDlg();
            dlg.ShowDialog();
        }

        //编辑
        private void barBtnEdit_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        {
        }

        //删除
        private void barBtnDelete_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        {
        }

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

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/04-dlg/AddProjectDlg.Designer.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,276 @@
namespace HStation.WinFrmUI.Xhs
{
    partial class AddProjectDlg
    {
        /// <summary>
        /// Required designer variable.
        /// </summary>
        private System.ComponentModel.IContainer components = null;

        /// <summary>
        /// Clean up any resources being used.
        /// </summary>
        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
        protected override void Dispose(bool disposing)
        {
            if (disposing && (components != null))
            {
                components.Dispose();
            }
            base.Dispose(disposing);
        }

        #region Windows Form Designer generated code

        /// <summary>
        /// Required method for Designer support - do not modify
        /// the contents of this method with the code editor.
        /// </summary>
        private void InitializeComponent()
        {
            layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
            Root = new DevExpress.XtraLayout.LayoutControlGroup();
            TextProjectName = new DevExpress.XtraEditors.TextEdit();
            layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            TextAdress = new DevExpress.XtraEditors.TextEdit();
            layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            TextCustomerName = new DevExpress.XtraEditors.TextEdit();
            layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
            TextTagName = new DevExpress.XtraEditors.TextEdit();
            layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
            BtnCancel = new DevExpress.XtraEditors.SimpleButton();
            layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
            BtnOk = new DevExpress.XtraEditors.SimpleButton();
            layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
            TextDescription = new DevExpress.XtraEditors.MemoEdit();
            layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
            emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
            ((ISupportInitialize)layoutControl1).BeginInit();
            layoutControl1.SuspendLayout();
            ((ISupportInitialize)Root).BeginInit();
            ((ISupportInitialize)TextProjectName.Properties).BeginInit();
            ((ISupportInitialize)layoutControlItem1).BeginInit();
            ((ISupportInitialize)TextAdress.Properties).BeginInit();
            ((ISupportInitialize)layoutControlItem2).BeginInit();
            ((ISupportInitialize)TextCustomerName.Properties).BeginInit();
            ((ISupportInitialize)layoutControlItem3).BeginInit();
            ((ISupportInitialize)TextTagName.Properties).BeginInit();
            ((ISupportInitialize)layoutControlItem4).BeginInit();
            ((ISupportInitialize)layoutControlItem6).BeginInit();
            ((ISupportInitialize)layoutControlItem7).BeginInit();
            ((ISupportInitialize)TextDescription.Properties).BeginInit();
            ((ISupportInitialize)layoutControlItem5).BeginInit();
            ((ISupportInitialize)emptySpaceItem1).BeginInit();
            SuspendLayout();
            // 
            // layoutControl1
            // 
            layoutControl1.Controls.Add(TextProjectName);
            layoutControl1.Controls.Add(TextAdress);
            layoutControl1.Controls.Add(TextCustomerName);
            layoutControl1.Controls.Add(TextTagName);
            layoutControl1.Controls.Add(BtnCancel);
            layoutControl1.Controls.Add(BtnOk);
            layoutControl1.Controls.Add(TextDescription);
            layoutControl1.Dock = DockStyle.Fill;
            layoutControl1.Location = new Point(0, 0);
            layoutControl1.Name = "layoutControl1";
            layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(982, 129, 650, 400);
            layoutControl1.Root = Root;
            layoutControl1.Size = new Size(641, 417);
            layoutControl1.TabIndex = 0;
            layoutControl1.Text = "layoutControl1";
            // 
            // Root
            // 
            Root.AppearanceItemCaption.Options.UseTextOptions = true;
            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, layoutControlItem5, emptySpaceItem1, layoutControlItem7 });
            Root.Name = "Root";
            Root.Size = new Size(641, 417);
            Root.TextVisible = false;
            // 
            // TextProjectName
            // 
            TextProjectName.Location = new Point(76, 12);
            TextProjectName.Name = "TextProjectName";
            TextProjectName.Size = new Size(553, 20);
            TextProjectName.StyleController = layoutControl1;
            TextProjectName.TabIndex = 0;
            // 
            // layoutControlItem1
            // 
            layoutControlItem1.Control = TextProjectName;
            layoutControlItem1.Location = new Point(0, 0);
            layoutControlItem1.Name = "layoutControlItem1";
            layoutControlItem1.Size = new Size(621, 24);
            layoutControlItem1.Text = "项目名称:";
            layoutControlItem1.TextSize = new Size(52, 14);
            // 
            // TextAdress
            // 
            TextAdress.Location = new Point(76, 36);
            TextAdress.Name = "TextAdress";
            TextAdress.Size = new Size(553, 20);
            TextAdress.StyleController = layoutControl1;
            TextAdress.TabIndex = 2;
            // 
            // layoutControlItem2
            // 
            layoutControlItem2.Control = TextAdress;
            layoutControlItem2.Location = new Point(0, 24);
            layoutControlItem2.Name = "layoutControlItem2";
            layoutControlItem2.Size = new Size(621, 24);
            layoutControlItem2.Text = "详细地址:";
            layoutControlItem2.TextSize = new Size(52, 14);
            // 
            // TextCustomerName
            // 
            TextCustomerName.Location = new Point(76, 60);
            TextCustomerName.Name = "TextCustomerName";
            TextCustomerName.Size = new Size(553, 20);
            TextCustomerName.StyleController = layoutControl1;
            TextCustomerName.TabIndex = 3;
            // 
            // layoutControlItem3
            // 
            layoutControlItem3.Control = TextCustomerName;
            layoutControlItem3.Location = new Point(0, 48);
            layoutControlItem3.Name = "layoutControlItem3";
            layoutControlItem3.Size = new Size(621, 24);
            layoutControlItem3.Text = "客户名称:";
            layoutControlItem3.TextSize = new Size(52, 14);
            // 
            // TextTagName
            // 
            TextTagName.Location = new Point(76, 84);
            TextTagName.Name = "TextTagName";
            TextTagName.Size = new Size(553, 20);
            TextTagName.StyleController = layoutControl1;
            TextTagName.TabIndex = 4;
            // 
            // layoutControlItem4
            // 
            layoutControlItem4.Control = TextTagName;
            layoutControlItem4.Location = new Point(0, 72);
            layoutControlItem4.Name = "layoutControlItem4";
            layoutControlItem4.Size = new Size(621, 24);
            layoutControlItem4.Text = "标签:";
            layoutControlItem4.TextSize = new Size(52, 14);
            // 
            // BtnCancel
            // 
            BtnCancel.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
            BtnCancel.Appearance.Options.UseBackColor = true;
            BtnCancel.Location = new Point(544, 383);
            BtnCancel.Name = "BtnCancel";
            BtnCancel.Size = new Size(85, 22);
            BtnCancel.StyleController = layoutControl1;
            BtnCancel.TabIndex = 7;
            BtnCancel.Text = "取消";
            // 
            // layoutControlItem6
            // 
            layoutControlItem6.Control = BtnCancel;
            layoutControlItem6.Location = new Point(532, 371);
            layoutControlItem6.Name = "layoutControlItem6";
            layoutControlItem6.Size = new Size(89, 26);
            layoutControlItem6.TextSize = new Size(0, 0);
            layoutControlItem6.TextVisible = false;
            // 
            // BtnOk
            // 
            BtnOk.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
            BtnOk.Appearance.Options.UseBackColor = true;
            BtnOk.Location = new Point(455, 383);
            BtnOk.Name = "BtnOk";
            BtnOk.Size = new Size(85, 22);
            BtnOk.StyleController = layoutControl1;
            BtnOk.TabIndex = 6;
            BtnOk.Text = "确定";
            BtnOk.Click += BtnOk_Click;
            // 
            // layoutControlItem7
            // 
            layoutControlItem7.Control = BtnOk;
            layoutControlItem7.Location = new Point(443, 371);
            layoutControlItem7.Name = "layoutControlItem7";
            layoutControlItem7.Size = new Size(89, 26);
            layoutControlItem7.TextSize = new Size(0, 0);
            layoutControlItem7.TextVisible = false;
            // 
            // TextDescription
            // 
            TextDescription.Location = new Point(76, 108);
            TextDescription.Name = "TextDescription";
            TextDescription.Size = new Size(553, 271);
            TextDescription.StyleController = layoutControl1;
            TextDescription.TabIndex = 5;
            // 
            // layoutControlItem5
            // 
            layoutControlItem5.Control = TextDescription;
            layoutControlItem5.Location = new Point(0, 96);
            layoutControlItem5.Name = "layoutControlItem5";
            layoutControlItem5.Size = new Size(621, 275);
            layoutControlItem5.Text = "说明:";
            layoutControlItem5.TextSize = new Size(52, 14);
            // 
            // emptySpaceItem1
            // 
            emptySpaceItem1.AllowHotTrack = false;
            emptySpaceItem1.Location = new Point(0, 371);
            emptySpaceItem1.Name = "emptySpaceItem1";
            emptySpaceItem1.Size = new Size(443, 26);
            emptySpaceItem1.TextSize = new Size(0, 0);
            // 
            // AddProjectDlg
            // 
            AutoScaleDimensions = new SizeF(7F, 14F);
            AutoScaleMode = AutoScaleMode.Font;
            ClientSize = new Size(641, 417);
            Controls.Add(layoutControl1);
            Name = "AddProjectDlg";
            Text = "添加项目";
            ((ISupportInitialize)layoutControl1).EndInit();
            layoutControl1.ResumeLayout(false);
            ((ISupportInitialize)Root).EndInit();
            ((ISupportInitialize)TextProjectName.Properties).EndInit();
            ((ISupportInitialize)layoutControlItem1).EndInit();
            ((ISupportInitialize)TextAdress.Properties).EndInit();
            ((ISupportInitialize)layoutControlItem2).EndInit();
            ((ISupportInitialize)TextCustomerName.Properties).EndInit();
            ((ISupportInitialize)layoutControlItem3).EndInit();
            ((ISupportInitialize)TextTagName.Properties).EndInit();
            ((ISupportInitialize)layoutControlItem4).EndInit();
            ((ISupportInitialize)layoutControlItem6).EndInit();
            ((ISupportInitialize)layoutControlItem7).EndInit();
            ((ISupportInitialize)TextDescription.Properties).EndInit();
            ((ISupportInitialize)layoutControlItem5).EndInit();
            ((ISupportInitialize)emptySpaceItem1).EndInit();
            ResumeLayout(false);
        }

        #endregion

        private DevExpress.XtraLayout.LayoutControl layoutControl1;
        private DevExpress.XtraEditors.TextEdit TextProjectName;
        private DevExpress.XtraEditors.TextEdit TextAdress;
        private DevExpress.XtraEditors.TextEdit TextCustomerName;
        private DevExpress.XtraEditors.TextEdit TextTagName;
        private DevExpress.XtraLayout.LayoutControlGroup Root;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
        private DevExpress.XtraEditors.SimpleButton BtnCancel;
        private DevExpress.XtraEditors.SimpleButton BtnOk;
        private DevExpress.XtraEditors.MemoEdit TextDescription;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
        private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
    }
}

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/04-dlg/AddProjectDlg.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,37 @@
namespace HStation.WinFrmUI.Xhs
{
    public partial class AddProjectDlg : DevExpress.XtraEditors.XtraForm
    {
        public AddProjectDlg()
        {
            InitializeComponent();
        }

        //数据验证
        private bool Valid()
        {
            return false;
        }

        //确定
        private async void BtnOk_Click(object sender, EventArgs e)
        {
            if (!Valid())
                return;
            var bll = new BLL.XhsProjectExtensions();
            var all = await bll.GetAll();
            await bll.Insert(new Vmo.Xhs.XhsProjectExtensions
            {
                Address = "详细地址",
                SiteList = new List<Vmo.Xhs.XhsProjectSite>()
                {
                     new Vmo.Xhs.XhsProjectSite
                     {
                         Name ="测试名称",
                         Description ="测试说明"
                     }
                }
            });
        }
    }
}

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/04-dlg/AddProjectDlg.resx

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
  <!--
    Microsoft ResX Schema 

    Version 2.0

    The primary goals of this format is to allow a simple XML format
    that is mostly human readable. The generation and parsing of the
    various data types are done through the TypeConverter classes
    associated with the data types.

    Example:

    ... ado.net/XML headers & schema ...
    <resheader name="resmimetype">text/microsoft-resx</resheader>
    <resheader name="version">2.0</resheader>
    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
        <value>[base64 mime encoded serialized .NET Framework object]</value>
    </data>
    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
        <comment>This is a comment</comment>
    </data>

    There are any number of "resheader" rows that contain simple
    name/value pairs.

    Each data row contains a name, and value. The row also contains a
    type or mimetype. Type corresponds to a .NET class that support
    text/value conversion through the TypeConverter architecture.
    Classes that don't support this are serialized and stored with the
    mimetype set.

    The mimetype is used for serialized objects, and tells the
    ResXResourceReader how to depersist the object. This is currently not
    extensible. For a given mimetype the value must be set accordingly:

    Note - application/x-microsoft.net.object.binary.base64 is the format
    that the ResXResourceWriter will generate, however the reader can
    read any of the formats listed below.

    mimetype: application/x-microsoft.net.object.binary.base64
    value   : The object must be serialized with
            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
            : and then encoded with base64 encoding.
    
    mimetype: application/x-microsoft.net.object.soap.base64
    value   : The object must be serialized with
            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
            : and then encoded with base64 encoding.

    mimetype: application/x-microsoft.net.object.bytearray.base64
    value   : The object must be serialized into a byte array
            : using a System.ComponentModel.TypeConverter
            : and then encoded with base64 encoding.
    -->
  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
    <xsd:element name="root" msdata:IsDataSet="true">
      <xsd:complexType>
        <xsd:choice maxOccurs="unbounded">
          <xsd:element name="metadata">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" />
              </xsd:sequence>
              <xsd:attribute name="name" use="required" type="xsd:string" />
              <xsd:attribute name="type" type="xsd:string" />
              <xsd:attribute name="mimetype" type="xsd:string" />
              <xsd:attribute ref="xml:space" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="assembly">
            <xsd:complexType>
              <xsd:attribute name="alias" type="xsd:string" />
              <xsd:attribute name="name" type="xsd:string" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="data">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
              </xsd:sequence>
              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
              <xsd:attribute ref="xml:space" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="resheader">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
              </xsd:sequence>
              <xsd:attribute name="name" type="xsd:string" use="required" />
            </xsd:complexType>
          </xsd:element>
        </xsd:choice>
      </xsd:complexType>
    </xsd:element>
  </xsd:schema>
  <resheader name="resmimetype">
    <value>text/microsoft-resx</value>
  </resheader>
  <resheader name="version">
    <value>2.0</value>
  </resheader>
  <resheader name="reader">
    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
</root>

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

@@ -19,6 +19,15 @@
  </ItemGroup>

  <ItemGroup>
    <Compile Remove="02-project\01-import\00-core\ImportXhsProjectDlg.cs" />
    <Compile Remove="02-project\01-import\00-core\ImportXhsProjectDlg.Designer.cs" />
  </ItemGroup>

  <ItemGroup>
    <EmbeddedResource Remove="02-project\01-import\00-core\ImportXhsProjectDlg.resx" />
  </ItemGroup>

  <ItemGroup>
    <None Remove="map\gaode\html\ViewProjectList.html" />
    <None Remove="map\gaode\img\xhs_project.png" />
    <None Remove="map\gaode\js\xhs_base64.js" />
@@ -43,8 +52,8 @@
  </ItemGroup>

  <ItemGroup>
    <Folder Include="00-core\" />
    <Folder Include="map\gaode\css\" />
    <Folder Include="00-core\" />
  </ItemGroup>

  <ItemGroup>
@@ -57,8 +66,8 @@
  </ItemGroup>

  <ItemGroup>
    <Compile Update="01-home\HomeXhsProjectPage.cs">
      <SubType>UserControl</SubType>
    <Compile Update="02-project\01-import\00-core\ImportXhsProjectDlg - å¤åˆ¶.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-scheme\XhsSchemeMultiMgrPage.cs">
      <SubType>UserControl</SubType>

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

@@ -10,11 +10,11 @@
    <Compile Update="01-home\03-property\HomeXhsProjectPropertyCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="01-home\HomeXhsProjectPage_Bak.cs">
    <Compile Update="01-home\HomeXhsProjectPage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="02-project\01-import\00-core\ImportXhsProjectDlg.cs">
      <SubType>Form</SubType>
    <Compile Update="01-home\HomeXhsProjectPage_Bak.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="02-project\01-import\01-ModelFile\SelectXhsProjectModelFileWizardPage.cs">
      <SubType>UserControl</SubType>
@@ -37,6 +37,9 @@
    <Compile Update="02-project\03-mgr\XhsProjectMgrPage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="02-project\04-dlg\AddProjectDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-scheme\XhsSchemeMgrListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>

 WinFrmUI/Yw.WinFrmUI.Core/04-property/CustomUITypenNoneEditor.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,21 @@
namespace Yw.WinFrmUI
{
    /// <summary>
    /// åŠŸèƒ½ï¼ˆè®©é›†åˆä¸æ˜¾ç¤ºç¼–辑按钮）
    /// ä½¿ç”¨æ–¹æ³•
    /// [EditorAttribute(typeof(CustomUITypenNoneEditor), typeof(System.Drawing.Design.UITypeEditor))]
    /// </summary>
    public class CustomUITypenNoneEditor : System.Drawing.Design.UITypeEditor
    {
        /// <summary>
        /// 
        /// </summary>
        public override System.Drawing.Design.UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context)
        {
            return System.Drawing.Design.UITypeEditorEditStyle.None;
        }
    }



}

 WinFrmUI/Yw.WinFrmUI.Core/04-property/DisplayUnitAttribute.cs

 WinFrmUI/Yw.WinFrmUI.Core/04-property/EnumPropertyConverter.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,149 @@
namespace Yw.WinFrmUI
{
    /// <summary>
    /// æžšä¸¾åœ¨propertyGrid中的显示
    /// </summary>
    public class EnumPropertyConverter : ExpandableObjectConverter
    {
        /// <summary>  
        /// æž„造函数  
        /// </summary>  
        public EnumPropertyConverter()
        {
            _dict = new Dictionary<object, string>();
        }

        private Dictionary<object, string> _dict;//枚举项集合

        /// <summary>  
        /// åŠ è½½æžšä¸¾é¡¹é›†åˆ  
        /// </summary>  
        private void LoadDict(ITypeDescriptorContext context)
        {
            _dict = GetEnumValueDispDict(context.PropertyDescriptor.PropertyType);
        }

        /// <summary>  
        /// æ˜¯å¦å¯ä»Žæ¥æºè½¬æ¢  
        /// </summary>  
        public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
        {
            if (sourceType == typeof(string))
            {
                return true;
            }

            return base.CanConvertFrom(context, sourceType);
        }

        /// <summary>  
        /// ä»Žæ¥æºè½¬æ¢  
        /// </summary>  
        public override object ConvertFrom(ITypeDescriptorContext context, System.Globalization.CultureInfo culture, object value)
        {
            if (value is string)
            {
                //如果是枚举  
                if (context.PropertyDescriptor.PropertyType.IsEnum)
                {
                    if (_dict.Count <= 0)
                        LoadDict(context);
                    if (_dict.Values.Contains(value.ToString()))
                    {
                        foreach (object obj in _dict.Keys)
                        {
                            if (_dict[obj] == value.ToString())
                            {
                                return obj;
                            }
                        }
                    }
                }
            }

            return base.ConvertFrom(context, culture, value);
        }

        /// <summary>  
        /// æ˜¯å¦å¯è½¬æ¢  
        /// </summary>  
        public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
        {
            return true;
        }

        /// <summary>
        /// 
        /// </summary>
        public override bool GetStandardValuesSupported(ITypeDescriptorContext context)
        {
            return true;
        }

        /// <summary>
        /// 
        /// </summary>
        public override bool GetStandardValuesExclusive(ITypeDescriptorContext context)
        {
            return true;
        }

        /// <summary>
        /// 
        /// </summary>
        public override StandardValuesCollection GetStandardValues(ITypeDescriptorContext context)
        {
            if (_dict == null || _dict.Count <= 0)
                LoadDict(context);

            StandardValuesCollection vals = new TypeConverter.StandardValuesCollection(_dict.Keys);

            return vals;
        }

        /// <summary>
        /// 
        /// </summary>
        public override object ConvertTo(ITypeDescriptorContext context, System.Globalization.CultureInfo culture, object value, Type destinationType)
        {
            if (_dict.Count <= 0)
                LoadDict(context);

            foreach (object key in _dict.Keys)
            {
                if (key.ToString() == value.ToString() || _dict[key] == value.ToString())
                {
                    return _dict[key].ToString();
                }
            }

            return base.ConvertTo(context, culture, value, destinationType);
        }

        /// <summary>  
        /// è®°è½½æžšä¸¾çš„值+Display  
        /// </summary>  
        /// <param name="enumType"></param>  
        /// <returns></returns>  
        public Dictionary<object, string> GetEnumValueDispDict(Type enumType)
        {
            Dictionary<object, string> dict = new Dictionary<object, string>();
            FieldInfo[] fieldinfos = enumType.GetFields();
            foreach (FieldInfo field in fieldinfos)
            {
                if (field.FieldType.IsEnum)
                {
                    Object[] objs = field.GetCustomAttributes(typeof(DisplayAttribute), false);
                    if (objs.Length > 0)
                    {
                        dict.Add(Enum.Parse(enumType, field.Name), ((DisplayAttribute)objs[0]).Name);
                    }
                }

            }

            return dict;
        }

    }
}

 WinFrmUI/Yw.WinFrmUI.Core/04-property/HideImageSubProConverter.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,16 @@
namespace Yw.WinFrmUI
{
    /// <summary>
    /// éšè—å›¾ç‰‡çš„附属属性（propertyGrid中使用）
    /// </summary>
    public class HideImageSubProConverter : ImageConverter
    {
        /// <summary>
        /// 
        /// </summary>
        public override PropertyDescriptorCollection GetProperties(ITypeDescriptorContext context, object value, Attribute[] attributes)
        {
            return new PropertyDescriptorCollection(null);
        }
    }
}

 WinFrmUI/Yw.WinFrmUI.Core/04-property/MultiTextAttribute.cs

 WinFrmUI/Yw.WinFrmUI.Core/04-property/PropertySorter.cs

 WinFrmUI/Yw.WinFrmUI.Core/04-property/ShowEditorAttribute.cs

 WinFrmUI/Yw.WinFrmUI.Core/GlobalUsings.cs

@@ -15,4 +15,6 @@
global using System.Collections;
global using System.ComponentModel;
global using System.Runtime.InteropServices;
global using Yw.WinFrmUI.Page;
global using Yw.WinFrmUI.Page;
global using System.ComponentModel.DataAnnotations;
global using System.Reflection;

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/02-node/HydroElbowPropertyViewModel.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,88 @@
namespace Yw.WinFrmUI
{
    /// <summary>
    /// å¼¯å¤´å±žæ€§è§†å›¾
    /// </summary>
    public class HydroElbowPropertyViewModel : HydroParterPropertyViewModel, IHydroNodePropertyViewModel
    {
        /// <summary>
        /// 
        /// </summary>
        public HydroElbowPropertyViewModel() { }

        /// <summary>
        /// 
        /// </summary>
        public HydroElbowPropertyViewModel(Yw.Model.HydroElbowInfo rhs) : base(rhs)
        {
            this.Quality = rhs.Quality;
            this.Elev = rhs.Elev;
            this.Demand = rhs.Demand;
            this.DemandPattern = rhs.DemandPattern;
        }


        /// <summary>
        /// åˆå§‹æ°´è´¨
        /// </summary>
        [Category("数据")]
        [DisplayName("初始水质")]
        [PropertyOrder(11)]
        [Browsable(true)]
        public double Quality { get; set; }

        /// <summary>
        /// æ ‡é«˜/高程
        /// </summary>
        [Category("数据")]
        [DisplayName("标高")]
        [PropertyOrder(13)]
        [Browsable(true)]
        public double Elev { get; set; }

        /// <summary>
        /// éœ€æ°´é‡
        /// </summary>
        [Category("数据")]
        [DisplayName("需水量")]
        [PropertyOrder(14)]
        [Browsable(true)]
        public double? Demand { get; set; }

        /// <summary>
        /// éœ€æ°´æ¨¡å¼
        /// </summary>
        [Category("数据")]
        [DisplayName("需水模式")]
        [PropertyOrder(15)]
        [Browsable(true)]
        public string DemandPattern { get; set; }

        /// <summary>
        /// è‡ªç”±åŽ‹åŠ›
        /// </summary>
        [Category("计算结果")]
        [DisplayName("自由压力")]
        [PropertyOrder(101)]
        [Browsable(true)]
        public double? CalcuPress { get; set; }

        /// <summary>
        /// ç»å¯¹åŽ‹åŠ›
        /// </summary>
        [Category("计算结果")]
        [DisplayName("绝对压力")]
        [PropertyOrder(102)]
        [Browsable(true)]
        public double? CalcuHead { get; set; }

        /// <summary>
        /// éœ€æ°´é‡
        /// </summary>
        [Category("计算结果")]
        [DisplayName("需水量")]
        [PropertyOrder(103)]
        [Browsable(true)]
        public double? CalcuDemand { get; set; }
    }
}

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/02-node/HydroExchangerPropertyViewModel.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,88 @@
namespace Yw.WinFrmUI
{
    /// <summary>
    /// æ¢çƒ­å™¨å±žæ€§è§†å›¾
    /// </summary>
    public class HydroExchangerPropertyViewModel : HydroParterPropertyViewModel, IHydroNodePropertyViewModel
    {
        /// <summary>
        /// 
        /// </summary>
        public HydroExchangerPropertyViewModel() { }

        /// <summary>
        /// 
        /// </summary>
        public HydroExchangerPropertyViewModel(Yw.Model.HydroExchangerInfo rhs) : base(rhs)
        {
            this.Quality = rhs.Quality;
            this.Elev = rhs.Elev;
            this.Demand = rhs.Demand;
            this.DemandPattern = rhs.DemandPattern;
        }


        /// <summary>
        /// åˆå§‹æ°´è´¨
        /// </summary>
        [Category("数据")]
        [DisplayName("初始水质")]
        [PropertyOrder(11)]
        [Browsable(true)]
        public double Quality { get; set; }

        /// <summary>
        /// æ ‡é«˜/高程
        /// </summary>
        [Category("数据")]
        [DisplayName("标高")]
        [PropertyOrder(13)]
        [Browsable(true)]
        public double Elev { get; set; }

        /// <summary>
        /// éœ€æ°´é‡
        /// </summary>
        [Category("数据")]
        [DisplayName("需水量")]
        [PropertyOrder(14)]
        [Browsable(true)]
        public double? Demand { get; set; }

        /// <summary>
        /// éœ€æ°´æ¨¡å¼
        /// </summary>
        [Category("数据")]
        [DisplayName("需水模式")]
        [PropertyOrder(15)]
        [Browsable(true)]
        public string DemandPattern { get; set; }

        /// <summary>
        /// è‡ªç”±åŽ‹åŠ›
        /// </summary>
        [Category("计算结果")]
        [DisplayName("自由压力")]
        [PropertyOrder(101)]
        [Browsable(true)]
        public double? CalcuPress { get; set; }

        /// <summary>
        /// ç»å¯¹åŽ‹åŠ›
        /// </summary>
        [Category("计算结果")]
        [DisplayName("绝对压力")]
        [PropertyOrder(102)]
        [Browsable(true)]
        public double? CalcuHead { get; set; }

        /// <summary>
        /// éœ€æ°´é‡
        /// </summary>
        [Category("计算结果")]
        [DisplayName("需水量")]
        [PropertyOrder(103)]
        [Browsable(true)]
        public double? CalcuDemand { get; set; }
    }
}

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/02-node/HydroMeterPropertyViewModel.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,88 @@
namespace Yw.WinFrmUI
{
    /// <summary>
    /// æ°´è¡¨å±žæ€§è§†å›¾
    /// </summary>
    public class HydroMeterPropertyViewModel : HydroParterPropertyViewModel, IHydroNodePropertyViewModel
    {
        /// <summary>
        /// 
        /// </summary>
        public HydroMeterPropertyViewModel() { }

        /// <summary>
        /// 
        /// </summary>
        public HydroMeterPropertyViewModel(Yw.Model.HydroMeterInfo rhs) : base(rhs)
        {
            this.Quality = rhs.Quality;
            this.Elev = rhs.Elev;
            this.Demand = rhs.Demand;
            this.DemandPattern = rhs.DemandPattern;
        }


        /// <summary>
        /// åˆå§‹æ°´è´¨
        /// </summary>
        [Category("数据")]
        [DisplayName("初始水质")]
        [PropertyOrder(11)]
        [Browsable(true)]
        public double Quality { get; set; }

        /// <summary>
        /// æ ‡é«˜/高程
        /// </summary>
        [Category("数据")]
        [DisplayName("标高")]
        [PropertyOrder(13)]
        [Browsable(true)]
        public double Elev { get; set; }

        /// <summary>
        /// éœ€æ°´é‡
        /// </summary>
        [Category("数据")]
        [DisplayName("需水量")]
        [PropertyOrder(14)]
        [Browsable(true)]
        public double? Demand { get; set; }

        /// <summary>
        /// éœ€æ°´æ¨¡å¼
        /// </summary>
        [Category("数据")]
        [DisplayName("需水模式")]
        [PropertyOrder(15)]
        [Browsable(true)]
        public string DemandPattern { get; set; }

        /// <summary>
        /// è‡ªç”±åŽ‹åŠ›
        /// </summary>
        [Category("计算结果")]
        [DisplayName("自由压力")]
        [PropertyOrder(101)]
        [Browsable(true)]
        public double? CalcuPress { get; set; }

        /// <summary>
        /// ç»å¯¹åŽ‹åŠ›
        /// </summary>
        [Category("计算结果")]
        [DisplayName("绝对压力")]
        [PropertyOrder(102)]
        [Browsable(true)]
        public double? CalcuHead { get; set; }

        /// <summary>
        /// éœ€æ°´é‡
        /// </summary>
        [Category("计算结果")]
        [DisplayName("需水量")]
        [PropertyOrder(103)]
        [Browsable(true)]
        public double? CalcuDemand { get; set; }
    }
}

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/02-node/HydroReservoirPropertyViewModel.cs

@@ -30,11 +30,20 @@
        public double Quality { get; set; }

        /// <summary>
        /// æ± åº•æ ‡é«˜
        /// </summary>
        [Category("数据")]
        [DisplayName("池底标高")]
        [PropertyOrder(12)]
        [Browsable(true)]
        public double? PoolElev { get; set; }

        /// <summary>
        /// æ€»æ°´å¤´
        /// </summary>
        [Category("数据")]
        [DisplayName("总水头")]
        [PropertyOrder(12)]
        [PropertyOrder(13)]
        [Browsable(true)]
        public double Head { get; set; }

@@ -43,7 +52,7 @@
        /// </summary>
        [Category("数据")]
        [DisplayName("水头模式")]
        [PropertyOrder(13)]
        [PropertyOrder(14)]
        [Browsable(true)]
        public string HeadPattern { get; set; }


 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/02-node/HydroTankPropertyViewModel.cs

@@ -1,7 +1,4 @@
using System.Windows.Forms.VisualStyles;
using Yw.Model.Hydro;

namespace Yw.WinFrmUI
namespace Yw.WinFrmUI
{
    /// <summary>
    /// æ°´æ± å±žæ€§è§†å›¾

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/04-converter/HydroPipeStatusConverter.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,40 @@
using Yw.Hydro;

namespace Yw.WinFrmUI
{
    /// <summary>
    /// æ°´åŠ›ç®¡é“状态转换器
    /// </summary>
    public class HydroPipeStatusConverter : StringConverter
    {
        /// <summary>
        /// 
        /// </summary>
        public override bool GetStandardValuesSupported(ITypeDescriptorContext context)
        {
            return true;
        }

        /// <summary>
        /// 
        /// </summary>
        public override StandardValuesCollection GetStandardValues(ITypeDescriptorContext context)
        {
            var list = new List<string>
            {
                PipeStatus.Open,
                PipeStatus.Closed,
                PipeStatus.CV
            };
            return new StandardValuesCollection(list);
        }

        /// <summary>
        /// ä¸å…è®¸æ‰‹åŠ¨è¾“å…¥
        /// </summary>
        public override bool GetStandardValuesExclusive(ITypeDescriptorContext context)
        {
            return true;
        }
    }
}

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/04-converter/HydroPumpStatusConverter.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,39 @@
using Yw.Hydro;

namespace Yw.WinFrmUI
{
    /// <summary>
    /// æ°´åŠ›æ°´æ³µçŠ¶æ€è½¬æ¢å™¨
    /// </summary>
    public class HydroPumpStatusConverter : StringConverter
    {
        /// <summary>
        /// 
        /// </summary>
        public override bool GetStandardValuesSupported(ITypeDescriptorContext context)
        {
            return true;
        }

        /// <summary>
        /// 
        /// </summary>
        public override StandardValuesCollection GetStandardValues(ITypeDescriptorContext context)
        {
            var list = new List<string>
            {
                PumpStatus.Open,
                PumpStatus.Closed
            };
            return new StandardValuesCollection(list);
        }

        /// <summary>
        /// ä¸å…è®¸æ‰‹åŠ¨è¾“å…¥
        /// </summary>
        public override bool GetStandardValuesExclusive(ITypeDescriptorContext context)
        {
            return true;
        }
    }
}

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/04-converter/HydroValveStatusConverter.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,40 @@
using Yw.Hydro;

namespace Yw.WinFrmUI
{
    /// <summary>
    /// æ°´åŠ›é˜€é—¨çŠ¶æ€è½¬æ¢å™¨
    /// </summary>
    public class HydroValveStatusConverter : StringConverter
    {
        /// <summary>
        /// 
        /// </summary>
        public override bool GetStandardValuesSupported(ITypeDescriptorContext context)
        {
            return true;
        }

        /// <summary>
        /// 
        /// </summary>
        public override StandardValuesCollection GetStandardValues(ITypeDescriptorContext context)
        {
            var list = new List<string>
            {
                ValveStatus.None,
                ValveStatus.Open,
                ValveStatus.Closed
            };
            return new StandardValuesCollection(list);
        }

        /// <summary>
        /// ä¸å…è®¸æ‰‹åŠ¨è¾“å…¥
        /// </summary>
        public override bool GetStandardValuesExclusive(ITypeDescriptorContext context)
        {
            return true;
        }
    }
}

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/05-attribute/IsHydroCurveProAttribute.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
namespace Yw.WinFrmUI
{
    /// <summary>
    /// ç”¨äºŽæ ‡è¯†æ°´åŠ›æ›²çº¿å±žæ€§ç‰¹æ€§
    /// </summary>
    [AttributeUsage(AttributeTargets.Property, AllowMultiple = false, Inherited = true)]
    public class IsHydroCurveProAttribute : Attribute
    {
        /// <summary>
        /// 
        /// </summary>
        public IsHydroCurveProAttribute()
        {

        }

    }

}

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/05-attribute/IsHydroPatternProAttribute.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
namespace Yw.WinFrmUI
{
    /// <summary>
    /// ç”¨äºŽæ ‡è¯†æ°´åŠ›æ¨¡å¼å±žæ€§ç‰¹æ€§
    /// </summary>
    [AttributeUsage(AttributeTargets.Property, AllowMultiple = false, Inherited = true)]
    public class IsHydroPatternProAttribute : Attribute
    {
        /// <summary>
        /// 
        /// </summary>
        public IsHydroPatternProAttribute()
        {

        }

    }

}

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/HydroParterPropertyCtrl.cs

@@ -202,6 +202,7 @@

            #endregion


        }

        //属性值正在改变

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/14-exchanger/HydroExchangerListCtrl.Designer.cs

@@ -30,22 +30,18 @@
        {
            components = new Container();
            gridControl1 = new DevExpress.XtraGrid.GridControl();
            hydroExchangerViewModelBindingSource = new BindingSource(components);
            gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            colCode = new DevExpress.XtraGrid.Columns.GridColumn();
            colName = new DevExpress.XtraGrid.Columns.GridColumn();
            colFlagsString = new DevExpress.XtraGrid.Columns.GridColumn();
            colStartCode = new DevExpress.XtraGrid.Columns.GridColumn();
            colEndCode = new DevExpress.XtraGrid.Columns.GridColumn();
            colLinkStatus = new DevExpress.XtraGrid.Columns.GridColumn();
            colDiameter = new DevExpress.XtraGrid.Columns.GridColumn();
            colLength = new DevExpress.XtraGrid.Columns.GridColumn();
            colRoughness = new DevExpress.XtraGrid.Columns.GridColumn();
            colMinorLoss = new DevExpress.XtraGrid.Columns.GridColumn();
            colDescription = new DevExpress.XtraGrid.Columns.GridColumn();
            hydroExchangerViewModelBindingSource = new BindingSource(components);
            colQuality = new DevExpress.XtraGrid.Columns.GridColumn();
            colDemand = new DevExpress.XtraGrid.Columns.GridColumn();
            colDemandPattern = new DevExpress.XtraGrid.Columns.GridColumn();
            ((ISupportInitialize)gridControl1).BeginInit();
            ((ISupportInitialize)gridView1).BeginInit();
            ((ISupportInitialize)hydroExchangerViewModelBindingSource).BeginInit();
            ((ISupportInitialize)gridView1).BeginInit();
            SuspendLayout();
            // 
            // gridControl1
@@ -59,9 +55,13 @@
            gridControl1.TabIndex = 0;
            gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView1 });
            // 
            // hydroExchangerViewModelBindingSource
            // 
            hydroExchangerViewModelBindingSource.DataSource = typeof(HydroExchangerViewModel);
            // 
            // gridView1
            // 
            gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colCode, colName, colFlagsString, colStartCode, colEndCode, colLinkStatus, colDiameter, colLength, colRoughness, colMinorLoss, colDescription });
            gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colCode, colName, colFlagsString, colQuality, colDemand, colDemandPattern, colDescription });
            gridView1.GridControl = gridControl1;
            gridView1.Name = "gridView1";
            gridView1.RowClick += gridView1_RowClick;
@@ -87,65 +87,33 @@
            colFlagsString.Visible = true;
            colFlagsString.VisibleIndex = 2;
            // 
            // colStartCode
            // 
            colStartCode.FieldName = "StartCode";
            colStartCode.Name = "colStartCode";
            colStartCode.Visible = true;
            colStartCode.VisibleIndex = 3;
            // 
            // colEndCode
            // 
            colEndCode.FieldName = "EndCode";
            colEndCode.Name = "colEndCode";
            colEndCode.Visible = true;
            colEndCode.VisibleIndex = 4;
            // 
            // colLinkStatus
            // 
            colLinkStatus.FieldName = "LinkStatus";
            colLinkStatus.Name = "colLinkStatus";
            colLinkStatus.Visible = true;
            colLinkStatus.VisibleIndex = 5;
            // 
            // colDiameter
            // 
            colDiameter.FieldName = "Diameter";
            colDiameter.Name = "colDiameter";
            colDiameter.Visible = true;
            colDiameter.VisibleIndex = 6;
            // 
            // colLength
            // 
            colLength.FieldName = "Length";
            colLength.Name = "colLength";
            colLength.Visible = true;
            colLength.VisibleIndex = 7;
            // 
            // colRoughness
            // 
            colRoughness.FieldName = "Roughness";
            colRoughness.Name = "colRoughness";
            colRoughness.Visible = true;
            colRoughness.VisibleIndex = 8;
            // 
            // colMinorLoss
            // 
            colMinorLoss.FieldName = "MinorLoss";
            colMinorLoss.Name = "colMinorLoss";
            colMinorLoss.Visible = true;
            colMinorLoss.VisibleIndex = 9;
            // 
            // colDescription
            // 
            colDescription.FieldName = "Description";
            colDescription.Name = "colDescription";
            colDescription.Visible = true;
            colDescription.VisibleIndex = 10;
            colDescription.VisibleIndex = 6;
            // 
            // hydroExchangerViewModelBindingSource
            // colQuality
            // 
            hydroExchangerViewModelBindingSource.DataSource = typeof(HydroExchangerViewModel);
            colQuality.FieldName = "Quality";
            colQuality.Name = "colQuality";
            colQuality.Visible = true;
            colQuality.VisibleIndex = 3;
            // 
            // colDemand
            // 
            colDemand.FieldName = "Demand";
            colDemand.Name = "colDemand";
            colDemand.Visible = true;
            colDemand.VisibleIndex = 4;
            // 
            // colDemandPattern
            // 
            colDemandPattern.FieldName = "DemandPattern";
            colDemandPattern.Name = "colDemandPattern";
            colDemandPattern.Visible = true;
            colDemandPattern.VisibleIndex = 5;
            // 
            // HydroExchangerListCtrl
            // 
@@ -155,8 +123,8 @@
            Name = "HydroExchangerListCtrl";
            Size = new Size(818, 590);
            ((ISupportInitialize)gridControl1).EndInit();
            ((ISupportInitialize)gridView1).EndInit();
            ((ISupportInitialize)hydroExchangerViewModelBindingSource).EndInit();
            ((ISupportInitialize)gridView1).EndInit();
            ResumeLayout(false);
        }

@@ -168,13 +136,9 @@
        private DevExpress.XtraGrid.Columns.GridColumn colName;
        private DevExpress.XtraGrid.Columns.GridColumn colFlagsString;
        private DevExpress.XtraGrid.Columns.GridColumn colDescription;
        private DevExpress.XtraGrid.Columns.GridColumn colStartCode;
        private DevExpress.XtraGrid.Columns.GridColumn colEndCode;
        private DevExpress.XtraGrid.Columns.GridColumn colLinkStatus;
        private DevExpress.XtraGrid.Columns.GridColumn colDiameter;
        private DevExpress.XtraGrid.Columns.GridColumn colLength;
        private DevExpress.XtraGrid.Columns.GridColumn colRoughness;
        private DevExpress.XtraGrid.Columns.GridColumn colMinorLoss;
        private BindingSource hydroExchangerViewModelBindingSource;
        private DevExpress.XtraGrid.Columns.GridColumn colQuality;
        private DevExpress.XtraGrid.Columns.GridColumn colDemand;
        private DevExpress.XtraGrid.Columns.GridColumn colDemandPattern;
    }
}

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/14-exchanger/HydroExchangerViewModel.cs

@@ -21,13 +21,10 @@
            this.Name = rhs.Name;
            this.FlagsString = Yw.Untity.FlagsHelper.ToString(rhs.Flags);
            this.Description = rhs.Description;
            this.StartCode = rhs.StartCode;
            this.EndCode = rhs.EndCode;
            this.LinkStatus = rhs.LinkStatus;
            this.Diameter = rhs.Diameter;
            this.Length = rhs.Length;
            this.MinorLoss = rhs.MinorLoss;
            this.Roughness = rhs.Roughness;
            this.Quality = rhs.Quality;
            this.Elev = rhs.Elev;
            this.Demand = rhs.Demand;
            this.DemandPattern = rhs.DemandPattern;

            this.Vmo = rhs;
        }
@@ -75,53 +72,32 @@
        public string Description { get; set; }

        /// <summary>
        /// ä¸Šæ¸¸èŠ‚点编码
        /// åˆå§‹æ°´è´¨
        /// </summary>
        [DisplayName("上游节点编码")]
        [Display(Name = "上游节点编码")]
        public string StartCode { get; set; }
        [DisplayName("初始水质")]
        [Display(Name = "初始水质")]
        public double Quality { get; set; }

        /// <summary>
        /// ä¸‹æ¸¸èŠ‚点编码
        /// æ ‡é«˜
        /// </summary>
        [DisplayName("下游节点编码")]
        [Display(Name = "下游节点编码")]
        public string EndCode { get; set; }
        [DisplayName("标高")]
        [Display(Name = "标高")]
        public double Elev { get; set; }

        /// <summary>
        /// ç®¡é“状态
        /// éœ€æ°´é‡
        /// </summary>
        [DisplayName("管道状态")]
        [Display(Name = "管道状态")]
        public string LinkStatus { get; set; }
        [DisplayName("需水量")]
        [Display(Name = "需水量")]
        public double? Demand { get; set; }

        /// <summary>
        /// ç›´å¾„
        /// éœ€æ°´æ¨¡å¼
        /// </summary>
        [DisplayName("直径")]
        [Display(Name = "直径")]
        public double Diameter { get; set; }

        /// <summary>
        /// é•¿åº¦
        /// </summary>
        [DisplayName("长度")]
        [Display(Name = "长度")]
        public double Length { get; set; }

        /// <summary>
        /// ç²—糙系数
        /// </summary>
        [DisplayName("粗糙系数")]
        [Display(Name = "粗糙系数")]
        public double Roughness { get; set; }

        /// <summary>
        /// å±€éƒ¨é˜»åŠ›ç³»æ•°
        /// </summary>
        [DisplayName("局部阻力系数")]
        [Display(Name = "局部阻力系数")]
        public double MinorLoss { get; set; }
        [DisplayName("需水模式")]
        [Display(Name = "需水模式")]
        public string DemandPattern { get; set; }

        /// <summary>
        /// 

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/Yw.WinFrmUI.Hydro.Core.csproj

@@ -8,8 +8,7 @@
  </PropertyGroup>

  <ItemGroup>
    <PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
    <PackageReference Include="Yw.BLL.Hydro.Core" Version="3.1.2" />
    <PackageReference Include="Yw.BLL.Hydro.Core" Version="3.1.3" />
  </ItemGroup>

  <ItemGroup>