From e5356b10cc15c02c60eb15b5b83858507a6dc306 Mon Sep 17 00:00:00 2001
From: GoEdgeLab <goedgecloud@gmail.com>
Date: Sat, 10 Jun 2023 17:35:45 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=93=E5=AD=98=E6=9D=A1=E4=BB=B6=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E6=94=AF=E6=8C=81=E2=80=9C=E5=85=A8=E7=AB=99=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../server/http-cache-config-box.js           |  4 +--
 .../components/server/http-cache-ref-box.js   |  3 +-
 .../server/http-cache-refs-config-box.js      |  2 +-
 .../server/http-cond-definitions.js           | 30 +++++++++++++++++++
 web/public/js/conds/official.json             | 11 ++++++-
 5 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/web/public/js/components/server/http-cache-config-box.js b/web/public/js/components/server/http-cache-config-box.js
index 6b160bc2..c93aa884 100644
--- a/web/public/js/components/server/http-cache-config-box.js
+++ b/web/public/js/components/server/http-cache-config-box.js
@@ -141,8 +141,8 @@ Vue.component("http-cache-config-box", {
 	</div>
 	
 	<div v-show="isOn()" style="margin-top: 1em">
-		<h4>缓存条件</h4>
-		<http-cache-refs-config-box :v-cache-config="cacheConfig" :v-cache-refs="cacheConfig.cacheRefs" :v-web-id="vWebId"></http-cache-refs-config-box>
+		<h4>缓存条件 &nbsp; <a href="" style="font-size: 0.8em" @click.prevent="$refs.cacheRefsConfigBoxRef.addRef(false)">[添加]</a> </h4>
+		<http-cache-refs-config-box ref="cacheRefsConfigBoxRef" :v-cache-config="cacheConfig" :v-cache-refs="cacheConfig.cacheRefs" :v-web-id="vWebId"></http-cache-refs-config-box>
 	</div>
 	<div class="margin"></div>
 </div>`
diff --git a/web/public/js/components/server/http-cache-ref-box.js b/web/public/js/components/server/http-cache-ref-box.js
index 294cc862..734844d4 100644
--- a/web/public/js/components/server/http-cache-ref-box.js
+++ b/web/public/js/components/server/http-cache-ref-box.js
@@ -177,9 +177,10 @@ Vue.component("http-cache-ref-box", {
 		<td class="title color-border">条件类型 *</td>
 		<td>
 			<select class="ui dropdown auto-width" name="condType" v-model="condType" @change="changeCondType(condType, false)">
-				<option value="url-extension">URL扩展名</option>
+				<option value="url-extension">文件扩展名</option>
 				<option value="url-prefix">URL前缀</option>
 				<option value="url-eq-index">首页</option>
+				<option value="url-all">全站</option>
 				<option value="url-eq">URL完整路径</option>
 				<option value="url-regexp">URL正则匹配</option>
 				<option value="params">参数匹配</option>
diff --git a/web/public/js/components/server/http-cache-refs-config-box.js b/web/public/js/components/server/http-cache-refs-config-box.js
index 570f8348..8cb125d6 100644
--- a/web/public/js/components/server/http-cache-refs-config-box.js
+++ b/web/public/js/components/server/http-cache-refs-config-box.js
@@ -214,7 +214,7 @@ Vue.component("http-cache-refs-config-box", {
 		</table>
 		<p class="comment" v-if="refs.length > 1">所有条件匹配顺序为从上到下，可以拖动左侧的<i class="icon bars"></i>排序。服务设置的优先级比全局缓存策略设置的优先级要高。</p>
 		
-		<button class="ui button tiny" @click.prevent="addRef(false)" type="button">+添加缓存条件</button> &nbsp; &nbsp; <a href="" @click.prevent="addRef(true)">+添加不缓存条件</a>
+		<button class="ui button tiny" @click.prevent="addRef(false)" type="button">+添加缓存条件</button> &nbsp; &nbsp; <a href="" @click.prevent="addRef(true)" style="font-size: 0.8em">+添加不缓存条件</a>
 	</div>
 	<div class="margin"></div>
 </div>`
diff --git a/web/public/js/components/server/http-cond-definitions.js b/web/public/js/components/server/http-cond-definitions.js
index cfdba943..2566fb95 100644
--- a/web/public/js/components/server/http-cond-definitions.js
+++ b/web/public/js/components/server/http-cond-definitions.js
@@ -276,6 +276,36 @@ Vue.component("http-cond-url-eq-index", {
 </div>`
 })
 
+// 全站
+Vue.component("http-cond-url-all", {
+	props: ["v-cond"],
+	data: function () {
+		let cond = {
+			isRequest: true,
+			param: "${requestPath}",
+			operator: "prefix",
+			value: "/",
+			isCaseInsensitive: false
+		}
+		if (this.vCond != null && typeof this.vCond.value == "string") {
+			cond.value = this.vCond.value
+		}
+		return {
+			cond: cond
+		}
+	},
+	methods: {
+		changeCaseInsensitive: function (isCaseInsensitive) {
+			this.cond.isCaseInsensitive = isCaseInsensitive
+		}
+	},
+	template: `<div>
+	<input type="hidden" name="condJSON" :value="JSON.stringify(cond)"/>
+	<input type="text" v-model="cond.value" disabled="disabled" style="background: #eee"/>
+	<p class="comment">支持全站所有URL。</p>
+</div>`
+})
+
 // URL精准匹配
 Vue.component("http-cond-url-eq", {
 	props: ["v-cond"],
diff --git a/web/public/js/conds/official.json b/web/public/js/conds/official.json
index 9fcaf104..a76a63af 100644
--- a/web/public/js/conds/official.json
+++ b/web/public/js/conds/official.json
@@ -1,7 +1,7 @@
 [
   {
     "type": "url-extension",
-    "name": "URL扩展名",
+    "name": "文件扩展名",
     "description": "根据URL中的文件路径扩展名进行过滤",
     "component": "http-cond-url-extension",
     "paramsTitle": "扩展名列表",
@@ -16,6 +16,15 @@
     "isRequest": true,
     "caseInsensitive": false
   },
+  {
+    "type": "url-all",
+    "name": "全站",
+    "description": "全站所有URL",
+    "component": "http-cond-url-all",
+    "paramsTitle": "URL完整路径",
+    "isRequest": true,
+    "caseInsensitive": false
+  },
   {
     "type": "url-prefix",
     "name": "URL前缀",