提交 095a8f61 编写于 作者: 蔡祥熠

Merge branch 'fix/Mgrid' into 'develop'

Merge of fix/Mgrid 优化MGrid to develop

See merge request o2oa/o2oa!1328
......@@ -219,13 +219,14 @@ var MGrid = new Class({
this.table.set( tableAttr );
this.fireEvent( "postCreateTable", [this] );
}
return this.table;
},
createHead : function( itemData ){
if( !this.options.isCreateTh )return;
if( this.thTemplate ){
this.createHead_byTemplate( itemData );
return this.createHead_byTemplate( itemData );
}else{
this.createHead_noTemplate( itemData );
return this.createHead_noTemplate( itemData );
}
},
createHead_byTemplate : function( itemData ){
......@@ -247,6 +248,7 @@ var MGrid = new Class({
if( add_button )this.createAddButton( add_button );
}
th.inject( this.table );
return th;
},
createHead_noTemplate : function( itemData ){
var tr = this.tableHead = new Element("tr");
......@@ -283,6 +285,7 @@ var MGrid = new Class({
}
tr.inject( this.table );
this.fireEvent("postCreateHead", [tr] );
return tr;
},
createAddButton : function( container ){
var button = new Element("div", { title : MWF.xApplication.Template.LP.MGrid.add }).inject( container );
......@@ -303,9 +306,12 @@ var MGrid = new Class({
},
addTrs : function( count ){
if( 100 < count )count = 100;
var trObj, trObjList = [];
for( var i=0 ; i<count; i++ ){
this.createTr( this.itemTemplate, true );
trObj = this.createTr( this.itemTemplate, true );
trObjList.push( trObj );
}
return trObjList;
},
appendTr : function( d, isNew, unid, sourceData ){
var items = this.itemTemplate;
......@@ -314,10 +320,11 @@ var MGrid = new Class({
items[ it ].value = d[it];
}
}
this.createTr( items, isNew, unid, sourceData );
var trObj = this.createTr( items, isNew, unid, sourceData );
for( var it in this.itemTemplate ){
this.itemTemplate[it].value = "";
}
return trObj;
},
getTrCounts : function(){
return this.trList.length;
......@@ -325,7 +332,7 @@ var MGrid = new Class({
createTr : function( itemData, isNew, unid, sourceData ){
if( this.options.maxTrCount ){
if( this.getTrCounts() < this.options.maxTrCount ){
this._createTr( itemData, isNew, unid, sourceData )
return this._createTr( itemData, isNew, unid, sourceData )
}else{
if( this.app && this.app.notice ){
var text = MWF.xApplication.Template.LP.MGrid.addMaxLimitText.replace("{count}", this.options.maxTrCount);
......@@ -333,7 +340,7 @@ var MGrid = new Class({
}
}
}else{
this._createTr( itemData, isNew, unid, sourceData )
return this._createTr( itemData, isNew, unid, sourceData )
}
},
_createTr : function( itemData, isNew, unid, sourceData ){
......@@ -386,6 +393,8 @@ var MGrid = new Class({
}
this.fireEvent("postCreateTr",[this, trObj]);
return trObj;
},
replaceTr : function( oldTrObjOr_Index, data, isNew, unid, sourceData ){
var oldTrObj;
......@@ -445,6 +454,8 @@ var MGrid = new Class({
for( var it in this.itemTemplate ){
this.itemTemplate[it].value = "";
}
return trObj;
},
createRemoveButton : function( trObj, container ){
var button = new Element("div", { title : MWF.xApplication.Template.LP.MGrid.delete }).inject( container );
......@@ -507,9 +518,9 @@ var MGrid = new Class({
var self = this;
this.trIndex ++;
if( this.trTemplate ){
this.createTr_textOnly_byTemplate( itemData );
return this.createTr_textOnly_byTemplate( itemData );
}else{
this.createTr_textOnly_noTemplate( itemData );
return this.createTr_textOnly_noTemplate( itemData );
}
},
createTr_textOnly_byTemplate : function( itemData ){
......@@ -543,6 +554,8 @@ var MGrid = new Class({
sequenceContainers.set("text", this.trIndex );
tr.inject( this.table );
return tr;
},
createTr_textOnly_noTemplate : function( itemData ){
var tr = new Element("tr" , { "data-id" : "_"+this.trIndex });
......@@ -578,6 +591,7 @@ var MGrid = new Class({
}
tr.inject( this.table );
return tr;
},
getResult : function( verify, separator, isAlert, onlyModified, keepAllData ){
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册