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]" 
@@ -6,4 +9,5 @@
   <#if item.getUnitName?? && item.getUnitName()??>unit="${item.getUnitName()}"</#if>
   <#if item.getPlaceHolder()??>placeholder="${item.getPlaceHolder()}"</#if>
   @change="($event)=>{gridEditItemChange(row, column.property, $event, $index)}">
-</input-box>
\ No newline at end of file
+</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" 
@@ -8,4 +11,5 @@
   <#if item.getUnitName?? && item.getUnitName()??>unit="${item.getUnitName()}"</#if>
   <#if item.getPlaceHolder()??>placeholder="${item.getPlaceHolder()}"</#if>
   @change="($event)=>{panelEditItemChange(data, ${editor.getName()?lower_case}, $event)}">
-</input-box>
\ No newline at end of file
+</input-box>
+</#if>
\ No newline at end of file

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

-<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>
\ No newline at end of file
+<#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

-<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>
\ No newline at end of file
+<#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" 
@@ -13,4 +16,5 @@
     codelistType='${codelist.getCodeListType()}'
     </#if> 
     placeholder=<#if item.getPlaceHolder()??>'${item.getPlaceHolder()}'<#else>'请选择...'</#if> style="${editor.getEditorCssStyle()}">
- </dropdown-list>
\ No newline at end of file
+ </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" 
@@ -14,4 +17,5 @@
   codelistType='${codelist.getCodeListType()}'
   </#if>  
   placeholder=<#if item.getPlaceHolder()??>'${item.getPlaceHolder()}'<#else>'请选择...'</#if>>
- </dropdown-list>
\ No newline at end of file
+ </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" 
@@ -16,4 +19,5 @@
     </#if>
   </#if> 
   placeholder=<#if item.getPlaceHolder()??>'${item.getPlaceHolder()}'<#else>'请选择...'</#if> style="${editor.getEditorCssStyle()}">
-</dropdown-list-mpicker>
\ No newline at end of file
+</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" 
@@ -16,4 +19,5 @@
   placeholder=<#if item.getPlaceHolder()??>'${item.getPlaceHolder()}'<#else>'请选择...'</#if>
   @change="($event)=>{gridEditItemChange(row, column.property, $event, $index)}"
   style="${item.getEditorCssStyle()}">
-</dropdown-list-mpicker>
\ No newline at end of file
+</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" 
@@ -18,4 +21,5 @@
   placeholder=<#if item.getPlaceHolder()??>'${item.getPlaceHolder()}'<#else>'请选择...'</#if>
   @change="($event)=>{panelEditItemChange(data, '${editor.name?lower_case}', $event)}"
   style="${item.getEditorCssStyle()}">
-</dropdown-list-mpicker>
\ No newline at end of file
+</dropdown-list-mpicker>
+</#if>
\ No newline at end of file

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

-<app-code-editor :code="data.${editor.name}" :disabled="detailsModel.${editor.name}.disabled" @change="(val) =>{this.data.${editor.name} =val}" codetype="javascript" ></app-code-editor>
\ No newline at end of file
+<#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" 
@@ -14,4 +17,5 @@
   codelistType='${codelist.getCodeListType()}' 
   </#if> 
   style="${editor.getEditorCssStyle()}">
-</app-radio-group>
\ No newline at end of file
+</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

- <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>
\ No newline at end of file
+<#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" 
@@ -10,4 +13,5 @@
   :imageOnly="true"
   :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>
\ No newline at end of file
+</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,4 +16,5 @@
   :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>
\ No newline at end of file
+</app-file-upload>
+</#if>
\ No newline at end of file

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

- <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>
\ No newline at end of file
+<#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" 
@@ -10,4 +13,5 @@
   :imageOnly="true"
   :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>
\ No newline at end of file
+</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" 
@@ -12,4 +15,5 @@
   :imageOnly="true"
   :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>
\ No newline at end of file
+</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"
@@ -20,4 +23,5 @@
     @formitemvaluechange="onFormItemValueChange" 
     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"
@@ -20,4 +23,5 @@
     @formitemvaluechange="($event)=>{onGridItemValueChange(row,$event,$index)}" 
     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"
@@ -20,4 +23,5 @@
     @formitemvaluechange="onFormItemValueChange" 
     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"
