表单与搜索表单代码整理

7c55fb53 · zcdtk · 579d42e4 · 7c55fb53 · 7c55fb53 · 7c55fb53
--- a/@CONTROL/搜索表单/CONTROL-BASE.vue#DETAIL_BUTTON.ftl
+++ b/@CONTROL/搜索表单/CONTROL-BASE.vue#DETAIL_BUTTON.ftl
 <#if item.render??>
-${item.render.code}
+    ${item.render.code}
 <#else>
 <div class="app-form-item-button" v-show="detailsModel.${item.name}.visible">
-    <nut-button v-if="detailsModel.${item.name}.visible" class="app-form-button<#if item.getPSSysCss()??> ${item.getPSSysCss().getCssName()}</#if>" style='<#if item.getHeight() gt 0>height: ${item.getHeight()}px;</#if>'>${item.caption}</nut-button>
+    <nut-button 
+        v-if="detailsModel.${item.name}.visible" 
+        class="app-form-button<#if item.getPSSysCss()??> ${item.getPSSysCss().getCssName()}</#if>" 
+        style='<#if item.getHeight() gt 0>height: ${item.getHeight()}px;</#if>'>${item.caption}</nut-button>
 </div>
 </#if>
\ No newline at end of file
--- a/@CONTROL/搜索表单/CONTROL-BASE.vue#DETAIL_DRUIPART.ftl
+++ b/@CONTROL/搜索表单/CONTROL-BASE.vue#DETAIL_DRUIPART.ftl
+<#ibizinclude>../../@NAVPARAMS/FUNC/PUBLIC.vue.ftl</#ibizinclude>
 <#if item.render??>
-${item.render.code}
+    ${item.render.code}
 <#else>
 <#assign dritem = item.getPSDEDRItem() />
 <#assign refView = item.getPSAppView() />
 <#assign appDataEntity = refView.getPSAppDataEntity()/>
 <app-form-druipart
-    <#if item.getPSSysCss?? && item.getPSSysCss()??>class="${item.getPSSysCss().getCssName()}"</#if>
-    :formState="formState"
+    class='<#if item.getPSSysCss?? && item.getPSSysCss()??>${item.getPSSysCss().getCssName()}</#if>' 
+    parameterName='${appde.getCodeName()?lower_case}' 
+    refviewtype='<#if refView.getPSViewType()??>${refView.getPSViewType().getId()}</#if>'  
+    refreshitems='<#if item.getRefreshItems()??>${item.getRefreshItems()}</#if>' 
+    viewname='${srffilepath2(refView.codeName)}' 
    paramItem='<#if item.getParamItem()??>${item.getParamItem()}<#else>${appde.getCodeName()?lower_case}</#if>' 
+    style="<#if item.getPSLayoutPos()?? && item.getPSLayoutPos().getLayout() == "FLEX">height: 100%;</#if><#if item.getContentHeight() == 0><#if refView.getHeight() gt 0>height:${refView.getHeight()?c}px</#if><#else>height:${item.getContentHeight()?c}px;</#if>" 
+    :formState="formState" 
    :parentdata='<#if dritem.getParentDataJO?? && dritem.getParentDataJO()??>${dritem.getParentDataJO()}<#else>{}</#if>' 
    :parameters="[
        <#if refView.getPSAppDERSPathCount() gt 0>
@@ -19,13 +25,9 @@ ${item.render.code}
    ]" 
    :context="context" 
    :viewparams="viewparams" 
-    parameterName='${appde.getCodeName()?lower_case}'  
-    refviewtype='<#if refView.getPSViewType()??>${refView.getPSViewType().getId()}</#if>' 
-    refreshitems='<#if item.getRefreshItems()??>${item.getRefreshItems()}</#if>' 
+    :navigateContext ='<@getNavigateContext item />' 
+    :navigateParam ='<@getNavigateParams item />' 
    :ignorefieldvaluechange="ignorefieldvaluechange" 
-    viewname='${srffilepath2(refView.codeName)}' 
    :data="JSON.stringify(this.data)"  
