Merge branch 'master' into 2020.07.12

@CONTROL/@MACRO/CONTROL/CONTROL_PORTLET-HEADER-BASE.vue.ftl

@@ -22,12 +22,16 @@ import ${srfclassname('${ctrl.codeName}')}Service from './${srffilepath2(ctrl.co
 <#list ctrl.getPSUIActions() as uiAction>
 <#if uiAction.getPSAppDataEntity()??>
 <#assign curAppEntity = uiAction.getPSAppDataEntity()/>
-<#if !P.exists("importService", curAppEntity.getId(), "")>
+<#if !P.exists("importService", curAppEntity.getId(), "") >
 import ${srfclassname('${curAppEntity.getCodeName()}')}UIService from '@/uiservice/${srffilepath2(curAppEntity.getCodeName())}/${srffilepath2(curAppEntity.getCodeName())}-ui-service';
+<#if appde?? && (curAppEntity.getId() == appde.getId())><#assign hasAppDE = true /></#if>
 </#if>
 </#if>
 </#list>
 </#if>
+<#if appde?? && !hasAppDE??>
+import ${srfclassname('${appde.getCodeName()}')}UIService from '@/uiservice/${srffilepath2(appde.getCodeName())}/${srffilepath2(appde.getCodeName())}-ui-service';
+</#if>
 <#--  语言资源入口  -->
 <#ibizinclude>
 ./LANGBASE.vue.ftl
@@ -135,6 +139,14 @@ export default class <#if ctrl.getPSAppDataEntity()??>${srfclassname('${ctrl.get
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     public appEntityService: ${srfclassname('${appde.getCodeName()}')}Service = new ${srfclassname('${appde.getCodeName()}')}Service({ $store: this.$store });
+
+    /**
+     * 界面UI服务对象
+     *
+     * @type {${srfclassname('${appde.getCodeName()}')}UIService}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
+     */  
+    public appUIService:${srfclassname('${appde.getCodeName()}')}UIService = new ${srfclassname('${appde.getCodeName()}')}UIService(this.$store);
 </#if>
     <#if ctrl.getPSControls?? && ctrl.getPSControls()??>
     <#list ctrl.getPSControls() as childCtrl>

@CONTROL/应用菜单/CONTROL-BASE.vue.ftl

@@ -11,111 +11,7 @@
       :collapse="isCollapse"
       @select="select"
       :default-active="defaultActive">
-        <template v-for="item0 in menus">
-            <template v-if="item0.items && Array.isArray(item0.items) && item0.items.length > 0">
-                <el-submenu v-show="!item0.hidden" :index="item0.name" :popper-class="popperClass" :key="item0.id">
-                    <template slot='title'>
-                        <template v-if="item0.icon && item0.icon != ''">
-                            <img :src="item0.icon" class='app-menu-icon' />
-                        </template>
-                        <template v-else-if="item0.iconcls && item0.iconcls != ''">
-                            <i :class="[item0.iconcls, 'app-menu-icon']"></i>
-                        </template>
-                        <template v-else>
-                            <i class='fa fa-cogs app-menu-icon'></i>
-                        </template>
-                        <span class='text' :title="$t('app.menus.${ctrl.codeName?lower_case}.' + item0.name)">{{$t('app.menus.${ctrl.codeName?lower_case}.' + item0.name)}}</span>
-                    </template>
-                    <template v-for="item1 in item0.items">
-                        <template v-if="item1.items && Array.isArray(item1.items) && item1.items.length > 0">
-                            <el-submenu v-show="!item1.hidden" :index="item1.name" :popper-class="popperClass" :key="item1.id">
-                                <template slot='title'>
-                                    <template v-if="item1.icon && item1.icon != ''">
-                                        <img :src="item1.icon" class='app-menu-icon' />
-                                    </template>
-                                    <template v-else-if="item1.iconcls && item1.iconcls != ''">
-                                        <i :class="[item1.iconcls, 'app-menu-icon']"></i>
-                                    </template>
-                                    <span class='text' :title="$t('app.menus.${ctrl.codeName?lower_case}.' + item1.name)">{{$t('app.menus.${ctrl.codeName?lower_case}.' + item1.name)}}</span>
-                                </template>
-                                <template v-for="item2 in item1.items">
-                                    <template v-if="item2.type =='MENUITEM'">
-                                        <el-menu-item v-show="!item2.hidden" :index="item2.name" :key="item2.id">
-                                            <template v-if="item2.icon && item2.icon != ''">
-                                                <img :src="item2.icon" class='app-menu-icon' />
-                                            </template>
-                                            <template v-else-if="item2.iconcls && item2.iconcls != ''">
-                                                <i :class="[item2.iconcls, 'app-menu-icon']"></i>
-                                            </template>
-                                            <template slot="title">
-                                                <span class="text" :title="$t('app.menus.${ctrl.codeName?lower_case}.' + item2.name)">{{$t('app.menus.${ctrl.codeName?lower_case}.' + item2.name)}}</span>
-                                                <template v-if="counterdata && counterdata[item2.counterid] && counterdata[item2.counterid] > 0">
-                                                    <span class="pull-right">
-                                                        <badge :count="counterdata[item2.counterid]" :overflow-count="9999"></badge>
-                                                    </span>
-                                                </template>
-                                            </template>
-                                        </el-menu-item>
-                                    </template>
-                                    <template v-if="item2.type =='SEPERATOR'">
-                                            <divider :key="item2.id" />
-                                    </template>
-                                </template>
-                            </el-submenu>
-                        </template>
-                        <template v-else>
-                            <template v-if="item1.type =='MENUITEM'">
-                                <el-menu-item v-show="!item1.hidden" :index="item1.name" :key="item1.id">
-                                    <template v-if="item1.icon && item1.icon != ''">
-                                        <img :src="item1.icon" class='app-menu-icon' />
-                                    </template>
-                                    <template v-else-if="item1.iconcls && item1.iconcls != ''">
-                                        <i :class="[item1.iconcls, 'app-menu-icon']"></i>
-                                    </template>
-                                    <template slot="title">
-                                        <span class="text" :title="$t('app.menus.${ctrl.codeName?lower_case}.' + item1.name)">{{$t('app.menus.${ctrl.codeName?lower_case}.' + item1.name)}} </span>
-                                        <template v-if="counterdata && counterdata[item1.counterid] && counterdata[item1.counterid] > 0">
-                                            <span class="pull-right">
-                                                <badge :count="counterdata[item1.counterid]" :overflow-count="9999"></badge>
-                                            </span>
-                                        </template>
-                                    </template>
-                                </el-menu-item>
-                            </template>
-                            <template v-if="item1.type =='SEPERATOR'">
-                                    <divider :key="item1.id" />
-                            </template>
-                        </template>
-                    </template>
-                </el-submenu>
-            </template>
-            <template v-else>
-                <template v-if="item0.type =='MENUITEM'">
-                    <el-menu-item v-show="!item0.hidden" :index="item0.name" :key="item0.id">
-                        <template v-if="item0.icon && item0.icon != ''">
-                            <img :src="item0.icon" class='app-menu-icon' />
-                        </template>
-                        <template v-else-if="item0.iconcls && item0.iconcls != ''">
-                            <i :class="[item0.iconcls, 'app-menu-icon']"></i>
-                        </template>
-                        <template v-else>
-                            <i class='fa fa-cogs app-menu-icon'></i>
-                        </template>
-                        <template slot="title">
-                            <span class="text" :title="$t('app.menus.${ctrl.codeName?lower_case}.' + item0.name)">{{$t('app.menus.${ctrl.codeName?lower_case}.' + item0.name)}}</span>
-                            <template v-if="counterdata && counterdata[item0.counterid] && counterdata[item0.counterid] > 0">
-                                <span class="pull-right">
-                                    <badge :count="counterdata[item0.counterid]" :overflow-count="9999"></badge>
-                                </span>
-                            </template>
-                        </template>
-                    </el-menu-item>
-                </template>
-                <template v-if="item0.type =='SEPERATOR'">
-                        <divider :key="item0.id" />
-                </template>
-            </template>
-        </template>
+        <app-menu-item :menus="menus" :ctrlName="'${ctrl.codeName?lower_case}'" :isFirst="true" :counterdata="counterdata" :popperclass="popperClass"></app-menu-item>
     </el-menu>
 </div>
 </#if>

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

@@ -262,6 +262,7 @@ import schema from 'async-validator';
           <#if ctrl.getPSDEFormItemVRs()??>
             <#list ctrl.getPSDEFormItemVRs() as fideValueRule>
             <#if fideValueRule.getPSDEFormItemName() == formdetail.getName()>
+                <#-- 系统值规则 -->
               <#if fideValueRule.getPSSysValueRule()??>
                 <#assign  valueRule = fideValueRule.getPSSysValueRule()/>
                 <#if valueRule.getRuleType?? && valueRule.getRuleType()??>
@@ -280,6 +281,7 @@ import schema from 'async-validator';
         </#list>
     }
 
