From 6c6c964b8afc0b437c712ee8163b694a9bc6933f Mon Sep 17 00:00:00 2001
From: heheer <heheer@sealos.io>
Date: Fri, 8 Nov 2024 17:19:05 +0800
Subject: [PATCH] array reference check & node ui (#3100)

---
 .../WorkflowComponents/Flow/nodes/NodeIfElse/ListItem.tsx   | 1 +
 .../WorkflowComponents/Flow/nodes/NodeIfElse/index.tsx      | 2 +-
 .../WorkflowComponents/Flow/nodes/NodeVariableUpdate.tsx    | 6 +++---
 .../Flow/nodes/render/RenderInput/templates/JsonEditor.tsx  | 2 +-
 projects/app/src/web/core/workflow/utils.ts                 | 3 ++-
 5 files changed, 8 insertions(+), 6 deletions(-)

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 33e19f2f3..25bb5b540 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
@@ -62,6 +62,7 @@ const ListItem = ({
         position={'relative'}
         transform={snapshot.isDragging ? `scale(${getZoom()})` : ''}
         transformOrigin={'top left'}
+        mb={2}
       >
         <Container w={snapshot.isDragging ? '' : 'full'} className="nodrag">
           <Flex mb={4} alignItems={'center'}>
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 b8f020a4b..882739d23 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<FlowNodeItemType>) => {
 
   return (
     <NodeCard selected={selected} maxW={'1000px'} {...data}>
-      <Flex flexDirection={'column'} cursor={'default'} gap={2}>
+      <Flex flexDirection={'column'} cursor={'default'}>
         <DndDrag<IfElseListItemType>
           onDragEndCb={(list: IfElseListItemType[]) => onUpdateIfElseList(list)}
           dataList={ifElseList}
diff --git a/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/NodeVariableUpdate.tsx b/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/NodeVariableUpdate.tsx
index c6312aacf..2933eb43b 100644
--- a/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/NodeVariableUpdate.tsx
+++ b/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/NodeVariableUpdate.tsx
@@ -121,7 +121,7 @@ const NodeVariableUpdate = ({ data, selected }: NodeProps<FlowNodeItemType>) =>
       };
 
       return (
-        <Container key={index} mt={4} w={'full'} mx={0}>
+        <Container key={index} w={'full'} mx={0}>
           <Flex alignItems={'center'}>
             <Flex w={'60px'}>{t('common:core.workflow.variable')}</Flex>
             <VariableSelector
@@ -268,11 +268,11 @@ const NodeVariableUpdate = ({ data, selected }: NodeProps<FlowNodeItemType>) =>
     return (
       <NodeCard selected={selected} maxW={'1000px'} {...data}>
         <Box px={4} pb={4}>
-          <>
+          <Flex flexDirection={'column'} gap={4}>
             {updateList.map((updateItem, index) => (
               <ValueRender key={index} updateItem={updateItem} index={index} />
             ))}
-          </>
+          </Flex>
           <Flex
             className="nodrag"
             cursor={'default'}
diff --git a/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/render/RenderInput/templates/JsonEditor.tsx b/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/render/RenderInput/templates/JsonEditor.tsx
index 43e703fa4..4636e74b6 100644
--- a/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/render/RenderInput/templates/JsonEditor.tsx
+++ b/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/render/RenderInput/templates/JsonEditor.tsx
@@ -50,7 +50,7 @@ const JsonEditor = ({ inputs = [], item, nodeId }: RenderInputProps) => {
     }
     return JSON.stringify(item.value, null, 2);
   }, [item.value]);
-  console.log(12121);
+
   return (
     <JSONEditor
       className="nowheel"
diff --git a/projects/app/src/web/core/workflow/utils.ts b/projects/app/src/web/core/workflow/utils.ts
index 46e864b26..5161fd0a8 100644
--- a/projects/app/src/web/core/workflow/utils.ts
+++ b/projects/app/src/web/core/workflow/utils.ts
@@ -412,7 +412,8 @@ export const checkWorkflowNodeAndConnection = ({
             if (input.required && (!input.value || input.value.length === 0)) {
               return true;
             }
-            return isValidArrayReferenceValue(input.value, nodeIds);
+
+            return input.required && !isValidArrayReferenceValue(input.value, nodeIds);
           }
           return input.required && !isValidReferenceValue(input.value, nodeIds);
         }