From cdd87a29ac534a4d89cfad2c90aa3c7a922ea1bf Mon Sep 17 00:00:00 2001
From: GoEdgeLab <goedgecloud@gmail.com>
Date: Sun, 20 Feb 2022 09:17:30 +0800
Subject: [PATCH] =?UTF-8?q?URL=E8=B7=B3=E8=BD=AC=E5=8F=AF=E4=BB=A5?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=98=AF=E5=90=A6=E4=BF=9D=E7=95=99=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../servers/server/settings/redirects/createPopup.go       | 4 ++++
 .../servers/server/settings/redirects/createPopup.html     | 7 +++++++
 .../servers/server/settings/redirects/createPopup.js       | 4 ++--
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/internal/web/actions/default/servers/server/settings/redirects/createPopup.go b/internal/web/actions/default/servers/server/settings/redirects/createPopup.go
index 1d6d1693..437e6c67 100644
--- a/internal/web/actions/default/servers/server/settings/redirects/createPopup.go
+++ b/internal/web/actions/default/servers/server/settings/redirects/createPopup.go
@@ -27,11 +27,13 @@ func (this *CreatePopupAction) RunGet(params struct {
 }
 
 func (this *CreatePopupAction) RunPost(params struct {
+	Mode           string
 	BeforeURL      string
 	AfterURL       string
 	MatchPrefix    bool
 	MatchRegexp    bool
 	KeepRequestURI bool
+	KeepArgs       bool
 	Status         int
 	CondsJSON      []byte
 	IsOn           bool
@@ -99,12 +101,14 @@ func (this *CreatePopupAction) RunPost(params struct {
 	}
 
 	this.Data["redirect"] = maps.Map{
+		"mode":           params.Mode,
 		"status":         params.Status,
 		"beforeURL":      params.BeforeURL,
 		"afterURL":       params.AfterURL,
 		"matchPrefix":    params.MatchPrefix,
 		"matchRegexp":    params.MatchRegexp,
 		"keepRequestURI": params.KeepRequestURI,
+		"keepArgs":       params.KeepArgs,
 		"conds":          conds,
 		"isOn":           params.IsOn,
 	}
diff --git a/web/views/@default/servers/server/settings/redirects/createPopup.html b/web/views/@default/servers/server/settings/redirects/createPopup.html
index 072f2649..cb0be022 100644
--- a/web/views/@default/servers/server/settings/redirects/createPopup.html
+++ b/web/views/@default/servers/server/settings/redirects/createPopup.html
@@ -43,6 +43,13 @@
                 <p class="comment">选中后，则跳转之后，保留跳转之前的URL路径和参数。</p>
             </td>
         </tr>
+        <tr v-if="mode == 'equal' || mode == 'matchRegexp'">
+            <td>是否保留请求参数</td>
+            <td>
+                <checkbox name="keepArgs" value="1" v-model="redirect.keepArgs"></checkbox>
+                <p class="comment">选中后，则跳转之后，保留跳转之前的URL上的参数（即问号之后的部分）。</p>
+            </td>
+        </tr>
         <tr>
             <td>跳转状态码</td>
             <td>
diff --git a/web/views/@default/servers/server/settings/redirects/createPopup.js b/web/views/@default/servers/server/settings/redirects/createPopup.js
index 96877b40..fceb441e 100644
--- a/web/views/@default/servers/server/settings/redirects/createPopup.js
+++ b/web/views/@default/servers/server/settings/redirects/createPopup.js
@@ -11,6 +11,7 @@ Tea.context(function () {
 			matchPrefix: false,
 			matchRegexp: false,
 			keepRequestURI: false,
+			keepArgs: true,
 			conds: null,
 			isOn: true
 		}
@@ -22,8 +23,7 @@ Tea.context(function () {
 	} else if (this.redirect.matchRegexp) {
 		this.mode = "matchRegexp"
 	} else {
-		this.mode = "matchPrefix"
-		this.redirect.matchPrefix = true
+		this.mode = "equal"
 	}
 
 	this.$delay(function () {