Skip to content

Commit 979432e

Browse files
author
aritra_chakraborty
committed
RED-7973: Consolidated commit
1 parent b496f42 commit 979432e

File tree

4 files changed

+124
-109
lines changed

4 files changed

+124
-109
lines changed

‎.babelrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
"plugins": [
33
"add-module-exports",
44
],
5-
"presets": ["es2015"]
5+
"presets": ["env"]
66
}

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
"yards": "^0.1.4"
6969
},
7070
"dependencies": {
71-
"fusioncharts": "^3.12.0",
71+
"fusioncharts": "^3.13.0",
7272
"vue": "^2.3.3"
7373
}
7474
}

‎src/index.js‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,24 @@
11
import _FC from 'fusioncharts';
22
import _FCComponent from './vue-fusioncharts';
33

4-
let FCComponent = _FCComponent(_FC);
5-
6-
const install = (Vue, FC = _FC, ...options) => {
7-
4+
const addDep = (FC, _FC, modules) => {
5+
if ( FC ){
6+
if ( modules.getName || modules.name ){
7+
FC.addDep(modules);
8+
} else {
9+
modules(FC);
10+
}
11+
} else {
12+
modules(_FC);
13+
}
14+
};
15+
const install = (Vue, FC, ...options) => {
816
options && options.forEach && options.forEach((modules) => {
9-
modules(FC);
17+
addDep(FC, _FC, modules);
1018
});
11-
1219
let component = _FCComponent(FC);
1320

1421
Vue.component(component.name, component);
1522
};
1623

17-
export {FCComponent, install};
1824
export default install;

‎src/vue-fusioncharts.js‎

Lines changed: 109 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -3,122 +3,130 @@ const optionsMap = {
33
id: 'id',
44
width: 'width',
55
height: 'height',
6-
dataformat: 'dataFormat',
7-
datasource: 'dataSource',
6+
dataFormat: 'dataFormat',
7+
dataSource: 'dataSource',
88
events: 'events',
99
link: 'link',
10-
showdataloadingmessage: 'showDataLoadingMessage',
11-
showchartloadingmessage: 'showChartLoadingMessage',
12-
basechartmessagefont: 'baseChartMessageFont',
13-
basechartmessagefontsize: 'baseChartMessageFontSize',
14-
basechartmessagecolor: 'baseChartMessageColor',
15-
dataloadstartmessage: 'dataLoadStartMessage',
16-
dataloaderrormessage: 'dataLoadErrorMessage',
17-
datainvalidmessage: 'dataInvalidMessage',
18-
dataemptymessage: 'dataEmptyMessage',
19-
typenotsupportedmessage: 'typeNotSupportedMessage',
20-
loadmessage: 'loadMessage',
21-
rendererrormessage: 'renderErrorMessage',
22-
containerbackgroundcolor: 'containerBackgroundColor',
23-
containerbackgroundopacity: 'containerBackgroundOpacity',
24-
containerclassname: 'containerClassName',
25-
basechartmessageimagehalign: 'baseChartMessageImageHAlign',
26-
basechartmessageimagevalign: 'baseChartMessageImageVAlign',
27-
basechartmessageimagealpha: 'baseChartMessageImageAlpha',
28-
basechartmessageimagescale: 'baseChartMessageImageScale',
29-
typenotsupportedmessageimagehalign: 'typeNotSupportedMessageImageHAlign',
30-
typenotsupportedmessageimagevalign: 'typeNotSupportedMessageImageVAlign',
31-
typenotsupportedmessageimagealpha: 'typeNotSupportedMessageImageAlpha',
32-
typenotsupportedmessageimagescale: 'typeNotSupportedMessageImageScale',
33-
dataloaderrormessageimagehalign: 'dataLoadErrorMessageImageHAlign',
34-
dataloaderrormessageimagevalign: 'dataLoadErrorMessageImageVAlign',
35-
dataloaderrormessageimagealpha: 'dataLoadErrorMessageImageAlpha',
36-
dataloaderrormessageimagescale: 'dataLoadErrorMessageImageScale',
37-
dataloadstartmessageimagehalign: 'dataLoadStartMessageImageHAlign',
38-
dataloadstartmessageimagevalign: 'dataLoadStartMessageImageVAlign',
39-
dataloadstartmessageimagealpha: 'dataLoadStartMessageImageAlpha',
40-
dataloadstartmessageimagescale: 'dataLoadStartMessageImageScale',
41-
datainvalidmessageimagehalign: 'dataInvalidMessageImageHAlign',
42-
datainvalidmessageimagevalign: 'dataInvalidMessageImageVAlign',
43-
datainvalidmessageimagealpha: 'dataInvalidMessageImageAlpha',
44-
datainvalidmessageimagescale: 'dataInvalidMessageImageScale',
45-
dataemptymessageimagehalign: 'dataEmptyMessageImageHAlign',
46-
dataemptymessageimagevalign: 'dataEmptyMessageImageVAlign',
47-
dataemptymessageimagealpha: 'dataEmptyMessageImageAlpha',
48-
dataemptymessageimagescale: 'dataEmptyMessageImageScale',
49-
rendererrormessageimagehalign: 'renderErrorMessageImageHAlign',
50-
rendererrormessageimagevalign: 'renderErrorMessageImageVAlign',
51-
rendererrormessageimagealpha: 'renderErrorMessageImageAlpha',
52-
rendererrormessageimagescale: 'renderErrorMessageImageScale',
53-
loadmessageimagehalign: 'loadMessageImageHAlign',
54-
loadmessageimagevalign: 'loadMessageImageVAlign',
55-
loadmessageimagealpha: 'loadMessageImageAlpha',
56-
loadmessageimagescale: 'loadMessageImageScale'
10+
showDataLoadingMessage: 'showDataLoadingMessage',
11+
showChartLoadingMessage: 'showChartLoadingMessage',
12+
baseChartMessageFont: 'baseChartMessageFont',
13+
baseChartMessageFontSize: 'baseChartMessageFontSize',
14+
baseChartMessageColor: 'baseChartMessageColor',
15+
dataLoadStartMessage: 'dataLoadStartMessage',
16+
dataLoadErrorMessage: 'dataLoadErrorMessage',
17+
dataInvalidMessage: 'dataInvalidMessage',
18+
dataEmptyMessage: 'dataEmptyMessage',
19+
typeNotSupportedMessage: 'typeNotSupportedMessage',
20+
loadMessage: 'loadMessage',
21+
renderErrorMessage: 'renderErrorMessage',
22+
containerBackgroundColor: 'containerBackgroundColor',
23+
containerBackgroundOpacity: 'containerBackgroundOpacity',
24+
containerClassName: 'containerClassName',
25+
baseChartMessageImageHAlign: 'baseChartMessageImageHAlign',
26+
baseChartMessageImageVAlign: 'baseChartMessageImageVAlign',
27+
baseChartMessageImageAlpha: 'baseChartMessageImageAlpha',
28+
baseChartMessageImageScale: 'baseChartMessageImageScale',
29+
typeNotSupportedMessageImageHAlign: 'typeNotSupportedMessageImageHAlign',
30+
typeNotSupportedMessageImageVAlign: 'typeNotSupportedMessageImageVAlign',
31+
typeNotSupportedMessageImageAlpha: 'typeNotSupportedMessageImageAlpha',
32+
typeNotSupportedMessageImageScale: 'typeNotSupportedMessageImageScale',
33+
dataLoadErrorMessageImageHAlign: 'dataLoadErrorMessageImageHAlign',
34+
dataLoadErrorMessageImageVAlign: 'dataLoadErrorMessageImageVAlign',
35+
dataLoadErrorMessageImageAlpha: 'dataLoadErrorMessageImageAlpha',
36+
dataLoadErrorMessageImageScale: 'dataLoadErrorMessageImageScale',
37+
dataLoadStartMessageImageHAlign: 'dataLoadStartMessageImageHAlign',
38+
dataLoadStartMessageImageVAlign: 'dataLoadStartMessageImageVAlign',
39+
dataLoadStartMessageImageAlpha: 'dataLoadStartMessageImageAlpha',
40+
dataLoadStartMessageImageScale: 'dataLoadStartMessageImageScale',
41+
dataInvalidMessageImageHAlign: 'dataInvalidMessageImageHAlign',
42+
dataInvalidMessageImageVAlign: 'dataInvalidMessageImageVAlign',
43+
dataInvalidMessageImageAlpha: 'dataInvalidMessageImageAlpha',
44+
dataInvalidMessageImageScale: 'dataInvalidMessageImageScale',
45+
dataEmptyMessageImageHAlign: 'dataEmptyMessageImageHAlign',
46+
dataEmptyMessageImageVAlign: 'dataEmptyMessageImageVAlign',
47+
dataEmptyMessageImageAlpha: 'dataEmptyMessageImageAlpha',
48+
dataEmptyMessageImageScale: 'dataEmptyMessageImageScale',
49+
renderErrorMessageImageHAlign: 'renderErrorMessageImageHAlign',
50+
renderErrorMessageImageVAlign: 'renderErrorMessageImageVAlign',
51+
renderErrorMessageImageAlpha: 'renderErrorMessageImageAlpha',
52+
renderErrorMessageImageScale: 'renderErrorMessageImageScale',
53+
loadMessageImageHAlign: 'loadMessageImageHAlign',
54+
loadMessageImageVAlign: 'loadMessageImageVAlign',
55+
loadMessageImageAlpha: 'loadMessageImageAlpha',
56+
loadMessageImageScale: 'loadMessageImageScale'
5757
};
5858

5959
export default (FC) => {
6060
return {
6161
name: 'fusioncharts',
6262
template: '<div></div>',
63+
render: h => h('div'),
6364
props: {
6465
options: Object,
6566
type: String,
6667
id: String,
6768
width: '',
6869
height: '',
69-
dataformat: String,
70-
datasource: '',
70+
dataFormat: String,
71+
dataSource: '',
7172
events: Object,
7273
link: Object,
73-
showdataloadingmessage: Boolean,
74-
showchartloadingmessage: Boolean,
75-
basechartmessagefont: String,
76-
basechartmessagefontsize: String,
77-
basechartmessagecolor: String,
78-
dataloadstartmessage: String,
79-
dataloaderrormessage: String,
80-
datainvalidmessage: String,
81-
dataemptymessage: String,
82-
typenotsupportedmessage: String,
83-
loadmessage: String,
84-
rendererrormessage: String,
85-
containerbackgroundcolor: String,
86-
containerbackgroundopacity: Number,
87-
containerclassname: String,
88-
basechartmessageimagehalign: String,
89-
basechartmessageimagevalign: String,
90-
basechartmessageimagealpha: Number,
91-
basechartmessageimagescale: Number,
92-
typenotsupportedmessageimagehalign: String,
93-
typenotsupportedmessageimagevalign: String,
94-
typenotsupportedmessageimagealpha: Number,
95-
typenotsupportedmessageimagescale: Number,
96-
dataloaderrormessageimagehalign: String,
97-
dataloaderrormessageimagevalign: String,
98-
dataloaderrormessageimagealpha: Number,
99-
dataloaderrormessageimagescale: Number,
100-
dataloadstartmessageimagehalign: String,
101-
dataloadstartmessageimagevalign: String,
102-
dataloadstartmessageimagealpha: Number,
103-
dataloadstartmessageimagescale: Number,
104-
datainvalidmessageimagehalign: String,
105-
datainvalidmessageimagevalign: String,
106-
datainvalidmessageimagealpha: Number,
107-
datainvalidmessageimagescale: Number,
108-
dataemptymessageimagehalign: String,
109-
dataemptymessageimagevalign: String,
110-
dataemptymessageimagealpha: Number,
111-
dataemptymessageimagescale: Number,
112-
rendererrormessageimagehalign: String,
113-
rendererrormessageimagevalign: String,
114-
rendererrormessageimagealpha: Number,
115-
rendererrormessageimagescale: Number,
116-
loadmessageimagehalign: String,
117-
loadmessageimagevalign: String,
118-
loadmessageimagealpha: Number,
119-
loadmessageimagescale: Number
74+
showDataLoadingMessage: Boolean,
75+
showChartLoadingMessage: Boolean,
76+
baseChartMessageFont: String,
77+
baseChartMessageFontSize: String,
78+
baseChartMessageColor: String,
79+
dataLoadStartMessage: String,
80+
dataLoadErrorMessage: String,
81+
dataInvalidMessage: String,
82+
dataEmptyMessage: String,
83+
typeNotSupportedMessage: String,
84+
loadMessage: String,
85+
renderErrorMessage: String,
86+
containerBackgroundColor: String,
87+
containerBackgroundOpacity: Number,
88+
containerClassName: String,
89+
baseChartMessageImageHAlign: String,
90+
baseChartMessageImageVAlign: String,
91+
baseChartMessageImageAlpha: Number,
92+
baseChartMessageImageScale: Number,
93+
typeNotSupportedMessageImageHAlign: String,
94+
typeNotSupportedMessageImageVAlign: String,
95+
typeNotSupportedMessageImageAlpha: Number,
96+
typeNotSupportedMessageImageScale: Number,
97+
dataLoadErrorMessageImageHAlign: String,
98+
dataLoadErrorMessageImageVAlign: String,
99+
dataLoadErrorMessageImageAlpha: Number,
100+
dataLoadErrorMessageImageScale: Number,
101+
dataLoadStartMessageImageHAlign: String,
102+
dataLoadStartMessageImageVAlign: String,
103+
dataLoadStartMessageImageAlpha: Number,
104+
dataLoadStartMessageImageScale: Number,
105+
dataInvalidMessageImageHAlign: String,
106+
dataInvalidMessageImageVAlign: String,
107+
dataInvalidMessageImageAlpha: Number,
108+
dataInvalidMessageImageScale: Number,
109+
dataEmptyMessageImageHAlign: String,
110+
dataEmptyMessageImageVAlign: String,
111+
dataEmptyMessageImageAlpha: Number,
112+
dataEmptyMessageImageScale: Number,
113+
renderErrorMessageImageHAlign: String,
114+
renderErrorMessageImageVAlign: String,
115+
renderErrorMessageImageAlpha: Number,
116+
renderErrorMessageImageScale: Number,
117+
loadMessageImageHAlign: String,
118+
loadMessageImageVAlign: String,
119+
loadMessageImageAlpha: Number,
120+
loadMessageImageScale: Number
120121
},
121122
methods: {
123+
attachListeners: function (){
124+
Object.keys(this.$listeners).forEach((event)=>{
125+
this.chartObj.addEventListener(event, (e)=>{
126+
this.$emit(event, e);
127+
});
128+
});
129+
},
122130
setLastOptions: function (config) {
123131
this._oldOptions = Object.assign({}, config);
124132
},
@@ -151,6 +159,7 @@ export default (FC) => {
151159
}
152160

153161
THIS.chartObj = chartObj = new FC(config);
162+
this.attachListeners();
154163
chartObj.render();
155164
},
156165
updateChart: function () {
@@ -186,9 +195,9 @@ export default (FC) => {
186195
},
187196
deep: true
188197
},
189-
datasource: {
198+
dataSource: {
190199
handler: function () {
191-
this.chartObj.setChartData(this.datasource, this.dataformat);
200+
this.chartObj.setChartData(this.dataSource, this.dataFormat);
192201
},
193202
deep: true
194203
}

0 commit comments

Comments
 (0)