edit

assets/moltran/html/inc/head.html

@@ -22,7 +22,7 @@
 <link rel="stylesheet" type="text/css" href="../css/responsive.css" />
 <link rel="stylesheet" type="text/css" href="../public/pjax/nprogress.css" />
 <!-- Responsive-table -->
-<!--link rel="stylesheet" type="text/css" href="../public/table/rwd-table.min.css" -->
+<link rel="stylesheet" type="text/css" href="../public/table/rwd-table.min.css">
 
 <!--
 <link rel="stylesheet" href="../public/kindeditor/themes/default/default.css" />

assets/moltran/html/inc/script.html

@@ -41,7 +41,7 @@
 <script type="text/javascript" src="../public/highlight/highlight.min.js"></script>
 
 <!-- 加载主要js，很乱，后续优化 -->
-<script type="text/javascript" src="../public/main.js?v1"></script>
+<script type="text/javascript" src="../public/main.js?v2"></script>
 
 <!-- 加载一些模板自带效果 -->
 <script>
@@ -59,13 +59,13 @@
 <script type="text/javascript" src="../js/waves.js"></script> 
 <script type="text/javascript" src="../js/wow.min.js"></script> 
 <script type="text/javascript" src="../js/jquery.app.js"></script> 
-<!--script type="text/javascript" src="../public/table/rwd-table.min.js"></script--> 
+<script type="text/javascript" src="../public/table/rwd-table.min.js"></script>
 
 <script type="text/javascript" src="../public/jquery/ui.min.js"></script>
 
 
 <!-- 加载valid -->
-<script type="text/javascript" src="../public/valid/jquery.validationEngine.min.js"></script>
+<script type="text/javascript" src="../public/valid/jquery.validationEngine.min.js?v1"></script>
 
 <!-- 加载文本编辑器 -->
 <script type="text/javascript" src="../public/simditor/scripts/module.min.js"></script>

assets/moltran/html/list.html

@@ -50,6 +50,8 @@
 {
     position:inherit;
     margin-top:20px;
+    overflow-x: auto;
+    overflow-y: hidden;
 }
 </style>
 <style id="addstyle">

assets/public/main.js

@@ -3,6 +3,7 @@
 var editors = [];
 var tables = [];
 var select = '';
+var submitButton = '';
 $(document).ready(function()
 {
 	//init();
@@ -41,7 +42,7 @@ function initMenu()
 			$(this).unbind('click').bind('click', function()
 			{
 				if ($(this).index() == i) {
-					return;
+					//return;
 				}
 				$('.list-unstyled .active').each(function()
 				{
@@ -118,10 +119,12 @@ function setOption(e, id)
 
 function table()
 {
-	$('.table-responsive[data-pattern]').each(function()
-	{
-		//$(this).responsiveTable('update');
-	});
+	if ($('.table-responsive').length) {
+		$('.table-responsive[data-pattern]').each(function()
+		{
+			$(this).responsiveTable('update');
+		});
+	}
 }
 
 function pjax(param)
@@ -291,14 +294,29 @@ function submit()
 {
 	if($(".save-data").length)
 	{
+		if (submitButton) {
+			$(".save-data").each(function()
+			{
+				$(this).html(submitButton);
+			})
+		}
+		
 		$(".save-data").unbind('click').bind('click', function()
 		{
+			submitButton = $(this).html();
+			$(this).html('loading...');
+			$(this).unbind('click');
 			submit_action();
-			//$(this).unbind('click');
 		})
 	}
 }
 
+//直接提交更新页的数据
+function submit_action()
+{
+	$(".form1").submit();
+}
+
 //设置某一个input的值
 function set_update(id, value)
 {
@@ -328,12 +346,6 @@ function copy_data(e)
 	});
 }
 
-//直接提交更新页的数据
-function submit_action()
-{
-	$(".form1").submit();
-}
-
 //头部菜单
 function topMenu(e)
 {
@@ -731,8 +743,8 @@ function msg(value)
 	var url = '';
 	if(value.data != 'reload' && value.status == 2)
 	{
-		//showAlert(value.msg);
-		alert(value.data);
+		showAlert(value.msg, false, '错误提示');
+		//alert(value.data);
 		//location.reload();
 		return;
 	}
@@ -1270,13 +1282,16 @@ function updateMsg(id)
 	$("#"+id).submit();
 }
 
-function showAlert(msg, func)
+function showAlert(msg, func, title)
 {
+	if (!title) {
+		title = $("#dever-name").html() + '提醒您';
+	}
 	//$("#dever_modal_no").click();
 	$("#dever_modal").modal();
 	$('#dever_modal_body').html(msg);
 	
-	$('#dever_modal_title').html('提醒您');
+	$('#dever_modal_title').html(title);
 	
 	if(func)
 	{

assets/public/valid/jquery.validationEngine.js

@@ -25,7 +25,7 @@
 			 if (!form.data('jqv') || form.data('jqv') == null ) {
 				 options = methods._saveOptions(form, options);
 				 // bind all formError elements to close on click
-				 $(".formError").live("click", function() {
+				 $(".formError").on("click", function() {
 					 $(this).fadeOut(150, function() {
 						 // remove prompt once invisible
 						 $(this).parent('.formErrorOuter').remove();
@@ -365,6 +365,10 @@
 
 				} else if(options.focusFirstField)
 					first_err.focus();
+				
+				if (options.onFailure) {
+					options.onFailure();
+				}
 				return false;
 			}
 			return true;

database/admin.php

@@ -238,8 +238,22 @@ return array
 			//'option' 	=> $option,
 			//'update'	=> 'radio',
 			//'list'		=> true,
+			//'extend'	=> true,//扩展功能，该字段为虚拟字段，只在数据库中建立extend字段来保存 后续实现
 		),
 
+		/*
+		提供冲突检测机制（乐观锁），保证高并发下的数据安全
+		这是模仿自 php 的 Memcached 扩展 后续实现
+		'token'		=> array
+		(
+			'type' 		=> 'int-11',
+			'name' 		=> 'token',
+			'default' 	=> '1',
+			'desc' 		=> 'token',
+			'match' 	=> 'is_numeric',
+		),
+		*/
+
 		'status'		=> array
 		(
 			'type' 		=> 'tinyint-1',

src/Database.php

@@ -2754,6 +2754,8 @@ class Database
 
         $script = '<script>';
 
+        //参考https://blog.csdn.net/wangzl1163/article/details/51071826
+        //http://code.ciaoca.com/jquery/validation-engine/demo/demoOnForm
         $script .= '(function($){
         $.fn.validationEngineLanguage = function(){
         };
@@ -2767,7 +2769,7 @@ class Database
             $.validationEngineLanguage.newLang();
         })(jQuery);';
         $script .= '$(document).ready(function(){
-        $(".form1").validationEngine("attach",{onSuccess:function(){submit();}});
+        $(".form1").validationEngine("attach",{onSuccess:function(){submit();},onFailure:function(){submit();}});
         });';
         $script .= '</script>';