From 617accf97af9201818cb0b09ba6a5bcc892d26dc Mon Sep 17 00:00:00 2001 From: yumoqing Date: Tue, 5 May 2026 19:48:03 +0800 Subject: [PATCH] fix: deep-flatten all style objects to options at any nesting level - Flatten style in widget root, options, and nested structures (row_options.fields etc.) --- wwwroot/approval_instance.ui | 8 +++----- wwwroot/approval_task.ui | 40 ++++++++++++------------------------ 2 files changed, 16 insertions(+), 32 deletions(-) diff --git a/wwwroot/approval_instance.ui b/wwwroot/approval_instance.ui index 237306e..2a2bd31 100644 --- a/wwwroot/approval_instance.ui +++ b/wwwroot/approval_instance.ui @@ -155,11 +155,9 @@ "widgettype": "Button", "options": { "label": "提交", - "style": { - "backgroundColor": "#007bff", - "color": "#fff" - }, - "onclick": "submitForm('newInstanceForm', '/main/workflow_approval/api/instance_create.dspy', 'newInstanceDialog', null)" + "onclick": "submitForm('newInstanceForm', '/main/workflow_approval/api/instance_create.dspy', 'newInstanceDialog', null)", + "backgroundColor": "#007bff", + "color": "#fff" } } ] diff --git a/wwwroot/approval_task.ui b/wwwroot/approval_task.ui index 028c6b2..ee583ab 100644 --- a/wwwroot/approval_task.ui +++ b/wwwroot/approval_task.ui @@ -114,22 +114,18 @@ "widgettype": "Button", "options": { "label": "拒绝", - "style": { - "backgroundColor": "#dc3545", - "color": "#fff" - }, - "onclick": "submitForm('approveForm', '/main/workflow_approval/api/task_reject.dspy', 'approveDialog', null)" + "onclick": "submitForm('approveForm', '/main/workflow_approval/api/task_reject.dspy', 'approveDialog', null)", + "backgroundColor": "#dc3545", + "color": "#fff" } }, { "widgettype": "Button", "options": { "label": "批准", - "style": { - "backgroundColor": "#28a745", - "color": "#fff" - }, - "onclick": "submitForm('approveForm', '/main/workflow_approval/api/task_approve.dspy', 'approveDialog', null)" + "onclick": "submitForm('approveForm', '/main/workflow_approval/api/task_approve.dspy', 'approveDialog', null)", + "backgroundColor": "#28a745", + "color": "#fff" } } ] @@ -169,9 +165,7 @@ "widgettype": "Text", "options": { "text": "步骤: ", - "style": { - "fontWeight": "bold" - } + "fontWeight": "bold" } }, { @@ -193,9 +187,7 @@ "widgettype": "Text", "options": { "text": "审批类型: ", - "style": { - "fontWeight": "bold" - } + "fontWeight": "bold" } }, { @@ -217,9 +209,7 @@ "widgettype": "Text", "options": { "text": "分配时间: ", - "style": { - "fontWeight": "bold" - } + "fontWeight": "bold" } }, { @@ -241,9 +231,7 @@ "widgettype": "Text", "options": { "text": "截止时间: ", - "style": { - "fontWeight": "bold" - } + "fontWeight": "bold" } }, { @@ -276,11 +264,9 @@ "widgettype": "Button", "options": { "label": "去审批", - "style": { - "backgroundColor": "#007bff", - "color": "#fff" - }, - "onclick": "closeDialog('taskDetailDialog'); openDialog('approveDialog'); setDialogField('approveDialog', 'task_id', getDialogField('taskDetailDialog', 'task_id')); setDialogField('approveDialog', 'task_title', getDialogField('taskDetailDialog', 'task_title'))" + "onclick": "closeDialog('taskDetailDialog'); openDialog('approveDialog'); setDialogField('approveDialog', 'task_id', getDialogField('taskDetailDialog', 'task_id')); setDialogField('approveDialog', 'task_title', getDialogField('taskDetailDialog', 'task_title'))", + "backgroundColor": "#007bff", + "color": "#fff" } } ]