From c2d024a352fba95c66daf3444fc3429f06aae5a0 Mon Sep 17 00:00:00 2001 From: wangxin Date: Thu, 16 Aug 2018 11:20:43 +0800 Subject: [PATCH 01/60] =?UTF-8?q?(1)app=E7=89=B9=E5=BE=81=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=EF=BC=8C=E5=9F=BA=E7=A1=80=E5=8D=8F=E8=AE=AE=EF=BC=8C?= =?UTF-8?q?=E5=8A=A0=E5=AF=86=E9=9A=A7=E9=81=93=E8=A1=8C=E4=B8=BAtree?= =?UTF-8?q?=E6=A0=B9=E8=8A=82=E7=82=B9=E6=B7=BB=E5=8A=A0tittle=20(2)?= =?UTF-8?q?=E7=89=B9=E5=AE=9A=E6=9C=8D=E5=8A=A1=E8=A1=A8=E5=8D=95=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E4=BD=8D=E7=BD=AE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webapp/WEB-INF/tags/sys/treeselect.tag | 1 - .../WEB-INF/views/cfg/app/appByteCfgForm.jsp | 1 + .../views/cfg/app/appDomainCfgForm.jsp | 1 + .../WEB-INF/views/cfg/app/appHttpCfgForm.jsp | 1 + .../WEB-INF/views/cfg/app/appIpCfgForm.jsp | 1 + .../views/cfg/app/appPolicyCfgForm.jsp | 1 + .../WEB-INF/views/cfg/basicprotocol/form.jsp | 1 + .../views/cfg/encryptedtunnelbehav/form.jsp | 1 + .../views/specific/specificServiceCfgForm.jsp | 26 +++++++------------ 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/main/webapp/WEB-INF/tags/sys/treeselect.tag b/src/main/webapp/WEB-INF/tags/sys/treeselect.tag index e2520f1d6..2fc704fb5 100644 --- a/src/main/webapp/WEB-INF/tags/sys/treeselect.tag +++ b/src/main/webapp/WEB-INF/tags/sys/treeselect.tag @@ -26,7 +26,6 @@ <%@ attribute name="showParentName" type="java.lang.String" required="false" description="显示父类名称"%> <%@ attribute name="checkedPS" type="java.lang.String" required="false" description="复选框选中时是否关联父子节点，ps关联父子，p关联父，s关联子,都不关联为空"%> <%@ attribute name="unCheckedPS" type="java.lang.String" required="false" description="复选框取消选中时是否关联父子节点，ps关联父子，p关联父，s关联子,都不关联为空"%> -<%@ attribute name="rootNodeName" type="java.lang.String" required="false" description="根节点显示的名称"%>
+
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp index 8e82f408c..5c229ec28 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp @@ -101,6 +101,7 @@ $(function(){
+
+
+
+
+
"); - if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){ - error.appendTo(element.parent().parent()); - } else { - error.insertAfter(element); - } + $(element).parents(".form-group").find("div[for='"+element.attr("name")+"']").append(error); } }); //if("${specificServiceCfg.parentType}"){ @@ -87,10 +82,6 @@ $(this).find("[name='parent.specServiceId']").removeAttr("name"); $(this).find("[name='parent.specServiceName']").removeAttr("name"); } - if($(this).attr("cfgType")==3){ - $(this).find("input").unbind("click"); - $(this).find("a").unbind("click"); - } }); $(".protocol_code").html('*:'); $(".protocol_name").html('*:'); @@ -102,9 +93,6 @@ $(this).find("[name='parent.specServiceId']").removeAttr("name"); $(this).find("[name='parent.specServiceName']").removeAttr("name"); } - if($(this).attr("cfgType")==3){ - $(this).find("input").unbind("click"); - } }); if($("[name='cfgType']").val()==1){ $(".protocol_code").html('*:'); @@ -127,8 +115,9 @@ if($(this).attr("cfgType")==cfgType){ $(this).removeClass("hidden"); $("#specificServiceCfg"+cfgType+"Id").attr("name","parent.specServiceId"); + $("#specificServiceCfg"+cfgType+"Name").attr("name","parent.specServiceName"); }else{ - $(this).addClass("hidden").addClass("disable"); + $(this).addClass("hidden"); $(this).find("[name='parent.specServiceId']").removeAttr("name"); $(this).find("[name='parent.specServiceName']").removeAttr("name"); } @@ -199,13 +188,14 @@
+ url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${dict.itemCode}" extId="${specificServiceCfg.specServiceId}" cssClass="required form-control"/> + title="${dict.itemValue}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${dict.itemCode}" extId="${specificServiceCfg.specServiceId}" cssClass="required form-control"/>
+
@@ -213,18 +203,21 @@
+
+
+
<%--
@@ -249,6 +242,7 @@
+
From 67aa6d985dfa25aba03c38fba62373dfd19d5b85 Mon Sep 17 00:00:00 2001 From: wangxin Date: Thu, 16 Aug 2018 12:53:46 +0800 Subject: [PATCH 02/60] =?UTF-8?q?=E4=BF=AE=E6=AD=A3tagtree=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E6=97=B6=EF=BC=8C=E6=A0=91=E9=BB=98=E8=AE=A4value?= =?UTF-8?q?=E5=9C=A8clear=E7=9A=84=E6=97=B6=E5=80=99=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E4=B8=BAplaceholder=E7=9A=84=E5=B1=95=E7=A4=BAbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/tags/sys/treeselect.tag | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/webapp/WEB-INF/tags/sys/treeselect.tag b/src/main/webapp/WEB-INF/tags/sys/treeselect.tag index 2fc704fb5..bc47cf5ed 100644 --- a/src/main/webapp/WEB-INF/tags/sys/treeselect.tag +++ b/src/main/webapp/WEB-INF/tags/sys/treeselect.tag @@ -112,11 +112,17 @@ //} $("#${id}Id").change();//手动触发change事件，使Id的值得变化可以被监听到 $("#${id}Name").val(names.join(",")); + if(!$("#${id}Name").val()&&'${value}'){//如果值不存在，但是value却有值，将placeholder清空 + $("#${id}Name").attr("placeholder",""); + } }else if (v == "clear"){ $("#${id}Id").val(""); //$("#${id}Id").removeAttr('cfgtype'); $("#${id}Id").change();//手动触发change事件，使Id的值得变化可以被监听到 $("#${id}Name").val(""); + if('${value}'){//如果值不存在，但是value却有值，将placeholder清空 + $("#${id}Name").attr("placeholder",""); + } } if(typeof ${id}TreeselectCallBack == 'function'){ ${id}TreeselectCallBack(v, h, f); From c08b57a4145cb3b261b198e4654afa7320e63888 Mon Sep 17 00:00:00 2001 From: duandongmei Date: Thu, 16 Aug 2018 14:24:39 +0800 Subject: [PATCH 03/60] =?UTF-8?q?ip=5Fmultiplex=5Fpolicy=3DIP\u590D\u7528\?= =?UTF-8?q?u7B56\u7565=20target=5Fip=5Fprotect=3D\u6297DDOS\u653B\u51FB=20?= =?UTF-8?q?ip=5Fmultiplex=5Fpool=5Fconfig=3DIP\u590D\u7528\u5730\u5740\u6C?= =?UTF-8?q?60=20letter=3D\u61D2\u6C49=20=E5=9B=BD=E9=99=85=E5=8C=96?= =?UTF-8?q?=E4=B8=AD=E6=96=87=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/messages/message_zh_CN.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 4b50bdeee..27bb7b07f 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -983,10 +983,10 @@ src_ip_report=\u5883\u5185\u6E90IP\u62A5\u8868 dest_ip_report=\u76EE\u7684\u56FD\u5BB6IP\u62A5\u8868 isp_report=\u8FD0\u8425\u5546\u5C40\u70B9\u62A5\u8868 #=============about report=================== -ip_multiplex_policy=IP Reuse Policy -target_ip_protect=Anti DDOS -ip_multiplex_pool_config=IP Reuse Addr Pool -letter=Official Letter +ip_multiplex_policy=IP\u590D\u7528\u7B56\u7565 +target_ip_protect=\u6297DDOS\u653B\u51FB +ip_multiplex_pool_config=IP\u590D\u7528\u5730\u5740\u6C60 +letter=\u61D2\u6C49 show_more=\u5C55\u793A\u66F4\u591A #===============dashboard begin=================================== dashboard=\u7EDF\u8BA1\u56FE\u8868 From ba6460a475bfa0673ba02779841f6a8f829d6d8d Mon Sep 17 00:00:00 2001 From: wangxin Date: Thu, 16 Aug 2018 14:34:14 +0800 Subject: [PATCH 04/60] =?UTF-8?q?=E7=89=B9=E5=AE=9A=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=97=B6=E6=98=AF=E5=90=A6=E5=8F=B6=E5=AD=90?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E6=94=BE=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp index 0e729150d..1354a18e7 100644 --- a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp @@ -219,7 +219,7 @@
- <%--
+
@@ -228,7 +228,7 @@
-
--%> +
<%--
From 9450df24b5214d62219c5843ade871c64801e05a Mon Sep 17 00:00:00 2001 From: duandongmei Date: Thu, 16 Aug 2018 15:13:18 +0800 Subject: [PATCH 05/60] =?UTF-8?q?=E6=89=80=E6=9C=89=E5=AD=97=E7=AC=A6?= =?UTF-8?q?=E4=B8=B2=E5=9F=9F=E6=96=B0=E5=A2=9E=E6=97=B6=EF=BC=8C=E6=96=B9?= =?UTF-8?q?=E4=BE=BF=E7=94=A8=E6=88=B7=E7=90=86=E8=A7=A3HEX=E5=92=8CCase-s?= =?UTF-8?q?enstive=20=E5=B0=86=E2=80=9C=E6=98=AF=E5=90=A6hex=E4=BA=8C?= =?UTF-8?q?=E8=BF=9B=E5=88=B6=E2=80=9D=E5=B1=9E=E6=80=A7=E9=9A=90=E8=97=8F?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6=E4=BA=8C=E8=BF=9B?= =?UTF-8?q?=E5=88=B6=E5=92=8C=E6=98=AF=E5=90=A6=E5=A4=A7=E5=B0=8F=E5=86=99?= =?UTF-8?q?=E6=95=8F=E6=84=9F=E4=B8=A4=E4=B8=AA=E9=80=89=E9=A1=B9=EF=BC=8C?= =?UTF-8?q?common.js=E4=B8=AD=E6=A0=B9=E6=8D=AE=E7=95=8C=E9=9D=A2=E4=B8=A4?= =?UTF-8?q?=E4=B8=AA=E9=80=89=E9=A1=B9=EF=BC=8C=E8=87=AA=E5=8A=A8=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E9=9A=90=E8=97=8F=E7=9A=84=E2=80=9C=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E4=BA=8C=E8=BF=9B=E5=88=B6=E2=80=9C=E5=B1=9E=E6=80=A7=E7=9A=84?= =?UTF-8?q?=E5=80=BC=E3=80=90=E6=B3=A8=EF=BC=9A=E5=8D=81=E5=85=AD=E8=BF=9B?= =?UTF-8?q?=E5=88=B6=E6=97=B6=EF=BC=8C=E5=A4=A7=E5=B0=8F=E5=86=99=E6=95=8F?= =?UTF-8?q?=E6=84=9F=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 其他后期新增的界面，也需要这样处理 --- .../resources/messages/message_en.properties | 8 +- .../messages/message_zh_CN.properties | 8 +- .../WEB-INF/include/form/stringInfo.jsp | 71 +++++++++++++---- .../views/cfg/app/appDomainCfgForm.jsp | 79 ++++++++++++++----- .../WEB-INF/views/cfg/app/appHttpCfgForm.jsp | 44 +++++++++++ .../WEB-INF/views/cfg/common/domainForm.jsp | 75 ++++++++++++++---- .../WEB-INF/views/cfg/complexCfgForm.jsp | 40 ++++++++++ .../WEB-INF/views/cfg/stringCfgForm.jsp | 40 ++++++++++ .../webapp/static/global/scripts/common.js | 45 +++++++++++ 9 files changed, 360 insertions(+), 50 deletions(-) diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index b9dbebbab..749ea017d 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1043,4 +1043,10 @@ app_desc=Application Description tunnel_code=Tunnel Behavior No tunnel_name=Tunnel Behavior Name tunnel_desc=Tunnel Behavior Description -call_external_procedures_failed=Call external procedures failed \ No newline at end of file +call_external_procedures_failed=Call external procedures failed +is_hex=Is HEX +is_case_insenstive=Is Case-senstive +case_senstive=Case-senstive +case_insenstive=Case-insenstive +hex=Hex +not_hex=Not HEX \ No newline at end of file diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 27bb7b07f..8c7107a74 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1043,4 +1043,10 @@ app_desc=\u793E\u4EA4\u5E94\u7528\u63CF\u8FF0 tunnel_code=\u52A0\u5BC6\u96A7\u9053\u884C\u4E3A\u5E8F\u53F7 tunnel_name=\u52A0\u5BC6\u96A7\u9053\u884C\u4E3A\u540D\u79F0 tunnel_desc=\u52A0\u5BC6\u96A7\u9053\u884C\u4E3A\u63CF\u8FF0 -call_external_procedures_failed=\u8C03\u7528\u5916\u90E8\u7A0B\u5E8F\u51FA\u9519 \ No newline at end of file +call_external_procedures_failed=\u8C03\u7528\u5916\u90E8\u7A0B\u5E8F\u51FA\u9519 +is_hex=\u662F\u5426\u5341\u516D\u8FDB\u5236 +is_case_insenstive=\u662F\u5426\u5927\u5C0F\u5199\u654F\u611F +case_senstive=\u5927\u5C0F\u5199\u654F\u611F +case_insenstive=\u5927\u5C0F\u5199\u4E0D\u654F\u611F +hex=\u5341\u516D\u8FDB\u5236 +not_hex=\u975E\u5341\u516D\u8FDB\u5236 diff --git a/src/main/webapp/WEB-INF/include/form/stringInfo.jsp b/src/main/webapp/WEB-INF/include/form/stringInfo.jsp index 38cf7c87b..bf3c6b0de 100644 --- a/src/main/webapp/WEB-INF/include/form/stringInfo.jsp +++ b/src/main/webapp/WEB-INF/include/form/stringInfo.jsp @@ -15,21 +15,6 @@
-
- -
- -
-
-
-
-
-
-
@@ -47,6 +32,8 @@
+
+
@@ -60,6 +47,60 @@
+
+
+ +
+ + +
+
+
+
+ +
+
+
+
+ +
+ + +
+
+
+
+
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp index 2bc1a5535..0fa08d859 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp @@ -152,24 +152,6 @@ $(function(){
-
-
- -
- -
-
-
-
-
-
-
+
+
+ +
+ + +
+
+
+
+ +
+
+ +
+
+ +
+ + +
+
+
+
+ +
+
+
+ <%-- <%@include file="/WEB-INF/include/form/areaInfo.jsp" %> --%> diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp index 5c229ec28..8a0a63e1a 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp @@ -229,6 +229,49 @@ $(function(){
+
+
+ +
+ + +
+
+
+
+ +
+
+ +
+
+ +
+ + +
+
+
+
+ +
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/common/domainForm.jsp b/src/main/webapp/WEB-INF/views/cfg/common/domainForm.jsp index 938565b01..ce533d4c3 100644 --- a/src/main/webapp/WEB-INF/views/cfg/common/domainForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/common/domainForm.jsp @@ -162,21 +162,6 @@
-
- -
- -
-
-
-
-
-
-
@@ -194,6 +179,9 @@
+
+
+
@@ -211,6 +199,63 @@
+
+
+ +
+ + +
+
+
+
+ +
+
+ +
+
+ +
+ + +
+
+
+
+ +
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp index 4039242f0..3175e1b12 100644 --- a/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp @@ -93,6 +93,46 @@
+ +
+
+ +
+ + +
+
+
+
+
+
+ +
+ + +
+
+
+
+ +
+