diff --git a/src/pages/demo/chart/index/components/ChartCardHeader.vue b/src/pages/demo/chart/index/components/ChartCardHeader.vue index 9b13f8df..ac631360 100644 --- a/src/pages/demo/chart/index/components/ChartCardHeader.vue +++ b/src/pages/demo/chart/index/components/ChartCardHeader.vue @@ -2,9 +2,11 @@
{{title}} - - - + +
@@ -17,6 +19,11 @@ export default { required: false, default: '' } + }, + methods: { + handleRefresh () { + this.$emit('refresh') + } } } diff --git a/src/pages/demo/chart/index/index.vue b/src/pages/demo/chart/index/index.vue index f8834c31..cb333758 100644 --- a/src/pages/demo/chart/index/index.vue +++ b/src/pages/demo/chart/index/index.vue @@ -8,7 +8,8 @@ + title="近年行情" + @refresh="handleRefreshData('G2LineBase1')"> @@ -18,16 +19,80 @@ diff --git a/src/pages/demo/chart/index/mixins/chart.js b/src/pages/demo/chart/index/mixins/chart.js deleted file mode 100644 index c24e23c5..00000000 --- a/src/pages/demo/chart/index/mixins/chart.js +++ /dev/null @@ -1,30 +0,0 @@ -export default { - data () { - return { - chart: [ - { - data: [], - padding: [30, 40, 50, 50] - } - ] - } - }, - mounted () { - // 请求图表数据 - this.syncData() - }, - methods: { - // 请求图表数据 - syncData () { - const api = [ - {url: '/api/chart/G2Line', data: {code: 1}} - ] - this.$axios.all(api.map(e => this.$axios.post(e.url, e.data))) - .then(this.$axios.spread((...res) => { - res.forEach((e, index) => { - this.chart[index].data = e - }) - })) - } - } -} diff --git a/src/pages/demo/chart/index/mixins/layout.js b/src/pages/demo/chart/index/mixins/layout.js deleted file mode 100644 index c68a03dc..00000000 --- a/src/pages/demo/chart/index/mixins/layout.js +++ /dev/null @@ -1,46 +0,0 @@ -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'}, - {'x': 0, 'y': 9, 'w': 4, 'h': 7, 'i': '2'} - ], - colNum: 12, - rowHeight: 30, - isDraggable: true, - isResizable: true, - isMirrored: false, - verticalCompact: true, - margin: [10, 10], - useCssTransforms: true - } - } - }, - methods: { - // 更新指定的图表 - chartResize (name) { - this.$nextTick(() => { - this.$refs[name].resize() - }) - }, - // 布局组件发生变化 - layoutUpdatedHandler (newLayout) { - console.group('layoutUpdatedHandler') - newLayout.forEach(e => { - console.log(`{'x': ${e.x}, 'y': ${e.y}, 'w': ${e.w}, 'h': ${e.h}, 'i': '${e.i}'},`) - }) - console.groupEnd() - }, - // 改变尺寸 - handleResize (name) { - // this.chartResize(name) - }, - // 改变尺寸完成 - handleResized (name) { - this.chartResize(name) - } - } -}