From 7fc435f5c9168fe66b4e6cc40824df1aeb1082e6 Mon Sep 17 00:00:00 2001
From: Katherine <katherine_15995@163.com>
Date: Thu, 9 Oct 2025 21:49:50 +0800
Subject: [PATCH] fix:  data query issue caused by unique identifier in
 calendar block (#7562)

---
 .../src/client/schema-initializer/CalendarBlockProvider.tsx    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/plugins/@nocobase/plugin-calendar/src/client/schema-initializer/CalendarBlockProvider.tsx b/packages/plugins/@nocobase/plugin-calendar/src/client/schema-initializer/CalendarBlockProvider.tsx
index 6e540e731e2..787117b2564 100644
--- a/packages/plugins/@nocobase/plugin-calendar/src/client/schema-initializer/CalendarBlockProvider.tsx
+++ b/packages/plugins/@nocobase/plugin-calendar/src/client/schema-initializer/CalendarBlockProvider.tsx
@@ -20,6 +20,7 @@ const InternalCalendarBlockProvider = (props) => {
   const { fieldNames, showLunar, defaultView, enableQuickCreateEvent, weekStart } = props;
   const field = useField();
   const { resource, service } = useBlockRequestContext();
+  const collection = useCollection();
 
   return (
     <CalendarBlockContext.Provider
@@ -27,7 +28,7 @@ const InternalCalendarBlockProvider = (props) => {
         field,
         service,
         resource,
-        fieldNames,
+        fieldNames: { ...fieldNames, id: collection.filterTargetKey },
         showLunar,
         defaultView,
         enableQuickCreateEvent: enableQuickCreateEvent ?? true,