修改冲突后问题

duheng

2024-11-29 9c1af7f5ec91917b4276b25406c86386fd337fbb

 WinFrmUI/PBS.WinFrmUI.WE.Core/WaterWE/01-catalogue/EditCatalogueDlg.cs

文件名从 WinFrmUI/PBS.WinFrmUI.WE.Core/新文件夹/01-catalogue/EditCatalogueDlg.cs 修改
@@ -1,6 +1,6 @@
锘縰sing Yw.WinFrmUI;

namespace HStation.WinFrmUI.WE
namespace PBS.WinFrmUI.WE
{
    public partial class EditCatalogueDlg : DevExpress.XtraEditors.XtraForm
    {
@@ -10,19 +10,19 @@
            this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon;
        }

        public event Func<Vmo.WE.CatalogueVmo, object, Task<bool>> ReloadDataEvent = null;
        public event Func<PBS.Vmo.WE.CatalogueVmo, object, Task<bool>> ReloadDataEvent = null;

        private Vmo.WE.CatalogueVmo _CatalogueDlg = null;
        private PBS.Vmo.WE.CatalogueVmo _CatalogueDlg = null;
        private List<CatalogueViewModel> _CatalogueDlgViews;

        public async void SetBindingData(Vmo.WE.CatalogueVmo seriesVmo)
        public async void SetBindingData(PBS.Vmo.WE.CatalogueVmo seriesVmo)
        {
            _CatalogueDlgViews = new List<CatalogueViewModel>();
            _CatalogueDlg = seriesVmo;
            this.NameTextEdit.Text = _CatalogueDlg.Name;
            this.DescriptionTextEdit.Text = _CatalogueDlg.Description;
            this.TagNameTextEdit.Text = _CatalogueDlg.TagName;
            var allList = await new BLL.WE.Catalogue().GetAll();
            var allList = await new PBS.BLL.WE.Catalogue().GetAll();
            foreach (var item in allList)
            {
                _CatalogueDlgViews.Add(new CatalogueViewModel(item));