发布v2.6.9版本
This commit is contained in:
12
mode/bootstrapplugin/jquery-bootstable.js
vendored
12
mode/bootstrapplugin/jquery-bootstable.js
vendored
@@ -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);
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user