Merge remote-tracking branch 'origin/master' into dev-sk

@@ -10,4 +10,6 @@ public class ZkDetailReq extends PageRequest{
 	private String zkValue;
 	
 	private String zkPath;
+	
+	private String zkName;
 }

@@ -9,22 +9,22 @@
 <form class="form-horizontal" id="zkInfoForm" name="zkInfoForm">
 
     <div class="form-group">
-        <label class="col-sm-2 control-label">路径：</label>
+        <label class="col-sm-2 control-label">名称：</label>
         <div class="col-sm-8">
-            <input type="text" class="form-control" id="zkPath" name="zkPath" maxlength="30" size="40" readonly="readonly"/>
+            <input type="text" class="form-control" id="zkName" name="zkName" maxlength="30" size="40" readonly="readonly"/>
         </div>
     </div>
 
     <div class="form-group">
         <label class="col-sm-2 control-label">值：</label>
         <div class="col-sm-8">
-            <textarea name="zkValue" id="zkValue" class="form-control" rows="12" ></textarea>
+            <textarea name="zkValue" id="zkValue" class="form-control" rows="4" ></textarea>
         </div>
     </div>
 </form>
 <script>
 $(function(){
-	$("#zkInfoForm #zkPath").val(paramObj.zkPath);
 	$("#zkInfoForm #zkValue").val(paramObj.zkValue);
+	$("#zkInfoForm #zkName").val(paramObj.zkName);
 })
 </script>
\ No newline at end of file

@@ -129,9 +129,9 @@ function toDetail(rowData,ip){
 	            return defaultLoadFilter(data);
 	        },
 	        columns: [{
-	            title: "路径",
+	            title: "名称",
 	            width:"30%",
-	            field: "zkPath"
+	            field: "zkName"
 	        }, {
 	            title: "值",
 	            field: "zkValue"
@@ -156,6 +156,7 @@ function toDetail(rowData,ip){
 function updateMObject(rowData){
 	paramObj.zkPath = rowData.zkPath;
 	paramObj.zkValue = rowData.zkValue;
+	paramObj.zkName = rowData.zkName;
 	var dialog0 = $("<div>").appendTo($("body"));
 	dialog0.dialog({
 		size : "modal-lg",
@@ -178,7 +179,8 @@ function updateMObject(rowData){
 				$("#zkInfoForm").form("submit", {
 					submitUrl : contextPath + "/zkTree/editDetail.do",
 					submitData : {
-						ip : rowData.ip
+						ip : rowData.ip,
+						zkPath : rowData.zkPath
 					},
 					onBeforeSubmit : function() {