From 48e4b2118df1e6b90bbf15500dbe0987ab00dce6 Mon Sep 17 00:00:00 2001
From: dream2023 <1098626505@qq.com>
Date: Thu, 18 Jan 2024 16:30:38 +0800
Subject: [PATCH] fix: single and multi data source

---
 .../items/DataBlockInitializer.tsx            | 28 +++++++++++--------
 .../src/client/instruction/forms/create.tsx   | 10 ++-----
 .../src/client/instruction/forms/update.tsx   | 10 ++-----
 3 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/packages/core/client/src/schema-initializer/items/DataBlockInitializer.tsx b/packages/core/client/src/schema-initializer/items/DataBlockInitializer.tsx
index 10aefd8264..fe84045ada 100644
--- a/packages/core/client/src/schema-initializer/items/DataBlockInitializer.tsx
+++ b/packages/core/client/src/schema-initializer/items/DataBlockInitializer.tsx
@@ -109,19 +109,27 @@ const LoadingItem = ({ loadMore, maxHeight }) => {
   );
 };
 
-export function useMenuSearch(data: any, openKey: string, showType?: boolean) {
+export function useMenuSearch(data: any[], openKeys: string[], showType?: boolean) {
   const [searchValue, setSearchValue] = useState('');
   const [count, setCount] = useState(STEP);
 
+  const isMuliSource = useMemo(() => data.length > 1, [data]);
+  const openKey = useMemo(() => {
+    return isMuliSource ? openKeys?.[1] : openKeys?.length > 0;
+  }, [openKeys]);
+
   useEffect(() => {
-    if (openKey) {
+    if (!openKey) {
       setSearchValue('');
     }
   }, [openKey]);
 
   const currentItems = useMemo(() => {
-    if (!openKey) return [];
-    return data.find((item) => (item.key || item.name) === openKey)?.children || [];
+    if (isMuliSource) {
+      if (!openKey) return [];
+      return data.find((item) => (item.key || item.name) === openKey)?.children || [];
+    }
+    return data[0].children || [];
   }, [data, openKey]);
 
   // 根据搜索的值进行处理
@@ -215,6 +223,7 @@ export function useMenuSearch(data: any, openKey: string, showType?: boolean) {
   }, [limitedSearchedItems, searchValue, shouldLoadMore, showType]);
 
   const res = useMemo(() => {
+    if (!isMuliSource) return resultItems;
     return data.map((item) => {
       if (openKey && item.key === openKey) {
         return {
@@ -288,11 +297,10 @@ export const DataBlockInitializer = (props: DataBlockInitializerProps) => {
     [createBlockSchema, getTemplateSchemaByMode, insert, isCusomeizeCreate, onCreateBlockSchema, templateWrap],
   );
   const items = useCollectionDataSourceItems(componentType, filter);
-  console.log('items', items);
   const getMenuItems = useGetSchemaInitializerMenuItems(onClick);
   const childItems = useMemo(() => getMenuItems(items, name), [items]);
-  const [openMenuKey, setOpenMenuKey] = useState('');
-  const searchedChildren = useMenuSearch(childItems, openMenuKey);
+  const [openMenuKeys, setOpenMenuKeys] = useState([]);
+  const searchedChildren = useMenuSearch(childItems, openMenuKeys);
   const compiledMenuItems = useMemo(
     () => [
       {
@@ -312,11 +320,7 @@ export const DataBlockInitializer = (props: DataBlockInitializerProps) => {
     return (
       <SchemaInitializerMenu
         onOpenChange={(keys) => {
-          if (keys.length === 2) {
-            setOpenMenuKey(keys[1]);
-          } else if (keys.length === 0) {
-            setOpenMenuKey('');
-          }
+          setOpenMenuKeys(keys);
         }}
         items={compiledMenuItems}
       />
diff --git a/packages/plugins/@nocobase/plugin-workflow-manual/src/client/instruction/forms/create.tsx b/packages/plugins/@nocobase/plugin-workflow-manual/src/client/instruction/forms/create.tsx
index e096b15040..cac689dc4b 100644
--- a/packages/plugins/@nocobase/plugin-workflow-manual/src/client/instruction/forms/create.tsx
+++ b/packages/plugins/@nocobase/plugin-workflow-manual/src/client/instruction/forms/create.tsx
@@ -64,8 +64,8 @@ export default {
           })),
         [allCollections],
       );
-      const [openMenuKey, setOpenMenuKey] = useState('');
-      const searchedChildren = useMenuSearch(childItems, openMenuKey);
+      const [openMenuKeys, setOpenMenuKeys] = useState([]);
+      const searchedChildren = useMenuSearch(childItems, openMenuKeys);
 
       return {
         name: 'createRecordForm',
@@ -74,11 +74,7 @@ export default {
         title: `{{t("Create record form", { ns: "${NAMESPACE}" })}}`,
         componentProps: {
           onOpenChange(keys) {
-            if (keys.length === 2) {
-              setOpenMenuKey(keys[1]);
-            } else if (keys.length === 0) {
-              setOpenMenuKey('');
-            }
+            setOpenMenuKeys(keys);
           },
         },
         children: searchedChildren,
diff --git a/packages/plugins/@nocobase/plugin-workflow-manual/src/client/instruction/forms/update.tsx b/packages/plugins/@nocobase/plugin-workflow-manual/src/client/instruction/forms/update.tsx
index 181992353d..bf6bdb96b9 100644
--- a/packages/plugins/@nocobase/plugin-workflow-manual/src/client/instruction/forms/update.tsx
+++ b/packages/plugins/@nocobase/plugin-workflow-manual/src/client/instruction/forms/update.tsx
@@ -101,8 +101,8 @@ export default {
           })),
         [allCollections],
       );
-      const [openMenuKey, setOpenMenuKey] = useState('');
-      const searchedChildren = useMenuSearch(childItems, openMenuKey);
+      const [openMenuKeys, setOpenMenuKeys] = useState([]);
+      const searchedChildren = useMenuSearch(childItems, openMenuKeys);
       return {
         name: 'updateRecordForm',
         key: 'updateRecordForm',
@@ -110,11 +110,7 @@ export default {
         title: `{{t("Update record form", { ns: "${NAMESPACE}" })}}`,
         componentProps: {
           onOpenChange(keys) {
-            if (keys.length === 2) {
-              setOpenMenuKey(keys[1]);
-            } else if (keys.length === 0) {
-              setOpenMenuKey('');
-            }
+            setOpenMenuKeys(keys);
           },
         },
         children: searchedChildren,