diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp
index 84c294127..ff15630b2 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp
@@ -83,7 +83,6 @@
-
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp
index 7f4c73e08..828bf6cb9 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp
@@ -83,7 +83,6 @@
-
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp
index f111d6be0..0ece44f29 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp
@@ -83,7 +83,6 @@
-
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp
index 0ddcd9705..cb27b1b33 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp
@@ -83,7 +83,6 @@
-
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp
index 7aeed1e77..aba8cf4c3 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp
@@ -86,7 +86,6 @@
-
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
index f693c0e96..9d272d8be 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
@@ -128,7 +128,6 @@
-
@@ -321,7 +320,7 @@
|
|
<%-- |
- --%> |
+ --%> |
|
|
|
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp
index 08b6bde2c..44c67c10a 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp
@@ -83,7 +83,6 @@
-
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp
index d6c97e2f2..7d3a09d9f 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp
@@ -81,7 +81,6 @@
-
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp
index 5667beb2f..7ca8af3a7 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp
@@ -80,7 +80,6 @@
-
diff --git a/src/main/webapp/WEB-INF/views/cfg/appCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/appCfgList.jsp
index 79ee23b2e..6e208accb 100644
--- a/src/main/webapp/WEB-INF/views/cfg/appCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/appCfgList.jsp
@@ -101,7 +101,6 @@
-
diff --git a/src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgList.jsp
index 132878016..3a70020d4 100644
--- a/src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgList.jsp
@@ -121,7 +121,6 @@
-
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp
index afefbedb9..fa82e2334 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp
@@ -289,7 +289,7 @@
|
|
|
- |
+ |
|
|
|
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp
index d8cb5acdd..fd6a2b77c 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp
@@ -281,7 +281,7 @@
|
|
|
- |
+ |
|
|
|
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp
index 21195226f..3754bdf64 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp
@@ -87,7 +87,6 @@
-
@@ -274,7 +273,7 @@
<%-- | --%>
|
|
- |
+ |
|
|
|
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp
index 7aa56fcb1..9360cc261 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp
@@ -289,7 +289,7 @@
|
|
|
- |
+ |
|
|
|
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp
index 94f36b8ac..1520a9e4d 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp
@@ -283,7 +283,7 @@
|
|
|
- |
+ |
|
|
|
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp
index 3c6244040..0cf7b5100 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp
@@ -282,7 +282,7 @@
|
|
|
- |
+ |
|
|
|
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountList.jsp
index 60b5fead7..749c43e13 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountList.jsp
@@ -446,7 +446,6 @@
-
@@ -633,7 +632,7 @@
|
|
|
- |
+ |
|
|
|
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp
index 5f41e3acd..dae5934fa 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp
@@ -458,7 +458,6 @@
-
@@ -646,7 +645,7 @@
|
|
|
- |
+ |
|
|
|
diff --git a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp
index 3ff5df4d5..a240e90ed 100644
--- a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp
@@ -131,7 +131,6 @@
-
@@ -325,7 +324,7 @@
|
<%-- | --%>
<%-- | --%>
- |
+ |
|
|
|
diff --git a/src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp b/src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp
index 14ea32e05..5628d668c 100644
--- a/src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp
@@ -263,7 +263,7 @@
<%-- | --%>
|
|
- |
+ |
|
|
|
diff --git a/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp
index 85f9e6f67..a852f8786 100644
--- a/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp
@@ -145,7 +145,11 @@
-
+
+
+
+
+
@@ -345,7 +349,7 @@
|
|
- |
+ |
|
|
diff --git a/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp
index 110715217..3b6eea6a1 100644
--- a/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp
@@ -92,7 +92,6 @@
-
@@ -285,7 +284,7 @@
<%-- | --%>
|
|
- |
+ |
|
|
|
diff --git a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp
index b73c4f0e6..07a213366 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp
@@ -290,7 +290,7 @@
|
|
|
- |
+ |
|
|
|
diff --git a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp
index c1d3077e6..33cd98ceb 100644
--- a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp
@@ -282,7 +282,7 @@
<%-- | --%>
|
<%-- | --%>
- |
+ |
|
|
|
diff --git a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp
index 074a8f8c8..b22f7b45e 100644
--- a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp
@@ -131,7 +131,6 @@
-
@@ -325,7 +324,7 @@
|
|
<%-- | --%>
- |
+ |
|
|
|
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp
index 2a1c98ff9..9e51d3536 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp
@@ -123,7 +123,6 @@
-
@@ -311,7 +310,7 @@
|
|
|
- |
+ |
|
|
|
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp
index 2fce03f61..f41c3d260 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp
@@ -125,7 +125,6 @@
-
@@ -313,7 +312,7 @@
|
|
|
- |
+ |
|
|
|
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp
index 67c4c60fa..212d8c044 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp
@@ -121,7 +121,6 @@
-
@@ -304,7 +303,7 @@
|
|
|
- |
+ |
|
|
|
diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
index cee0890c2..447163f3e 100644
--- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
@@ -128,7 +128,6 @@
-
@@ -323,7 +322,7 @@
|
|
- |
+ |
<%-- | --%>
|
|
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp
index 6b31f5f42..6efdd9639 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp
@@ -89,7 +89,6 @@
-
@@ -287,7 +286,7 @@
|
|
|
- |
+ |
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
index c9e88fed9..0ffd04076 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
@@ -121,7 +121,6 @@
-
@@ -133,10 +132,6 @@
- <%--
-
-
- --%>
@@ -308,7 +303,7 @@
|
|
|
- |
+ |
|
|
|
diff --git a/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp b/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp
index 5f3214a09..1dc574b55 100644
--- a/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp
@@ -122,7 +122,6 @@
-
@@ -309,7 +308,7 @@
|
|
|
- |
+ |
|
|
|
diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp
index 5a84e6843..a54e8c5fc 100644
--- a/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp
@@ -266,7 +266,7 @@
|
|
|
- |
+ |
|
|
|
diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp
index 8a33a61d6..965f2736a 100644
--- a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp
@@ -268,7 +268,7 @@
| --%>
|
|
- |
+ |
|
|
|
diff --git a/src/main/webapp/WEB-INF/views/cfg/multipleCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/multipleCfgList.jsp
index 81cf2ea38..5ad894e0a 100644
--- a/src/main/webapp/WEB-INF/views/cfg/multipleCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/multipleCfgList.jsp
@@ -114,7 +114,6 @@
-
@@ -381,7 +380,7 @@
<%--遍历子表属性 --%>
-
|
+ |
|
|
|
diff --git a/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp b/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp
index 2f1c6751b..ed8b9064e 100644
--- a/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp
@@ -123,7 +123,6 @@
-
@@ -311,7 +310,7 @@
|
|
|
- |
+ |
|
|
|
diff --git a/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp b/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp
index ed899aeb5..912ca138b 100644
--- a/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp
@@ -123,7 +123,6 @@
-
@@ -310,7 +309,7 @@
|
|
|
- |
+ |
|
|
|
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp
index ad823de4f..b29dfee8d 100644
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp
@@ -311,7 +311,6 @@
-
@@ -505,7 +504,7 @@
|
|
|
- |
+ |
|
|
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp
index c1bb86ff3..18414d12c 100644
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp
@@ -262,7 +262,7 @@
|
|
|
- |
+ |
|
|
|
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp
index 0eee8ba96..171ddb21d 100644
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp
@@ -263,7 +263,7 @@
|
|
|
- |
+ |
|
|
|
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/list.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/list.jsp
index 21a80ec89..14e954e75 100644
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/list.jsp
@@ -86,7 +86,6 @@
-
diff --git a/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
index d8bc62a22..5d43fb58b 100644
--- a/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
@@ -91,7 +91,6 @@
-
@@ -267,7 +266,7 @@
<%-- | --%>
|
|
- |
+ |
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp
index ddc5c2c69..cfd8418fc 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp
@@ -121,7 +121,6 @@
-
@@ -309,7 +308,7 @@
|
|
|
- |
+ |
|
|
|
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp
index 549ea9c4f..ade307040 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp
@@ -279,7 +279,6 @@
-
@@ -466,7 +465,7 @@
|
|
|
- |
+ |
|
|
|
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp
index 2a502b11e..1bbba778a 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp
@@ -121,7 +121,6 @@
-
@@ -308,7 +307,7 @@
|
|
|
- |
+ |
|
|
|
diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp
index 4214397e6..532aeefd2 100644
--- a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp
@@ -121,7 +121,6 @@
-
@@ -308,7 +307,7 @@
|
|
|
- |
+ |
<%-- |
|
|
diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp
index 2d47bd7b3..3451c6cd6 100644
--- a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp
@@ -121,7 +121,6 @@
-
@@ -308,7 +307,7 @@
|
|
|
- |
+ |
<%-- |
|
|
diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js
index 670352f50..b72883542 100644
--- a/src/main/webapp/static/global/scripts/common.js
+++ b/src/main/webapp/static/global/scripts/common.js
@@ -264,13 +264,16 @@ $(function(){
areaControlInit();
/*=====关键字与表达式处理 开始=====*/
var tagsInputSettings="#tags";
+ var options;
$("input[name$='cfgKeywords']").each(function(){
var tagsId = $(this).attr("id");
var objNamePrefix = $(this).attr("name").split("cfgKeywords")[0];
var isTags = $(this).hasClass("tags");//有tags样式的关键字输入框才需处理
if(typeof(tagsId)!=='undefined' && tagsId.indexOf("tags_")!=-1 && isTags){
- if($("input:radio[name='"+objNamePrefix+"exprType']").val()==1){
- $("select[name='"+objNamePrefix+"matchMethod']").find("option[value!=0]").attr("disabled",true);
+ if($("input:radio[name='"+objNamePrefix+"exprType']").val()==0){
+ //$("select[name='"+objNamePrefix+"matchMethod']").find("option[value!=0]").attr("disabled",true);
+ options = $("select[name='"+objNamePrefix+"matchMethod']").find("option[value!=0]").clone();
+ $("select[name='"+objNamePrefix+"matchMethod']").find("option[value!=0]").remove();
}
//表单中如果有关键字内容可能输入多个关键字的情况,根据输入关键字个数确定表达式选中情况,不允许手动选中
$("input:radio[name='"+objNamePrefix+"exprType']").attr("disabled",true);
@@ -296,7 +299,7 @@ $(function(){
keywordValue = keywordValue+"***iie***"+$(this).find("span").text().trim();
});
$(this).prev("input[name$='cfgKeywords']").val(keywordValue);*/
- exprTypeChecked(objNamePrefix,size);
+ exprTypeChecked(objNamePrefix,size,options);
},
onRemoveTag:function(tag,size){
$(this).parents(".col-md-6").next("div").html("");
@@ -306,7 +309,7 @@ $(function(){
keywordValue = keywordValue+"***iie***"+$(this).find("span").text().trim();
});
$(this).prev("input[name$='cfgKeywords']").val(keywordValue);*/
- exprTypeChecked(objNamePrefix,size);
+ exprTypeChecked(objNamePrefix,size,options);
}
});
$(".tagsinput").popover({
@@ -1417,17 +1420,20 @@ function isLicit(str,regStr) {//判断是否为合格字符 //s 包括空格回
//var re = "^[_0-9a-zA-Z\.@]*$";
return re.test(str);
}
-function exprTypeChecked(objNamePrefix,size){
+function exprTypeChecked(objNamePrefix,size,options){
if(size>1) {
+ // 与表达式
$("input:radio[name='"+objNamePrefix+"exprType'][value=1]").prop("checked",true); //选中是
+ $("select[name='"+objNamePrefix+"matchMethod']").append(options);
$("select[name='"+objNamePrefix+"matchMethod']").find("option").removeAttr("selected",false);
$("select[name='"+objNamePrefix+"matchMethod']").find("option[value=0]").attr("selected",true);
- $("select[name='"+objNamePrefix+"matchMethod']").find("option[value!=0]").attr("disabled",true);
$("select[name='"+objNamePrefix+"matchMethod']").selectpicker("refresh");
}else {
+ // 无表达式
$("input:radio[name='"+objNamePrefix+"exprType'][value=0]").prop("checked",true); //选中否
- $("select[name='"+objNamePrefix+"matchMethod']").find("option").removeAttr("disabled");
+ $("select[name='"+objNamePrefix+"matchMethod']").find("option[value!=0]").remove();
$("select[name='"+objNamePrefix+"matchMethod']").selectpicker("refresh");
+
}
}
function validateDataIsLicit(){