From 00c158f0a54d9b43ae2bd747e86095a926ea00b7 Mon Sep 17 00:00:00 2001
From: GoEdgeLab <goedgecloud@gmail.com>
Date: Wed, 14 Jul 2021 22:44:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=B8=AA=E6=8C=87?=
 =?UTF-8?q?=E6=A0=87=E5=9B=BE=E8=A1=A8=E6=97=A0=E6=B3=95=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E7=9A=84Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../js/components/server/metric-charts.js     |  6 ++-
 .../components/waf/updateSetPopup.html        | 40 +++----------------
 .../@default/servers/server/log/index.js      |  3 +-
 3 files changed, 12 insertions(+), 37 deletions(-)

diff --git a/web/public/js/components/server/metric-charts.js b/web/public/js/components/server/metric-charts.js
index 6fc4b1f8..86fb9709 100644
--- a/web/public/js/components/server/metric-charts.js
+++ b/web/public/js/components/server/metric-charts.js
@@ -17,7 +17,8 @@ Vue.component("metric-chart", {
 				stats.push({
 					keys: ["其他"],
 					value: stats[0].total - sum,
-					total: stats[0].total
+					total: stats[0].total,
+					time: stats[0].time
 				})
 			}
 		}
@@ -324,6 +325,9 @@ Vue.component("metric-chart", {
 			document.getElementById(this.chartId).innerHTML = table
 		},
 		formatTime: function (time) {
+			if (time == null) {
+				return ""
+			}
 			switch (this.vPeriodUnit) {
 				case "month":
 					return time.substring(0, 4) + "-" + time.substring(4, 6)
diff --git a/web/views/@default/servers/components/waf/updateSetPopup.html b/web/views/@default/servers/components/waf/updateSetPopup.html
index 8f01f170..d3fb5078 100644
--- a/web/views/@default/servers/components/waf/updateSetPopup.html
+++ b/web/views/@default/servers/components/waf/updateSetPopup.html
@@ -27,41 +27,11 @@
 			</td>
 		</tr>
 		<tr>
-			<td :class="{'color-border':action == 'go_group' || action == 'go_set'}">动作</td>
-			<td>
-				<select class="ui dropdown auto-width" name="action" v-model="action">
-					<option v-for="a in actions" :value="a.code">{{a.name}}({{a.code.toUpperCase()}})</option>
-				</select>
-				<p class="comment">匹配当前规则集后要执行的动作。</p>
-			</td>
-		</tr>
-		<tr v-if="action == 'go_group'">
-			<td class="color-border">下一个规则分组</td>
-			<td>
-				<select class="ui dropdown" name="action_groupId" style="width:12em" v-model="actionGroupId">
-					<option v-for="g in firewallPolicy.inbound.groups" :value="g.id">{{g.name}}</option>
-				</select>
-				<p class="comment">当动作为"跳到下一个规则分组"时出现此选择。</p>
-			</td>
-		</tr>
-		<tr v-if="action == 'go_set'">
-			<td class="color-border">下一个规则分组</td>
-			<td>
-				<select class="ui dropdown" name="action_groupId" style="width:12em" v-model="actionGroupId">
-					<option v-for="g in firewallPolicy.inbound.groups" :value="g.id">{{g.name}}</option>
-				</select>
-				<p class="comment">当动作为"跳到下一个规则集"时出现此选择。</p>
-			</td>
-		</tr>
-		<tr v-if="action == 'go_set'">
-			<td class="color-border">下一个规则集</td>
-			<td>
-				<select class="ui dropdown" name="action_setId" style="width:12em" v-model="actionSetId">
-					<option v-for="r in groupSets(actionGroupId)" :value="r.id">{{r.name}}</option>
-				</select>
-				<p class="comment">当动作为"跳到下一个规则集"时出现此选择。</p>
-			</td>
-		</tr>
+            <td>执行动作 *</td>
+            <td>
+                <http-firewall-actions-box :v-actions="actions" :v-firewall-policy="firewallPolicy" :v-action-configs="actionConfigs"></http-firewall-actions-box>
+            </td>
+        </tr>
 	</table>
 	<submit-btn></submit-btn>
 </form>
\ No newline at end of file
diff --git a/web/views/@default/servers/server/log/index.js b/web/views/@default/servers/server/log/index.js
index bd2e6f1b..5913a0eb 100644
--- a/web/views/@default/servers/server/log/index.js
+++ b/web/views/@default/servers/server/log/index.js
@@ -11,7 +11,8 @@ Tea.context(function () {
 		this.$post("$")
 			.params({
 				serverId: this.serverId,
-				requestId: this.requestId
+				requestId: this.requestId,
+				keyword: this.keyword
 			})
 			.success(function (resp) {
 				this.accessLogs = resp.data.accessLogs.concat(this.accessLogs)