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

WAF规则中如果对比值为空，则显示空字样
版本号修改为0.6.3
2023-01-13 18:51:14 +08:00 · 2023-01-13 15:58:35 +08:00 · 2023-01-11 15:45:03 +08:00 · 2023-01-10 21:32:20 +08:00 · 2023-01-10 21:17:20 +08:00 · 2023-01-10 18:31:28 +08:00
8 changed files with 29 additions and 19 deletions
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,10 +1,11 @@
 FROM alpine:latest
 LABEL maintainer="iwind.liu@gmail.com"
 ENV TZ "Asia/Shanghai"
-ENV VERSION 0.5.9
+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"
+#ENV TAR_URL "http://192.168.2.60:8080/edge-admin-linux-amd64-plus-v${VERSION}.zip" # your local repository

 RUN apk add --no-cache tzdata

--- a/internal/const/const.go
+++ b/internal/const/const.go
@@ -1,9 +1,9 @@
 package teaconst

 const (
-	Version = "0.6.0"
+	Version = "0.6.3"

-	APINodeVersion = "0.6.0"
+	APINodeVersion = "0.6.3"

 	ProductName   = "Edge Admin"
 	ProcessName   = "edge-admin"
--- a/web/public/js/components.js
+++ b/web/public/js/components.js
@@ -5101,16 +5101,16 @@ example2.com
 </tbody>`}),Vue.component("download-link",{props:["v-element","v-file","v-value"],created:function(){let e=this;setTimeout(function(){e.url=e.composeURL()},1e3)},data:function(){let e=this.vFile;return{file:e=null!=e&&0!=e.length?e:"unknown-file",url:this.composeURL()}},methods:{composeURL:function(){let e="";if(null!=this.vValue)e=this.vValue;else{var t=document.getElementById(this.vElement);if(null==t)return;null==(e=t.innerText)&&(e=t.textContent)}return Tea.url("/ui/download",{file:this.file,text:e})}},template:'<a :href="url" target="_blank" style="font-weight: normal"><slot></slot></a>'}),Vue.component("values-box",{props:["values","v-values","size","maxlength","name","placeholder","v-allow-empty"],data:function(){let e=this.values;return null==e&&(e=[]),{realValues:e=null!=this.vValues&&"object"==typeof this.vValues?this.vValues:e,isUpdating:!1,isAdding:!1,index:0,value:"",isEditing:!1}},methods:{create:function(){this.isAdding=!0;var e=this;setTimeout(function(){e.$refs.value.focus()},200)},update:function(e){this.cancel(),this.isUpdating=!0,this.index=e,this.value=this.realValues[e];var t=this;setTimeout(function(){t.$refs.value.focus()},200)},confirm:function(){(0!=this.value.length||"boolean"==typeof this.vAllowEmpty&&this.vAllowEmpty)&&(this.isUpdating?Vue.set(this.realValues,this.index,this.value):this.realValues.push(this.value),this.cancel(),this.$emit("change",this.realValues))},remove:function(e){this.realValues.$remove(e),this.$emit("change",this.realValues)},cancel:function(){this.isUpdating=!1,this.isAdding=!1,this.value=""},updateAll:function(e){this.realValues=e},addValue:function(e){this.realValues.push(e)},startEditing:function(){this.isEditing=!this.isEditing},allValues:function(){return this.realValues}},template:`<div>
 	<div v-show="!isEditing && realValues.length > 0">
 		<div class="ui label tiny basic" v-for="(value, index) in realValues" style="margin-top:0.4em;margin-bottom:0.4em">
-			<span v-if="value.length > 0">{{value}}</span>
-			<span v-if="value.length == 0" class="disabled">[空]</span>
+			<span v-if="value.toString().length > 0">{{value}}</span>
+			<span v-if="value.toString().length == 0" class="disabled">[空]</span>
 		</div>
 		<a href="" @click.prevent="startEditing" style="font-size: 0.8em; margin-left: 0.2em">[修改]</a>
 	</div>
 	<div v-show="isEditing || realValues.length == 0">
 		<div style="margin-bottom: 1em" v-if="realValues.length > 0">
 			<div class="ui label tiny basic" v-for="(value, index) in realValues" style="margin-top:0.4em;margin-bottom:0.4em">
-				<span v-if="value.length > 0">{{value}}</span>
-				<span v-if="value.length == 0" class="disabled">[空]</span>
+				<span v-if="value.toString().length > 0">{{value}}</span>
+				<span v-if="value.toString().length == 0" class="disabled">[空]</span>
 				<input type="hidden" :name="name" :value="value"/>
 				&nbsp; <a href="" @click.prevent="update(index)" title="修改"><i class="icon pencil small" ></i></a> 
 				<a href="" @click.prevent="remove(index)" title="删除"><i class="icon remove"></i></a> 
--- a/web/public/js/components.src.js
+++ b/web/public/js/components.src.js
@@ -14961,16 +14961,16 @@ Vue.component("values-box", {
 	template: `<div>
 	<div v-show="!isEditing && realValues.length > 0">
 		<div class="ui label tiny basic" v-for="(value, index) in realValues" style="margin-top:0.4em;margin-bottom:0.4em">
-			<span v-if="value.length > 0">{{value}}</span>
-			<span v-if="value.length == 0" class="disabled">[空]</span>
+			<span v-if="value.toString().length > 0">{{value}}</span>
+			<span v-if="value.toString().length == 0" class="disabled">[空]</span>
 		</div>
 		<a href="" @click.prevent="startEditing" style="font-size: 0.8em; margin-left: 0.2em">[修改]</a>
 	</div>
 	<div v-show="isEditing || realValues.length == 0">
 		<div style="margin-bottom: 1em" v-if="realValues.length > 0">
 			<div class="ui label tiny basic" v-for="(value, index) in realValues" style="margin-top:0.4em;margin-bottom:0.4em">
-				<span v-if="value.length > 0">{{value}}</span>
-				<span v-if="value.length == 0" class="disabled">[空]</span>
+				<span v-if="value.toString().length > 0">{{value}}</span>
+				<span v-if="value.toString().length == 0" class="disabled">[空]</span>
 				<input type="hidden" :name="name" :value="value"/>
 				&nbsp; <a href="" @click.prevent="update(index)" title="修改"><i class="icon pencil small" ></i></a> 
 				<a href="" @click.prevent="remove(index)" title="删除"><i class="icon remove"></i></a> 
--- a/web/public/js/components/common/values-box.js
+++ b/web/public/js/components/common/values-box.js
@@ -78,16 +78,16 @@ Vue.component("values-box", {
 	template: `<div>
 	<div v-show="!isEditing && realValues.length > 0">
 		<div class="ui label tiny basic" v-for="(value, index) in realValues" style="margin-top:0.4em;margin-bottom:0.4em">
-			<span v-if="value.length > 0">{{value}}</span>
-			<span v-if="value.length == 0" class="disabled">[空]</span>
+			<span v-if="value.toString().length > 0">{{value}}</span>
+			<span v-if="value.toString().length == 0" class="disabled">[空]</span>
 		</div>
 		<a href="" @click.prevent="startEditing" style="font-size: 0.8em; margin-left: 0.2em">[修改]</a>
 	</div>
 	<div v-show="isEditing || realValues.length == 0">
 		<div style="margin-bottom: 1em" v-if="realValues.length > 0">
 			<div class="ui label tiny basic" v-for="(value, index) in realValues" style="margin-top:0.4em;margin-bottom:0.4em">
-				<span v-if="value.length > 0">{{value}}</span>
-				<span v-if="value.length == 0" class="disabled">[空]</span>
+				<span v-if="value.toString().length > 0">{{value}}</span>
+				<span v-if="value.toString().length == 0" class="disabled">[空]</span>
 				<input type="hidden" :name="name" :value="value"/>
 				&nbsp; <a href="" @click.prevent="update(index)" title="修改"><i class="icon pencil small" ></i></a> 
 				<a href="" @click.prevent="remove(index)" title="删除"><i class="icon remove"></i></a> 
--- a/web/public/js/components/server/http-firewall-rule-label.js
+++ b/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 -->
--- a/web/public/js/components/server/http-firewall-rules-box.js
+++ b/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 -->
--- a/web/views/@default/servers/components/waf/createRulePopup.html
+++ b/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>
Author	SHA1	Message	Date
刘祥超	0d02e3f15a	优化WAF创建规则界面中参数选项显示	2023-01-13 18:51:14 +08:00
刘祥超	bf82f22d0f	WAF规则中如果对比值为空，则显示空字样	2023-01-13 15:58:35 +08:00
刘祥超	e18f182ce6	版本号修改为0.6.3	2023-01-11 15:45:03 +08:00
刘祥超	761c26b587	Update Dockerfile	2023-01-10 21:32:20 +08:00
刘祥超	5e62769dcf	修改版本为0.6.2	2023-01-10 21:17:20 +08:00
刘祥超	86b8a718a0	在Dockerfile中增加local repository提示	2023-01-10 18:31:28 +08:00
刘祥超	a729cfc31d	更新Dockerfile文件	2023-01-10 10:53:48 +08:00
刘祥超	96cfda852a	Dockerfile版本号更新到0.6.0	2023-01-09 20:45:04 +08:00
刘祥超	0423d9246c	更新components.js	2023-01-09 18:12:45 +08:00
刘祥超	985798757f	修复<values-box>组件内容中如果出现数字的显示问题	2023-01-09 18:08:24 +08:00
刘祥超	72876f6749	版本修改为0.6.1	2023-01-09 16:06:13 +08:00