From f7c7592487ffdf191cf2c0bded358568eb65f837 Mon Sep 17 00:00:00 2001
From: tower1229 <tower1229@foxmail.com>
Date: Wed, 9 May 2018 17:12:01 +0800
Subject: [PATCH] 1.2.2

---
 package.json                        |   2 +-
 sdk/common.js                       |  12 +---
 sdk/core.js                         |  23 +++++--
 sdk/modules/validform/validform.js  |  23 +++----
 view/common/chooseList/content.html |  21 +++---
 view/common/chooseList/content.js   |  29 ++++----
 view/common/chooseList/script.js    |   7 +-
 view/common/chooseList/temp.html    |   2 +-
 view/demo/ajax/script.js            |   1 -
 view/demo/chooseList/script.js      |   5 +-
 view/demo/index/content.html        |   2 +-
 view/demo/list2detail/content.js    | 100 ++++++++++++++--------------
 view/demo/list2detail/detail.js     |  51 +++++++-------
 view/demo/tabList/content.js        |   6 +-
 view/demo/tabList/script.js         |  13 ++--
 view/demo/validform/script.js       |   5 +-
 view/member/login/script.js         |  92 +++++++++++--------------
 17 files changed, 192 insertions(+), 202 deletions(-)

diff --git a/package.json b/package.json
index 1efbef3..9cda8b2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hybridstart",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "A hybrid application development framework",
   "main": "lib/index.js",
   "directories": {
diff --git a/sdk/common.js b/sdk/common.js
index f25f875..b5b32ea 100644
--- a/sdk/common.js
+++ b/sdk/common.js
@@ -132,17 +132,7 @@ define(function(require, exports, module) {
 				});
 			}
 		}
