From 7b3012d8da0c67e61fa11f645a80ddd3d409b5fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A5=94=E8=B7=91=E7=9A=84=E9=9D=A2=E6=9D=A1?=
 <1262327911@qq.com>
Date: Thu, 8 Sep 2022 20:47:34 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E6=BC=8F=E6=96=97?=
 =?UTF-8?q?=E5=9B=BE=E4=BD=BF=E7=94=A8=EF=BC=8C=E8=A7=A3=E5=86=B3=E9=A2=84?=
 =?UTF-8?q?=E8=A7=88=E6=95=B0=E6=8D=AE=E5=8F=98=E6=9B=B4=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Charts/Mores/Funnel/config.ts         |  2 +-
 .../components/Charts/Mores/Funnel/config.vue        | 12 +++++++++++-
 src/packages/components/Charts/Mores/Funnel/index.ts |  3 ++-
 .../components/Charts/Mores/Radar/config.vue         |  4 ----
 src/packages/components/Charts/Mores/Radar/index.ts  |  2 +-
 5 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/packages/components/Charts/Mores/Funnel/config.ts b/src/packages/components/Charts/Mores/Funnel/config.ts
index fd48376c..2ec23bf2 100644
--- a/src/packages/components/Charts/Mores/Funnel/config.ts
+++ b/src/packages/components/Charts/Mores/Funnel/config.ts
@@ -27,9 +27,9 @@ export const option = {
     {
       name: 'Funnel',
       type: 'funnel',
+      top: '70',
       left: '10%',
       width: '80%',
-      bottom: 10,
       min: 0,
       minSize: '0%',
       maxSize: '100%',
diff --git a/src/packages/components/Charts/Mores/Funnel/config.vue b/src/packages/components/Charts/Mores/Funnel/config.vue
index 38ae3d80..4018a38d 100644
--- a/src/packages/components/Charts/Mores/Funnel/config.vue
+++ b/src/packages/components/Charts/Mores/Funnel/config.vue
@@ -2,13 +2,19 @@
   <!-- Echarts 全局设置 -->
   <global-setting :optionData="optionData" :in-chart="true"> </global-setting>
   <!-- 漏斗图 -->
-  <collapse-item v-for="(item, index) in seriesList" :key="index" :name="`漏斗图-${index + 1}`" expanded>
+  <collapse-item v-for="(item, index) in seriesList" :key="index" :name="`漏斗图`" expanded>
     <setting-item-box name="排序" alone>
       <setting-item>
         <n-select v-model:value="item.sort" :options="FunnelOrderEnumList" size="small" />
       </setting-item>
     </setting-item-box>
 
+    <SettingItemBox name="范围" :alone="true">
+      <setting-item :name="`顶部距离：${item.top}px`">
+        <n-slider v-model:value="item.top" :min="0" :max="300" :format-tooltip="sliderFormatTooltip"></n-slider>
+      </setting-item>
+    </SettingItemBox>
+
     <setting-item-box name="区块">
       <setting-item name="边框大小">
         <n-input-number v-model:value="item.itemStyle.borderWidth" :min="0" :max="10" size="small" />
@@ -54,4 +60,8 @@ const props = defineProps({
 const seriesList = computed(() => {
   return props.optionData.series
 })
+
+const sliderFormatTooltip = (v: number) => {
+  return `${v}px`
+}
 </script>
diff --git a/src/packages/components/Charts/Mores/Funnel/index.ts b/src/packages/components/Charts/Mores/Funnel/index.ts
index 7a89239c..da99c3fb 100644
--- a/src/packages/components/Charts/Mores/Funnel/index.ts
+++ b/src/packages/components/Charts/Mores/Funnel/index.ts
@@ -1,5 +1,5 @@
 import image from '@/assets/images/chart/charts/funnel.png'
-import { ConfigType, PackagesCategoryEnum } from '@/packages/index.d'
+import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'
 import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'
 
 export const FunnelConfig: ConfigType = {
@@ -10,5 +10,6 @@ export const FunnelConfig: ConfigType = {
   category: ChatCategoryEnum.MORE,
   categoryName: ChatCategoryEnumName.MORE,
   package: PackagesCategoryEnum.CHARTS,
+  chartFrame: ChartFrameEnum.ECHARTS,
   image
 }
diff --git a/src/packages/components/Charts/Mores/Radar/config.vue b/src/packages/components/Charts/Mores/Radar/config.vue
index b30669a4..a25fc145 100644
--- a/src/packages/components/Charts/Mores/Radar/config.vue
+++ b/src/packages/components/Charts/Mores/Radar/config.vue
@@ -27,7 +27,6 @@
 
       <SettingItemBox name="范围">
         <setting-item :name="`最小值：${radarProp.radius[0]}%`">
-          <!-- 透明度 -->
           <n-slider
             v-model:value="radarProp.radius[0]"
             :min="0"
@@ -37,7 +36,6 @@
           ></n-slider>
         </setting-item>
         <setting-item :name="`最大值：${radarProp.radius[1]}%`">
-          <!-- 透明度 -->
           <n-slider
             v-model:value="radarProp.radius[1]"
             :min="0"
@@ -50,7 +48,6 @@
       
       <SettingItemBox name="偏移">
         <setting-item :name="`X 轴值：${radarProp.center[0]}%`">
-          <!-- 透明度 -->
           <n-slider
             v-model:value="radarProp.center[0]"
             :min="0"
@@ -60,7 +57,6 @@
           ></n-slider>
         </setting-item>
         <setting-item :name="`Y 轴值：${radarProp.center[1]}%`">
-          <!-- 透明度 -->
           <n-slider
             v-model:value="radarProp.center[1]"
             :min="0"
diff --git a/src/packages/components/Charts/Mores/Radar/index.ts b/src/packages/components/Charts/Mores/Radar/index.ts
index 006f2e5d..35a95ece 100644
--- a/src/packages/components/Charts/Mores/Radar/index.ts
+++ b/src/packages/components/Charts/Mores/Radar/index.ts
@@ -6,7 +6,7 @@ export const RadarConfig: ConfigType = {
   key: 'Radar',
   chartKey: 'VRadar',
   conKey: 'VCRadar',
-  title: '雷达',
+  title: '雷达图',
   category: ChatCategoryEnum.MORE,
   categoryName: ChatCategoryEnumName.MORE,
   package: PackagesCategoryEnum.CHARTS,