diff --git a/src/main/resources/jeecg/ext-template/ace/onetomany/cgform_jspTemplate_add.ftl b/src/main/resources/jeecg/ext-template/ace/onetomany/cgform_jspTemplate_add.ftl index 1b5aabe6..39063b18 100644 --- a/src/main/resources/jeecg/ext-template/ace/onetomany/cgform_jspTemplate_add.ftl +++ b/src/main/resources/jeecg/ext-template/ace/onetomany/cgform_jspTemplate_add.ftl @@ -149,9 +149,6 @@ <#if po.fieldValidType?if_exists?html != ''> datatype="${po.fieldValidType?if_exists?html}"<#else><#if po.type == 'int'> datatype="n"<#elseif po.type=='double'> datatype="/^(-?\d+)(\.\d+)?$/"<#else><#if po.isNull != 'Y'>datatype="*" /> <#elseif po.showType=='radio' || po.showType=='select' || po.showType=='checkbox' || po.showType=='list'> datatype="*" - <#-- update--begin--author:zhangjiaqiang Date:20170414 for:增加校验必填项 --> - <#if po.fieldMustInput??><#if po.fieldMustInput == 'Y' || po.isNull != 'Y'>ignore="checked"<#else>ignore="ignore" - <#-- update--end--author:zhangjiaqiang Date:20170414 for:增加校验必填项 --> <#if po.dictTable?if_exists?html != ''>dictTable="${po.dictTable?if_exists?html}" dictField="${po.dictField?if_exists?html}" dictText="${po.dictText?if_exists?html}"<#else>typeGroupCode="${po.dictField}" hasLabel="false" title="${po.content}"> <#elseif po.showType=='date'> datatype="${po.fieldValidType?if_exists?html}"<#else><#if po.type == 'int'> datatype="n"<#elseif po.type=='double'> datatype="/^(-?\d+)(\.\d+)?$/"<#else> <#if po.isNull != 'Y'>datatype="*"> <#elseif po.showType=='radio' || po.showType=='select' || po.showType=='checkbox' || po.showType=='list'> datatype="*" - <#-- update--begin--author:zhangjiaqiang Date:20170414 for:增加校验必填项 --> - <#if po.fieldMustInput??><#if po.fieldMustInput == 'Y' || po.isNull != 'Y'>ignore="checked"<#else>ignore="ignore" - <#-- update--end--author:zhangjiaqiang Date:20170414 for:增加校验必填项 --> <#if po.dictTable?if_exists?html != ''>dictTable="${po.dictTable?if_exists?html}" dictField="${po.dictField?if_exists?html}" dictText="${po.dictText?if_exists?html}"<#else>typeGroupCode="${po.dictField}" defaultVal="" hasLabel="false" title="${po.content}"> <#elseif po.showType=='date'> datatype="${po.fieldValidType?if_exists?html}"<#else><#if po.type == 'int'> datatype="n"<#elseif po.type=='double'> datatype="/^(-?\d+)(\.\d+)?$/"<#else><#if po.isNull != 'Y'>datatype="*" value='${'$'}{${entityName?uncap_first}Page.${po.fieldName}}' /> <#elseif po.showType=='radio' || po.showType=='select' || po.showType=='checkbox' || po.showType=='list'> datatype="*" - <#-- update--begin--author:zhangjiaqiang Date:20170414 for:增加校验必填项 --> - <#if po.fieldMustInput??><#if po.fieldMustInput == 'Y' || po.isNull != 'Y'>ignore="checked"<#else>ignore="ignore" - <#-- update--end--author:zhangjiaqiang Date:20170414 for:增加校验必填项 --> <#if po.dictTable?if_exists?html != ''>dictTable="${po.dictTable?if_exists?html}" dictField="${po.dictField?if_exists?html}" dictText="${po.dictText?if_exists?html}"<#else>typeGroupCode="${po.dictField}" defaultVal="${'$'}{${entityName?uncap_first}Page.${po.fieldName}}" hasLabel="false" title="${po.content}"> <#elseif po.showType=='date'> datatype="${po.fieldValidType?if_exists?html}"<#else><#if po.type == 'int'> datatype="n"<#elseif po.type=='double'> datatype="/^(-?\d+)(\.\d+)?$/"<#else> <#if po.isNull != 'Y'>datatype="*"> <#elseif po.showType=='radio' || po.showType=='select' || po.showType=='checkbox' || po.showType=='list'> datatype="*" - <#-- update--begin--author:zhangjiaqiang Date:20170414 for:增加校验必填项 --> - <#if po.fieldMustInput??><#if po.fieldMustInput == 'Y' || po.isNull != 'Y'>ignore="checked"<#else>ignore="ignore" - <#-- update--end--author:zhangjiaqiang Date:20170414 for:增加校验必填项 --> <#if po.dictTable?if_exists?html != ''>dictTable="${po.dictTable?if_exists?html}" dictField="${po.dictField?if_exists?html}" dictText="${po.dictText?if_exists?html}"<#else>typeGroupCode="${po.dictField}" defaultVal="" hasLabel="false" title="${po.content}"> <#elseif po.showType=='date'> datatype="${po.fieldValidType?if_exists?html}"<#else><#if po.type == 'int'> datatype="n"<#elseif po.type=='double'> datatype="/^(-?\d+)(\.\d+)?$/"<#else><#if po.isNull != 'Y'>datatype="*" /> <#elseif po.showType=='radio' || po.showType=='select' || po.showType=='checkbox' || po.showType=='list'> - <#if po.fieldMustInput??><#if po.fieldMustInput == 'Y' || po.isNull != 'Y'>ignore="checked"<#else>ignore="ignore" - <#-- update--end--author:zhangjiaqiang Date:20170414 for:增加校验必填项 --> <#if po.dictTable?if_exists?html != ''>dictTable="${po.dictTable?if_exists?html}" dictField="${po.dictField?if_exists?html}" dictText="${po.dictText?if_exists?html}"<#else>typeGroupCode="${po.dictField}" hasLabel="false" title="${po.content}"> <#elseif po.showType=='date'> datatype="${po.fieldValidType?if_exists?html}"<#else><#if po.type == 'int'> datatype="n"<#elseif po.type=='double'> datatype="/^(-?\d+)(\.\d+)?$/"<#else><#if po.isNull != 'Y'>datatype="*" value='${'$'}{${entityName?uncap_first}Page.${po.fieldName}}' /> <#elseif po.showType=='radio' || po.showType=='select' || po.showType=='checkbox' || po.showType=='list'> - <#if po.fieldMustInput??><#if po.fieldMustInput == 'Y' || po.isNull != 'Y'>ignore="checked"<#else>ignore="ignore" - <#-- update--end--author:zhangjiaqiang Date:20170414 for:增加校验必填项 --> <#if po.dictTable?if_exists?html != ''>dictTable="${po.dictTable?if_exists?html}" dictField="${po.dictField?if_exists?html}" dictText="${po.dictText?if_exists?html}"<#else>typeGroupCode="${po.dictField}" defaultVal="${'$'}{${entityName?uncap_first}Page.${po.fieldName}}" hasLabel="false" title="${po.content}"> <#elseif po.showType=='date'> datatype="${po.fieldValidType?if_exists?html}"<#else><#if po.type == 'int'> datatype="n"<#elseif po.type=='double'> datatype="/^(-?\d+)(\.\d+)?$/"<#else><#if po.isNull != 'Y'>datatype="*"/> <#elseif po.showType=='radio' || po.showType=='select' || po.showType=='checkbox' || po.showType=='list'> datatype="*" - <#-- update--begin--author:zhangjiaqiang Date:20170414 for:增加校验必填项 --> - <#if po.fieldMustInput??><#if po.fieldMustInput == 'Y' || po.isNull != 'Y'>ignore="checked"<#else>ignore="ignore" - <#-- update--end--author:zhangjiaqiang Date:20170414 for:增加校验必填项 --> - <#if po.dictTable?if_exists?html != ''>dictTable="${po.dictTable?if_exists?html}" dictField="${po.dictField?if_exists?html}" dictText="${po.dictText?if_exists?html}"<#else>typeGroupCode="${po.dictField}" defaultVal="${'$'}{${entityName?uncap_first}Page.${po.fieldName}}" hasLabel="false" title="${po.content}"> + <#if po.dictTable?if_exists?html != ''>dictTable="${po.dictTable?if_exists?html}" dictField="${po.dictField?if_exists?html}" dictText="${po.dictText?if_exists?html}"<#else>typeGroupCode="${po.dictField}" defaultVal="${'$'}{${entityName?uncap_first}Page.${po.fieldName}}" hasLabel="false" title="${po.content}"> <#elseif po.showType=='date'> diff --git a/src/main/resources/jeecg/ext-template/div/single/cgform_jspTemplate_update.ftl b/src/main/resources/jeecg/ext-template/div/single/cgform_jspTemplate_update.ftl index a2af7832..93d59281 100644 --- a/src/main/resources/jeecg/ext-template/div/single/cgform_jspTemplate_update.ftl +++ b/src/main/resources/jeecg/ext-template/div/single/cgform_jspTemplate_update.ftl @@ -135,10 +135,7 @@ <#if po.fieldValidType?if_exists?html != ''> datatype="${po.fieldValidType?if_exists?html}"<#else><#if po.type == 'int'> datatype="n"<#elseif po.type=='double'> datatype="/^(-?\d+)(\.\d+)?$/"<#else><#if po.isNull != 'Y'>datatype="*" value='${'$'}{${entityName?uncap_first}Page.${po.fieldName}}'/> <#elseif po.showType=='radio' || po.showType=='select' || po.showType=='checkbox' || po.showType=='list'> datatype="*" - <#-- update--begin--author:zhangjiaqiang Date:20170414 for:增加校验必填项 --> - <#if po.fieldMustInput??><#if po.fieldMustInput == 'Y' || po.isNull != 'Y'>ignore="checked"<#else>ignore="ignore" - <#-- update--end--author:zhangjiaqiang Date:20170414 for:增加校验必填项 --> - <#if po.dictTable?if_exists?html != ''>dictTable="${po.dictTable?if_exists?html}" dictField="${po.dictField?if_exists?html}" dictText="${po.dictText?if_exists?html}"<#else>typeGroupCode="${po.dictField}" defaultVal="${'$'}{${entityName?uncap_first}Page.${po.fieldName}}" hasLabel="false" title="${po.content}"> + <#if po.dictTable?if_exists?html != ''>dictTable="${po.dictTable?if_exists?html}" dictField="${po.dictField?if_exists?html}" dictText="${po.dictText?if_exists?html}"<#else>typeGroupCode="${po.dictField}" defaultVal="${'$'}{${entityName?uncap_first}Page.${po.fieldName}}" hasLabel="false" title="${po.content}"> <#elseif po.showType=='date'> datatype="${po.fieldValidType?if_exists?html}"<#else><#if po.isNull != 'Y'>datatype="*" <#-- update--begin--author:zhangjiaqiang Date:20170414 for:增加校验必填项 --> diff --git a/src/main/resources/jeecg/ext-template/nopop/single/cgform_jspTemplate_add.ftl b/src/main/resources/jeecg/ext-template/nopop/single/cgform_jspTemplate_add.ftl index d00186c6..65add2cb 100644 --- a/src/main/resources/jeecg/ext-template/nopop/single/cgform_jspTemplate_add.ftl +++ b/src/main/resources/jeecg/ext-template/nopop/single/cgform_jspTemplate_add.ftl @@ -105,9 +105,6 @@ > <#elseif po.showType=='radio' || po.showType=='select' || po.showType=='checkbox' || po.showType=='list'> - <#if po.fieldMustInput??><#if po.fieldMustInput == 'Y' || po.isNull != 'Y'>ignore="checked"<#else>ignore="ignore" - <#-- update--end--author:zhangjiaqiang Date:20170414 for:增加校验必填项 --> <#if po.dictTable?if_exists?html != ''>dictTable="${po.dictTable?if_exists?html}" dictField="${po.dictField?if_exists?html}" dictText="${po.dictText?if_exists?html}"<#else>typeGroupCode="${po.dictField}" defaultVal="${'$'}{${entityName?uncap_first}Page.${po.fieldName}}" hasLabel="false" title="${po.content}"> <#elseif po.showType=='date'> datatype="${po.fieldValidType?if_exists?html}"<#else><#if po.type == 'int'> datatype="n"<#elseif po.type=='double'> datatype="/^(-?\d+)(\.\d+)?$/"<#else><#if po.isNull != 'Y'>datatype="*" value='${'$'}{${entityName?uncap_first}Page.${po.fieldName}}'> <#elseif po.showType=='radio' || po.showType=='select' || po.showType=='checkbox' || po.showType=='list'> - <#if po.fieldMustInput??><#if po.fieldMustInput == 'Y' || po.isNull != 'Y'>ignore="checked"<#else>ignore="ignore" - <#-- update--end--author:zhangjiaqiang Date:20170414 for:增加校验必填项 --> <#if po.dictTable?if_exists?html != ''>dictTable="${po.dictTable?if_exists?html}" dictField="${po.dictField?if_exists?html}" dictText="${po.dictText?if_exists?html}"<#else>typeGroupCode="${po.dictField}" defaultVal="${'$'}{${entityName?uncap_first}Page.${po.fieldName}}" hasLabel="false" title="${po.content}"> <#elseif po.showType=='date'> dictTable="${po.dictTable?if_exists?html}" dictField="${po.dictField?if_exists?html}" dictText="${po.dictText?if_exists?html}"<#else>typeGroupCode="${po.dictField}" hasLabel="false" title="${po.content}" <#if po.isNull != 'Y'>datatype="*" - <#-- update--begin--author:zhangjiaqiang Date:20170414 for:增加校验必填项 --> - <#if po.fieldMustInput??><#if po.fieldMustInput == 'Y' || po.isNull != 'Y'>ignore="checked"<#else>ignore="ignore" - <#-- update--end--author:zhangjiaqiang Date:20170414 for:增加校验必填项 --> > <#elseif po.showType=='date'> <#elseif po.showType=='radio' || po.showType=='select' || po.showType=='checkbox' || po.showType=='list'> datatype="*" - <#-- update--begin--author:zhangjiaqiang Date:20170414 for:增加校验必填项 --> - <#if po.fieldMustInput??><#if po.fieldMustInput == 'Y' || po.isNull != 'Y'>ignore="checked"<#else>ignore="ignore" - <#-- update--end--author:zhangjiaqiang Date:20170414 for:增加校验必填项 --> <#if po.dictTable?if_exists?html != ''>dictTable="${po.dictTable?if_exists?html}" dictField="${po.dictField?if_exists?html}" dictText="${po.dictText?if_exists?html}"<#else>typeGroupCode="${po.dictField}" defaultVal="" hasLabel="false" title="${po.content}"> <#elseif po.showType=='date'> datatype="${po.fieldValidType?if_exists?html}"<#else><#if po.type == 'int'> datatype="n"<#elseif po.type=='double'> datatype="/^(-?\d+)(\.\d+)?$/"<#else><#if po.isNull != 'Y'>datatype="*" value='${'$'}{${entityName?uncap_first}Page.${po.fieldName}}'> <#elseif po.showType=='radio' || po.showType=='select' || po.showType=='checkbox' || po.showType=='list'> - <#if po.fieldMustInput??><#if po.fieldMustInput == 'Y' || po.isNull != 'Y'>ignore="checked"<#else>ignore="ignore" - <#-- update--end--author:zhangjiaqiang Date:20170414 for:增加校验必填项 --> <#if po.isNull != 'Y'>datatype="*" <#if po.dictTable?if_exists?html != ''>dictTable="${po.dictTable?if_exists?html}" dictField="${po.dictField?if_exists?html}" dictText="${po.dictText?if_exists?html}"<#else>typeGroupCode="${po.dictField}" defaultVal="${'$'}{${entityName?uncap_first}Page.${po.fieldName}}" hasLabel="false" title="${po.content}"> <#elseif po.showType=='date'> @@ -218,9 +215,6 @@ <#if po.fieldValidType?if_exists?html != ''> datatype="${po.fieldValidType?if_exists?html}"<#else><#if po.type == 'int'> datatype="n"<#elseif po.type=='double'> datatype="/^(-?\d+)(\.\d+)?$/"<#else> <#if po.isNull != 'Y'>datatype="*"> <#elseif po.showType=='radio' || po.showType=='select' || po.showType=='checkbox' || po.showType=='list'> datatype="*" - <#-- update--begin--author:zhangjiaqiang Date:20170414 for:增加校验必填项 --> - <#if po.fieldMustInput??><#if po.fieldMustInput == 'Y' || po.isNull != 'Y'>ignore="checked"<#else>ignore="ignore" - <#-- update--end--author:zhangjiaqiang Date:20170414 for:增加校验必填项 --> <#if po.dictTable?if_exists?html != ''>dictTable="${po.dictTable?if_exists?html}" dictField="${po.dictField?if_exists?html}" dictText="${po.dictText?if_exists?html}"<#else>typeGroupCode="${po.dictField}" defaultVal="" hasLabel="false" title="${po.content}"> <#elseif po.showType=='date'> datatype="${po.fieldValidType?if_exists?html}"<#elseif po.type == 'int'> datatype="n"<#elseif po.type=='double'> datatype="/^(-?\d+)(\.\d+)?$/"<#elseif po.isNull != 'Y'> datatype="*" <#-- update--begin--author:zhangjiaqiang Date:20170414 for:增加校验必填项 --> - <#if po.fieldMustInput??><#if po.fieldMustInput == 'Y' || po.isNull == 'Y'>ignore="checked"<#else>ignore="ignore" + <#if po.fieldMustInput??><#if po.fieldMustInput == 'Y' || po.isNull != 'Y'>ignore="checked"<#else>ignore="ignore" <#-- update--end--author:zhangjiaqiang Date:20170414 for:增加校验必填项 --> data-options="panelHeight:'220', url: '${entityName?uncap_first}Controller.do?datagrid&field=id,${cgformConfig.cgFormHead.treeFieldnamePage}', @@ -127,7 +127,7 @@ datatype="${po.fieldValidType?if_exists?html}"<#elseif po.type == 'int'> datatype="n"<#elseif po.type=='double'> datatype="/^(-?\d+)(\.\d+)?$/"<#elseif po.isNull != 'Y'> datatype="*" <#-- update--begin--author:zhangjiaqiang Date:20170414 for:增加校验必填项 --> - <#if po.fieldMustInput??><#if po.fieldMustInput == 'Y' || po.isNull == 'Y'>ignore="checked"<#else>ignore="ignore" + <#if po.fieldMustInput??><#if po.fieldMustInput == 'Y' || po.isNull != 'Y'>ignore="checked"<#else>ignore="ignore" <#-- update--end--author:zhangjiaqiang Date:20170414 for:增加校验必填项 --> /> <#elseif po.showType=='popup'> @@ -140,40 +140,37 @@ <#elseif po.isNull != 'Y'>datatype="*" <#-- update--begin--author:zhangjiaqiang Date:20170414 for:增加校验必填项 --> - <#if po.fieldMustInput??><#if po.fieldMustInput == 'Y' || po.isNull == 'Y'>ignore="checked"<#else>ignore="ignore" + <#if po.fieldMustInput??><#if po.fieldMustInput == 'Y' || po.isNull != 'Y'>ignore="checked"<#else>ignore="ignore" <#-- update--end--author:zhangjiaqiang Date:20170414 for:增加校验必填项 --> <#if po.dictTable?if_exists?html!=""> onclick="inputClick(this,'${po.dictField}','${po.dictTable}')" /> <#elseif po.showType=='textarea'> <#elseif po.showType=='password'> datatype="${po.fieldValidType?if_exists?html}" <#elseif po.type == 'int'> datatype="n" <#elseif po.type=='double'>datatype="/^(-?\d+)(\.\d+)?$/" <#elseif po.isNull != 'Y'>datatype="*" <#-- update--begin--author:zhangjiaqiang Date:20170414 for:增加校验必填项 --> - <#if po.fieldMustInput??><#if po.fieldMustInput == 'Y' || po.isNull == 'Y'>ignore="checked"<#else>ignore="ignore" + <#if po.fieldMustInput??><#if po.fieldMustInput == 'Y' || po.isNull != 'Y'>ignore="checked"<#else>ignore="ignore" <#-- update--end--author:zhangjiaqiang Date:20170414 for:增加校验必填项 -->/> <#elseif po.showType=='radio' || po.showType=='select' || po.showType=='checkbox' || po.showType=='list'> dictTable="${po.dictTable?if_exists?html}" dictField="${po.dictField?if_exists?html}" dictText="${po.dictText?if_exists?html}"<#else>typeGroupCode="${po.dictField}" defaultVal="${'$'}{${entityName?uncap_first}Page.${po.fieldName}}" hasLabel="false" title="${po.content}" <#if po.fieldValidType?if_exists?html != ''> datatype="${po.fieldValidType?if_exists?html}" <#elseif po.isNull != 'Y'> datatype="*" - <#-- update--begin--author:zhangjiaqiang Date:20170414 for:增加校验必填项 --> - <#if po.fieldMustInput??><#if po.fieldMustInput == 'Y' || po.isNull == 'Y'>ignore="checked"<#else>ignore="ignore" - <#-- update--end--author:zhangjiaqiang Date:20170414 for:增加校验必填项 --> > <#elseif po.showType=='date'> datatype="${po.fieldValidType?if_exists?html}" <#elseif po.isNull != 'Y'> datatype="*" <#-- update--begin--author:zhangjiaqiang Date:20170414 for:增加校验必填项 --> - <#if po.fieldMustInput??><#if po.fieldMustInput == 'Y' || po.isNull == 'Y'>ignore="checked"<#else>ignore="ignore" + <#if po.fieldMustInput??><#if po.fieldMustInput == 'Y' || po.isNull != 'Y'>ignore="checked"<#else>ignore="ignore" <#-- update--end--author:zhangjiaqiang Date:20170414 for:增加校验必填项 --> /> <#elseif po.showType=='datetime'> datatype="${po.fieldValidType?if_exists?html}"<#elseif po.isNull != 'Y'> datatype="*" <#-- update--begin--author:zhangjiaqiang Date:20170414 for:增加校验必填项 --> - <#if po.fieldMustInput??><#if po.fieldMustInput == 'Y' || po.isNull == 'Y'>ignore="checked"<#else>ignore="ignore" + <#if po.fieldMustInput??><#if po.fieldMustInput == 'Y' || po.isNull != 'Y'>ignore="checked"<#else>ignore="ignore" <#-- update--end--author:zhangjiaqiang Date:20170414 for:增加校验必填项 --> /> <#elseif po.showType=='file'> diff --git a/src/main/resources/jeecg/ext-template/table/single/cgform_jspTemplate_update.ftl b/src/main/resources/jeecg/ext-template/table/single/cgform_jspTemplate_update.ftl index ef84924f..206c2b6c 100644 --- a/src/main/resources/jeecg/ext-template/table/single/cgform_jspTemplate_update.ftl +++ b/src/main/resources/jeecg/ext-template/table/single/cgform_jspTemplate_update.ftl @@ -96,7 +96,7 @@ datatype="${po.fieldValidType?if_exists?html}"<#elseif po.type == 'int'> datatype="n"<#elseif po.type=='double'> datatype="/^(-?\d+)(\.\d+)?$/"<#elseif po.isNull != 'Y'> datatype="*" value='${'$'}{${entityName?uncap_first}Page.${po.fieldName}}' <#-- update--begin--author:zhangjiaqiang Date:20170414 for:增加校验必填项 --> - <#if po.fieldMustInput??><#if po.fieldMustInput == 'Y' || po.isNull == 'Y'>ignore="checked"<#else>ignore="ignore" + <#if po.fieldMustInput??><#if po.fieldMustInput == 'Y' || po.isNull != 'Y'>ignore="checked"<#else>ignore="ignore" <#-- update--end--author:zhangjiaqiang Date:20170414 for:增加校验必填项 --> data-options=" panelHeight:'220', @@ -129,44 +129,41 @@ <#elseif po.showType=='text'> datatype="${po.fieldValidType?if_exists?html}"<#else><#if po.type == 'int'> datatype="n"<#elseif po.type=='double'> datatype="/^(-?\d+)(\.\d+)?$/"<#else><#if po.isNull != 'Y'>datatype="*" <#-- update--begin--author:zhangjiaqiang Date:20170414 for:增加校验必填项 --> - <#if po.fieldMustInput??><#if po.fieldMustInput == 'Y' || po.isNull == 'Y'>ignore="checked"<#else>ignore="ignore" + <#if po.fieldMustInput??><#if po.fieldMustInput == 'Y' || po.isNull != 'Y'>ignore="checked"<#else>ignore="ignore" <#-- update--end--author:zhangjiaqiang Date:20170414 for:增加校验必填项 --> value='${'$'}{${entityName?uncap_first}Page.${po.fieldName}}'> <#elseif po.showType=='popup'> datatype="${po.fieldValidType?if_exists?html}"<#else><#if po.type == 'int'> datatype="n"<#elseif po.type=='double'> datatype="/^(-?\d+)(\.\d+)?$/"<#else><#if po.isNull != 'Y'>datatype="*" <#-- update--begin--author:zhangjiaqiang Date:20170414 for:增加校验必填项 --> - <#if po.fieldMustInput??><#if po.fieldMustInput == 'Y' || po.isNull == 'Y'>ignore="checked"<#else>ignore="ignore" + <#if po.fieldMustInput??><#if po.fieldMustInput == 'Y' || po.isNull != 'Y'>ignore="checked"<#else>ignore="ignore" <#-- update--end--author:zhangjiaqiang Date:20170414 for:增加校验必填项 --> <#if po.dictTable?if_exists?html!=""> onclick="inputClick(this,'${po.dictField}','${po.dictTable}')" value='${'$'}{${entityName?uncap_first}Page.${po.fieldName}}'> <#elseif po.showType=='textarea'> <#elseif po.showType=='password'> datatype="${po.fieldValidType?if_exists?html}"<#else><#if po.type == 'int'> datatype="n"<#elseif po.type=='double'> datatype="/^(-?\d+)(\.\d+)?$/"<#else><#if po.isNull != 'Y'>datatype="*" <#-- update--begin--author:zhangjiaqiang Date:20170414 for:增加校验必填项 --> - <#if po.fieldMustInput??><#if po.fieldMustInput == 'Y' || po.isNull == 'Y'>ignore="checked"<#else>ignore="ignore" + <#if po.fieldMustInput??><#if po.fieldMustInput == 'Y' || po.isNull != 'Y'>ignore="checked"<#else>ignore="ignore" <#-- update--end--author:zhangjiaqiang Date:20170414 for:增加校验必填项 --> value='${'$'}{${entityName?uncap_first}Page.${po.fieldName}}'> <#elseif po.showType=='radio' || po.showType=='select' || po.showType=='checkbox' || po.showType=='list'> dictTable="${po.dictTable?if_exists?html}" dictField="${po.dictField?if_exists?html}" dictText="${po.dictText?if_exists?html}"<#else>typeGroupCode="${po.dictField}" defaultVal="${'$'}{${entityName?uncap_first}Page.${po.fieldName}}" hasLabel="false" title="${po.content}" <#if po.fieldValidType?if_exists?html != ''> datatype="${po.fieldValidType?if_exists?html}"<#else><#if po.isNull != 'Y'>datatype="*" - <#-- update--begin--author:zhangjiaqiang Date:20170414 for:增加校验必填项 --> - <#if po.fieldMustInput??><#if po.fieldMustInput == 'Y' || po.isNull == 'Y'>ignore="checked"<#else>ignore="ignore" - <#-- update--end--author:zhangjiaqiang Date:20170414 for:增加校验必填项 --> > <#elseif po.showType=='date'> datatype="${po.fieldValidType?if_exists?html}"<#else><#if po.isNull != 'Y'>datatype="*" <#-- update--begin--author:zhangjiaqiang Date:20170414 for:增加校验必填项 --> - <#if po.fieldMustInput??><#if po.fieldMustInput == 'Y' || po.isNull == 'Y'>ignore="checked"<#else>ignore="ignore" + <#if po.fieldMustInput??><#if po.fieldMustInput == 'Y' || po.isNull != 'Y'>ignore="checked"<#else>ignore="ignore" <#-- update--end--author:zhangjiaqiang Date:20170414 for:增加校验必填项 --> value=''> <#elseif po.showType=='datetime'> datatype="${po.fieldValidType?if_exists?html}"<#else><#if po.isNull != 'Y'>datatype="*" <#-- update--begin--author:zhangjiaqiang Date:20170414 for:增加校验必填项 --> - <#if po.fieldMustInput??><#if po.fieldMustInput == 'Y' || po.isNull == 'Y'>ignore="checked"<#else>ignore="ignore" + <#if po.fieldMustInput??><#if po.fieldMustInput == 'Y' || po.isNull != 'Y'>ignore="checked"<#else>ignore="ignore" <#-- update--end--author:zhangjiaqiang Date:20170414 for:增加校验必填项 --> value=''> <#elseif po.showType=='file'>