From 9328146313c9757f22e3cd238fe406e7ee74d084 Mon Sep 17 00:00:00 2001
From: wangbo <781278657@qq.com>
Date: Wed, 9 Aug 2023 14:52:54 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E2=9C=A8=20=E6=9F=B1=E7=8A=B6=E5=9B=BE?=
 =?UTF-8?q?=E3=80=81=E9=A5=BC=E5=9B=BE=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 examples/src/config/menus/bar.ts              |  6 -----
 examples/src/config/menus/index.ts            |  3 ---
 .../bar/basic-bar-stack-vertical.ts           |  4 ++--
 .../chart-option/bar/basic-bar-stack.ts       |  4 ++--
 .../chart-option/bar/basic-bar-vertical.ts    |  4 ++--
 .../basic-chart/chart-option/bar/basic-bar.ts |  4 ++--
 .../basic-chart/chart-option/bar/basic.ts     |  4 ++--
 .../basic-chart/chart-option/pie/basic.ts     | 23 ++++++++++++++-----
 packages/bi-chart/style/index.css             | 22 ++++++++++++++++++
 9 files changed, 49 insertions(+), 25 deletions(-)

diff --git a/examples/src/config/menus/bar.ts b/examples/src/config/menus/bar.ts
index 24c8c51..f3859af 100644
--- a/examples/src/config/menus/bar.ts
+++ b/examples/src/config/menus/bar.ts
@@ -1,26 +1,20 @@
-import { BnIconSetting } from 'blocks-next'
-
 export default [
   {
-    icon: BnIconSetting,
     title: '柱状图',
     routeName: 'BasicBarDemo',
     showItem: true
   },
   {
-    icon: BnIconSetting,
     title: '柱状图-纵向',
     routeName: 'BasicBarVerticalDemo',
     showItem: true
   },
   {
-    icon: BnIconSetting,
     title: '柱状图-堆叠',
     routeName: 'BasicBarStackDemo',
     showItem: true
   },
   {
-    icon: BnIconSetting,
     title: '柱状图-堆叠-纵向',
     routeName: 'BasicBarStackVerticalDemo',
     showItem: true
diff --git a/examples/src/config/menus/index.ts b/examples/src/config/menus/index.ts
index 709b31b..f475cd9 100644
--- a/examples/src/config/menus/index.ts
+++ b/examples/src/config/menus/index.ts
@@ -1,4 +1,3 @@
-import { BnIconSetting } from 'blocks-next'
 import Bar from './bar.ts'
 import Line from './line.ts'
 import Pie from './pie.ts'
@@ -10,7 +9,6 @@ export const menuData = [
     showGroup: true,
     children: [
       {
-        icon: BnIconSetting,
         title: '小报表布局',
         routeName: 'BasicSmallLayoutDemo',
         showItem: true
@@ -27,7 +25,6 @@ export const menuData = [
     showGroup: true,
     children: [
       {
-        icon: BnIconSetting,
         title: '外呼次数排行榜',
         routeName: 'ThingsOutboundNumberRankingDemo',
         showItem: true
diff --git a/packages/bi-chart/components/basic-chart/chart-option/bar/basic-bar-stack-vertical.ts b/packages/bi-chart/components/basic-chart/chart-option/bar/basic-bar-stack-vertical.ts
index 523f4eb..ad487bb 100644
--- a/packages/bi-chart/components/basic-chart/chart-option/bar/basic-bar-stack-vertical.ts
+++ b/packages/bi-chart/components/basic-chart/chart-option/bar/basic-bar-stack-vertical.ts
@@ -1,7 +1,7 @@
 import {
   categoryXAxis,
   colors,
-  tooltip,
+  barTooltip,
   valueYAxis,
   verticalBarStyle,
   verticalGrid
@@ -9,7 +9,7 @@ import {
 
 export default {
   color: colors,
-  tooltip: tooltip,
+  tooltip: barTooltip,
   xAxis: categoryXAxis,
   yAxis: valueYAxis,
   series: [
diff --git a/packages/bi-chart/components/basic-chart/chart-option/bar/basic-bar-stack.ts b/packages/bi-chart/components/basic-chart/chart-option/bar/basic-bar-stack.ts
index a152a4d..9cb37ad 100644
--- a/packages/bi-chart/components/basic-chart/chart-option/bar/basic-bar-stack.ts
+++ b/packages/bi-chart/components/basic-chart/chart-option/bar/basic-bar-stack.ts
@@ -3,13 +3,13 @@ import {
   colors,
   horizontalBarStyle,
   horizontalGrid,
-  tooltip,
+  barTooltip,
   valueXAxis
 } from './basic'
 
 export default {
   color: colors,
-  tooltip: tooltip,
+  tooltip: barTooltip,
   xAxis: valueXAxis,
   yAxis: categoryYAxis,
   series: [
diff --git a/packages/bi-chart/components/basic-chart/chart-option/bar/basic-bar-vertical.ts b/packages/bi-chart/components/basic-chart/chart-option/bar/basic-bar-vertical.ts
index 3dfadd2..78c4f66 100644
--- a/packages/bi-chart/components/basic-chart/chart-option/bar/basic-bar-vertical.ts
+++ b/packages/bi-chart/components/basic-chart/chart-option/bar/basic-bar-vertical.ts
@@ -1,7 +1,7 @@
 import {
   categoryXAxis,
   colors,
-  tooltip,
+  barTooltip,
   valueYAxis,
   verticalBarStyle,
   verticalGrid
@@ -9,7 +9,7 @@ import {
 
 export default {
   color: colors,
-  tooltip: tooltip,
+  tooltip: barTooltip,
   xAxis: categoryXAxis,
   yAxis: valueYAxis,
   series: [
diff --git a/packages/bi-chart/components/basic-chart/chart-option/bar/basic-bar.ts b/packages/bi-chart/components/basic-chart/chart-option/bar/basic-bar.ts
index b468fa7..c3b10b1 100644
--- a/packages/bi-chart/components/basic-chart/chart-option/bar/basic-bar.ts
+++ b/packages/bi-chart/components/basic-chart/chart-option/bar/basic-bar.ts
@@ -3,13 +3,13 @@ import {
   colors,
   horizontalBarStyle,
   horizontalGrid,
-  tooltip,
+  barTooltip,
   valueXAxis
 } from './basic'
 
 export default {
   color: colors,
-  tooltip: tooltip,
+  tooltip: barTooltip,
   xAxis: valueXAxis,
   yAxis: categoryYAxis,
   series: [
diff --git a/packages/bi-chart/components/basic-chart/chart-option/bar/basic.ts b/packages/bi-chart/components/basic-chart/chart-option/bar/basic.ts
index 7af288c..07b9f15 100644
--- a/packages/bi-chart/components/basic-chart/chart-option/bar/basic.ts
+++ b/packages/bi-chart/components/basic-chart/chart-option/bar/basic.ts
@@ -134,8 +134,8 @@ export const colors = [
   '#242934'
 ]
 
-// 通用 tooltip
-export const tooltip = {
+// 通用柱状图 tooltip
+export const barTooltip = {
   trigger: 'axis',
   axisPointer: {
     // Use axis to trigger tooltip
diff --git a/packages/bi-chart/components/basic-chart/chart-option/pie/basic.ts b/packages/bi-chart/components/basic-chart/chart-option/pie/basic.ts
index e51239a..b544f25 100644
--- a/packages/bi-chart/components/basic-chart/chart-option/pie/basic.ts
+++ b/packages/bi-chart/components/basic-chart/chart-option/pie/basic.ts
@@ -1,3 +1,16 @@
+// 通用饼图 tooltip
+export const pieTooltip = {
+  trigger: 'item',
+  className: 'tooltip-layer-wrapper',
+  formatter: `
+      <div class="tooltip-layer-box">
+        <div class="title">{b}</div>
+        <div class="num">数量：{c}</div>
+        <div class="proportion">占比：{d}%</div>
+      </div>
+    `
+}
+
 export const colorToolTipLegend = {
   color: [
     '#0056FF',
@@ -11,9 +24,7 @@ export const colorToolTipLegend = {
     '#2ED4A9',
     '#242934'
   ],
-  tooltip: {
-    trigger: 'item'
-  },
+  tooltip: pieTooltip,
   legend: {
     type: 'scroll',
     orient: 'vertical',
@@ -28,7 +39,7 @@ export const colorToolTipLegend = {
       padding: [0, 0, 0, 5]
     },
     itemWidth: 6
-  },
+  }
 }
 
 export const labelEmphasis = {
@@ -46,5 +57,5 @@ export const labelEmphasis = {
   },
   labelLine: {
     show: false
-  },
-}
\ No newline at end of file
+  }
+}
diff --git a/packages/bi-chart/style/index.css b/packages/bi-chart/style/index.css
index 9b42007..b794096 100644
--- a/packages/bi-chart/style/index.css
+++ b/packages/bi-chart/style/index.css
@@ -1,3 +1,4 @@
+/* 业务布局组件 */
 .chart-box {
   width: 100%;
   min-width: 300px;
@@ -112,3 +113,24 @@ x-vue-echarts {
   min-width: 0;
   height: 100%;
 }
+
+/* echarts tooltip */
+.tooltip-layer-wrapper {
+  padding: 0 !important;
+  background: transparent !important;
+  border: none !important;
+}
+
+.tooltip-layer-box {
+  padding: 12px !important;
+  font-size: 12px !important;
+  line-height: 19px;
+  color: #fff !important;
+  background: rgb(0 0 0 / 70%) !important;
+  border: none !important;
+  border-radius: 4px;
+
+  .title {
+    font-size: 13px;
+  }
+}