filter tool type version & fix unpublished version (#4803)

packages/service/core/app/plugin/controller.ts

@@ -22,8 +22,7 @@ import {
 import { type PluginRuntimeType } from '@fastgpt/global/core/plugin/type';
 import { MongoSystemPlugin } from './systemPluginSchema';
 import { PluginErrEnum } from '@fastgpt/global/common/error/code/plugin';
-import { MongoAppVersion } from '../version/schema';
-import { i18nT } from '../../../../web/i18n/utils';
+import { Types } from 'mongoose';
 
 /* 
   plugin id rule:
@@ -111,19 +110,13 @@ export async function getChildAppPreviewNode({
 
       const version = await getAppVersionById({ appId, versionId, app: item });
 
-      if (!version.versionId) return Promise.reject(i18nT('common:app_not_version'));
-
-      const versionData = await MongoAppVersion.findById(
-        version.versionId,
-        '_id versionName appId time'
-      ).lean();
-
-      const isLatest = versionData
-        ? await checkIsLatestVersion({
-            appId,
-            versionId: versionData._id
-          })
-        : true;
+      const isLatest =
+        version.versionId && Types.ObjectId.isValid(version.versionId)
+          ? await checkIsLatestVersion({
+              appId,
+              versionId: version.versionId
+            })
+          : true;
 
       return {
         id: String(item._id),
@@ -140,7 +133,7 @@ export async function getChildAppPreviewNode({
         templateType: FlowNodeTemplateTypeEnum.teamApp,
 
         version: version.versionId,
-        versionLabel: versionData?.versionName || '',
+        versionLabel: version?.versionName || '',
         isLatestVersion: isLatest,
 
         originCost: 0,

packages/service/core/app/version/controller.ts

@@ -15,6 +15,7 @@ export const getAppLatestVersion = async (appId: string, app?: AppSchema) => {
   if (version) {
     return {
       versionId: version._id,
+      versionName: version.versionName,
       nodes: version.nodes,
       edges: version.edges,
       chatConfig: version.chatConfig || app?.chatConfig || {}
@@ -22,6 +23,7 @@ export const getAppLatestVersion = async (appId: string, app?: AppSchema) => {
   }
   return {
     versionId: app?.pluginData?.nodeVersion,
+    versionName: app?.name,
     nodes: app?.modules || [],
     edges: app?.edges || [],
     chatConfig: app?.chatConfig || {}
@@ -47,6 +49,7 @@ export const getAppVersionById = async ({
     if (version) {
       return {
         versionId: version._id,
+        versionName: version.versionName,
         nodes: version.nodes,
         edges: version.edges,
         chatConfig: version.chatConfig || app?.chatConfig || {}

packages/web/components/common/MySelect/index.tsx

@@ -24,6 +24,7 @@ import { useRequest2 } from '../../../hooks/useRequest';
 import MyDivider from '../MyDivider';
 import type { useScrollPagination } from '../../../hooks/useScrollPagination';
 import Avatar from '../Avatar';
+import EmptyTip from '../EmptyTip';
 
 /** 选择组件 Props 类型
  * value: 选中的值
@@ -141,43 +142,49 @@ const MySelect = <T = any,>(
   const ListRender = useMemo(() => {
     return (
       <>
-        {filterList.map((item, i) => (
-          <Box key={i}>
-            <MenuItem
-              {...menuItemStyles}
-              {...(value === item.value
-                ? {
-                    ref: SelectedItemRef,
-                    color: 'primary.700',
-                    bg: 'myGray.100',
-                    fontWeight: '600'
+        {filterList.length > 0 ? (
+          filterList.map((item, i) => (
+            <Box key={i}>
+              <MenuItem
+                {...menuItemStyles}
+                {...(value === item.value
+                  ? {
+                      ref: SelectedItemRef,
+                      color: 'primary.700',
+                      bg: 'myGray.100',
+                      fontWeight: '600'
+                    }
+                  : {
+                      color: 'myGray.900'
+                    })}
+                onClick={() => {
+                  if (value !== item.value) {
+                    onClickChange(item.value);
                   }
-                : {
-                    color: 'myGray.900'
-                  })}
-              onClick={() => {
-                if (value !== item.value) {
-                  onClickChange(item.value);
-                }
-              }}
-              whiteSpace={'pre-wrap'}
-              fontSize={'sm'}
-              display={'block'}
-              mb={0.5}
-            >
-              <Flex alignItems={'center'}>
-                {item.icon && <Avatar mr={2} src={item.icon as any} w={item.iconSize ?? '1rem'} />}
-                {item.label}
-              </Flex>
-              {item.description && (
-                <Box color={'myGray.500'} fontSize={'xs'}>
-                  {item.description}
-                </Box>
-              )}
-            </MenuItem>
-            {item.showBorder && <MyDivider my={2} />}
-          </Box>
-        ))}
+                }}
+                whiteSpace={'pre-wrap'}
+                fontSize={'sm'}
+                display={'block'}
+                mb={0.5}
+              >
+                <Flex alignItems={'center'}>
+                  {item.icon && (
+                    <Avatar mr={2} src={item.icon as any} w={item.iconSize ?? '1rem'} />
+                  )}
+                  {item.label}
+                </Flex>
+                {item.description && (
+                  <Box color={'myGray.500'} fontSize={'xs'}>
+                    {item.description}
+                  </Box>
+                )}
+              </MenuItem>
+              {item.showBorder && <MyDivider my={2} />}
+            </Box>
+          ))
+        ) : (
+          <EmptyTip py={0} />
+        )}
       </>
     );
   }, [filterList, onClickChange, value]);

projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/render/NodeCard.tsx

@@ -104,8 +104,8 @@ const NodeCard = (props: Props) => {
   const isAppNode = node && AppNodeFlowNodeTypeMap[node?.flowNodeType];
   const showVersion = useMemo(() => {
     if (!isAppNode || !node?.pluginId) return false;
-    const splitRes = node.pluginId.split('-');
-    if (splitRes.length > 1) {
+    if ([FlowNodeTypeEnum.tool, FlowNodeTypeEnum.toolSet].includes(node.flowNodeType)) return false;
+    if (node.pluginId.split('-').length > 1) {
       return false;
     }
     return true;