From cbbb888720ea7ba9fb0eefb9d5c3941bac60405b Mon Sep 17 00:00:00 2001
From: zhangwenqing <zhangwenqing@zdjizhi.com>
Date: Tue, 18 Dec 2018 17:01:10 +0800
Subject: [PATCH] =?UTF-8?q?IP=E7=99=BD=E5=90=8D=E5=8D=95=20APP=E5=8D=8F?=
 =?UTF-8?q?=E8=AE=AEIP=20APP=E5=9F=9F=E5=90=8D=E7=89=B9=E5=BE=81=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E9=A1=B5=E9=9A=90=E8=97=8F=E6=9D=A5=E5=87=BD=E6=80=A7?=
 =?UTF-8?q?=E8=B4=A8=E5=88=86=E7=B1=BB.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/include/excel/importModal.jsp     | 19 ++++++++++---------
 .../static/pages/scripts/importExcel.js       | 19 +++++++++++++++++++
 2 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/src/main/webapp/WEB-INF/include/excel/importModal.jsp b/src/main/webapp/WEB-INF/include/excel/importModal.jsp
index 80eea6d79..a72b2da63 100644
--- a/src/main/webapp/WEB-INF/include/excel/importModal.jsp
+++ b/src/main/webapp/WEB-INF/include/excel/importModal.jsp
@@ -94,12 +94,12 @@
 							</div>
 							<div for="action"></div>
 						</div>
-						<!-- 600 asn ip -->
-						<c:if test="${cfg.functionId eq 600 }">
-							<div class="row hidden">
+						<!-- 600 asn ip、 3：IP白名单、 405：APP协议IP、 403：APP域名特征 -->
+						<c:if test="${(cfg.functionId eq 600) || (cfg.functionId eq 3) || (cfg.functionId eq 405) || (cfg.functionId eq 403)  }">
+							<div class="row hidden requestIdSel">
 						</c:if>
-						<c:if test="${cfg.functionId ne 600 }">
-							<div class="row">
+						<c:if test="${(cfg.functionId ne 600) && (cfg.functionId ne 3) && (cfg.functionId ne 405) && (cfg.functionId ne 403) }">
+							<div class="row requestIdSel">
 						</c:if>
 					           <label class="control-label col-md-3"><font color="red">*</font><spring:message code="letter"/></label>
 					           <div class="col-md-6">
@@ -116,7 +116,7 @@
 					           <div for="requestId"></div>
 					    </div>
 						</br>
-						<div class="row">
+						<div class="row attributeSel">
 				           <label class="control-label col-md-3"><spring:message code="attribute"/></label>
 				           <div class="col-md-6">
 				            	<sys:treeselect id="attribute" name="attribute" value="0" labelName="attributeName" extId="0"
@@ -126,7 +126,7 @@
 				            </div>
 						</div>
 						</br>
-						<div class="row">
+						<div class="row classifySel">
 							<label class="control-label col-md-3"><spring:message code="classification"/></label>
 				           <div class="col-md-6">
 				           		<sys:treeselect id="classify" name="classify" value="0" labelName="classifyName" extId="0"
@@ -135,6 +135,7 @@
 									checked="true" cssClass="form-control" checkedPS="ps" unCheckedPS="s"/>
 				           </div>
 						</div>
+						
 						</br>
 						<!-- 63 app -->
 						<c:if test="${cfg.functionId eq 63 or cfg.functionId eq 405 
@@ -159,7 +160,7 @@
 						</c:if>
 						
 						<c:if test="${!empty cfgType }">
-							<div class="row">
+							<div class="row appSelDiv">
 					        	<c:forEach items="${fns:getDictList('IS_SHOW_BUSINESS_TYPE') }" var="showBusinessType">
 										<c:if test="${showBusinessType.itemCode==1 }">
 										<c:set var="isShowBusinessType" value="true"/>
@@ -208,7 +209,7 @@
 						</div>
 						</br>
 						</c:if>
-						<div class="col-md-12">
+						<div class="col-md-12 fileSelDiv">
 							<div class="form-group">
 								<label class="col-md-2 control-label" style="margin-top:5px;"><spring:message
 										code="chooseFile" />：</label>
diff --git a/src/main/webapp/static/pages/scripts/importExcel.js b/src/main/webapp/static/pages/scripts/importExcel.js
index 0bd9c540c..98520db02 100644
--- a/src/main/webapp/static/pages/scripts/importExcel.js
+++ b/src/main/webapp/static/pages/scripts/importExcel.js
@@ -17,6 +17,25 @@ $(function(){
 	$("input[name='regionDictIds']").click(function(){
 	});
 	
+	if($(".requestIdSel").hasClass("hidden")){
+		$(".attributeSel").addClass("hidden");
+		$(".classifySel").addClass("hidden");
+		
+		if($(".appSelDiv").length == 0){
+			// 新增文件div上移
+			var fileDiv = $(".fileSelDiv").clone();
+			$(".fileSelDiv").remove();
+			$(".requestIdSel").after(fileDiv);
+		}else{
+			// 去除多余<br>
+			$(".modal-body").find("br").each(function(){
+				if($(this).prev("div").hasClass("hidden")){
+					$(this).remove();
+				}
+			});
+		}
+		
+	}
 });
 /**
  * action动作切换