diff --git a/packages/global/core/workflow/template/input.ts b/packages/global/core/workflow/template/input.ts index 3cccc3155..6a73b5e6e 100644 --- a/packages/global/core/workflow/template/input.ts +++ b/packages/global/core/workflow/template/input.ts @@ -111,7 +111,7 @@ export const Input_Template_Node_Height: FlowNodeInputItemType = { renderTypeList: [FlowNodeInputTypeEnum.hidden], valueType: WorkflowIOValueTypeEnum.number, label: '', - value: 900 + value: 960 }; export const Input_Template_Stream_MODE: FlowNodeInputItemType = { diff --git a/projects/app/src/pages/app/detail/components/WorkflowComponents/AppCard.tsx b/projects/app/src/pages/app/detail/components/WorkflowComponents/AppCard.tsx index c639bfa0d..3c86ff4df 100644 --- a/projects/app/src/pages/app/detail/components/WorkflowComponents/AppCard.tsx +++ b/projects/app/src/pages/app/detail/components/WorkflowComponents/AppCard.tsx @@ -4,19 +4,18 @@ import { useContextSelector } from 'use-context-selector'; import { AppContext, TabEnum } from '../context'; import { useTranslation } from 'next-i18next'; import Avatar from '@fastgpt/web/components/common/Avatar'; -import MyMenu from '@fastgpt/web/components/common/MyMenu'; import MyIcon from '@fastgpt/web/components/common/Icon'; import { WorkflowContext } from './context'; import { filterSensitiveNodesData } from '@/web/core/workflow/utils'; import dynamic from 'next/dynamic'; import { useCopyData } from '@/web/common/hooks/useCopyData'; -import { useSystemStore } from '@/web/common/system/useSystemStore'; import MyTag from '@fastgpt/web/components/common/Tag/index'; import { publishStatusStyle } from '../constants'; import MyPopover from '@fastgpt/web/components/common/MyPopover'; import { fileDownload } from '@/web/common/file/utils'; import { AppChatConfigType } from '@fastgpt/global/core/app/type'; import MyBox from '@fastgpt/web/components/common/MyBox'; +import { useSystemStore } from '@/web/common/system/useSystemStore'; const ImportSettings = dynamic(() => import('./Flow/ImportSettings')); @@ -28,11 +27,10 @@ const AppCard = ({ isPublished: boolean; }) => { const { t } = useTranslation(); + const { feConfigs } = useSystemStore(); - const { appDetail, onOpenInfoEdit, onOpenTeamTagModal, onDelApp } = useContextSelector( - AppContext, - (v) => v - ); + const { appDetail, onOpenInfoEdit, onOpenTeamTagModal, onDelApp, currentTab } = + useContextSelector(AppContext, (v) => v); const { isOpen: isOpenImport, onOpen: onOpenImport, onClose: onCloseImport } = useDisclosure(); @@ -104,36 +102,41 @@ const AppCard = ({ })} + {appDetail.permission.hasWritePer && feConfigs?.show_team_chat && ( + <> + + + {t('app:Team_Tags')} + + + + )} - - - {t('app:Team_Tags')} - - - - - - {t('common:common.Delete')} - + {appDetail.permission.isOwner && ( + + + {t('common:common.Delete')} + + )} )} @@ -142,6 +145,10 @@ const AppCard = ({ [ appDetail.chatConfig, appDetail.name, + appDetail.permission.hasWritePer, + appDetail.permission.isOwner, + currentTab, + feConfigs?.show_team_chat, onDelApp, onOpenImport, onOpenInfoEdit, diff --git a/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/hooks/useWorkflow.tsx b/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/hooks/useWorkflow.tsx index bbc707b67..bd90b7f1b 100644 --- a/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/hooks/useWorkflow.tsx +++ b/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/hooks/useWorkflow.tsx @@ -319,7 +319,7 @@ export const useWorkflow = () => { type: 'position', position: { x: rect.x - 50, - y: rect.y - 280 + y: rect.y - 300 } } ]); diff --git a/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/NodeIfElse/ListItem.tsx b/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/NodeIfElse/ListItem.tsx index 0d3fead83..fb70b3d54 100644 --- a/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/NodeIfElse/ListItem.tsx +++ b/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/NodeIfElse/ListItem.tsx @@ -266,7 +266,7 @@ const ListItem = ({ nodeId={nodeId} handleId={handleId} position={Position.Right} - translate={[18, 0]} + translate={[3, 0]} /> )} diff --git a/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/NodeIfElse/index.tsx b/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/NodeIfElse/index.tsx index 6808370c0..5cf13619d 100644 --- a/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/NodeIfElse/index.tsx +++ b/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/NodeIfElse/index.tsx @@ -48,7 +48,7 @@ const NodeIfElse = ({ data, selected }: NodeProps) => { return ( - + onDragEndCb={(list: IfElseListItemType[]) => onUpdateIfElseList(list)} dataList={ifElseList} @@ -98,12 +98,12 @@ const NodeIfElse = ({ data, selected }: NodeProps) => { nodeId={nodeId} handleId={elseHandleId} position={Position.Right} - translate={[26, 0]} + translate={[20, 0]} /> - - + +