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

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

@@ -3,10 +3,10 @@
 </#ibizinclude>
     <#macro getres tempView>
     <#compress>
-    <#if tempView.getPSAppDataEntity?? && tempView.getPSAppDataEntity()?? && tempView.getPSAppDataEntity().getPSDataEntity?? && tempView.getPSAppDataEntity().getPSDataEntity()??>
-    <#assign dataeneity = tempView.getPSAppDataEntity().getPSDataEntity() />
-    <#if dataeneity.getMajorPSDERs?? && dataeneity.getMajorPSDERs()??>
-    [<#list dataeneity.getMajorPSDERs() as psDes>'${psDes.getName()}'<#if psDes_has_next>,</#if></#list>]
+    <#if tempView.getPSAppDataEntity?? && tempView.getPSAppDataEntity()?? && tempView.getPSAppDataEntity().getMajorPSAppDERSs?? && tempView.getPSAppDataEntity().getMajorPSAppDERSs()??>
+    <#assign appDataEneity = tempView.getPSAppDataEntity() />
+    <#if appDataEneity.getMajorPSAppDERSs?? && appDataEneity.getMajorPSAppDERSs()??>
+    [<#list appDataEneity.getMajorPSAppDERSs() as psDes>'${psDes.getMajorPSAppDataEntity()}'<#if psDes_has_next>,</#if></#list>]
     </#if>
     </#if>
     </#compress>
@@ -37,6 +37,8 @@
         </#list>
         ];
         </#if>
+        console.log(this.context);
+        console.log(args);
         const data: any = {};
         if (args && args.length > 0 && args[0].srfsourcekey) {
             Object.assign(data, { srfsourcekey: args[0].srfsourcekey })
@@ -58,7 +60,7 @@
                 })
             }
         })
-        const openPopupModal = (view: any, data: any) => {
+        <#--  const openPopupModal = (view: any, data: any) => {
             let container: Subject<any> = this.$appmodal.openModal(view, data);
             container.subscribe((result: any) => {
                 if (!result || !Object.is(result.ret, 'OK')) {
@@ -102,7 +104,7 @@
             }
         })
         const view: any = curView;
-        openPopupModal(view, data);
+        openPopupModal(view, data);  -->
     <#elseif viewlogic.isBatchAddOnly()>
         this.$Notice.warning({ title: '错误', desc: '只支持批添加未实现' });
     <#elseif viewlogic.getNewDataPSAppView()??>