From 689b4eb4604902144846fb431d4b6376e6ac4c70 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Mon, 9 Apr 2018 10:24:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=9A=E5=9F=9F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=97=B6IP=E9=85=8D=E7=BD=AE=E5=A6=82=E6=9E=9C?=
 =?UTF-8?q?=E4=B8=8D=E4=B8=BA=E7=A9=BA=E9=BB=98=E8=AE=A4=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/WEB-INF/include/form/multiple/ipInfo.jsp | 13 +++++--------
 .../webapp/WEB-INF/views/cfg/multipleCfgForm.jsp    |  7 +++++++
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/main/webapp/WEB-INF/include/form/multiple/ipInfo.jsp b/src/main/webapp/WEB-INF/include/form/multiple/ipInfo.jsp
index 1ba595455..94b005c6b 100644
--- a/src/main/webapp/WEB-INF/include/form/multiple/ipInfo.jsp
+++ b/src/main/webapp/WEB-INF/include/form/multiple/ipInfo.jsp
@@ -1,8 +1,5 @@
 <%@ page contentType="text/html;charset=UTF-8"%>
 <%@ include file="/WEB-INF/include/taglib.jsp"%>
-<style>
-
-</style>
 <h3 class="form-section">
 <c:choose>
     <c:when test="${mainTableType eq '1' and otherTable==null}">
@@ -13,7 +10,7 @@
     </c:when>
     <c:otherwise>IP<spring:message code="block_config"/></c:otherwise>
 </c:choose>
-<small><span style="margin-left:10px"><input type="checkbox" id="ipSelect"/> 可选</span><!-- <span class="glyphicon glyphicon-plus" data-toggle="collapse" data-target=".ipCfg" title="add"></span> --></small></h3>
+<small><span style="margin-left:10px"><input type="checkbox" id="ipSelect" <c:if test="${_cfg.ipCfg[mainTable]!= null and _cfg.ipCfg[mainTable].cfgId != null}">checked</c:if> <c:if test="${_cfg.ipCfg[otherTable.tableName]!= null and _cfg.ipCfg[otherTable.tableName].cfgId != null}">checked</c:if>/> 可选</span><!-- <span class="glyphicon glyphicon-plus" data-toggle="collapse" data-target=".ipCfg" title="add"></span> --></small></h3>
 <div class="row ipCfg collapse">
     <div class="col-md-6">
         <div class="form-group">
@@ -264,15 +261,15 @@
             		<c:when test="${mainTableType eq '1' and otherTable==null}">
             		<select name="ipCfg[${mainTable}].direction" class="selectpicker show-tick form-control required" title=<spring:message code="select"/>>
 	                   <option value="" ><spring:message code="select"/></option>
-	                   <option value="0" <c:if test="${_cfg.ipCfg[mainTable].direction==0}">selected</c:if>>0</option>
-	                   <option value="1" <c:if test="${_cfg.ipCfg[mainTable].direction==1}">selected</c:if>>1</option>
+	                   <option value="0" <c:if test="${_cfg.ipCfg[mainTable].direction==0}">selected</c:if>><spring:message code="twoway"/></option>
+	                   <option value="1" <c:if test="${_cfg.ipCfg[mainTable].direction==1}">selected</c:if>><spring:message code="oneway"/></option>
 	                 </select>
             		</c:when>
             		<c:when test="${otherTable!=null and otherTable.tableType eq '1'}">
             		<select name="ipCfg[${otherTable.tableName}].direction" class="selectpicker show-tick form-control required" title=<spring:message code="select"/>>
 	                   <option value="" ><spring:message code="select"/></option>
-	                   <option value="0" <c:if test="${_cfg.ipCfg[otherTable.tableName].direction==0}">selected</c:if>>0</option>
-	                   <option value="1" <c:if test="${_cfg.ipCfg[otherTable.tableName].direction==1}">selected</c:if>>1</option>
+	                   <option value="0" <c:if test="${_cfg.ipCfg[otherTable.tableName].direction==0}">selected</c:if>><spring:message code="twoway"/></option>
+	                   <option value="1" <c:if test="${_cfg.ipCfg[otherTable.tableName].direction==1}">selected</c:if>><spring:message code="oneway"/></option>
 	                 </select>
             		</c:when>
             	</c:choose>
diff --git a/src/main/webapp/WEB-INF/views/cfg/multipleCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/multipleCfgForm.jsp
index 59eb92700..0de09e29e 100644
--- a/src/main/webapp/WEB-INF/views/cfg/multipleCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/multipleCfgForm.jsp
@@ -6,6 +6,13 @@
 <script type="text/javascript">
 $(function(){
 	$("[name^='ipCfg']").attr("disabled",true);
+	if($("#ipSelect").is(":checked")){
+		$("[name^='ipCfg']").removeProp("disabled");
+		//解决select插件disbale后无法恢复
+		$(".bootstrap-select").removeClass("disabled");
+		$(".bootstrap-select button").removeClass("disabled");
+		$(".collapse").addClass("in");
+	}
 	//$("[name^='stringCfg']").attr("disabled",true);
 	//$("[name^='complexCfg']").attr("disabled",true);
 	//$("[name^='numCfg']").attr("disabled",true);