diff --git a/src/components/charts/G2/components/Bar/base.vue b/src/components/charts/G2/components/Bar/base.vue
new file mode 100644
index 00000000..c7b08880
--- /dev/null
+++ b/src/components/charts/G2/components/Bar/base.vue
@@ -0,0 +1,35 @@
+
+
+
+
+
+
diff --git a/src/components/charts/index.js b/src/components/charts/index.js
index 8d363576..ed4cdfdb 100644
--- a/src/components/charts/index.js
+++ b/src/components/charts/index.js
@@ -3,3 +3,4 @@ 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) })
diff --git a/src/mock/chart/G2Bar.js b/src/mock/chart/G2Bar.js
new file mode 100644
index 00000000..05498d4f
--- /dev/null
+++ b/src/mock/chart/G2Bar.js
@@ -0,0 +1,35 @@
+import Mock from 'mockjs'
+
+const r = (add = 0) => {
+ return Math.round(Math.random() * 100) + add
+}
+
+const returnMaker = (data = []) => {
+ return {
+ code: 0,
+ msg: '请求成功',
+ data
+ }
+}
+
+Mock.mock('/api/chart/G2Bar', 'post', ({body, type, url}) => {
+ const _body = JSON.parse(body)
+ switch (_body.type) {
+ // 基础折线图
+ case 'base': {
+ const year = ['3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月']
+ const data = year.map(e => ({
+ year: e,
+ value: r()
+ })).map(e => ({
+ x: e.year,
+ y: e.value
+ })).sort((a, b) => {
+ return a.y - b.y
+ })
+ return returnMaker(data)
+ }
+ default:
+ return {}
+ }
+})
diff --git a/src/mock/chart/index.js b/src/mock/chart/index.js
index da63eff5..e2b9f82f 100644
--- a/src/mock/chart/index.js
+++ b/src/mock/chart/index.js
@@ -1,2 +1,3 @@
+import './G2Bar'
import './G2Column'
import './G2Line'
diff --git a/src/pages/demo/chart/index/index.vue b/src/pages/demo/chart/index/index.vue
index 5e1251bf..242575a9 100644
--- a/src/pages/demo/chart/index/index.vue
+++ b/src/pages/demo/chart/index/index.vue
@@ -22,6 +22,13 @@
+
+
+
+
@@ -52,6 +59,12 @@ export default {
refName: 'G2ColumnBase',
data: [],
padding: [30, 40, 50, 50]
+ },
+ {
+ api: {url: '/api/chart/G2Bar', data: {type: 'base'}},
+ refName: 'G2BarBase',
+ data: [],
+ padding: [30, 40, 50, 50]
}
],
layout: {
@@ -59,7 +72,8 @@ export default {
layout: [
{'x': 0, 'y': 0, 'w': 4, 'h': 7, 'i': '0'},
{'x': 4, 'y': 0, 'w': 4, 'h': 7, 'i': '1'},
- {'x': 8, 'y': 0, 'w': 4, 'h': 7, 'i': '2'}
+ {'x': 8, 'y': 0, 'w': 4, 'h': 7, 'i': '2'},
+ {'x': 0, 'y': 7, 'w': 4, 'h': 7, 'i': '3'}
],
colNum: 12,
rowHeight: 30,