+
     /**
      * 详情模型集合
      *

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

@@ -77,6 +77,9 @@
     <#list item.getPSDEUIActionGroup().getPSUIActionGroupDetails() as uiactionDetail>
       <#if uiactionDetail.getPSUIAction?? && uiactionDetail.getPSUIAction()??>
         <#assign uiaction = uiactionDetail.getPSUIAction() />
+        <#if preUIAction??>
+                <divider type='vertical' v-show="scope.row.${preUIAction.getUIActionTag()}.visabled && scope.row.${uiaction.getUIActionTag()}.visabled" ></divider>
+        </#if>
         <#if !uiactionDetail.isShowCaption()>
                 <tooltip :transfer="true" :max-width="600">
         </#if>
@@ -88,9 +91,7 @@
                 <div slot='content'>{{<#if langbase??>$t('${langbase}.uiactions.<#if uiaction.getPSAppDataEntity?? && uiaction.getPSAppDataEntity()??>${uiaction.getPSAppDataEntity().getCodeName()?lower_case}_</#if>${uiaction.getUIActionTag()?lower_case}')<#else>'${uiaction.getCaption()}'</#if>}}</div>
                 </tooltip>
         </#if>
-        <#if uiactionDetail_has_next>
-                <divider type='vertical' v-show="scope.row.${uiaction.getUIActionTag()}.visabled" ></divider>
-        </#if>
+        <#assign preUIAction = uiaction />
       </#if>
     </#list>
   </#if>
@@ -168,7 +169,12 @@
                   </app-column-link>
                   <#else>
                   <#if item.getPSDEGridEditItem()?? && item.getPSDEGridEditItem().getPSEditorType?? && item.getPSDEGridEditItem().getPSEditorType()??>
-                    <app-span name='${item.name}' editorType="${item.getPSDEGridEditItem().getPSEditorType().getStandardPSEditorType()}" :value="row.${item.getName()?lower_case}"></app-span>
+                    <app-span name='${item.name}' editorType="${item.getPSDEGridEditItem().getPSEditorType().getStandardPSEditorType()}" :value="row.${item.getName()?lower_case}" <#t>
+                    <#if item.getPSDEField().getDataType()!="">
+                      dataType="${item.getPSDEField().getDataType()}" <#t>
+                    </#if>
+                    <#if item.getPSDEField().getPrecision()??>
+                      precision="${item.getPSDEField().getPrecision()}" <#t></#if>></app-span>
                   <#else>
                   <#if item.getValueFormat()?? && item.getValueFormat() != "%1$s">
                     <app-format-data format="${item.getValueFormat()}" :data="row.${item.getName()?lower_case}"></app-format-data>

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

 <template>
 <div class='grid' style="height:100%;">
-    <#if ctrl.render?? || ctrl.getRender()??> 
+    <#if ctrl.render??> 
     ${ctrl.render.code}
     <#else>
   <i-form style="height:100%">

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

@@ -110,7 +110,7 @@
         <#if ctrl.render??>
             ${ctrl.render.code}
         <#else>
-            <app-actionbar :items="actionBarModelData" @itemClick="handleItemClick"></app-actionbar>
+            <app-actionbar :viewState="viewState" :uiService="appUIService" :items="actionBarModelData" @itemClick="handleItemClick"></app-actionbar>
         </#if>
         </div>
       <#--  HTML  -->
@@ -208,6 +208,9 @@ import { Environment } from '@/environments/environment';
         <#assign counter = uiaction.getPSAppCounter() />
         counterService:this.${srfclassname('${counter.getCodeName()}')}counterservice,
         <#if uiaction.getCounterId()??>counterId:"${uiaction.getCounterId()}",</#if>
+        noprivdisplaymode:'<#if uiaction.getNoPrivDisplayMode(view)??>${uiaction.getNoPrivDisplayMode(view)}</#if>',
+        dataaccaction:'<#if uiaction.getDataAccessAction()??>${uiaction.getDataAccessAction()}</#if>',
+        visabled:true,disabled:false
         </#if>
         </#if>
         </#if>

@EDITOR/@MACRO/GRID/DEFAULT.vue.ftl

+<#if item.render??> 
+    ${item.render.code}
+<#else>
 <input-box 
   :disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1" 
   v-model="row[column.property]" 
@@ -7,3 +10,4 @@
   <#if item.getPlaceHolder()??>placeholder="${item.getPlaceHolder()}"</#if>
   @change="($event)=>{gridEditItemChange(row, column.property, $event, $index)}">
 </input-box>
+</#if>
\ No newline at end of file

@EDITOR/@MACRO/PANEL/DEFAULT.vue.ftl

+<#if item.render??> 
+    ${item.render.code}
+<#else>
 <input-box 
 <#if item.getEnableCond??>
   :disabled="data.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1" 
@@ -9,3 +12,4 @@
   <#if item.getPlaceHolder()??>placeholder="${item.getPlaceHolder()}"</#if>
   @change="($event)=>{panelEditItemChange(data, ${editor.getName()?lower_case}, $event)}">
 </input-box>
+</#if>
\ No newline at end of file

@EDITOR/HTML编辑器/EDITOR.vue.ftl

+<#if item.render??> 
+    ${item.render.code}
+<#else>
 <app-rich-text-editor :formState="formState" :value="data.${editor.name}" @change="(val) =>{this.data.${editor.name} =val}" :disabled="detailsModel.${editor.name}.disabled" :data="JSON.stringify(this.data)"  name="${editor.name}" :uploadparams='<#if editor.getEditorParam('uploadparams','') != ''>${editor.getEditorParam('uploadparams','')}<#else>{}</#if>' :exportparams='<#if editor.getEditorParam('exportparams','') != ''>${editor.getEditorParam('exportparams','')}<#else>{}</#if>' <#if editor.getEditorHeight() gt 0> height={${editor.getEditorHeight()?c}}</#if> style="${editor.getEditorCssStyle()}"></app-rich-text-editor>
+</#if>
\ No newline at end of file

@EDITOR/HTML编辑器/PANELEDITOR.vue.ftl

+<#if item.render??> 
+    ${item.render.code}
+<#else>
 <app-rich-text-editor :formState="formState" :value="data.${editor.name?lower_case}" @change="(val) =>{this.data.${editor.name?lower_case} =val}" <#if item.getEnableCond??>:disabled="data.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1"</#if>  name="${editor.name?lower_case}"<#if editor.getEditorHeight() gt 0> height={${editor.getEditorHeight()?c}}</#if> style="${editor.getEditorCssStyle()}"></app-rich-text-editor>
+</#if>
\ No newline at end of file

@EDITOR/下拉列表框/EDITOR.vue.ftl

  <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
+<#if item.render??>
+    ${item.render.code}
+<#else>
  <dropdown-list 
     v-model="data.${editor.name}" 
     :data="data" 
@@ -14,3 +17,4 @@
     </#if> 
     placeholder=<#if item.getPlaceHolder()??>'${item.getPlaceHolder()}'<#else>'请选择...'</#if> style="${editor.getEditorCssStyle()}">
  </dropdown-list>
+</#if>
\ No newline at end of file

@EDITOR/下拉列表框/GRIDEIDTOR.vue.ftl

  <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
+<#if item.render??>
+    ${item.render.code}
+<#else>
  <dropdown-list 
   v-model="row[column.property]" 
   :disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1" 
@@ -16,3 +19,4 @@
   style="${item.getEditorCssStyle()}" 
   @change="($event)=>{gridEditItemChange(row, column.property, $event, $index)}">
  </dropdown-list>
+ </#if>

@EDITOR/下拉列表框/PANELEDITOR.vue.ftl

  <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
+<#if item.render??>
+    ${item.render.code}
+<#else>
  <dropdown-list 
   v-model="data.${editor.name?lower_case}" 
 <#if item.getEnableCond??>
@@ -18,3 +21,4 @@
   style="${item.getEditorCssStyle()}" 
   @change="($event)=>{panelEditItemChange(data, '${editor.name?lower_case}', $event)}">
  </dropdown-list>
+ </#if>

@EDITOR/下拉列表框（100宽度）/EDITOR.vue.ftl

  <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
+<#if item.render??>
+    ${item.render.code}
+<#else>
  <dropdown-list 
   v-model="data.${editor.name}" 
   :data="data" 
@@ -15,3 +18,4 @@
   </#if>  
   placeholder=<#if item.getPlaceHolder()??>'${item.getPlaceHolder()}'<#else>'请选择...'</#if>>
  </dropdown-list>
+ </#if>
\ No newline at end of file

@EDITOR/下拉列表框（100宽度）/GRIDEIDTOR.vue.ftl

 <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
+<#if item.render??>
+    ${item.render.code}
+<#else>
  <dropdown-list 
   v-model="row[column.property]" 
   :disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1" 
@@ -16,3 +19,4 @@
   placeholder=<#if item.getPlaceHolder()??>'${item.getPlaceHolder()}'<#else>'请选择...'</#if> 
   @change="($event)=>{gridEditItemChange(row, column.property, $event, $index)}">
  </dropdown-list>
+ </#if>

@EDITOR/下拉列表框（100宽度）/PANELEDITOR.vue.ftl

 <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
+<#if item.render??>
+    ${item.render.code}
+<#else>
  <dropdown-list 
   v-model="data.${editor.name?lower_case}" 
 <#if item.getEnableCond??>
@@ -18,3 +21,4 @@
   style="${item.getEditorCssStyle()}width: 100px;" 
   @change="($event)=>{panelEditItemChange(data, '${editor.name?lower_case}', $event)}">
  </dropdown-list>
+</#if>
\ No newline at end of file

@EDITOR/下拉列表框（多选）/EDITOR.vue.ftl

 <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
+<#if item.render??>
+    ${item.render.code}
+<#else>
 <dropdown-list-mpicker 
   v-model="data.${editor.name}"
   :data="data" 
@@ -17,3 +20,4 @@
   </#if> 
   placeholder=<#if item.getPlaceHolder()??>'${item.getPlaceHolder()}'<#else>'请选择...'</#if> style="${editor.getEditorCssStyle()}">
 </dropdown-list-mpicker>
+</#if>
\ No newline at end of file

@EDITOR/下拉列表框（多选）/GRIDEIDTOR.vue.ftl

 <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
+<#if item.render??>
+    ${item.render.code}
+<#else>
 <dropdown-list-mpicker 
   v-model="row[column.property]" 
   :data="row" 
@@ -17,3 +20,4 @@
   @change="($event)=>{gridEditItemChange(row, column.property, $event, $index)}"
   style="${item.getEditorCssStyle()}">
 </dropdown-list-mpicker>
+</#if>
\ No newline at end of file

@EDITOR/下拉列表框（多选）/PANELEDITOR.vue.ftl

 <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
+<#if item.render??>
+    ${item.render.code}
+<#else>
 <dropdown-list-mpicker 
   v-model="data.${editor.name?lower_case}" 
   :data="data" 
@@ -19,3 +22,4 @@
   @change="($event)=>{panelEditItemChange(data, '${editor.name?lower_case}', $event)}"
   style="${item.getEditorCssStyle()}">
 </dropdown-list-mpicker>
+</#if>
\ No newline at end of file

@EDITOR/代码编辑器/EDITOR.vue.ftl

+<#if item.render??>
+    ${item.render.code}
+<#else>
 <app-code-editor :code="data.${editor.name}" :disabled="detailsModel.${editor.name}.disabled" @change="(val) =>{this.data.${editor.name} =val}" codetype="javascript" ></app-code-editor>
+</#if>
\ No newline at end of file

@EDITOR/单选项列表/EDITOR.vue.ftl

 <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
+<#if item.render??>
+    ${item.render.code}
+<#else>
 <app-radio-group 
   v-model="data.${editor.name}"
   :data="data" 
@@ -15,3 +18,4 @@
   </#if> 
   style="${editor.getEditorCssStyle()}">
 </app-radio-group>
+</#if>
\ No newline at end of file

@EDITOR/单选项列表/GRIDEIDTOR.vue.ftl

 <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
+<#if item.render??>
+    ${item.render.code}
+<#else>
 <app-radio-group 
   v-model="row[column.property]" 
   :disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1" 
@@ -16,3 +19,4 @@
 </#if> 
   style="${item.getEditorCssStyle()}">
 </app-radio-group>
+</#if>
\ No newline at end of file

@EDITOR/单选项列表/PANELEDITOR.vue.ftl

 <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
+<#if item.render??>
+    ${item.render.code}
+<#else>
 <app-radio-group 
   v-model="data.${editor.name?lower_case}" 
 <#if item.getEnableCond??>
@@ -18,3 +21,4 @@
 </#if> 
   style="${item.getEditorCssStyle()}">
 </app-radio-group>
+</#if>

@EDITOR/图片控件/EDITOR.vue.ftl

+<#if item.render??>
+    ${item.render.code}
+<#else>
  <app-image-upload :multiple="true" :formState="formState" :ignorefieldvaluechange="ignorefieldvaluechange" @formitemvaluechange="onFormItemValueChange" :data="JSON.stringify(this.data)" name='${editor.name}' :value="data.${editor.name}" :disabled="detailsModel.${editor.name}.disabled" :uploadparams='<#if editor.getEditorParam('uploadparams','') != ''>${editor.getEditorParam('uploadparams','')}<#else>{}</#if>' :exportparams='<#if editor.getEditorParam('exportparams','') != ''>${editor.getEditorParam('exportparams','')}<#else>{}</#if>' style="${editor.getEditorCssStyle()}overflow: auto;"></app-image-upload>
+ </#if>
\ No newline at end of file

@EDITOR/图片控件/GRIDEIDTOR.vue.ftl

+<#if item.render??>
+    ${item.render.code}
+<#else>
 <app-file-upload 
   :formState="viewState" 
   :ignorefieldvaluechange="false" 
@@ -11,3 +14,4 @@
   :uploadparams='<#if editor.getEditorParam('uploadparams','') != ''>${editor.getEditorParam('uploadparams','')}<#else>{}</#if>' :exportparams='<#if editor.getEditorParam('exportparams','') != ''>${editor.getEditorParam('exportparams','')}<#else>{}</#if>'
   style="${editor.getEditorCssStyle()}overflow: auto;">
 </app-file-upload>
+</#if>
\ No newline at end of file

@EDITOR/图片控件/PANELEDITOR.vue.ftl

+<#if item.render??>
+    ${item.render.code}
+<#else>
 <app-file-upload 
   :formState="viewState" 
   :ignorefieldvaluechange="false" 
@@ -14,3 +17,4 @@
   :exportparams='<#if editor.getEditorParam('exportparams','') != ''>${editor.getEditorParam('exportparams','')}<#else>{}</#if>' 
   style="${editor.getEditorCssStyle()}overflow: auto;">
 </app-file-upload>
+</#if>
\ No newline at end of file

@EDITOR/图片控件（单项）/EDITOR.vue.ftl

+<#if item.render??>
+    ${item.render.code}
+<#else>
  <app-image-upload :multiple="false" :formState="formState" :ignorefieldvaluechange="ignorefieldvaluechange" @formitemvaluechange="onFormItemValueChange" :data="JSON.stringify(this.data)" name='${editor.name}' :value="data.${editor.name}" :disabled="detailsModel.${editor.name}.disabled" :uploadparams='<#if editor.getEditorParam('uploadparams','') != ''>${editor.getEditorParam('uploadparams','')}<#else>{}</#if>' :exportparams='<#if editor.getEditorParam('exportparams','') != ''>${editor.getEditorParam('exportparams','')}<#else>{}</#if>' ></app-image-upload>
+ </#if>
\ No newline at end of file

@EDITOR/图片控件（单项）/GRIDEIDTOR.vue.ftl

+<#if item.render??>
+    ${item.render.code}
+<#else>
 <app-file-upload 
   :formState="viewState" 
   :ignorefieldvaluechange="false" 
@@ -11,3 +14,4 @@
   :uploadparams='<#if editor.getEditorParam('uploadparams','') != ''>${editor.getEditorParam('uploadparams','')}<#else>{}</#if>' :exportparams='<#if editor.getEditorParam('exportparams','') != ''>${editor.getEditorParam('exportparams','')}<#else>{}</#if>'
   style="${editor.getEditorCssStyle()}overflow: auto;">
 </app-file-upload>
+</#if>
\ No newline at end of file

@EDITOR/图片控件（单项）/PANELEDITOR.vue.ftl

+<#if item.render??>
+    ${item.render.code}
+<#else>
 <app-file-upload 
   :formState="viewState" 
   :ignorefieldvaluechange="false" 
@@ -13,3 +16,4 @@
   :uploadparams='<#if editor.getEditorParam('uploadparams','') != ''>${editor.getEditorParam('uploadparams','')}<#else>{}</#if>' :exportparams='<#if editor.getEditorParam('exportparams','') != ''>${editor.getEditorParam('exportparams','')}<#else>{}</#if>'
   style="${editor.getEditorCssStyle()}overflow: auto;">
 </app-file-upload>
+</#if>
\ No newline at end of file

@EDITOR/地址框（支持选择、AC）/EDITOR.vue.ftl

 <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
+<#if item.render??>
+    ${item.render.code}
+<#else>
 <#if editor.getPickupPSAppView()??>
 <app-mpicker
     :activeData="data"
@@ -21,3 +24,4 @@
     style="${editor.getEditorCssStyle()}">
 </app-mpicker>
 </#if>
+</#if>
\ No newline at end of file

@EDITOR/地址框（支持选择、AC）/GRIDEIDTOR.vue.ftl

 <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
+<#if item.render??>
+    ${item.render.code}
+<#else>
 <#if editor.getPickupPSAppView()??>
 <app-mpicker
     :activeData="row"
@@ -21,3 +24,4 @@
     style="${editor.getEditorCssStyle()}">
 </app-mpicker>
 </#if>
+</#if>
\ No newline at end of file

@EDITOR/地址框（选择）/EDITOR.vue.ftl

 <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
+<#if item.render??>
+    ${item.render.code}
+<#else>
 <#if editor.getPickupPSAppView()??>
 <app-mpicker
     :activeData="data"
@@ -21,3 +24,4 @@
     style="${editor.getEditorCssStyle()}">
 </app-mpicker>
 </#if>
+</#if>
\ No newline at end of file

@EDITOR/地址框（选择）/GRIDEIDTOR.vue.ftl

 <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
+<#if item.render??>
+    ${item.render.code}
+<#else>
 <#if editor.getPickupPSAppView()??>
 <app-mpicker
     :activeData="row"
@@ -21,3 +24,4 @@
     style="${editor.getEditorCssStyle()}">
 </app-mpicker>
 </#if>
+</#if>
\ No newline at end of file

@EDITOR/多行输入框/EDITOR.vue.ftl

+<#if item.render??>
+    ${item.render.code}
+<#else>
 <input-box v-model="data.${editor.name}"  :disabled="detailsModel.${editor.name}.disabled" type='textarea' style="${editor.getEditorCssStyle()}" <#if item.getPlaceHolder()??> placeholder="${item.getPlaceHolder()}"</#if>></input-box>
+</#if>
\ No newline at end of file

@EDITOR/多行输入框/GRIDEIDTOR.vue.ftl

+<#if item.render??>
+    ${item.render.code}
+<#else>
 <div class="ivu-input-wrapper ivu-input-wrapper-default ivu-input-type">
     <textarea class="ivu-input" :disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1" v-model="row[column.property]" style="${item.getEditorCssStyle()}" <#if item.getPlaceHolder()??> placeholder="${item.getPlaceHolder()}"</#if> @change="($event)=>{gridEditItemChange(row, column.property, $event, $index)}"></textarea>
 </div>
+</#if>
\ No newline at end of file

@EDITOR/多行输入框/PANELEDITOR.vue.ftl

+<#if item.render??>
+    ${item.render.code}
+<#else>
 <div class="ivu-input-wrapper ivu-input-wrapper-default ivu-input-type">
   <textarea 
     class="ivu-input" 
@@ -12,3 +15,4 @@
     @change="($event)=>{panelEditItemChange(data, '${editor.name?lower_case}', $event)}">
   </textarea>
 </div>
+</#if>
\ No newline at end of file

@EDITOR/多行输入框（10行）/EDITOR.vue.ftl

+<#if item.render??>
+    ${item.render.code}
+<#else>
 <input-box v-model="data.${editor.name}" :textareaId="this.$util.createUUID()"  :disabled="detailsModel.${editor.name}.disabled" type='textarea' textareaStyle="${editor.getEditorCssStyle()}" <#if item.getPlaceHolder()??> placeholder="${item.getPlaceHolder()}"</#if>></input-box>
+</#if>
\ No newline at end of file

@EDITOR/多行输入框（10行）/GRIDEIDTOR.vue.ftl

+<#if item.render??>
+    ${item.render.code}
+<#else>
 <div class="ivu-input-wrapper ivu-input-wrapper-default ivu-input-type">
     <textarea class="ivu-input" rows="10" :disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1" v-model="row[column.property]" style="${item.getEditorCssStyle()}" <#if item.getPlaceHolder()??> placeholder="${item.getPlaceHolder()}"</#if> @change="($event)=>{gridEditItemChange(row, column.property, $event, $index)}"></textarea>
 </div>
+</#if>
\ No newline at end of file

@EDITOR/多行输入框（10行）/PANELEDITOR.vue.ftl

+<#if item.render??>
+    ${item.render.code}
+<#else>
 <div class="ivu-input-wrapper ivu-input-wrapper-default ivu-input-type">
   <textarea 
     class="ivu-input" 
@@ -13,3 +16,4 @@
     @change="($event)=>{panelEditItemChange(data, '${editor.name?lower_case}', $event)}">
   </textarea>
 </div>
+</#if>
\ No newline at end of file

@EDITOR/密码框/EDITOR.vue.ftl

+<#if item.render??>
+    ${item.render.code}
+<#else>
 <i-input type="password" v-model="data.${editor.name}" :disabled="detailsModel.${editor.name}.disabled" style="${editor.getEditorCssStyle()}"></i-input>
+</#if>
\ No newline at end of file

@EDITOR/密码框/GRIDEIDTOR.vue.ftl

+<#if item.render??>
+    ${item.render.code}
+<#else>
 <input-box type="password" :disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1" v-model="row[column.property]" style="${item.getEditorCssStyle()}" @change="($event)=>{gridEditItemChange(row, column.property, $event, $index)}"></input-box>
+</#if>
\ No newline at end of file

@EDITOR/密码框/PANELEDITOR.vue.ftl

+<#if item.render??>
+    ${item.render.code}
+<#else>
 <input-box 
   type="password" 
 <#if item.getEnableCond??>
@@ -7,3 +10,4 @@
   style="${item.getEditorCssStyle()}" 
   @change="($event)=>{panelEditItemChange(data, '${editor.name?lower_case}', $event)}">
 </input-box>
+</#if>
\ No newline at end of file

@EDITOR/开关部件/EDITOR.vue.ftl

+<#if item.render??>
+    ${item.render.code}
+<#else>
 <app-switch name='${editor.name}' :value="this.data.${editor.name}" @change="($event)=>{this.data.${editor.name} = $event} " :disabled="detailsModel.${editor.name}.disabled" style="${editor.getEditorCssStyle()}"></app-switch>
+</#if>
\ No newline at end of file

@EDITOR/开关部件/GRIDEIDTOR.vue.ftl

+<#if item.render??>
+    ${item.render.code}
+<#else>
 <app-switch name='${editor.name}' :value="row[column.property]" @change="($event)=>{row[column.property] = $event;gridEditItemChange(row, column.property, $event, $index)} " :disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1" style="${item.getEditorCssStyle()}"></app-switch>
+</#if>
\ No newline at end of file

@EDITOR/开关部件/PANELEDITOR.vue.ftl

+<#if item.render??>
+    ${item.render.code}
+<#else>
 <app-switch 
   name='${editor.name?lower_case}' 
   :value="data.${editor.name?lower_case}" 
@@ -7,3 +10,4 @@
 </#if>
   style="${item.getEditorCssStyle()}">
 </app-switch>
+</#if>
\ No newline at end of file

@EDITOR/数值框/EDITOR.vue.ftl

+<#if item.render??>
+    ${item.render.code}
+<#else>
 <input-box 
   v-model="data.${editor.name}"  
   @enter="onEnter($event)"  
@@ -14,3 +17,4 @@
   <#if editor.getPlaceHolder()??>placeholder="${editor.getPlaceHolder()}"</#if> 
   style="${editor.getEditorCssStyle()}">
 </input-box>
+</#if>
\ No newline at end of file

@EDITOR/数值框/GRIDEIDTOR.vue.ftl

+<#if item.render??>
+    ${item.render.code}
+<#else>
 <input-box 
   :disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1" 
   v-model="row[column.property]" 
@@ -18,3 +21,4 @@
 </#if> 
   @change="($event)=>{gridEditItemChange(row, column.property, $event, $index)}">
 </input-box>
+</#if>
\ No newline at end of file

@EDITOR/数值框/PANELEDITOR.vue.ftl

+<#if item.render??>
+    ${item.render.code}
+<#else>
 <input-box 
   type="number" 
 <#if item.getEnableCond??>
   :disabled="data.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1" 
 </#if>
-  <#if item.getUnitName()??>unit="${item.getUnitName()}"</#if>
+  <#if item.getUnitName?? && item.getUnitName()??>unit="${item.getUnitName()}"</#if>
+  :precision="2"
   v-model="data.${editor.name?lower_case}" 
   style="${item.getEditorCssStyle()}" 
   <#if item.getPlaceHolder()??>placeholder="${item.getPlaceHolder()}"</#if> 
   @change="($event)=>{panelEditItemChange(data, '${editor.name?lower_case}', $event)}">
 </input-box>
+</#if>
\ No newline at end of file

@EDITOR/数据选择/EDITOR.vue.ftl

 <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
+<#if item.render??>
+    ${item.render.code}
+<#else>
 <#if editor.getEditorParam("PICKUPVIEW",true)??>
   <#if editor.getPickupPSAppView()??>
 <app-picker 
@@ -26,3 +29,4 @@
 </app-picker>
   </#if>
 </#if>
+</#if>
\ No newline at end of file

@EDITOR/数据选择/GRIDEIDTOR.vue.ftl

 <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
+<#if item.render??>
+    ${item.render.code}
+<#else>
 <#if editor.getEditorParam("PICKUPVIEW",true)??>
   <#if editor.getPickupPSAppView()??>
 <app-picker 
@@ -26,3 +29,4 @@
 </app-picker>
   </#if>
 </#if>
+</#if>
\ No newline at end of file

@EDITOR/数据选择/PANELEDITOR.vue.ftl

 <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
+<#if item.render??>
+    ${item.render.code}
+<#else>
 <#if editor.getEditorParam("PICKUPVIEW",true)??>
   <#if editor.getPickupPSAppView()??>
 <app-picker 
@@ -26,3 +29,4 @@
 </app-picker>
   </#if>
 </#if>
+</#if>
\ No newline at end of file

@EDITOR/数据选择（下拉视图、数据链接）/EDITOR.vue.ftl

 <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
+<#if item.render??>
+    ${item.render.code}
+<#else>
 <#if editor.getEditorParam("PICKUPVIEW",true)??>
   <#if editor.getPickupPSAppView()??>
 <app-picker-select-view 
@@ -24,3 +27,4 @@
 </app-picker-select-view>
   </#if>
 </#if>
+</#if>
\ No newline at end of file

@EDITOR/数据选择（下拉视图、数据链接）/GRIDEIDTOR.vue.ftl

 <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
+<#if item.render??> 
+    ${item.render.code}
+<#else>
 <#if editor.getEditorParam("PICKUPVIEW",true)??>
   <#if editor.getPickupPSAppView()??>
 <app-picker-select-view 
@@ -24,3 +27,4 @@
 </app-picker-select-view>
   </#if>
 </#if>
+</#if>
\ No newline at end of file

@EDITOR/数据选择（下拉视图）/EDITOR.vue.ftl

 <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
+<#if item.render??>
+    ${item.render.code}
+<#else>
 <#if editor.getEditorParam("PICKUPVIEW",true)??>
   <#if editor.getPickupPSAppView()??>
 <app-picker-select-view 
@@ -26,3 +29,4 @@
 </app-picker-select-view>
   </#if>
 </#if>
+</#if>
\ No newline at end of file

@EDITOR/数据选择（下拉视图）/GRIDEIDTOR.vue.ftl

 <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
+<#if item.render??>
+    ${item.render.code}
+<#else>
 <#if editor.getEditorParam("PICKUPVIEW",true)??>
   <#if editor.getPickupPSAppView()??>
 <app-picker-select-view 
@@ -26,3 +29,4 @@
 </app-picker-select-view>
   </#if>
 </#if>
+</#if>
\ No newline at end of file

@EDITOR/数据选择（下拉）/EDITOR.vue.ftl

 <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
+<#if item.render??>
+    ${item.render.code}
+<#else>
 <app-picker  
   :formState="formState"
   :data="data"
@@ -21,3 +24,4 @@
   @formitemvaluechange="onFormItemValueChange">
     <@getItemRender editor />
 </app-picker>
+</#if>
\ No newline at end of file

@EDITOR/数据选择（下拉）/GRIDEIDTOR.vue.ftl

 <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
+<#if item.render??>
+    ${item.render.code}
+<#else>
 <app-picker  
   :formState="viewState" 
   :data="row"
@@ -21,3 +24,4 @@
   @formitemvaluechange="($event)=>{onGridItemValueChange(row,$event,$index)}">
     <@getItemRender editor />
 </app-picker>
+</#if>
\ No newline at end of file

@EDITOR/数据选择（嵌入选择视图）/EDITOR.vue.ftl

 <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
+<#if item.render??>
+    ${item.render.code}
+<#else>
 <#if item.getRefPickupPSAppView()??>
   <#assign pickupview = item.getRefPickupPSAppView()>
 <app-embed-picker 
@@ -26,3 +29,4 @@
   style="${editor.getEditorCssStyle()}">
 </app-embed-picker>
 </#if>
+</#if>
\ No newline at end of file

@EDITOR/数据选择（嵌入选择视图）/GRIDEIDTOR.vue.ftl

 <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
+<#if item.render??>
+    ${item.render.code}
+<#else>
 <#if item.getRefPickupPSAppView()??>
   <#assign pickupview = item.getRefPickupPSAppView()>
 <app-embed-picker 
@@ -26,3 +29,4 @@
   style="${editor.getEditorCssStyle()}">
 </app-embed-picker>
 </#if>
+</#if>
\ No newline at end of file

@EDITOR/数据选择（数据链接）/EDITOR.vue.ftl

 <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
+<#if item.render??>
+    ${item.render.code}
+<#else>
 <#if editor.getEditorParam("PICKUPVIEW",true)??>
   <#if editor.getPickupPSAppView()??>
 <app-picker 
@@ -27,3 +30,4 @@
 </app-picker>
   </#if>
 </#if>
+</#if>
\ No newline at end of file

@EDITOR/数据选择（数据链接）/GRIDEIDTOR.vue.ftl

 <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
+<#if item.render??>
+    ${item.render.code}
+<#else>
 <#if editor.getEditorParam("PICKUPVIEW",true)??>
   <#if editor.getPickupPSAppView()??>
 <app-picker 
@@ -27,3 +30,4 @@
 </app-picker>
   </#if>
 </#if>
+</#if>
\ No newline at end of file

@EDITOR/数据选择（无AC、数据链接）/EDITOR.vue.ftl

 <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
+<#if item.render??>
+    ${item.render.code}
+<#else>
 <#if editor.getEditorParam("PICKUPVIEW",true)??>
   <#if editor.getPickupPSAppView()??>
 <app-picker 
@@ -24,3 +27,4 @@
 </app-picker>
   </#if>
 </#if>
+</#if>
\ No newline at end of file

@EDITOR/数据选择（无AC、数据链接）/GRIDEIDTOR.vue.ftl

 <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
+<#if item.render??>
+    ${item.render.code}
+<#else>
 <#if editor.getEditorParam("PICKUPVIEW",true)??>
   <#if editor.getPickupPSAppView()??>
 <app-picker 
@@ -24,3 +27,4 @@
 </app-picker>
   </#if>
 </#if>
+</#if>
\ No newline at end of file

@EDITOR/数据选择（无AC）/EDITOR.vue.ftl

 <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
+<#if item.render??>
+    ${item.render.code}
+<#else>
 <#if editor.getEditorParam("PICKUPVIEW",true)??>
   <#if editor.getPickupPSAppView()??>
 <app-picker 
@@ -23,3 +26,4 @@
 </app-picker>
   </#if>
 </#if>
+</#if>
\ No newline at end of file

@EDITOR/数据选择（无AC）/GRIDEIDTOR.vue.ftl

 <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
+<#if item.render??>
+    ${item.render.code}
+<#else>
 <#if editor.getEditorParam("PICKUPVIEW",true)??>
   <#if editor.getPickupPSAppView()??>
 <app-picker 
@@ -23,3 +26,4 @@
 </app-picker>
   </#if>
 </#if>
+</#if>
\ No newline at end of file

@EDITOR/数据链接/EDITOR.vue.ftl

 <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
+<#if item.render??>
+    ${item.render.code}
+<#else>
 <app-picker 
   :formState="formState"
   :data="data"
@@ -19,3 +22,4 @@
   style="${editor.getEditorCssStyle()}"  
   @formitemvaluechange="onFormItemValueChange">
 </app-picker>
+</#if>
\ No newline at end of file

@EDITOR/数据链接/GRIDEIDTOR.vue.ftl

 <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
+<#if item.render??>
+    ${item.render.code}
+<#else>
 <app-picker 
   :formState="viewState" 
   :data="row"
@@ -19,3 +22,4 @@
   style="${editor.getEditorCssStyle()}"  
   @formitemvaluechange="($event)=>{onGridItemValueChange(row,$event,$index)}">
 </app-picker>
+</#if>
\ No newline at end of file

@EDITOR/文件上传/EDITOR.vue.ftl

+<#if item.render??>
+    ${item.render.code}
+<#else>
 <app-file-upload :formState="formState" :ignorefieldvaluechange="ignorefieldvaluechange" @formitemvaluechange="onFormItemValueChange" :data="JSON.stringify(this.data)" name='${editor.name}' :value="data.${editor.name}" :disabled="detailsModel.${editor.name}.disabled" :uploadparams='<#if editor.getEditorParam('uploadparams','') != ''>${editor.getEditorParam('uploadparams','')}<#else>{}</#if>' :exportparams='<#if editor.getEditorParam('exportparams','') != ''>${editor.getEditorParam('exportparams','')}<#else>{}</#if>'  style="${editor.getEditorCssStyle()}overflow: auto;"></app-file-upload>
+</#if>
\ No newline at end of file

@EDITOR/文件上传/GRIDEIDTOR.vue.ftl

+<#if item.render??>
+    ${item.render.code}
+<#else>
 <app-file-upload 
   :formState="viewState" 
   :ignorefieldvaluechange="false" 
@@ -11,3 +14,4 @@
   :exportparams='<#if editor.getEditorParam('exportparams','') != ''>${editor.getEditorParam('exportparams','')}<#else>{}</#if>' 
   style="${editor.getEditorCssStyle()}overflow: auto;">
 </app-file-upload>
+</#if>
\ No newline at end of file

@EDITOR/文件上传/PANELEDITOR.vue.ftl

+<#if item.render??>
+    ${item.render.code}
+<#else>
 <app-file-upload 
   :formState="viewState" 
   :ignorefieldvaluechange="false" 
@@ -13,3 +16,4 @@
   :exportparams='<#if editor.getEditorParam('exportparams','') != ''>${editor.getEditorParam('exportparams','')}<#else>{}</#if>'
   style="${editor.getEditorCssStyle()}overflow: auto;">
 </app-file-upload>
+</#if>
\ No newline at end of file

@EDITOR/文本框/EDITOR.vue.ftl

+<#if item.render??>
+    ${item.render.code}
+<#else>
 <input-box v-model="data.${editor.name}"  @enter="onEnter($event)"  <#if item.getUnitName()??> unit="${item.getUnitName()}"</#if>  :disabled="detailsModel.${editor.name}.disabled" type='<#if item.getPSDEField()??><#assign datatype=srfjavatype(item.getPSDEField().getStdDataType())><#if datatype=='BigInteger' || datatype=='Integer' || datatype=='Double' || datatype=='Decimal' || datatype=='Float' || datatype=='BigDecimal'>number<#else>text</#if><#else>text</#if>' <#if item.getPlaceHolder()??> placeholder="${item.getPlaceHolder()}"</#if> style="${editor.getEditorCssStyle()}"></input-box>
+</#if>
\ No newline at end of file

@EDITOR/时间选择器(新）/EDITOR.vue.ftl

+<#if item.render??>
+    ${item.render.code}
+<#else>
 <date-picker type="datetime" :transfer="true" format="yyyy-MM-dd HH:mm:ss" placeholder="请选择时间..." :value="data.${editor.name}" :disabled="detailsModel.${editor.name}.disabled" style="min-width: 150px; ${editor.getEditorCssStyle()}<#if editor.getEditorParam('width','') == 'auto'>width:100%;</#if>" @on-change="(val1, val2) => { this.data.${editor.name} = val1 }"></date-picker>
+</#if>
\ No newline at end of file

@EDITOR/时间选择器(新）/GRIDEIDTOR.vue.ftl

+<#if item.render??>
+    ${item.render.code}
+<#else>
 <date-picker type="datetime" :transfer="true" format="yyyy-MM-dd HH:mm:ss" placeholder="请选择时间..." :disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1" :value="row[column.property]" style="${item.getEditorCssStyle()}<#if item.getEditorParam('width','') == 'auto'>width:100%;</#if>" @on-change="(val1, val2) => { row[column.property] = val1; gridEditItemChange(row, column.property, val1, $index)}"></date-picker>
+</#if>
\ No newline at end of file

@EDITOR/时间选择器(新）/PANELEDITOR.vue.ftl

+<#if item.render??>
+    ${item.render.code}
+<#else>
 <date-picker 
   type="datetime" 
   :transfer="true" 
@@ -10,3 +13,4 @@
   style="${item.getEditorCssStyle()}<#if item.getEditorParam('width','') == 'auto'>width:100%;</#if>" 
   @on-change="(val1, val2) => { data.${editor.name?lower_case} = val1; gridEditItemChange(data, '${editor.name?lower_case}', val1)}">
 </date-picker>
+</#if>
\ No newline at end of file

@EDITOR/时间选择控件/EDITOR.vue.ftl

+<#if item.render??>
+    ${item.render.code}
+<#else>
 <date-picker type="date" :transfer="true" format="yyyy-MM-dd" placeholder="请选择时间..." :value="data.${editor.name}" :disabled="detailsModel.${editor.name}.disabled" style="min-width: 150px;${editor.getEditorCssStyle()}  <#if editor.getEditorParam('width','') == 'auto'>width:100%;</#if>" @on-change="(val1, val2) => { this.data.${editor.name} = val1 }"></date-picker>
+</#if>
\ No newline at end of file

@EDITOR/时间选择控件/GRIDEIDTOR.vue.ftl

+<#if item.render??>
+    ${item.render.code}
+<#else>
 <date-picker type="date" :transfer="true" format="yyyy-MM-dd" placeholder="请选择时间..." :disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1" :value="row[column.property]" style="${item.getEditorCssStyle()}<#if item.getEditorParam('width','') == 'auto'>width:100%;</#if>" @on-change="(val1, val2) => { row[column.property] = val1; gridEditItemChange(row, column.property, val1, $index)}"></date-picker>
+</#if>
\ No newline at end of file

@EDITOR/时间选择控件/PANELEDITOR.vue.ftl

+<#if item.render??>
+    ${item.render.code}
+<#else>
 <date-picker 
   type="date" 
   :transfer="true" 
@@ -10,3 +13,4 @@
   style="${item.getEditorCssStyle()}<#if item.getEditorParam('width','') == 'auto'>width:100%;</#if>" 
   @on-change="(val1, val2) => { data.${editor.name?lower_case} = val1; gridEditItemChange(data, '${editor.name?lower_case}', val1)}">
 </date-picker>
+</#if>
\ No newline at end of file

@EDITOR/时间选择控件_分钟/EDITOR.vue.ftl

+<#if item.render??>
+    ${item.render.code}
+<#else>
  <time-picker :value="data.${editor.name}" :transfer="true" :disabled="detailsModel.${editor.name}.disabled" format="mm" placeholder="请选择时间..." style="min-width: 150px; ${editor.getEditorCssStyle()}<#if editor.getEditorParam('width','') == 'auto'>width:100%;</#if>"  @on-change="(val) => {this.data.${editor.name} = val}"></time-picker>
+ </#if>
\ No newline at end of file

@EDITOR/时间选择控件_分钟/GRIDEIDTOR.vue.ftl

+<#if item.render??>
+    ${item.render.code}
+<#else>
  <time-picker :value="row[column.property]" :transfer="true" format="mm" placeholder="请选择时间..." :disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1" style="${item.getEditorCssStyle()}<#if item.getEditorParam('width','') == 'auto'>width:100%;</#if>" @on-change="(val) => { row[column.property] = val; gridEditItemChange(row, column.property, val, $index)}"></time-picker>
+ </#if>
\ No newline at end of file

@EDITOR/时间选择控件_分钟/PANELEDITOR.vue.ftl

+<#if item.render??>
+    ${item.render.code}
+<#else>
 <time-picker 
   :transfer="true" 
   format="mm" 
@@ -9,3 +12,4 @@
   style="${item.getEditorCssStyle()}<#if item.getEditorParam('width','') == 'auto'>width:100%;</#if>" 
   @on-change="(val) => { data.${editor.name?lower_case} = val; gridEditItemChange(data, '${editor.name?lower_case}', val)}">
 </time-picker>
+</#if>
\ No newline at end of file

@EDITOR/时间选择控件_小时/EDITOR.vue.ftl

+<#if item.render??>
+    ${item.render.code}
+<#else>
  <time-picker :value="data.${editor.name}" :transfer="true" :disabled="detailsModel.${editor.name}.disabled" format="HH" placeholder="请选择时间..." style="min-width: 150px; ${editor.getEditorCssStyle()}<#if editor.getEditorParam('width','') == 'auto'>width:100%;</#if>"  @on-change="(val) => {this.data.${editor.name} = val}"></time-picker>
+ </#if>
\ No newline at end of file

@EDITOR/时间选择控件_小时/GRIDEIDTOR.vue.ftl

+<#if item.render??>
+    ${item.render.code}
+<#else>
  <time-picker :value="row[column.property]" :transfer="true" format="HH" placeholder="请选择时间..." :disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1" style="${item.getEditorCssStyle()}<#if item.getEditorParam('width','') == 'auto'>width:100%;</#if>" @on-change="(val) => { row[column.property] = val; gridEditItemChange(row, column.property, val, $index)}"></time-picker>
+ </#if>
\ No newline at end of file

@EDITOR/时间选择控件_小时/PANELEDITOR.vue.ftl

+<#if item.render??>
+    ${item.render.code}
+<#else>
 <time-picker 
   :transfer="true" 
   format="HH" 
@@ -9,3 +12,4 @@
   style="${item.getEditorCssStyle()}<#if item.getEditorParam('width','') == 'auto'>width:100%;</#if>" 
   @on-change="(val) => { data.${editor.name?lower_case} = val; gridEditItemChange(data, '${editor.name?lower_case}', val)}">
 </time-picker>
+</#if>
\ No newline at end of file

@EDITOR/时间选择控件_无小时/EDITOR.vue.ftl

+<#if item.render??>
+    ${item.render.code}
+<#else>
 <date-picker type="date" :transfer="true" format="yyyy-MM-dd" placeholder="请选择时间..." :value="data.${editor.name}" :disabled="detailsModel.${editor.name}.disabled" style="min-width: 150px; ${editor.getEditorCssStyle()}<#if editor.getEditorParam('width','') == 'auto'>width:100%;</#if>" @on-change="(val1, val2) => { this.data.${editor.name} = val1 }"></date-picker>
+</#if>
\ No newline at end of file

@EDITOR/时间选择控件_无小时/GRIDEIDTOR.vue.ftl

+<#if item.render??>
+    ${item.render.code}
+<#else>
 <date-picker type="date" :transfer="true" format="yyyy-MM-dd" placeholder="请选择时间..." :disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1" :value="row[column.property]" style="${item.getEditorCssStyle()}<#if item.getEditorParam('width','') == 'auto'>width:100%;</#if>" @on-change="(val1, val2) => { row[column.property] = val1; gridEditItemChange(row, column.property, val1, $index)}"></date-picker>
+</#if>
\ No newline at end of file

@EDITOR/时间选择控件_无小时/PANELEDITOR.vue.ftl

+<#if item.render??>
+    ${item.render.code}
+<#else>
 <date-picker 
   type="date" 
   :transfer="true" 
@@ -10,3 +13,4 @@
   style="${item.getEditorCssStyle()}<#if item.getEditorParam('width','') == 'auto'>width:100%;</#if>" 
   @on-change="(val1, val2) => { data.${editor.name?lower_case} = val1; gridEditItemChange(data, '${editor.name?lower_case}', val1)}">
 </date-picker>
+</#if>
\ No newline at end of file

@EDITOR/时间选择控件_无日期/EDITOR.vue.ftl

+<#if item.render??>
+    ${item.render.code}
+<#else>
  <time-picker :value="data.${editor.name}" :transfer="true" :disabled="detailsModel.${editor.name}.disabled" format="HH:mm:ss" placeholder="请选择时间..." style="min-width: 150px; ${editor.getEditorCssStyle()}<#if editor.getEditorParam('width','') == 'auto'>width:100%;</#if>"  @on-change="(val) => {this.data.${editor.name} = val}"></time-picker>
+</#if>
\ No newline at end of file

@EDITOR/时间选择控件_无日期/GRIDEIDTOR.vue.ftl

+<#if item.render??>
+    ${item.render.code}
+<#else>
  <time-picker :value="row[column.property]" :transfer="true" format="HH:mm:ss" placeholder="请选择时间..." :disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1" style="${item.getEditorCssStyle()}<#if item.getEditorParam('width','') == 'auto'>width:100%;</#if>" @on-change="(val) => { row[column.property] = val; gridEditItemChange(row, column.property, val, $index)}"></time-picker>
+ </#if>
\ No newline at end of file

@EDITOR/时间选择控件_无日期/PANELEDITOR.vue.ftl

+<#if item.render??>
+    ${item.render.code}
+<#else>
 <time-picker 
   :transfer="true" 
   format="HH:mm:ss" 
@@ -9,3 +12,4 @@
   style="${item.getEditorCssStyle()}<#if item.getEditorParam('width','') == 'auto'>width:100%;</#if>" 
   @on-change="(val) => { data.${editor.name?lower_case} = val; gridEditItemChange(data, '${editor.name?lower_case}', val)}">
 </time-picker>
+</#if>
\ No newline at end of file

@EDITOR/时间选择控件_无日期无秒钟/EDITOR.vue.ftl

+<#if item.render??>
+    ${item.render.code}
+<#else>
  <time-picker :value="data.${editor.name}" :transfer="true" :disabled="detailsModel.${editor.name}.disabled" format="HH:mm" placeholder="请选择时间..." style="min-width: 150px; ${editor.getEditorCssStyle()}<#if editor.getEditorParam('width','') == 'auto'>width:100%;</#if>"  @on-change="(val) => {this.data.${editor.name} = val}"></time-picker>
+ </#if>
\ No newline at end of file

@EDITOR/时间选择控件_无日期无秒钟/GRIDEIDTOR.vue.ftl

+<#if item.render??>
+    ${item.render.code}
+<#else>
  <time-picker :value="row[column.property]" :transfer="true" format="HH:mm" placeholder="请选择时间..." :disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1" style="${item.getEditorCssStyle()}<#if item.getEditorParam('width','') == 'auto'>width:100%;</#if>" @on-change="(val) => { row[column.property] = val; gridEditItemChange(row, column.property, val, $index)}"></time-picker>
+ </#if>
\ No newline at end of file

@EDITOR/时间选择控件_无日期无秒钟/PANELEDITOR.vue.ftl

+<#if item.render??>
+    ${item.render.code}
+<#else>
 <time-picker 
   :transfer="true" 
   format="HH:mm" 
@@ -9,3 +12,4 @@
   style="${item.getEditorCssStyle()}<#if item.getEditorParam('width','') == 'auto'>width:100%;</#if>" 
   @on-change="(val) => { data.${editor.name?lower_case} = val; gridEditItemChange(data, '${editor.name?lower_case}', val)}">
 </time-picker>
+</#if>
\ No newline at end of file

@EDITOR/时间选择控件_秒钟/EDITOR.vue.ftl

+<#if item.render??>
+    ${item.render.code}
+<#else>
  <time-picker :value="data.${editor.name}" :transfer="true" :disabled="detailsModel.${editor.name}.disabled" format="ss" placeholder="请选择时间..." style="min-width: 150px; ${editor.getEditorCssStyle()}<#if editor.getEditorParam('width','') == 'auto'>width:100%;</#if>"  @on-change="(val) => {this.data.${editor.name} = val}"></time-picker>
+ </#if>
\ No newline at end of file

@EDITOR/时间选择控件_秒钟/GRIDEIDTOR.vue.ftl

+<#if item.render??>
+    ${item.render.code}
+<#else>
  <time-picker :value="row[column.property]" :transfer="true" format="ss" placeholder="请选择时间..." :disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1" style="${item.getEditorCssStyle()}<#if item.getEditorParam('width','') == 'auto'>width:100%;</#if>" @on-change="(val) => { row[column.property] = val; gridEditItemChange(row, column.property, val, $index)}"></time-picker>
+ </#if>
\ No newline at end of file

@EDITOR/时间选择控件_秒钟/PANELEDITOR.vue.ftl

+<#if item.render??>
+    ${item.render.code}
+<#else>
 <time-picker 
   :transfer="true" 
   format="ss" 
@@ -9,3 +12,4 @@
   style="${item.getEditorCssStyle()}<#if item.getEditorParam('width','') == 'auto'>width:100%;</#if>" 
   @on-change="(val) => { data.${editor.name?lower_case} = val; gridEditItemChange(data, '${editor.name?lower_case}', val)}">
 </time-picker>
+</#if>
\ No newline at end of file

@EDITOR/标签(旧）/EDITOR.vue.ftl

+<#if item.render??>
+    ${item.render.code}
+<#else>
 <i-input v-model="data.${editor.name}" readonly disabled style="${editor.getEditorCssStyle()}"></i-input>
+</#if>
\ No newline at end of file

@EDITOR/标签/EDITOR.vue.ftl

 <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
+<#if item.render??> 
+    ${item.render.code}
+<#else>
 <app-span <#t>
   name='${editor.name}' <#t>
   :value="data.${editor.name}" <#t>
+  <#--  值格式化 start -->
+  <#--  @author ljy  -->
+  <#--  @update 2020.7.13 18:08  -->
+  <#if item.getPSEditor().getPSEditorContainer().getPSAppDEField().getPSDEField().getDataType()??>
+    dataType="${item.getPSEditor().getPSEditorContainer().getPSAppDEField().getPSDEField().getDataType()}" <#t>
+    <#if item.getUnitName()!="">
+    unitName="${item.getUnitName()}" <#t>
+    </#if>
+  </#if>
+  <#if item.getPSEditor().getPSEditorContainer().getPSDEFUIMode().getPSDEFFormItem().getValueFormat()?? && item.getPSEditor().getPSEditorContainer().getPSDEFUIMode().getPSDEFFormItem().getValueFormat()!= "%1$s">
+    valueFormat="${item.getPSEditor().getPSEditorContainer().getPSDEFUIMode().getPSDEFFormItem().getValueFormat()}" <#t>
+  </#if>
+  <#--  值格式化 end -->
+  <#-- 数值精度 start -->
+  <#--  @author mos  -->
+  <#--  @update 2020.7.16  -->
+  <#if item.getPSEditor().getPSEditorContainer().getPSAppDEField().getPSDEField().getPrecision??>
+    <#if item.getPSEditor().getPSEditorContainer().getPSAppDEField().getPSDEField().getDataType() == 'FLOAT' && item.getPSEditor().getPSEditorContainer().getPSAppDEField().getPSDEField().getPrecision() == 0>
+    :precision="2"
+    <#else>
+    :precision="${item.getPSEditor().getPSEditorContainer().getPSAppDEField().getPSDEField().getPrecision()?c}"
+    </#if>
+  </#if> 
+  <#--  数值精度 end -->
 <#if item.getPSCodeList?? && item.getPSCodeList()??>
   <#assign codelist=item.getPSCodeList() />
   tag='${codelist.codeName}' <#t>
@@ -22,4 +49,6 @@
   :localContext =<@getNavigateContext editor /> <#t>
   :localParam =<@getNavigateParams editor /> <#t>
   style="${editor.getEditorCssStyle()}"><#t>
+  
 </app-span><#lt>
+</#if>
\ No newline at end of file

@EDITOR/标签/GRIDEIDTOR.vue.ftl

 <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
+<#if item.render??> 
+    ${item.render.code}
+<#else>
 <app-span <#t>
   name='${editor.name}' <#t>
   :value="row[column.property]" <#t>
@@ -23,3 +26,4 @@
   :localParam =<@getNavigateParams editor /> <#t>
   style="${editor.getEditorCssStyle()}"><#t>
 </app-span><#lt>
+</#if>
\ No newline at end of file

@EDITOR/标签/PANELEDITOR.vue.ftl

 <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
+<#if item.render??> 
+    ${item.render.code}
+<#else>
 <app-span <#t>
   :value="data.${editor.name?lower_case}" <#t>
   name="${editor.name?lower_case}" <#t>
@@ -14,3 +17,4 @@
 </#if> 
   style="${item.getEditorCssStyle()}"> <#t>
 </app-span> <#lt>
+</#if>

@EDITOR/步进器/EDITOR.vue.ftl

+<#if item.render??>
+    ${item.render.code}
+<#else>
 <app-stepper name='${editor.name}' :value="this.data.${editor.name}" @change="onFormItemValueChange" :disabled="detailsModel.${editor.name}.disabled" style="${editor.getEditorCssStyle()}"></app-stepper>
+</#if>
\ No newline at end of file

@EDITOR/步进器/GRIDEIDTOR.vue.ftl

+<#if item.render??>
+    ${item.render.code}
+<#else>
 <app-stepper name='${editor.name}' :value="row[column.property]" @change="($event)=>{onGridItemValueChange(row,$event,$index)} " :disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1" style="${item.getEditorCssStyle()}"></app-stepper>
+</#if>
\ No newline at end of file

@EDITOR/步进器/PANELEDITOR.vue.ftl

+<#if item.render??>
+    ${item.render.code}
+<#else>
 <app-stepper 
   name='${editor.name}' 
   :value="data.${editor.name?lower_case}" 
@@ -7,3 +10,4 @@
 </#if>
   style="${item.getEditorCssStyle()}">
 </app-stepper>
+</#if>
\ No newline at end of file

@EDITOR/滑动输入条/EDITOR.vue.ftl

+<#if item.render??>
+    ${item.render.code}
+<#else>
 <app-slider name='${editor.name}' :value="this.data.${editor.name}" @change="onFormItemValueChange" :disabled="detailsModel.${editor.name}.disabled" style="${editor.getEditorCssStyle()}"></app-slider>
+</#if>
\ No newline at end of file

@EDITOR/滑动输入条/GRIDEIDTOR.vue.ftl

+<#if item.render??>
+    ${item.render.code}
+<#else>
 <app-slider name='${editor.name}' :value="row[column.property]" @change="($event)=>{onGridItemValueChange(row,$event,$index)} " :disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1" style="${item.getEditorCssStyle()}"></app-slider>
+</#if>
\ No newline at end of file

@EDITOR/滑动输入条/PANELEDITOR.vue.ftl

+<#if item.render??>
+    ${item.render.code}
+<#else>
 <app-slider 
   name='${editor.name?lower_case}' 
   :value="data.${editor.name?lower_case}" 
@@ -7,3 +10,4 @@
 </#if>
   style="${item.getEditorCssStyle()}">
 </app-slider>
+</#if>
\ No newline at end of file

@EDITOR/直接内容/EDITOR.vue.ftl

+<#if item.render??> 
+    ${item.render.code}
+<#else>
 <div style="${editor.getEditorCssStyle()}">{{data.${editor.name}}}</div>
+</#if>
\ No newline at end of file

@EDITOR/自动填充/EDITOR.vue.ftl

 <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
+<#if item.render??> 
+    ${item.render.code}
+<#else>
 <app-autocomplete 
     :data="data"
     :disabled="detailsModel.${editor.name}.disabled" 
@@ -18,3 +21,4 @@
     @formitemvaluechange="onFormItemValueChange"
     style="${editor.getEditorCssStyle()}">
 </app-autocomplete>
+</#if>
\ No newline at end of file

@EDITOR/自动填充/GRIDEIDTOR.vue.ftl

 <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
+<#if item.render??> 
+    ${item.render.code}
+<#else>
 <app-autocomplete 
     :data="row"
     :disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1" 
@@ -18,3 +21,4 @@
     @formitemvaluechange="($event)=>{onGridItemValueChange(row,$event,$index)}"
     style="${editor.getEditorCssStyle()}">
 </app-autocomplete>
+</#if>
\ No newline at end of file

@EDITOR/评分器/EDITOR.vue.ftl

+<#if item.render??>
+    ${item.render.code}
+<#else>
 <app-rate name='${editor.name}' :value="this.data.${editor.name}" @change="($event)=>{this.data.${editor.name} = $event} " :disabled="detailsModel.${editor.name}.disabled" style="${editor.getEditorCssStyle()}"></app-rate>
+</#if>
\ No newline at end of file

@EDITOR/评分器/GRIDEIDTOR.vue.ftl

+<#if item.render??>
+    ${item.render.code}
+<#else>
 <app-rate name='${item.name}' :value="row[column.property]" @change="($event)=>{row[column.property] = $event; gridEditItemChange(row, column.property, $event, $index)} " :disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1" style="${item.getEditorCssStyle()}"></app-rate>
+</#if>
\ No newline at end of file

@EDITOR/评分器/PANELEDITOR.vue.ftl

+<#if item.render??>
+    ${item.render.code}
+<#else>
 <app-rate 
   name='${editor.name?lower_case}' 
   :value="data.${editor.name?lower_case}" 
@@ -7,3 +10,4 @@
 </#if>
   style="${item.getEditorCssStyle()}">
 </app-rate>
+</#if>
\ No newline at end of file

@EDITOR/选项框/EDITOR.vue.ftl

+<#if item.render??>
+    ${item.render.code}
+<#else>
 <div style="${editor.getEditorCssStyle()}">
   <app-checkbox :value="this.data.${editor.name}" @change="($event)=>{this.data.${editor.name} = $event} " :disabled="detailsModel.${editor.name}.disabled"></app-checkbox>
 </div>
+</#if>
\ No newline at end of file

@EDITOR/选项框/GRIDEIDTOR.vue.ftl

+<#if item.render??>
+    ${item.render.code}
+<#else>
 <div style="${item.getEditorCssStyle()}">
   <app-checkbox :value="row[column.property]" @change="($event)=>{row[column.property] = $event;gridEditItemChange(row, column.property, $event, $index)} " :disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1"></app-checkbox>
 </div>
+</#if>
\ No newline at end of file

@EDITOR/选项框/PANELEDITOR.vue.ftl

+<#if item.render??>
+    ${item.render.code}
+<#else>
 <div style="${item.getEditorCssStyle()}">
   <app-checkbox :value="data.${editor.name?lower_case}" @change="($event)=>{data.${editor.name?lower_case} = $event;panelEditItemChange(data, '${editor.name?lower_case}', $event)} " <#if item.getEnableCond??>:disabled="data.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1"</#if>></app-checkbox>
 </div>
+</#if>
\ No newline at end of file

@EDITOR/选项框列表/EDITOR.vue.ftl

 <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
+<#if item.render??>
+    ${item.render.code}
+<#else>
 <app-checkbox-list 
   v-model="data.${editor.name}" 
   :data="data" 
@@ -19,3 +22,4 @@
   name="${editor.name}" 
   style="${editor.getEditorCssStyle()}">
 </app-checkbox-list>
+</#if>
\ No newline at end of file

@EDITOR/选项框列表/GRIDEIDTOR.vue.ftl

 <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
+<#if item.render??>
+    ${item.render.code}
+<#else>
 <app-checkbox-list 
   v-model="row[column.property]" 
   :disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1" 
@@ -19,3 +22,4 @@
   name="${item.name}" 
   @change="($event)=>{gridEditItemChange(row, column.property, $event, $index)}">
 </app-checkbox-list>
+</#if>
\ No newline at end of file

@EDITOR/选项框列表/PANELEDITOR.vue.ftl

 <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
+<#if item.render??>
+    ${item.render.code}
+<#else>
 <app-checkbox-list 
   v-model="data.${editor.name?lower_case}" 
 <#if item.getEnableCond??>
@@ -21,3 +24,4 @@
   name="${editor.name?lower_case}" 
   @change="($event)=>{panelEditItemChange(data, '${editor.name?lower_case}', $event)}">
 </app-checkbox-list>
+</#if>
\ No newline at end of file

@LOGIC/@UIACTION/系统预置/sys/新建行/LOGIC.vue.ftl

@@ -12,7 +12,7 @@
     public ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
         const _this: any = this;
         const data: any = {};
-        if (_this.newRow && _this.newRow instanceof Function) {
+        if (_this.hasOwnProperty('newRow') && _this.newRow instanceof Function) {
             _this.newRow([{ ...data }], params, $event, xData);
         } else if(xData.newRow && xData.newRow instanceof Function) {
             xData.newRow([{ ...data }], params, $event, xData);

@VIEW/@MACRO/VIEW_HEADER-BASE.vue.ftl

@@ -61,7 +61,7 @@ export default class ${srfclassname('${view.name}')}Base extends Vue {
     public appEntityService: ${srfclassname('${appde.getCodeName()}')}Service = new ${srfclassname('${appde.getCodeName()}')}Service;
 
     /**
-     * 实体权限服务对象
+     * 实体UI服务对象
      *
      * @type ${srfclassname('${appde.getCodeName()}')}UIService
      * @memberof ${srfclassname('${view.name}')}Base

@VIEW/实体分页导航视图/VIEW-BASE.vue.ftl

- <#assign self_content>
+<#assign self_content>
     /**
      * 加载模型
      * 

@VIEW/实体数据多项选择视图/VIEW-BASE.vue.ftl

@@ -201,6 +201,7 @@ if(this.viewparams.selectedData){
      * @memberof ${srfclassname('${view.name}')}Base
      */
     public onClickCancel(): void {
+        this.$emit('viewdataschange', null);
         this.$emit('close', null);
     }
 

