Skip to content

Commit

Permalink
Merge branch 'hotfix/filename'
Browse files Browse the repository at this point in the history
Former-commit-id: c6da601fd371fb018cd56f0a877edb791a76211b [formerly c6da601fd371fb018cd56f0a877edb791a76211b [formerly c6da601fd371fb018cd56f0a877edb791a76211b [formerly c6da601fd371fb018cd56f0a877edb791a76211b [formerly d4363f2 [formerly 6a277380c1ce7e40f530235508d2fd8890b65234]]]]]
Former-commit-id: 78abd15
Former-commit-id: 80eed26
Former-commit-id: 6addccb6e8389ae9af9511d4a2e5c1aa56685c41 [formerly 68642bcd68e99ff0966a32428737cdb5c8584d7b]
Former-commit-id: ca3d9eaa8496c4890f314995592cd2d32ac5afeb
Former-commit-id: 432b0c2d1c95517c2a203c1ba1714b9762e2a0fc
Former-commit-id: eb6d53454dca48e523f396613778ed4eed5d49d0
Former-commit-id: 5d0a3dcbfcba7ce6849a42ddaa4aebf1a032d337
Former-commit-id: 4ede9e8f149c57210b868e3ebf95e01aaedf60eb
  • Loading branch information
FairyEver committed Nov 17, 2018
2 parents b32a877 + 50ee49c commit ab40de4
Show file tree
Hide file tree
Showing 197 changed files with 946 additions and 234 deletions.
12 changes: 11 additions & 1 deletion src/pages/demo/business/index/index.vue
Original file line number Diff line number Diff line change
@@ -1,9 +1,19 @@
<template>
<d2-container>
<d2-container :filename="filename">
<d2-page-cover
title="示例"
sub-title="供借鉴和参考的页面">
<img src="./image/icon.png">
</d2-page-cover>
</d2-container>
</template>

