From 7fb65ff24c05abd4b0878d46fc50ad690753369a Mon Sep 17 00:00:00 2001
From: tnt group <dodu@live.cn>
Date: Tue, 13 Jun 2023 10:27:08 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E7=8E=AF=E5=BD=A2=E9=A5=BC?=
=?UTF-8?q?=E5=9B=BE=E5=A2=9E=E5=8A=A0=E8=BD=A8=E9=81=93=E5=AE=BD=E5=BA=A6?=
=?UTF-8?q?=E8=AE=BE=E7=BD=AE=EF=BC=8C=E5=B9=B6=E4=BC=98=E5=8C=96=E6=95=B0?=
=?UTF-8?q?=E5=AD=97=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Charts/Pies/PieCircle/config.vue | 45 ++++++++++++-------
.../Charts/Pies/PieCircle/index.vue | 4 +-
2 files changed, 30 insertions(+), 19 deletions(-)
diff --git a/src/packages/components/Charts/Pies/PieCircle/config.vue b/src/packages/components/Charts/Pies/PieCircle/config.vue
index a3206946..38329dbc 100644
--- a/src/packages/components/Charts/Pies/PieCircle/config.vue
+++ b/src/packages/components/Charts/Pies/PieCircle/config.vue
@@ -7,6 +7,22 @@
</n-input-number>
</SettingItem>
</SettingItemBox>
+ <!-- 中心标题 -->
+ <SettingItemBox v-if="config.title" name="标题">
+ <SettingItem name="颜色">
+ <n-color-picker size="small" :modes="['hex']" v-model:value="config.title.textStyle.color"></n-color-picker>
+ </SettingItem>
+ <SettingItem name="字体大小">
+ <n-input-number
+ v-model:value="config.title.textStyle.fontSize"
+ :min="0"
+ :step="1"
+ size="small"
+ placeholder="字体大小"
+ >
+ </n-input-number>
+ </SettingItem>
+ </SettingItemBox>
<!-- Echarts 全局设置 -->
<SettingItemBox name="进度条">
<SettingItem name="颜色">
@@ -31,24 +47,8 @@
></n-color-picker>
</SettingItem>
</SettingItemBox>
- <!-- 中心标题 -->
- <SettingItemBox v-if="config.title" name="标题">
- <SettingItem name="颜色">
- <n-color-picker size="small" :modes="['hex']" v-model:value="config.title.textStyle.color"></n-color-picker>
- </SettingItem>
- <SettingItem name="字体大小">
- <n-input-number
- v-model:value="config.title.textStyle.fontSize"
- :min="0"
- :step="1"
- size="small"
- placeholder="字体大小"
- >
- </n-input-number>
- </SettingItem>
- </SettingItemBox>
<!-- 其他样式 -->
- <SettingItemBox name="轨道样式">
+ <SettingItemBox name="轨道">
<SettingItem name="颜色">
<n-color-picker size="small" :modes="['hex']" v-model:value="item.data[1].itemStyle.color"></n-color-picker>
</SettingItem>
@@ -69,6 +69,17 @@
v-model:value="item.data[1].itemStyle.shadowColor"
></n-color-picker>
</SettingItem>
+ <SettingItem name="轨道宽度">
+ <n-select
+ v-model:value="item.radius[0]"
+ :options="[
+ { label: '窄', value: '75%' },
+ { label: '中', value: '60%' },
+ { label: '宽', value: '45%' },
+ { label: '更宽', value: '30%' }
+ ]"
+ />
+ </SettingItem>
</SettingItemBox>
</CollapseItem>
</template>
diff --git a/src/packages/components/Charts/Pies/PieCircle/index.vue b/src/packages/components/Charts/Pies/PieCircle/index.vue
index 26bda2a7..bf6250cd 100644
--- a/src/packages/components/Charts/Pies/PieCircle/index.vue
+++ b/src/packages/components/Charts/Pies/PieCircle/index.vue
@@ -41,7 +41,7 @@ const option = reactive({
const dataHandle = (newData: any) => {
const d = parseFloat(`${newData}`) * 100
let config = props.chartConfig.option
- config.title.text = d.toFixed(2) + '%'
+ config.title.text = `${+d.toFixed(2)}%`
config.series[0].data[0].value[0] = d
config.series[0].data[1].value[0] = 100 - d
option.value = mergeTheme(props.chartConfig.option, props.themeSetting, includes)
@@ -68,7 +68,7 @@ watch(
useChartDataFetch(props.chartConfig, useChartEditStore, (resData: number) => {
let d = parseFloat(`${resData}`) * 100
// @ts-ignore
- option.value.title.text = d.toFixed(2) + '%'
+ option.value.title.text = `${+d.toFixed(2)}%`
// @ts-ignore
option.value.series[0].data[0].value[0] = d
// @ts-ignore
From d018d6babca09b5e3e53f78b5abfc367eabc96ac Mon Sep 17 00:00:00 2001
From: tnt group <dodu@live.cn>
Date: Wed, 14 Jun 2023 07:54:36 +0800
Subject: [PATCH 2/2] =?UTF-8?q?chore:=20=E8=AE=BE=E7=BD=AE=E9=80=89?=
=?UTF-8?q?=E6=8B=A9=E6=A1=86size?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/packages/components/Charts/Pies/PieCircle/config.vue | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/packages/components/Charts/Pies/PieCircle/config.vue b/src/packages/components/Charts/Pies/PieCircle/config.vue
index 38329dbc..f343aa23 100644
--- a/src/packages/components/Charts/Pies/PieCircle/config.vue
+++ b/src/packages/components/Charts/Pies/PieCircle/config.vue
@@ -72,6 +72,7 @@
<SettingItem name="轨道宽度">
<n-select
v-model:value="item.radius[0]"
+ size="small"
:options="[
{ label: '窄', value: '75%' },
{ label: '中', value: '60%' },