调整视图消息服务

APP/src/message/%APP_MSG%/%APP_MSG%-message-base.ts.ftl

@@ -102,7 +102,7 @@ export default class ${srfclassname('${item.getCodeName()}')}MessageServiceBase
         this.name = "${item.getName()}";
         this.codename = "<#if item.getCodeName()??>${item.getCodeName()}</#if>";
         this.title = "<#if item.getTitle()??>${item.getTitle()}</#if>";
-        this.content = "<#if item.getTitle()??>${item.getTitle()}</#if>";
+        this.content = "<#if item.getMessage()??>${item.getMessage()}</#if>";
         this.closeMode = "";
         this.position = "<#if item.getPosition() !="">${item.getPosition()}<#else>TOP</#if>";
         this.type = "<#if item.getMessageType() !="">${item.getMessageType()}<#else>INFO</#if>";
@@ -160,21 +160,15 @@ export default class ${srfclassname('${item.getCodeName()}')}MessageServiceBase
                 id:"${item.getId()}",
                 name:"${item.getName()}",
                 codename:"<#if item.getCodeName()??>${item.getCodeName()}</#if>",
-                title:"<#if item.getTitle()??>${item.getTitle()}</#if>",
-                content:"<#if item.getTitle()??>${item.getTitle()}</#if>",
+                title:<#if item.getTitlePSDEField()??>item['${item.getTitlePSDEField().getCodeName()?lower_case}']<#else>"<#if item.getTitle()??>${item.getTitle()}</#if>"</#if>,
+                content:<#if item.getContentPSDEField()??>item['${item.getContentPSDEField().getCodeName()?lower_case}']<#else>"<#if item.getMessage()??>${item.getMessage()}</#if>"</#if>,
                 closeMode:"",
-                position:"<#if item.getPosition() !="">${item.getPosition()}<#else>TOP</#if>",
-                type:"<#if item.getMessageType() !="">${item.getMessageType()}<#else>INFO</#if>",
-                isEnableRemove:${item.isEnableRemove()?c},
-                order:1,
+                position:<#if item.getMsgPosPSDEField()??>item['${item.getMsgPosPSDEField().getCodeName()?lower_case}']<#else>"<#if item.getPosition() !="">${item.getPosition()}<#else>TOP</#if>"</#if>,
+                type:<#if item.getMsgTypePSDEField()??>item['${item.getMsgTypePSDEField().getCodeName()?lower_case}']<#else>"<#if item.getMessageType() !="">${item.getMessageType()}<#else>INFO</#if>"</#if>,
+                isEnableRemove:<#if item.getRemoveFlagPSDEField()??>item['${item.getRemoveFlagPSDEField().getCodeName()?lower_case}']<#else>${item.isEnableRemove()?c}</#if>,
+                order:<#if item.getOrderValuePSDEField()??>item['${item.getOrderValuePSDEField().getCodeName()?lower_case}']<#else>1</#if>,
                 dynamicMode:"DYNAMIC"
             };
-            <#if item.getTitlePSDEField()??>Object.assign(itemdata,{title:item['${item.getTitlePSDEField().getCodeName()?lower_case}']});</#if>
-            <#if item.getContentPSDEField()??>Object.assign(itemdata,{content:item['${item.getContentPSDEField().getCodeName()?lower_case}']});</#if>
-            <#if item.getMsgPosPSDEField()??>Object.assign(itemdata,{position:item['${item.getMsgPosPSDEField().getCodeName()?lower_case}']});</#if>
-            <#if item.getMsgTypePSDEField()??>Object.assign(itemdata,{type:item['${item.getMsgTypePSDEField().getCodeName()?lower_case}']});</#if>
-            <#if item.getOrderValuePSDEField()??>Object.assign(itemdata,{order:item['${item.getOrderValuePSDEField().getCodeName()?lower_case}']});</#if>
-            <#if item.getRemoveFlagPSDEField()??>Object.assign(itemdata,{isEnableRemove:item['${item.getRemoveFlagPSDEField().getCodeName()?lower_case}']});</#if>
             _items.push(itemdata);
         });
         return _items;