<script>
export default {
data () {
return {
filename: __filename
}
}
}
</script>
3 changes: 2 additions & 1 deletion src/pages/demo/business/table/1/index.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<d2-container>
<d2-container :filename="filename">
<demo-page-header
slot="header"
@submit="handleSubmit"
Expand Down Expand Up @@ -28,6 +28,7 @@ export default {
},
data () {
return {
filename: __filename,
table: [],
loading: false,
page: {
Expand Down
12 changes: 11 additions & 1 deletion src/pages/demo/charts/index/index.vue
Original file line number Diff line number Diff line change
@@ -1,9 +1,19 @@
<template>
<d2-container>
<d2-container :filename="filename">
<d2-page-cover
title="图表"
sub-title="集成图表组件">
<img src="./image/icon.png">
</d2-page-cover>
</d2-container>
</template>

<script>
export default {
data () {
return {
filename: __filename
}
}
}
</script>
3 changes: 2 additions & 1 deletion src/pages/demo/charts/list/bar/demo1/index.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<d2-container>
<d2-container :filename="filename">
<template slot="header">一般</template>
<div class="inner">
<ve-bar :data="chartData" v-bind="pubSetting"></ve-bar>
Expand All @@ -18,6 +18,7 @@ export default {
],
data () {
return {
filename: __filename,
chartData: {
columns: ['日期', '访问用户', '下单用户', '下单率'],
rows: [
Expand Down
3 changes: 2 additions & 1 deletion src/pages/demo/charts/list/bar/demo2/index.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<d2-container>
<d2-container :filename="filename">
<template slot="header">指定指标维度</template>
<div class="inner">
<ve-bar :data="chartData" :settings="chartSettings" v-bind="pubSetting"></ve-bar>
Expand All @@ -22,6 +22,7 @@ export default {
metrics: ['访问用户']
}
return {
filename: __filename,
chartData: {
columns: ['日期', '访问用户', '下单用户', '下单率'],
rows: [
Expand Down
3 changes: 2 additions & 1 deletion src/pages/demo/charts/list/bar/demo3/index.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<d2-container>
<d2-container :filename="filename">
<template slot="header">排序条形图</template>
<div class="inner">
<ve-bar :data="chartData" :settings="chartSettings" v-bind="pubSetting"></ve-bar>
Expand All @@ -25,6 +25,7 @@ export default {
}
}
return {
filename: __filename,
chartData: {
columns: ['日期', '访问用户', '下单用户', '下单率'],
rows: [
Expand Down
3 changes: 2 additions & 1 deletion src/pages/demo/charts/list/bar/demo4/index.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<d2-container>
<d2-container :filename="filename">
<template slot="header">堆叠条形图</template>
<div class="inner">
<ve-bar :data="chartData" :settings="chartSettings" v-bind="pubSetting"></ve-bar>
Expand All @@ -23,6 +23,7 @@ export default {
}
}
return {
filename: __filename,
chartData: {
columns: ['日期', '访问用户', '下单用户', '下单率'],
rows: [
Expand Down
3 changes: 2 additions & 1 deletion src/pages/demo/charts/list/bar/demo5/index.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<d2-container>
<d2-container :filename="filename">
<template slot="header">纵轴为连续的数值轴</template>
<div class="inner">
<ve-bar :data="chartData" :settings="chartSettings" v-bind="pubSetting"></ve-bar>
Expand All @@ -21,6 +21,7 @@ export default {
yAxisType: 'value'
}
return {
filename: __filename,
chartData: {
columns: ['日期', '访问用户'],
rows: [
Expand Down
3 changes: 2 additions & 1 deletion src/pages/demo/charts/list/candle/demo1/index.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<d2-container>
<d2-container :filename="filename">
<template slot="header">一般</template>
<div class="inner">
<ve-candle :data="chartData" v-bind="pubSetting"></ve-candle>
Expand All @@ -18,6 +18,7 @@ export default {
],
data () {
return {
filename: __filename,
chartData: {
columns: ['日期', 'open', 'close', 'lowest', 'highest', 'vol'],
rows: [
Expand Down
3 changes: 2 additions & 1 deletion src/pages/demo/charts/list/candle/demo2/index.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<d2-container>
<d2-container :filename="filename">
<template slot="header">显示 MA VOL</template>
<div class="inner">
<ve-candle :data="chartData" :settings="chartSettings" v-bind="pubSetting"></ve-candle>
Expand All @@ -22,6 +22,7 @@ export default {
showVol: true
}
return {
filename: __filename,
chartData: {
columns: ['日期', 'open', 'close', 'lowest', 'highest', 'vol'],
rows: [
Expand Down
3 changes: 2 additions & 1 deletion src/pages/demo/charts/list/candle/demo3/index.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<d2-container>
<d2-container :filename="filename">
<template slot="header">修改指标名和图例文字</template>
<div class="inner">
<ve-candle :data="chartData" :settings="chartSettings" v-bind="pubSetting"></ve-candle>
Expand Down Expand Up @@ -29,6 +29,7 @@ export default {
showDataZoom: true
}
return {
filename: __filename,
chartData: {
columns: ['日期', 'open', 'close', 'lowest', 'highest', 'vol'],
rows: [
Expand Down
3 changes: 2 additions & 1 deletion src/pages/demo/charts/list/funnel/demo1/index.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<d2-container>
<d2-container :filename="filename">
<template slot="header">一般</template>
<div class="inner">
<ve-funnel :data="chartData" v-bind="pubSetting"></ve-funnel>
Expand All @@ -18,6 +18,7 @@ export default {
],
data () {
return {
filename: __filename,
chartData: {
columns: ['状态', '数值'],
rows: [
Expand Down
3 changes: 2 additions & 1 deletion src/pages/demo/charts/list/funnel/demo2/index.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<d2-container>
<d2-container :filename="filename">
<template slot="header">金字塔</template>
<div class="inner">
<ve-funnel :data="chartData" :settings="chartSettings" v-bind="pubSetting"></ve-funnel>
Expand All @@ -21,6 +21,7 @@ export default {
ascending: true
}
return {
filename: __filename,
chartData: {
columns: ['状态', '数值'],
rows: [
Expand Down
3 changes: 2 additions & 1 deletion src/pages/demo/charts/list/gauge/demo1/index.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<d2-container>
<d2-container :filename="filename">
<template slot="header">一般</template>
<div class="inner">
<ve-gauge :data="chartData" v-bind="pubSetting"></ve-gauge>
Expand All @@ -18,6 +18,7 @@ export default {
],
data () {
return {
filename: __filename,
chartData: {
columns: ['type', 'a', 'b', 'value'],
rows: [
Expand Down
3 changes: 2 additions & 1 deletion src/pages/demo/charts/list/heatmap/demo1/index.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<d2-container>
<d2-container :filename="filename">
<template slot="header">一般</template>
<div class="inner">
<ve-heatmap :data="chartData" v-bind="pubSetting"></ve-heatmap>
Expand All @@ -18,6 +18,7 @@ export default {
],
data () {
return {
filename: __filename,
chartData: {
columns: ['时间', '地点', '人数'],
rows: [
Expand Down
3 changes: 2 additions & 1 deletion src/pages/demo/charts/list/heatmap/demo2/index.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<d2-container>
<d2-container :filename="filename">
<template slot="header">地图热力图</template>
<div class="inner">
<ve-heatmap :data="chartData" :settings="chartSettings" v-bind="pubSetting"></ve-heatmap>
Expand Down Expand Up @@ -38,6 +38,7 @@ export default {
}
}
return {
filename: __filename,
chartData: {
columns: ['lat', 'lng', '人数'],
rows: [
Expand Down
3 changes: 2 additions & 1 deletion src/pages/demo/charts/list/histogram/demo1/index.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<d2-container>
<d2-container :filename="filename">
<template slot="header">一般</template>
<div class="inner">
<ve-histogram :data="chartData" v-bind="pubSetting"></ve-histogram>
Expand All @@ -18,6 +18,7 @@ export default {
],
data () {
return {
filename: __filename,
chartData: {
columns: ['日期', '访问用户', '下单用户', '下单率'],
rows: [
Expand Down
3 changes: 2 additions & 1 deletion src/pages/demo/charts/list/histogram/demo2/index.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<d2-container>
<d2-container :filename="filename">
<template slot="header">设置显示的指标维度</template>
<div class="inner">
<ve-histogram :data="chartData" :settings="chartSettings" v-bind="pubSetting"></ve-histogram>
Expand All @@ -22,6 +22,7 @@ export default {
dimension: ['日期']
}
return {
filename: __filename,
chartData: {
columns: ['日期', '访问用户', '下单用户', '下单率'],
rows: [
Expand Down
3 changes: 2 additions & 1 deletion src/pages/demo/charts/list/histogram/demo3/index.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<d2-container>
<d2-container :filename="filename">
<template slot="header">柱状图+折线图</template>
<div class="inner">
<ve-histogram :data="chartData" :settings="chartSettings" v-bind="pubSetting"></ve-histogram>
Expand All @@ -21,6 +21,7 @@ export default {
showLine: ['下单用户']
}
return {
filename: __filename,
chartData: {
columns: ['日期', '访问用户', '下单用户', '下单率'],
rows: [
Expand Down
3 changes: 2 additions & 1 deletion src/pages/demo/charts/list/histogram/demo4/index.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<d2-container>
<d2-container :filename="filename">
<template slot="header">堆叠柱状图</template>
<div class="inner">
<ve-histogram :data="chartData" :settings="chartSettings" v-bind="pubSetting"></ve-histogram>
Expand All @@ -21,6 +21,7 @@ export default {
stack: { '用户': ['访问用户', '下单用户'] }
}
return {
filename: __filename,
chartData: {
columns: ['日期', '访问用户', '下单用户', '下单率'],
rows: [
Expand Down
13 changes: 7 additions & 6 deletions src/pages/demo/charts/list/histogram/demo5/index.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<d2-container>
<d2-container :filename="filename">
<template slot="header">默认显示柱状图数据</template>
<div class="inner">
<ve-histogram :data="chartData" :extend="extend" v-bind="pubSetting"></ve-histogram>
Expand All @@ -17,12 +17,13 @@ export default {
list
],
data () {
this.extend = {
series: {
label: { show: true, position: 'top' }
}
}
return {
filename: __filename,
extend: {
series: {
label: { show: true, position: 'top' }
}
},
chartData: {
columns: ['日期', '访问用户', '下单用户', '下单率'],
rows: [
Expand Down
3 changes: 2 additions & 1 deletion src/pages/demo/charts/list/histogram/demo6/index.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<d2-container>
<d2-container :filename="filename">
<template slot="header">横轴为连续的数值轴</template>
<div class="inner">
<ve-histogram :data="chartData" :settings="chartSettings" v-bind="pubSetting"></ve-histogram>
Expand All @@ -21,6 +21,7 @@ export default {
xAxisType: 'value'
}
return {
filename: __filename,
chartData: {
columns: ['日期', '访问用户', '下单用户', '下单率'],
rows: [
Expand Down
5 changes: 3 additions & 2 deletions src/pages/demo/charts/list/line/demo1/index.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<d2-container>
<d2-container :filename="filename">
<template slot="header">一般</template>
<div class="inner">
<ve-line :data="chartData" v-bind="pubSetting"></ve-line>
Expand All @@ -16,8 +16,9 @@ export default {
mixins: [
list
],
data: function () {
data () {
return {
filename: __filename,
chartData: {
columns: ['日期', '访问用户', '下单用户', '下单率'],
rows: [
Expand Down
11 changes: 6 additions & 5 deletions src/pages/demo/charts/list/line/demo2/index.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<d2-container>
<d2-container :filename="filename">
<template slot="header">横坐标的倾斜</template>
<div class="inner">
<ve-line :data="chartData" :extend="extend" v-bind="pubSetting"></ve-line>
Expand All @@ -16,11 +16,12 @@ export default {
mixins: [
list
],
data: function () {
this.extend = {
'xAxis.0.axisLabel.rotate': 45
}
data () {
return {
filename: __filename,
extend: {
'xAxis.0.axisLabel.rotate': 45
},
chartData: {
columns: ['日期', '访问用户', '下单用户', '下单率'],
rows: [
Expand Down
Loading

0 comments on commit ab40de4

Please sign in to comment.