|
@@ -90,8 +90,9 @@ |
|
|
"dataset": "${param.queryDs}" |
|
|
"dataset": "${param.queryDs}" |
|
|
}, |
|
|
}, |
|
|
"id": "id${newId()}" |
|
|
"id": "id${newId()}" |
|
|
}, |
|
|
|
|
|
{ |
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
<#if (group.sfilters?size>0)> |
|
|
|
|
|
,{ |
|
|
"type": "fx-button", |
|
|
"type": "fx-button", |
|
|
"props": { |
|
|
"props": { |
|
|
"label": "高级筛选", |
|
|
"label": "高级筛选", |
|
@@ -103,6 +104,7 @@ |
|
|
}, |
|
|
}, |
|
|
"id": "id${newId()}" |
|
|
"id": "id${newId()}" |
|
|
} |
|
|
} |
|
|
|
|
|
</#if> |
|
|
] |
|
|
] |
|
|
}, |
|
|
}, |
|
|
"layout": { |
|
|
"layout": { |
|
@@ -279,8 +281,9 @@ |
|
|
}, |
|
|
}, |
|
|
"events": { |
|
|
"events": { |
|
|
} |
|
|
} |
|
|
}, |
|
|
|
|
|
"graph": { |
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
<#if (group.sfilters?size>0)> |
|
|
|
|
|
,"graph": { |
|
|
"shape": "panel", |
|
|
"shape": "panel", |
|
|
"id": "root_panel", |
|
|
"id": "root_panel", |
|
|
"type": "fx-split-panel", |
|
|
"type": "fx-split-panel", |
|
@@ -302,7 +305,7 @@ |
|
|
"scroll": true |
|
|
"scroll": true |
|
|
}, |
|
|
}, |
|
|
"children": [ |
|
|
"children": [ |
|
|
<#if (group.sfilters?size>0)> |
|
|
|
|
|
|
|
|
|
|
|
<#assign fields = group.sfilters> |
|
|
<#assign fields = group.sfilters> |
|
|
<#list fields as filter> |
|
|
<#list fields as filter> |
|
|
{ |
|
|
{ |
|
@@ -324,7 +327,7 @@ |
|
|
} |
|
|
} |
|
|
<#if filter_has_next>,</#if> |
|
|
<#if filter_has_next>,</#if> |
|
|
</#list> |
|
|
</#list> |
|
|
</#if> |
|
|
|
|
|
|
|
|
|
|
|
] |
|
|
] |
|
|
}, |
|
|
}, |
|
|
{ |
|
|
{ |
|
@@ -372,6 +375,7 @@ |
|
|
} |
|
|
} |
|
|
] |
|
|
] |
|
|
} |
|
|
} |
|
|
|
|
|
</#if> |
|
|
} |
|
|
} |
|
|
], |
|
|
], |
|
|
</#list> |
|
|
</#list> |
|
|