From e5a7bee9db44da3e4082adeb4bd635b119632d7b Mon Sep 17 00:00:00 2001
From: balibabu <cike8899@users.noreply.github.com>
Date: Wed, 29 Jul 2026 16:25:46 +0800
Subject: [PATCH] Fix: Switching templates results in a few extra data entries
 in the entity specification. (#17514)

---
 .../create-next/components/template-configuration.tsx          | 3 ++-
 .../edit-next/components/template-configuration.tsx            | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/web/src/pages/user-setting/compilation-templates/create-next/components/template-configuration.tsx b/web/src/pages/user-setting/compilation-templates/create-next/components/template-configuration.tsx
index 14fb154918..def1f126ac 100644
--- a/web/src/pages/user-setting/compilation-templates/create-next/components/template-configuration.tsx
+++ b/web/src/pages/user-setting/compilation-templates/create-next/components/template-configuration.tsx
@@ -113,7 +113,7 @@ export function TemplateConfiguration({
       return (
         sectionName === activeSectionTab && (
           <SectionFieldGrid
-            key={activeFieldsPath}
+            key={`${activeFieldsPath}-${kind}`}
             fieldsPath={activeFieldsPath}
             sectionName={sectionName}
             onOpenAddField={handleOpenAddField}
@@ -125,6 +125,7 @@ export function TemplateConfiguration({
     [
       activeFieldsPath,
       activeSectionTab,
+      kind,
       handleOpenAddField,
       handleOpenEditField,
     ],
diff --git a/web/src/pages/user-setting/compilation-templates/edit-next/components/template-configuration.tsx b/web/src/pages/user-setting/compilation-templates/edit-next/components/template-configuration.tsx
index 69c08a0e78..adacf90b1f 100644
--- a/web/src/pages/user-setting/compilation-templates/edit-next/components/template-configuration.tsx
+++ b/web/src/pages/user-setting/compilation-templates/edit-next/components/template-configuration.tsx
@@ -106,7 +106,7 @@ export function TemplateConfiguration({
       return (
         sectionName === activeSectionTab && (
           <SectionFieldGrid
-            key={activeFieldsPath}
+            key={`${activeFieldsPath}-${kind}`}
             fieldsPath={activeFieldsPath}
             sectionName={sectionName}
             onOpenAddField={handleOpenAddField}
@@ -118,6 +118,7 @@ export function TemplateConfiguration({
     [
       activeFieldsPath,
       activeSectionTab,
+      kind,
       handleOpenAddField,
       handleOpenEditField,
     ],