From 4e9e492c29bfd4f2cde1b503e4477b609cf814ef Mon Sep 17 00:00:00 2001
From: mtruning <1262327911@qq.com>
Date: Sat, 26 Feb 2022 17:38:24 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E5=9B=BE=E8=A1=A8?=
 =?UTF-8?q?=E7=8B=AC=E7=AB=8B=E9=85=8D=E7=BD=AE=E6=B7=B7=E5=90=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AppleControlBtn/index.ts       |   3 -
 .../ChartItemSetting/CollapseItem.vue         |   7 +-
 src/components/MacOsControlBtn/index.ts       |   3 +
 .../index.vue                                 |   0
 .../Charts/Bars/BarCommon/config.ts           |  80 +++++++-------
 .../Charts/Bars/BarCommon/config.vue          |  40 ++++++-
 .../components/Charts/Bars/BarCommon/index.ts |   2 +
 .../Charts/Bars/BarCrossrange/config.ts       |  77 +++++++------
 .../Charts/Bars/BarCrossrange/config.vue      |  40 ++++++-
 .../Charts/Bars/BarCrossrange/index.ts        |   2 +
 .../Charts/Lines/LineCommon/config.ts         |  11 +-
 .../Charts/Lines/LineCommon/config.vue        |   1 -
 .../Charts/Lines/LineCommon/index.ts          |   2 +
 .../Lines/LineGradientSingle/config.vue       |   1 -
 .../Charts/Lines/LineGradientSingle/index.ts  |   2 +
 .../Charts/Lines/LineGradients/config.ts      | 103 +++++++++---------
 .../Charts/Lines/LineGradients/config.vue     |   1 -
 .../Charts/Lines/LineGradients/index.ts       |   2 +
 .../Charts/Pies/PieCommon/config.ts           |   8 +-
 .../Charts/Pies/PieCommon/config.vue          |   1 -
 .../components/Charts/Pies/PieCommon/index.ts |   2 +
 src/packages/index.d.ts                       |   1 +
 .../modules/packagesStore/packagesStore.ts    |   2 +-
 src/utils/componets.ts                        |   2 +-
 src/utils/crypto.ts                           |   4 +-
 src/utils/utils.ts                            |   2 +-
 .../components/ItemBox/index.vue              |   8 +-
 .../ContentCharts/hooks/useAside.hook.ts      |   4 +-
 src/views/chart/ContentCharts/index.vue       |   1 -
 .../components/ChartDataSetting/index.vue     |   0
 .../components/ChartThemeColor/index.vue      |   0
 .../components/CanvasPage/index.ts            |   0
 .../components/CanvasPage/index.vue           |   0
 .../components/ChartData/index.vue            |   0
 .../components/ChartSetting/index.vue         |   5 +
 .../chart/ContentConfigurations/index.ts      |   3 +
 .../index.vue                                 |   0
 src/views/chart/ContentDetails/index.ts       |   3 -
 .../components/EditShapeBox/index.vue         |   2 +-
 src/views/chart/HeaderLeftBtn/index.vue       |   2 +-
 src/views/chart/index.vue                     |   6 +-
 .../project/items/components/Card/index.vue   |   4 +-
 .../items/components/ModalCard/index.vue      |   4 +-
 43 files changed, 271 insertions(+), 170 deletions(-)
 delete mode 100644 src/components/AppleControlBtn/index.ts
 create mode 100644 src/components/MacOsControlBtn/index.ts
 rename src/components/{AppleControlBtn => MacOsControlBtn}/index.vue (100%)
 rename src/views/chart/{ContentDetails => ContentConfigurations}/components/CanvasPage/components/ChartDataSetting/index.vue (100%)
 rename src/views/chart/{ContentDetails => ContentConfigurations}/components/CanvasPage/components/ChartThemeColor/index.vue (100%)
 rename src/views/chart/{ContentDetails => ContentConfigurations}/components/CanvasPage/index.ts (100%)
 rename src/views/chart/{ContentDetails => ContentConfigurations}/components/CanvasPage/index.vue (100%)
 rename src/views/chart/{ContentDetails => ContentConfigurations}/components/ChartData/index.vue (100%)
 rename src/views/chart/{ContentDetails => ContentConfigurations}/components/ChartSetting/index.vue (87%)
 create mode 100644 src/views/chart/ContentConfigurations/index.ts
 rename src/views/chart/{ContentDetails => ContentConfigurations}/index.vue (100%)
 delete mode 100644 src/views/chart/ContentDetails/index.ts

diff --git a/src/components/AppleControlBtn/index.ts b/src/components/AppleControlBtn/index.ts
deleted file mode 100644
index aa632ff7..00000000
--- a/src/components/AppleControlBtn/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import AppleControlBtn from './index.vue';
-
-export { AppleControlBtn };
diff --git a/src/components/ChartItemSetting/CollapseItem.vue b/src/components/ChartItemSetting/CollapseItem.vue
index e9119ac7..09589195 100644
--- a/src/components/ChartItemSetting/CollapseItem.vue
+++ b/src/components/ChartItemSetting/CollapseItem.vue
@@ -1,6 +1,6 @@
 <template>
   <n-divider style="margin: 10px 0;" />
-  <n-collapse arrow-placement="right" :default-expanded-names="name" accordion>
+  <n-collapse arrow-placement="right" :default-expanded-names="expanded ? name : null" accordion>
     <!-- 右侧 -->
     <template #header-extra>
       <div @click="click">
