v4.6.2-alpah (#511)

projects/app/src/pages/plugin/edit/index.tsx

@@ -3,12 +3,12 @@ import { useRouter } from 'next/router';
 import Header from './Header';
 import Flow from '@/components/core/module/Flow';
 import FlowProvider, { useFlowProviderStore } from '@/components/core/module/Flow/FlowProvider';
-import { SystemModuleTemplateType } from '@fastgpt/global/core/module/type.d';
-import { PluginModuleTemplates } from '@/constants/flow/ModuleTemplate';
+import { FlowModuleTemplateType } from '@fastgpt/global/core/module/type.d';
+import { pluginSystemModuleTemplates } from '@/web/core/modules/template/system';
 import { FlowNodeTypeEnum } from '@fastgpt/global/core/module/node/constant';
 import { serviceSideProps } from '@/web/common/utils/i18n';
 import { useQuery } from '@tanstack/react-query';
-import { getOnePlugin, getUserPlugs2ModuleTemplates } from '@/web/core/plugin/api';
+import { getOnePlugin } from '@/web/core/plugin/api';
 import { useToast } from '@/web/common/hooks/useToast';
 import Loading from '@/components/Loading';
 import { getErrText } from '@fastgpt/global/common/error/utils';
@@ -22,11 +22,11 @@ const Render = ({ pluginId }: Props) => {
   const router = useRouter();
   const { toast } = useToast();
   const { nodes = [] } = useFlowProviderStore();
-  const { pluginModuleTemplates, loadPluginModuleTemplates } = usePluginStore();
+  const { pluginModuleTemplates, loadPluginTemplates } = usePluginStore();
 
   const filterTemplates = useMemo(() => {
-    const copyTemplates: SystemModuleTemplateType = JSON.parse(
-      JSON.stringify(PluginModuleTemplates)
+    const copyTemplates: FlowModuleTemplateType[] = JSON.parse(
+      JSON.stringify(pluginSystemModuleTemplates)
     );
     const filterType: Record<string, 1> = {
       [FlowNodeTypeEnum.userGuide]: 1,
@@ -37,12 +37,10 @@ const Render = ({ pluginId }: Props) => {
     // filter some template
     nodes.forEach((node) => {
       if (node.type && filterType[node.type]) {
-        copyTemplates.forEach((item) => {
-          item.list.forEach((module, index) => {
-            if (module.flowType === node.type) {
-              item.list.splice(index, 1);
-            }
-          });
+        copyTemplates.forEach((module, index) => {
+          if (module.flowType === node.type) {
+            copyTemplates.splice(index, 1);
+          }
         });
       }
     });
@@ -60,16 +58,15 @@ const Render = ({ pluginId }: Props) => {
     }
   });
 
-  useQuery(['getUserPlugs2ModuleTemplates'], () => loadPluginModuleTemplates());
-  const filterPlugins = useMemo(
-    () => pluginModuleTemplates.filter((item) => item.id !== pluginId),
-    [pluginId, pluginModuleTemplates]
-  );
+  useQuery(['getPlugTemplates'], () => loadPluginTemplates());
+  const filterPlugins = useMemo(() => {
+    return pluginModuleTemplates.filter((item) => item.id !== pluginId);
+  }, [pluginId, pluginModuleTemplates]);
 
   return data ? (
     <Flow
       systemTemplates={filterTemplates}
-      pluginTemplates={[{ label: '', list: filterPlugins }]}
+      pluginTemplates={filterPlugins}
       modules={data?.modules || []}
       Header={<Header plugin={data} onClose={() => router.back()} />}
     />
@@ -80,7 +77,7 @@ const Render = ({ pluginId }: Props) => {
 
 export default function AdEdit(props: any) {
   return (
-    <FlowProvider filterAppIds={[]}>
+    <FlowProvider mode={'plugin'} filterAppIds={[]}>
       <Render {...props} />
     </FlowProvider>
   );