是否表达式国际化code使用null_expression和and_expression

This commit is contained in:
duandongmei
2018-07-13 19:44:41 +08:00
parent 4652ca03d9
commit 316e9c8c81
14 changed files with 30 additions and 30 deletions

View File

@@ -29,12 +29,12 @@
<label class="radio-inline">
<input type="radio" name="exprType" value="1" class="required"
<c:if test="${_cfg.exprType==1}">checked</c:if>
><spring:message code="and"/>
><spring:message code="and_expression"/>
</label>
<label class="radio-inline">
<input type="radio" name="exprType" value="0" class="required"
<c:if test="${_cfg.exprType==0}">checked</c:if>
><spring:message code="null"/>
><spring:message code="null_expression"/>
</label>
</div>
<div for="exprType"></div>

View File

@@ -62,12 +62,12 @@ $(function(){
<label class="radio-inline">
<input type="radio" name="complexCfg[${tableInfo.tableName}].exprType" value="1"
<c:if test="${_cfg.complexCfg[tableInfo.tableName].exprType==1}">checked</c:if>
class="required"/><spring:message code="and"/>
class="required"/><spring:message code="and_expression"/>
</label>
<label class="radio-inline">
<input type="radio" name="complexCfg[${tableInfo.tableName}].exprType" value="0"
<c:if test="${_cfg.complexCfg[tableInfo.tableName].exprType==0}">checked</c:if>
class="required"/><spring:message code="null"/>
class="required"/><spring:message code="null_expression"/>
</label>
</div>
<div for="complexCfg[${tableInfo.tableName}].exprType"></div>

View File

@@ -36,12 +36,12 @@
<label class="radio-inline">
<input type="radio" name="exprType" value="1" class="required"
<c:if test="${_cfg.exprType==1}">checked</c:if>
><spring:message code="and"/>
><spring:message code="and_expression"/>
</label>
<label class="radio-inline">
<input type="radio" name="exprType" value="0" class="required"
<c:if test="${_cfg.exprType==0 || _cfg.exprType==null}">checked</c:if>
><spring:message code="null"/>
><spring:message code="null_expression"/>
</label>
</div>
<div for="exprType"></div>

View File

@@ -304,8 +304,8 @@
</c:forEach>
</td>
<td>
<c:if test="${cfg.exprType==1}"><spring:message code="and"/></c:if>
<c:if test="${cfg.exprType==0}"><spring:message code="null"/></c:if>
<c:if test="${cfg.exprType==1}"><spring:message code="and_expression"/></c:if>
<c:if test="${cfg.exprType==0}"><spring:message code="null_expression"/></c:if>
</td>
<td>
<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">

View File

@@ -304,8 +304,8 @@
</c:forEach>
</td>
<td>
<c:if test="${cfg.exprType==1}"><spring:message code="and"/></c:if>
<c:if test="${cfg.exprType==0}"><spring:message code="null"/></c:if>
<c:if test="${cfg.exprType==1}"><spring:message code="and_expression"/></c:if>
<c:if test="${cfg.exprType==0}"><spring:message code="null_expression"/></c:if>
</td>
<td>
<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">

View File

@@ -311,8 +311,8 @@
</c:forEach>
</td>
<td>
<c:if test="${cfg.exprType==1}"><spring:message code="and"/></c:if>
<c:if test="${cfg.exprType==0}"><spring:message code="null"/></c:if>
<c:if test="${cfg.exprType==1}"><spring:message code="and_expression"/></c:if>
<c:if test="${cfg.exprType==0}"><spring:message code="null_expression"/></c:if>
</td>
<td>
<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">

View File

@@ -180,12 +180,12 @@ $(function(){
<label class="radio-inline">
<input type="radio" class="required" name="strFeaturesCfgList[${index1}].exprType" value="1"
<c:if test="${_cfg.strFeaturesCfgList[index1].exprType==1}">checked</c:if>
><spring:message code="and"/>
><spring:message code="and_expression"/>
</label>
<label class="radio-inline">
<input type="radio" class ="required" name="strFeaturesCfgList[${index1}].exprType" value="0"
<c:if test="${_cfg.strFeaturesCfgList[index1].exprType==0}">checked</c:if>
><spring:message code="null"/>
><spring:message code="null_expression"/>
</label>
</div>
<div for="exprType"></div>

View File

@@ -66,12 +66,12 @@ $(function(){
<label class="radio-inline">
<input type="radio" class="required" name="strFeaturesCfgList[${index1}].exprType" value="1"
<c:if test="${_cfg.strFeaturesCfgList[index1].exprType==1}">checked</c:if>
><spring:message code="and"/>
><spring:message code="and_expression"/>
</label>
<label class="radio-inline">
<input type="radio" class ="required" name="strFeaturesCfgList[${index1}].exprType" value="0"
<c:if test="${_cfg.strFeaturesCfgList[index1].exprType==0}">checked</c:if>
><spring:message code="null"/>
><spring:message code="null_expression"/>
</label>
</div>
<div for="exprType"></div>
@@ -158,12 +158,12 @@ $(function(){
<label class="radio-inline">
<input type="radio" class="required" name="complexFeaturesList[${index2}].exprType" value="1"
<c:if test="${_cfg.complexFeaturesList[index2].exprType==1}">checked</c:if>
><spring:message code="and"/>
><spring:message code="and_expression"/>
</label>
<label class="radio-inline">
<input type="radio" class="required" name="complexFeaturesList[${index2}].exprType" value="0"
<c:if test="${_cfg.complexFeaturesList[index2].exprType==0}">checked</c:if>
><spring:message code="null"/>
><spring:message code="null_expression"/>
</label>
</div>
<div for="exprType"></div>

View File

@@ -310,8 +310,8 @@
</c:forEach>
</td>
<td>
<c:if test="${cfg.exprType==1}"><spring:message code="and"/></c:if>
<c:if test="${cfg.exprType==0}"><spring:message code="null"/></c:if>
<c:if test="${cfg.exprType==1}"><spring:message code="and_expression"/></c:if>
<c:if test="${cfg.exprType==0}"><spring:message code="null_expression"/></c:if>
</td>
<td>
<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">

View File

@@ -311,8 +311,8 @@
</c:forEach>
</td>
<td>
<c:if test="${cfg.exprType==1}"><spring:message code="and"/></c:if>
<c:if test="${cfg.exprType==0}"><spring:message code="null"/></c:if>
<c:if test="${cfg.exprType==1}"><spring:message code="and_expression"/></c:if>
<c:if test="${cfg.exprType==0}"><spring:message code="null_expression"/></c:if>
</td>
<td>
<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">

View File

@@ -181,12 +181,12 @@
<label class="radio-inline">
<input type="radio" name="exprType" value="1" class="required"
<c:if test="${_cfg.exprType==1}">checked</c:if>
><spring:message code="and"/>
><spring:message code="and_expression"/>
</label>
<label class="radio-inline">
<input type="radio" name="exprType" value="0" class="required"
<c:if test="${_cfg.exprType==0 || _cfg.exprType==null}">checked</c:if>
><spring:message code="null"/>
><spring:message code="null_expression"/>
</label>
</div>
<div for="exprType"></div>

View File

@@ -299,8 +299,8 @@
</c:forEach>
</td>
<td>
<c:if test="${cfg.exprType==1}"><spring:message code="and"/></c:if>
<c:if test="${cfg.exprType==0}"><spring:message code="null"/></c:if>
<c:if test="${cfg.exprType==1}"><spring:message code="and_expression"/></c:if>
<c:if test="${cfg.exprType==0}"><spring:message code="null_expression"/></c:if>
</td>
<td>
<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">

View File

@@ -299,8 +299,8 @@
</c:forEach>
</td>
<td>
<c:if test="${cfg.exprType==1}"><spring:message code="and"/></c:if>
<c:if test="${cfg.exprType==0}"><spring:message code="null"/></c:if>
<c:if test="${cfg.exprType==1}"><spring:message code="and_expression"/></c:if>
<c:if test="${cfg.exprType==0}"><spring:message code="null_expression"/></c:if>
</td>
<td>
<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">

View File

@@ -49,12 +49,12 @@ $(function(){
<label class="radio-inline"> <input type="radio"
name="${cfgName}.exprType" value="1"
class="required" <c:if test="${strCfg.exprType==1}">checked</c:if>>
<spring:message code="and" />
<spring:message code="and_expression" />
</label> <label class="radio-inline"> <input type="radio"
name="${cfgName}.exprType" value="0"
class="required"
<c:if test="${strCfg.exprType==0 || strCfg.exprType==null}">checked</c:if>>
<spring:message code="null" />
<spring:message code="null_expression" />
</label>
</div>
<div for="${cfgName}.exprType"></div>