diff --git a/smtweb-framework/sw-system-bpm/src/main/resources/static/template/model_list1.ftl b/smtweb-framework/sw-system-bpm/src/main/resources/static/template/model_list1.ftl index 93a747d..bcba6d5 100644 --- a/smtweb-framework/sw-system-bpm/src/main/resources/static/template/model_list1.ftl +++ b/smtweb-framework/sw-system-bpm/src/main/resources/static/template/model_list1.ftl @@ -90,8 +90,9 @@ "dataset": "${param.queryDs}" }, "id": "id${newId()}" - }, - { + } + <#if (group.sfilters?size>0)> + ,{ "type": "fx-button", "props": { "label": "高级筛选", @@ -103,6 +104,7 @@ }, "id": "id${newId()}" } + ] }, "layout": { @@ -279,8 +281,9 @@ }, "events": { } - }, - "graph": { + } + <#if (group.sfilters?size>0)> + ,"graph": { "shape": "panel", "id": "root_panel", "type": "fx-split-panel", @@ -302,7 +305,7 @@ "scroll": true }, "children": [ - <#if (group.sfilters?size>0)> + <#assign fields = group.sfilters> <#list fields as filter> { @@ -324,7 +327,7 @@ } <#if filter_has_next>, - + ] }, { @@ -372,6 +375,7 @@ } ] } + } ],