-    @drdatasaved="drdatasaved($event)"
-    style="<#if item.getPSLayoutPos()?? && item.getPSLayoutPos().getLayout() == "FLEX">height: 100%;</#if><#if item.getContentHeight() == 0><#if refView.getHeight() gt 0>height:${refView.getHeight()?c}px</#if><#else>height:${item.getContentHeight()?c}px;</#if>">
-</app-form-druipart>
+    @drdatasaved="drdatasaved($event)"/>
 </#if>
--- a/@CONTROL/搜索表单/CONTROL-BASE.vue#DETAIL_FORMITEM.ftl
+++ b/@CONTROL/搜索表单/CONTROL-BASE.vue#DETAIL_FORMITEM.ftl
@@ -5,10 +5,35 @@
 <#if item.render??>
    ${item.render.code}
 <#else>
-<app-form-item ref="${item.name}rules"  :checkValue="this.data.${item.name}" v-show="detailsModel.${item.name}.visible" name='${item.name}' :itemRules="this.rules.${item.name}" class='<#if item.getPSSysCss?? && item.getPSSysCss()??>${item.getPSSysCss().getCssName()}</#if>'<#if item.getLabelPSSysCss?? && item.getLabelPSSysCss()??> labelStyle="${item.getLabelPSSysCss().getCssName()}"</#if> :caption="<#if langbase??>$t('${langbase}.details.${item.name}')<#else>'${item.getCaption()}'</#if>" uiStyle="${item.getDetailStyle()}" :labelWidth="${item.getLabelWidth()?c}" :isShowCaption="${item.isShowCaption()?c}" :error="detailsModel.${item.name}.error" :isEmptyCaption="${item.isEmptyCaption()?c}" labelPos="${item.getLabelPos()}">
+<app-form-item 
+    name='${item.name}' 
+    class='<#if item.getPSSysCss?? && item.getPSSysCss()??>${item.getPSSysCss().getCssName()}</#if>' 
+    <#if item.getLabelPSSysCss?? && item.getLabelPSSysCss()??>
+    labelStyle="${item.getLabelPSSysCss().getCssName()}"  
+    </#if> 
+    uiStyle="${item.getDetailStyle()}"  
+    labelPos="${item.getLabelPos()}" 
+    ref="${item.name}_item"  
+    :itemValue="this.data.${item.name}" 
+    v-show="detailsModel.${item.name}.visible" 
+    :itemRules="this.rules.${item.name}" 
+    :caption="<#if langbase??>$t('${langbase}.details.${item.name}')<#else>'${item.getCaption()}'</#if>"  
+    :labelWidth="${item.getLabelWidth()?c}"  
+    :isShowCaption="${item.isShowCaption()?c}"  
+    :error="detailsModel.${item.name}.error" 
+    :isEmptyCaption="${item.isEmptyCaption()?c}">
    <#if item.isCompositeItem()>
    <#assign formitems=item.getPSDEFormItems()>
-    <app-range-editor v-model="data.${item.name}" :activeData="data" :disabled="detailsModel.${item.name}.disabled" name="${item.name}" editorType="${item.getEditorType()}" format="${item.getEditorParam("TIMEFMT","")}" :refFormItem="[<#list formitems as formitem><#if formitem_index gt 0>,</#if>'${formitem.name}'</#list>]" @formitemvaluechange="onFormItemValueChange" style="${item.getEditorCssStyle()}"></app-range-editor>
+        <app-range-editor 
+            name="${item.name}"  
+            editorType="${item.getEditorType()}"  
+            format="${item.getEditorParam("TIMEFMT","")}"  
+            style="${item.getEditorCssStyle()}" 
+            v-model="data.${item.name}" 
+            :activeData="data"  
+            :disabled="detailsModel.${item.name}.disabled" 
+            :refFormItem="[<#list formitems as formitem><#if formitem_index gt 0>,</#if>'${formitem.name}'</#list>]" 
+            @formitemvaluechange="onFormItemValueChange"/>
    <#else>
        ${P.getEditorCode(item, "EDITOR.vue").code}
    </#if>

