From 322f3d749eb6ad77e2ab4c7954ea8b15caffd487 Mon Sep 17 00:00:00 2001
From: Zeke Zhang <958414905@qq.com>
Date: Mon, 24 Mar 2025 20:39:44 +0800
Subject: [PATCH] fix(Link): cannot use 'current user' variable (#6536)

---
 .../client/src/modules/menu/LinkMenuItem.tsx  | 64 +++++++++++--------
 .../antd/filter/useFilterActionProps.ts       |  2 +-
 2 files changed, 40 insertions(+), 26 deletions(-)

diff --git a/packages/core/client/src/modules/menu/LinkMenuItem.tsx b/packages/core/client/src/modules/menu/LinkMenuItem.tsx
index 8217f7de14..aace433ec4 100644
--- a/packages/core/client/src/modules/menu/LinkMenuItem.tsx
+++ b/packages/core/client/src/modules/menu/LinkMenuItem.tsx
@@ -14,6 +14,14 @@ import React, { useCallback, useContext } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Router } from 'react-router-dom';
 import { SchemaInitializerItem } from '../../application';
+import {
+  CollectionManagerProvider,
+  useCollectionManager,
+} from '../../data-source/collection/CollectionManagerProvider';
+import {
+  DataSourceManagerProvider,
+  useDataSourceManager,
+} from '../../data-source/data-source/DataSourceManagerProvider';
 import { useGlobalTheme } from '../../global-theme';
 import { NocoBaseDesktopRouteType } from '../../route-switch/antd/admin-layout/convertRoutesToSchema';
 import {
@@ -34,6 +42,8 @@ export const LinkMenuItem = () => {
   const { urlSchema, paramsSchema } = useURLAndHTMLSchema();
   const parentRoute = useParentRoute();
   const { createRoute } = useNocoBaseRoutes();
+  const dm = useDataSourceManager();
+  const cm = useCollectionManager();
 
   const handleClick = useCallback(async () => {
     const values = await FormDialog(
@@ -41,31 +51,35 @@ export const LinkMenuItem = () => {
       () => {
         const history = createMemoryHistory();
         return (
-          <Router location={history.location} navigator={history}>
-            <SchemaComponentOptions scope={options.scope} components={{ ...options.components }}>
-              <FormLayout layout={'vertical'}>
-                <SchemaComponent
-                  schema={{
-                    properties: {
-                      title: {
-                        title: t('Menu item title'),
-                        required: true,
-                        'x-component': 'Input',
-                        'x-decorator': 'FormItem',
-                      },
-                      icon: {
-                        title: t('Icon'),
-                        'x-component': 'IconPicker',
-                        'x-decorator': 'FormItem',
-                      },
-                      href: urlSchema,
-                      params: paramsSchema,
-                    },
-                  }}
-                />
-              </FormLayout>
-            </SchemaComponentOptions>
-          </Router>
+          <DataSourceManagerProvider dataSourceManager={dm}>
+            <CollectionManagerProvider instance={cm} dataSource={cm?.dataSource?.key}>
+              <Router location={history.location} navigator={history}>
+                <SchemaComponentOptions scope={options.scope} components={{ ...options.components }}>
+                  <FormLayout layout={'vertical'}>
+                    <SchemaComponent
+                      schema={{
+                        properties: {
+                          title: {
+                            title: t('Menu item title'),
+                            required: true,
+                            'x-component': 'Input',
+                            'x-decorator': 'FormItem',
+                          },
+                          icon: {
+                            title: t('Icon'),
+                            'x-component': 'IconPicker',
+                            'x-decorator': 'FormItem',
+                          },
+                          href: urlSchema,
+                          params: paramsSchema,
+                        },
+                      }}
+                    />
+                  </FormLayout>
+                </SchemaComponentOptions>
+              </Router>
+            </CollectionManagerProvider>
+          </DataSourceManagerProvider>
         );
       },
       theme,
diff --git a/packages/core/client/src/schema-component/antd/filter/useFilterActionProps.ts b/packages/core/client/src/schema-component/antd/filter/useFilterActionProps.ts
index 1f20ba46e4..8db32dec4f 100644
--- a/packages/core/client/src/schema-component/antd/filter/useFilterActionProps.ts
+++ b/packages/core/client/src/schema-component/antd/filter/useFilterActionProps.ts
@@ -92,7 +92,7 @@ export const useGetFilterFieldOptions = () => {
 
   const getOptions = (fields, depth, usedInVariable?: boolean) => {
     const options = [];
-    fields.forEach((field) => {
+    fields?.forEach((field) => {
       const option = field2option(field, depth, usedInVariable);
       if (option) {
         options.push(option);