From 914f5ae8690307ad36cdce5ca992eefbf3ff7ca9 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Wed, 27 Jun 2018 10:53:38 +0800
Subject: [PATCH] no message

Former-commit-id: 46bfd534b20379635bff085ca82623cf90b9093c [formerly 46bfd534b20379635bff085ca82623cf90b9093c [formerly 46bfd534b20379635bff085ca82623cf90b9093c [formerly 46bfd534b20379635bff085ca82623cf90b9093c [formerly 3f77a80be6105a7727fb6807a45bd1ba8dac940f [formerly 86daa47d9e44a393ecd2425040402eabaa51909a]]]]]
Former-commit-id: 51d9f3fc503e0bac96e5882288a0ac3aeaa3b468
Former-commit-id: 3f3bb76bba52a4c51ddfed6bac0c6e94eae6d024
Former-commit-id: a728a59f4b1092f292c318c5832db92f1eae4ee4 [formerly 3c7dcb253a474d70b6f8c4287af6fa144e4f4abb]
Former-commit-id: 10f376fc4417efb466e8acb20eee955156d5ca65
Former-commit-id: fe5ba69235c369a54f90ab4eb6ac3df2c2858896
Former-commit-id: 0c8cd4cfd880ec4f27c8408568c2f4c9d629257a
Former-commit-id: dade7b41ccc86cffcda57ad4948f5e83e47eb655
Former-commit-id: b4c2d4ae2ca65e70b46d741d9f5debba38aa6d99
---
 design.sketch.REMOVED.git-id                  |  2 +-
 src/assets/style/theme/violet/setting.scss    |  2 +-
 src/menu/index.js                             | 15 +++++-
 .../charts/list/histogram/demo1/index.vue     | 45 ++++++++++++++++
 .../charts/list/histogram/demo2/index.vue     | 49 +++++++++++++++++
 .../charts/list/histogram/demo3/index.vue     | 48 +++++++++++++++++
 .../charts/list/histogram/demo4/index.vue     | 48 +++++++++++++++++
 .../charts/list/histogram/demo5/index.vue     | 50 +++++++++++++++++
 .../charts/list/histogram/demo6/index.vue     | 48 +++++++++++++++++
 .../demo/charts/list/line/demo5/index.vue     | 54 +++++++++++++++++++
 src/router/index.js.REMOVED.git-id            |  2 +-
 11 files changed, 359 insertions(+), 4 deletions(-)
 create mode 100644 src/pages/demo/charts/list/histogram/demo1/index.vue
 create mode 100644 src/pages/demo/charts/list/histogram/demo2/index.vue
 create mode 100644 src/pages/demo/charts/list/histogram/demo3/index.vue
 create mode 100644 src/pages/demo/charts/list/histogram/demo4/index.vue
 create mode 100644 src/pages/demo/charts/list/histogram/demo5/index.vue
 create mode 100644 src/pages/demo/charts/list/histogram/demo6/index.vue
 create mode 100644 src/pages/demo/charts/list/line/demo5/index.vue

