Roo.each(merge, function(c) {
var rc = _t.rangeToRC(c.textContent);
- //Roo.log(JSON.stringify(rc))
+ //Roo.log(JSON.stringify(rc));
if (typeof(_t.grid[rc[0].r][rc[0].c]) == 'undefined') {
- _t.grid[rc[0].r][rc[0].c] = Roo.applyIf({ r : rc[0].r, c : rc[0].c }, _t.defaultCell);
+ //Roo.log(["creating empty cell for ",rc[0].r, rc[0].c ]);
+ _t.createCell(rc[0].r, rc[0].c );
+ //_t.grid[rc[0].r][rc[0].c] = //Roo.applyIf({ r : rc[0].r, c : rc[0].c }, _t.defaultCell);
}
_t.grid[rc[0].r][rc[0].c].colspan = (rc[1].c - rc[0].c) + 1;
_t.grid[rc[0].r][rc[0].c].rowspan = (rc[1].r - rc[0].r) + 1;
for(var r = (rc[0].r); r < (rc[1].r+1); r++) {
- for(var c = rc[0].c; c < (rc[1].c+1); c++) {
+ for(var cc = rc[0].c; cc < (rc[1].c+1); cc++) {
//Roo.log('adding alias : ' + r+','+c);
- _t.grid[r][c] = _t.grid[rc[0].r][rc[0].c];
+ _t.grid[r][cc] = _t.grid[rc[0].r][rc[0].c];
}
}
for (var c = s.c; c < s.c1;c++) {
if (c > _t.cmax) continue;
- if (typeof(_t.grid[r][c]) == 'undefined') _t.grid[r][c] = Roo.applyIf({ r: r , c : c }, _t.defaultCell);
+ if (typeof(_t.grid[r][c]) == 'undefined') {
+ _t.createCell(r,c);
+ //_t.grid[r][c] = Roo.applyIf({ r: r , c : c }, _t.defaultCell);
+ }
var g=_t.grid[r][c];
if (typeof(g.cls) =='undefined') {
g.cls = [];
for (var r = 0; r < this.rmax;r++) {
out += '<tr style="height:'+this.rowInfo[r]+'px;">';
for (var c = 0; c < this.cmax;c++) {
- var g = (typeof(grid[r][c]) == 'undefined') ? this.defaultCell : grid[r][c];
+ if (typeof(grid[r][c]) == 'undefined') {
+ this.createCell(r,c);
+
+ }
+ var g = grid[r][c];
if (typeof(g.cls) =='undefined') g.cls = [];
var w= calcWidth(c,g.colspan);
+
+ var value = g.value[0] == '=' ? 'CALCULATED' : g.value;
+
+ try {
+ if(
+ g.styles[0].firstElementChild.getAttribute('Format') == "D\\-MMM\\-YYYY;@" &&
+ g.value[0] != '=' &&
+ !isNaN(value * 1) &&
+ value != 0
+ ){
+ value = new Date(value * 24 * 60 * 60 * 1000 + new Date('1899-12-30').getTime()).format('d-M-Y');
+ }
+
+ } catch(e) {
+
+ }
+
out+=String.format('<td colspan="{0}" rowspan="{1}" class="{4}"><div style="{3}">{2}</div></td>',
- g.colspan, g.rowspan, g.value,
+ g.colspan, g.rowspan, value,
'overflow:hidden;' +
'width:'+w+'px;' +