发布v2.6.8版本

js/js.js

@@ -1,5 +1,5 @@
 var MODE	= '',ACTION = '',DIR='',PROJECT='',HOST='',PARAMS='',QOM='xinhu_',apiurl='',token='',device='',CFROM='pc',ISDEMO=false,NOWURL='',nwjsgui=false,apicloud=false,isapp=false,homestyle=0,maincolor='#1389D3';
-var windows	= null,ismobile=0;
+var windows	= null,ismobile=0,clientbool = false;;
 function initbody(){}
 function bodyunload(){}
 function globalbody(){}
@@ -21,6 +21,8 @@ $(document).ready(function(){
 		if(nwjsgui)window.focus=function(){nw.Window.get().focus()}
 		if(winobj!='')opener.js.openarr[winobj]=window;
 	}catch(e){}
+	var llq = navigator.userAgent;
+	if(llq.indexOf('REIMCLIENT')>0)clientbool = true;
 	globalbody();
 	initbody();
 	$('body').click(function(e){
@@ -37,7 +39,7 @@ $(document).ready(function(){
 		var msg = '文件：'+e.filename+'\n行：'+e.lineno+'\n错误：<font color=red>'+e.message+'</font>';
 		js.alert(msg,'js错误');
 	});
-	if(navigator.userAgent.indexOf('XINHUOA')<0){
+	if(llq.indexOf('XINHUOA')<0){
 		if(typeof(api)=='undefined')api={};
 	}
 	setTimeout(function(){
@@ -204,7 +206,14 @@ js.open=function(url,w,h,wina,can,wjcan){
 	for(var o1 in a1)s+=','+o1+'='+a1[o1]+'';
 	var ja=(url.indexOf('?')>=0)?'&':'?';
 	if(wina)url+=''+ja+'winobj='+wina+'';
-	if(typeof(nw)=='undefined'){
+	 if(clientbool){
+		if(url.substr(0,4)!='http')url=NOWURL+url;
+		rockclient.rockFun("openWin",{
+			url:url,
+			width:w,
+			height:h
+		});
+	}else if(typeof(nw)=='undefined'){
 		var opar=window.open(url,'',s);
 	}else{
 		var ocsn=js.apply({'frame':true,width:w,height:h,x:l,y:t,icon:'images/logo.png'},wjcan);
@@ -775,7 +784,7 @@ js.alertclose=function(){
 }
 js.tanstyle = 0;
 js.confirm	= function(txt,fun, tcls, tis, lx,ostr,bstr){
-	if(!lx)lx=0;
+	if(!lx)lx=0;js.alertclose();
 	var h = '<div style="padding:20px;line-height:30px" align="center">',w=320;
 	if(lx==1)w= 350;
 	if(w>winWb())w=winWb()-10;
@@ -1234,4 +1243,21 @@ js.ling = function(w){
 	var sve = 'style="height:'+w+'px;width:'+w+'px"';
 	if(!w)sve='';
 	return '<i '+sve+' class="rock-loading"></i>';
+}
+
+js.chajian = function(type, cans){
+	if(!$[type]){
+		js.importjs('mode/plugin/jquery-'+type+'.js?'+js.getrand()+'', function(){$[type](cans);});
+	}else{
+		$[type](cans);
+	}
+}
+
+function showDebug(strv,col){
+	var obj = $('div[temp="divt"]'),hei=50;
+	for(var i=0;i<obj.length;i++)hei+=$(obj[i]).height()+11;
+	if(!col)col='red';
+	if(typeof(strv)!='string')strv = JSON.stringify(strv);
+	var str = '<div temp="divt" onclick="$(\'div[temp=divt]\').remove()" style="background:rgba(0,0,0,0.8);font-size:12px;position:fixed;right:0px;top:'+hei+'px;padding:5px;z-index:99;word-wrap:break-word;word-break:break-all;white-space:normal;color:'+col+'">['+js.now('now')+']'+strv+'</div>';
+	$('body').append(str);
 }