--- a/@CONTROL/搜索表单/CONTROL-BASE.vue#DETAIL_GROUPPANEL.ftl
+++ b/@CONTROL/搜索表单/CONTROL-BASE.vue#DETAIL_GROUPPANEL.ftl
@@ -4,7 +4,18 @@
 <#if item.render??>
 ${item.render.code}
 <#else>
-<app-form-group v-show="detailsModel.${item.name}.visible" layoutType="<#if item.getPSLayoutPos()??>${item.getPSLayoutPos().getLayout()}</#if>" titleStyle="<#if item.getLabelPSSysCss?? && item.getLabelPSSysCss()??>${item.getLabelPSSysCss().getCssName()}</#if>" class='<#if item.getPSSysCss?? && item.getPSSysCss()??> ${item.getPSSysCss().getCssName()}</#if>' uiActionGroup="detailsModel.${item.name}.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="<#if langbase??>$t('${langbase}.details.${item.name}')<#else>'${item.getCaption()}'</#if>" :isShowCaption="${item.isShowCaption()?c}" uiStyle="${item.getDetailStyle()}" :titleBarCloseMode="${item.getTitleBarCloseMode()}" :isInfoGroupMode="${item.isInfoGroupMode()?c}">
+<app-form-group 
+    class='<#if item.getPSSysCss?? && item.getPSSysCss()??>${item.getPSSysCss().getCssName()}</#if>' 
+    layoutType='<#if item.getPSLayoutPos()??>${item.getPSLayoutPos().getLayout()}</#if>' 
+    titleStyle='<#if item.getLabelPSSysCss?? && item.getLabelPSSysCss()??>${item.getLabelPSSysCss().getCssName()}</#if>' 
+    uiStyle="${item.getDetailStyle()}" 
+    v-show="detailsModel.${item.name}.visible" 
+    :uiActionGroup="detailsModel.${item.name}.uiActionGroup" 
+    :caption="<#if langbase??>$t('${langbase}.details.${item.name}')<#else>'${item.getCaption()}'</#if>" 
+    :isShowCaption="${item.isShowCaption()?c}" 
+    :titleBarCloseMode="${item.getTitleBarCloseMode()}" 
+    :isInfoGroupMode="${item.isInfoGroupMode()?c}" 
+    @groupuiactionclick="groupUIActionClick($event)">
 <#if item.getPSSysImage()??><#assign img=item.getPSSysImage()><#if img.getCssClass()?? && (img.getCssClass()?length gt 0)><i class="${img.getCssClass()}" style="margin-right: 2px;position: absolute;top: -51px;left: 60px;"></i></#if></#if>    
 <#assign content>
    <#list item.getPSDEFormDetails() as formmenber>

--- a/@CONTROL/搜索表单/CONTROL-BASE.vue#DETAIL_IFRAME.ftl
+++ b/@CONTROL/搜索表单/CONTROL-BASE.vue#DETAIL_IFRAME.ftl
-<div v-show="detailsModel.${item.name}.visible" :style="{height:${item.getContentHeight()}px;}"><iframe src='${item.getIFrameUrl()}'></iframe></div>
+<div v-show="detailsModel.${item.name}.visible" :style="{height:${item.getContentHeight()}px;}">
+    <iframe src='${item.getIFrameUrl()}'></iframe>
+</div>
--- a/@CONTROL/搜索表单/CONTROL-BASE.vue.ftl
+++ b/@CONTROL/搜索表单/CONTROL-BASE.vue.ftl
--- a/@CONTROL/表单/CONTROL-BASE.vue#DETAIL_BUTTON.ftl
+++ b/@CONTROL/表单/CONTROL-BASE.vue#DETAIL_BUTTON.ftl
 <#if item.render??>
-${item.render.code}
+    ${item.render.code}
 <#else>
 <div class="app-form-item-button" v-show="detailsModel.${item.name}.visible">