@@ -20,4 +23,5 @@
     @formitemvaluechange="($event)=>{onGridItemValueChange(row,$event,$index)}" 
     style="${editor.getEditorCssStyle()}">
 </app-mpicker>
+</#if>
 </#if>
\ No newline at end of file

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

-<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>
\ No newline at end of file
+<#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>
\ No newline at end of file
+</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" 
@@ -11,4 +14,5 @@
   </#if> 
     @change="($event)=>{panelEditItemChange(data, '${editor.name?lower_case}', $event)}">
   </textarea>
-</div>
\ No newline at end of file
+</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>
\ No newline at end of file
+</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" 
@@ -12,4 +15,5 @@
 </#if> 
     @change="($event)=>{panelEditItemChange(data, '${editor.name?lower_case}', $event)}">
   </textarea>
-</div>
\ No newline at end of file
+</div>
+</#if>
\ No newline at end of file

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

-<i-input type="password" v-model="data.${editor.name}" :disabled="detailsModel.${editor.name}.disabled" style="${editor.getEditorCssStyle()}"></i-input>
\ No newline at end of file
+<#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

-<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>
\ No newline at end of file
+<#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??>
@@ -6,4 +9,5 @@
   v-model="data.${editor.name?lower_case}" 
   style="${item.getEditorCssStyle()}" 
   @change="($event)=>{panelEditItemChange(data, '${editor.name?lower_case}', $event)}">
-</input-box>
\ No newline at end of file
+</input-box>
+</#if>
\ No newline at end of file

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

-<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>
\ No newline at end of file
+<#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

-<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>
\ No newline at end of file
+<#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}" 
@@ -6,4 +9,5 @@
   :disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1" 
 </#if>
   style="${item.getEditorCssStyle()}">
-</app-switch>
\ No newline at end of file
+</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)"  
@@ -13,4 +16,5 @@
 </#if>
   <#if editor.getPlaceHolder()??>placeholder="${editor.getPlaceHolder()}"</#if> 
   style="${editor.getEditorCssStyle()}">
-</input-box>
\ No newline at end of file
+</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]" 
@@ -17,4 +20,5 @@
   placeholder="${item.getPlaceHolder()}"
 </#if> 
   @change="($event)=>{gridEditItemChange(row, column.property, $event, $index)}">
-</input-box>
\ No newline at end of file
+</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>
\ No newline at end of file
+</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 
@@ -25,4 +28,5 @@
     <@getItemRender editor />
 </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 
@@ -25,4 +28,5 @@
     <@getItemRender editor />
 </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 
@@ -25,4 +28,5 @@
     <@getItemRender editor />
 </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 
@@ -23,4 +26,5 @@
   @formitemvaluechange="onFormItemValueChange">
 </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 
@@ -23,4 +26,5 @@
   @formitemvaluechange="($event)=>{onGridItemValueChange(row,$event,$index)}">
 </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 
@@ -25,4 +28,5 @@
   @formitemvaluechange="onFormItemValueChange">
 </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 
@@ -25,4 +28,5 @@
   @formitemvaluechange="($event)=>{onGridItemValueChange(row,$event,$index)}">
 </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"
@@ -20,4 +23,5 @@
   style="${editor.getEditorCssStyle()}" 
   @formitemvaluechange="onFormItemValueChange">
     <@getItemRender editor />
-</app-picker>
\ No newline at end of file
+</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"
@@ -20,4 +23,5 @@
   style="${item.getEditorCssStyle()}" 
   @formitemvaluechange="($event)=>{onGridItemValueChange(row,$event,$index)}">
     <@getItemRender editor />
-</app-picker>
\ No newline at end of file
+</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 
@@ -25,4 +28,5 @@
   @formitemvaluechange="onFormItemValueChange" 
   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 
@@ -25,4 +28,5 @@
   @formitemvaluechange="($event)=>{onGridItemValueChange(row,$event,$index)}"
   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 
@@ -26,4 +29,5 @@
     <@getItemRender editor />
 </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,4 +29,5 @@
     <@getItemRender editor />
 </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,4 +26,5 @@
   @formitemvaluechange="onFormItemValueChange">
 </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,4 +26,5 @@
   @formitemvaluechange="($event)=>{onGridItemValueChange(row,$event,$index)}">
 </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 
