From 11464151e249219da4597eb5bd0f2a1b0afa37a9 Mon Sep 17 00:00:00 2001 From: feng <1304903146@qq.com> Date: Wed, 5 Jul 2023 14:22:27 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9C=89=E9=BB=98=E8=AE=A4=E5=80=BC=20r?= =?UTF-8?q?equired=20=E4=B8=BAfalse?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/automations/base/manager.py | 6 +----- apps/common/serializers/dynamic.py | 4 ++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/apps/assets/automations/base/manager.py b/apps/assets/automations/base/manager.py index b0215710a..d18e56f05 100644 --- a/apps/assets/automations/base/manager.py +++ b/apps/assets/automations/base/manager.py @@ -55,12 +55,8 @@ class BasePlaybookManager: return {} data = self.params.get(method_id) - default_data = serializer().data if not data: - data = automation_params.get(method_id, default_data) - - for k, v in default_data.items(): - data.setdefault(k, v) + data = automation_params.get(method_id, {}) params = serializer(data).data return { diff --git a/apps/common/serializers/dynamic.py b/apps/common/serializers/dynamic.py index 49e1e062d..c02bb3818 100644 --- a/apps/common/serializers/dynamic.py +++ b/apps/common/serializers/dynamic.py @@ -51,8 +51,8 @@ def create_serializer_class(serializer_name, fields_info): field_type = data.pop('type', 'str') # 用户定义 default 和 required 可能会冲突, 所以要处理一下 - default = data.get('default', '') - if default not in ['', None]: + default = data.get('default') + if default is not None: data['required'] = False else: data.pop('default', None)