From fa20de4df12f5a768ed28024d8f9daa513037d02 Mon Sep 17 00:00:00 2001
From: fangshunjian <fangshunjian@iie.ac.cn>
Date: Sun, 27 Jan 2019 19:45:48 +0600
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9ddos,=E9=9F=B3?=
 =?UTF-8?q?=E8=A7=86=E9=A2=91=E4=BF=9D=E5=AD=98=E5=AE=9A=E6=97=B6=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E4=BF=A1=E6=81=AFcronValid=20=E5=92=8C=20cronInvalid?=
 =?UTF-8?q?=20=E5=AD=97=E6=AE=B5=E5=87=BA=E9=94=99=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Conflicts:
	src/main/webapp/WEB-INF/views/cfg/ddosIpCfgForm.jsp
---
 .../webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp |  3 +++
 .../WEB-INF/views/cfg/av/fileSampleSubList.jsp     | 14 ++++++++++++++
 .../webapp/WEB-INF/views/cfg/ddosIpCfgForm.jsp     |  3 +++
 src/main/webapp/WEB-INF/views/cfg/ddosSubList.jsp  | 13 +++++++++++++
 4 files changed, 33 insertions(+)

diff --git a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp
index 9355d1f2f..80ce3e030 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp
@@ -242,6 +242,7 @@ $(function(){
 				flag = validateEffectiveRuleLimit("${ctx}",serviceId);
 			}
 			if(flag){
+				$("#cron .detail > div.disabled").remove();//删除disabled 的字段
 				form.submit();
 			}
 		},
@@ -555,6 +556,8 @@ function sampleFileValidate(fileType,fileName){
 								<!-- dolog end-->
                            <input type="hidden" name="isAreaEffective" value="0">
                             <%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
+                            <br>
+							<%@include file="/WEB-INF/include/form/scheduleNew.jsp"%>
                           </div>
                           <div class="form-actions">
                               <div class="row">
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleSubList.jsp
index 780317849..7f63f65a1 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleSubList.jsp
@@ -19,6 +19,14 @@
 			<i id="${region[1]}${index}" class="fa" name="tabFlag${index}"></i>
 	</div>
 </c:forEach>
+
+<c:if test="${not empty _cfg.schedule }">
+	<div id="scheduleTitle${index}" onclick="switchSubCfgTabInfo('schedule',${index})"
+		class="col-md-1 tabInfo" name="tabTitle${index }">
+			<spring:message code='schedule' />
+			<i id="schedule${index}" class="fa" name="tabFlag${index}"></i>
+	</div>
+</c:if>
 </div>
 <c:forEach items="${tabList}" var="region">
 	<c:if test="${region[0] eq 5 }">
@@ -51,4 +59,10 @@
 			</c:if>
 	</c:if>
 </c:forEach>
+<!-- 显示 定时任务信息 -->
+<c:if test="${not empty _cfg.schedule }">
+	<div id="scheduleInfo${index}" class="content" name="subCfg${index}">
+			<%@include file="/WEB-INF/include/form/scheduleNewSubList.jsp"%>
+	</div>
+</c:if>
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgForm.jsp
index 598256c1f..726a9f284 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgForm.jsp
@@ -75,6 +75,7 @@ $(function(){
 				return;
 			}
 			loading('onloading...');
+			$("#cron .detail > div.disabled").remove();//删除disabled 的字段
 			form.submit();
 		},
 		errorContainer: "#messageBox",
@@ -236,6 +237,8 @@ $(function(){
 							<%@include file="/WEB-INF/include/form/areaInfo.jsp"%>
 							<br>
                             <%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
+                          	<br>
+						   	<%@include file="/WEB-INF/include/form/scheduleNew.jsp"%>
                           </div>
                           <div class="form-actions">
                               <div class="row">
diff --git a/src/main/webapp/WEB-INF/views/cfg/ddosSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/ddosSubList.jsp
index 6e7ff08ef..d5a834c8e 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ddosSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ddosSubList.jsp
@@ -19,6 +19,13 @@
 	</div>
 </c:forEach>
 
+<c:if test="${not empty _cfg.schedule }">
+	<div id="scheduleTitle${index}" onclick="switchSubCfgTabInfo('schedule',${index})"
+		class="col-md-1 tabInfo" name="tabTitle${index }">
+			<spring:message code='schedule' />
+			<i id="schedule${index}" class="fa" name="tabFlag${index}"></i>
+	</div>
+</c:if>
 </div>
 <c:forEach items="${tabList}" var="region">
 	<c:if test="${region[0] eq 1 }">
@@ -130,4 +137,10 @@
 			</c:if>
 	</c:if>
 </c:forEach>
+<!-- 显示 定时任务信息 -->
+<c:if test="${not empty _cfg.schedule }">
+	<div id="scheduleInfo${index}" class="content" name="subCfg${index}">
+			<%@include file="/WEB-INF/include/form/scheduleNewSubList.jsp"%>
+	</div>
+</c:if>
 </html>
\ No newline at end of file