From 82b865fd6f7e426d02d537dca3f533675b0ada4c Mon Sep 17 00:00:00 2001
From: jiangjx32566 <jiangjx32566@hundsun.com>
Date: Mon, 9 Dec 2024 15:44:33 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8D=95=E5=85=83?=
 =?UTF-8?q?=E6=A0=BC=E7=BC=96=E8=BE=91=E5=87=BA=E7=8E=B0=E7=9A=84=E4=B8=A4?=
 =?UTF-8?q?=E4=B8=AA=E9=97=AE=E9=A2=98=201=E3=80=81=E6=8C=89Esc=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E6=97=B6=E5=8D=95=E5=85=83=E6=A0=BC=E6=9C=AA=E8=BF=98?=
 =?UTF-8?q?=E5=8E=9F=202=E3=80=81=E6=8C=89Enter=E6=97=B6=E5=8D=95=E5=85=83?=
 =?UTF-8?q?=E6=A0=BC=E8=A2=AB=E6=B8=85=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Models/TreeDataGrid/TextCell.cs                           | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls.TreeDataGrid/Models/TreeDataGrid/TextCell.cs b/src/Avalonia.Controls.TreeDataGrid/Models/TreeDataGrid/TextCell.cs
index 18afebe8..b1881d23 100644
--- a/src/Avalonia.Controls.TreeDataGrid/Models/TreeDataGrid/TextCell.cs
+++ b/src/Avalonia.Controls.TreeDataGrid/Models/TreeDataGrid/TextCell.cs
@@ -92,8 +92,8 @@ public void BeginEdit()
         {
             if (!_isEditing && !IsReadOnly)
             {
-                _isEditing = true;
                 _editText = Text;
+                _isEditing = true;
             }
         }
 
@@ -103,6 +103,7 @@ public void CancelEdit()
             {
                 _isEditing = false;
                 _editText = null;
+                RaisePropertyChanged(nameof(Value));
             }
         }
 
@@ -114,6 +115,7 @@ public void EndEdit()
                 _isEditing = false;
                 _editText = null;
                 Text = text;
+                RaisePropertyChanged(nameof(Value));
             }
         }
 

From 9ebe16da0c90178155a884ee12f1115f8997581a Mon Sep 17 00:00:00 2001
From: jiangjx32566 <jiangjx32566@hundsun.com>
Date: Thu, 29 May 2025 09:25:10 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=97=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=88=A0=E9=99=A4=E6=93=8D=E4=BD=9C=E5=90=8E=EF=BC=8C?=
 =?UTF-8?q?=E4=BC=9A=E5=87=BA=E7=8E=B0=E9=94=99=E4=BD=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Primitives/TreeDataGridTemplateCell.cs           | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/Avalonia.Controls.TreeDataGrid/Primitives/TreeDataGridTemplateCell.cs b/src/Avalonia.Controls.TreeDataGrid/Primitives/TreeDataGridTemplateCell.cs
index fb9d07c8..6843889b 100644
--- a/src/Avalonia.Controls.TreeDataGrid/Primitives/TreeDataGridTemplateCell.cs
+++ b/src/Avalonia.Controls.TreeDataGrid/Primitives/TreeDataGridTemplateCell.cs
@@ -104,6 +104,13 @@ protected override void OnAttachedToLogicalTree(LogicalTreeAttachmentEventArgs e
             }
         }
 
+        protected override void OnDetachedFromLogicalTree(LogicalTreeAttachmentEventArgs e)
+        {
+            base.OnDetachedFromLogicalTree(e);
+            ContentTemplate = null;
+            EditingTemplate = null;
+        }
+
         protected override void OnDataContextChanged(EventArgs e)
         {
             base.OnDataContextChanged(e);
@@ -121,6 +128,11 @@ protected override void OnDataContextChanged(EventArgs e)
                     ContentTemplate = cell.GetCellTemplate(this);
                     EditingTemplate = cell.GetCellEditingTemplate?.Invoke(this);
                 }
+                else
+                {
+                    ContentTemplate = null;
+                    EditingTemplate = null;
+                }
             }
             else
             {

From c2be40a0bd340bbda5fe1bd0c6743a22ab6fd427 Mon Sep 17 00:00:00 2001
From: jiangjx32566 <jiangjx32566@hundsun.com>
Date: Fri, 3 Jul 2026 14:06:31 +0800
Subject: [PATCH 3/3] =?UTF-8?q?11.1.0-cbuild20250522=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Directory.Build.props                                           | 2 ++
 global.json                                                     | 1 -
 .../Avalonia.Controls.TreeDataGrid.csproj                       | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index b52a8875..c73f2335 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -13,5 +13,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <AvaloniaVersion>11.0.0</AvaloniaVersion>
+    <Version>11.1.0-cbuild20250522</Version>
+    <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
   </PropertyGroup>
 </Project>
diff --git a/global.json b/global.json
index d3492186..9955c471 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,5 @@
 {
   "sdk": {
-    "version": "8.0.101",
     "rollForward": "latestFeature"
   }
 }
diff --git a/src/Avalonia.Controls.TreeDataGrid/Avalonia.Controls.TreeDataGrid.csproj b/src/Avalonia.Controls.TreeDataGrid/Avalonia.Controls.TreeDataGrid.csproj
index e1ca2c40..6d59a4b1 100644
--- a/src/Avalonia.Controls.TreeDataGrid/Avalonia.Controls.TreeDataGrid.csproj
+++ b/src/Avalonia.Controls.TreeDataGrid/Avalonia.Controls.TreeDataGrid.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>True</IsPackable>
     <RootNamespace>Avalonia.Controls</RootNamespace>
   </PropertyGroup>