lxm--尽量用getPSAppDataEntity代替getPSDataEntity

@CONTROL/@MACRO/CONTROL/CONTROL.vue.ftl

@@ -15,7 +15,7 @@ import view_${subctrl.getName()} from '@widgets/app/${srffilepath2(subctrl.getCo
 
 <#if ctrl.getPSLayoutPanels?? && ctrl.getPSLayoutPanels()??>
 <#list ctrl.getPSLayoutPanels() as panel>
-import layout_${panel.getName()} from '@widgets/${srffilepath2(panel.getPSDataEntity().getCodeName())}/${srffilepath2(panel.getCodeName())}-${panel.getControlType()?lower_case}/${srffilepath2(panel.getCodeName())}-${panel.getControlType()?lower_case}.vue';
+import layout_${panel.getName()} from '@widgets/${srffilepath2(panel.getPSAppDataEntity().getCodeName())}/${srffilepath2(panel.getCodeName())}-${panel.getControlType()?lower_case}/${srffilepath2(panel.getCodeName())}-${panel.getControlType()?lower_case}.vue';
 </#list>
 </#if>
 <#if import_block??>${import_block}</#if> 

@CONTROL/日历部件/CONTROL-BASE.vue.ftl

@@ -408,7 +408,7 @@ FullCalendar,
         switch(deName){
 <#if view.getAllRelatedPSAppViews?? && view.getAllRelatedPSAppViews()??>
   <#list view.getAllRelatedPSAppViews() as editview>
-            case "${editview.getPSDataEntity().getCodeName()?lower_case}": 
+            case "${editview.getPSAppDataEntity().getCodeName()?lower_case}": 
                 view = {
                     viewname: '${srffilepath2(editview.getCodeName())}', 
                     height: ${editview.getHeight()?c}, 

@CONTROL/树视图/SERVICE.ts.ftl

@@ -432,9 +432,9 @@ import ${srfclassname('${node.getPSAppDataEntity().codeName}')}Service from '@se
             </#if>
         });
 </#if>
-<#if node.getTreeNodeType() == 'DE' && node.getPSDataEntity()??>
-    <#assign filtername>${node.getPSDataEntity().codeName}SearchFilter</#assign>
-    <#assign entityname>${node.getPSDataEntity().codeName}</#assign>
+<#if node.getTreeNodeType() == 'DE' && node.getPSAppDataEntity()??>
+    <#assign filtername>${node.getPSAppDataEntity().codeName}SearchFilter</#assign>
+    <#assign entityname>${node.getPSAppDataEntity().codeName}</#assign>
             let searchFilter: any = {};
     <#list ctrl.getPSDETreeNodeRSs() as noders>
     <#if noders.getChildPSDETreeNode().id == node.id>

@CONTROL/甘特图部件/SERVICE.ts.ftl

@@ -465,9 +465,9 @@ import ${srfclassname('${node.getPSAppDataEntity().codeName}')}Service from '@se
             </#if>
         });
 </#if>
-<#if node.getTreeNodeType() == 'DE' && node.getPSDataEntity()??>
-    <#assign filtername>${node.getPSDataEntity().codeName}SearchFilter</#assign>
-    <#assign entityname>${node.getPSDataEntity().codeName}</#assign>
+<#if node.getTreeNodeType() == 'DE' && node.getPSAppDataEntity()??>
+    <#assign filtername>${node.getPSAppDataEntity().codeName}SearchFilter</#assign>
+    <#assign entityname>${node.getPSAppDataEntity().codeName}</#assign>
             let searchFilter: any = {};
     <#list ctrl.getPSDETreeNodeRSs() as noders>
     <#if noders.getChildPSDETreeNode().id == node.id>

@CONTROL/表格/CONTROL-BASE.vue.ftl

