From c039e19158d4327855902179cc175e5ee6872e19 Mon Sep 17 00:00:00 2001
From: capdiem <capdiem@live.com>
Date: Wed, 28 Aug 2024 09:20:44 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix(Sortable):=20the=20re-order?=
 =?UTF-8?q?=20should=20be=20triggered=20after=20the=20Order=20property=20v?=
 =?UTF-8?q?alue=20changes=20(#2120)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Sortable/MSortableProviderBase.cs           | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/Masa.Blazor/Components/Sortable/MSortableProviderBase.cs b/src/Masa.Blazor/Components/Sortable/MSortableProviderBase.cs
index 78d8d69442..52ff7dc9da 100644
--- a/src/Masa.Blazor/Components/Sortable/MSortableProviderBase.cs
+++ b/src/Masa.Blazor/Components/Sortable/MSortableProviderBase.cs
@@ -9,12 +9,7 @@ public abstract class MSortableProviderBase<TItem> : MasaComponentBase, ISortabl
 
     [Parameter] [EditorRequired] public IEnumerable<TItem> Items { get; set; } = Enumerable.Empty<TItem>();
 
-    [Parameter]
-    public List<string>? Order
-    {
-        get => GetValue<List<string>>();
-        set => SetValue(value);
-    }
+    [Parameter] public List<string>? Order { get; set; }
 
     [Parameter] public EventCallback<List<string>> OrderChanged { get; set; }
 
@@ -178,6 +173,7 @@ public bool Disabled
     private IEnumerable<TItem>? _prevItems;
     private HashSet<string> _prevItemKeys;
     private List<string> _internalOrder;
+    private string[] _prevOrder = [];
 
     private DotNetObjectReference<SortableJSInteropHandle>? _sortableJSInteropHandle;
     private SortableJSObjectReference? _jsObjectReference;
@@ -205,8 +201,7 @@ protected override void RegisterWatchers(PropertyWatcher watcher)
         base.RegisterWatchers(watcher);
 
         watcher.Watch<bool>(nameof(Disabled),
-                val => { _jsObjectReference?.InvokeVoidAsync("option", "disabled", val); })
-            .Watch<List<string>>(nameof(Order), val => { _ = _jsObjectReference?.SortAsync(val, false); });
+            val => { _jsObjectReference?.InvokeVoidAsync("option", "disabled", val); });
     }
 
     protected override void OnParametersSet()
@@ -232,6 +227,12 @@ protected override void OnParametersSet()
                 SortByInternalOrder();
             }
         }
+
+        if (Order is not null && !_prevOrder.SequenceEqual(Order))
+        {
+            _prevOrder = Order.ToArray();
+            _ = _jsObjectReference?.SortAsync(Order, false);
+        }
     }
 
     protected override async Task OnAfterRenderAsync(bool firstRender)