增加了dataType

joleye · Nov 19, 2018 · 667361e · 667361e
1 parent 7432e31
commit 667361e
Show file tree

Hide file tree

Showing 15 changed files with 9,608 additions and 145 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,3 @@
 .settings/
 .project
-.idea
+.idea/*
diff --git a/README.md b/README.md
@@ -71,6 +71,8 @@ ye.check({
 ```js
 		ye.verify('#form1').do_post({
 			method : 'ajax',//默认 ajax模式提交
+			dataType : 'json',//可选
+			contentType : 'application/json;charset=UTF-8',//可选
 			msg : {
 				right : 'dright',
 				error : 'derr'

diff --git a/compositebox.html b/compositebox.html
@@ -4,9 +4,9 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>compositebox</title>
 <link rel="stylesheet" type="text/css" href="css/ye.check.css" />
-<script type="text/javascript" src="js/jquery.js"></script>
-<script type="text/javascript" src="js/ye.check.js"></script>
-<script type="text/javascript" src="js/jquery.compositebox.js"></script>
+<script type="text/javascript" src="src/jquery.js"></script>
+<script type="text/javascript" src="src/ye.check.js"></script>
+<script type="text/javascript" src="src/jquery.compositebox.js"></script>
 <style type="text/css">
 #form1 li {
 	height: 45px;

diff --git a/demo-2verify.html b/demo-2verify.html
@@ -4,8 +4,8 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>demo-verify</title>
 <link rel="stylesheet" type="text/css" href="css/ye.check.css" />
-<script type="text/javascript" src="js/jquery.js"></script>
-<script type="text/javascript" src="js/ye.check.js"></script>
+<script type="text/javascript" src="src/jquery.js"></script>
+<script type="text/javascript" src="src/ye.check.js"></script>
 <style type="text/css">
 #form1 li {
 	height: 45px;

diff --git a/demo-verify.html b/demo-verify.html
@@ -4,8 +4,8 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>demo-verify</title>
 <link rel="stylesheet" type="text/css" href="css/ye.check.css" />
-<script type="text/javascript" src="js/jquery.js"></script>
-<script type="text/javascript" src="js/ye.check.js"></script>
+<script type="text/javascript" src="src/jquery.js"></script>
+<script type="text/javascript" src="src/ye.check.js"></script>
 <style type="text/css">
 #form1 li {
 	height: 45px;

diff --git a/demo.html b/demo.html
@@ -4,8 +4,8 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>demo</title>
 <link rel="stylesheet" type="text/css" href="css/ye.check.css" />
-<script type="text/javascript" src="js/jquery.js"></script>
-<script type="text/javascript" src="js/ye.check.js"></script>
+<script type="text/javascript" src="src/jquery.js"></script>
+<script type="text/javascript" src="src/ye.check.js"></script>
 <style type="text/css">
 #form1 li {
 	height: 45px;

diff --git a/demo2.html b/demo2.html
@@ -4,8 +4,8 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>demo</title>
 <link rel="stylesheet" type="text/css" href="css/ye.check.css" />
-<script type="text/javascript" src="js/jquery.js"></script>
-<script type="text/javascript" src="js/ye.check.js"></script>
+<script type="text/javascript" src="src/jquery.js"></script>
+<script type="text/javascript" src="src/ye.check.js"></script>
 <style type="text/css">
 #form1 li {
 	height: 45px;

diff --git a/js/ye.check.min.js → dist/ye.check.min.js b/js/ye.check.min.js → dist/ye.check.min.js
diff --git a/js/jquery.js b/js/jquery.js
diff --git a/make.sh b/make.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-yuicompressor --type js --charset UTF-8 -v js/ye.check.js > js/ye.check.min.js
+yuicompressor --type js --charset UTF-8 -v src/ye.check.js > dist/ye.check.min.js
diff --git a/js/jquery.action.js → src/jquery.action.js b/js/jquery.action.js → src/jquery.action.js
@@ -1,45 +1,45 @@
-/**
- * jquery.action 插件，支持事件操作
- * @author joleye
- */
-;
-$.fn.action = function(){
-	this.click(function(){
-		var attr = $(this).attr('act-conf');
-		var conf;
-		eval('conf = {'+attr+'}');
-
-		var func = 'act_'+conf.act;
-
-		act_func[func] && act_func[func](conf,this);
-	});
-};
-
-var act_func = {
-	act_link : function(conf){
-		location.href = conf.url;
-	},
-	act_post : function(conf,dthis){
-		var ext = conf.extend?conf.extend:{};
-
-		ye.verify(conf.form,ext).do_post({
-			method : 'ajax',
-			msg : {
-				right : 'dright',
-				error : 'derr'
-			},
-			btn : {
-				name : dthis,
-				text : 'load...'
-			},
-			success : function(env){
-				if(env.result){
-					$.messager.alert("系统提示",env.msg);
-				}else{
-					$.messager.alert("错误提示",env.msg);
-				}
-			}
-		});
-	}
-};
-
+/**
+ * jquery.action 插件，支持事件操作
+ * @author joleye
+ */
+;
+$.fn.action = function(){
+	this.click(function(){
+		var attr = $(this).attr('act-conf');
+		var conf;
+		eval('conf = {'+attr+'}');
+
+		var func = 'act_'+conf.act;
+
+		act_func[func] && act_func[func](conf,this);
+	});
+};
+
+var act_func = {
+	act_link : function(conf){
+		location.href = conf.url;
+	},
+	act_post : function(conf,dthis){
+		var ext = conf.extend?conf.extend:{};
+
+		ye.verify(conf.form,ext).do_post({
+			method : 'ajax',
+			msg : {
+				right : 'dright',
+				error : 'derr'
+			},
+			btn : {
+				name : dthis,
+				text : 'load...'
+			},
+			success : function(env){
+				if(env.result){
+					$.messager.alert("系统提示",env.msg);
+				}else{
+					$.messager.alert("错误提示",env.msg);
+				}
+			}
+		});
+	}
+};
+
diff --git a/js/jquery.compositebox.js → src/jquery.compositebox.js b/js/jquery.compositebox.js → src/jquery.compositebox.js
@@ -1,73 +1,73 @@
-/**
- *    复合复选框 - ye.check
- */
-
-(function($){
-
-	function init(name,target,onSelect){
-		var item = $(target);
-
-		item.hide();
-
-		var ops = $.data(target);
-
-		$('<span class="comp-box"><input class="icon-compositebox '+ops.status[0]+'" type="button" value=" "/></span>').insertBefore(item).click(function(){
-			var inp = $(this).find('input');
-			var cls = inp.attr('class').match(/\s+\w+$/)[0].replace(/\s+/g,'');
-
-			var newcls = ye.array(ops.status).next(cls);
-
-			inp.removeClass(cls).addClass(newcls);
-
-			var index = 0;
-			$('input[name='+name+']').each(function(){
-
-				if($(this).val()==ops.map[newcls]){
-					$(this).attr('checked',true);
-					if(onSelect){
-						onSelect.call(this,index,true);
-					}
-				}else{
-					$(this).attr('checked',false);
-				}
-
-				if(onSelect && ops.map[newcls]==''){
-					onSelect.call(this,index,false);
-				}
-
-				index++;
-			});
-		});
-
-	};
-
-	$.fn.compositebox = function(option){
-		var options = $.extend({
-			status : ['none','checked','del']
-		},option);
-
-		var nodes = {};
-		this.each(function(){
-			nodes[this.name] = this.parentNode.parentNode;
-			$(nodes[this.name]).hide();
-		});
-
-		$.each(nodes,function(k,val){
-			var new_option = ['none'];
-			options.map = {'none':''};
-			$('input[name='+k+']').each(function(){
-				var b = $(this).attr('composite-box'); 
-				if(b){
-					new_option.push(b);
-					options.map[b] = $(this).val();
-				}
-			});
-
-			options.status = $.extend(options.status,new_option);
-
-			$.data(val,options);
-
-			init(k,val,options.onSelect);
-		});
-	};
-})($);
+/**
+ *    复合复选框 - ye.check
+ */
+
+(function($){
+
+	function init(name,target,onSelect){
+		var item = $(target);
+
+		item.hide();
+
+		var ops = $.data(target);
+
+		$('<span class="comp-box"><input class="icon-compositebox '+ops.status[0]+'" type="button" value=" "/></span>').insertBefore(item).click(function(){
+			var inp = $(this).find('input');
+			var cls = inp.attr('class').match(/\s+\w+$/)[0].replace(/\s+/g,'');
+
+			var newcls = ye.array(ops.status).next(cls);
+
+			inp.removeClass(cls).addClass(newcls);
+
+			var index = 0;
+			$('input[name='+name+']').each(function(){
+
+				if($(this).val()==ops.map[newcls]){
+					$(this).attr('checked',true);
+					if(onSelect){
+						onSelect.call(this,index,true);
+					}
+				}else{
+					$(this).attr('checked',false);
+				}
+
+				if(onSelect && ops.map[newcls]==''){
+					onSelect.call(this,index,false);
+				}
+
+				index++;
+			});
+		});
+
+	};
+
+	$.fn.compositebox = function(option){
+		var options = $.extend({
+			status : ['none','checked','del']
+		},option);
+
+		var nodes = {};
+		this.each(function(){
+			nodes[this.name] = this.parentNode.parentNode;
+			$(nodes[this.name]).hide();
+		});
+
+		$.each(nodes,function(k,val){
+			var new_option = ['none'];
+			options.map = {'none':''};
+			$('input[name='+k+']').each(function(){
+				var b = $(this).attr('composite-box'); 
+				if(b){
+					new_option.push(b);
+					options.map[b] = $(this).val();
+				}
+			});
+
+			options.status = $.extend(options.status,new_option);
+
+			$.data(val,options);
+
+			init(k,val,options.onSelect);
+		});
+	};
+})($);