From 81f2982abc6e981623dfce7cd6af50486fe57889 Mon Sep 17 00:00:00 2001
From: GoEdgeLab <goedgecloud@gmail.com>
Date: Tue, 29 Sep 2020 17:23:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E7=8E=B0gzip?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../servers/server/settings/gzip/index.go     | 30 +++++++++----------
 .../server/http-cond-definitions.js           |  5 ++--
 .../js/components/server/http-gzip-box.js     |  4 +--
 .../server/http-request-conds-tbody.js        | 26 +++++++++-------
 4 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/internal/web/actions/default/servers/server/settings/gzip/index.go b/internal/web/actions/default/servers/server/settings/gzip/index.go
index 936fb6f0..4ceb8c81 100644
--- a/internal/web/actions/default/servers/server/settings/gzip/index.go
+++ b/internal/web/actions/default/servers/server/settings/gzip/index.go
@@ -66,12 +66,12 @@ func (this *IndexAction) RunGet(params struct {
 }
 
 func (this *IndexAction) RunPost(params struct {
-	WebId          int64
-	GzipId         int64
-	Level          int
-	MinLength      string
-	MaxLength      string
-	CondGroupsJSON []byte
+	WebId     int64
+	GzipId    int64
+	Level     int
+	MinLength string
+	MaxLength string
+	CondsJSON []byte
 
 	Must *actions.Must
 }) {
@@ -99,11 +99,11 @@ func (this *IndexAction) RunPost(params struct {
 
 	if params.GzipId > 0 {
 		_, err := this.RPC().HTTPGzipRPC().UpdateHTTPGzip(this.AdminContext(), &pb.UpdateHTTPGzipRequest{
-			GzipId:         params.GzipId,
-			Level:          types.Int32(params.Level),
-			MinLength:      minLength,
-			MaxLength:      maxLength,
-			CondGroupsJSON: params.CondGroupsJSON,
+			GzipId:    params.GzipId,
+			Level:     types.Int32(params.Level),
+			MinLength: minLength,
+			MaxLength: maxLength,
+			CondsJSON: params.CondsJSON,
 		})
 		if err != nil {
 			this.ErrorPage(err)
@@ -111,10 +111,10 @@ func (this *IndexAction) RunPost(params struct {
 		}
 	} else {
 		resp, err := this.RPC().HTTPGzipRPC().CreateHTTPGzip(this.AdminContext(), &pb.CreateHTTPGzipRequest{
-			Level:          types.Int32(params.Level),
-			MinLength:      minLength,
-			MaxLength:      maxLength,
-			CondGroupsJSON: params.CondGroupsJSON,
+			Level:     types.Int32(params.Level),
+			MinLength: minLength,
+			MaxLength: maxLength,
+			CondsJSON: params.CondsJSON,
 		})
 		if err != nil {
 			this.ErrorPage(err)
diff --git a/web/public/js/components/server/http-cond-definitions.js b/web/public/js/components/server/http-cond-definitions.js
index f381d35d..b16290d0 100644
--- a/web/public/js/components/server/http-cond-definitions.js
+++ b/web/public/js/components/server/http-cond-definitions.js
@@ -5,6 +5,7 @@ Vue.component("http-cond-url-extension", {
 		let cond = this.vCond
 		if (cond == null) {
 			cond = {
+				isRequest: true,
 				param: "${requestPathExtension}",
 				operator: "in",
 				value: "[]"
@@ -85,7 +86,7 @@ Vue.component("http-cond-mime-type", {
 		let cond = this.vCond
 		if (cond == null) {
 			cond = {
-				type: "mime-type",
+				isRequest: false,
 				param: "${response.contentType}",
 				operator: "mime type",
 				value: "[]"
@@ -144,7 +145,7 @@ Vue.component("http-cond-mime-type", {
 	</div>
 	<div class="ui fields inline" v-if="isAdding">
 		<div class="ui field">
-			<input type="text" size="16" maxlength="100" v-model="addingMimeType" ref="addingMimeType" placeholder="xxxxx/xxx" @keyup.enter="confirmAdding" @keypress.enter.prevent="1" />
+			<input type="text" size="16" maxlength="100" v-model="addingMimeType" ref="addingMimeType" placeholder="类似于image/png" @keyup.enter="confirmAdding" @keypress.enter.prevent="1" />
 		</div>
 		<div class="ui field">
 			<button class="ui button tiny" type="button" @click.prevent="confirmAdding">确认</button>
diff --git a/web/public/js/components/server/http-gzip-box.js b/web/public/js/components/server/http-gzip-box.js
index 3f3a1d84..2bfd6891 100644
--- a/web/public/js/components/server/http-gzip-box.js
+++ b/web/public/js/components/server/http-gzip-box.js
@@ -8,7 +8,7 @@ Vue.component("http-gzip-box", {
 				level: 0,
 				minLength: null,
 				maxLength: null,
-				condGroups: []
+				conds: null
 			}
 		}
 
@@ -69,7 +69,7 @@ Vue.component("http-gzip-box", {
 			</td>
 		</tr>
 	</tbody>
-	<http-request-conds-tbody v-show="isOn() && advancedVisible" :v-cond-groups="gzip.condGroups"></http-request-conds-tbody>
+	<http-request-conds-tbody v-show="isOn() && advancedVisible" :v-conds="gzip.conds"></http-request-conds-tbody>
 </table>
 </div>`
 })
\ No newline at end of file
diff --git a/web/public/js/components/server/http-request-conds-tbody.js b/web/public/js/components/server/http-request-conds-tbody.js
index cebd70e1..beb03a09 100644
--- a/web/public/js/components/server/http-request-conds-tbody.js
+++ b/web/public/js/components/server/http-request-conds-tbody.js
@@ -1,12 +1,16 @@
 Vue.component("http-request-conds-tbody", {
-	props: ["v-cond-groups"],
+	props: ["v-conds"],
 	data: function () {
-		let groups = this.vCondGroups
-		if (groups == null) {
-			groups = []
+		let conds = this.vConds
+		if (conds == null) {
+			conds = {
+				isOn: true,
+				connector: "or",
+				groups: []
+			}
 		}
 		return {
-			groups: groups,
+			conds: conds,
 			components: window.REQUEST_COND_COMPONENTS
 		}
 	},
@@ -16,7 +20,7 @@ Vue.component("http-request-conds-tbody", {
 			teaweb.popup("/servers/server/settings/conds/addGroupPopup", {
 				height: "30em",
 				callback: function (resp) {
-					that.groups.push(resp.data.group)
+					that.conds.groups.push(resp.data.group)
 				}
 			})
 		},
@@ -26,14 +30,14 @@ Vue.component("http-request-conds-tbody", {
 			teaweb.popup("/servers/server/settings/conds/addGroupPopup", {
 				height: "30em",
 				callback: function (resp) {
-					Vue.set(that.groups, groupIndex, resp.data.group)
+					Vue.set(that.conds.groups, groupIndex, resp.data.group)
 				}
 			})
 		},
 		removeGroup: function (groupIndex) {
 			let that = this
 			teaweb.confirm("确定要删除这一组条件吗？", function () {
-				that.groups.$remove(groupIndex)
+				that.conds.groups.$remove(groupIndex)
 			})
 		},
 		typeName: function (cond) {
@@ -50,11 +54,11 @@ Vue.component("http-request-conds-tbody", {
 		<tr>
 			<td>匹配条件</td>
 			<td>
-				<input type="hidden" name="condGroupsJSON" :value="JSON.stringify(groups)"/>
+				<input type="hidden" name="condsJSON" :value="JSON.stringify(conds)"/>
 				<div class="margin"></div>
-				<div v-if="groups.length > 0">
+				<div v-if="conds.groups.length > 0">
 					<table class="ui table">
-						<tr v-for="(group, groupIndex) in groups">
+						<tr v-for="(group, groupIndex) in conds.groups">
 							<td style="background: white">
 								<var v-for="(cond, index) in group.conds" style="font-style: normal;display: inline-block; margin-bottom:0.5em">
 									<span class="ui label tiny">