-    <nut-button v-if="detailsModel.${item.name}.visible" class="app-form-button<#if item.getPSSysCss()??> ${item.getPSSysCss().getCssName()}</#if>" style='<#if item.getHeight() gt 0>height: ${item.getHeight()}px;</#if>'>${item.caption}</nut-button>
+    <nut-button 
+        v-if="detailsModel.${item.name}.visible" 
+        class="app-form-button<#if item.getPSSysCss()??> ${item.getPSSysCss().getCssName()}</#if>" 
+        style='<#if item.getHeight() gt 0>height: ${item.getHeight()}px;</#if>'>${item.caption}</nut-button>
 </div>
 </#if>
\ No newline at end of file
--- a/@CONTROL/表单/CONTROL-BASE.vue#DETAIL_DRUIPART.ftl
+++ b/@CONTROL/表单/CONTROL-BASE.vue#DETAIL_DRUIPART.ftl
 <#ibizinclude>../../@NAVPARAMS/FUNC/PUBLIC.vue.ftl</#ibizinclude>
 <#if item.render??>
-${item.render.code}
+    ${item.render.code}
 <#else>
 <#assign dritem = item.getPSDEDRItem() />
 <#assign refView = item.getPSAppView() />
 <#assign appDataEntity = refView.getPSAppDataEntity()/>
 <app-form-druipart
-    <#if item.getPSSysCss?? && item.getPSSysCss()??>class="${item.getPSSysCss().getCssName()}"</#if>
-    :formState="formState"
+    class='<#if item.getPSSysCss?? && item.getPSSysCss()??>${item.getPSSysCss().getCssName()}</#if>' 
+    parameterName='${appde.getCodeName()?lower_case}' 
+    refviewtype='<#if refView.getPSViewType()??>${refView.getPSViewType().getId()}</#if>'  
+    refreshitems='<#if item.getRefreshItems()??>${item.getRefreshItems()}</#if>' 
+    viewname='${srffilepath2(refView.codeName)}' 
    paramItem='<#if item.getParamItem()??>${item.getParamItem()}<#else>${appde.getCodeName()?lower_case}</#if>' 
+    style="<#if item.getPSLayoutPos()?? && item.getPSLayoutPos().getLayout() == "FLEX">height: 100%;</#if><#if item.getContentHeight() == 0><#if refView.getHeight() gt 0>height:${refView.getHeight()?c}px</#if><#else>height:${item.getContentHeight()?c}px;</#if>" 
+    :formState="formState" 
    :parentdata='<#if dritem.getParentDataJO?? && dritem.getParentDataJO()??>${dritem.getParentDataJO()}<#else>{}</#if>' 
    :parameters="[
        <#if refView.getPSAppDERSPathCount() gt 0>
@@ -20,15 +25,9 @@ ${item.render.code}
    ]" 
    :context="context" 
    :viewparams="viewparams" 
-    parameterName='${appde.getCodeName()?lower_case}'
    :navigateContext ='<@getNavigateContext item />' 
    :navigateParam ='<@getNavigateParams item />' 
-    refviewtype='<#if refView.getPSViewType()??>${refView.getPSViewType().getId()}</#if>' 
-    refreshitems='<#if item.getRefreshItems()??>${item.getRefreshItems()}</#if>' 
    :ignorefieldvaluechange="ignorefieldvaluechange" 
-    viewname='${srffilepath2(refView.codeName)}' 
    :data="JSON.stringify(this.data)"  
-    @drdatasaved="drdatasaved($event)"
-    style="<#if item.getPSLayoutPos()?? && item.getPSLayoutPos().getLayout() == "FLEX">height: 100%;</#if><#if item.getContentHeight() == 0><#if refView.getHeight() gt 0>height:${refView.getHeight()?c}px</#if><#else>height:${item.getContentHeight()?c}px;</#if>">
-</app-form-druipart>
+    @drdatasaved="drdatasaved($event)"/>
 </#if>
