From 5d8eb5d05a3fd6520c1645cb8bda9e557fa3d033 Mon Sep 17 00:00:00 2001 From: lihanbo Date: Sat, 11 Jan 2025 12:29:50 +0800 Subject: [PATCH] =?UTF-8?q?105040=20Update=20=E8=B0=83=E6=95=B4=E7=BA=BF?= =?UTF-8?q?=E6=9D=90=E8=B5=84=E6=96=99=E6=8E=92=E5=BA=8F=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Sinvo.EplanHpD.Plugin.WPFUI/ViewModel/LectotypeViewModel.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Sinvo.EplanHpD.Plugin.WPFUI/ViewModel/LectotypeViewModel.cs b/Sinvo.EplanHpD.Plugin.WPFUI/ViewModel/LectotypeViewModel.cs index f1cb183..c601613 100644 --- a/Sinvo.EplanHpD.Plugin.WPFUI/ViewModel/LectotypeViewModel.cs +++ b/Sinvo.EplanHpD.Plugin.WPFUI/ViewModel/LectotypeViewModel.cs @@ -215,7 +215,7 @@ public class LectotypeViewModel(string docId) : INotifyPropertyChanged }) .Where(it => it != null) //.Where(it => !string.IsNullOrEmpty(it.AxisNo)) - .OrderBy(it => it?.CableName ?? "")]; + .OrderBy(it => it?.CurrentLine ?? 0)]; Wires = StuffData(cables); designer.SelectSet.NodeSelected += SelectSet_NodeSelected; @@ -384,7 +384,7 @@ public class LectotypeViewModel(string docId) : INotifyPropertyChanged }); CheckLines(datas); - return [.. datas.OrderByDescending(it => it.SeqNo)]; + return [.. datas.OrderBy(it => it.AxisNo).ThenBy(it => it.CableType).ThenBy(it => it.CurrentLine)]; } private void CheckLines(List lines)