From 2bf895ad3d5ae75fc960bbb1b6a94bc9ddb6cb9c 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: Mon, 13 Jun 2022 17:29:39 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E6=96=B0=E5=A2=9E=E6=B0=B4?=
 =?UTF-8?q?=E7=90=83=E5=9B=BE=E8=AE=BE=E7=BD=AE=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Charts/Mores/WaterPolo/config.ts          | 32 +++++++++++++++++++
 .../Charts/Mores/WaterPolo/config.vue         | 13 ++++++--
 2 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/src/packages/components/Charts/Mores/WaterPolo/config.ts b/src/packages/components/Charts/Mores/WaterPolo/config.ts
index e671ed00..89441cca 100644
--- a/src/packages/components/Charts/Mores/WaterPolo/config.ts
+++ b/src/packages/components/Charts/Mores/WaterPolo/config.ts
@@ -3,6 +3,37 @@ import { CreateComponentType } from '@/packages/index.d'
 import { WaterPoloConfig } from './index'
 import cloneDeep from 'lodash/cloneDeep'
 
+export const shapes = [
+  {
+    label: '圆形',
+    value: 'circle'
+  },
+  {
+    label: '正方形',
+    value: 'rect'
+  },
+  {
+    label: '带圆角的正方形',
+    value: 'roundRect'
+  },
+  {
+    label: '正三角形',
+    value: 'triangle'
+  },
+  {
+    label: '菱形',
+    value: 'diamond'
+  },
+  {
+    label: '水滴',
+    value: 'pin'
+  },
+  {
+    label: '箭头',
+    value: 'arrow'
+  },
+]
+
 export const includes = []
 
 export const option = {
@@ -10,6 +41,7 @@ export const option = {
   series: [
     {
       type: 'liquidFill',
+      shape: shapes[0].value,
       radius: '90%',
       data: [0],
       center: ['50%', '50%'],
diff --git a/src/packages/components/Charts/Mores/WaterPolo/config.vue b/src/packages/components/Charts/Mores/WaterPolo/config.vue
index 029b9919..4121b380 100644
--- a/src/packages/components/Charts/Mores/WaterPolo/config.vue
+++ b/src/packages/components/Charts/Mores/WaterPolo/config.vue
@@ -15,19 +15,26 @@
           placeholder="水球数值"
         ></n-input-number>
       </SettingItem>
+      <SettingItem name="形状">
+        <n-select v-model:value="item.shape" :options="shapes" placeholder="选择形状" />
+      </SettingItem>
+      <SettingItem name="文本">
+        <n-input-number v-model:value="item.label.normal.textStyle.fontSize" :min="0" :step="1" size="small" placeholder="文字大小">
+        </n-input-number>
+      </SettingItem>
       <SettingItem name="颜色1">
         <n-color-picker
           size="small"
           :modes="['hex']"
           v-model:value="item.color[0].colorStops[0].color"
-       ></n-color-picker>
+      ></n-color-picker>
       </SettingItem>
       <SettingItem name="颜色2">
         <n-color-picker
           size="small"
           :modes="['hex']"
           v-model:value="item.color[0].colorStops[1].color"
-       ></n-color-picker>
+      ></n-color-picker>
       </SettingItem>
     </SettingItemBox>
     <SettingItemBox name="背景" :alone="true">
@@ -44,7 +51,7 @@
 
 <script setup lang="ts">
 import { PropType, computed } from 'vue'
-import { option } from './config'
+import { option, shapes } from './config'
 import {
   CollapseItem,
   SettingItemBox,