Merge branch 'dev' of http://demo.ibizlab.cn/ibizr7pfstdtempl/ibizvuemobr7 into dev

@CONTROL/树视图/CONTROL-BASE.template.ftl

@@ -19,7 +19,7 @@
         <#list node.getPSDETreeNodeRSs() as nodeitem>
         <#if nodeitem.getChildPSDETreeNode?? && nodeitem.getChildPSDETreeNode()??>
         <#assign nodeitemchild = nodeitem.getChildPSDETreeNode()>
-        <#if nodeitemchild.hasPSDETreeNodeRSs?? && nodeitemchild.hasPSDETreeNodeRSs()?? && nodeitemchild.hasPSDETreeNodeRSs()>
+        <#if nodeitemchild.getTreeNodeType?? && nodeitemchild.getTreeNodeType()?? && nodeitemchild.getTreeNodeType() != 'STATIC'>
         <ion-item>
             <ion-label>${nodeitemchild.getName()}</ion-label>
             <ion-icon class="tree-icon" slot="end" name="chevron-forward-outline"></ion-icon>
@@ -32,6 +32,28 @@
         </#list>
        </ion-list>
        </#if>
+
+        <#if ctrl.getPSDETreeNodes?? && ctrl.getPSDETreeNodes()??>
+        <div class="tree-partition tree-partition-bigger"></div>
+        <ion-list>
+        <#list ctrl.getPSDETreeNodes() as node>
+        <#if node.isRootNode?? && node.isRootNode()?? && node.isRootNode()>
+        <#if node.getPSDETreeNodeRSs?? && node.getPSDETreeNodeRSs()??>
+        <#list node.getPSDETreeNodeRSs() as nodeitem>
+        <#if nodeitem.getChildPSDETreeNode?? && nodeitem.getChildPSDETreeNode()??>
+        <#assign nodeitemchild = nodeitem.getChildPSDETreeNode()>
+        <#if nodeitemchild.getTreeNodeType?? && nodeitemchild.getTreeNodeType()?? && nodeitemchild.getTreeNodeType() == 'STATIC'>
+        <ion-item>
+            <ion-label>${nodeitemchild.getName()}</ion-label>
+        </ion-item>
+        </#if>
+        </#if>
+        </#list>
+        </#if>
+        </#if>
+        </#list>
+       </ion-list>
+       </#if>
     </#if>
     </div>
 </template>
\ No newline at end of file