预览

src/jfw/modules/app/src/web/templates/dataExport/dataExport_previewData.html

@@ -183,15 +183,15 @@
 				})
 			})
 			//
+			if(localStorage.keyWord!==""&&localStorage.keyWord!==undefined){
+				var keyWordArr = JSON.parse(localStorage.keyWord);
+				for(var i in keyWordArr){
+					keys.push(keyWordArr[i].keyWord);
+				}
+			}
 			function tab(t){
 				$.post("/jyapp/front/dataExport/getPreview",{dataType:t,_id:{{.T.id}}},function(r){
 					console.log(r.res)
-					if(localStorage.keyWord!==""&&localStorage.keyWord!==undefined){
-						var keyWordArr = JSON.parse(localStorage.keyWord);
-						for(var i in keyWordArr){
-							keys.push(keyWordArr[i].keyWord);
-						}
-					}
 					if(r.res.data){
 						var res = r.res.data;
 						var aHtml = bz;
@@ -206,6 +206,7 @@
 										var re =new RegExp(keys[m], "g");
 										var index = res[i]["title"].search(re);
 										if(index !== -1){
+											console.log(res[i]["title"])
 											a++;
 											aHtml+='<tr><td>'+a+'</td>'
 													+'<td>'+res[i]["title"]+'</td>'
@@ -229,8 +230,8 @@
 													+'<td>'+res[i]["currency"]+'</td>'
 													+'<td>'+res[i]["subtype"]+'</td>'
 													+'</tr>';
+											break
 										}
-										break
 									}
 								}else{
 									aHtml+='<tr><td>'+(Number(i)+Number(1))+'</td>'
@@ -259,11 +260,18 @@
 							}
 							for(var i in res){
 								if(localStorage.keyWord!==""&&localStorage.keyWord!==undefined){
+									var b = 0;
 									for(var m in keys){
 										var re =new RegExp(keys[m], "g");
 										var index = res[i]["title"].search(re);
-										if(index === -1){
+										if(index !== -1){
+											break
+										}else{
+											b++
+										}
+										if(keys.length===b){
 											a++;
+											b = 0;
 											aHtml+='<tr><td>'+a+'</td>'
 													+'<td>'+res[i]["title"]+'</td>'
 													+'<td>'+res[i]["detail"]+'</td>'
@@ -285,9 +293,8 @@
 													+'<td>'+res[i]["projectscope"]+'</td>'
 													+'<td>'+res[i]["currency"]+'</td>'
 													+'<td>'+res[i]["subtype"]+'</td>'
-													+'</tr>';
+													+'</tr>';	
 										}
-										break
 									}
 								}
 							}
@@ -301,6 +308,7 @@
 										var re =new RegExp(keys[m], "g");
 										var index = res[i]["title"].search(re);
 										if(index !== -1){
+											console.log(res[i]["title"])
 											a++;
 											aHtml+='<tr><td>'+a+'</td>'
 													+'<td>'+res[i]["title"]+'</td>'
@@ -316,8 +324,8 @@
 													+'<td>'+res[i]["currency"]+'</td>'
 													+'<td>'+res[i]["subtype"]+'</td>'
 													+'</tr>'
+										    break
 										}
-										break
 									}
 								}else{
 									aHtml+='<tr><td>'+(Number(i)+Number(1))+'</td>'
@@ -338,10 +346,17 @@
 							}
 							for(var i in res){
 								if(localStorage.keyWord!==""&&localStorage.keyWord!==undefined){
+									var b = 0;
 									for(var m in keys){
 										var re =new RegExp(keys[m], "g");
 										var index = res[i]["title"].search(re);
-										if(index === -1){
+										if(index !== -1){
+											break
+										}else{
+											b++;
+										}
+										if(keys.length===b){
+											b = 0;
 											a++;
 											aHtml+='<tr><td>'+a+'</td>'
 													+'<td>'+res[i]["title"]+'</td>'
@@ -358,7 +373,6 @@
 													+'<td>'+res[i]["subtype"]+'</td>'
 													+'</tr>'
 										}
-										break
 									}
 								}
 							}

src/web/templates/weixin/dataExport/dataExport_appended.html

@@ -89,6 +89,12 @@
     <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
     <script>
         initShare({{.T.signature}},{{.T.openid}},2,"jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});
+        window.addEventListener('pageshow', function(e) {
+            // 通过persisted属性判断是否存在 BF Cache
+            if (e.persisted) {
+                location.reload();
+            }
+        });
         var keyWordArr = [];
         var keyWordsArr = [];
         var appendedArr = [];

src/web/templates/weixin/dataExport/dataExport_exclude.html

@@ -89,6 +89,12 @@
     <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
     <script>
         initShare({{.T.signature}},{{.T.openid}},2,"jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});
+        window.addEventListener('pageshow', function(e) {
+            // 通过persisted属性判断是否存在 BF Cache
+            if (e.persisted) {
+                location.reload();
+            }
+        });
         var keyWordArr = [];
         var keyWordsArr = [];
         var excludeArr = [];

src/web/templates/weixin/dataExport/dataExport_keyWord.html

@@ -118,6 +118,8 @@
             $(window).bind("pageshow", function(event){
                 if(event.originalEvent.persisted){
                     IOSsession();
+                    $(".appended").prop("disabled", true)
+                    $(".exclued").prop("disabled", true)
                 }
             });
             if(!isinitpage) {

src/web/templates/weixin/dataExport/dataExport_previewData.html

@@ -180,6 +180,7 @@
 							keys.push(keyWordArr[i].keyWord);
 						}
 					}
+					console.log(r.res)
 					if(r.res.data){
 						var res = r.res.data;
 						var aHtml = bz;
@@ -189,11 +190,13 @@
 							aHtml = gj;
 							var a = 0;
 							for(var i in res){
+								console.log(res[i]["title"])
 								if(localStorage.keyWord!==""&&localStorage.keyWord!==undefined){
 									for(var m in keys){
 										var re =new RegExp(keys[m], "g");
 										var index = res[i]["title"].search(re);
 										if(index !== -1){
+											console.log(res[i]["title"])
 											a++;
 											aHtml+='<tr><td>'+a+'</td>'
 													+'<td>'+res[i]["title"]+'</td>'
@@ -217,8 +220,8 @@
 													+'<td>'+res[i]["currency"]+'</td>'
 													+'<td>'+res[i]["subtype"]+'</td>'
 													+'</tr>';
+											break
 										}
-										break
 									}
 								}else{
 									aHtml+='<tr><td>'+(Number(i)+Number(1))+'</td>'
@@ -247,11 +250,18 @@
 							}
 							for(var i in res){
 								if(localStorage.keyWord!==""&&localStorage.keyWord!==undefined){
+									var b = 0;
 									for(var m in keys){
 										var re =new RegExp(keys[m], "g");
 										var index = res[i]["title"].search(re);
-										if(index === -1){
+										if(index !== -1){
+											break
+										}else{
+											b++
+										}
+										if(keys.length===b){
 											a++;
+											b = 0;
 											aHtml+='<tr><td>'+a+'</td>'
 													+'<td>'+res[i]["title"]+'</td>'
 													+'<td>'+res[i]["detail"]+'</td>'
@@ -273,9 +283,8 @@
 													+'<td>'+res[i]["projectscope"]+'</td>'
 													+'<td>'+res[i]["currency"]+'</td>'
 													+'<td>'+res[i]["subtype"]+'</td>'
-													+'</tr>';
+													+'</tr>';	
 										}
-										break
 									}
 								}
 							}
@@ -289,6 +298,7 @@
 										var re =new RegExp(keys[m], "g");
 										var index = res[i]["title"].search(re);
 										if(index !== -1){
+											console.log(res[i]["title"])
 											a++;
 											aHtml+='<tr><td>'+a+'</td>'
 													+'<td>'+res[i]["title"]+'</td>'
@@ -304,8 +314,8 @@
 													+'<td>'+res[i]["currency"]+'</td>'
 													+'<td>'+res[i]["subtype"]+'</td>'
 													+'</tr>'
+										    break
 										}
-										break
 									}
 								}else{
 									aHtml+='<tr><td>'+(Number(i)+Number(1))+'</td>'
@@ -326,10 +336,17 @@
 							}
 							for(var i in res){
 								if(localStorage.keyWord!==""&&localStorage.keyWord!==undefined){
+									var b = 0;
 									for(var m in keys){
 										var re =new RegExp(keys[m], "g");
 										var index = res[i]["title"].search(re);
-										if(index === -1){
+										if(index !== -1){
+											break
+										}else{
+											b++;
+										}
+										if(keys.length===b){
+											b = 0;
 											a++;
 											aHtml+='<tr><td>'+a+'</td>'
 													+'<td>'+res[i]["title"]+'</td>'
@@ -346,7 +363,6 @@
 													+'<td>'+res[i]["subtype"]+'</td>'
 													+'</tr>'
 										}
-										break
 									}
 								}
 							}