diff --git a/src/components/G2/charts/Column/1.vue b/src/components/_G2/charts/Column/1.vue similarity index 100% rename from src/components/G2/charts/Column/1.vue rename to src/components/_G2/charts/Column/1.vue diff --git a/src/components/G2/charts/Line/1.vue b/src/components/_G2/charts/Line/1.vue similarity index 100% rename from src/components/G2/charts/Line/1.vue rename to src/components/_G2/charts/Line/1.vue diff --git a/src/components/G2/charts/Pie/1.vue b/src/components/_G2/charts/Pie/1.vue similarity index 100% rename from src/components/G2/charts/Pie/1.vue rename to src/components/_G2/charts/Pie/1.vue diff --git a/src/components/G2/index.js b/src/components/_G2/index.js similarity index 100% rename from src/components/G2/index.js rename to src/components/_G2/index.js diff --git a/src/components/G2/mixins/G2.js b/src/components/_G2/mixins/G2.js similarity index 100% rename from src/components/G2/mixins/G2.js rename to src/components/_G2/mixins/G2.js diff --git a/src/components/charts/G2/index.js b/src/components/charts/G2/index.js new file mode 100644 index 00000000..5c53fd7f --- /dev/null +++ b/src/components/charts/G2/index.js @@ -0,0 +1,3 @@ +// import Vue from 'vue' + +// Vue.component('G2Line1', resolve => { require(['@/components/G2/charts/Line/1.vue'], resolve) }) diff --git a/src/components/index.js b/src/components/index.js index f7ce81b2..e800037c 100644 --- a/src/components/index.js +++ b/src/components/index.js @@ -2,5 +2,5 @@ import './core' // 非核心组件 只是在很多演示页面中用到的组件 import './demo' -// 图表组件 -import './G2' +// 图表组件 G2 +import './charts/G2' diff --git a/src/pages/demo/chart/index2/index.vue b/src/pages/demo/chart/_index/index.vue similarity index 83% rename from src/pages/demo/chart/index2/index.vue rename to src/pages/demo/chart/_index/index.vue index 944de3b8..8526efe3 100644 --- a/src/pages/demo/chart/index2/index.vue +++ b/src/pages/demo/chart/_index/index.vue @@ -4,19 +4,19 @@
近年趋势
- 1 +
人员分布
- 2 +
人员分布
- 3 +
@@ -37,3 +37,4 @@ export default { + diff --git a/src/pages/demo/chart/index2/mixins/chart.js b/src/pages/demo/chart/_index/mixins/chart.js similarity index 100% rename from src/pages/demo/chart/index2/mixins/chart.js rename to src/pages/demo/chart/_index/mixins/chart.js diff --git a/src/pages/demo/chart/index2/mixins/layout.js b/src/pages/demo/chart/_index/mixins/layout.js similarity index 77% rename from src/pages/demo/chart/index2/mixins/layout.js rename to src/pages/demo/chart/_index/mixins/layout.js index d65f8ded..12d5e68c 100644 --- a/src/pages/demo/chart/index2/mixins/layout.js +++ b/src/pages/demo/chart/_index/mixins/layout.js @@ -2,7 +2,6 @@ export default { data () { return { layout: { - // 调整布局时 复制 layoutUpdatedHandler() 输出的日志到这里 layout: [ {'x': 0, 'y': 0, 'w': 8, 'h': 9, 'i': '0'}, {'x': 8, 'y': 0, 'w': 4, 'h': 9, 'i': '1'}, @@ -20,11 +19,6 @@ export default { } }, methods: { - // 更新指定的图表 - chartResize () { - this.$log('chartResize') - }, - // 布局组件发生变化 layoutUpdatedHandler (newLayout) { console.group('layoutUpdatedHandler') newLayout.forEach(e => { @@ -34,11 +28,15 @@ export default { }, // 改变尺寸 resizeHandler (name) { - this.chartResize() + this.$nextTick(() => { + this.$refs[name].resize() + }) }, // 改变尺寸完成 resizedHandler (name) { - this.chartResize() + this.$nextTick(() => { + this.$refs[name].resize() + }) } } } diff --git a/src/pages/demo/chart/index2/style.scss b/src/pages/demo/chart/_index/style.scss similarity index 100% rename from src/pages/demo/chart/index2/style.scss rename to src/pages/demo/chart/_index/style.scss diff --git a/src/pages/demo/chart/index/index.vue b/src/pages/demo/chart/index/index.vue index 8526efe3..3d701ab0 100644 --- a/src/pages/demo/chart/index/index.vue +++ b/src/pages/demo/chart/index/index.vue @@ -1,22 +1,13 @@