From 2bbb3d038e07b8278d75101e2d2fb78b9b2f4526 Mon Sep 17 00:00:00 2001 From: yumoqing Date: Tue, 5 May 2026 19:36:11 +0800 Subject: [PATCH] fix: flatten style to options, fix Button/Text widget properties - Flatten nested style objects directly into options - Text/Title use 'text', Button uses 'label' - All paths use {{entire_url()}} --- wwwroot/base.ui | 18 +-- wwwroot/opportunity_edit.ui | 216 ++++++++++++++++++++++-------- wwwroot/opportunity_management.ui | 30 ++--- 3 files changed, 178 insertions(+), 86 deletions(-) diff --git a/wwwroot/base.ui b/wwwroot/base.ui index d06ada5..6214948 100644 --- a/wwwroot/base.ui +++ b/wwwroot/base.ui @@ -4,28 +4,22 @@ "options": { "width": "100%", "height": "100%", - "style": { - "padding": "16px" - } + "padding": "16px" }, "subwidgets": [ { "widgettype": "HBox", "options": { - "style": { - "marginBottom": "16px", - "gap": "8px" - } + "marginBottom": "16px", + "gap": "8px" }, "subwidgets": [ { "widgettype": "Text", "options": { - "style": { - "fontSize": "20px", - "fontWeight": "bold" - }, - "text": "商机管理" + "text": "商机管理", + "fontSize": "20px", + "fontWeight": "bold" } }, { diff --git a/wwwroot/opportunity_edit.ui b/wwwroot/opportunity_edit.ui index d902c04..c68bca7 100644 --- a/wwwroot/opportunity_edit.ui +++ b/wwwroot/opportunity_edit.ui @@ -1,58 +1,166 @@ { - "widgettype": "Page", - "options": { - "title": "商机编辑", - "style": {"height": "100vh", "padding": "0"} - }, - "subwidgets": [ - { - "widgettype": "VBox", - "options": {"style": {"padding": "16px", "flex": 1, "overflow": "auto"}}, - "subwidgets": [ + "widgettype": "Page", + "options": { + "title": "商机编辑", + "height": "100vh", + "padding": "0" + }, + "subwidgets": [ { - "widgettype": "Form", - "id": "opportunity_form", - "options": { - "submit_url": "{{entire_url('api/opportunities_create.dspy')}}", - "method": "POST", - "layout": "vertical", - "style": {"maxWidth": "600px"}, - "fields": [ - {"name": "opportunity_name", "label": "商机名称", "uitype": "text", "required": true}, - {"name": "customer_id", "label": "客户ID", "uitype": "text", "required": true}, - {"name": "customer_name", "label": "客户名称", "uitype": "text", "required": true}, - {"name": "estimated_amount", "label": "预估金额", "uitype": "number", "required": true}, - {"name": "current_stage", "label": "阶段", "uitype": "code", "required": true, "data": [ - {"value": "qualification", "text": "资格确认"}, - {"value": "needs_analysis", "text": "需求分析"}, - {"value": "proposal", "text": "方案报价"}, - {"value": "negotiation", "text": "商务谈判"}, - {"value": "closed_won", "text": "成交"}, - {"value": "closed_lost", "text": "丢单"} - ]}, - {"name": "expected_close_date", "label": "预计成交日期", "uitype": "date", "required": true}, - {"name": "owner_id", "label": "负责人ID", "uitype": "text", "required": true}, - {"name": "owner_name", "label": "负责人", "uitype": "text", "required": true}, - {"name": "region", "label": "区域", "uitype": "code", "data": [ - {"value": "east", "text": "华东"}, - {"value": "south", "text": "华南"}, - {"value": "west", "text": "华西"}, - {"value": "north", "text": "华北"} - ]}, - {"name": "probability", "label": "成功概率(%)", "uitype": "number"}, - {"name": "description", "label": "描述", "uitype": "textarea"}, - {"name": "status", "label": "状态", "uitype": "code", "data": [ - {"value": "active", "text": "有效"}, - {"value": "inactive", "text": "无效"} - ]} - ], - "buttons": [ - {"type": "submit", "text": "保存", "variant": "primary"}, - {"type": "button", "text": "取消", "action": "navigate('main/opportunity_management/opportunity_management.ui')"} + "widgettype": "VBox", + "options": { + "padding": "16px", + "flex": 1, + "overflow": "auto" + }, + "subwidgets": [ + { + "widgettype": "Form", + "id": "opportunity_form", + "options": { + "submit_url": "{{entire_url('api/opportunities_create.dspy')}}", + "method": "POST", + "layout": "vertical", + "fields": [ + { + "name": "opportunity_name", + "label": "商机名称", + "uitype": "text", + "required": true + }, + { + "name": "customer_id", + "label": "客户ID", + "uitype": "text", + "required": true + }, + { + "name": "customer_name", + "label": "客户名称", + "uitype": "text", + "required": true + }, + { + "name": "estimated_amount", + "label": "预估金额", + "uitype": "number", + "required": true + }, + { + "name": "current_stage", + "label": "阶段", + "uitype": "code", + "required": true, + "data": [ + { + "value": "qualification", + "text": "资格确认" + }, + { + "value": "needs_analysis", + "text": "需求分析" + }, + { + "value": "proposal", + "text": "方案报价" + }, + { + "value": "negotiation", + "text": "商务谈判" + }, + { + "value": "closed_won", + "text": "成交" + }, + { + "value": "closed_lost", + "text": "丢单" + } + ] + }, + { + "name": "expected_close_date", + "label": "预计成交日期", + "uitype": "date", + "required": true + }, + { + "name": "owner_id", + "label": "负责人ID", + "uitype": "text", + "required": true + }, + { + "name": "owner_name", + "label": "负责人", + "uitype": "text", + "required": true + }, + { + "name": "region", + "label": "区域", + "uitype": "code", + "data": [ + { + "value": "east", + "text": "华东" + }, + { + "value": "south", + "text": "华南" + }, + { + "value": "west", + "text": "华西" + }, + { + "value": "north", + "text": "华北" + } + ] + }, + { + "name": "probability", + "label": "成功概率(%)", + "uitype": "number" + }, + { + "name": "description", + "label": "描述", + "uitype": "textarea" + }, + { + "name": "status", + "label": "状态", + "uitype": "code", + "data": [ + { + "value": "active", + "text": "有效" + }, + { + "value": "inactive", + "text": "无效" + } + ] + } + ], + "buttons": [ + { + "type": "submit", + "text": "保存", + "variant": "primary" + }, + { + "type": "button", + "text": "取消", + "action": "navigate('main/opportunity_management/opportunity_management.ui')" + } + ], + "maxWidth": "600px" + } + } ] - } } - ] - } - ] -} + ] +} \ No newline at end of file diff --git a/wwwroot/opportunity_management.ui b/wwwroot/opportunity_management.ui index 44107c8..e868482 100644 --- a/wwwroot/opportunity_management.ui +++ b/wwwroot/opportunity_management.ui @@ -2,29 +2,23 @@ "widgettype": "Page", "options": { "title": "商机管理", - "style": { - "height": "100vh", - "padding": "0" - } + "height": "100vh", + "padding": "0" }, "subwidgets": [ { "widgettype": "VBox", "options": { - "style": { - "padding": "16px", - "flex": 1, - "overflow": "hidden" - } + "padding": "16px", + "flex": 1, + "overflow": "hidden" }, "subwidgets": [ { "widgettype": "HBox", "options": { - "style": { - "marginBottom": "16px", - "gap": "8px" - } + "marginBottom": "16px", + "gap": "8px" }, "subwidgets": [ { @@ -33,9 +27,7 @@ "options": { "label": "搜索", "placeholder": "商机名称/客户", - "style": { - "flex": 1 - } + "flex": 1 } }, { @@ -62,9 +54,6 @@ "id": "opportunity_grid", "options": { "url": "{{entire_url('api/opportunities_list.dspy')}}", - "style": { - "flex": 1 - }, "columns": [ { "field": "opportunity_name", @@ -120,7 +109,8 @@ "icon": "delete", "action": "doDelete('{% raw %}{{selectedRow.id}}{% endraw %}')" } - ] + ], + "flex": 1 } } ]