Merge branch 'master' of http://47.92.149.153:3000/zhenggm/smtweb2

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()}"
                                         }
+                                        </#if>
                                     ]
                                 },
                                 "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>,</#if>
                                     </#list>
-                                </#if>
+
                         ]
                     },
                     {
@@ -372,6 +375,7 @@
                     }
                 ]
             }
+    </#if>
         }
     ],
 </#list>