优化WAF创建规则界面中参数选项显示

docker/Dockerfile

@@ -1,7 +1,7 @@
 FROM alpine:latest
 LABEL maintainer="iwind.liu@gmail.com"
 ENV TZ "Asia/Shanghai"
-ENV VERSION 0.6.1
+ENV VERSION 0.6.2
 ENV ROOT_DIR /usr/local/goedge
 ENV TAR_FILE edge-admin-linux-amd64-plus-v${VERSION}.zip
 ENV TAR_URL "https://dl.goedge.cn/edge/v${VERSION}/edge-admin-linux-amd64-plus-v${VERSION}.zip"

internal/const/const.go

@@ -1,9 +1,9 @@
 package teaconst
 
 const (
-	Version = "0.6.2"
+	Version = "0.6.3"
 
-	APINodeVersion = "0.6.2"
+	APINodeVersion = "0.6.3"
 
 	ProductName   = "Edge Admin"
 	ProcessName   = "edge-admin"

web/public/js/components/server/http-firewall-rule-label.js

@@ -21,6 +21,9 @@ Vue.component("http-firewall-rule-label", {
 			}
 
 			return operatorName
+		},
+		isEmptyString: function (v) {
+			return typeof v == "string" && v.length == 0
 		}
 	},
 	template: `<div>
@@ -41,7 +44,8 @@ Vue.component("http-firewall-rule-label", {
 		<span v-else>
 			<span v-if="rule.paramFilters != null && rule.paramFilters.length > 0" v-for="paramFilter in rule.paramFilters"> | {{paramFilter.code}}</span> 
 		<span :class="{dash:rule.isCaseInsensitive}" :title="rule.isCaseInsensitive ? '大小写不敏感':''" v-if="!rule.isComposed">{{operatorName(rule.operator)}}</span> 
-		{{rule.value}}
+			<span v-if="!isEmptyString(rule.value)">{{rule.value}}</span>
+			<span v-else class="disabled" style="font-weight: normal" title="空字符串">[空]</span>
 		</span>
 		
 		<!-- description -->

web/public/js/components/server/http-firewall-rules-box.js

@@ -47,6 +47,9 @@ Vue.component("http-firewall-rules-box", {
 			}
 
 			return operatorName
+		},
+		isEmptyString: function (v) {
+			return typeof v == "string" && v.length == 0
 		}
 	},
 	template: `<div>
@@ -67,7 +70,9 @@ Vue.component("http-firewall-rules-box", {
 				</span>
 				
 				<span v-else>
-					<span v-if="rule.paramFilters != null && rule.paramFilters.length > 0" v-for="paramFilter in rule.paramFilters"> | {{paramFilter.code}}</span> <span :class="{dash:rule.isCaseInsensitive}" :title="rule.isCaseInsensitive ? '大小写不敏感':''">{{operatorName(rule.operator)}}</span> {{rule.value}}
+					<span v-if="rule.paramFilters != null && rule.paramFilters.length > 0" v-for="paramFilter in rule.paramFilters"> | {{paramFilter.code}}</span> <span :class="{dash:rule.isCaseInsensitive}" :title="rule.isCaseInsensitive ? '大小写不敏感':''">{{operatorName(rule.operator)}}</span> 
+						<span v-if="!isEmptyString(rule.value)">{{rule.value}}</span>
+						<span v-else class="disabled" style="font-weight: normal" title="空字符串">[空]</span>
 				</span>
 				
 				<!-- description -->

web/views/@default/servers/components/waf/createRulePopup.html

@@ -13,9 +13,9 @@
 				<select name="prefix" class="ui dropdown auto-width" @change="changeCheckpoint()" v-model="rule.checkpointPrefix">
 					<option value="">[选择参数]</option>
 					<optgroup label="特殊参数"></optgroup>
-					<option v-for="cp in checkpoints" v-if="cp.isComposed" :value="cp.prefix">{{cp.name}} - [ {{cp.prefix}}]</option>
+					<option v-for="cp in checkpoints" v-if="cp.isComposed" :value="cp.prefix">{{cp.name}} - [{{cp.prefix}}]</option>
 					<optgroup label="通用参数"></optgroup>
-					<option v-for="cp in checkpoints" v-if="!cp.isComposed" :value="cp.prefix">{{cp.name}} - [ {{cp.prefix}}]</option>
+					<option v-for="cp in checkpoints" v-if="!cp.isComposed" :value="cp.prefix">{{cp.name}} - [{{cp.prefix}}]</option>
 				</select>
 				<p class="comment" v-if="checkpoint != null"><span class="ui label tiny">${<em style="font-style: normal;">{{checkpoint.prefix}}</em>}</span>{{checkpoint.description}}</p>
 			</td>