@@ -19,6 +19,11 @@ defineProps({
   name: {
     type: String,
     required: true
+  },
+  expanded: {
+    type: Boolean,
+    required: false,
+    default: false
   }
 })
 
diff --git a/src/components/MacOsControlBtn/index.ts b/src/components/MacOsControlBtn/index.ts
new file mode 100644
index 00000000..a3a98777
--- /dev/null
+++ b/src/components/MacOsControlBtn/index.ts
@@ -0,0 +1,3 @@
+import MacOsControlBtn from './index.vue';
+
+export { MacOsControlBtn };
diff --git a/src/components/AppleControlBtn/index.vue b/src/components/MacOsControlBtn/index.vue
similarity index 100%
rename from src/components/AppleControlBtn/index.vue
rename to src/components/MacOsControlBtn/index.vue
diff --git a/src/packages/components/Charts/Bars/BarCommon/config.ts b/src/packages/components/Charts/Bars/BarCommon/config.ts
index 86a74029..e4c6ae73 100644
--- a/src/packages/components/Charts/Bars/BarCommon/config.ts
+++ b/src/packages/components/Charts/Bars/BarCommon/config.ts
@@ -6,49 +6,55 @@ import cloneDeep from 'lodash/cloneDeep'
 
 export const includes = ['legend', 'xAxis', 'yAxis']
 
