From 0e995e7d8f434472c76578507b3df4f78724e6d4 Mon Sep 17 00:00:00 2001
From: zhangwei <zhangwei@intranet.com>
Date: Tue, 3 Apr 2018 14:41:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=BC=BA=E5=AD=97=E7=AC=A6=E4=B8=B2?=
 =?UTF-8?q?=E7=89=B9=E5=BE=81=E5=8C=B9=E9=85=8D=E5=8C=BA=E5=9F=9F=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E4=B8=BAothers=E6=97=B6=EF=BC=8C=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=BE=93=E5=85=A5=E5=8C=B9=E9=85=8D?=
 =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E4=BF=A1=E6=81=AF=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/WEB-INF/views/cfg/appCfgForm.jsp   | 51 ++++++++++++++++++-
 .../WEB-INF/views/cfg/appFeaturesCfg.jsp      | 10 ++++
 2 files changed, 60 insertions(+), 1 deletion(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/appCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/appCfgForm.jsp
index a762ff797..ab9e6a927 100644
--- a/src/main/webapp/WEB-INF/views/cfg/appCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/appCfgForm.jsp
@@ -6,6 +6,45 @@
 
 <script type="text/javascript">
 $(function(){
+
+	if(!$(".district").val()&&$(".otherValue").val()){
+		$(".district").find("option").each(function(){
+			var text=$(this).text().toLowerCase();
+			if("others"==text){
+				$(this).attr("selected","selected");
+				$(this).parent().siblings(".otherValue").prop("type","text");
+			}
+		});
+	}
+	$(".district").on("change",function(){
+		var text=$(this).find("option:selected").text().toLowerCase();
+		var other=$(this).parent("div").siblings(".otherValue");
+		if("others"==text){
+			other.prop("type","text");
+			$(this).find("option").each(function(){
+				if(other.val()==$(this).text()){
+					other.val("");
+					return false;
+				}
+			});
+		}else{
+			other.prop("type","hidden");
+		}
+	});
+	$(".otherValue").on("change",function(){
+		var val=$(this).val();
+		if($(this).is(":visible")){
+			$(this).prev("div").find("option").each(function(){
+				if("others"==$(this).text().toLowerCase()){
+					$(this).prop("value",val);
+					if($(this).prop("selected")){
+						$(this).parent("select.selectpicker").selectpicker('val',val);
+					}
+				}
+			});
+		}
+		
+	});
 	$("#save").on("click",function(){
 		$("#cfgFrom").attr("action","${ctx}/cfg/app/saveOrUpdateCfg");
 		$("#save").submit();
@@ -191,11 +230,21 @@ $(function(){
 										        <div class="form-group">
 										            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="match_area"/></label>
 										            <div class="col-md-6">
-										            	<select name="complexFeaturesList[${index2}].district" class="required selectpicker select2 form-control" title="<spring:message code="select"/>" >
+										            	<c:set var="districtValue" value="noSelect"></c:set>
+										            	<select name="complexFeaturesList[${index2}].district" class="district required selectpicker select2 form-control" title="<spring:message code="select"/>" >
 										            		<c:forEach items="${fns:getFeaturesDictData(features.tableName) }" var="item">
 																<option value="${item.itemValue }" <c:if test="${_cfg.complexFeaturesList[index2].district==item.itemValue }">selected</c:if>><spring:message code="${item.itemValue}"></spring:message></option>   
+										            			<c:if test="${_cfg.complexFeaturesList[index2].district==item.itemValue }">
+										            				<c:set var="districtValue" value="${item.itemValue }"></c:set>
+										            			</c:if>
 										            		</c:forEach>
+										            		<c:if test="${districtValue eq 'noSelect' and not empty _cfg.cfgId}">
+										            			<option value="${_cfg.complexFeaturesList[index2].district}" selected>
+										            				${_cfg.complexFeaturesList[index2].district}
+										            			</option>
+										            		</c:if>
 										            	</select>
+										            	<input type="hidden" name="" placeholder="请输入自定义域" class="otherValue form-control" value="${_cfg.complexFeaturesList[index2].district}"/>
 										                <%-- <input class="required form-control" type="text" name="complexFeaturesList[${index2}].district" value="${_cfg.complexFeaturesList[index2].district }"> --%>
 										            </div>
 										            <div for="cfgDesc"></div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/appFeaturesCfg.jsp b/src/main/webapp/WEB-INF/views/cfg/appFeaturesCfg.jsp
index 263c51658..c168fe4e2 100644
--- a/src/main/webapp/WEB-INF/views/cfg/appFeaturesCfg.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/appFeaturesCfg.jsp
@@ -120,11 +120,21 @@ $(function(){
 										        <div class="form-group">
 										            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="match_area"/></label>
 										            <div class="col-md-6">
+										            	<c:set var="districtValue" value="noSelect"></c:set>
 										            	<select name="complexFeaturesList[${index2}].district" class="required selectpicker select2 form-control" title="<spring:message code="select"/>" >
 										            		<c:forEach items="${fns:getFeaturesDictData(features.tableName) }" var="item">
 																<option value="${item.itemValue }" <c:if test="${_cfg.complexFeaturesList[index2].district==item.itemValue }">selected</c:if>><spring:message code="${item.itemValue}"></spring:message></option>   
+										            			<c:if test="${_cfg.complexFeaturesList[index2].district==item.itemValue }">
+										            				<c:set var="districtValue" value="${item.itemValue }"></c:set>
+										            			</c:if>
 										            		</c:forEach>
+										            		<c:if test="${districtValue eq 'noSelect' and not empty _cfg.cfgId}">
+										            			<option value="${_cfg.complexFeaturesList[index2].district}" selected>
+										            				${_cfg.complexFeaturesList[index2].district}
+										            			</option>
+										            		</c:if>
 										            	</select>
+										            	
 										                <%-- <input class="required form-control" type="text" name="complexFeaturesList[${index2}].district" value="${_cfg.complexFeaturesList[index2].district }"> --%>
 										            </div>
 										            <div for="cfgDesc"></div>