From a53c6829c7cfe7b055e502a9538d18e12280956c Mon Sep 17 00:00:00 2001
From: zhangshaohu <shaohu.zhang@fit2cloud.com>
Date: Tue, 27 Aug 2024 22:48:32 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E6=B5=81=E5=87=BD=E6=95=B0=E8=8A=82=E7=82=B9=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E7=B1=BB=E5=9E=8B=E6=9C=AA=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/base_function_lib_node.py            | 23 +++++++++++--------
 .../function_node/impl/base_function_node.py  | 23 +++++++++++--------
 2 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/apps/application/flow/step_node/function_lib_node/impl/base_function_lib_node.py b/apps/application/flow/step_node/function_lib_node/impl/base_function_lib_node.py
index d5799ae07..db8c5c819 100644
--- a/apps/application/flow/step_node/function_lib_node/impl/base_function_lib_node.py
+++ b/apps/application/flow/step_node/function_lib_node/impl/base_function_lib_node.py
@@ -44,16 +44,19 @@ def get_field_value(debug_field_list, name, is_required):
 
 def valid_reference_value(_type, value, name):
     if _type == 'int':
-        return isinstance(value, int)
-    if _type == 'float':
-        return isinstance(value, float)
-    if _type == 'dict':
-        return isinstance(value, dict)
-    if _type == 'array':
-        return isinstance(value, list)
-    if _type == 'string':
-        return isinstance(value, str)
-    raise Exception(500, f'字段:{name}类型:{_type}值:{value}类型错误')
+        instance_type = int
+    elif _type == 'float':
+        instance_type = float
+    elif _type == 'dict':
+        instance_type = dict
+    elif _type == 'array':
+        instance_type = list
+    elif _type == 'string':
+        instance_type = str
+    else:
+        raise Exception(500, f'字段:{name}类型:{_type} 不支持的类型')
+    if not isinstance(value, instance_type):
+        raise Exception(f'字段:{name}类型:{_type}值:{value}类型错误')
 
 
 def convert_value(name: str, value, _type, is_required, source, node):
diff --git a/apps/application/flow/step_node/function_node/impl/base_function_node.py b/apps/application/flow/step_node/function_node/impl/base_function_node.py
index 38aec0689..bf8d9492b 100644
--- a/apps/application/flow/step_node/function_node/impl/base_function_node.py
+++ b/apps/application/flow/step_node/function_node/impl/base_function_node.py
@@ -33,16 +33,19 @@ def write_context(step_variable: Dict, global_variable: Dict, node, workflow):
 
 def valid_reference_value(_type, value, name):
     if _type == 'int':
-        return isinstance(value, int)
-    if _type == 'float':
-        return isinstance(value, float)
-    if _type == 'dict':
-        return isinstance(value, dict)
-    if _type == 'array':
-        return isinstance(value, list)
-    if _type == 'string':
-        return isinstance(value, str)
-    raise Exception(500, f'字段:{name}类型:{_type}值:{value}类型错误')
+        instance_type = int
+    elif _type == 'float':
+        instance_type = float
+    elif _type == 'dict':
+        instance_type = dict
+    elif _type == 'array':
+        instance_type = list
+    elif _type == 'string':
+        instance_type = str
+    else:
+        raise Exception(500, f'字段:{name}类型:{_type} 不支持的类型')
+    if not isinstance(value, instance_type):
+        raise Exception(f'字段:{name}类型:{_type}值:{value}类型错误')
 
 
 def convert_value(name: str, value, _type, is_required, source, node):