From ef0ff750ad621449b312ee6f819d436b79ff3a74 Mon Sep 17 00:00:00 2001 From: FLYPHT <1035748121@qq.com> Date: Thu, 18 Aug 2022 12:11:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9Amodel=5Flist=5Fcard.?= =?UTF-8?q?ftl=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../template/default/incModel/inc_list_query.ftl | 6 ++---- .../template/default/incModel/inc_list_table.ftl | 14 +++++-------- .../default/incModel/inc_query_sfilters.ftl | 10 ++++------ .../resources/static/template/default/index.yaml | 2 +- .../static/template/default/model_list_card.ftl | 23 +++++++++++----------- 5 files changed, 23 insertions(+), 32 deletions(-) diff --git a/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_list_query.ftl b/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_list_query.ftl index 1a8050b..45ae051 100644 --- a/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_list_query.ftl +++ b/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_list_query.ftl @@ -51,7 +51,6 @@ "props": { "label": "重置", "leftIcon": "clear", - "type": "", "action": "button:reset", "dataset": "${param.queryDs}", "link": false, @@ -65,8 +64,7 @@ "label": "查询", "leftIcon": "search", "type": "primary", - "action": "button:search", - "dataset": "${param.queryDs}" + "action": "button:loadList" } } <#if (group.sfilters?size>0)> @@ -79,7 +77,7 @@ "action": "button:link", "link": true, "linkType": "drawer", - "fxLink": "dialog:qrueydialog" + "fxLink": "dialog:queryDialog" } } diff --git a/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_list_table.ftl b/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_list_table.ftl index 737fdc9..90fe426 100644 --- a/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_list_table.ftl +++ b/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_list_table.ftl @@ -66,13 +66,12 @@ "label": "编辑", "type": "primary", "leftIcon": "edit", - "action": "button:edit", + "action": "button:editCard", "link": false, "text": true, "linkType": "dialog", - "fxLink": "dialog:editDialog", - "fxLink_text": "${param.editTitle}", - "dataset": "${param.editDs}" + "fxLink": "dialog:cardDialog", + "fxLink_text": "${param.cardTitle}" } }, @@ -83,13 +82,10 @@ "label": "删除", "type": "danger", "leftIcon": "delete-themes", - "action": "button:remove", - "preAction": "", + "action": "button:delCard", "link": false, "text": true, - "confirm": "", - "nextAction": "button:search", - "dataset": "${param.queryDs}" + "confirm": "" } } ] diff --git a/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_query_sfilters.ftl b/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_query_sfilters.ftl index da691f8..a788157 100644 --- a/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_query_sfilters.ftl +++ b/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_query_sfilters.ftl @@ -5,7 +5,7 @@ "type":"fx-dialog", "props": { "title": "查询条件", - "key": "qrueydialog", + "key": "queryDialog", "destroyOnClose": true, "closeOnClickModal": true, "width": "20%", @@ -81,8 +81,7 @@ "type": "fx-button", "props": { "label": "重置", - "leftIcon": "clear", - "action": "button:return" + "leftIcon": "clear" }, "id": "id${newId()}" }, @@ -92,8 +91,7 @@ "label": "查询", "leftIcon": "save", "type": "success", - "action": "button:search", - "dataset": "${param.queryDs}" + "action": "button:loadList" }, "id": "id${newId()}" } @@ -103,4 +101,4 @@ ] }] } -} \ No newline at end of file +} diff --git a/smtweb-framework/bpm/src/main/resources/static/template/default/index.yaml b/smtweb-framework/bpm/src/main/resources/static/template/default/index.yaml index fbb2540..ea49048 100644 --- a/smtweb-framework/bpm/src/main/resources/static/template/default/index.yaml +++ b/smtweb-framework/bpm/src/main/resources/static/template/default/index.yaml @@ -37,7 +37,7 @@ model: # 变量 param: - - name: 'editTitle' + name: 'cardTitle' type: 'input' label: '卡片标题' desc: '请选择弹窗卡片标题' diff --git a/smtweb-framework/bpm/src/main/resources/static/template/default/model_list_card.ftl b/smtweb-framework/bpm/src/main/resources/static/template/default/model_list_card.ftl index 6b8411e..42e23bc 100644 --- a/smtweb-framework/bpm/src/main/resources/static/template/default/model_list_card.ftl +++ b/smtweb-framework/bpm/src/main/resources/static/template/default/model_list_card.ftl @@ -66,15 +66,14 @@ "label": "新增", "leftIcon": "plus", "type": "primary", - "action": "button:add", + "action": "button:addCard", "link": false, - "linkType": "dialog", - "fxLink": "dialog:editDialog", - <#if (param.editTitle == "")> - "title": "卡片demo", + "fxLink": "dialog:cardDialog", + <#if (param.cardTitle == "")> + "title": "卡片" <#else> - "fxLink_text": "${param.editTitle}", + "fxLink_text": "${param.cardTitle}" }, "id": "id${newId()}" @@ -107,12 +106,12 @@ "id": "id${newId()}", "type": "fx-dialog", "props": { - <#if (param.editTitle == "")> - "title": "卡片demo", + <#if (param.cardTitle == "")> + "title": "卡片", <#else> - "title": "${param.editTitle}", + "title": "${param.cardTitle}", - "key": "editDialog", + "key": "cardDialog", "fontSize": 16, "color": "#313131", "fontWeight": "bold", @@ -267,7 +266,7 @@ "label": "保存", "leftIcon": "save", "type": "success", - "action": "button:save", + "action": "button:saveCard" }, "id": "id${newId()}" }, @@ -276,7 +275,7 @@ "props": { "label": "关闭", "leftIcon": "close", - "action": "button:closeDialog", + "action": "button:closeDialog" }, "id": "id${newId()}" }