@VIEW/实体数据看板视图/VIEW-BASE.vue.ftl

 <#assign self_viewparam>
 this.$forceUpdate();
 </#assign>
+<#assign self_content>
+
+    /**
+     * 加载数据
+     * 
+     * @memberof ${srfclassname('${view.name}')}Base
+     */
+    public loadModel(){
+    <#assign appDataEntity = view.getPSAppDataEntity() />
+        if(this.context.${appDataEntity.getCodeName()?lower_case}){
+            this.appEntityService.getDataInfo(JSON.parse(JSON.stringify(this.context)),{},false).then((response:any) =>{
+                if (!response || response.status !== 200) {
+                    return;
+                }
+                const { data: _data } = response;
+                this.viewState.next({ tag: 'app-actionbar', action: 'loadmodel', data:_data});
+                if (_data.${appDataEntity.getMajorPSAppDEField().getCodeName()?lower_case}) {
+                    Object.assign(this.model, { dataInfo: _data.${appDataEntity.getMajorPSAppDEField().getCodeName()?lower_case} });
+                    if(this.$tabPageExp){
+                        let _this:any = this;
+                        this.$tabPageExp.setCurPageCaption(_this.$t(this.model.srfTitle), _this.$t(this.model.srfTitle), _this.model.dataInfo);
+                    }
+                    if(this.$route){
+                        this.$route.meta.info = this.model.dataInfo;
+                    }
+                    <#noparse>Object.assign(this.model, { srfTitle: `${this.$t(this.model.srfTitle)} - ${this.model.dataInfo}` });</#noparse>
+                }
+            })
+        }
+    }
+</#assign>
 
 <#ibizinclude>
 ../@MACRO/LAYOUTPANEL_VIEW.template.ftl

