Merge branch 'master' of http://git.dever.cc:3000/dever-package/script

assets/dever/core.js

@@ -388,7 +388,11 @@ var _Dever_Page =
                         $(key).append(c);
                         var l = $(t).find(page).attr('dever-page-link');
                         $(page).attr('dever-page-link', l);
-                        init();
+                        //Dever.Init();
+                        var callback = $(page).attr('dever-page-call');
+                        if (callback) {
+                            eval(callback);
+                        }
                     }
                 });
             }

assets/lib/manage/main.js

@@ -1534,6 +1534,7 @@ function edit()
 		{
 			$(this).bind('dblclick', function()
 			{
+				
 				var col = $(this).attr('data-col');
 				var project = $(this).attr('data-project');
 				var table = $(this).attr('data-table');
@@ -1547,7 +1548,11 @@ function edit()
 					html = html.replace('<!--', '<');
 					html = html.replace('-->', '>');
 				}
-				
+
+
+				if (html == '点此编辑') {
+					html = '';
+				}
 				if(html.indexOf('input') == -1)
 				{
 					if(type && type == 'textarea')
@@ -1559,6 +1564,7 @@ function edit()
 						$(this).html('<input type="text" name="edit" id="edit" value="'+html+'" class="layui-input">');
 					}
 					var self = $(this);
+					self.find("#edit").focus();
 					self.find("#edit").blur(function()
 					{
 						var value = self.find("#edit").val();