refactor: simplify SchemaInitializerItemGroup and update menu item handling

packages/core/client/src/application/schema-initializer/components/SchemaInitializerItemGroup.tsx

@@ -15,7 +15,6 @@ import { SchemaInitializerOptions } from '../types';
 import { SchemaInitializerChildren } from './SchemaInitializerChildren';
 import { SchemaInitializerDivider } from './SchemaInitializerDivider';
 import { useSchemaInitializerStyles } from './style';
-import { useMenuSearch } from './SchemaInitializerItemSearchFields';
 export interface SchemaInitializerItemGroupProps {
   title: string;
   children?: SchemaInitializerOptions['items'];
@@ -47,11 +46,5 @@ export const SchemaInitializerItemGroup: FC<SchemaInitializerItemGroupProps> = (
 
 export const SchemaInitializerItemGroupInternal = () => {
   const itemConfig: any = useSchemaInitializerItem<SchemaInitializerItemGroupProps>();
-
-  const searchedChildren = useMenuSearch(itemConfig);
-  if (itemConfig.name && itemConfig.name !== 'displayFields') {
   return <SchemaInitializerItemGroup {...itemConfig} />;
-  }
-  /* eslint-disable react/no-children-prop */
-  return <SchemaInitializerItemGroup {...itemConfig} children={searchedChildren} />;
 };

packages/core/client/src/application/schema-initializer/hooks/useGetSchemaInitializerMenuItems.tsx

@@ -68,12 +68,17 @@ export function useGetSchemaInitializerMenuItems(onClick?: (args: any) => void)
           };
         }
         if (item.type === 'subMenu') {
-          const label = compiledTitle;
           const key = item.key || item.name || `${parentKey}-sub-menu-${indexA}`;
+
           return {
             key,
-            label,
+            label: <SchemaInitializerChild {...item} title={compiledTitle} />,
+            // 子菜单的内容已经完全交给 SchemaInitializerChild 处理了，所以这些属性不需要传递下去。但是为了兼容旧版的代码，这里还暂时保留。
+            item_deprecated: {
+              key,
+              label: compiledTitle,
               children: item?.children?.length ? getMenuItems(item.children, key) : [],
+            },
           };
         }
         if (item.isMenuType) {

packages/core/client/src/schema-initializer/items/DataBlockInitializer.tsx

@@ -147,22 +147,30 @@ export function useMenuSearch({
   const currentItems = useMemo(() => {
     if (isMuliSource) {
       if (!openKey) return [];
-      return data.find((item) => (item.key || item.name) === openKey)?.children || [];
+      let result = data.find((item) => (item.key || item.name) === openKey);
+      result = result.item_deprecated || result;
+
+      return result?.children || [];
     }
-    return data[0]?.children || [];
+
+    let result = data[0];
+    result = result.item_deprecated || result;
+    return result?.children || [];
   }, [data, isMuliSource, openKey]);
 
   // 根据搜索的值进行处理
   const searchedItems = useMemo(() => {
     if (!searchValue) return currentItems;
     const lowerSearchValue = searchValue.toLocaleLowerCase();
-    return currentItems.filter(
+    return currentItems.filter((item) => {
-      (item) =>
+      item = item.item_deprecated || item;
+      return (
         (item.label || item.title) &&
         String(item.label || item.title)
           .toLocaleLowerCase()
-          .includes(lowerSearchValue),
+          .includes(lowerSearchValue)
       );
+    });
   }, [searchValue, currentItems]);
 
   const shouldLoadMore = useMemo(() => searchedItems.length > count, [count, searchedItems]);
@@ -248,6 +256,8 @@ export function useMenuSearch({
   const res = useMemo(() => {
     if (!isMuliSource) return resultItems;
     return data.map((item) => {
+      item = item.item_deprecated || item;
+
       if (openKey && item.key === openKey) {
         return {
           ...item,

packages/core/client/src/schema-initializer/utils.ts

@@ -219,6 +219,7 @@ function getGroupItemForTable({
   depth: number;
   t: any;
 }) {
+  const getChildren = () => {
     const subFields = getCollectionFields(field.target);
     const items = subFields
       ?.filter(
@@ -299,12 +300,17 @@ function getGroupItemForTable({
       }
     }
 
+    return children;
+  };
+
   return {
     type: 'subMenu',
     key: `${field.target}_${schemaName}_submenu`,
     name: schemaName,
     title: field.uiSchema?.title,
-    children,
+    useChildren() {
+      return getChildren() || [];
+    },
   } as SchemaInitializerItemType;
 }