From 9fa9f74b90a74f8026196ea471fa93ce023b744d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= <iwind.liu@gmail.com>
Date: Thu, 10 Jun 2021 10:39:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../js/components/server/http-request-conds-view.js    |  3 +++
 .../@default/servers/components/cache/createPopup.html | 10 +++++-----
 .../servers/server/settings/cache/createPopup.html     |  2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/web/public/js/components/server/http-request-conds-view.js b/web/public/js/components/server/http-request-conds-view.js
index 6c9ec40b..40626f75 100644
--- a/web/public/js/components/server/http-request-conds-view.js
+++ b/web/public/js/components/server/http-request-conds-view.js
@@ -63,6 +63,9 @@ Vue.component("http-request-conds-view", {
 					<var v-if="index < group.conds.length - 1"> {{group.connector}} &nbsp;</var>
 				</var>
 				<div class="ui divider" v-if="groupIndex != conds.groups.length - 1" style="margin-top:0.3em;margin-bottom:0.5em"></div>
+				<div>
+					<span class="ui label tiny olive" v-if="group.description != null && group.description.length > 0">{{group.description}}</span>
+				</div>
 			</div>	
 		</div>
 	</div>	
diff --git a/web/views/@default/servers/components/cache/createPopup.html b/web/views/@default/servers/components/cache/createPopup.html
index 1beca3a4..aa34f920 100644
--- a/web/views/@default/servers/components/cache/createPopup.html
+++ b/web/views/@default/servers/components/cache/createPopup.html
@@ -28,24 +28,24 @@
             <tr>
                 <td class="color-border">文件目录最大容量</td>
                 <td>
-                    <size-capacity-box :v-name="'capacityJSON'" :v-count="128" :v-unit="'gb'"></size-capacity-box>
+                    <size-capacity-box :v-name="'capacityJSON'" :v-count="128" :v-unit="'gb'" :key="'capacityJSON1'"></size-capacity-box>
                     <p class="comment">作为二级缓存的文件目录允许缓存的最大容量，如果为0表示没有限制。</p>
                 </td>
             </tr>
             <tr>
                 <td class="color-border">内存最大容量</td>
                 <td>
-                    <size-capacity-box :v-name="'fileMemoryCapacityJSON'" :v-count="0" :v-unit="'gb'"></size-capacity-box>
+                   <size-capacity-box :v-name="'fileMemoryCapacityJSON'" :v-count="0" :v-unit="'gb'" :key="'fileMemoryCapacityJSON'"></size-capacity-box>
                     <p class="comment">作为一级缓存的内存最大容量，如果为0表示不使用内存作为一级缓存。</p>
                 </td>
             </tr>
 		</tbody>
 
-        <tbody v-if="policyType != 'file'">
+        <tbody v-if="policyType == 'memory'">
             <tr>
                 <td>内存最大容量</td>
                 <td>
-                    <size-capacity-box :v-name="'capacityJSON'" :v-count="0" :v-unit="'gb'"></size-capacity-box>
+                    <size-capacity-box :key="'a'" :v-name="'capacityJSON'" :v-count="2" :v-unit="'gb'" :key="'capacityJSON2'"></size-capacity-box>
                     <p class="comment">允许缓存的最大容量，如果为0表示没有限制。</p>
                 </td>
             </tr>
@@ -58,7 +58,7 @@
 			<tr>
 				<td>最大内容长度</td>
 				<td>
-					<size-capacity-box :v-name="'maxSizeJSON'" :v-count="256" :v-unit="'mb'"></size-capacity-box>
+					<size-capacity-box :v-name="'maxSizeJSON'" :v-count="256" :v-unit="'mb'" :key="'maxSizeJSON'"></size-capacity-box>
 					<p class="comment">允许缓存的最大内容长度，如果为0表示没有限制。</p>
 				</td>
 			</tr>
diff --git a/web/views/@default/servers/server/settings/cache/createPopup.html b/web/views/@default/servers/server/settings/cache/createPopup.html
index 41f692a1..29055d9b 100644
--- a/web/views/@default/servers/server/settings/cache/createPopup.html
+++ b/web/views/@default/servers/server/settings/cache/createPopup.html
@@ -6,6 +6,6 @@
     <table class="ui table definition selectable">
         <tbody is="http-cache-ref-box" :v-cache-ref="cacheRef" :v-is-reverse="isReverse"></tbody>
     </table>
-    <p class="comment">如果请求满足当前添加的条件，则不缓存。</p>
+    <p class="comment" v-if="isReverse">如果请求满足当前添加的条件，则不缓存。</p>
     <submit-btn>确定</submit-btn>
 </form>
\ No newline at end of file