@@ -1202,7 +1202,7 @@ import { FormItemModel } from '@/model/form-detail';
         }
         // 已选中则删除，没选中则添加
         let selectIndex = this.selections.findIndex((item:any)=>{
-            return Object.is(item.${ctrl.getPSDataEntity().getName()?lower_case},$event.${ctrl.getPSDataEntity().getName()?lower_case});
+            return Object.is(item.${ctrl.getPSAppDataEntity().getName()?lower_case},$event.${ctrl.getPSAppDataEntity().getName()?lower_case});
         });
         if (Object.is(selectIndex,-1)){
           this.selections.push(JSON.parse(JSON.stringify($event)));
@@ -1481,7 +1481,7 @@ import { FormItemModel } from '@/model/form-detail';
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
     public setColState() {
-		const _data: any = localStorage.getItem('${ctrl.getPSDataEntity().getName()?lower_case}_${ctrl.getCodeName()?lower_case}_${ctrl.name}');
+		const _data: any = localStorage.getItem('${ctrl.getPSAppDataEntity().getName()?lower_case}_${ctrl.getCodeName()?lower_case}_${ctrl.name}');
 		if (_data) {
 			let columns = JSON.parse(_data);
 			columns.forEach((col: any) => {
@@ -1499,7 +1499,7 @@ import { FormItemModel } from '@/model/form-detail';
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
     public onColChange() {
-        localStorage.setItem('${ctrl.getPSDataEntity().getName()?lower_case}_${ctrl.getCodeName()?lower_case}_${ctrl.name}', JSON.stringify(this.allColumns));
+        localStorage.setItem('${ctrl.getPSAppDataEntity().getName()?lower_case}_${ctrl.getCodeName()?lower_case}_${ctrl.name}', JSON.stringify(this.allColumns));
     }
 
     /**

@CONTROL/门户部件/CONTROL.vue.ftl

@@ -38,7 +38,7 @@ import view_${subctrl.getName()} from '@widgets/app/${srffilepath2(subctrl.getCo
 
 <#if ctrl.getPSLayoutPanels?? && ctrl.getPSLayoutPanels()??>
 <#list ctrl.getPSLayoutPanels() as panel>
-import layout_${panel.getName()} from '@widgets/${srffilepath2(panel.getPSDataEntity().getCodeName())}/${srffilepath2(panel.getCodeName())}-${panel.getControlType()?lower_case}/${srffilepath2(panel.getCodeName())}-${panel.getControlType()?lower_case}.vue';
+import layout_${panel.getName()} from '@widgets/${srffilepath2(panel.getPSAppDataEntity().getCodeName())}/${srffilepath2(panel.getCodeName())}-${panel.getControlType()?lower_case}/${srffilepath2(panel.getCodeName())}-${panel.getControlType()?lower_case}.vue';
 </#list>
 </#if>
 <#if import_block??>${import_block}</#if> 

@EDITOR/@MACRO/FUNC/PUBLIC.vue.ftl

@@ -36,7 +36,7 @@
     "{ <#t>
       viewname: '${srffilepath2(pickupview.codeName)}'<#t>
     <#if pickupview.isPSDEView()>
-      , title: $t('entities.${pickupview.getPSDataEntity().getCodeName()?lower_case}.views.${pickupview.getPSDEViewCodeName()?lower_case}.title')<#t>
+      , title: $t('entities.${pickupview.getPSAppDataEntity().getCodeName()?lower_case}.views.${pickupview.getPSDEViewCodeName()?lower_case}.title')<#t>
     <#else>
       , title: $t('app.views.${pickupview.getCodeName()?lower_case}.title')<#t>
     </#if>
@@ -65,7 +65,7 @@
     "{ <#t>
     viewname: '${linkview.codeName}'<#t>
     <#if linkview.isPSDEView()>
-    , title: $t('entities.${linkview.getPSDataEntity().getCodeName()?lower_case}.views.${linkview.getPSDEViewCodeName()?lower_case}.title')<#t>
+    , title: $t('entities.${linkview.getPSAppDataEntity().getCodeName()?lower_case}.views.${linkview.getPSDEViewCodeName()?lower_case}.title')<#t>
     <#else>
     , title: $t('app.views.${linkview.getCodeName()?lower_case}.title')<#t>
     </#if>
@@ -77,7 +77,7 @@
     , isRedirectView: <#t>
     <#if linkview.isRedirectView()>
       true<#t>
-      <#assign link_de = linkview.getPSDataEntity()/>
+      <#assign link_de = linkview.getPSAppDataEntity().getPSDataEntity()/>
       , url: '/${app.getPKGCodeName()?lower_case}/${link_de.getPSSystemModule().codeName?lower_case}/${link_de.codeName?lower_case}/${linkview.getPSDEViewCodeName()?lower_case}/getmodel'<#t>
     <#else><#t>
       false<#t>

@LOGIC/@UIACTION/前台调用/LOGIC.vue.ftl

@@ -298,7 +298,7 @@ ${front_block}
                 window.open(url, '_blank');
                 return null;
             }
-        <#assign dataview_de = dataview.getPSDataEntity()/>
+        <#assign dataview_de = dataview.getPSAppDataEntity().getPSDataEntity()/>
             const url: string = '/${app.getPKGCodeName()?lower_case}/${dataview_de.getPSSystemModule().codeName?lower_case}/${dataview_de.codeName?lower_case}/${dataview.getPSDEViewCodeName()?lower_case}/getmodel';
             actionContext.$http.get(url, data).then((response: any) => {
                 if (!response || response.status !== 200) {

@MACRO/LANG_FUN.ftl

 <#macro getViewLanguageTitle tempView>
   <#if tempView.isPSDEView()>
-    $t('entities.${tempView.getPSDataEntity().getCodeName()?lower_case}.views.${tempView.getPSDEViewCodeName()?lower_case}.title')<#t>
+    $t('entities.${tempView.getPSAppDataEntity().getCodeName()?lower_case}.views.${tempView.getPSDEViewCodeName()?lower_case}.title')<#t>
   <#else>
     $t('app.views.${tempView.getCodeName()?lower_case}.title')<#t>
   </#if>

@VIEW/应用首页视图/ROUTER.ts.ftl

@@ -12,7 +12,7 @@ Vue.use(Router);
             {
                 path: '<#if !isIncludeIndex>/</#if>appdataredirectview/:appdataredirectview?',
                 meta: {
-                    caption: '<#if subView.isPSDEView()>entities.${subView.getPSDataEntity().getCodeName()?lower_case}.views.${subView.getPSDEViewCodeName()?lower_case}.caption<#else>app.views.${subView.getCodeName()?lower_case}.caption</#if>',
+                    caption: '<#if subView.isPSDEView()>entities.${subView.getPSAppDataEntity().getCodeName()?lower_case}.views.${subView.getPSDEViewCodeName()?lower_case}.caption<#else>app.views.${subView.getCodeName()?lower_case}.caption</#if>',
                     <#if subView.getPSSysImage()??>
                     imgPath: '${subView.getPSSysImage().getImagePath()}',
                     iconCls: '${subView.getPSSysImage().getCssClass()}',
@@ -30,7 +30,7 @@ Vue.use(Router);
             {
                 path: '<#if !isIncludeIndex>/</#if>appwfdataredirectview/:appwfdataredirectview?',
                 meta: {
-                    caption: '<#if subView.isPSDEView()>entities.${subView.getPSDataEntity().getCodeName()?lower_case}.views.${subView.getPSDEViewCodeName()?lower_case}.caption<#else>app.views.${subView.getCodeName()?lower_case}.caption</#if>',
+                    caption: '<#if subView.isPSDEView()>entities.${subView.getPSAppDataEntity().getCodeName()?lower_case}.views.${subView.getPSDEViewCodeName()?lower_case}.caption<#else>app.views.${subView.getCodeName()?lower_case}.caption</#if>',
                     <#if subView.getPSSysImage()??>
                     imgPath: '${subView.getPSSysImage().getImagePath()}',
                     iconCls: '${subView.getPSSysImage().getCssClass()}',
@@ -48,7 +48,7 @@ Vue.use(Router);
             {
                 path: '<#if !isIncludeIndex>/</#if>${subView.getViewType()?lower_case}/:${subView.getViewType()?lower_case}?',
                 meta: {
-                    caption: '<#if subView.isPSDEView()>entities.${subView.getPSDataEntity().getCodeName()?lower_case}.views.${subView.getPSDEViewCodeName()?lower_case}.caption<#else>app.views.${subView.getCodeName()?lower_case}.caption</#if>',
+                    caption: '<#if subView.isPSDEView()>entities.${subView.getPSAppDataEntity().getCodeName()?lower_case}.views.${subView.getPSDEViewCodeName()?lower_case}.caption<#else>app.views.${subView.getCodeName()?lower_case}.caption</#if>',
                     <#if subView.getPSSysImage()??>
                     imgPath: '${subView.getPSSysImage().getImagePath()}',
                     iconCls: '${subView.getPSSysImage().getCssClass()}',
@@ -66,7 +66,7 @@ Vue.use(Router);
             {
                 path: '<#if !isIncludeIndex>/</#if>${subView.getCodeName()?lower_case}/:${subView.getCodeName()?lower_case}?',
                 meta: {
-                    caption: '<#if subView.isPSDEView()>entities.${subView.getPSDataEntity().getCodeName()?lower_case}.views.${subView.getPSDEViewCodeName()?lower_case}.caption<#else>app.views.${subView.getCodeName()?lower_case}.caption</#if>',
+                    caption: '<#if subView.isPSDEView()>entities.${subView.getPSAppDataEntity().getCodeName()?lower_case}.views.${subView.getPSDEViewCodeName()?lower_case}.caption<#else>app.views.${subView.getCodeName()?lower_case}.caption</#if>',
                     <#if subView.getPSSysImage()??>
                     imgPath: '${subView.getPSSysImage().getImagePath()}',
                     iconCls: '${subView.getPSSysImage().getCssClass()}',
@@ -102,7 +102,7 @@ Vue.use(Router);
         path: '/${path}${srfpluralize(appDataEntity.codeName)?lower_case}/:${appDataEntity.getCodeName()?lower_case}?/${subView.getPSDEViewCodeName()?lower_case}/:${subView.getPSDEViewCodeName()?lower_case}?',
         <#-- 嵌入关系路由未设置name属性 -->
         meta: {
-            caption: '<#if subView.isPSDEView()>entities.${subView.getPSDataEntity().getCodeName()?lower_case}.views.${subView.getPSDEViewCodeName()?lower_case}.caption<#else>app.views.${subView.getCodeName()?lower_case}.caption</#if>',
+            caption: '<#if subView.isPSDEView()>entities.${subView.getPSAppDataEntity().getCodeName()?lower_case}.views.${subView.getPSDEViewCodeName()?lower_case}.caption<#else>app.views.${subView.getCodeName()?lower_case}.caption</#if>',
             <#if subView.getPSSysImage()??>
             imgPath: '${subView.getPSSysImage().getImagePath()}',
             iconCls: '${subView.getPSSysImage().getCssClass()}',
@@ -125,7 +125,7 @@ Vue.use(Router);
     {
         path: '/${srfpluralize(appDataEntity.codeName)?lower_case}/:${appDataEntity.getCodeName()?lower_case}?/${subView.getPSDEViewCodeName()?lower_case}/:${subView.getPSDEViewCodeName()?lower_case}?',
         meta: {
-            caption: '<#if subView.isPSDEView()>entities.${subView.getPSDataEntity().getCodeName()?lower_case}.views.${subView.getPSDEViewCodeName()?lower_case}.caption<#else>app.views.${subView.getCodeName()?lower_case}.caption</#if>',
+            caption: '<#if subView.isPSDEView()>entities.${subView.getPSAppDataEntity().getCodeName()?lower_case}.views.${subView.getPSDEViewCodeName()?lower_case}.caption<#else>app.views.${subView.getCodeName()?lower_case}.caption</#if>',
             <#if subView.getPSSysImage()??>
             imgPath: '${subView.getPSSysImage().getImagePath()}',
             iconCls: '${subView.getPSSysImage().getCssClass()}',
@@ -142,7 +142,7 @@ Vue.use(Router);
     {
         path: '/${subView.getCodeName()?lower_case}/:${subView.getCodeName()?lower_case}?',
         meta: {
-            caption: '<#if subView.isPSDEView()>entities.${subView.getPSDataEntity().getCodeName()?lower_case}.views.${subView.getPSDEViewCodeName()?lower_case}.caption<#else>app.views.${subView.getCodeName()?lower_case}.caption</#if>',
+            caption: '<#if subView.isPSDEView()>entities.${subView.getPSAppDataEntity().getCodeName()?lower_case}.views.${subView.getPSDEViewCodeName()?lower_case}.caption<#else>app.views.${subView.getCodeName()?lower_case}.caption</#if>',
             <#if subView.getPSSysImage()??>
             imgPath: '${subView.getPSSysImage().getImagePath()}',
             iconCls: '${subView.getPSSysImage().getCssClass()}',
@@ -182,7 +182,7 @@ const router = new Router({
                 });
             },
             meta: {  
-                caption: '<#if view.isPSDEView()>entities.${view.getPSDataEntity().getCodeName()?lower_case}.views.${view.getPSDEViewCodeName()?lower_case}.caption<#else>app.views.${view.getCodeName()?lower_case}.caption</#if>',
+                caption: '<#if view.isPSDEView()>entities.${view.getPSAppDataEntity().getCodeName()?lower_case}.views.${view.getPSDEViewCodeName()?lower_case}.caption<#else>app.views.${view.getCodeName()?lower_case}.caption</#if>',
                 viewType: 'APPINDEX',
                 <#if view.getPSSysImage()??>
                 imgPath: '${view.getPSSysImage().getImagePath()}',
@@ -212,7 +212,7 @@ const router = new Router({
                 {
                     path: '${path}${srfpluralize(appDataEntity.codeName)?lower_case}/:${appDataEntity.getCodeName()?lower_case}?/${subView.getPSDEViewCodeName()?lower_case}/:${subView.getPSDEViewCodeName()?lower_case}?',
                     meta: {
-                        caption: '<#if subView.isPSDEView()>entities.${subView.getPSDataEntity().getCodeName()?lower_case}.views.${subView.getPSDEViewCodeName()?lower_case}.caption<#else>app.views.${subView.getCodeName()?lower_case}.caption</#if>',
+                        caption: '<#if subView.isPSDEView()>entities.${subView.getPSAppDataEntity().getCodeName()?lower_case}.views.${subView.getPSDEViewCodeName()?lower_case}.caption<#else>app.views.${subView.getCodeName()?lower_case}.caption</#if>',
                         <#if subView.getPSSysImage()??>
                         imgPath: '${subView.getPSSysImage().getImagePath()}',
                         iconCls: '${subView.getPSSysImage().getCssClass()}',
@@ -236,7 +236,7 @@ const router = new Router({
                 {
                     path: '${srfpluralize(appDataEntity.codeName)?lower_case}/:${appDataEntity.getCodeName()?lower_case}?/${subView.getPSDEViewCodeName()?lower_case}/:${subView.getPSDEViewCodeName()?lower_case}?',
                     meta: {
-                        caption: '<#if subView.isPSDEView()>entities.${subView.getPSDataEntity().getCodeName()?lower_case}.views.${subView.getPSDEViewCodeName()?lower_case}.caption<#else>app.views.${subView.getCodeName()?lower_case}.caption</#if>',
+                        caption: '<#if subView.isPSDEView()>entities.${subView.getPSAppDataEntity().getCodeName()?lower_case}.views.${subView.getPSDEViewCodeName()?lower_case}.caption<#else>app.views.${subView.getCodeName()?lower_case}.caption</#if>',
                         <#if subView.getPSSysImage()??>
                         imgPath: '${subView.getPSSysImage().getImagePath()}',
                         iconCls: '${subView.getPSSysImage().getCssClass()}',
@@ -254,7 +254,7 @@ const router = new Router({
                 {
                     path: '${subView.getCodeName()?lower_case}/:${subView.getCodeName()?lower_case}?',
                     meta: {
-                        caption: '<#if subView.isPSDEView()>entities.${subView.getPSDataEntity().getCodeName()?lower_case}.views.${subView.getPSDEViewCodeName()?lower_case}.caption<#else>app.views.${subView.getCodeName()?lower_case}.caption</#if>',
+                        caption: '<#if subView.isPSDEView()>entities.${subView.getPSAppDataEntity().getCodeName()?lower_case}.views.${subView.getPSDEViewCodeName()?lower_case}.caption<#else>app.views.${subView.getCodeName()?lower_case}.caption</#if>',
                         <#if subView.getPSSysImage()??>
                         imgPath: '${subView.getPSSysImage().getImagePath()}',
                         iconCls: '${subView.getPSSysImage().getCssClass()}',