From ef912f91b2dde5ae5973b3b9d6b52d0dd8fdb7fe Mon Sep 17 00:00:00 2001
From: zhong <1781507490@qq.com>
Date: Sat, 29 Jun 2024 04:09:58 +0000
Subject: [PATCH 1/2] =?UTF-8?q?update=20src/views/chart/ContentEdit/compon?=
 =?UTF-8?q?ents/EditRule/index.vue.=20=E4=BF=AE=E6=94=B9=20=E5=AE=BD?=
 =?UTF-8?q?=E5=BA=A6*2=20=20=E4=BD=8E=E4=BA=8E1920=E6=97=B6=E6=8B=96?=
 =?UTF-8?q?=E4=B8=8D=E5=8A=A8=E5=92=8C=E4=BF=AE=E6=94=B9=E5=AE=BD=E9=AB=98?=
 =?UTF-8?q?=E6=97=B6=E6=BB=9A=E5=8A=A8=E6=9D=A1=E6=B2=A1=E5=8F=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zhong <1781507490@qq.com>
---
 .../ContentEdit/components/EditRule/index.vue | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/views/chart/ContentEdit/components/EditRule/index.vue b/src/views/chart/ContentEdit/components/EditRule/index.vue
index 0dbd527b..21ab7e27 100644
--- a/src/views/chart/ContentEdit/components/EditRule/index.vue
+++ b/src/views/chart/ContentEdit/components/EditRule/index.vue
@@ -13,7 +13,7 @@
     >
     </sketch-rule>
     <div ref="$app" class="edit-screens" @scroll="handleScroll">
-      <div ref="$container" class="edit-screen-container" :style="{ width: width * 2 + 'px' }">
+      <div ref="$container" class="edit-screen-container" :style="{ width: containerWidth }">
         <div
           ref="refSketchRuleBox"
           class="canvas"
@@ -62,8 +62,13 @@ const scale = computed(() => {
   return chartEditStore.getEditCanvas.scale
 })
 
-// 滚动条拖动的高度
+// 滚动条拖动的宽度
 const containerWidth = computed(() => {
+  return `${window.innerWidth * 2}px`
+})
+
+// 滚动条拖动的高度
+const containerHeight = computed(() => {
   return `${height.value * 2}px`
 })
 
@@ -203,14 +208,12 @@ watch(
   (newValue, oldValue) => {
     if (oldValue !== newValue && chartLayoutStore.getRePositionCanvas) {
       chartLayoutStore.setItemUnHandle(ChartLayoutStoreEnum.RE_POSITION_CANVAS, false)
-      handleScroll()
-      setTimeout(() => {
+    }
+    handleScroll()
+    setTimeout(() => {
         canvasPosCenter()
         reDraw()
-      }, 400)
-    } else {
-        reDraw();
-    }
+    }, 400)
   }
 )
 
@@ -337,7 +340,7 @@ window.onKeySpacePressHold = (isHold: boolean) => {
 
   .edit-screen-container {
     position: absolute;
-    height: v-bind('containerWidth');
+    height: v-bind('containerHeight');
     top: 0;
     left: 0;
   }

From 2201c0921913d5f64053b5389c536fa5652a41df 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: Tue, 6 Aug 2024 21:07:40 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E9=A5=BC?=
 =?UTF-8?q?=E5=9B=BE=E6=A0=87=E7=AD=BE=E6=A8=A1=E7=B3=8A=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chartConfiguration/echarts/label.ts       |  6 ++
 .../Charts/Pies/PieCommon/config.ts           |  6 +-
 .../Charts/Pies/PieCommon/config.vue          | 89 +++++++++++++++----
 3 files changed, 82 insertions(+), 19 deletions(-)

diff --git a/src/packages/chartConfiguration/echarts/label.ts b/src/packages/chartConfiguration/echarts/label.ts
index c907687a..a71a3804 100644
--- a/src/packages/chartConfiguration/echarts/label.ts
+++ b/src/packages/chartConfiguration/echarts/label.ts
@@ -3,5 +3,11 @@ export const labelConfig = {
     { label: '外侧', value: 'outside' },
     { label: '内部', value: 'inside' },
     { label: '中心', value: 'center' }
+  ],
+  fontWeight: [
+    { label: '正常', value: 'normal' },
+    { label: '普通加粗', value: 'bold' },
+    { label: '加粗', value: 'bolder' },
+    { label: '细体', value: 'lighter' }
   ]
 }
