Merge branch 'master' of http://114.215.100.48:3000/ipu/android-share.git

display-server/web/biz/js/plugin/database.js

@@ -10,96 +10,46 @@ require(["domReady!","mobile", "util"], function(doc,Mobile) {
			+ " stu_sex varchar(1))";
	//建表
	$("#create").tap(function() {
		Mobile.execSQL(dbName, createSql, null, function(result){
		Mobile.execSQL(dbName, createSql, null, null, null, function(result){
			alert(result);
		});
	});
	//查询数据
	$("#select").tap(function() {
		var columns=new Array(); //查询字段 可以是个空的数组，也可是是null，这是默认查询字段是*，即全部
		columns[0]="stu_name";
		columns[1]="stu_age";
		columns[2]="stu_sex";
		var columns = ["stu_name","stu_age","stu_sex"];//查询字段
		
		var condSQL = "STU_AGE = :VSTU_AGE";
		var conds = new Wade.DataMap();	//查询条件 可以是个空的DataMap(),也可以是null
		conds.put("stu_age", "19"); //注意：拼装的条件只能是等于，如：stu_age=19，而不能是stu_age>19
		conds.put("STU_AGE", "19"); //注意：拼装的条件只能是等于，如：stu_age=19，而不能是stu_age>19
		
		WadeMobile.select(dbName, tableName, columns, conds, function(obj){			//查询所有符合条件
			var result = JSON.parse(obj); //解析成JSON
			var childObjStr = "";		  //子元素
			$("#tbody").children("tr").remove();//删除表格内容
			for(var i = 0; i < result.length; i++){
				childObjStr += "<tr>";
				var stuItem = result[i];
				var columnVal;
				for(var j=0; j<columns.length; j++){
					columnVal = stuItem[columns[j]];//获取字段值
					if(typeof(columnVal) != "undefined"){//过滤查询字段中冗余字段（表中不存在的字段）
						childObjStr += "<td>" + columnVal + "</td>";
					}
				}
				childObjStr += "</tr>";
			}
			//将子元素节点添加到表格中
			$("#tbody").append($(childObjStr));
		});
		WadeMobile.select(dbName,tableName,null,condSQL,conds,null,null,function(obj){qryResultDeal(obj, columns)});
	});
	
	//查询第一条数据
	$("#selectFirst").tap(function() {
		var columns=new Array(); //查询字段 可以是个空的数组，也可是是null，这是默认查询字段是*，即全部
		columns[0]="stu_name";
		columns[1]="stu_age";
		columns[2]="stu_sex";
		var columns = ["stu_name","stu_age","stu_sex"];//查询字段
		
		var condSQL = "STU_AGE = :VSTU_AGE";
		var conds = new Wade.DataMap();	//查询条件 可以是个空的DataMap(),也可以是null
		conds.put("stu_age", "19"); //注意：拼装的条件只能是等于，如：stu_age=19，而不能是stu_age>19
		conds.put("STU_AGE", "19"); //注意：拼装的条件只能是等于，如：stu_age=19，而不能是stu_age>19
		
		WadeMobile.selectFirst(dbName, tableName, columns, conds, function(obj){	//查询第一条
			var result = JSON.parse(obj); //解析成JSON
			var childObjStr = "";		  //子元素
			$("#tbody").children("tr").remove();//删除表格内容
			childObjStr += "<tr>";
			var columnVal;
			for(var j=0; j<columns.length; j++){
				columnVal = result[columns[j]];//获取字段值
				if(typeof(columnVal) != "undefined"){//过滤查询字段中冗余字段（表中不存在的字段）
					childObjStr += "<td>" + columnVal + "</td>";
				}
			}
			childObjStr += "</tr>";
			//将子元素节点添加到表格中
			$("#tbody").append($(childObjStr));
		});
		WadeMobile.selectFirst(dbName, tableName, columns, condSQL, conds, function(obj){qryResultDeal(obj, columns)});
	});
	
	//查询数据  selectExecSQL
	$("#selectExecSQL").tap(function() {
		var sql = "select * from " + tableName + " where stu_name=? and stu_age=? and stu_sex=?";
		var selectionArgs=new Array(); //查询字段 可以是个空的数组，也可是是null，这是默认查询字段是*，即全部
		selectionArgs[0]="JACK1";
		selectionArgs[1]="19";
		selectionArgs[2]="10";
		//查询语句不能出现“*”
		var sql = "select stu_no,stu_name,stu_age,stu_sex from " + tableName + " where stu_name=:VSTU_NAME and stu_age=:VSTU_AGE and stu_sex=:VSTU_SEX";
		var params = new Wade.DataMap();//查询字段
		params.put("STU_NAME", "JACK");
		params.put("STU_AGE", "19");
		params.put("STU_SEX", "M");
		
		WadeMobile.execSQL(dbName, sql, selectionArgs, function(obj){			//查询所有符合条件
			var result = JSON.parse(obj); //解析成JSON
			var childObjStr = "";		  //子元素
			$("#tbody").children("tr").remove();//删除表格内容
			for(var i = 0; i < result.length; i++){
				childObjStr += "<tr>";
				var name = "<td>" + result[i].stu_name + "</td>";
				var age = "<td>" + result[i].stu_age + "</td>";
				var sex = "<td>" + result[i].stu_sex + "</td>";
				childObjStr += name + age + sex + "</tr>";
			}
			//将子元素节点添加到表格中
			$("#tbody").append($(childObjStr));
		});
		WadeMobile.execSQL(dbName, sql, params, 1, 1, function(obj){qryResultDeal(obj, ["stu_name","stu_age","stu_sex"])});
	});
	
	//增加数据
	/*var insertSql = "INSERT INTO " + tableName + " (stu_no, stu_name, stu_age, stu_sex) VALUES ('2015003','JACK3','10','F')";
	insertSql = transform(insertSql);
	/*var insertSql = "INSERT INTO " + tableName + " (stu_no, stu_name, stu_age, stu_sex) VALUES ('2015003','JACK','10','F')";
	$("#insert").tap(function() {
		var param = new Wade.DataMap();
		param.put("STU_NO", "2015001");
@@ -115,8 +65,8 @@ require(["domReady!","mobile", "util"], function(doc,Mobile) {
	//新增数据
	$("#insert").tap(function() {
		var param = new Wade.DataMap();
		param.put("STU_NO", "2015004");
		param.put("STU_NAME", "JACK4");
		param.put("STU_NO", "2015001");
		param.put("STU_NAME", "JACK");
		param.put("STU_AGE", "19");
		param.put("STU_SEX", "M");
		Mobile.insert(dbName, tableName, param, function(result){
@@ -125,37 +75,35 @@ require(["domReady!","mobile", "util"], function(doc,Mobile) {
	});
	
	//修改数据
	/*var updateSql = "UPDATE " + tableName + " SET stu_name = :VSTU_NAME, stu_age = :VSTU_AGE WHERE stu_no = :VSTU_NO";
	updateSql = transform(updateSql);
	var updateSql = "UPDATE " + tableName + " SET stu_name = :VSTU_NAME, stu_age = :VSTU_AGE WHERE stu_no = :VSTU_NO";
	$("#update").tap(function() {
		var param = new Wade.DataMap();
		param.put("STU_NAME", "Dave");
		param.put("STU_AGE", "20");
		param.put("STU_AGE", "19");
		param.put("STU_NO", "2015001");
		
		Mobile.execSQL(dbName, updateSql, param, function(result){
		Mobile.execSQL(dbName, updateSql, param, null, null, function(result){
			alert(result);
		});
	});*/
	});
	
	//修改数据
	$("#update").tap(function() {
	/*$("#update").tap(function() {
		var param = new Wade.DataMap();
		param.put("STU_NAME", "Dave");
		var condSQL = "STU_NO = :VSTU_NO";
		
		var conds = new Wade.DataMap();
		conds.put("STU_NO", "2015004");
		conds.put("STU_NO", "2015001");
		
		Mobile.update(dbName, tableName, param, condSQL, conds, function(result){
			alert(result);
		});
	});
	});*/
	
	/*//删除数据
	var delteSql = "DELETE FROM " + tableName + " WHERE stu_no = 2015001";
	delteSql = transform(delteSql);
	
	$("#delete").tap(function() {
		var param = new Wade.DataMap();
@@ -170,7 +118,7 @@ require(["domReady!","mobile", "util"], function(doc,Mobile) {
		var condSQL = "STU_NO = :VSTU_NO";
		
		var param = new Wade.DataMap();
		param.put("STU_NO", "2015004");
		param.put("STU_NO", "2015001");
		
		Mobile.delete(dbName, tableName, condSQL, param, function(result){
			alert(result);
@@ -181,14 +129,30 @@ require(["domReady!","mobile", "util"], function(doc,Mobile) {
	var dropSql = "DROP TABLE " + tableName ;
	$("#drop").tap(function() {
		
		Mobile.execSQL(dbName, dropSql, null, function(result){
		Mobile.execSQL(dbName, dropSql, null, null, null, function(result){
			alert(result);
		});
	});
	
	//特殊符号过滤
	function transform(sql){
		return sql;
//		return sql.replace(/=/g, ":3D").replace(/\?/g ,":3F").replace(/,/g, ":9A");
	
	//处理查询语句结果集
	var qryResultDeal = function(obj, qryCols){
		var result = JSON.parse(obj); //解析成JSON
		var childObjStr = "";		  //子元素
		$("#tbody").children("tr").remove();//删除表格内容
		
		for(var i = 0, length = result.length; i < length; i++){
			childObjStr += "<tr>";
			var stuItem = result[i];
			//因为从后台取到得值进过hash散列，所以需要通过“查询列”取对应字段值
			for(var x = 0, len = qryCols.length; x < len; x++){
				var columnVal = stuItem[qryCols[x].toUpperCase()];//获取字段值
				if(typeof(columnVal) != "undefined")//过滤查询字段中冗余字段（表中不存在的字段）
					childObjStr += "<td>" + columnVal + "</td>";
			}
			childObjStr += "</tr>";
		}
		//将子元素节点添加到表格中
		$("#tbody").append($(childObjStr));
	};
});

display-server/web/res/js/mobile/expand-mobile.js

@@ -193,12 +193,22 @@ define(["require"],function(require) {
			},logCat:function(msg,title,err){
				//将日志输出至LogCat控制台（异步）
				execute("logCat",[msg,title],err);
			},execSQL:function(dbName,sql,bindArgs,callback,err){
				if(bindArgs==undefined){
					bindArgs = new Array();
			},execSQL:function(dbName,sql,bindArgs,limit,offset,callback,err){
				if(bindArgs == undefined){
					bindArgs = new Wade.DataMap();
				}
				if(limit == null)
					limit = "";
				else if(!isNaN(limit))	
					limit = "\"" + limit + "\"";
				
				if(offset == null)	
					offset = "";
				else if(!isNaN(offset))
					offset = "\"" + offset + "\"";
				
				storageCallback("execSQL",callback);
				execute("execSQL",[dbName,sql,bindArgs],err);
				execute("execSQL",[dbName,sql,bindArgs.toString(),limit,offset],err);
			},insert:function(dbName,table,datas,callback,err){
				if(datas==undefined){
					datas = new Wade.DataMap();
@@ -212,7 +222,7 @@ define(["require"],function(require) {
				storageCallback("delete",callback);
				execute("delete",[dbName,table,condSQL,conds.toString()],err);
			},update:function(dbName,table,datas,condSQL,conds,callback,err){
				if(datas==undefined){
				if(datas==undefined){c
					datas = new Wade.DataMap();
				}
				if(conds==undefined){
@@ -220,24 +230,27 @@ define(["require"],function(require) {
				}
				storageCallback("update",callback);
				execute("update",[dbName,table,datas.toString(),condSQL,conds.toString()],err);
			},select:function(dbName,table,columns,conds,callback,err){
				if(columns==undefined){
			},select:function(dbName,table,columns,condSQL,conds,limit,offset,callback,err){
				if(columns == null){
					columns = new Array();
				}
				if(conds==undefined){
				if(conds == null){
					conds = new Wade.DataMap();
				}
				if(limit == null)
					limit = "";
				else if(!isNaN(limit))	
					limit = "\"" + limit + "\"";
				
				if(offset == null)	
					offset = "";
				else if(!isNaN(offset))
					offset = "\"" + offset + "\"";
				
				storageCallback("select",callback);
				execute("select",[dbName,table,columns,conds.toString()],err);
			},selectFirst:function(dbName,table,columns,conds,callback,err){
				if(columns==undefined){
					columns = new Array();
				}
				if(conds==undefined){
					conds = new Wade.DataMap();
				}
				storageCallback("selectFirst",callback);
				execute("selectFirst",[dbName,table,columns,conds.toString()],err);
				execute("select",[dbName,table,columns,condSQL,conds.toString(),limit,offset],err);
			},selectFirst:function(dbName,table,columns,condSQL,conds,callback,err){
				this.select(dbName,table,columns,condSQL,conds,1,0,callback,err);
			},registerForPush:function(account,callback,err){
				storageCallback("registerForPush",callback);
				execute("registerForPush",[account],err);

display-server/web/res/js/mobile/mobile-browser.js

@@ -184,23 +184,23 @@ define(["browserTool","jcl"],function(browserTool,Wade) {
			alert("等待实现");
		}
		/******************本地数据库操作**********************/
		this.execSQL = function(dbName,sql,bindArgs,callback,err){
		this.execSQL = function(dbName,sql,bindArgs,limit,offset,callback,err){
			alert("等待实现");
		};
		this.insert = function(dbName,table,datas,callback,err){
			alert("等待实现");
		};
		this.delete = function(dbName,table,datas,callback,err){
		this.delete = function(dbName,table,condSQL,conds,callback,err){
			alert("等待实现");
		};
		this.update = function(dbName,table,datas,conds,callback,err){
		this.update = function(dbName,table,datas,condSQL,conds,callback,err){
			alert("等待实现");
		};
		this.select = function(dbName,table,columns,conds,callback,err){
		this.select = function(dbName,table,columns,condSQL,conds,limit,offset,callback,err){
			alert("等待实现");
		};
		//查询第一行数据,效率高
		this.selectFirst = function(dbName,table,columns,conds,callback,err){
		this.selectFirst = function(dbName,table,columns,condSQL,conds,callback,err){
			alert("等待实现");
		};
		// 设置手势锁

display-server/web/res/js/mobile/mobile-client.js

@@ -147,24 +147,24 @@ define(["wadeMobile","clientTool"],function(WadeMobile,clientTool) {
			WadeMobile.closeSlidingMenu(result);
		}
		/******************本地数据库操作**********************/
		this.execSQL = function(dbName,sql,bindArgs,callback,err){
			WadeMobile.execSQL(dbName,sql,bindArgs,callback,err);
		this.execSQL = function(dbName,sql,bindArgs,limit,offset,callback,err){
			WadeMobile.execSQL(dbName,sql,bindArgs,limit,offset,callback,err);
		};
		this.insert = function(dbName,sql,bindArgs,callback,err){
			WadeMobile.insert(dbName,sql,bindArgs,callback,err);
		this.insert = function(dbName,table,datas,callback,err){
			WadeMobile.insert(dbName,table,datas,callback,err);
		};
		this.delete = function(dbName,sql,bindArgs,callback,err){
			WadeMobile.delete(dbName,sql,bindArgs,callback,err);
		this.delete = function(dbName,table,condSQL,conds,callback,err){
			WadeMobile.delete(dbName,table,condSQL,conds,callback,err);
		};
		this.update = function(dbName,sql,bindArgs,callback,err){
			WadeMobile.update(dbName,sql,bindArgs,callback,err);
		this.update = function(dbName,table,datas,condSQL,conds,callback,err){
			WadeMobile.update(dbName,table,datas,condSQL,conds,callback,err);
		};
		this.select = function(dbName,sql,bindArgs,callback,err){
			WadeMobile.select(dbName,sql,bindArgs,callback,err);
		this.select = function(dbName,table,columns,condSQL,conds,limit,offset,callback,err){
			WadeMobile.select(dbName,table,columns,condSQL,conds,limit,offset,callback,err);
		};
		//查询第一行数据,效率高
		this.selectFirst = function(dbName,sql,bindArgs,callback,err){
			WadeMobile.selectFirst(dbName,sql,bindArgs,callback,err);
		this.selectFirst = function(dbName,table,columns,condSQL,conds,callback,err){
			WadeMobile.selectFirst(dbName,table,columns,condSQL,conds,callback,err);
		};
		// 设置手势锁
		this.setScreeLock = function(dataAction,param,indexPage,err) {