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("规则校验错误,请修正:" + teaweb.encodeHTML(err) + "") }, 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", { | {{paramFilter.code}} {{operatorName(rule.operator)}} {{rule.value}} - [空] + [空] 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", { | {{paramFilter.code}} {{operatorName(rule.operator)}} {{rule.value}} - [空] + [空] 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 @@

- + 匹配正则表达式 匹配单个通配符