-// 图表配置项
-const option = echartOptionProfixHandle(
-  {
-    tooltip: {
+export const option = {
+  tooltip: {
+    show: true,
+    trigger: 'axis',
+    axisPointer: {
       show: true,
-      trigger: 'axis',
-      axisPointer: {
-        show: true,
-        type: 'shadow'
-      }
-    },
-    legend: {
-      show: true,
-    },
-    xAxis: {
-      show: true,
-      type: 'category',
-      data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
-    },
-    yAxis: {
-      show: true,
-      type: 'value'
-    },
-    series: [
-      {
-        name: 'data1',
-        type: 'bar',
-        data: [120, 200, 150, 80, 70, 110, 130]
-      },
-      {
-        name: 'data2',
-        type: 'bar',
-        data: [130, 130, 312, 268, 155, 117, 160]
-      }
-    ]
+      type: 'shadow'
+    }
   },
-  includes
-)
+  legend: {
+    show: true,
+  },
+  xAxis: {
+    show: true,
+    type: 'category',
+    data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
+  },
+  yAxis: {
+    show: true,
+    type: 'value'
+  },
+  series: [
+    {
+      name: 'data1',
+      type: 'bar',
+      barWidth: null,
+      itemStyle: {
+        color: null,
+        borderRadius: 0
+      },
+      data: [120, 200, 150, 80, 70, 110, 130]
+    },
+    {
+      name: 'data2',
+      type: 'bar',
+      barWidth: null,
+      itemStyle: {
+        color: null,
+        borderRadius: 0
+      },
+      data: [130, 130, 312, 268, 155, 117, 160]
+    }
+  ]
+}
 
 export default class Config extends publicConfig
   implements CreateComponentType {
   public key = BarCommonConfig.key
   public chartConfig = omit(cloneDeep(BarCommonConfig), ['node'])
   // 图表配置项
-  public option = option
+  public option = echartOptionProfixHandle(option, includes)
 }
diff --git a/src/packages/components/Charts/Bars/BarCommon/config.vue b/src/packages/components/Charts/Bars/BarCommon/config.vue
index 3e3b929c..130caf10 100644
--- a/src/packages/components/Charts/Bars/BarCommon/config.vue
+++ b/src/packages/components/Charts/Bars/BarCommon/config.vue
@@ -1,7 +1,45 @@
 <template>
-  <div>配置项目</div>
+  <CollapseItem v-for="(item, index) in seriesList" :key="index" :name="`柱状图-数据-${index+1}`" :expanded="true">
+    <SettingItemBox name="图形">
+      <SettingItem name="颜色">
+        <n-color-picker size="small" :modes="['hex']" v-model:value="item.itemStyle.color" />
+      </SettingItem>
+      <SettingItem>
+        <n-button size="small" @click="item.itemStyle.color = null">恢复默认</n-button>
+      </SettingItem>
+      <SettingItem name="宽度">
+          <n-input-number
+          v-model:value="item.barWidth"
+          :min="1"
+          :max="100"
+          size="small"
+          placeholder="自动计算"
+        />
+      </SettingItem>
+      <SettingItem name="圆角">
+          <n-input-number
+          v-model:value="item.itemStyle.borderRadius"
+          :min="0"
+          size="small"
+        />
+      </SettingItem>
+    </SettingItemBox>
+  </CollapseItem>
 </template>
 
 <script setup lang="ts">
+import { PropType, computed } from 'vue'
+import { CollapseItem, SettingItemBox, SettingItem } from '@/components/ChartItemSetting/index'
+import { option } from './config'
 
+const props = defineProps({
+  optionData: {
+    type: Object as PropType<typeof option>,
+    required: true
+  }
+})
+
+const seriesList = computed(() => {
+  return props.optionData.series
+})
 </script>
diff --git a/src/packages/components/Charts/Bars/BarCommon/index.ts b/src/packages/components/Charts/Bars/BarCommon/index.ts
index 13f6b12e..9385ef7a 100644
--- a/src/packages/components/Charts/Bars/BarCommon/index.ts
+++ b/src/packages/components/Charts/Bars/BarCommon/index.ts
@@ -1,4 +1,5 @@
 import BarCommon from './index.vue'
+import Configuration from './config.vue'
 import image from '@/assets/images/chart/charts/bar_x.png'
 import { ConfigType, PackagesCategoryEnum } from '@/packages/index.d'
 import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'
@@ -10,5 +11,6 @@ export const BarCommonConfig: ConfigType = {
   categoryName: ChatCategoryEnumName.BAR,
   package: PackagesCategoryEnum.CHARTS,
   node: BarCommon,
+  conNode: () => Configuration,
   image: image,
 }
diff --git a/src/packages/components/Charts/Bars/BarCrossrange/config.ts b/src/packages/components/Charts/Bars/BarCrossrange/config.ts
index 823432e6..c2b6ec6a 100644
--- a/src/packages/components/Charts/Bars/BarCrossrange/config.ts
+++ b/src/packages/components/Charts/Bars/BarCrossrange/config.ts
@@ -6,48 +6,55 @@ import cloneDeep from 'lodash/cloneDeep'
 
 export const includes = ['legend', 'xAxis', 'yAxis']
 
-const option = echartOptionProfixHandle(
-  {
-    tooltip: {
+export const option = {
+  tooltip: {
+    show: true,
+    trigger: 'axis',
+    axisPointer: {
       show: true,
-      trigger: 'axis',
-      axisPointer: {
-        show: true,
-        type: 'shadow'
-      }
+      type: 'shadow',
     },
-    legend: {
-      show: true,
-    },
-    xAxis: {
-      show: true,
-      type: 'value',
-      data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
-    },
-    yAxis: {
-      show: true,
-      type: 'category'
-    },
-    series: [
-      {
-        name: 'data1',
-        type: 'bar',
-        data: [120, 200, 150, 80, 70, 110, 130]
-      },
-      {
-        name: 'data2',
-        type: 'bar',
-        data: [130, 130, 312, 268, 155, 117, 160]
-      }
-    ]
   },
-  includes
-)
+  legend: {
+    show: true,
+  },
+  xAxis: {
+    show: true,
+    type: 'value',
+    data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
+  },
+  yAxis: {
+    show: true,
+    type: 'category',
+  },
+  series: [
+    {
+      name: 'data1',
+      type: 'bar',
+      barWidth: null,
+      itemStyle: {
+        color: null,
+        borderRadius: 0,
+      },
+      data: [120, 200, 150, 80, 70, 110, 130],
+    },
+    {
+      name: 'data2',
+      type: 'bar',
+      barWidth: null,
+      itemStyle: {
+        color: null,
+        borderRadius: 0,
+      },
+      data: [130, 130, 312, 268, 155, 117, 160],
+    },
+  ],
+}
 
 export default class Config extends publicConfig
   implements CreateComponentType {
   public key: string = BarCrossrangefig.key
   public chartConfig = omit(cloneDeep(BarCrossrangefig), ['node'])
   // 图表配置项
-  public option = option
+  public option = echartOptionProfixHandle(option, includes)
 }
diff --git a/src/packages/components/Charts/Bars/BarCrossrange/config.vue b/src/packages/components/Charts/Bars/BarCrossrange/config.vue
index 3e3b929c..130caf10 100644
--- a/src/packages/components/Charts/Bars/BarCrossrange/config.vue
+++ b/src/packages/components/Charts/Bars/BarCrossrange/config.vue
@@ -1,7 +1,45 @@
 <template>
-  <div>配置项目</div>
+  <CollapseItem v-for="(item, index) in seriesList" :key="index" :name="`柱状图-数据-${index+1}`" :expanded="true">
+    <SettingItemBox name="图形">
+      <SettingItem name="颜色">
+        <n-color-picker size="small" :modes="['hex']" v-model:value="item.itemStyle.color" />
+      </SettingItem>
+      <SettingItem>
+        <n-button size="small" @click="item.itemStyle.color = null">恢复默认</n-button>
+      </SettingItem>
+      <SettingItem name="宽度">
+          <n-input-number
+          v-model:value="item.barWidth"
+          :min="1"
+          :max="100"
+          size="small"
+          placeholder="自动计算"
+        />
+      </SettingItem>
+      <SettingItem name="圆角">
+          <n-input-number
+          v-model:value="item.itemStyle.borderRadius"
+          :min="0"
+          size="small"
+        />
+      </SettingItem>
+    </SettingItemBox>
+  </CollapseItem>
 </template>
 
 <script setup lang="ts">
+import { PropType, computed } from 'vue'
+import { CollapseItem, SettingItemBox, SettingItem } from '@/components/ChartItemSetting/index'
+import { option } from './config'
 
+const props = defineProps({
+  optionData: {
+    type: Object as PropType<typeof option>,
+    required: true
+  }
+})
+
+const seriesList = computed(() => {
+  return props.optionData.series
+})
 </script>
diff --git a/src/packages/components/Charts/Bars/BarCrossrange/index.ts b/src/packages/components/Charts/Bars/BarCrossrange/index.ts
index 65d9acc5..90dc86b0 100644
--- a/src/packages/components/Charts/Bars/BarCrossrange/index.ts
+++ b/src/packages/components/Charts/Bars/BarCrossrange/index.ts
@@ -1,4 +1,5 @@
 import BarCrossrange from './index.vue'
+import Configuration from './config.vue'
 import image from '@/assets/images/chart/charts/bar_y.png'
 import { ConfigType, PackagesCategoryEnum } from '@/packages/index.d'
 import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'
@@ -10,5 +11,6 @@ export const BarCrossrangefig: ConfigType = {
   categoryName: ChatCategoryEnumName.BAR,
   package: PackagesCategoryEnum.CHARTS,
   node: BarCrossrange,
+  conNode: () => Configuration,
   image: image
 }
diff --git a/src/packages/components/Charts/Lines/LineCommon/config.ts b/src/packages/components/Charts/Lines/LineCommon/config.ts
index d74b4573..cb51008f 100644
--- a/src/packages/components/Charts/Lines/LineCommon/config.ts
+++ b/src/packages/components/Charts/Lines/LineCommon/config.ts
@@ -5,7 +5,7 @@ import omit from 'lodash/omit'
 
 export const includes = ['legend', 'xAxis', 'yAxis']
 
-const options = echartOptionProfixHandle({
+const option = {
   legend: {
     show: true,
   },
@@ -23,18 +23,13 @@ const options = echartOptionProfixHandle({
       name: 'data1',
       type: 'line',
       data: [120, 200, 150, 80, 70, 110, 130]
-    },
-    {
-      name: 'data2',
-      type: 'line',
-      data: [130, 130, 312, 268, 155, 117, 160]
     }
   ]
-}, includes)
+}
 
 export default class Config extends publicConfig implements CreateComponentType {
   public key: string = LineCommonConfig.key
   public chartConfig = omit(LineCommonConfig, ['node'])
   // 图表配置项
-  public option = options
+  public option = echartOptionProfixHandle(option, includes)
 }
\ No newline at end of file
diff --git a/src/packages/components/Charts/Lines/LineCommon/config.vue b/src/packages/components/Charts/Lines/LineCommon/config.vue
index 3e3b929c..44a7bc22 100644
--- a/src/packages/components/Charts/Lines/LineCommon/config.vue
+++ b/src/packages/components/Charts/Lines/LineCommon/config.vue
@@ -1,5 +1,4 @@
 <template>
-  <div>配置项目</div>
 </template>
 
 <script setup lang="ts">
diff --git a/src/packages/components/Charts/Lines/LineCommon/index.ts b/src/packages/components/Charts/Lines/LineCommon/index.ts
index 205a42aa..c1912eb5 100644
--- a/src/packages/components/Charts/Lines/LineCommon/index.ts
+++ b/src/packages/components/Charts/Lines/LineCommon/index.ts
@@ -1,4 +1,5 @@
 import LineCommon from './index.vue'
+import Configuration from './config.vue'
 import image from '@/assets/images/chart/charts/line.png'
 import { ConfigType, PackagesCategoryEnum } from '@/packages/index.d'
 import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'
@@ -10,5 +11,6 @@ export const LineCommonConfig: ConfigType = {
   categoryName: ChatCategoryEnumName.LINE,
   package: PackagesCategoryEnum.CHARTS,
   node: LineCommon,
+  conNode: () => Configuration,
   image: image
 }
diff --git a/src/packages/components/Charts/Lines/LineGradientSingle/config.vue b/src/packages/components/Charts/Lines/LineGradientSingle/config.vue
index 3e3b929c..44a7bc22 100644
--- a/src/packages/components/Charts/Lines/LineGradientSingle/config.vue
+++ b/src/packages/components/Charts/Lines/LineGradientSingle/config.vue
@@ -1,5 +1,4 @@
 <template>
-  <div>配置项目</div>
 </template>
 
 <script setup lang="ts">
diff --git a/src/packages/components/Charts/Lines/LineGradientSingle/index.ts b/src/packages/components/Charts/Lines/LineGradientSingle/index.ts
index 666b5df7..986e82f0 100644
--- a/src/packages/components/Charts/Lines/LineGradientSingle/index.ts
+++ b/src/packages/components/Charts/Lines/LineGradientSingle/index.ts
@@ -1,4 +1,5 @@
 import LineGradientSingle from './index.vue'
+import Configuration from './config.vue'
 import image from '@/assets/images/chart/charts/line_gradient_single.png'
 import { ConfigType, PackagesCategoryEnum } from '@/packages/index.d'
 import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'
@@ -10,5 +11,6 @@ export const LineGradientSingleConfig: ConfigType = {
   categoryName: ChatCategoryEnumName.LINE,
   package: PackagesCategoryEnum.CHARTS,
   node: LineGradientSingle,
+  conNode: () => Configuration,
   image: image
 }
diff --git a/src/packages/components/Charts/Lines/LineGradients/config.ts b/src/packages/components/Charts/Lines/LineGradients/config.ts
index 13467359..0d4edce0 100644
--- a/src/packages/components/Charts/Lines/LineGradients/config.ts
+++ b/src/packages/components/Charts/Lines/LineGradients/config.ts
@@ -6,72 +6,69 @@ import omit from 'lodash/omit'
 
 export const includes = ['legend', 'xAxis', 'yAxis']
 
-const options = echartOptionProfixHandle(
-  {
-    legend: {
-      show: true
+const option = {
+  legend: {
+    show: true,
+  },
+  xAxis: {
+    show: true,
+    type: 'category',
+    data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
+  },
+  yAxis: {
+    show: true,
+    type: 'value',
+  },
+  series: [
+    {
+      name: 'data1',
+      type: 'line',
+      smooth: false,
+      data: [120, 200, 150, 80, 70, 110, 130],
+      areaStyle: {
+        opacity: 0.8,
+        color: new graphic.LinearGradient(0, 0, 0, 1, [
+          {
+            offset: 0,
+            color: 'rgba(25,163,223,.3)',
+          },
+          {
+            offset: 1,
+            color: 'rgba(25,163,223, 0)',
+          },
+        ]),
+      },
     },
-    xAxis: {
-      show: true,
-      type: 'category',
-      data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
-    },
-    yAxis: {
-      show: true,
-      type: 'value'
-    },
-    series: [
-      {
-        name: 'data1',
-        type: 'line',
-        smooth: false,
-        data: [120, 200, 150, 80, 70, 110, 130],
-        areaStyle: {
+    {
+      name: 'data2',
+      type: 'line',
+      smooth: false,
+      areaStyle: {
+        normal: {
           opacity: 0.8,
           color: new graphic.LinearGradient(0, 0, 0, 1, [
             {
               offset: 0,
-              color: 'rgba(25,163,223,.3)'
+              color: 'rgba(0,202,149,0.3)',
             },
             {
               offset: 1,
-              color: 'rgba(25,163,223, 0)'
-            }
-          ])
-        }
-      },
-      {
-        name: 'data2',
-        type: 'line',
-        smooth: false,
-        areaStyle: {
-          normal: {
-            opacity: 0.8,
-            color: new graphic.LinearGradient(0, 0, 0, 1, [
-              {
-                offset: 0,
-                color: 'rgba(0,202,149,0.3)'
-              },
-              {
-                offset: 1,
-                color: 'rgba(0,202,149,0)'
-              }
-            ]),
-            shadowColor: 'rgba(0,202,149, 0.9)',
-            shadowBlur: 20
-          }
+              color: 'rgba(0,202,149,0)',
+            },
+          ]),
+          shadowColor: 'rgba(0,202,149, 0.9)',
+          shadowBlur: 20,
         },
-        data: [130, 130, 312, 268, 155, 117, 160]
-      }
-    ]
-  },
-  includes
-)
+      },
+      data: [130, 130, 312, 268, 155, 117, 160],
+    },
+  ],
+}
 
 export default class Config extends publicConfig
   implements CreateComponentType {
   public key: string = LineGradientsConfig.key
   public chartConfig = omit(LineGradientsConfig, ['node'])
   // 图表配置项
-  public option = options
+  public option = echartOptionProfixHandle(option, includes)
 }
diff --git a/src/packages/components/Charts/Lines/LineGradients/config.vue b/src/packages/components/Charts/Lines/LineGradients/config.vue
index 3e3b929c..44a7bc22 100644
--- a/src/packages/components/Charts/Lines/LineGradients/config.vue
+++ b/src/packages/components/Charts/Lines/LineGradients/config.vue
@@ -1,5 +1,4 @@
 <template>
-  <div>配置项目</div>
 </template>
 
 <script setup lang="ts">
diff --git a/src/packages/components/Charts/Lines/LineGradients/index.ts b/src/packages/components/Charts/Lines/LineGradients/index.ts
index ca8e300f..43e68ec3 100644
--- a/src/packages/components/Charts/Lines/LineGradients/index.ts
+++ b/src/packages/components/Charts/Lines/LineGradients/index.ts
@@ -1,4 +1,5 @@
 import LineGradients from './index.vue'
+import Configuration from './config.vue'
 import image from '@/assets/images/chart/charts/line_gradient2.png'
 import { ConfigType, PackagesCategoryEnum } from '@/packages/index.d'
 import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'
@@ -10,5 +11,6 @@ export const LineGradientsConfig: ConfigType = {
   categoryName: ChatCategoryEnumName.LINE,
   package: PackagesCategoryEnum.CHARTS,
   node: LineGradients,
+  conNode: () => Configuration,
   image: image
 }
diff --git a/src/packages/components/Charts/Pies/PieCommon/config.ts b/src/packages/components/Charts/Pies/PieCommon/config.ts
index db634dd1..796fb437 100644
--- a/src/packages/components/Charts/Pies/PieCommon/config.ts
+++ b/src/packages/components/Charts/Pies/PieCommon/config.ts
@@ -5,7 +5,7 @@ import omit from 'lodash/omit'
 
 export const includes = ['legend']
 
-const option = echartOptionProfixHandle({
+const option = {
   tooltip: {
     show: true,
     trigger: 'item'
@@ -17,7 +17,7 @@ const option = echartOptionProfixHandle({
     {
       name: 'Access From',
       type: 'pie',
-      radius: ['40%', '70%'],
+      radius: ['40%', '65%'],
       center: ['50%', '60%'],
       avoidLabelOverlap: false,
       itemStyle: {
@@ -49,7 +49,7 @@ const option = echartOptionProfixHandle({
       ]
     }
   ]
-}, includes)
+}
 
 export default class Config extends publicConfig implements CreateComponentType {
   public key: string = PieCommonConfig.key
@@ -57,5 +57,5 @@ export default class Config extends publicConfig implements CreateComponentType
   public chartConfig = omit(PieCommonConfig, ['node'])
 
   // 图表配置项
-  public option = option
+  public option = echartOptionProfixHandle(option, includes)
 }
diff --git a/src/packages/components/Charts/Pies/PieCommon/config.vue b/src/packages/components/Charts/Pies/PieCommon/config.vue
index 3e3b929c..44a7bc22 100644
--- a/src/packages/components/Charts/Pies/PieCommon/config.vue
+++ b/src/packages/components/Charts/Pies/PieCommon/config.vue
@@ -1,5 +1,4 @@
 <template>
-  <div>配置项目</div>
 </template>
 
 <script setup lang="ts">
diff --git a/src/packages/components/Charts/Pies/PieCommon/index.ts b/src/packages/components/Charts/Pies/PieCommon/index.ts
index 5e9c49d8..697057a7 100644
--- a/src/packages/components/Charts/Pies/PieCommon/index.ts
+++ b/src/packages/components/Charts/Pies/PieCommon/index.ts
@@ -1,4 +1,5 @@
 import PieCommon from './index.vue'
+import Configuration from './config.vue'
 import image from '@/assets/images/chart/charts/pie.png'
 import { ConfigType, PackagesCategoryEnum } from '@/packages/index.d'
 import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'
@@ -10,5 +11,6 @@ export const PieCommonConfig: ConfigType = {
   categoryName: ChatCategoryEnumName.PIE,
   package: PackagesCategoryEnum.CHARTS,
   node: PieCommon,
+  conNode: () => Configuration,
   image
 }
diff --git a/src/packages/index.d.ts b/src/packages/index.d.ts
index 676f3391..809b44ca 100644
--- a/src/packages/index.d.ts
+++ b/src/packages/index.d.ts
@@ -9,6 +9,7 @@ export type ConfigType = {
   categoryName: string
   package: string
   node: Component
+  conNode: () => Component
   image: string | (() => Promise<typeof import('*.png')>)
 }
 
diff --git a/src/store/modules/packagesStore/packagesStore.ts b/src/store/modules/packagesStore/packagesStore.ts
index cc7849bf..0e7254db 100644
--- a/src/store/modules/packagesStore/packagesStore.ts
+++ b/src/store/modules/packagesStore/packagesStore.ts
@@ -6,7 +6,7 @@ import { packagesList } from '@/packages/index'
 export const usePackagesStore = defineStore({
   id: 'usePackagesStore',
   state: (): PackagesStoreType => ({
-    packagesList
+    packagesList: Object.freeze(packagesList)
   }),
   getters: {
     getPackagesList(): PackagesType {
diff --git a/src/utils/componets.ts b/src/utils/componets.ts
index 0e13bb58..4ef9850b 100644
--- a/src/utils/componets.ts
+++ b/src/utils/componets.ts
@@ -5,7 +5,7 @@ import { AsyncLoading, AsyncSkeletonLoading } from '@/components/LoadingComponen
  * * 动态注册组件
  */
 export const componentInstall = <T> (key:string, node: T)  => {
-  if(!window['$vue'].component(key)) {
+  if(!window['$vue'].component(key) && key && node) {
     window['$vue'].component(key, node)
   }
 }
diff --git a/src/utils/crypto.ts b/src/utils/crypto.ts
index 6b553ff9..ef2db7e7 100644
--- a/src/utils/crypto.ts
+++ b/src/utils/crypto.ts
@@ -2,7 +2,7 @@ import * as CryptoJS from 'crypto-ts'
 
 export default {
   AES_KEY: 'mt',
-  encode(data: string): string {
+  cryptoEncode(data: string): string {
     if (typeof data !== 'string') return ''
     // 加密
     const key = CryptoJS.enc.Utf8.parse(this.AES_KEY)
@@ -15,7 +15,7 @@ export default {
     return encryptedData.toString()
   },
   // 解密
-  decode(data: string): string {
+  cryptoDecode(data: string): string {
     if (typeof data !== 'string') return ''
     const encryptedHexStr = CryptoJS.enc.Utf8.parse(data)
     const encryptedBase64Str = CryptoJS.enc.Utf8.stringify(encryptedHexStr)
diff --git a/src/utils/utils.ts b/src/utils/utils.ts
index 96b3ed19..656be1b4 100644
--- a/src/utils/utils.ts
+++ b/src/utils/utils.ts
@@ -7,7 +7,7 @@ import throttle from 'lodash/throttle'
  * * 生成一个不重复的ID
  * @param { Number } randomLength
  */
-export function getUUID(randomLength = 10) {
+export const getUUID = (randomLength = 10) =>{
   return Number(
     Math.random().toString().substr(2, randomLength) + Date.now()
   ).toString(36)
diff --git a/src/views/chart/ContentCharts/components/ItemBox/index.vue b/src/views/chart/ContentCharts/components/ItemBox/index.vue
index 8464bd3e..53e8ff02 100644
--- a/src/views/chart/ContentCharts/components/ItemBox/index.vue
+++ b/src/views/chart/ContentCharts/components/ItemBox/index.vue
@@ -9,7 +9,7 @@
       @dragstart="handleDragStart($event, item)"
     >
       <div class="list-header">
-        <AppleControlBtn :mini="true" :disabled="true"></AppleControlBtn>
+        <MacOsControlBtn :mini="true" :disabled="true"></MacOsControlBtn>
         <n-text class="list-header-text" depth="3">{{ item.title }}</n-text>
       </div>
       <div class="list-center go-flex-center">
@@ -26,7 +26,8 @@
 </template>
 
 <script setup lang="ts">
-import { AppleControlBtn } from '@/components/AppleControlBtn/index'
+import { PropType } from 'vue'
+import { MacOsControlBtn } from '@/components/MacOsControlBtn/index'
 import { requireFallbackImg, componentInstall } from '@/utils'
 import { DragKeyEnum } from '@/enums/editPageEnum'
 import { ConfigType } from '@/packages/index.d'
@@ -34,13 +35,14 @@ import omit from 'lodash/omit'
 
 defineProps({
   menuOptions: {
-    type: Array,
+    type: Array as PropType<ConfigType[]>,
     default: () => []
   }
 })
 
 // 拖拽处理
 const handleDragStart = (e: DragEvent, item: ConfigType) => {
+  // 动态注册图表组件
   componentInstall(item.key, item.node)
   // 将配置项绑定到拖拽属性上
   e!.dataTransfer!.setData(DragKeyEnum.DROG_KEY, JSON.stringify(omit(item, ['node', 'image'])))
diff --git a/src/views/chart/ContentCharts/hooks/useAside.hook.ts b/src/views/chart/ContentCharts/hooks/useAside.hook.ts
index 2190f347..77878aec 100644
--- a/src/views/chart/ContentCharts/hooks/useAside.hook.ts
+++ b/src/views/chart/ContentCharts/hooks/useAside.hook.ts
@@ -17,12 +17,12 @@ const {
 
 // 图表
 const { getPackagesList } = usePackagesStore()
-const menuOptions = shallowReactive<{
+const menuOptions:{
   key: string
   icon: ReturnType<typeof renderIcon>
   label: ReturnType<typeof renderLang>
   list: PackagesType
-}[]>([])
+}[] = []
 
 const packagesListObj = {
   [PackagesCategoryEnum.CHARTS]: {
diff --git a/src/views/chart/ContentCharts/index.vue b/src/views/chart/ContentCharts/index.vue
index 5d1ed64c..1760d7dc 100644
--- a/src/views/chart/ContentCharts/index.vue
+++ b/src/views/chart/ContentCharts/index.vue
@@ -43,7 +43,6 @@
 </template>
 
 <script setup lang="ts">
-import { reactive, ref, toRefs } from 'vue'
 import { ContentBox } from '../ContentBox/index'
 import { OptionContent } from './components/OptionContent'
 import {
diff --git a/src/views/chart/ContentDetails/components/CanvasPage/components/ChartDataSetting/index.vue b/src/views/chart/ContentConfigurations/components/CanvasPage/components/ChartDataSetting/index.vue
similarity index 100%
rename from src/views/chart/ContentDetails/components/CanvasPage/components/ChartDataSetting/index.vue
rename to src/views/chart/ContentConfigurations/components/CanvasPage/components/ChartDataSetting/index.vue
diff --git a/src/views/chart/ContentDetails/components/CanvasPage/components/ChartThemeColor/index.vue b/src/views/chart/ContentConfigurations/components/CanvasPage/components/ChartThemeColor/index.vue
similarity index 100%
rename from src/views/chart/ContentDetails/components/CanvasPage/components/ChartThemeColor/index.vue
rename to src/views/chart/ContentConfigurations/components/CanvasPage/components/ChartThemeColor/index.vue
diff --git a/src/views/chart/ContentDetails/components/CanvasPage/index.ts b/src/views/chart/ContentConfigurations/components/CanvasPage/index.ts
similarity index 100%
rename from src/views/chart/ContentDetails/components/CanvasPage/index.ts
rename to src/views/chart/ContentConfigurations/components/CanvasPage/index.ts
diff --git a/src/views/chart/ContentDetails/components/CanvasPage/index.vue b/src/views/chart/ContentConfigurations/components/CanvasPage/index.vue
similarity index 100%
rename from src/views/chart/ContentDetails/components/CanvasPage/index.vue
rename to src/views/chart/ContentConfigurations/components/CanvasPage/index.vue
diff --git a/src/views/chart/ContentDetails/components/ChartData/index.vue b/src/views/chart/ContentConfigurations/components/ChartData/index.vue
similarity index 100%
rename from src/views/chart/ContentDetails/components/ChartData/index.vue
rename to src/views/chart/ContentConfigurations/components/ChartData/index.vue
diff --git a/src/views/chart/ContentDetails/components/ChartSetting/index.vue b/src/views/chart/ContentConfigurations/components/ChartSetting/index.vue
similarity index 87%
rename from src/views/chart/ContentDetails/components/ChartSetting/index.vue
rename to src/views/chart/ContentConfigurations/components/ChartSetting/index.vue
index 8dd163bc..d41038db 100644
--- a/src/views/chart/ContentDetails/components/ChartSetting/index.vue
+++ b/src/views/chart/ContentConfigurations/components/ChartSetting/index.vue
@@ -1,5 +1,6 @@
 <template>
   <div class="go-chart-content-details" v-if="targetData">
+    <!-- 名称 -->
     <SettingItemBox name="名称">
       <n-input
         type="text"
@@ -10,7 +11,11 @@
         v-model:value="targetData.chartConfig.title"
       />
     </SettingItemBox>
+    <!-- 位置 -->
     <PositionSetting :chartAttr="targetData.attr" />
+    <!-- 自定义配置项 -->
+    <component :is="targetData.chartConfig.conNode()" :optionData="targetData.option"></component>
+    <!-- 全局设置 --> 
     <GlobalSetting :optionData="targetData.option" :in-chart="true" />
   </div>
 </template>
diff --git a/src/views/chart/ContentConfigurations/index.ts b/src/views/chart/ContentConfigurations/index.ts
new file mode 100644
index 00000000..e708cd5b
--- /dev/null
+++ b/src/views/chart/ContentConfigurations/index.ts
@@ -0,0 +1,3 @@
+import ContentConfigurations from './index.vue'
+
+export { ContentConfigurations }
diff --git a/src/views/chart/ContentDetails/index.vue b/src/views/chart/ContentConfigurations/index.vue
similarity index 100%
rename from src/views/chart/ContentDetails/index.vue
rename to src/views/chart/ContentConfigurations/index.vue
diff --git a/src/views/chart/ContentDetails/index.ts b/src/views/chart/ContentDetails/index.ts
deleted file mode 100644
index 93fff8d1..00000000
--- a/src/views/chart/ContentDetails/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import ContentDetails from './index.vue'
-
-export { ContentDetails }
diff --git a/src/views/chart/ContentEdit/components/EditShapeBox/index.vue b/src/views/chart/ContentEdit/components/EditShapeBox/index.vue
index 0d58a9c8..86c1cfd1 100644
--- a/src/views/chart/ContentEdit/components/EditShapeBox/index.vue
+++ b/src/views/chart/ContentEdit/components/EditShapeBox/index.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref, computed, PropType, h } from 'vue';
+import { ref, computed, PropType } from 'vue';
 import { useChartEditStoreStore } from '@/store/modules/chartEditStore/chartEditStore'
 import { useDesignStore } from '@/store/modules/designStore/designStore'
 import { CreateComponentType } from '@/packages/index.d'
diff --git a/src/views/chart/HeaderLeftBtn/index.vue b/src/views/chart/HeaderLeftBtn/index.vue
index e2d310a3..c8866c7b 100644
--- a/src/views/chart/HeaderLeftBtn/index.vue
+++ b/src/views/chart/HeaderLeftBtn/index.vue
@@ -61,7 +61,7 @@ const btnList = reactive<ItemType[]>([
 ])
 
 
-// store 描述的是展示的值，所以和 ContentDetails 的 collapsed 是相反的
+// store 描述的是展示的值，所以和 ContentConfigurations 的 collapsed 是相反的
 const styleHandle = (item: ItemType) => {
   if (item.key === ChartLayoutStoreEnum.DETAILS) {
     return item.select ? '' : 'success'
diff --git a/src/views/chart/index.vue b/src/views/chart/index.vue
index b9f88290..69f176c9 100644
--- a/src/views/chart/index.vue
+++ b/src/views/chart/index.vue
@@ -16,7 +16,7 @@
       <n-layout-content content-style="overflow:hidden; display: flex">
         <ContentCharts />
         <ContentLayers />
-        <ContentDetails />
+        <ContentConfigurations />
       </n-layout-content>
     </n-layout>
   </div>
@@ -60,8 +60,8 @@ const ContentLayers = loadAsyncComponent(() =>
 const ContentCharts = loadAsyncComponent(() =>
   import('./ContentCharts/index.vue')
 )
-const ContentDetails = loadAsyncComponent(() =>
-  import('./ContentDetails/index.vue')
+const ContentConfigurations = loadAsyncComponent(() =>
+  import('./ContentConfigurations/index.vue')
 )
 
 // 右键
diff --git a/src/views/project/items/components/Card/index.vue b/src/views/project/items/components/Card/index.vue
index 03b4caa9..36077e13 100644
--- a/src/views/project/items/components/Card/index.vue
+++ b/src/views/project/items/components/Card/index.vue
@@ -4,7 +4,7 @@
       <div class="list-content">
         <!-- 顶部按钮 -->
         <div class="list-content-top">
-          <AppleControlBtn
+          <MacOsControlBtn
             class="top-btn"
             :hidden="['remove']"
             @close="deleteHanlde"
@@ -85,7 +85,7 @@
 import { reactive, ref } from 'vue'
 import { renderIcon, renderLang, requireUrl, requireFallbackImg } from '@/utils'
 import { icon } from '@/plugins'
-import { AppleControlBtn } from '@/components/AppleControlBtn'
+import { MacOsControlBtn } from '@/components/MacOsControlBtn'
 
 const {
   EllipsisHorizontalCircleSharpIcon,
diff --git a/src/views/project/items/components/ModalCard/index.vue b/src/views/project/items/components/ModalCard/index.vue
index a9aeadae..c31704b9 100644
--- a/src/views/project/items/components/ModalCard/index.vue
+++ b/src/views/project/items/components/ModalCard/index.vue
@@ -17,7 +17,7 @@
         </n-space>
         <!-- 顶部按钮 -->
         <n-space class="list-content-top">
-          <AppleControlBtn
+          <MacOsControlBtn
             :narrow="true"
             :hidden="['close']"
             @remove="closeHandle"
@@ -78,7 +78,7 @@
 import { reactive } from 'vue'
 import { renderIcon, renderLang, requireUrl } from '@/utils'
 import { icon } from '@/plugins'
-import { AppleControlBtn } from '@/components/AppleControlBtn'
+import { MacOsControlBtn } from '@/components/MacOsControlBtn'
 
 const { HammerIcon } = icon.ionicons5