提交 980ec265 编写于 作者: tony001's avatar tony001

Merge branch 'dev'

......@@ -32,7 +32,6 @@ ${item.render.code}
tempMode='${refView.getTempMode()}'
:data="JSON.stringify(this.data)"
@drdatasaved="drdatasaved($event)"
@viewdataschange="formDataChange({name:'${item.name}',newVal:null,oldVal:null})"
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>;overflow: auto;">
</app-form-druipart>
</#if>
......@@ -336,7 +336,7 @@ import { Environment } from '@/environments/environment';
}else{
return true;
}
}, message: '${formdetail.getCaption()} 必须填写', trigger: 'change' ,required:true}
}, message: '${formdetail.getCaption()} 必须填写', trigger: 'change' ,required:true},
</#if>
</#if>
<#if ctrl.getPSDEFormItemVRs()??>
......@@ -630,17 +630,6 @@ import { Environment } from '@/environments/environment';
</#if>
</#list>
</#if>
<#if ctrl.getAllPSDEFormDetails()??>
<#list ctrl.getAllPSDEFormDetails() as formDetail>
<#if formDetail.getDetailType() == "DRUIPART" && formDetail.getPSDEFormItemUpdate()??>
<#assign formDetailUpdate = formDetail.getPSDEFormItemUpdate() />
if(Object.is(name, '${formDetail.name}')){
const details: string[] = [<#list formDetailUpdate.getPSDEFIUpdateDetails() as detail><#if detail_index gt 0>, </#if>'${detail.getPSDEFormDetailName()?lower_case}'</#list>];
this.updateFormItems('${formDetailUpdate.getPSAppDEMethod().getCodeName()}', this.data, details, ${formDetailUpdate.isShowBusyIndicator()?c});
}
</#if>
</#list>
</#if>
}
/**
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册