@VIEW/实体数据看板视图（部件视图）/VIEW-BASE.vue.ftl

@@ -11,6 +11,37 @@ this.$forceUpdate();
             });
         }
 </#assign>
+<#assign self_content>
+
+    /**
+     * 加载数据
+     * 
+     * @memberof ${srfclassname('${view.name}')}Base
+     */
+    public loadModel(){
+    <#assign appDataEntity = view.getPSAppDataEntity() />
+        if(this.context.${appDataEntity.getCodeName()?lower_case}){
+            this.appEntityService.getDataInfo(JSON.parse(JSON.stringify(this.context)),{},false).then((response:any) =>{
+                if (!response || response.status !== 200) {
+                    return;
+                }
+                const { data: _data } = response;
+                this.viewState.next({ tag: 'app-actionbar', action: 'loadmodel', data:_data});
+                if (_data.${appDataEntity.getMajorPSAppDEField().getCodeName()?lower_case}) {
+                    Object.assign(this.model, { dataInfo: _data.${appDataEntity.getMajorPSAppDEField().getCodeName()?lower_case} });
+                    if(this.$tabPageExp){
+                        let _this:any = this;
+                        this.$tabPageExp.setCurPageCaption(_this.$t(this.model.srfTitle), _this.$t(this.model.srfTitle), _this.model.dataInfo);
+                    }
+                    if(this.$route){
+                        this.$route.meta.info = this.model.dataInfo;
+                    }
+                    <#noparse>Object.assign(this.model, { srfTitle: `${this.$t(this.model.srfTitle)} - ${this.model.dataInfo}` });</#noparse>
+                }
+            })
+        }
+    }
+</#assign>
 <#ibizinclude>
 ../@MACRO/LAYOUTPANEL_VIEW.template.ftl
 </#ibizinclude>

