Skip to content

Commit d7b3978

Browse files
committed
Dev example fix
1 parent d9122bc commit d7b3978

File tree

2 files changed

+25
-180
lines changed

2 files changed

+25
-180
lines changed

example/ChartViewer.js

Lines changed: 24 additions & 179 deletions
Original file line numberDiff line numberDiff line change
@@ -1,207 +1,52 @@
11
import React from 'react';
22
import FusionCharts from 'fusioncharts';
33
import Charts from 'fusioncharts/fusioncharts.charts';
4-
import Column2d from 'fusioncharts/viz/column2d';
54
import TimeSeries from 'fusioncharts/fusioncharts.timeseries';
65
import FusionTheme from 'fusioncharts/themes/fusioncharts.theme.fusion';
76
import ReactFC from '../lib/ReactFC';
87

9-
// Charts(FusionCharts);
10-
// TimeSeries(FusionCharts);
11-
// OceanTheme(FusionCharts);
128
ReactFC.fcRoot(FusionCharts, Charts, TimeSeries, FusionTheme);
139

14-
const myDataSource = {
10+
const dataSource = {
1511
chart: {
16-
caption: "Harry's ss",
17-
subCaption: 'Top 5 stores in last month by revenue',
18-
numberPrefix: '$',
19-
theme: 'ocean'
12+
caption: 'Countries With Most Oil Reserves [2017-18]',
13+
subCaption: 'In MMbbl = One Million barrels',
14+
xAxisName: 'Country',
15+
yAxisName: 'Reserves (MMbbl)',
16+
numberSuffix: 'K',
17+
theme: 'fusion'
2018
},
2119
data: [
22-
{
23-
label: 'Bakersfield Central',
24-
value: '880000'
25-
},
26-
{
27-
label: 'Garden Groove harbour',
28-
value: '730000'
29-
},
30-
{
31-
label: 'Los Angeles Topanga',
32-
value: '590000'
33-
},
34-
{
35-
label: 'Compton-Rancho Dom',
36-
value: '520000'
37-
},
38-
{
39-
label: 'Daly City Serramonte',
40-
value: '330000'
41-
}
20+
{ label: 'Venezuela', value: '290' },
21+
{ label: 'Saudi', value: '260' },
22+
{ label: 'Canada', value: '180' },
23+
{ label: 'Iran', value: '140' },
24+
{ label: 'Russia', value: '115' },
25+
{ label: 'UAE', value: '100' },
26+
{ label: 'US', value: '30' },
27+
{ label: 'China', value: '30' }
4228
]
4329
};
4430

45-
// const jsonify = res => res.json();
46-
// const dataFetch = fetch(
47-
// 'https://raw.githubusercontent.com/fusioncharts/dev_centre_docs/fusiontime-beta-release/charts-resources/fusiontime/online-sales-single-series/data.json'
48-
// ).then(jsonify);
49-
// const schemaFetch = fetch(
50-
// 'https://raw.githubusercontent.com/fusioncharts/dev_centre_docs/fusiontime-beta-release/charts-resources/fusiontime/online-sales-single-series/schema.json'
51-
// ).then(jsonify);
31+
const chartConfigs = {
32+
type: 'column2d',
33+
width: 600,
34+
height: 400,
35+
dataFormat: 'json',
36+
dataSource
37+
};
5238

5339
class ChartViewer extends React.Component {
5440
constructor(props) {
5541
super(props);
5642

57-
this.state = {
58-
timeseriesDs: {
59-
type: 'column2d',
60-
renderAt: 'container',
61-
width: '90%',
62-
height: 350,
63-
dataSource: {
64-
chart: {
65-
caption: "Harry's ss",
66-
subCaption: 'Top 5 stores in last month by revenue',
67-
numberPrefix: '$'
68-
},
69-
data: [
70-
{
71-
label: 'Bakersfield Central',
72-
value: '880000'
73-
},
74-
{
75-
label: 'Garden Groove harbour',
76-
value: '730000'
77-
},
78-
{
79-
label: 'Los Angeles Topanga',
80-
value: '590000'
81-
},
82-
{
83-
label: 'Compton-Rancho Dom',
84-
value: '520000'
85-
},
86-
{
87-
label: 'Daly City Serramonte',
88-
value: '330000'
89-
}
90-
]
91-
}
92-
}
93-
};
94-
95-
this.onChangeSize = this.onChangeSize.bind(this);
96-
this.onFetchData = this.onFetchData.bind(this);
97-
this.onChangeCaption = this.onChangeCaption.bind(this);
98-
}
99-
100-
componentDidMount() {
101-
// this.onFetchData();
102-
}
103-
104-
onChangeSize() {
105-
const timeseriesDs = { ...this.state.timeseriesDs };
106-
timeseriesDs.height = 600;
107-
timeseriesDs.width = 600;
108-
this.setState({ timeseriesDs }, () => {
109-
console.log(this.state.timeseriesDs);
110-
});
111-
}
112-
113-
onFetchData() {
114-
// Promise.all([dataFetch, schemaFetch]).then(res => {
115-
// const data = res[0];
116-
// const schema = res[1];
117-
// const fusionTable = new FusionCharts.DataStore().createDataTable(
118-
// data,
119-
// schema
120-
// );
121-
// const timeseriesDs = Object.assign({}, this.state.timeseriesDs);
122-
// timeseriesDs.dataSource.data = fusionTable;
123-
// this.setState({
124-
// timeseriesDs
125-
// });
126-
// });
127-
}
128-
129-
onChangeCaption() {
130-
// console.log(this.state.timeseriesDs);
131-
const timeseriesDs = { ...this.state.timeseriesDs };
132-
timeseriesDs.dataSource.caption.text = 'Random';
133-
this.setState(
134-
{
135-
timeseriesDs
136-
},
137-
() => {
138-
// this.onChangeSize();
139-
}
140-
);
43+
this.state = {};
14144
}
14245

14346
render() {
14447
return (
14548
<div>
146-
{/* <ReactFC {...this.state} /> */}
147-
{this.state.timeseriesDs.dataSource.data ? (
148-
<ReactFC
149-
type="line"
150-
width="600"
151-
height="400"
152-
dataSource={{
153-
chart: {
154-
theme: 'fusion',
155-
caption: 'Total footfall in Bakersfield Central',
156-
subCaption: 'Last week',
157-
xAxisName: 'Day',
158-
yAxisName: 'No. of Visitors',
159-
lineThickness: '2',
160-
showXAxisLine: 1,
161-
showYAxisLine: 1,
162-
numDivLines: 7,
163-
numVDivLines: 7,
164-
showToolTip: 1
165-
},
166-
data: [
167-
{
168-
label: 'Mon',
169-
value: '15123'
170-
},
171-
{
172-
label: 'Tue',
173-
value: '14233'
174-
},
175-
{
176-
label: 'Wed',
177-
value: '23507'
178-
},
179-
{
180-
label: 'Thu',
181-
value: '9110'
182-
},
183-
{
184-
label: 'Fri',
185-
value: '15529'
186-
},
187-
{
188-
label: 'Sat',
189-
value: '20803'
190-
},
191-
{
192-
label: 'Sun',
193-
value: '19202'
194-
}
195-
]
196-
}}
197-
/>
198-
) : (
199-
'loading'
200-
)}
201-
<div>
202-
<button onClick={this.onChangeSize}>Change Size</button>
203-
<button onClick={this.onChangeCaption}>Change Caption</button>
204-
</div>
49+
<ReactFC {...chartConfigs} />
20550
</div>
20651
);
20752
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
"eslint-plugin-import": "^2.9.0",
5656
"eslint-plugin-jsx-a11y": "^6.0.3",
5757
"eslint-plugin-react": "^7.7.0",
58-
"fusioncharts": "^3.13.3",
58+
"fusioncharts": "^3.13.5-sr.1",
5959
"jest": "^22.4.2",
6060
"lodash": "^4.17.11",
6161
"prop-types": "^15.6.2",

0 commit comments

Comments
 (0)