From 67aa6d985dfa25aba03c38fba62373dfd19d5b85 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Thu, 16 Aug 2018 12:53:46 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=AD=A3tagtree=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=A0=91=E9=BB=98=E8=AE=A4value=E5=9C=A8clea?=
 =?UTF-8?q?r=E7=9A=84=E6=97=B6=E5=80=99=E5=B1=95=E7=A4=BA=E4=B8=BAplacehol?=
 =?UTF-8?q?der=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 <duandongmei@intranet.com>
Date: Thu, 16 Aug 2018 14:24:39 +0800
Subject: [PATCH 2/2] =?UTF-8?q?ip=5Fmultiplex=5Fpolicy=3DIP\u590D\u7528\u7?=
 =?UTF-8?q?B56\u7565=20target=5Fip=5Fprotect=3D\u6297DDOS\u653B\u51FB=20ip?=
 =?UTF-8?q?=5Fmultiplex=5Fpool=5Fconfig=3DIP\u590D\u7528\u5730\u5740\u6C60?=
 =?UTF-8?q?=20letter=3D\u61D2\u6C49=20=E5=9B=BD=E9=99=85=E5=8C=96=E4=B8=AD?=
 =?UTF-8?q?=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