@VIEW/实体数据选择视图/VIEW-BASE.vue.ftl

@@ -69,6 +69,7 @@ if(this.viewparams.selectedData){
      * @memberof ${srfclassname('${view.name}')}Base
      */
     public onClickCancel(): void {
+        this.$emit('viewdataschange', null);
         this.$emit('close', null);
     }
 

APP/src/service/%DE_PKGPATH%/%DE_PKGPATH%-service-base.ts.ftl

@@ -21,7 +21,13 @@ import ${srfclassname('${singleLogic.getCodeName()}')}Logic from '@/service/${sr
         <#assign majorPSAppDataEntity = deReRs.getMajorPSAppDataEntity() />
         <#-- 从实体 -->
         <#assign minorPSAppDataEntity = deReRs.getMinorPSAppDataEntity() />
-            this.tempStorage.setItem(context.srfsessionkey+'_${srfpluralize(minorPSAppDataEntity.codeName)?lower_case}',JSON.stringify(res.data.${srfpluralize(minorPSAppDataEntity.codeName)?lower_case}));
+        <#-- 从实体支持临时数据模式为true，才设置本地缓存 start -->
+        <#-- @author zpc -->
+        <#-- @update 2020.7.13 15:00 -->
+        <#if minorPSAppDataEntity.isEnableTempData()>
+            this.tempStorage.setItem(context.srfsessionkey+'_${srfpluralize(minorPSAppDataEntity.codeName)?lower_case}',JSON.stringify(res.data.${srfpluralize(minorPSAppDataEntity.codeName)?lower_case}?res.data.${srfpluralize(minorPSAppDataEntity.codeName)?lower_case}:[]));
+        </#if>
+        <#-- 从实体支持临时数据模式为true，才设置本地缓存 end -->
         </#list>
         </#if>
 </#macro>
@@ -34,6 +40,10 @@ import ${srfclassname('${singleLogic.getCodeName()}')}Logic from '@/service/${sr
         <#assign majorPSAppDataEntity = deReRs.getMajorPSAppDataEntity() />
         <#-- 从实体 -->
         <#assign minorPSAppDataEntity = deReRs.getMinorPSAppDataEntity() />
+        <#-- 从实体支持临时数据模式为true，才从前端缓存拿取数据，组装数据给后台 start -->
+        <#-- @author zpc -->
+        <#-- @update 2020.7.13 15:00 -->
+        <#if minorPSAppDataEntity.isEnableTempData()>
         let ${srfpluralize(minorPSAppDataEntity.codeName)?lower_case}Data:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_${srfpluralize(minorPSAppDataEntity.codeName)?lower_case}'),'undefined')){
             ${srfpluralize(minorPSAppDataEntity.codeName)?lower_case}Data = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_${srfpluralize(minorPSAppDataEntity.codeName)?lower_case}') as any);
@@ -49,12 +59,25 @@ import ${srfclassname('${singleLogic.getCodeName()}')}Logic from '@/service/${sr
             }
         }
         masterData.${srfpluralize(minorPSAppDataEntity.codeName)?lower_case} = ${srfpluralize(minorPSAppDataEntity.codeName)?lower_case}Data;