diff --git a/src/packages/components/Charts/Pies/PieCommon/config.ts b/src/packages/components/Charts/Pies/PieCommon/config.ts
index 1f999a51..35cc632f 100644
--- a/src/packages/components/Charts/Pies/PieCommon/config.ts
+++ b/src/packages/components/Charts/Pies/PieCommon/config.ts
@@ -52,7 +52,11 @@ const option = {
         show: false,
         position: 'center',
         formatter: '{b}',
-        fontSize:12
+        fontWeight: 'normal',
+        fontSize: 14,
+        color: '#454E54',
+        textBorderColor: '#ffffff',
+        textBorderWidth: 1
       },
       emphasis: {
         label: {
diff --git a/src/packages/components/Charts/Pies/PieCommon/config.vue b/src/packages/components/Charts/Pies/PieCommon/config.vue
index 2dd38301..bce322cd 100644
--- a/src/packages/components/Charts/Pies/PieCommon/config.vue
+++ b/src/packages/components/Charts/Pies/PieCommon/config.vue
@@ -18,6 +18,20 @@
         <n-text :depth="3">无鼠标点击图例场景时，可强行打开图例</n-text>
       </SettingItem>
     </SettingItemBox>
+    <SettingItemBox name="图形">
+      <setting-item name="内圈范围">
+        <n-input v-model:value="optionData.series[0].radius[0]" size="small"></n-input>
+      </setting-item>
+      <setting-item name="外圈范围">
+        <n-input v-model:value="optionData.series[0].radius[1]" size="small"></n-input>
+      </setting-item>
+      <setting-item name="X轴中心">
+        <n-input v-model:value="optionData.series[0].center[0]" size="small"></n-input>
+      </setting-item>
+      <setting-item name="Y轴中心">
+        <n-input v-model:value="optionData.series[0].center[1]" size="small"></n-input>
+      </setting-item>
+    </SettingItemBox>
     <SettingItemBox name="标签">
       <SettingItem>
         <n-space>
@@ -38,28 +52,67 @@
         <n-select v-model:value="optionData.series[0].label.formatter" size="small" :options="labelFormatterOptions" />
       </setting-item>
     </SettingItemBox>
+    <setting-item-box name="字体">
+      <setting-item name="大小">
+        <n-input-number v-model:value="optionData.series[0].label.fontSize" size="small" :min="0"></n-input-number>
+      </setting-item>
+      <setting-item name="颜色" v-if="optionData.series[0].label.color">
+        <n-color-picker size="small" :modes="['hex']" v-model:value="optionData.series[0].label.color"></n-color-picker>
+      </setting-item>
+      <SettingItem name="文字加粗" v-if="optionData.series[0].label.fontWeight">
+        <n-select
+          v-model:value="optionData.series[0].label.fontWeight"
+          size="small"
+          :options="labelConfig.fontWeight"
+        />
+      </SettingItem>
+      <setting-item name="文字边框大小" v-if="optionData.series[0].label.textBorderWidth">
+        <n-input-number
+          v-model:value="optionData.series[0].label.textBorderWidth"
+          size="small"
+          :min="0"
+        ></n-input-number>
+      </setting-item>
+      <setting-item name="文字边框色" v-if="optionData.series[0].label.textBorderColor">
+        <n-color-picker
+          size="small"
+          :modes="['hex']"
+          v-model:value="optionData.series[0].label.textBorderColor"
+        ></n-color-picker>
+      </setting-item>
+    </setting-item-box>
     <setting-item-box name="圆角">
-      <setting-item>
-        <n-space>
-          <n-input-number
-            v-model:value="optionData.series[0].itemStyle.borderRadius"
-            size="small"
-            :min="0"
-          ></n-input-number>
-          <n-text>圆角大小</n-text>
-        </n-space>
+      <setting-item name="圆角大小">
+        <n-input-number
+          v-model:value="optionData.series[0].itemStyle.borderRadius"
+          size="small"
+          :min="0"
+        ></n-input-number>
       </setting-item>
-      <setting-item>
-        <n-space>
-          <n-input-number
-            v-model:value="optionData.series[0].itemStyle.borderWidth"
-            size="small"
-            :min="0"
-          ></n-input-number>
-          <n-text>线条宽度</n-text>
-        </n-space>
+      <setting-item name="线条宽度">
+        <n-input-number
+          v-model:value="optionData.series[0].itemStyle.borderWidth"
+          size="small"
+          :min="0"
+        ></n-input-number>
       </setting-item>
     </setting-item-box>
+    <setting-item-box name="鼠标聚焦">
+      <setting-item name="文字大小">
+        <n-input-number
+          v-model:value="optionData.series[0].emphasis.label.fontSize"
+          size="small"
+          :min="0"
+        ></n-input-number>
+      </setting-item>
+      <SettingItem name="文字加粗" v-if="optionData.series[0].emphasis.label.fontWeight">
+        <n-select
+          v-model:value="optionData.series[0].emphasis.label.fontWeight"
+          size="small"
+          :options="labelConfig.fontWeight"
+        />
+      </SettingItem>
+    </setting-item-box>
   </CollapseItem>
 </template>