diff --git a/src/components/charts/G2/components/Pie/base.vue b/src/components/charts/G2/components/Pie/base.vue index 1c4a30b4..8f6b655e 100644 --- a/src/components/charts/G2/components/Pie/base.vue +++ b/src/components/charts/G2/components/Pie/base.vue @@ -26,6 +26,7 @@ export default { }, // 初始化图表 init () { + console.log('pie base') // mixin 中提供 creatChart this.creatChart() // 本组件的特殊设置 diff --git a/src/components/charts/index.js b/src/components/charts/index.js index ed4cdfdb..54c8c1ae 100644 --- a/src/components/charts/index.js +++ b/src/components/charts/index.js @@ -2,5 +2,9 @@ import Vue from 'vue' Vue.component('G2LineBase', resolve => { require(['@/components/charts/G2/components/Line/base.vue'], resolve) }) Vue.component('G2LineStep', resolve => { require(['@/components/charts/G2/components/Line/step.vue'], resolve) }) + Vue.component('G2ColumnBase', resolve => { require(['@/components/charts/G2/components/Column/base.vue'], resolve) }) + Vue.component('G2BarBase', resolve => { require(['@/components/charts/G2/components/Bar/base.vue'], resolve) }) + +Vue.component('G2PieBase', resolve => { require(['@/components/charts/G2/components/Pie/base.vue'], resolve) }) diff --git a/src/mock/chart/G2Pie.js b/src/mock/chart/G2Pie.js new file mode 100644 index 00000000..b11f442f --- /dev/null +++ b/src/mock/chart/G2Pie.js @@ -0,0 +1,14 @@ +import Mock from 'mockjs' +import * as fn from './_fn' + +Mock.mock('/api/chart/G2Pie', 'post', ({body, type, url}) => { + const _body = JSON.parse(body) + switch (_body.type) { + // 基础折线图 + case 'base': { + return fn.returnMaker(['中国', '日本', '美国', '法国', '英国'].map(e => ({item: e, count: fn.r()}))) + } + default: + return {} + } +}) diff --git a/src/mock/chart/index.js b/src/mock/chart/index.js index e2b9f82f..e2907dde 100644 --- a/src/mock/chart/index.js +++ b/src/mock/chart/index.js @@ -1,3 +1,4 @@ import './G2Bar' import './G2Column' import './G2Line' +import './G2Pie' diff --git a/src/pages/demo/chart/index/index.vue b/src/pages/demo/chart/index/index.vue index abc034e8..9bc44d73 100644 --- a/src/pages/demo/chart/index/index.vue +++ b/src/pages/demo/chart/index/index.vue @@ -33,7 +33,7 @@ - + @@ -79,6 +79,12 @@ export default { refName: 'G2BarBase', data: [], padding: [30, 40, 50, 50] + }, + { + api: {url: '/api/chart/G2Pie', data: {type: 'base'}}, + refName: 'G2PieBase', + data: [], + padding: [30, 40, 50, 50] } ], layout: {