+        </#if>
+        <#-- 从实体支持临时数据模式为true，才从前端缓存拿取数据，组装数据给后台 end -->
         </#list>
         </#if>
 </#macro>
 
+<#-- 检查行为是否可以执行 start -->
+<#-- @author zpc -->
+<#-- @update 2020.7.13 18:00 -->
+<#-- 获取测试行为的修饰符和名称 start -->
+<#macro getTestActionModifier appdeAction>
+<#compress>
+<#if appdeAction.getTestActionMode() == 1>private</#if><#if appdeAction.getTestActionMode() == 3>public</#if>
+</#compress>
+</#macro>
+<#-- 获取测试行为的修饰符和名称 end -->
+
 <#-- 定义service_block start -->
-<#macro service_block item singleAppMethod>
+<#macro service_block item singleAppMethod afterActionStr = "">
  <#if item.getPSAppDERSPathCount() gt 0 && singleServiceApi??>
     <#list 1..item.getPSAppDERSPathCount() as count>
         <#assign path = ''/>
@@ -70,21 +93,24 @@ import ${srfclassname('${singleLogic.getCodeName()}')}Logic from '@/service/${sr
         <#if singleAppMethod.getMethodType() == "SELECT">
         if(${condition}context.${item.getCodeName()?lower_case}){
             <#if singleServiceApi.getRequestMethod() == 'PUT' ||  singleServiceApi.getRequestMethod() == 'POST'>
-            return Http.getInstance().${singleServiceApi.getRequestMethod()?lower_case}(`/${path}${srfpluralize(item.codeName)?lower_case}/<#noparse>$</#noparse>{context.${item.getCodeName()?lower_case}}<#if singleServiceApi.getRequestPath()??>${singleServiceApi.getRequestPath()}</#if>`,data,isloading);
+            let res:any = Http.getInstance().${singleServiceApi.getRequestMethod()?lower_case}(`/${path}${srfpluralize(item.codeName)?lower_case}/<#noparse>$</#noparse>{context.${item.getCodeName()?lower_case}}<#if singleServiceApi.getRequestPath()??>${singleServiceApi.getRequestPath()}</#if>`,data,isloading);
             <#else>
-            return Http.getInstance().${singleServiceApi.getRequestMethod()?lower_case}(`/${path}${srfpluralize(item.codeName)?lower_case}/<#noparse>$</#noparse>{context.${item.getCodeName()?lower_case}}<#if singleServiceApi.getRequestPath()??>${singleServiceApi.getRequestPath()}</#if>`,isloading);
-            </#if>
+            let res:any = Http.getInstance().${singleServiceApi.getRequestMethod()?lower_case}(`/${path}${srfpluralize(item.codeName)?lower_case}/<#noparse>$</#noparse>{context.${item.getCodeName()?lower_case}}<#if singleServiceApi.getRequestPath()??>${singleServiceApi.getRequestPath()}</#if>`,isloading);
+            </#if><#if afterActionStr?? && afterActionStr !="" >${afterActionStr}</#if>
+            return res;
         }
         <#-- 方法类型为FETCH -->
         <#elseif singleAppMethod.getMethodType() == "FETCH">
         if(${condition}true){
             let tempData:any = JSON.parse(JSON.stringify(data));
-            return Http.getInstance().get(`/${path}${srfpluralize(item.codeName)?lower_case}<#if singleServiceApi.getRequestPath()??>${singleServiceApi.getRequestPath()}</#if>`,tempData,isloading);
+            let res:any = Http.getInstance().get(`/${path}${srfpluralize(item.codeName)?lower_case}<#if singleServiceApi.getRequestPath()??>${singleServiceApi.getRequestPath()}</#if>`,tempData,isloading);<#if afterActionStr?? && afterActionStr !="" >${afterActionStr}</#if>
+            return res;
         }
         <#-- 方法类型为FETCHTEMP -->
         <#elseif singleAppMethod.getMethodType() == "FETCHTEMP">
         if(${condition}true){
-            return Http.getInstance().get(`/${path}${srfpluralize(item.codeName)?lower_case}<#if singleServiceApi.getRequestPath()??>${singleServiceApi.getRequestPath()}</#if>`,data,isloading);
+            let res:any = Http.getInstance().get(`/${path}${srfpluralize(item.codeName)?lower_case}<#if singleServiceApi.getRequestPath()??>${singleServiceApi.getRequestPath()}</#if>`,data,isloading);<#if afterActionStr?? && afterActionStr !="" >${afterActionStr}</#if>
+            return res;
         }
         <#else>
         <#-- 方法类型为DEACTION start -->
