发布v2.6.9版本

mode/bootstrapplugin/jquery-bootstable.js

@@ -190,7 +190,9 @@
 			if(can.checked){
 				dis = '';
 				if(ov.checkdisabled)dis='disabled';
-				s+='<td align="center" class="rock-table-td" width="40"><input oi="'+j+'" name="tablecheck_'+rand+'" '+dis+' value="'+ov.id+'" type="checkbox"></td>';
+				s+='<td align="center" class="rock-table-td" width="40">';
+				if(ov.id)s+='<input oi="'+j+'" name="tablecheck_'+rand+'" '+dis+' value="'+ov.id+'" type="checkbox">';
+				s+='</td>';
 			}
 			for(i=0;i<len;i++){
 				na	= a[i].dataIndex;
@@ -201,7 +203,8 @@
 					val = '';
 					this.data[j][na]=val;
 				}
-				if(a[i].type == 'checkbox'){
+				if(ov.colums_type=='hj' && i==0)val='合计';
+				if(a[i].type == 'checkbox' && ov.id){
 					s1 = '<img height="20" width="20" src="images/checkbox'+val+'.png">';
 				}else{
 					s1 = val;
@@ -212,6 +215,7 @@
 					s3 = a[i].renderer(val, ov, j);
 					if(!isempt(s3))s1=s3;
 				}
+				
 				s2 = '';
 				if(i == 0 && can.tree){
 					st = ov.stotal;
@@ -342,7 +346,7 @@
 				w		= o1.clientWidth,
 				h		= o1.clientHeight,
 				at		= '',
-				v		= a[fields];
+				v		= a[fields];if(!a.id)return;
 			$('#edittable_'+rand+'').remove();
 			if(b.editorbefore && !b.editorbefore(a))return;
 			if(!b.textmsg)b.textmsg='';
@@ -538,7 +542,7 @@
 				o1  = $(o2);
 				cell= parseFloat(o1.attr('cell'));
 				farr= can.columns[cell];
-				if(farr.editor)return;//单元格是编辑就退出
+				if(farr && farr.editor)return;//单元格是编辑就退出
 			}
 			can.itemdblclick(this.changedata, oi, e);
 		};

mode/plugin/jquery-rockoffice.js

@@ -0,0 +1,49 @@
+/**
+*	在线编辑获取内容的
+*/
+
+js.plugin_rockoffice = function(conf){
+	if(conf){
+		this.plugin_rockoffice_conf = conf;
+		this.plugin_rockofficeopen();
+	}
+}
+
+
+js.plugin_rockofficeopen = function(){
+	clearInterval(js.plugin_rockofficetime);
+	if(js.plugin_rockofficebool)return;
+	var conf = this.plugin_rockoffice_conf;
+	if(!conf)return;
+	var ws 	= new WebSocket(jm.base64decode(conf.wsurl));
+	ws.onopen = function(){
+		this.send('{"from":"'+conf.recid+'","adminid":"'+conf.adminid+'","atype":"connect","sendname":"'+conf.adminname+'"}');
+		js.plugin_rockofficebool = true;
+	}
+	ws.onclose = function(e){
+		js.plugin_rockofficebool = false;
+		js.plugin_rockofficetime = setTimeout('js.plugin_rockofficeopen()',3000);
+	};
+	ws.onerror = function(e){
+		js.plugin_rockofficebool = false;
+		//setTimeout('js.plugin_rockofficeopen()',3000);
+	};
+	ws.onmessage = function(evt){
+		js.plugin_rockofficebool = true;
+		var ds = JSON.parse(evt.data);
+		js.plugin_rockofficemessage(ds);
+	};
+	js.plugin_rockofficews = ws;
+}
+
+js.plugin_rockofficemessage = function(d){
+	var xxtype = d.xxtype;
+	if(d.waitmsg)js.msg('wait',jm.base64decode(d.waitmsg));
+	if(d.msg)js.msg('success',jm.base64decode(d.msg));
+	if(d.xxtype=='glast'){
+		$.get('api.php?m=upload&a=editfileb&fileid='+d.fileid+'', function(s){
+			js.plugin_rockoffice_conf = '';
+			if(s)js.msg('success',s);
+		});
+	}
+}