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

@LOGIC/@VIEWLOGIC/新建/LOGIC.vue.ftl

@@ -11,6 +11,17 @@
     </#if>
     </#compress>
     </#macro>
+    <#macro getreskey appEntity curEntity>
+    <#compress>
+    <#if appEntity.getMajorPSAppDERSs()??>
+    <#list appEntity.getMajorPSAppDERSs() as appDeRs>
+    <#if appDeRs.getMinorPSAppDataEntity().getId() == curEntity.getId>
+    ${appDeRs.getPSDER1N().getPSPickupDEField().getCodeName()?lower_case}
+    </#if>
+    </#list>
+    </#if>
+    </#compress>
+    </#macro>
     <#if item.getPSViewLogic?? && item.getPSViewLogic()??>
     <#assign viewlogic = item.getPSViewLogic()/>
     /**
@@ -33,7 +44,8 @@
         const batchAddPSAppViews=[
         <#list batchAddPSAppViews as batchAddPSAppView>
             {view:{viewname:'${srffilepath2(batchAddPSAppView.getCodeName())}',height: ${batchAddPSAppView.getHeight()?c},width: ${batchAddPSAppView.getWidth()?c},title: '${batchAddPSAppView.title}'},
-            res:<@getres tempView=batchAddPSAppView /><#if batchAddPSAppView.getPSAppDataEntity()??><#assign appDataEntity= batchAddPSAppView.getPSAppDataEntity()/>,'resAppKey':'${appDataEntity.getKeyPSAppDEField().getName()?lower_case}'</#if>}<#if batchAddPSAppView_has_next>,</#if>
+            res:<@getres tempView=batchAddPSAppView /><#if batchAddPSAppView.getPSAppDataEntity()??><#assign appDataEntity= batchAddPSAppView.getPSAppDataEntity()/>,
+            'resAppKey':'<@getreskey appEntity=appDataEntity curEntity=view.getPSAppDataEntity()/>'</#if>}<#if batchAddPSAppView_has_next>,</#if>
         </#list>
         ];
         </#if>