From 5cf871c6dcf3e8dc4a48208aab50e97745c3e7c1 Mon Sep 17 00:00:00 2001 From: shaohuzhang1 Date: Thu, 22 Aug 2024 15:44:49 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=A4=8D=E5=88=B6=20?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81=E6=95=B0=E6=8D=AE=E6=9C=AA=E5=A4=8D?= =?UTF-8?q?=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serializers/application_serializers.py | 11 +++++++---- apps/application/sql/list_application.sql | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/apps/application/serializers/application_serializers.py b/apps/application/serializers/application_serializers.py index 9586cb20a..bef20bd64 100644 --- a/apps/application/serializers/application_serializers.py +++ b/apps/application/serializers/application_serializers.py @@ -121,15 +121,18 @@ class ApplicationWorkflowSerializer(serializers.Serializer): desc = serializers.CharField(required=False, allow_null=True, allow_blank=True, max_length=256, min_length=1, error_messages=ErrMessage.char("应用描述")) + work_flow = serializers.DictField(required=False, error_messages=ErrMessage.dict("工作流对象")) prologue = serializers.CharField(required=False, allow_null=True, allow_blank=True, max_length=4096, error_messages=ErrMessage.char("开场白")) @staticmethod def to_application_model(user_id: str, application: Dict): - - default_workflow_json = get_file_content( - os.path.join(PROJECT_DIR, "apps", "application", 'flow', 'default_workflow.json')) - default_workflow = json.loads(default_workflow_json) + if application.get('work_flow') is not None: + default_workflow = application.get('work_flow') + else: + default_workflow_json = get_file_content( + os.path.join(PROJECT_DIR, "apps", "application", 'flow', 'default_workflow.json')) + default_workflow = json.loads(default_workflow_json) for node in default_workflow.get('nodes'): if node.get('id') == 'base-node': node.get('properties')['node_data'] = {"desc": application.get('desc'), diff --git a/apps/application/sql/list_application.sql b/apps/application/sql/list_application.sql index b7aa0fbe9..4a4cde556 100644 --- a/apps/application/sql/list_application.sql +++ b/apps/application/sql/list_application.sql @@ -1,4 +1,4 @@ -SELECT *,to_json(dataset_setting) as dataset_setting,to_json(model_setting) as model_setting FROM ( SELECT * FROM application ${application_custom_sql} UNION +SELECT *,to_json(dataset_setting) as dataset_setting,to_json(model_setting) as model_setting,to_json(work_flow) as work_flow FROM ( SELECT * FROM application ${application_custom_sql} UNION SELECT * FROM