From e1aa82288da978d12d764dbabb4e6e884844ccb9 Mon Sep 17 00:00:00 2001
From: alex li <alex.dou@qq.com>
Date: Mon, 13 Jun 2022 01:40:11 +0800
Subject: [PATCH] =?UTF-8?q?pie=5Fcircle:=E4=BF=AE=E6=94=B9=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E7=95=8C=E9=9D=A2=E6=98=BE=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Charts/Pies/PieCircle/config.ts           |  6 ++--
 .../Charts/Pies/PieCircle/config.vue          | 29 ++++++-------------
 .../Charts/Pies/PieCircle/index.vue           | 26 +++++++++++------
 3 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/src/packages/components/Charts/Pies/PieCircle/config.ts b/src/packages/components/Charts/Pies/PieCircle/config.ts
index 07981a9a..e5a09dbe 100644
--- a/src/packages/components/Charts/Pies/PieCircle/config.ts
+++ b/src/packages/components/Charts/Pies/PieCircle/config.ts
@@ -11,9 +11,9 @@ const option = {
   legend: {
     show: true,
   },
-  dataset: 45,
+  dataset: 0.25,
   title: {
-    text: 0 + "%",
+    text: 25 + "%",
     x: "center",
     y: "center",
     textStyle: {
@@ -45,7 +45,7 @@ const option = {
           }
         },
         {
-          value: 75,
+          value: [75],
           itemStyle: {
             normal: {
               color: "#00bcd44a",
diff --git a/src/packages/components/Charts/Pies/PieCircle/config.vue b/src/packages/components/Charts/Pies/PieCircle/config.vue
index 270d10aa..258bafc7 100644
--- a/src/packages/components/Charts/Pies/PieCircle/config.vue
+++ b/src/packages/components/Charts/Pies/PieCircle/config.vue
@@ -1,14 +1,14 @@
 <template>
   <!-- 遍历 seriesList -->
-  <CollapseItem v-for="(item, index) in seriesList" :key="index" :name="`圆环-${index + 1}`" :expanded="true">
+  <CollapseItem v-for="(item, index) in config.series" :key="index" :name="`圆环-${index + 1}`" :expanded="true">
     <SettingItemBox name="数据">
       <SettingItem name="数值">
-        <n-input-number v-model:value="item.data[0].value" :min="0" :step="0.01" size="small" placeholder="数值">
+        <n-input-number v-model:value="config.dataset" :min="0" :max="1" :step="0.01" size="small" placeholder="数值">
         </n-input-number>
       </SettingItem>
     </SettingItemBox>
     <!-- Echarts 全局设置 -->
-    <SettingItemBox name="样式">
+    <SettingItemBox name="进度条样式">
       <SettingItem name="颜色">
         <n-color-picker
           size="small"
@@ -17,7 +17,7 @@
         ></n-color-picker>
       </SettingItem>
       <SettingItem name="阴影模糊等级">
-        <n-input-number v-model:value="item.data[0].itemStyle.normal.shadowBlur" :min="0" :step="1" size="small" placeholder="阴影模糊等级">
+        <n-input-number v-model:value="item.data[0].itemStyle.normal.shadowBlur" :min="0" :max="50" :step="1" size="small" placeholder="阴影模糊等级">
         </n-input-number>
       </SettingItem>
       <SettingItem name="阴影颜色">
@@ -34,16 +34,16 @@
         <n-color-picker
           size="small"
           :modes="['hex']"
-          v-model:value="title.textStyle.color"
+          v-model:value="config.title.textStyle.color"
         ></n-color-picker>
       </SettingItem>
       <SettingItem name="字体大小">
-        <n-input-number v-model:value="title.textStyle.fontSize" :min="0" :step="1" size="small" placeholder="字体大小">
+        <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"
@@ -63,8 +63,6 @@
         ></n-color-picker>
       </SettingItem>
     </SettingItemBox>
-    <!-- Echarts 全局设置 -->
-    <global-setting :optionData="optionData" :in-chart="true"></global-setting>
   </CollapseItem>
 </template>
 
@@ -72,7 +70,6 @@
 import { PropType, computed } from 'vue'
 // 以下是封装的设置模块布局组件，具体效果可在官网查看
 import {
-  GlobalSetting,
   CollapseItem,
   SettingItemBox,
   SettingItem
@@ -83,18 +80,10 @@ const props = defineProps({
   optionData: {
     type: Object as PropType<GlobalThemeJsonType>,
     required: true
-  },
-  title: {
-    type: Object as PropType<GlobalThemeJsonType>,
-    required: true
   }
 })
 
-const seriesList = computed(() => {
-  return props.optionData.series
-})
-
-const title = computed(() => {
-  return props.optionData.title
+const config = computed(() => {
+  return props.optionData
 })
 </script>
diff --git a/src/packages/components/Charts/Pies/PieCircle/index.vue b/src/packages/components/Charts/Pies/PieCircle/index.vue
index 305dee76..a4bf95da 100644
--- a/src/packages/components/Charts/Pies/PieCircle/index.vue
+++ b/src/packages/components/Charts/Pies/PieCircle/index.vue
@@ -1,9 +1,9 @@
 <template>
-  <v-chart ref="vChartRef" :theme="themeColor" :option="option" :manual-update="isPreview()" autoresize></v-chart>
+  <v-chart ref="vChartRef" :theme="themeColor" :option="option.value" :manual-update="isPreview()" autoresize></v-chart>
 </template>
 
 <script setup lang="ts">
-import { computed, PropType, watch } from 'vue'
+import {computed, PropType, reactive, watch} from 'vue'
 import VChart from 'vue-echarts'
 import { use } from 'echarts/core'
 import { CanvasRenderer } from 'echarts/renderers'
@@ -46,18 +46,26 @@ use([
   TitleComponent
 ])
 
+const option = reactive({
+  value: {}
+})
+
 watch(
     () => props.chartConfig.option.dataset,
     (newData) => {
-      props.chartConfig.option.title.text = newData + "%"
-      props.chartConfig.option.series[0].data[0].value = newData
-      props.chartConfig.option.series[0].data[1].value = 100 - newData
+      // console.log('update:'+newData)
+      const d = parseFloat(`${newData}`) * 100
+      let config = props.chartConfig.option
+      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(config, props.themeSetting, includes)
+      option.value = config
+    },
+    {
+      immediate: true,
     }
 )
 
-const option = computed(() => {
-  return mergeTheme(props.chartConfig.option, props.themeSetting, includes)
-})
-
 const { vChartRef } = useChartDataFetch(props.chartConfig, useChartEditStore)
 </script>