diff --git a/design.sketch.REMOVED.git-id b/design.sketch.REMOVED.git-id
index f507b344..d4ce923b 100644
--- a/design.sketch.REMOVED.git-id
+++ b/design.sketch.REMOVED.git-id
@@ -1 +1 @@
-b30efefaca309fb3ee7befbef31a30b8f0029c07
\ No newline at end of file
+e8516ea88601f01f9a34696023fe735bf963b9c1
\ No newline at end of file
diff --git a/src/assets/style/theme/violet/setting.scss b/src/assets/style/theme/violet/setting.scss
index 51851c96..a060a6f8 100644
--- a/src/assets/style/theme/violet/setting.scss
+++ b/src/assets/style/theme/violet/setting.scss
@@ -47,4 +47,4 @@ $theme-aside-menu-empty-text-color: #FFF;
 $theme-aside-menu-empty-background-color: rgba(#000, .1);
 $theme-aside-menu-empty-icon-color-hover: #FFF;
 $theme-aside-menu-empty-text-color-hover: #FFF;
-$theme-aside-menu-empty-background-color-hover: rgba(#000, .05);
\ No newline at end of file
+$theme-aside-menu-empty-background-color-hover: rgba(#000, .15);
\ No newline at end of file
diff --git a/src/menu/index.js b/src/menu/index.js
index 261e8b15..73df245a 100644
--- a/src/menu/index.js
+++ b/src/menu/index.js
@@ -134,7 +134,20 @@ const demoCharts = {
             { path: `${pre}list/line/demo1`, title: '一般' },
             { path: `${pre}list/line/demo2`, title: '横坐标的倾斜' },
             { path: `${pre}list/line/demo3`, title: '堆叠面积图' },
-            { path: `${pre}list/line/demo4`, title: '显示指标数值' }
+            { path: `${pre}list/line/demo4`, title: '显示指标数值' },
+            { path: `${pre}list/line/demo5`, title: '设置别名' }
+          ]
+        },
+        {
+          path: `${pre}list/histogram`,
+          title: '柱状图',
+          children: [
+            { path: `${pre}list/histogram/demo1`, title: '一般' },
+            { path: `${pre}list/histogram/demo2`, title: '设置显示的指标维度' },
+            { path: `${pre}list/histogram/demo3`, title: '柱状图+折线图' },
+            { path: `${pre}list/histogram/demo4`, title: '堆叠柱状图' },
+            { path: `${pre}list/histogram/demo5`, title: '默认显示柱状图数据' },
+            { path: `${pre}list/histogram/demo6`, title: '横轴为连续的数值轴' }
           ]
         }
       ]
diff --git a/src/pages/demo/charts/list/histogram/demo1/index.vue b/src/pages/demo/charts/list/histogram/demo1/index.vue
new file mode 100644
index 00000000..b33f2309
--- /dev/null
+++ b/src/pages/demo/charts/list/histogram/demo1/index.vue
@@ -0,0 +1,45 @@
+<template>
+  <d2-container type="full">
+    <template slot="header">示例</template>
+    <div class="inner">
+      <ve-histogram :data="chartData" v-bind="pubSetting"></ve-histogram>
+    </div>
+    <template slot="footer">
+      <d2-demo-link-btn title="更多示例和文档" link="https://v-charts.js.org"/>
+    </template>
+  </d2-container>
+</template>
+
+<script>
+import list from '@/pages/demo/charts/list/_mixin/list.js'
+export default {
+  mixins: [
+    list
+  ],
+  data () {
+    return {
+      chartData: {
+        columns: ['日期', '访问用户', '下单用户', '下单率'],
+        rows: [
+          { '日期': '1/1', '访问用户': 1393, '下单用户': 1093, '下单率': 0.32 },
+          { '日期': '1/2', '访问用户': 3530, '下单用户': 3230, '下单率': 0.26 },
+          { '日期': '1/3', '访问用户': 2923, '下单用户': 2623, '下单率': 0.76 },
+          { '日期': '1/4', '访问用户': 1723, '下单用户': 1423, '下单率': 0.49 },
+          { '日期': '1/5', '访问用户': 3792, '下单用户': 3492, '下单率': 0.323 },
+          { '日期': '1/6', '访问用户': 4593, '下单用户': 4293, '下单率': 0.78 }
+        ]
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.inner {
+  position: absolute;
+  top: 20px;
+  right:  20px;
+  bottom: 20px;
+  left: 20px;
+}
+</style>
diff --git a/src/pages/demo/charts/list/histogram/demo2/index.vue b/src/pages/demo/charts/list/histogram/demo2/index.vue
new file mode 100644
index 00000000..b4cea437
--- /dev/null
+++ b/src/pages/demo/charts/list/histogram/demo2/index.vue
@@ -0,0 +1,49 @@
+<template>
+  <d2-container type="full">
+    <template slot="header">设置显示的指标维度</template>
+    <div class="inner">
+      <ve-histogram :data="chartData" :settings="chartSettings" v-bind="pubSetting"></ve-histogram>
+    </div>
+    <template slot="footer">
+      <d2-demo-link-btn title="更多示例和文档" link="https://v-charts.js.org"/>
+    </template>
+  </d2-container>
+</template>
+
+<script>
+import list from '@/pages/demo/charts/list/_mixin/list.js'
+export default {
+  mixins: [
+    list
+  ],
+  data () {
+    this.chartSettings = {
+      metrics: ['访问用户', '下单用户'],
+      dimension: ['日期']
+    }
+    return {
+      chartData: {
+        columns: ['日期', '访问用户', '下单用户', '下单率'],
+        rows: [
+          { '日期': '1/1', '访问用户': 1393, '下单用户': 1093, '下单率': 0.32 },
+          { '日期': '1/2', '访问用户': 3530, '下单用户': 3230, '下单率': 0.26 },
+          { '日期': '1/3', '访问用户': 2923, '下单用户': 2623, '下单率': 0.76 },
+          { '日期': '1/4', '访问用户': 1723, '下单用户': 1423, '下单率': 0.49 },
+          { '日期': '1/5', '访问用户': 3792, '下单用户': 3492, '下单率': 0.323 },
+          { '日期': '1/6', '访问用户': 4593, '下单用户': 4293, '下单率': 0.78 }
+        ]
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.inner {
+  position: absolute;
+  top: 20px;
+  right:  20px;
+  bottom: 20px;
+  left: 20px;
+}
+</style>
diff --git a/src/pages/demo/charts/list/histogram/demo3/index.vue b/src/pages/demo/charts/list/histogram/demo3/index.vue
new file mode 100644
index 00000000..1d46c86a
--- /dev/null
+++ b/src/pages/demo/charts/list/histogram/demo3/index.vue
@@ -0,0 +1,48 @@
+<template>
+  <d2-container type="full">
+    <template slot="header">柱状图+折线图</template>
+    <div class="inner">
+      <ve-histogram :data="chartData" :settings="chartSettings" v-bind="pubSetting"></ve-histogram>
+    </div>
+    <template slot="footer">
+      <d2-demo-link-btn title="更多示例和文档" link="https://v-charts.js.org"/>
+    </template>
+  </d2-container>
+</template>
+
+<script>
+import list from '@/pages/demo/charts/list/_mixin/list.js'
+export default {
+  mixins: [
+    list
+  ],
+  data () {
+    this.chartSettings = {
+      showLine: ['下单用户']
+    }
+    return {
+      chartData: {
+        columns: ['日期', '访问用户', '下单用户', '下单率'],
+        rows: [
+          { '日期': '1/1', '访问用户': 1393, '下单用户': 1093, '下单率': 0.32 },
+          { '日期': '1/2', '访问用户': 3530, '下单用户': 3230, '下单率': 0.26 },
+          { '日期': '1/3', '访问用户': 2923, '下单用户': 2623, '下单率': 0.76 },
+          { '日期': '1/4', '访问用户': 1723, '下单用户': 1423, '下单率': 0.49 },
+          { '日期': '1/5', '访问用户': 3792, '下单用户': 3492, '下单率': 0.323 },
+          { '日期': '1/6', '访问用户': 4593, '下单用户': 4293, '下单率': 0.78 }
+        ]
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.inner {
+  position: absolute;
+  top: 20px;
+  right:  20px;
+  bottom: 20px;
+  left: 20px;
+}
+</style>
diff --git a/src/pages/demo/charts/list/histogram/demo4/index.vue b/src/pages/demo/charts/list/histogram/demo4/index.vue
new file mode 100644
index 00000000..944e7dfb
--- /dev/null
+++ b/src/pages/demo/charts/list/histogram/demo4/index.vue
@@ -0,0 +1,48 @@
+<template>
+  <d2-container type="full">
+    <template slot="header">堆叠柱状图</template>
+    <div class="inner">
+      <ve-histogram :data="chartData" :settings="chartSettings" v-bind="pubSetting"></ve-histogram>
+    </div>
+    <template slot="footer">
+      <d2-demo-link-btn title="更多示例和文档" link="https://v-charts.js.org"/>
+    </template>
+  </d2-container>
+</template>
+
+<script>
+import list from '@/pages/demo/charts/list/_mixin/list.js'
+export default {
+  mixins: [
+    list
+  ],
+  data () {
+    this.chartSettings = {
+      stack: { '用户': ['访问用户', '下单用户'] }
+    }
+    return {
+      chartData: {
+        columns: ['日期', '访问用户', '下单用户', '下单率'],
+        rows: [
+          { '日期': '1/1', '访问用户': 1393, '下单用户': 1093, '下单率': 0.32 },
+          { '日期': '1/2', '访问用户': 3530, '下单用户': 3230, '下单率': 0.26 },
+          { '日期': '1/3', '访问用户': 2923, '下单用户': 2623, '下单率': 0.76 },
+          { '日期': '1/4', '访问用户': 1723, '下单用户': 1423, '下单率': 0.49 },
+          { '日期': '1/5', '访问用户': 3792, '下单用户': 3492, '下单率': 0.323 },
+          { '日期': '1/6', '访问用户': 4593, '下单用户': 4293, '下单率': 0.78 }
+        ]
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.inner {
+  position: absolute;
+  top: 20px;
+  right:  20px;
+  bottom: 20px;
+  left: 20px;
+}
+</style>
diff --git a/src/pages/demo/charts/list/histogram/demo5/index.vue b/src/pages/demo/charts/list/histogram/demo5/index.vue
new file mode 100644
index 00000000..e7876da9
--- /dev/null
+++ b/src/pages/demo/charts/list/histogram/demo5/index.vue
@@ -0,0 +1,50 @@
+<template>
+  <d2-container type="full">
+    <template slot="header">默认显示柱状图数据</template>
+    <div class="inner">
+      <ve-histogram :data="chartData" :extend="extend" v-bind="pubSetting"></ve-histogram>
+    </div>
+    <template slot="footer">
+      <d2-demo-link-btn title="更多示例和文档" link="https://v-charts.js.org"/>
+    </template>
+  </d2-container>
+</template>
+
+<script>
+import list from '@/pages/demo/charts/list/_mixin/list.js'
+export default {
+  mixins: [
+    list
+  ],
+  data () {
+    this.extend = {
+      series: {
+        label: { show: true, position: "top" }
+      }
+    }
+    return {
+      chartData: {
+        columns: ['日期', '访问用户', '下单用户', '下单率'],
+        rows: [
+          { '日期': '1/1', '访问用户': 1393, '下单用户': 1093, '下单率': 0.32 },
+          { '日期': '1/2', '访问用户': 3530, '下单用户': 3230, '下单率': 0.26 },
+          { '日期': '1/3', '访问用户': 2923, '下单用户': 2623, '下单率': 0.76 },
+          { '日期': '1/4', '访问用户': 1723, '下单用户': 1423, '下单率': 0.49 },
+          { '日期': '1/5', '访问用户': 3792, '下单用户': 3492, '下单率': 0.323 },
+          { '日期': '1/6', '访问用户': 4593, '下单用户': 4293, '下单率': 0.78 }
+        ]
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.inner {
+  position: absolute;
+  top: 20px;
+  right:  20px;
+  bottom: 20px;
+  left: 20px;
+}
+</style>
diff --git a/src/pages/demo/charts/list/histogram/demo6/index.vue b/src/pages/demo/charts/list/histogram/demo6/index.vue
new file mode 100644
index 00000000..92a6cd07
--- /dev/null
+++ b/src/pages/demo/charts/list/histogram/demo6/index.vue
@@ -0,0 +1,48 @@
+<template>
+  <d2-container type="full">
+    <template slot="header">横轴为连续的数值轴</template>
+    <div class="inner">
+      <ve-histogram :data="chartData" :settings="chartSettings" v-bind="pubSetting"></ve-histogram>
+    </div>
+    <template slot="footer">
+      <d2-demo-link-btn title="更多示例和文档" link="https://v-charts.js.org"/>
+    </template>
+  </d2-container>
+</template>
+
+<script>
+import list from '@/pages/demo/charts/list/_mixin/list.js'
+export default {
+  mixins: [
+    list
+  ],
+  data () {
+    this.chartSettings = {
+      xAxisType: 'value'
+    }
+    return {
+      chartData: {
+        columns: ['日期', '访问用户', '下单用户', '下单率'],
+        rows: [
+          { '日期': 1, '访问用户': 1393, '下单用户': 1093, '下单率': 0.32 },
+          { '日期': 2, '访问用户': 3530, '下单用户': 3230, '下单率': 0.26 },
+          { '日期': 5, '访问用户': 2923, '下单用户': 2623, '下单率': 0.76 },
+          { '日期': 10, '访问用户': 1723, '下单用户': 1423, '下单率': 0.49 },
+          { '日期': 20, '访问用户': 3792, '下单用户': 3492, '下单率': 0.323 },
+          { '日期': 22, '访问用户': 4593, '下单用户': 4293, '下单率': 0.78 }
+        ]
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.inner {
+  position: absolute;
+  top: 20px;
+  right:  20px;
+  bottom: 20px;
+  left: 20px;
+}
+</style>
diff --git a/src/pages/demo/charts/list/line/demo5/index.vue b/src/pages/demo/charts/list/line/demo5/index.vue
new file mode 100644
index 00000000..6fb34189
--- /dev/null
+++ b/src/pages/demo/charts/list/line/demo5/index.vue
@@ -0,0 +1,54 @@
+<template>
+  <d2-container type="full">
+    <template slot="header">设置别名</template>
+    <div class="inner">
+      <ve-line :data="chartData" :settings="chartSettings" v-bind="pubSetting"></ve-line>
+    </div>
+    <template slot="footer">
+      <d2-demo-link-btn title="更多示例和文档" link="https://v-charts.js.org"/>
+    </template>
+  </d2-container>
+</template>
+
+<script>
+import list from '@/pages/demo/charts/list/_mixin/list.js'
+export default {
+  mixins: [
+    list
+  ],
+  data () {
+    this.chartSettings = {
+      labelMap: {
+        'PV': '访问用户',
+        'Order': '下单用户'
+      },
+      legendName: {
+        '访问用户': '访问用户 total: 10000'
+      }
+    }
+    return {
+      chartData: {
+        columns: ['date', 'PV', 'Order', 'OrderRate'],
+        rows: [
+          { 'date': '1/1', 'PV': 1393, 'Order': 1093, 'OrderRate': 0.32 },
+          { 'date': '1/2', 'PV': 3530, 'Order': 3230, 'OrderRate': 0.26 },
+          { 'date': '1/3', 'PV': 2923, 'Order': 2623, 'OrderRate': 0.76 },
+          { 'date': '1/4', 'PV': 1723, 'Order': 1423, 'OrderRate': 0.49 },
+          { 'date': '1/5', 'PV': 3792, 'Order': 3492, 'OrderRate': 0.323 },
+          { 'date': '1/6', 'PV': 4593, 'Order': 4293, 'OrderRate': 0.78 }
+        ]
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.inner {
+  position: absolute;
+  top: 20px;
+  right:  20px;
+  bottom: 20px;
+  left: 20px;
+}
+</style>
diff --git a/src/router/index.js.REMOVED.git-id b/src/router/index.js.REMOVED.git-id
index ff0de9bd..519773bf 100644
--- a/src/router/index.js.REMOVED.git-id
+++ b/src/router/index.js.REMOVED.git-id
@@ -1 +1 @@
-75041a6a688f975cc1b62327c7bb6c7fa8358afc
\ No newline at end of file
+b88fea69da2540d699da2fb35dc84ba4434bee74
\ No newline at end of file