@@ -93,7 +119,7 @@ import ${srfclassname('${singleLogic.getCodeName()}')}Logic from '@/service/${sr
         if(${condition}true){
             let res:any = await Http.getInstance().${singleServiceApi.getRequestMethod()?lower_case}(`/${path}${srfpluralize(item.codeName)?lower_case}<#if singleServiceApi.getRequestPath()??>${singleServiceApi.getRequestPath()}</#if>`,isloading);
             res.data.${item.getCodeName()?lower_case} = data.${item.getCodeName()?lower_case};
-            <@setStore appEntity=item />
+            <@setStore appEntity=item /><#if afterActionStr?? && afterActionStr !="" >${afterActionStr}</#if>
             return res;
         }
             <#-- 无参数情况end -->
@@ -104,12 +130,16 @@ import ${srfclassname('${singleLogic.getCodeName()}')}Logic from '@/service/${sr
             <#-- GET -->
             <#if singleServiceApi.getRequestMethod() == "GET">
             let res:any = await Http.getInstance().${singleServiceApi.getRequestMethod()?lower_case}(`/${path}${srfpluralize(item.codeName)?lower_case}/<#noparse>$</#noparse>{context.${item.getCodeName()?lower_case}}<#if singleServiceApi.getRequestPath()??>${singleServiceApi.getRequestPath()}</#if>`,isloading);
-            <@setStore appEntity=item />
+            <@setStore appEntity=item /><#if afterActionStr?? && afterActionStr !="" >${afterActionStr}</#if>
             return res;
             <#elseif singleServiceApi.getRequestMethod() == "POST">
-            return Http.getInstance().${singleServiceApi.getRequestMethod()?lower_case}(`/${path}${srfpluralize(item.codeName)?lower_case}/<#noparse>$</#noparse>{context.${item.getCodeName()?lower_case}}<#if singleServiceApi.getRequestPath()??>${singleServiceApi.getRequestPath()}</#if>`,data,isloading);
+            let res:any = Http.getInstance().${singleServiceApi.getRequestMethod()?lower_case}(`/${path}${srfpluralize(item.codeName)?lower_case}/<#noparse>$</#noparse>{context.${item.getCodeName()?lower_case}}<#if singleServiceApi.getRequestPath()??>${singleServiceApi.getRequestPath()}</#if>`,data,isloading);<#if afterActionStr?? && afterActionStr !="" >
+            ${afterActionStr}</#if>
+            return res;
             <#else>
-            return Http.getInstance().${singleServiceApi.getRequestMethod()?lower_case}(`/${path}${srfpluralize(item.codeName)?lower_case}/<#noparse>$</#noparse>{context.${item.getCodeName()?lower_case}}<#if singleServiceApi.getRequestPath()??>${singleServiceApi.getRequestPath()}</#if>`,isloading);
+            let res:any = Http.getInstance().${singleServiceApi.getRequestMethod()?lower_case}(`/${path}${srfpluralize(item.codeName)?lower_case}/<#noparse>$</#noparse>{context.${item.getCodeName()?lower_case}}<#if singleServiceApi.getRequestPath()??>${singleServiceApi.getRequestPath()}</#if>`,isloading);<#if afterActionStr?? && afterActionStr !="" >
+            ${afterActionStr}</#if>
+            return res;
             </#if>
             <#-- 指定属性情况end -->
         }
@@ -135,9 +165,9 @@ import ${srfclassname('${singleLogic.getCodeName()}')}Logic from '@/service/${sr
             <#assign majorPSAppDataEntity = deReRs.getMajorPSAppDataEntity() />
             <#-- 从实体 -->
             <#assign minorPSAppDataEntity = deReRs.getMinorPSAppDataEntity() />
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_${srfpluralize(minorPSAppDataEntity.codeName)?lower_case}',JSON.stringify(res.data.${srfpluralize(minorPSAppDataEntity.codeName)?lower_case}));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_${srfpluralize(minorPSAppDataEntity.codeName)?lower_case}',JSON.stringify(res.data.${srfpluralize(minorPSAppDataEntity.codeName)?lower_case}?res.data.${srfpluralize(minorPSAppDataEntity.codeName)?lower_case}:[]));
             </#list>
-            </#if>
+            </#if><#if afterActionStr?? && afterActionStr !="" >${afterActionStr}</#if>
             return res;
         }
             <#else>
@@ -146,7 +176,7 @@ import ${srfclassname('${singleLogic.getCodeName()}')}Logic from '@/service/${sr
             <@getStore appEntity=item />
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().${singleServiceApi.getRequestMethod()?lower_case}(`/${path}${srfpluralize(item.codeName)?lower_case}/<#noparse>$</#noparse>{context.${item.getCodeName()?lower_case}}<#if singleServiceApi.getRequestPath()??>${singleServiceApi.getRequestPath()}</#if>`,data,isloading);
-            <@setStore appEntity=item />
+            <@setStore appEntity=item /><#if afterActionStr?? && afterActionStr !="" >${afterActionStr}</#if>
             return res;
         }
             </#if>
@@ -165,25 +195,30 @@ import ${srfclassname('${singleLogic.getCodeName()}')}Logic from '@/service/${sr
         <#if singleAppMethod.getMethodType() == "SELECT">
         <#--  if(context.${item.getCodeName()?lower_case}){  -->
             <#if singleServiceApi.getRequestMethod() == 'PUT' ||  singleServiceApi.getRequestMethod() == 'POST'>
-            return Http.getInstance().${singleServiceApi.getRequestMethod()?lower_case}(`/${srfpluralize(item.codeName)?lower_case}/<#noparse>$</#noparse>{context.${item.getCodeName()?lower_case}}<#if singleServiceApi.getRequestPath()??>${singleServiceApi.getRequestPath()}</#if>`,data,isloading);
+            let res:any = Http.getInstance().${singleServiceApi.getRequestMethod()?lower_case}(`/${srfpluralize(item.codeName)?lower_case}/<#noparse>$</#noparse>{context.${item.getCodeName()?lower_case}}<#if singleServiceApi.getRequestPath()??>${singleServiceApi.getRequestPath()}</#if>`,data,isloading);
             <#else>
-            return Http.getInstance().${singleServiceApi.getRequestMethod()?lower_case}(`/${srfpluralize(item.codeName)?lower_case}/<#noparse>$</#noparse>{context.${item.getCodeName()?lower_case}}<#if singleServiceApi.getRequestPath()??>${singleServiceApi.getRequestPath()}</#if>`,isloading);
-            </#if>
+            let res:any = Http.getInstance().${singleServiceApi.getRequestMethod()?lower_case}(`/${srfpluralize(item.codeName)?lower_case}/<#noparse>$</#noparse>{context.${item.getCodeName()?lower_case}}<#if singleServiceApi.getRequestPath()??>${singleServiceApi.getRequestPath()}</#if>`,isloading);
+            </#if><#if afterActionStr?? && afterActionStr !="" >${afterActionStr}</#if>
+            return res;
         <#--  }  -->
         <#-- 方法类型为FETCH -->
         <#elseif singleAppMethod.getMethodType() == "FETCH">
         let tempData:any = JSON.parse(JSON.stringify(data));
-        return Http.getInstance().get(`/${srfpluralize(item.codeName)?lower_case}<#if singleServiceApi.getRequestPath()??>${singleServiceApi.getRequestPath()}</#if>`,tempData,isloading);
+        let res:any = Http.getInstance().get(`/${srfpluralize(item.codeName)?lower_case}<#if singleServiceApi.getRequestPath()??>${singleServiceApi.getRequestPath()}</#if>`,tempData,isloading);<#if afterActionStr?? && afterActionStr !="" >
+        ${afterActionStr}</#if>
+        return res;
         <#-- 方法类型为FETCHTEMP -->
         <#elseif singleAppMethod.getMethodType() == "FETCHTEMP">
-        return Http.getInstance().get(`/${srfpluralize(item.codeName)?lower_case}<#if singleServiceApi.getRequestPath()??>${singleServiceApi.getRequestPath()}</#if>`,data,isloading);
+        let res:any =  Http.getInstance().get(`/${srfpluralize(item.codeName)?lower_case}<#if singleServiceApi.getRequestPath()??>${singleServiceApi.getRequestPath()}</#if>`,data,isloading);<#if afterActionStr?? && afterActionStr !="" >
+        ${afterActionStr}</#if>
+        return res;
         <#else>
         <#-- 方法类型为DEACTION start -->
             <#if singleServiceApi.getRequestParamType() == "NONE">
         <#-- 无参数情况start -->
         let res:any = await  Http.getInstance().${singleServiceApi.getRequestMethod()?lower_case}(`/${srfpluralize(item.codeName)?lower_case}<#if singleServiceApi.getRequestPath()??>${singleServiceApi.getRequestPath()}</#if>`,isloading);
         res.data.${item.getCodeName()?lower_case} = data.${item.getCodeName()?lower_case};
-        <@setStore appEntity=item />
+        <@setStore appEntity=item /><#if afterActionStr?? && afterActionStr !="" >${afterActionStr}</#if>
         return res;
             <#-- 无参数情况end -->
             <#elseif singleServiceApi.getRequestParamType() == "FIELD">
@@ -192,17 +227,21 @@ import ${srfclassname('${singleLogic.getCodeName()}')}Logic from '@/service/${sr
             <#if singleServiceApi.getRequestMethod() == "GET">
         <#--  if(context.${item.getCodeName()?lower_case}){  -->
             let res:any = await Http.getInstance().${singleServiceApi.getRequestMethod()?lower_case}(`/${srfpluralize(item.codeName)?lower_case}/<#noparse>$</#noparse>{context.${item.getCodeName()?lower_case}}<#if singleServiceApi.getRequestPath()??>${singleServiceApi.getRequestPath()}</#if>`,isloading);
-            <@setStore appEntity=item />
+            <@setStore appEntity=item /><#if afterActionStr?? && afterActionStr !="" >${afterActionStr}</#if>
             return res;
         <#--  }  -->
             <#elseif singleServiceApi.getRequestMethod() == "POST">
             <#-- REMOVE -->
         <#--  if(context.${item.getCodeName()?lower_case}){  -->
-            return Http.getInstance().${singleServiceApi.getRequestMethod()?lower_case}(`/${srfpluralize(item.codeName)?lower_case}/<#noparse>$</#noparse>{context.${item.getCodeName()?lower_case}}<#if singleServiceApi.getRequestPath()??>${singleServiceApi.getRequestPath()}</#if>`,data,isloading);
+            let res:any = Http.getInstance().${singleServiceApi.getRequestMethod()?lower_case}(`/${srfpluralize(item.codeName)?lower_case}/<#noparse>$</#noparse>{context.${item.getCodeName()?lower_case}}<#if singleServiceApi.getRequestPath()??>${singleServiceApi.getRequestPath()}</#if>`,data,isloading);<#if afterActionStr?? && afterActionStr !="" >
+            ${afterActionStr}</#if>
+            return res;
         <#--  }    -->
             <#else>
         <#--  if(context.${item.getCodeName()?lower_case}){  -->
-            return Http.getInstance().${singleServiceApi.getRequestMethod()?lower_case}(`/${srfpluralize(item.codeName)?lower_case}/<#noparse>$</#noparse>{context.${item.getCodeName()?lower_case}}<#if singleServiceApi.getRequestPath()??>${singleServiceApi.getRequestPath()}</#if>`,isloading);
+            let res:any = Http.getInstance().${singleServiceApi.getRequestMethod()?lower_case}(`/${srfpluralize(item.codeName)?lower_case}/<#noparse>$</#noparse>{context.${item.getCodeName()?lower_case}}<#if singleServiceApi.getRequestPath()??>${singleServiceApi.getRequestPath()}</#if>`,isloading);<#if afterActionStr?? && afterActionStr !="" >
+            ${afterActionStr}</#if>
+            return res;
         <#--  }     -->
             </#if>
             <#-- 指定属性情况end -->
@@ -214,7 +253,7 @@ import ${srfclassname('${singleLogic.getCodeName()}')}Logic from '@/service/${sr
         Object.assign(data,masterData);
         <#--  if(context.${item.getCodeName()?lower_case}){  -->
             let res:any = await  Http.getInstance().${singleServiceApi.getRequestMethod()?lower_case}(`/${srfpluralize(item.codeName)?lower_case}/<#noparse>$</#noparse>{context.${item.getCodeName()?lower_case}}<#if singleServiceApi.getRequestPath()??>${singleServiceApi.getRequestPath()}</#if>`,data,isloading);
-            <@setStore appEntity=item />
+            <@setStore appEntity=item /><#if afterActionStr?? && afterActionStr !="" >${afterActionStr}</#if>
             return res;
         <#--  }  -->
         <#elseif singleAppMethod.getCodeName() == 'Save'>
