From d7ef7ad26fb48930caa1609d6b445af069e94fb8 Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@intranet.com>
Date: Mon, 30 Jul 2018 15:33:27 +0800
Subject: [PATCH] =?UTF-8?q?choose=20menu=E4=B8=AD=E9=97=B4=20=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=8A=E7=A9=BA=E6=A0=BC=20WdatePicker=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E5=9B=BD=E5=AE=B6=E5=8C=96=E4=B8=BAen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/tags/sys/treeselect.tag             | 2 +-
 .../static/global/plugins/My97DatePicker/WdatePicker.js     | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/WEB-INF/tags/sys/treeselect.tag b/src/main/webapp/WEB-INF/tags/sys/treeselect.tag
index 3717ad1a0..4072e43c7 100644
--- a/src/main/webapp/WEB-INF/tags/sys/treeselect.tag
+++ b/src/main/webapp/WEB-INF/tags/sys/treeselect.tag
@@ -45,7 +45,7 @@
 			return true;
 		}
 		// 正常打开	
-		top.$.jBox.open("iframe:${ctx}/tag/treeselect?url="+encodeURIComponent("${url}")+"&selectIds="+$("#${id}Id").val()+"&module=${module}&checked=${checked}&extId=${extId}&isAll=${isAll}", "<spring:message code='choose'/><spring:message code='${title}'/>", 320, 420, {
+		top.$.jBox.open("iframe:${ctx}/tag/treeselect?url="+encodeURIComponent("${url}")+"&selectIds="+$("#${id}Id").val()+"&module=${module}&checked=${checked}&extId=${extId}&isAll=${isAll}", "<spring:message code='choose'/> <spring:message code='${title}'/>", 320, 420, {
 			ajaxData:{selectIds: $("#${id}Id").val()},buttons:{"<spring:message code='ok'/>":"ok", "<spring:message code='clear'/>":"clear","<spring:message code='close'/>":true}, submit:function(v, h, f){
 				if (v=="ok"){
 					var tree = h.find("iframe")[0].contentWindow.tree;//h.find("iframe").contents();
diff --git a/src/main/webapp/static/global/plugins/My97DatePicker/WdatePicker.js b/src/main/webapp/static/global/plugins/My97DatePicker/WdatePicker.js
index 687bb408f..9298422e9 100644
--- a/src/main/webapp/static/global/plugins/My97DatePicker/WdatePicker.js
+++ b/src/main/webapp/static/global/plugins/My97DatePicker/WdatePicker.js
@@ -3,7 +3,9 @@
  * License: http://www.my97.net/dp/license.asp
  */
 var $dp,WdatePicker;(function(){var $={
-$langList:[{name:"en",charset:"UTF-8"},{name:"zh-cn",charset:"UTF-8"},{name:"zh-tw",charset:"UTF-8"}],
+$langList:[{name:"en",charset:"UTF-8"},
+           {name:"zh-cn",charset:"UTF-8"},
+           {name:"zh-tw",charset:"UTF-8"}],
 $skinList:[
 	{name:"default",charset:"gb2312"},
 	{name:"whyGreen",charset:"gb2312"},
@@ -18,7 +20,7 @@ enableInputMask:true,
 autoUpdateOnChanged:null,
 weekMethod:"ISO8601",
 position:{},
-lang:"auto",
+lang:"en",
 skin:"twoer",
 dateFmt:"yyyy-MM-dd",
 realDateFmt:"yyyy-MM-dd",