简化赋值为null的配置。

Author: wangliang181230

apps/application/flow/step_node/variable_assign_node/impl/base_variable_assign_node.py

@@ -89,15 +89,15 @@ def handle(self, variable, evaluation):
                 val = self.convert(val, variable.get('target_type'))
                 evaluation(variable, val)
                 result['output_value'] = val
-            elif variable['type'] == 'null':
-                val = None
-                evaluation(variable, val)
-                result['output_value'] = val
             else:
                 val = variable['value']
                 val = self.convert(val, variable.get('target_type'))
                 evaluation(variable, val)
                 result['output_value'] = val
+        elif variable['source'] == 'null':
+            val = None
+            evaluation(variable, val)
+            result['output_value'] = val
         else:
             reference = self.get_reference_content(variable['reference'])
             reference = self.convert(reference, variable.get('target_type'))

ui/src/workflow/nodes/variable-assign-node/index.vue

@@ -45,6 +45,7 @@
             <el-select :teleported="false" v-model="item.source" size="small" style="width: 85px">
               <el-option :label="$t('workflow.variable.Referencing')" value="referencing" />
               <el-option :label="$t('common.custom')" value="custom" />
+              <el-option :label="null" value="null" />
             </el-select>
           </div>
 
@@ -86,7 +87,6 @@
               ></el-input>
             </el-form-item>
             <el-form-item
-              class="w-full"
               v-else-if="item.type === 'num'"
               :prop="'variable_list.' + index + '.value'"
               :rules="{
@@ -152,7 +152,7 @@
               <el-option v-for="item2 in targetTypeOptions" :key="item2.key" :label="item2.label" :value="item2.key" />
             </el-select>
           </div>
-          <el-form-item v-else>
+          <el-form-item v-else-if="item.source === 'referencing'">
             <NodeCascader
               ref="nodeCascaderRef2"
               :nodeModel="nodeModel"
@@ -187,7 +187,7 @@ import { WorkflowMode } from '@/enums/application'
 const workflowMode = inject('workflowMode') as WorkflowMode
 const props = defineProps<{ nodeModel: any }>()
 
-const typeOptions = ['string', 'num', 'json', 'bool', 'null']
+const typeOptions = ['string', 'num', 'json', 'bool']
 const targetTypeOptions = [
   { label: t('workflow.nodes.variableAssignNode.doNotConvert'), key: '' },
   { label: 'string', key: 'string' },