-		if (platform === 'ios') {
-			if (parseFloat(version) >= 9) {
-				$body.on('click', '.item-radio', function() {
-					var $view = $(this).parent();
-					$view.css('visibility', 'hidden');
-					setTimeout(function() {
-						$view.css('visibility', 'visible');
-					}, 0);
-				});
-			}
-		}
+		
 		//自动加载data-src
 		app.window.on('resume', function(){
 			$.each($('[data-src]'), function(i, ele){
diff --git a/sdk/core.js b/sdk/core.js
index 72ec6cc..7ce4d3f 100644
--- a/sdk/core.js
+++ b/sdk/core.js
@@ -957,8 +957,11 @@ var apputil = (function(document, undefined) {
 				z: 0
 			}
 		}, config || {});
+		//IOS不允许传递包含function的对象
+		var cbTemp = opt.callback;
+		delete opt.callback;
 		api.animation(opt, function(ret, err) {
-			typeof opt.callback === 'function' && opt.callback(ret, err);
+			typeof cbTemp === 'function' && cbTemp(ret, err);
 		});
 		return opt.name;
 	}
@@ -1166,10 +1169,11 @@ var gh=((((ga*ga)>>>17)+ga*gb)>>>15)+gb*gb;var gl=(((gx&4294901760)*gx)|0)+(((gx
 
 		//返回结果处理
 		var tempSucc = opt.success;
+		var tempErr = opt.error;
 		var handleError = function(res, err) {
 			if (!res) {
-				if (typeof(opt['error']) === 'function') {
-					opt['error'](err);
+				if (typeof(tempErr) === 'function') {
+					tempErr(err);
 				} else {
 					app.loading.hide();
 					catchAjaxError(err.code, err.statusCode);
@@ -1191,11 +1195,15 @@ var gh=((((ga*ga)>>>17)+ga*gb)>>>15)+gb*gb;var gl=(((gx&4294901760)*gx)|0)+(((gx
 				if(opt.snapshoot && !fromSnap){
 					app.storage.val(urlkey, res);
 				}
-				tempSucc(res);
+				typeof(tempSucc)==='function' && tempSucc(res);
 			}
 		}
 		//清理数据
 		delete opt.success;
+		delete opt.error;
+		delete opt.callback;
+		delete opt.beforeCheck;
+		delete opt.beforeSubmit;
 		delete opt.type;
 		delete opt.tiptype;
 		delete opt.tipSweep;
@@ -1280,8 +1288,13 @@ var gh=((((ga*ga)>>>17)+ga*gb)>>>15)+gb*gb;var gl=(((gx&4294901760)*gx)|0)+(((gx
 				values: opt.data
 			};
 		}
-		//console.log(JSON.stringify(opt))
+		// var aaaaalist = [];
+		// for(var x in opt){
+		// 	aaaaalist.push(x)
+		// }
+		// console.log(aaaaalist.join(' '))
 		api.ajax(opt, function(res, err) {
+			//console.log(JSON.stringify(res))
 			handleRes(res);
 			handleError(res, err);
 		});
diff --git a/sdk/modules/validform/validform.js b/sdk/modules/validform/validform.js
index e4faba9..ef52b57 100644
--- a/sdk/modules/validform/validform.js
+++ b/sdk/modules/validform/validform.js
@@ -542,8 +542,8 @@ define('validform', function(require, exports, module) {
 						return true;
 					}
 				};
-				if (ajaxsetup.success) {
-					var temp_suc = ajaxsetup.success;
+				if (ajaxsetup.callback) {
+					var temp_suc = ajaxsetup.callback;
 					ajaxsetup.success = function(data) {
 						localconfig.success(data);
 						temp_suc(data, inputobj);
@@ -672,8 +672,8 @@ define('validform', function(require, exports, module) {
 						sweep: settings.tipSweep
 					}, "byajax");
 
-					if (ajaxsetup.success) {
-						var temp_suc = ajaxsetup.success;
+					if (ajaxsetup.callback) {
+						var temp_suc = ajaxsetup.callback;
 						ajaxsetup.success = function(data) {
 							settings.callback && settings.callback(data);
 							curform[0].validform_ajax = null;
@@ -748,14 +748,13 @@ define('validform', function(require, exports, module) {
 						}
 					};
 					ajaxsetup = $.extend({}, localconfig, ajaxsetup);
-					setTimeout(function(){
-						try{
-							curform[0].validform_ajax = ajaxRequest(ajaxsetup);
-						}catch(e){
-							//ios报错兼容
-							curform[0].validform_ajax = {abort:null};
-						}
-					},100)
+					try{
+						curform[0].validform_ajax = ajaxRequest(ajaxsetup);
+					}catch(e){
+						//ios报错兼容
+						console.log('validform.js:' + e.message);
+						curform[0].validform_ajax = {abort:null};
+					}
 					return null;
 				} else {
 					if (!settings.postonce) {
diff --git a/view/common/chooseList/content.html b/view/common/chooseList/content.html
index adbfc5e..d427f34 100644
--- a/view/common/chooseList/content.html
+++ b/view/common/chooseList/content.html
@@ -15,17 +15,20 @@
         <!-- for: ${data} as ${store} -->
         <!-- if: ${store.hasSub} != 1 -->
             <!-- if: ${store.multi} -->
-            <label class="item item-radio radio-primary chooseListHookMulti" data-id="${store.id}">
-                <input type="radio">
+            <div class="item item-checkbox radio-primary chooseListHookMulti" data-id="${store.id}">
+                <label class="checkbox checkbox-primary">
+                    <input type="checkbox" name="checkbox">
+                </label>
                 ${store.name}
-            </label>
-            <!-- else -->
-            <div class="item chooseListHook" data-id="${store.id}">
-            ${store.name}
-            <!-- if: ${store.note} -->
-            <div class="item-note">${store.note}</div>
-            <!-- /if -->
             </div>
+            <!-- else -->
+            <label class="item item-radio radio-primary chooseListHook" data-id="${store.id}">
+                <input type="radio" name="radio">
+                ${store.name}
+                <!-- if: ${store.note} -->
+                <div class="item-note">${store.note}</div>
+                <!-- /if -->
+            </label>
             <!-- /if -->
         <!-- else -->
         <label class="item item-icon-right" data-id="${store.id}">
diff --git a/view/common/chooseList/content.js b/view/common/chooseList/content.js
index a8995f6..05c46fc 100644
--- a/view/common/chooseList/content.js
+++ b/view/common/chooseList/content.js
@@ -19,7 +19,9 @@ define(function(require) {
     var doRend = render({
         el: '#storeList',
         callback: function(){
-            app.loading.hide()
+            app.window.evaluate({
+                script: 'app.loading.hide()'
+            });
         }
     });
 
@@ -44,7 +46,9 @@ define(function(require) {
                 if (res.status === 'Y') {
                     dataRender(res, getMore);
                 } else {
-                	app.loading.hide();
+                	app.window.evaluate({
+                        script: 'app.loading.hide()'
+                    });
                     $('#storeList')[0].innerHTML = '';
                     app.toast(res.msg, {
                         color: 'danger',
@@ -96,9 +100,6 @@ define(function(require) {
             var thisObj = getListById($(this).data('id'), extParam.data);
             $.extend(choosenItem, thisObj);
             app.storage.val('choosenItem',JSON.stringify(choosenItem));
-            app.window.evaluate({
-                script: 'submitChoose()'
-            });
         }
     }).on('touchstart','.chooseListHookMulti',function(){
         //多选
@@ -109,28 +110,22 @@ define(function(require) {
         $(this).data('acting',false);
     }).on('touchend', '.chooseListHookMulti',function(){
         if($(this).data('acting')){
-            if(this.className.indexOf(' active')!==-1){
-                var _catchData = choosenItem.data, _catchId = $(this).data('id');
-                var cacheClass = this.className;
-                this.className = cacheClass.replace(/\s*active/g, '');
+            if(this.querySelector('input:checked')){
+                var _catchData = choosenItem.data, 
+                    _catchId = $(this).data('id');
                 $.each(_catchData,function(i,e){
                     if(e.id==_catchId){
                         _catchData.splice(i,1);
                         return false;
                     }
                 });
+                choosenItem.data = _catchData;
             }else{
-                this.className = (this.className + ' active');
                 choosenItem.data.push({
-                    part_id:$(this).data('id'),
-                    name:$(this).data('name'),
-                    code:$(this).data('code'),
-                    spec:$(this).data('spec'),
-                    units:$(this).data('units'),
-                    part_flag:$(this).data('flag'),
-                    img:$(this).data('img')
+                    id:$(this).data('id')
                 });
             }
+            
             app.storage.val('choosenItem',JSON.stringify(choosenItem));
         }
     }).on('click','.item-icon-right',function(){
diff --git a/view/common/chooseList/script.js b/view/common/chooseList/script.js
index a27edd9..4e081e4 100644
--- a/view/common/chooseList/script.js
+++ b/view/common/chooseList/script.js
@@ -10,9 +10,6 @@ define(function(require) {
     var $ = app.util;
     var extParam = app.getParam();
 
-    if(extParam && extParam.multi){
-        $('#ok')[0].style.display = 'block';
-    }
     var submitChoose = function(){
         var choosenItem = app.storage.val('choosenItem');
         setTimeout(function(){
@@ -24,10 +21,10 @@ define(function(require) {
         },0);
     };
     //选好了
-    $('#ok').on('click',function(){
+    $('#ok').on('click', function(){
         submitChoose();
     });
-    window.submitChoose = submitChoose;
+    
     //loading
     app.loading.show();
     
diff --git a/view/common/chooseList/temp.html b/view/common/chooseList/temp.html
index 2065451..c5abcbf 100644
--- a/view/common/chooseList/temp.html
+++ b/view/common/chooseList/temp.html
@@ -13,7 +13,7 @@
                 <i class="radio-icon ion">&#xe651;</i>
             </div>
             <div class="title" id="headTitle">选择</div>
-            <div class="btn hide" id="ok"> 
+            <div class="btn" id="ok"> 
                 <i class="ion">&#xe645;</i>
             </div>
         </div>
diff --git a/view/demo/ajax/script.js b/view/demo/ajax/script.js
index ae261d0..38a1676 100644
--- a/view/demo/ajax/script.js
+++ b/view/demo/ajax/script.js
@@ -24,7 +24,6 @@ define(function(require) {
 			case "cache":
 				app.ajax({
 					url: "http://spider.dcloud.net.cn/api/banner/36kr",
-					checkData: false,
 					cache: true,
 					success: function(res) {
 						app.loading.hide();
diff --git a/view/demo/chooseList/script.js b/view/demo/chooseList/script.js
index c70bfa7..fc1c06c 100644
--- a/view/demo/chooseList/script.js
+++ b/view/demo/chooseList/script.js
@@ -74,7 +74,10 @@ define(function(require) {
 			}
 		}, 'common', 'chooseList');
 	});
-
+	//接收返回事件
+	app.subscribe('choosenItem',function(choosenItem){
+		console.log(choosenItem)
+	});
 
 	
 });
\ No newline at end of file
diff --git a/view/demo/index/content.html b/view/demo/index/content.html
index 6d9a5f4..b0392a0 100644
--- a/view/demo/index/content.html
+++ b/view/demo/index/content.html
@@ -135,7 +135,7 @@
             tabList (多标签列表)
         </div>
         <div class="item" active="1,demo,list2detail">
-            list2detail (列表到详细页)
+            list2detail (列表跳详细极致优化)
         </div>
         <div class="item" active="1,demo,scoll-list">
             scoll-list (下拉刷新+滚动加载)
diff --git a/view/demo/list2detail/content.js b/view/demo/list2detail/content.js
index 507a6e3..34fcfce 100644
--- a/view/demo/list2detail/content.js
+++ b/view/demo/list2detail/content.js
@@ -1,9 +1,10 @@
 /*
- * layout
+ * 
  */
 define(function(require) {
 	require('sdk/common');
 	var $ = app.util;
+
 	var lastId = ''; //最新新闻的id
 	var reqData = {
 		column: "id,post_id,title,author_name,cover,published_at" //需要的字段名
@@ -18,7 +19,7 @@ define(function(require) {
 	});
 	/**
 	 * 1、将服务端返回数据，转换成前端需要的格式
-	 * 2、若服务端返回格式和前端所需格式相同，则不需要改功能
+	 * 2、若服务端返回格式和前端所需格式相同，则不需要此功能
 	 * 
 	 * @param {Array} items 
 	 */
@@ -41,39 +42,37 @@ define(function(require) {
 		openLock = true;
 	}).on('touchend', '[data-guid]', function() {
 		if (openLock) {
-			return openLock = false;
+			return console.log('openLock');
 		}
-		var guid = this.getAttribute('data-guid');
+		var guid = $(this).data('guid');
 		var title = this.querySelector(".title").innerHTML.trim();
 		var author = this.querySelector(".author").innerHTML;
 		var cover = this.querySelector("img").getAttribute("src");
-		open_detail(guid, title, author, cover);
-	});
-
-	var open_detail = function(guid, title, author, cover) {
-		if(openLock){
-			return null;
-		}
 		openLock = true;
-		app.publish('detail_open', {
+		//存参数
+		app.storage.val('crossParam', {
 			guid: guid,
 			title: title,
 			author: author,
 			cover: cover
 		});
-	};
+		//通知详细页
+		app.window.evaluate({
+			frameName: 'page_detail',
+			script: "detail_open()"
+		});
+	});
 
 	var loadData = function() {
 		if (lastId) { //说明已有数据，目前处于下拉刷新，增加时间戳，触发服务端立即刷新，返回最新数据
 			reqData.lastId = lastId;
-			reqData.time = new Date().getTime() + "";
+			reqData.time = String(new Date().getTime());
 		}
-
+		
 		//请求顶部banner信息
 		app.ajax({
 			type: 'get',
 			url: "http://spider.dcloud.net.cn/api/banner/36kr",
-			checkData: false,
 			data: reqData,
 			success: function(rsp) {
 				bannerRender.data({
@@ -82,62 +81,63 @@ define(function(require) {
 						cover: rsp.cover
 					}
 				});
+				//引擎bug: IOS不支持同时发起多个AJAX，只能挨个发
+				fetchList();
 			},
 			error: function(err) {
 				console.log(err.msg);
 				app.pull.stop();
 			}
 		});
-
 		//请求列表信息流
-		app.ajax({
-			type: 'get',
-			url: "http://spider.dcloud.net.cn/api/news",
-			checkData: false,
-			data: reqData,
-			snapshoot: false,
-			success: function(rsp) {
-				app.pull.stop();
-				if (rsp && rsp.length > 0) {
-					lastId = rsp[0].id; //保存最新消息的id，方便下拉刷新时使用
-					listRender.push('data', convert(rsp));
+		var fetchList = function(){
+			app.ajax({
+				type: 'get',
+				url: "http://spider.dcloud.net.cn/api/news",
+				data: reqData,
+				success: function(rsp) {
+					app.pull.stop();
+					if (rsp && rsp.length > 0) {
+						lastId = rsp[0].id; //保存最新消息的id，方便下拉刷新时使用
+						listRender.push('data', convert(rsp));
+					}
+				},
+				error: function(err) {
+					console.log(err.msg);
+					app.pull.stop();
 				}
+			});
+		}
+	};
+
+	//详细页加载完成
+	window.detail_done = function(){
+		app.window.animPopover({
+			name: 'page_detail',
+			translation: {
+				x: -window.innerWidth
 			},
-			error: function(err) {
-				console.log(err.msg);
-				app.pull.stop();
+			callback: function() {
+				openLock = false;
+				app.window.evaluate({
+					script: 'detailIsOpen = true'
+				});
 			}
 		});
-	};
-	
+	}
+
 	app.ready(function() {
 		app.pull.init(loadData);
 
 		//加载初始数据
 		loadData();
 		//预加载详细页
-
 		app.window.openPopover({
 			name: 'page_detail',
 			url: './detail.html',
 			width: window.innerWidth, //必须设置宽度，否则不渲染
 			left: window.innerWidth
 		});
-		//详细页加载完成
-		app.subscribe('detail_done', function() {
-			
-			app.window.animPopover({
-				name: 'page_detail',
-				translation: {
-					x: -window.innerWidth
-				},
-				callback: function() {
-					openLock = false;
-					app.window.evaluate({
-						script: 'detailIsOpen = true'
-					});
-				}
-			});
-		});
+		
 	});
 });
\ No newline at end of file
diff --git a/view/demo/list2detail/detail.js b/view/demo/list2detail/detail.js
index af96608..fc448eb 100644
--- a/view/demo/list2detail/detail.js
+++ b/view/demo/list2detail/detail.js
@@ -44,32 +44,33 @@ define(function(require) {
 		};
 	}
 
-	app.ready(function() {
-		//监听
-		app.subscribe('detail_open', function(param) {
-			//参数信息
-			$('#title')[0].innerText = param.title;
-			metaRender.data(param);
-			//文章内容
-			if (!param.guid) {
-				return;
-			}
-			//向服务端请求文章详情内容
-			app.ajax({
-				type: 'get',
-				url: 'http://spider.dcloud.net.cn/api/news/36kr/' + param.guid,
-				checkData: false,
-				success: function(res) {
-					artRender.data({
-						content: res.content
-					});
-					app.publish('detail_done');
-				},
-				error: function(err) {
-					alert(err.msg);
+	window.detail_open = function() {
+		//参数信息
+		var param = app.getParam();
+		if (!param || !param.guid) {
+			return console.log('详细页参数错误');
+		}
+		$('#title')[0].innerText = param.title;
+		metaRender.data(param);
+		//向服务端请求文章详情内容
+		app.ajax({
+			type: 'get',
+			url: 'http://spider.dcloud.net.cn/api/news/36kr/' + param.guid,
+			success: function(res) {
+				try{
+					artRender.data(res);
+				}catch(e){
+					console.log(e.message)
 				}
-			});
+				app.window.evaluate({
+					frameName: "view",
+					script: "detail_done()"
+				});
+			},
+			error: function(err) {
+				alert(err.msg);
+			}
 		});
+	}
 
-	});
 });
\ No newline at end of file
diff --git a/view/demo/tabList/content.js b/view/demo/tabList/content.js
index c1109ec..a627599 100644
--- a/view/demo/tabList/content.js
+++ b/view/demo/tabList/content.js
@@ -96,5 +96,9 @@ define(function(require) {
 		});
 		pageLoadObj.reload();
 	});
-	
+	//通知父页面
+	app.window.evaluate({
+		script: "childrenInit()"
+	});
+
 });
diff --git a/view/demo/tabList/script.js b/view/demo/tabList/script.js
index d0b93eb..f6e5b7a 100644
--- a/view/demo/tabList/script.js
+++ b/view/demo/tabList/script.js
@@ -12,8 +12,9 @@ define(function(require) {
 		bounce: true,
 	});
 
-
-	var setData = function(status) {
+	
+	window.childrenInit = function() {
+		var status = $('.label-tab-head .flex-1')[0].dataset.status;
 		app.window.evaluate(null, 'view', 'getData("'+status+'")');
 	};
 
@@ -24,13 +25,9 @@ define(function(require) {
 		}
 		$('.label-tab-head .cur')[0].classList.remove('cur');
 		e.target.classList.add('cur');
-		setData(e.target.dataset.status);
+		var status = e.target.dataset.status;
+		app.window.evaluate(null, 'view', 'getData("'+status+'")');
 	});
 
 
-	setTimeout(function() {
-		setData("1");
-	}, 300);
-
-
 });
\ No newline at end of file
diff --git a/view/demo/validform/script.js b/view/demo/validform/script.js
index 61d06ab..da10e44 100644
--- a/view/demo/validform/script.js
+++ b/view/demo/validform/script.js
@@ -10,7 +10,10 @@ define(function(require) {
 		ajaxPost: true,
 		url: 'http://rap2api.taobao.org/app/mock/3567/return/Yes',
 		callback: function(res) {
-			app.toast("注册成功");
+			app.toast("注册成功", {
+				global:true
+			});
+			app.window.close();
 		}
 	});
 
diff --git a/view/member/login/script.js b/view/member/login/script.js
index 6d02fad..e32d012 100644
--- a/view/member/login/script.js
+++ b/view/member/login/script.js
@@ -8,60 +8,46 @@ define(function(require) {
 	var crossParam = app.getParam();
 
 	//登录验证
-	//var Validform = require('validform');
-	// var vf = Validform('#logForm', {
-	// 	url: "http://rapapi.org/mockjsdata/9195/common/getYes/",
-	// 	ajaxPost: true,
-	// 	beforeCheck: function() {
-	// 		if ($('#usern')[0].value == "9527") {
-	// 			app.openView(null, 'x');
-	// 			return false;
-	// 		}
-	// 		return true;
-	// 	},
-	// 	beforeSubmit: function() {
-	// 		$('#logForm input').each(function(i, input) {
-	// 			input.blur();
-	// 		});
-	// 		app.loading.show();
-	// 		return true;
-	// 	},
-	// 	callback: function(res) {
-	// 		app.loading.hide();
-	// 		if (res.status === 'Y') {
-	// 			//初始化用户数据
-	// 			comm.initUser({
-	// 				tag: 'tag1',
-	// 				id: 123,
-	// 				nowScore: 100,
-	// 				nickName: '斑斑',
-	// 				headImg: "../../../res/img/avat.jpg"
-	// 			});
-	// 			setTimeout(function() {
-	// 				app.openView({
-	// 					closeself: true
-	// 				}, 'demo', 'index');
-	// 			}, 0);
-	// 		} else {
-	// 			app.toast(res.msg || '登录失败');
-	// 		}
-	// 	}
-	// });
-	$('.mysub').on('touchend', function(){
-		//初始化用户数据
-		comm.initUser({
-			tag: 'tag1',
-			id: 123,
-			nowScore: 100,
-			nickName: '斑斑',
-			headImg: "../../../res/img/avat.jpg"
-		});
-		setTimeout(function() {
-			app.openView({
-				closeself: true
-			}, 'demo', 'index');
-		}, 0);
+	var Validform = require('validform');
+	var vf = Validform('#logForm', {
+		url: "http://rapapi.org/mockjsdata/9195/common/getYes/",
+		ajaxPost: true,
+		beforeCheck: function() {
+			if ($('#usern')[0].value == "9527") {
+				app.openView(null, 'x');
+				return false;
+			}
+			return true;
+		},
+		beforeSubmit: function() {
+			$('#logForm input').each(function(i, input) {
+				input.blur();
+			});
+			app.loading.show();
+			return true;
+		},
+		callback: function(res) {
+			app.loading.hide();
+			if (res.status === 'Y') {
+				//初始化用户数据
+				comm.initUser({
+					tag: 'tag1',
+					id: 123,
+					nowScore: 100,
+					nickName: '斑斑',
+					headImg: "../../../res/img/avat.jpg"
+				});
+				setTimeout(function() {
+					app.openView({
+						closeself: true
+					}, 'demo', 'index');
+				}, 0);
+			} else {
+				app.toast(res.msg || '登录失败');
+			}
+		}
 	});
+	
 
 	app.ready(function() {
 		//检测状态