Skip to content

Commit cd547a6

Browse files
committed
refactor: Improve parameter handling in function execution
1 parent 3709d34 commit cd547a6

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

apps/application/flow/step_node/function_lib_node/impl/base_function_lib_node.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,10 @@ def execute(self, function_lib_id, input_field_list, **kwargs) -> NodeResult:
111111

112112
self.context['params'] = params
113113
# 合并初始化参数
114-
all_params = json.loads(rsa_long_decrypt(function_lib.init_params)) | params
114+
if function_lib.init_params is not None:
115+
all_params = json.loads(rsa_long_decrypt(function_lib.init_params)) | params
116+
else:
117+
all_params = params
115118
result = function_executor.exec_code(function_lib.code, all_params)
116119
return NodeResult({'result': result}, {}, _write_context=write_context)
117120

apps/function_lib/serializers/function_lib_serializer.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,8 +222,11 @@ def debug(self, debug_instance, with_valid=True):
222222
**field} for field in
223223
input_field_list]}
224224
# 合并初始化参数
225-
params = init_params | params
226-
return function_executor.exec_code(code, params)
225+
if init_params is not None:
226+
all_params = init_params | params
227+
else:
228+
all_params = params
229+
return function_executor.exec_code(code, all_params)
227230

228231
@staticmethod
229232
def get_field_value(debug_field_list, name, is_required):

0 commit comments

Comments
 (0)