From c0ad74ab7beead16c1deb6123439eab3c746e9c6 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, 7 Dec 2023 20:24:26 +0800
Subject: [PATCH] =?UTF-8?q?WAF=E6=93=8D=E4=BD=9C=E7=AC=A6=E5=AF=B9?=
 =?UTF-8?q?=E5=BA=94=E7=9A=84=E5=AF=B9=E6=AF=94=E5=80=BC=E5=8F=AF=E4=BB=A5?=
 =?UTF-8?q?=E4=B8=8D=E5=A1=AB=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../server/http-firewall-rule-label.js           | 16 ++++++++++++++--
 .../components/server/http-firewall-rules-box.js | 16 ++++++++++++++--
 .../servers/components/waf/createRulePopup.html  |  2 +-
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/web/public/js/components/server/http-firewall-rule-label.js b/web/public/js/components/server/http-firewall-rule-label.js
index 3d704760..b72e1b8d 100644
--- a/web/public/js/components/server/http-firewall-rule-label.js
+++ b/web/public/js/components/server/http-firewall-rule-label.js
@@ -11,7 +11,7 @@ Vue.component("http-firewall-rule-label", {
 			teaweb.popupTip("规则校验错误，请修正：<span class=\"red\">"  + teaweb.encodeHTML(err) + "</span>")
 		},
 		operatorName: function (operatorCode) {
-			var operatorName = operatorCode
+			let operatorName = operatorCode
 			if (typeof (window.WAF_RULE_OPERATORS) != null) {
 				window.WAF_RULE_OPERATORS.forEach(function (v) {
 					if (v.code == operatorCode) {
@@ -22,6 +22,18 @@ Vue.component("http-firewall-rule-label", {
 
 			return operatorName
 		},
+		operatorDataType: function (operatorCode) {
+			let operatorDataType = "none"
+			if (typeof (window.WAF_RULE_OPERATORS) != null) {
+				window.WAF_RULE_OPERATORS.forEach(function (v) {
+					if (v.code == operatorCode) {
+						operatorDataType = v.dataType
+					}
+				})
+			}
+
+			return operatorDataType
+		},
 		isEmptyString: function (v) {
 			return typeof v == "string" && v.length == 0
 		}
@@ -45,7 +57,7 @@ Vue.component("http-firewall-rule-label", {
 			<span v-if="rule.paramFilters != null && rule.paramFilters.length > 0" v-for="paramFilter in rule.paramFilters"> | {{paramFilter.code}}</span> 
 		<span :class="{dash:!rule.isComposed && rule.isCaseInsensitive}" :title="(!rule.isComposed && 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 v-else-if="operatorDataType(rule.operator) != 'none'" class="disabled" style="font-weight: normal" title="空字符串">[空]</span>
 		</span>
 		
 		<!-- description -->
diff --git a/web/public/js/components/server/http-firewall-rules-box.js b/web/public/js/components/server/http-firewall-rules-box.js
index dad072cb..53b2366c 100644
--- a/web/public/js/components/server/http-firewall-rules-box.js
+++ b/web/public/js/components/server/http-firewall-rules-box.js
@@ -37,7 +37,7 @@ Vue.component("http-firewall-rules-box", {
 			})
 		},
 		operatorName: function (operatorCode) {
-			var operatorName = operatorCode
+			let operatorName = operatorCode
 			if (typeof (window.WAF_RULE_OPERATORS) != null) {
 				window.WAF_RULE_OPERATORS.forEach(function (v) {
 					if (v.code == operatorCode) {
@@ -48,6 +48,18 @@ Vue.component("http-firewall-rules-box", {
 
 			return operatorName
 		},
+		operatorDataType: function (operatorCode) {
+			let operatorDataType = "none"
+			if (typeof (window.WAF_RULE_OPERATORS) != null) {
+				window.WAF_RULE_OPERATORS.forEach(function (v) {
+					if (v.code == operatorCode) {
+						operatorDataType = v.dataType
+					}
+				})
+			}
+
+			return operatorDataType
+		},
 		isEmptyString: function (v) {
 			return typeof v == "string" && v.length == 0
 		}
@@ -72,7 +84,7 @@ Vue.component("http-firewall-rules-box", {
 				<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.isComposed && rule.isCaseInsensitive)}" :title="(!rule.isComposed && 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 v-else-if="operatorDataType(rule.operator) != 'none'" class="disabled" style="font-weight: normal" title="空字符串">[空]</span>
 				</span>
 				
 				<!-- description -->
diff --git a/web/views/@default/servers/components/waf/createRulePopup.html b/web/views/@default/servers/components/waf/createRulePopup.html
index a824807a..fe9a4daf 100644
--- a/web/views/@default/servers/components/waf/createRulePopup.html
+++ b/web/views/@default/servers/components/waf/createRulePopup.html
@@ -89,7 +89,7 @@
                 <p class="comment" v-if="operator != null" v-html="operator.description"></p>
             </td>
         </tr>
-        <tr>
+        <tr v-show="operator != null && operator.dataType != 'none'">
             <td>
                 <span v-if="operator != null && operator.dataType == 'regexp'">匹配正则表达式</span>
                 <span v-else-if="operator != null && operator.dataType == 'wildcard'">匹配单个通配符</span>