@@ -22,4 +25,5 @@
   @formitemvaluechange="onFormItemValueChange">
 </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 
@@ -22,4 +25,5 @@
   @formitemvaluechange="($event)=>{onGridItemValueChange(row,$event,$index)}">
 </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"
@@ -18,4 +21,5 @@
   :linkview=<@getLinkView editor /> 
   style="${editor.getEditorCssStyle()}"  
   @formitemvaluechange="onFormItemValueChange">
-</app-picker>
\ No newline at end of file
+</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"
@@ -18,4 +21,5 @@
   :linkview=<@getLinkView editor /> 
   style="${editor.getEditorCssStyle()}"  
   @formitemvaluechange="($event)=>{onGridItemValueChange(row,$event,$index)}">
-</app-picker>
\ No newline at end of file
+</app-picker>
+</#if>
\ No newline at end of file

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

-<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>
\ No newline at end of file
+<#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" 
@@ -10,4 +13,5 @@
   :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>
\ No newline at end of file
+</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" 
@@ -12,4 +15,5 @@
   :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>
\ No newline at end of file
+</app-file-upload>
+</#if>
\ No newline at end of file

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

-<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>
\ No newline at end of file
+<#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

-<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>
\ No newline at end of file
+<#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

-<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>
\ No newline at end of file
+<#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" 
@@ -9,4 +12,5 @@
   :value="data.${editor.name?lower_case}" 
   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>
\ No newline at end of file
+</date-picker>
+</#if>
\ No newline at end of file

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

-<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>
\ No newline at end of file
+<#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

-<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>
\ No newline at end of file
+<#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" 
@@ -9,4 +12,5 @@
   :value="data.${editor.name?lower_case}" 
   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>
\ No newline at end of file
+</date-picker>
+</#if>
\ No newline at end of file

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

- <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>
\ No newline at end of file
+<#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

- <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>
\ No newline at end of file
+<#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" 
@@ -8,4 +11,5 @@
   :value="data.${editor.name?lower_case}" 
   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>
\ No newline at end of file
+</time-picker>
+</#if>
\ No newline at end of file

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

- <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>
\ No newline at end of file
+<#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

- <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>
\ No newline at end of file
+<#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" 
@@ -8,4 +11,5 @@
   :value="data.${editor.name?lower_case}" 
   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>
\ No newline at end of file
+</time-picker>
+</#if>
\ No newline at end of file

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

-<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>
\ No newline at end of file
+<#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

-<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>
\ No newline at end of file
+<#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" 
@@ -9,4 +12,5 @@
   :value="data.${editor.name?lower_case}" 
   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>
\ No newline at end of file
+</date-picker>
+</#if>
\ No newline at end of file

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

- <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>
\ No newline at end of file
+<#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

- <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>
\ No newline at end of file
+<#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" 
@@ -8,4 +11,5 @@
   :value="data.${editor.name?lower_case}" 
   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>
\ No newline at end of file
+</time-picker>
+</#if>
\ No newline at end of file

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

- <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>
\ No newline at end of file
+<#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

- <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>
\ No newline at end of file
+<#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" 
@@ -8,4 +11,5 @@
   :value="data.${editor.name?lower_case}" 
   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>
\ No newline at end of file
+</time-picker>
+</#if>
\ No newline at end of file

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

- <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>
\ No newline at end of file
+<#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

- <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>
\ No newline at end of file
+<#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" 
@@ -8,4 +11,5 @@
   :value="data.${editor.name?lower_case}" 
   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>
\ No newline at end of file
+</time-picker>
+</#if>
\ No newline at end of file

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

-<i-input v-model="data.${editor.name}" readonly disabled style="${editor.getEditorCssStyle()}"></i-input>
\ No newline at end of file
+<#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>
\ No newline at end of file
+  
+</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>
@@ -22,4 +25,5 @@
   :localContext =<@getNavigateContext editor /> <#t>
   :localParam =<@getNavigateParams editor /> <#t>
   style="${editor.getEditorCssStyle()}"><#t>
-</app-span><#lt>
\ No newline at end of file
+</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

-<app-stepper name='${editor.name}' :value="this.data.${editor.name}" @change="onFormItemValueChange" :disabled="detailsModel.${editor.name}.disabled" style="${editor.getEditorCssStyle()}"></app-stepper>
\ No newline at end of file
+<#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