冲突

duheng

2024-08-14 71ff3ccde064c104db61fa28300b039456c0ba06

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

@@ -5,7 +5,11 @@
        public SysCatalogManageMainPanel()
        {
            InitializeComponent();
            this.PageTitle.Caption = "分类管理";
            this.PageTitle.HeaderSvgImage = this.svgImage32[1];
            this.PageTitle.SvgImageSize = new Size(24, 24);
            this.typeTreeListCtrl2.FocusedChangedEvent += TypeTreeListCtrl2_FocusedChangedEvent;
        
        }

        private List<SysCatalogViewModel> _allBindingList = null;
@@ -15,13 +19,13 @@
        public override void InitialDataSource()
        {
            this.typeTreeListCtrl2.SetBindingData();
            _bll = new Yw.BLL.SysCatalog();
        }

        //聚焦切换
        private async void TypeTreeListCtrl2_FocusedChangedEvent(long typeID)
        {
            _allBindingList = new List<SysCatalogViewModel>();
            _bll = new Yw.BLL.SysCatalog();
            var alllist = await _bll.GetByTypeID(typeID);
            _allBindingList.Clear();
            foreach (var item in alllist)
@@ -136,7 +140,7 @@
            var currentVm = this.treeList1.GetCurrentViewModel(_allBindingList);
            if (currentVm != null)
            {
                var dlg = new SysPropEditDlg();
                var dlg = new SetSysPropForCatalogDlg();
                dlg.SetBindingData(currentVm.ID);
                dlg.ShowDialog();
            }