@@ -223,7 +262,7 @@ import ${srfclassname('${singleLogic.getCodeName()}')}Logic from '@/service/${sr
         Object.assign(data,masterData);
         <#--  if(context.${item.getCodeName()?lower_case}){  -->
             let res:any = await  Http.getInstance().${singleServiceApi.getRequestMethod()?lower_case}(`/${srfpluralize(item.codeName)?lower_case}/<#noparse>$</#noparse>{context.${item.getCodeName()?lower_case}}<#if singleServiceApi.getRequestPath()??>${singleServiceApi.getRequestPath()}</#if>`,data,isloading);
-            <@setStore appEntity=item />
+            <@setStore appEntity=item /><#if afterActionStr?? && afterActionStr !="" >${afterActionStr}</#if>
             return res;
         <#--  }  -->
         <#elseif singleAppMethod.getCodeName() == 'Create'>
@@ -244,13 +283,14 @@ import ${srfclassname('${singleLogic.getCodeName()}')}Logic from '@/service/${sr
         <#assign majorPSAppDataEntity = deReRs.getMajorPSAppDataEntity() />
         <#-- 从实体 -->
         <#assign minorPSAppDataEntity = deReRs.getMinorPSAppDataEntity() />
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_${srfpluralize(minorPSAppDataEntity.codeName)?lower_case}',JSON.stringify(res.data.${srfpluralize(minorPSAppDataEntity.codeName)?lower_case}));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_${srfpluralize(minorPSAppDataEntity.codeName)?lower_case}',JSON.stringify(res.data.${srfpluralize(minorPSAppDataEntity.codeName)?lower_case}?res.data.${srfpluralize(minorPSAppDataEntity.codeName)?lower_case}:[]));
         </#list>
-        </#if>
+        </#if><#if afterActionStr?? && afterActionStr !="" >${afterActionStr}</#if>
         return res;
         <#else>
         <#--  if(context.${item.getCodeName()?lower_case}){  -->
-            return Http.getInstance().${singleServiceApi.getRequestMethod()?lower_case}(`/${srfpluralize(item.codeName)?lower_case}/<#noparse>$</#noparse>{context.${item.getCodeName()?lower_case}}<#if singleServiceApi.getRequestPath()??>${singleServiceApi.getRequestPath()}</#if>`,data,isloading);
+            let res:any = Http.getInstance().${singleServiceApi.getRequestMethod()?lower_case}(`/${srfpluralize(item.codeName)?lower_case}/<#noparse>$</#noparse>{context.${item.getCodeName()?lower_case}}<#if singleServiceApi.getRequestPath()??>${singleServiceApi.getRequestPath()}</#if>`,data,isloading);<#if afterActionStr?? && afterActionStr !="" >${afterActionStr}</#if>
+            return res;
         <#--  }  -->
         </#if>
             <#-- 提交对象数据情况end -->
@@ -440,6 +480,38 @@ import ${srfclassname('${singleLogic.getCodeName()}')}Logic from '@/service/${sr
 </#macro>
 <#-- 定义service_block end -->
 
+<#-- 行为执行之前 start -->
+<#-- @author zpc -->
+<#-- @update 2020.7.14 11:00 -->
+<#macro excuteBeforeAction appdeAction>
+    <#if appdeAction.getBeforePSDEActionLogics?? && appdeAction.getBeforePSDEActionLogics()??>
+        <#list appdeAction.getBeforePSDEActionLogics() as beforelogic>
+        <#if beforelogic.getPSDELogic()??>
+        <#assign singleLogic = beforelogic.getPSDELogic() />
+        let ${singleLogic.getCodeName()?lower_case}:${srfclassname('${singleLogic.getCodeName()}')}Logic = new ${srfclassname('${singleLogic.getCodeName()}')}Logic({context:JSON.parse(JSON.stringify(context)),data:JSON.parse(JSON.stringify(data))});
+        data = await ${singleLogic.getCodeName()?lower_case}.onExecute(context,data,isloading?true:false);
+        </#if>
+        </#list>
+    </#if>
+</#macro>
+<#-- 行为执行之前 end -->
+
+<#-- 行为执行之后 start -->
+<#-- @author zpc -->
+<#-- @update 2020.7.14 14:00 -->
+<#macro excuteAfterAction appdeAction>
+    <#if appdeAction.getAfterPSDEActionLogics?? && appdeAction.getAfterPSDEActionLogics()??>
+        <#list appdeAction.getAfterPSDEActionLogics() as afterlogic>
+        <#if afterlogic.getPSDELogic()??>
+        <#assign singleLogic = afterlogic.getPSDELogic() />
+    <@compress single_line=true>let ${singleLogic.getCodeName()?lower_case}:${srfclassname('${singleLogic.getCodeName()}')}Logic = new ${srfclassname('${singleLogic.getCodeName()}')}Logic({context:JSON.parse(JSON.stringify(context)),data:JSON.parse(JSON.stringify(res))});</@compress>
+            <@compress single_line=true>res = await ${singleLogic.getCodeName()?lower_case}.onExecute(context,res,isloading?true:false);</@compress>
+        </#if>
+        </#list>
+    </#if>
+</#macro>
+<#-- 行为执行之后 end -->
+
 
 /**
  * ${de.getLogicName()}服务对象基类
@@ -479,7 +551,7 @@ export default class ${srfclassname('${item.getCodeName()}')}ServiceBase extends
 <#if item.getAllPSAppDEMethods?? && item.getAllPSAppDEMethods()??>
 <#list item.getAllPSAppDEMethods() as singleAppMethod>
 <#if singleAppMethod.getPSDEServiceAPIMethod?? &&  singleAppMethod.getPSDEServiceAPIMethod()??>
- <#assign singleServiceApi = singleAppMethod.getPSDEServiceAPIMethod()/>
+<#assign singleServiceApi = singleAppMethod.getPSDEServiceAPIMethod()/>
 </#if>
     <#if singleAppMethod.render??>
         ${singleAppMethod.render.code}
@@ -496,22 +568,133 @@ export default class ${srfclassname('${item.getCodeName()}')}ServiceBase extends
      * @memberof ${srfclassname('${item.getCodeName()}')}ServiceBase
      */
     public async ${singleAppMethod.getCodeName()}(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-    <#--是否存在前端处理逻辑start -->
     <#if singleAppMethod.getPSDEAction()??>
     <#assign appdeAction = singleAppMethod.getPSDEAction() /> 
+    <#-- 检查行为是否可以执行 start -->
+    <#-- @author zpc -->
+    <#-- @update 2020.7.13 16:00 -->
+    <#if appdeAction.getTestActionMode?? && appdeAction.getTestActionMode()?? && (appdeAction.getTestActionMode() == 1 || appdeAction.getTestActionMode() == 3)>
+        let result:any = await this.test${srfclassname('${singleAppMethod.getCodeName()}')}(context,data);
+		if(!result) return;
+    </#if>
+    <#-- 检查行为是否可以执行 end -->
+
+    <#-- 行为执行之前 start -->
+    <#-- @author zpc -->
+    <#-- @update 2020.7.14 11:00 -->
+    <@excuteBeforeAction appdeAction = appdeAction />
+    <#-- 行为执行之前 end -->
+    <#--是否存在前端处理逻辑start -->
     <#if appdeAction.getPSDELogic?? && appdeAction.getPSDELogic()?? && (appdeAction.getActionHolder() == 2 || appdeAction.getActionHolder() == 3)   >
     <#assign appdelogic = appdeAction.getPSDELogic() />
         let appLogic:${srfclassname('${appdelogic.getCodeName()}')}Logic = new ${srfclassname('${appdelogic.getCodeName()}')}Logic({context:JSON.parse(JSON.stringify(context)),data:JSON.parse(JSON.stringify(data))});
-        const result = await appLogic.onExecute(context,data,isloading?true:false);
-        return {status:200,data:result};
+        const res = await appLogic.onExecute(context,data,isloading?true:false);
+        <@excuteAfterAction appdeAction = appdeAction />
+        return {status:200,data:res};
     <#else>
-    <@service_block item=item singleAppMethod=singleAppMethod/>
+    <#-- 行为执行之后 start -->
+    <#-- @author zpc -->
+    <#-- @update 2020.7.14 14:00 -->
+    <#assign afterActionStr><@excuteAfterAction appdeAction = appdeAction /></#assign>
+    <@service_block item=item singleAppMethod=singleAppMethod afterActionStr = afterActionStr/>
+    <#-- 行为执行之后 end -->
     </#if>
     <#--是否存在前端处理逻辑end -->
     <#else>
-    <@service_block item=item singleAppMethod=singleAppMethod/>
+    <#-- 行为执行之后 start -->
+    <#-- @author zpc -->
+    <#-- @update 2020.7.14 14:00 -->
+    <@service_block item=item singleAppMethod=singleAppMethod />
+    <#-- 行为执行之后 end -->
+    </#if>
+    }
+    <#-- 查询数据集(post方式)start -->
+    <#-- @author zpc -->
+    <#-- @update 2020.7.13 15:00 -->
+    <#if singleAppMethod.getMethodType?? && singleAppMethod.getMethodType()?? && singleAppMethod.getMethodType() == "FETCH">
+    <#assign dataSet = singleAppMethod.getPSDEDataSet() />
+
+    /**
+     * search${dataSet.getCodeName()}接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof ${srfclassname('${item.getCodeName()}')}ServiceBase
+     */
+    public async search${dataSet.getCodeName()}(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+    <#-- 检查行为是否可以执行 start -->
+    <#-- @author zpc -->
+    <#-- @update 2020.7.13 16:00 -->
+    <#if singleAppMethod.getPSDEAction()??>
+    <#assign appdeAction = singleAppMethod.getPSDEAction() />
+    <#if appdeAction.getTestActionMode?? && appdeAction.getTestActionMode()?? && (appdeAction.getTestActionMode() == 1 || appdeAction.getTestActionMode() == 3)>
+        let result:any = await this.test${srfclassname('search${dataSet.getCodeName()}')}(context,data);
+		if(!result) return;
+    </#if>
     </#if>
+    <#-- 检查行为是否可以执行 end -->
+    <#if item.getPSAppDERSPathCount() gt 0 && singleServiceApi??>
+        <#list 1..item.getPSAppDERSPathCount() as count>
+        <#assign path = ''/>
+        <#assign condition = ''/>
+        <#list item.getPSAppDERSPath(count_index)  as deRSPath>
+            <#if deRSPath.getMajorPSAppDataEntity?? && deRSPath.getMajorPSAppDataEntity()??>
+                <#assign _dataEntity = deRSPath.getMajorPSAppDataEntity()/>
+                <#assign condition>${condition}context.${_dataEntity.getCodeName()?lower_case} && </#assign>
+                <#assign path>${path}${srfpluralize(_dataEntity.codeName)?lower_case}/<#noparse>$</#noparse>{context.${_dataEntity.getCodeName()?lower_case}}/</#assign>
+            </#if>
+        </#list>
+        if(${condition}true){
+            let tempData:any = JSON.parse(JSON.stringify(data));
+            return Http.getInstance().post(`/${path}${srfpluralize(item.codeName)?lower_case}/search${dataSet.getCodeName()?lower_case}`,tempData,isloading);
         }
+        </#list>
+    </#if>
+    <#if item.isMajor()>
+        let tempData:any = JSON.parse(JSON.stringify(data));
+        return Http.getInstance().post(`/${srfpluralize(item.codeName)?lower_case}/search${dataSet.getCodeName()?lower_case}`,tempData,isloading);
+    </#if>
+    }
+    </#if>
+    <#-- 查询数据集(post方式)end -->
+    <#-- 检查行为是否可以执行 start -->
+    <#-- @author zpc -->
+    <#-- @update 2020.7.13 17:00 -->
+    <#if singleAppMethod.getPSDEAction()??>
+    <#assign appdeAction = singleAppMethod.getPSDEAction() />
+    <#if appdeAction.getTestActionMode?? && appdeAction.getTestActionMode()?? && (appdeAction.getTestActionMode() == 1 || appdeAction.getTestActionMode() == 3)>
+    
+    /**
+     * test${srfclassname('${singleAppMethod.getCodeName()}')}方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @returns {Promise<any>}
+     * @memberof ${srfclassname('${item.getCodeName()}')}ServiceBase
+     */
+    <@getTestActionModifier appdeAction=appdeAction/> async test${srfclassname('${singleAppMethod.getCodeName()}')}(context: any = {},data: any = {}): Promise<any> {
+        return true;
+    }
+    <#if singleAppMethod.getMethodType?? && singleAppMethod.getMethodType()?? && singleAppMethod.getMethodType() == "FETCH">
+    <#assign dataSet = singleAppMethod.getPSDEDataSet() />
+
+    /**
+     * test${srfclassname('search${dataSet.getCodeName()}')}方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @returns {Promise<any>}
+     * @memberof ${srfclassname('${item.getCodeName()}')}ServiceBase
+     */
+    <@getTestActionModifier appdeAction=appdeAction/> async test${srfclassname('search${dataSet.getCodeName()}')}(context: any = {},data: any = {}): Promise<any> {
+        return true;
+    }
+    </#if>
+    </#if>
+    </#if>
+    <#-- 检查行为是否可以执行 end -->
     </#if>
     </#if>
 </#list>

APP/src/uiservice/%DE_PKGPATH%/%DE_PKGPATH%-ui-service-base.ts.ftl

@@ -338,7 +338,7 @@ ${P.getLogicCode(appdeUIAction, "LOGIC.vue").code}
 
         this.mainStateFields.forEach((singleMainField:any) =>{
             if(!(singleMainField in curData)){
-                console.error(`当前数据对象不包含属性singleMainField，可能会发生错误`);
+                <#noparse>console.warn(`当前数据对象不包含属性${singleMainField}，可能会发生错误`);</#noparse>
             }
         })
         for (let i = 0; i <= 1; i++) {