冲突

duheng

2024-09-27 32b2fee0421e7997672fe4a14fe5bf9a6de926c2

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/07-fourlink/XhsProjectSimulationFourlinkMatchingListCtrl.cs

@@ -33,26 +33,17 @@
        {
            if (inputs == null || inputs.Count == 0)
                return null;
            var resultList = new List<FourlinkMatchingViewModel>();
            foreach (var item in inputs)
            {
                var result = AssetsMatchingHelper.MatchingFourlink(item, alllist);
                if (result != null)
                {
                    resultList.Add(result);
                }
                else
                {
                    resultList.Add(item);
                }
                AssetsMatchingHelper.MatchingFourlink(item, alllist);
            }
            _allBindingList.Clear();
            foreach (var item in resultList)
            foreach (var item in inputs)
            {
                _allBindingList.Add(new XhsProjectSimulationFourlinkMatchingViewModel(item));
            }
            this.fourLinkFormViewModelBindingSource.ResetBindings(false);
            return resultList;
            return inputs;
        }

        //行点击事件