--- a/@CONTROL/表单/CONTROL-BASE.vue#DETAIL_GROUPPANEL.ftl
+++ b/@CONTROL/表单/CONTROL-BASE.vue#DETAIL_GROUPPANEL.ftl
@@ -4,7 +4,18 @@
 <#if item.render??>
 ${item.render.code}
 <#else>
-<app-form-group v-show="detailsModel.${item.name}.visible" layoutType="<#if item.getPSLayoutPos()??>${item.getPSLayoutPos().getLayout()}</#if>" titleStyle="<#if item.getLabelPSSysCss?? && item.getLabelPSSysCss()??>${item.getLabelPSSysCss().getCssName()}</#if>" class='<#if item.getPSSysCss?? && item.getPSSysCss()??> ${item.getPSSysCss().getCssName()}</#if>' uiActionGroup="detailsModel.${item.name}.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="<#if langbase??>$t('${langbase}.details.${item.name}')<#else>'${item.getCaption()}'</#if>" :isShowCaption="${item.isShowCaption()?c}" uiStyle="${item.getDetailStyle()}" :titleBarCloseMode="${item.getTitleBarCloseMode()}" :isInfoGroupMode="${item.isInfoGroupMode()?c}">
+<app-form-group 
+    class='<#if item.getPSSysCss?? && item.getPSSysCss()??>${item.getPSSysCss().getCssName()}</#if>' 
+    layoutType='<#if item.getPSLayoutPos()??>${item.getPSLayoutPos().getLayout()}</#if>' 
+    titleStyle='<#if item.getLabelPSSysCss?? && item.getLabelPSSysCss()??>${item.getLabelPSSysCss().getCssName()}</#if>' 
+    uiStyle="${item.getDetailStyle()}" 
+    v-show="detailsModel.${item.name}.visible" 
+    :uiActionGroup="detailsModel.${item.name}.uiActionGroup" 
+    :caption="<#if langbase??>$t('${langbase}.details.${item.name}')<#else>'${item.getCaption()}'</#if>" 
+    :isShowCaption="${item.isShowCaption()?c}" 
+    :titleBarCloseMode="${item.getTitleBarCloseMode()}" 
+    :isInfoGroupMode="${item.isInfoGroupMode()?c}" 
+    @groupuiactionclick="groupUIActionClick($event)">
 <#if item.getPSSysImage()??><#assign img=item.getPSSysImage()><#if img.getCssClass()?? && (img.getCssClass()?length gt 0)><i class="${img.getCssClass()}" style="margin-right: 2px;position: absolute;top: -51px;left: 60px;"></i></#if></#if>    
 <#assign content>
    <#list item.getPSDEFormDetails() as formmenber>

--- a/@CONTROL/表单/CONTROL-BASE.vue#DETAIL_IFRAME.ftl
+++ b/@CONTROL/表单/CONTROL-BASE.vue#DETAIL_IFRAME.ftl
-<div v-show="detailsModel.${item.name}.visible" :style="{height:${item.getContentHeight()}px;}"><iframe src='${item.getIFrameUrl()}'></iframe></div>
+<div v-show="detailsModel.${item.name}.visible" :style="{height:${item.getContentHeight()}px;}">
+    <iframe src='${item.getIFrameUrl()}'></iframe>
+</div>
--- a/@CONTROL/表单/CONTROL-BASE.vue.ftl
+++ b/@CONTROL/表单/CONTROL-BASE.vue.ftl
@@ -5,9 +5,6 @@
 <#assign import_block>
 import { FormButtonModel, FormPageModel, FormItemModel, FormDRUIPartModel, FormPartModel, FormGroupPanelModel, FormIFrameModel, FormRowItemModel, FormTabPageModel, FormTabPanelModel, FormUserControlModel } from '@/model/form-detail';
 import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
-<#if view.getViewType?? && view.getViewType() ?? && view.getViewType()=='DEMOBWFDYNAEDITVIEW'>
-import { toastController, alertController } from '@ionic/core';
-</#if>
 </#assign>
 <#ibizinclude>
 ../@MACRO/CONTROL/CONTROL_HEADER-BASE.vue.ftl