← All changes | js/render.js +42 -25 3.0.9 → 3.0.11 View file →

		@@ -181,35 +181,30 @@
181	181	table.addRow(row);
182	182	}
183	183
184	184	if (settings.series) {
185		- for (i = 0; i < settings.series.length; i++) {
186		- format = settings.series[i].format;
187		- if (!format || format === '' || !series[i + 1]) {
188		- continue;
189		- }
190		-
191		- formatter = null;
192		- switch (series[i + 1].type) {
193		- case 'number':
194		- formatter = new g.visualization.NumberFormat({pattern: format});
195		- break;
196		- case 'date':
197		- case 'datetime':
198		- case 'timeofday':
199		- formatter = new g.visualization.DateFormat({pattern: format});
200		- break;
201		- }
202		-
203		- if (formatter) {
204		- formatter.format(table, i + 1);
205		- }
206		- }
	185	+ switch(chart.type){
	186	+ case 'table':
	187	+ for(i in settings.series){
	188	+ i = parseInt(i);
	189	+ if (!series[i + 1]) {
	190	+ continue;
	191	+ }
	192	+ v.format_data(table, series[i + 1].type, settings.series[i].format, i + 1);
	193	+ }
	194	+ break;
	195	+ default:
	196	+ for (i = 0; i < settings.series.length; i++) {
	197	+ if (!series[i + 1]) {
	198	+ continue;
	199	+ }
	200	+ v.format_data(table, series[i + 1].type, settings.series[i].format, i + 1);
	201	+ }
	202	+ break;
	203	+ }
207	204	} else if (chart.type === 'pie' && settings.format && settings.format !== '') {
208		- formatter = new g.visualization.NumberFormat({pattern: settings.format});
209		- formatter.format(table, 1);
	205	+ v.format_data(table, 'number', settings.format, 1);
210	206	}
211		-
212	207	v.override(settings);
213	208
214	209	g.visualization.events.addListener(render, 'ready', function () {
215	210	var arr = id.split('-');
		@@ -223,8 +218,30 @@
223	218	});
224	219
225	220	render.draw(table, settings);
226	221	};
	222	+
	223	+ v.format_data = function(table, type, format, index) {
	224	+ if (!format || format === '') {
	225	+ return;
	226	+ }
	227	+
	228	+ var formatter = null;
	229	+ switch (type) {
	230	+ case 'number':
	231	+ formatter = new g.visualization.NumberFormat({pattern: format});
	232	+ break;
	233	+ case 'date':
	234	+ case 'datetime':
	235	+ case 'timeofday':
	236	+ formatter = new g.visualization.DateFormat({pattern: format});
	237	+ break;
	238	+ }
	239	+
	240	+ if (formatter) {
	241	+ formatter.format(table, index);
	242	+ }
	243	+ };
227	244
228	245	v.override = function(settings) {
229	246	if (settings.manual) {
230	247	try{