From 69a8c8c616c47280502933a7a6d42d8a6cea3ec4 Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@intranet.com>
Date: Sat, 18 Aug 2018 19:54:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=B2=E7=AA=81=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/views/cfg/stringCfgForm.jsp       | 28 +++++++++++++++----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp
index 18f717671..506c51e09 100644
--- a/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp
@@ -26,6 +26,22 @@ $(function(){
 	</div>
 </div>
 <div class="row">
+	<c:if test="${region.configRegionValue eq 'NTC_P2P_HASH_BIN'}">
+	<div class="col-md-6">
+		<div class="form-group">
+			<label class="control-label col-md-3"><spring:message code="p2p_hash_type"/></label>
+			<div class="col-md-6">
+				<select name="userRegion2" class="selectpicker show-tick form-control">
+				<option value=""><spring:message code="select"/></option>
+				<c:forEach items="${fns:getDictList('P2P_HASH_TYPE')}" var="hashType">
+						<option value="${hashType.itemCode}" <c:if test="${_cfg.p2pHashList[0].userRegion1==hashType.itemCode}">selected</c:if> ><spring:message code="${hashType.itemValue}"/></option>
+				</c:forEach>
+				</select>
+			</div>
+			<div for="userRegion2"></div>
+		</div>
+	</div>
+	</c:if>
 	<div class="col-md-6">
 		<div class="form-group">
 			<label class="control-label col-md-3"><font color="red">*</font>
@@ -38,7 +54,7 @@ $(function(){
 			<div for="${cfgName}.cfgKeywords"></div>
 		</div>
 	</div>
-
+	
 </div>
 <div class="row">
 	<div class="col-md-6">
@@ -82,13 +98,14 @@ $(function(){
 	            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="is_hex"/></label>
 	            <div class="col-md-6">
 	            	<label class="radio-inline">
-	            		<input type="radio" name="${cfgName}.isHex" value="1" class="required"
-	            			<c:if test="${strCfg.isHexbin eq 1}">checked</c:if>
+	            		<input type="radio" name="${cfgName}.isHex" value="1" class="required" 
+	            			<c:if test="${(strCfg.isHexbin eq 1) || (region.configRegionValue eq 'NTC_P2P_HASH_BIN')}">checked disabled</c:if>
 	            		><spring:message code="hex"/>
 	            	</label>
 	            	<label class="radio-inline">
-	            		<input type="radio" name="${cfgName}.isHex" value="0" class="required"
-	            			<c:if test="${strCfg.isHexbin ne 1}">checked</c:if>
+	            		<input type="radio" name="${cfgName}.isHex" value="0" class="required" 
+	            			<c:if test="${(strCfg.isHexbin ne 1) && (region.configRegionValue ne 'NTC_P2P_HASH_BIN')}">checked</c:if>
+	            			<c:if test="${region.configRegionValue eq 'NTC_P2P_HASH_BIN'}">disabled</c:if>
 	            		><spring:message code="not_hex"/>
 	            	</label>
 	            </div>
@@ -132,5 +149,6 @@ $(function(){
 			<div for="${cfgName}.isHexbin"></div>
 		</div>
 	</div>
+	
 </div>
 </html>
\ No newline at end of file