From 09d8c58e73d7d1ed1578d93184112e6602f5b0e0 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:30:17 +0800
Subject: [PATCH] =?UTF-8?q?style:=20=E4=BC=98=E5=8C=96=E6=B0=B4=E7=90=83?=
=?UTF-8?q?=E5=9B=BE=E4=BB=A3=E7=A0=81=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Charts/Mores/WaterPolo/config.ts | 33 ++++++++++++++++-
.../Charts/Mores/WaterPolo/config.vue | 35 ++-----------------
2 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/src/packages/components/Charts/Mores/WaterPolo/config.ts b/src/packages/components/Charts/Mores/WaterPolo/config.ts
index 390b89a1..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,7 +41,7 @@ export const option = {
series: [
{
type: 'liquidFill',
- shape: 'circle',
+ 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 d65bccf0..4121b380 100644
--- a/src/packages/components/Charts/Mores/WaterPolo/config.vue
+++ b/src/packages/components/Charts/Mores/WaterPolo/config.vue
@@ -18,7 +18,7 @@
<SettingItem name="形状">
<n-select v-model:value="item.shape" :options="shapes" placeholder="选择形状" />
</SettingItem>
- <SettingItem name="文字大小">
+ <SettingItem name="文本">
<n-input-number v-model:value="item.label.normal.textStyle.fontSize" :min="0" :step="1" size="small" placeholder="文字大小">
</n-input-number>
</SettingItem>
@@ -51,7 +51,7 @@
<script setup lang="ts">
import { PropType, computed } from 'vue'
-import { option } from './config'
+import { option, shapes } from './config'
import {
CollapseItem,
SettingItemBox,
@@ -68,35 +68,4 @@ const props = defineProps({
const seriesList = computed(() => {
return props.optionData.series
})
-
-const shapes = [
- {
- label: '圆形',
- value: 'circle'
- },
- {
- label: '正方形',
- value: 'rect'
- },
- {
- label: '带圆角的正方形',
- value: 'roundRect'
- },
- {
- label: '正三角形',
- value: 'triangle'
- },
- {
- label: '菱形',
- value: 'diamond'
- },
- {
- label: '水滴',
- value: 'pin'
- },
- {
- label: '箭头',
- value: 'arrow'
- },
-]
</script>