zhuchaowe/maxkb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修复复制 工作流数据未复制

Browse Source
This commit is contained in:
shaohuzhang1 2024-08-22 15:44:49 +08:00 committed by shaohuzhang1
parent 3b35a2cf69
commit 5cf871c6dc
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/application/serializers/application_serializers.py
View File

@ -121,12 +121,15 @@ class ApplicationWorkflowSerializer(serializers.Serializer):
desc = serializers.CharField(required=False, allow_null=True, allow_blank=True, desc = serializers.CharField(required=False, allow_null=True, allow_blank=True,
max_length=256, min_length=1, max_length=256, min_length=1,
error_messages=ErrMessage.char("应用描述")) 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, prologue = serializers.CharField(required=False, allow_null=True, allow_blank=True, max_length=4096,
error_messages=ErrMessage.char("开场白")) error_messages=ErrMessage.char("开场白"))
@staticmethod @staticmethod
def to_application_model(user_id: str, application: Dict): def to_application_model(user_id: str, application: Dict):
if application.get('work_flow') is not None:
default_workflow = application.get('work_flow')
else:
default_workflow_json = get_file_content( default_workflow_json = get_file_content(
os.path.join(PROJECT_DIR, "apps", "application", 'flow', 'default_workflow.json')) os.path.join(PROJECT_DIR, "apps", "application", 'flow', 'default_workflow.json'))
default_workflow = json.loads(default_workflow_json) default_workflow = json.loads(default_workflow_json)

2
apps/application/sql/list_application.sql
View File

@ -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 SELECT
* *
FROM FROM