feat: 折线图和柱状图配置label

src/packages/components/Charts/Bars/BarCommon/config.ts

@@ -5,16 +5,20 @@ import cloneDeep from 'lodash/cloneDeep'
 import dataJson from './data.json'
 
 export const includes = ['legend', 'xAxis', 'yAxis']
-
 export const seriesItem = {
   type: 'bar',
-  barWidth: null,
+  barWidth: 15,
+  label:{
+    show: true,
+    position: 'top',
+    color: "#fff",
+    fontSize: 12,
+  },
   itemStyle: {
     color: null,
-    borderRadius: 0
+    borderRadius: 2
   }
 }
-
 export const option = {
   tooltip: {
     show: true,

src/packages/components/Charts/Bars/BarCommon/config.vue

@@ -1,5 +1,5 @@
 <template>
-   <!-- Echarts 全局设置 --> 
+  <!-- Echarts 全局设置 -->
   <global-setting :optionData="optionData"></global-setting>
   <CollapseItem
     v-for="(item, index) in seriesList"
@@ -16,9 +16,7 @@
         ></n-color-picker>
       </SettingItem>
       <SettingItem>
-        <n-button size="small" @click="item.itemStyle.color = null">
+        <n-button size="small" @click="item.itemStyle.color = null"> 恢复默认 </n-button>
-          恢复默认
-        </n-button>
       </SettingItem>
       <SettingItem name="宽度">
         <n-input-number
@@ -37,27 +35,60 @@
         ></n-input-number>
       </SettingItem>
     </SettingItemBox>
+    <setting-item-box name="标签">
+      <setting-item>
+        <n-space>
+          <n-switch v-model:value="item.label.show" size="small" />
+          <n-text>展示标签</n-text>
+        </n-space>
+      </setting-item>
+      <setting-item name="大小">
+        <n-input-number
+          v-model:value="item.label.fontSize"
+          size="small"
+          :min="1"
+        ></n-input-number>
+      </setting-item>
+      <setting-item name="颜色">
+        <n-color-picker
+          size="small"
+          :modes="['hex']"
+          v-model:value="item.label.color"
+        ></n-color-picker>
+      </setting-item>
+      <setting-item name="位置">
+        <n-select
+          v-model:value="item.label.position"
+          :options="[
+            { label: 'top', value: 'top' },
+            { label: 'left', value: 'left' },
+            { label: 'right', value: 'right' },
+            { label: 'bottom', value: 'bottom' },
+          ]"
+        />
+      </setting-item>
+    </setting-item-box>
   </CollapseItem>
 </template>
 
 <script setup lang="ts">
-import { PropType, computed } from 'vue'
+import { PropType, computed } from "vue";
 import {
   GlobalSetting,
   CollapseItem,
   SettingItemBox,
-  SettingItem
+  SettingItem,
-} from '@/components/Pages/ChartItemSetting'
+} from "@/components/Pages/ChartItemSetting";
-import { GlobalThemeJsonType } from '@/settings/chartThemes/index'
+import { GlobalThemeJsonType } from "@/settings/chartThemes/index";
 
 const props = defineProps({
   optionData: {
     type: Object as PropType<GlobalThemeJsonType>,
-    required: true
+    required: true,
-  }
+  },
-})
+});
 
 const seriesList = computed(() => {
-  return props.optionData.series
+  return props.optionData.series;
-})
+});
 </script>

src/packages/components/Charts/Bars/BarCrossrange/config.ts

@@ -5,16 +5,20 @@ import cloneDeep from 'lodash/cloneDeep'
 import dataJson from './data.json'
 
 export const includes = ['legend', 'xAxis', 'yAxis']
-
 export const seriesItem = {
   type: 'bar',
   barWidth: null,
+  label: {
+    show: true,
+    position: 'right',
+    color: '#fff',
+    fontSize: 12
+  },
   itemStyle: {
     color: null,
     borderRadius: 0
   }
 }
-
 export const option = {
   tooltip: {
     show: true,
@@ -29,7 +33,7 @@ export const option = {
   },
   xAxis: {
     show: true,
-    type: 'value',
+    type: 'value'
   },
   yAxis: {
     show: true,

src/packages/components/Charts/Bars/BarCrossrange/config.vue

@@ -26,6 +26,39 @@
        ></n-input-number>
       </SettingItem>
     </SettingItemBox>
+        <setting-item-box name="标签">
+      <setting-item>
+        <n-space>
+          <n-switch v-model:value="item.label.show" size="small" />
+          <n-text>展示标签</n-text>
+        </n-space>
+      </setting-item>
+      <setting-item name="大小">
+        <n-input-number
+          v-model:value="item.label.fontSize"
+          size="small"
+          :min="1"
+        ></n-input-number>
+      </setting-item>
+      <setting-item name="颜色">
+        <n-color-picker
+          size="small"
+          :modes="['hex']"
+          v-model:value="item.label.color"
+        ></n-color-picker>
+      </setting-item>
+      <setting-item name="位置">
+        <n-select
+          v-model:value="item.label.position"
+          :options="[
+            { label: 'top', value: 'top' },
+            { label: 'left', value: 'left' },
+            { label: 'right', value: 'right' },
+            { label: 'bottom', value: 'bottom' },
+          ]"
+        />
+      </setting-item>
+    </setting-item-box>
   </CollapseItem>
 </template>
 

src/packages/components/Charts/Lines/LineCommon/config.ts

@@ -5,16 +5,23 @@ import { defaultTheme, chartColorsSearch } from '@/settings/chartThemes/index'
 import dataJson from './data.json'
 
 export const includes = ['legend', 'xAxis', 'yAxis']
-
 export const seriesItem = {
   type: 'line',
+  label: {
+    show: true,
+    position: 'top',
+    color: '#fff',
+    fontSize: 12
+  },
+  symbolSize: 5,   //设定实心点的大小
+  itemStyle: {
+    color: null,
+    borderRadius: 0
+  },
   lineStyle: {
     type: 'solid',
     width: 3,
-    itemStyle: {
+    color: null,
-      color: null,
-      borderRadius: 0
-    }
   }
 }
 

src/packages/components/Charts/Lines/LineCommon/config.vue

@@ -1,13 +1,11 @@
 <template>
   <!-- Echarts 全局设置 -->
   <global-setting :optionData="optionData"></global-setting>
-  <CollapseItem
+  <CollapseItem v-for="(item, index) in seriesList" :key="index" :name="`折线图-${index + 1}`" :expanded="true">
-    v-for="(item, index) in seriesList"
-    :key="index"
-    :name="`折线图-${index + 1}`"
-    :expanded="true"
-  >
     <SettingItemBox name="线条">
+      <setting-item name="颜色">
+        <n-color-picker size="small" :modes="['hex']" v-model:value="item.lineStyle.color"></n-color-picker>
+      </setting-item>
       <SettingItem name="宽度">
         <n-input-number
           v-model:value="item.lineStyle.width"
@@ -15,16 +13,48 @@
           :max="100"
           size="small"
           placeholder="自动计算"
-       ></n-input-number>
+        ></n-input-number>
       </SettingItem>
       <SettingItem name="类型">
-        <n-select
+        <n-select v-model:value="item.lineStyle.type" size="small" :options="lineConf.lineStyle.type"></n-select>
-          v-model:value="item.lineStyle.type"
-          size="small"
-          :options="lineConf.lineStyle.type"
-       ></n-select>
       </SettingItem>
     </SettingItemBox>
+    <SettingItemBox name="实心点">
+      <SettingItem name="大小">
+        <n-input-number
+          v-model:value="item.symbolSize"
+          :min="1"
+          :max="100"
+          size="small"
+          placeholder="自动计算"
+        ></n-input-number>
+      </SettingItem>
+    </SettingItemBox>
+    <setting-item-box name="标签">
+      <setting-item>
+        <n-space>
+          <n-switch v-model:value="item.label.show" size="small" />
+          <n-text>展示标签</n-text>
+        </n-space>
+      </setting-item>
+      <setting-item name="大小">
+        <n-input-number v-model:value="item.label.fontSize" size="small" :min="1"></n-input-number>
+      </setting-item>
+      <setting-item name="颜色">
+        <n-color-picker size="small" :modes="['hex']" v-model:value="item.label.color"></n-color-picker>
+      </setting-item>
+      <setting-item name="位置">
+        <n-select
+          v-model:value="item.label.position"
+          :options="[
+            { label: 'top', value: 'top' },
+            { label: 'left', value: 'left' },
+            { label: 'right', value: 'right' },
+            { label: 'bottom', value: 'bottom' }
+          ]"
+        />
+      </setting-item>
+    </setting-item-box>
   </CollapseItem>
 </template>
 
@@ -32,12 +62,7 @@
 import { PropType, computed } from 'vue'
 import { lineConf } from '@/packages/chartConfiguration/echarts/index'
 import { GlobalThemeJsonType } from '@/settings/chartThemes/index'
-import {
+import { GlobalSetting, CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
-  GlobalSetting,
-  CollapseItem,
-  SettingItemBox,
-  SettingItem
-} from '@/components/Pages/ChartItemSetting'
 
 const props = defineProps({
   optionData: {

src/packages/components/Charts/Lines/LineGradientSingle/config.ts

@@ -20,7 +20,7 @@ const options = {
   },
   xAxis: {
     show: true,
-    type: 'category'
+    type: 'category',
   },
   yAxis: {
     show: true,
@@ -31,6 +31,13 @@ const options = {
     {
       type: 'line',
       smooth: false,
+      symbolSize: 5,   //设定实心点的大小
+      label:{
+        show: true,
+        position: 'top',
+        color: "#fff",
+        fontSize: 12,
+      },
       lineStyle: {
         type: 'solid',
         width: 3
@@ -52,7 +59,8 @@ const options = {
   ]
 }
 
-export default class Config extends PublicConfigClass implements CreateComponentType {
+export default class Config extends PublicConfigClass
+  implements CreateComponentType {
   public key: string = LineGradientSingleConfig.key
   public chartConfig = LineGradientSingleConfig
   // 图表配置项

src/packages/components/Charts/Lines/LineGradientSingle/config.vue

@@ -25,28 +25,72 @@
         ></n-select>
       </SettingItem>
     </SettingItemBox>
+    <SettingItemBox name="实心点">
+      <SettingItem name="大小">
+        <n-input-number
+          v-model:value="item.symbolSize"
+          :min="1"
+          :max="100"
+          size="small"
+          placeholder="自动计算"
+        ></n-input-number>
+      </SettingItem>
+    </SettingItemBox>
+    <setting-item-box name="标签">
+      <setting-item>
+        <n-space>
+          <n-switch v-model:value="item.label.show" size="small" />
+          <n-text>展示标签</n-text>
+        </n-space>
+      </setting-item>
+      <setting-item name="大小">
+        <n-input-number
+          v-model:value="item.label.fontSize"
+          size="small"
+          :min="1"
+        ></n-input-number>
+      </setting-item>
+      <setting-item name="颜色">
+        <n-color-picker
+          size="small"
+          :modes="['hex']"
+          v-model:value="item.label.color"
+        ></n-color-picker>
+      </setting-item>
+      <setting-item name="位置">
+        <n-select
+          v-model:value="item.label.position"
+          :options="[
+            { label: 'top', value: 'top' },
+            { label: 'left', value: 'left' },
+            { label: 'right', value: 'right' },
+            { label: 'bottom', value: 'bottom' },
+          ]"
+        />
+      </setting-item>
+    </setting-item-box>
   </CollapseItem>
 </template>
 
 <script setup lang="ts">
-import { PropType, computed } from 'vue'
+import { PropType, computed } from "vue";
-import { lineConf } from '@/packages/chartConfiguration/echarts/index'
+import { lineConf } from "@/packages/chartConfiguration/echarts/index";
-import { GlobalThemeJsonType } from '@/settings/chartThemes/index'
+import { GlobalThemeJsonType } from "@/settings/chartThemes/index";
 import {
   GlobalSetting,
   CollapseItem,
   SettingItemBox,
-  SettingItem
+  SettingItem,
-} from '@/components/Pages/ChartItemSetting'
+} from "@/components/Pages/ChartItemSetting";
 
 const props = defineProps({
   optionData: {
     type: Object as PropType<GlobalThemeJsonType>,
-    required: true
+    required: true,
   },
-})
+});
 
 const seriesList = computed(() => {
-  return props.optionData.series
+  return props.optionData.series;
-})
+});
 </script>

src/packages/components/Charts/Lines/LineGradientSingle/index.vue

@@ -1,5 +1,10 @@
 <template>
-  <v-chart ref="vChartRef" :theme="themeColor" :option="option.value" :manual-update="isPreview()" autoresize>
+  <v-chart 
+    ref="vChartRef" 
+    :theme="themeColor" 
+    :option="option.value" 
+    :manual-update="isPreview()" 
+    autoresize>
   </v-chart>
 </template>
 
@@ -32,7 +37,14 @@ const props = defineProps({
   }
 })
 
-use([DatasetComponent, CanvasRenderer, LineChart, GridComponent, TooltipComponent, LegendComponent])
+use([
+  DatasetComponent,
+  CanvasRenderer,
+  LineChart,
+  GridComponent,
+  TooltipComponent,
+  LegendComponent,
+])
 const chartEditStore = useChartEditStore()
 
 const option = reactive({
@@ -40,41 +52,32 @@ const option = reactive({
 })
 
 // 渐变色处理
-watch(
+watch(() => chartEditStore.getEditCanvasConfig.chartThemeColor, (newColor: keyof typeof chartColorsSearch) => {
-  () => chartEditStore.getEditCanvasConfig.chartThemeColor,
+  if (!isPreview()) {
-  (newColor: keyof typeof chartColorsSearch) => {
+    const themeColor = chartColorsSearch[newColor] || chartColorsSearch[defaultTheme]
-    if (!isPreview()) {
+    props.chartConfig.option.series.forEach((value: any, index: number) => {
-      const themeColor = chartColorsSearch[newColor] || chartColorsSearch[defaultTheme]
+      value.areaStyle.color = new graphic.LinearGradient(0, 0, 0, 1, [
-      props.chartConfig.option.series.forEach((value: any, index: number) => {
+        {
-        value.areaStyle.color = new graphic.LinearGradient(0, 0, 0, 1, [
+          offset: 0,
-          {
+          color: themeColor[3]
-            offset: 0,
+        },
-            color: themeColor[3]
+        {
-          },
+          offset: 1,
-          {
+          color: 'rgba(0,0,0, 0)'
-            offset: 1,
+        }
-            color: 'rgba(0,0,0, 0)'
+      ])
-          }
+    })
-        ])
-      })
-    }
-    option.value = mergeTheme(props.chartConfig.option, props.themeSetting, includes)
-    props.chartConfig.option = option.value
-  },
-  {
-    immediate: true
   }
-)
+  option.value = mergeTheme(props.chartConfig.option, props.themeSetting, includes)
+  props.chartConfig.option = option.value
+}, {
+  immediate: true
+})
 
-watch(
+
-  () => props.chartConfig.option.dataset,
+watch(() => props.chartConfig.option.dataset, () => {
-  () => {
+  option.value = props.chartConfig.option
-    option.value = props.chartConfig.option
+})
-  },
-  {
-    deep: false
-  }
-)
 
 const { vChartRef } = useChartDataFetch(props.chartConfig, useChartEditStore)
 </script>

src/packages/components/Charts/Lines/LineGradients/config.ts

@@ -31,6 +31,13 @@ const option = {
     {
       type: 'line',
       smooth: false,
+      symbolSize: 5,   //设定实心点的大小
+      label: {
+        show: true,
+        position: 'top',
+        color: '#fff',
+        fontSize: 12
+      },
       lineStyle: {
         width: 3,
         type: 'solid'
@@ -52,6 +59,12 @@ const option = {
     {
       type: 'line',
       smooth: false,
+      label: {
+        show: true,
+        position: 'top',
+        color: '#fff',
+        fontSize: 12
+      },
       lineStyle: {
         width: 3,
         type: 'solid'

src/packages/components/Charts/Lines/LineGradients/config.vue

@@ -25,6 +25,50 @@
         ></n-select>
       </SettingItem>
     </SettingItemBox>
+    <SettingItemBox name="实心点">
+      <SettingItem name="大小">
+        <n-input-number
+          v-model:value="item.symbolSize"
+          :min="1"
+          :max="100"
+          size="small"
+          placeholder="自动计算"
+        ></n-input-number>
+      </SettingItem>
+    </SettingItemBox>
+    <setting-item-box name="标签">
+      <setting-item>
+        <n-space>
+          <n-switch v-model:value="item.label.show" size="small" />
+          <n-text>展示标签</n-text>
+        </n-space>
+      </setting-item>
+      <setting-item name="大小">
+        <n-input-number
+          v-model:value="item.label.fontSize"
+          size="small"
+          :min="1"
+        ></n-input-number>
+      </setting-item>
+      <setting-item name="颜色">
+        <n-color-picker
+          size="small"
+          :modes="['hex']"
+          v-model:value="item.label.color"
+        ></n-color-picker>
+      </setting-item>
+      <setting-item name="位置">
+        <n-select
+          v-model:value="item.label.position"
+          :options="[
+            { label: 'top', value: 'top' },
+            { label: 'left', value: 'left' },
+            { label: 'right', value: 'right' },
+            { label: 'bottom', value: 'bottom' },
+          ]"
+        />
+      </setting-item>
+    </setting-item-box>
   </CollapseItem>
 </template>
 

src/packages/components/Charts/Lines/LineGradients/index.vue

@@ -1,76 +1,93 @@
 <template>
-  <v-chart ref="vChartRef" :theme="themeColor" :option="option.value" :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 { reactive, watch, PropType } from 'vue'
+import { reactive, watch, PropType } from "vue";
-import VChart from 'vue-echarts'
+import VChart from "vue-echarts";
-import { use, graphic } from 'echarts/core'
+import { use, graphic } from "echarts/core";
-import { CanvasRenderer } from 'echarts/renderers'
+import { CanvasRenderer } from "echarts/renderers";
-import { LineChart } from 'echarts/charts'
+import { LineChart } from "echarts/charts";
-import config, { includes } from './config'
+import config, { includes } from "./config";
-import { mergeTheme } from '@/packages/public/chart'
+import { mergeTheme } from "@/packages/public/chart";
-import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
+import { useChartEditStore } from "@/store/modules/chartEditStore/chartEditStore";
-import { chartColorsSearch, defaultTheme } from '@/settings/chartThemes/index'
+import { chartColorsSearch, defaultTheme } from "@/settings/chartThemes/index";
-import { DatasetComponent, GridComponent, TooltipComponent, LegendComponent } from 'echarts/components'
+import {
-import { useChartDataFetch } from '@/hooks'
+  DatasetComponent,
-import { isPreview } from '@/utils'
+  GridComponent,
+  TooltipComponent,
+  LegendComponent,
+} from "echarts/components";
+import { useChartDataFetch } from "@/hooks";
+import { isPreview } from "@/utils";
 
 const props = defineProps({
   themeSetting: {
     type: Object,
-    required: true
+    required: true,
   },
   themeColor: {
     type: Object,
-    required: true
+    required: true,
   },
   chartConfig: {
     type: Object as PropType<config>,
-    required: true
+    required: true,
-  }
+  },
-})
+});
 
-use([DatasetComponent, CanvasRenderer, LineChart, GridComponent, TooltipComponent, LegendComponent])
+use([
-const chartEditStore = useChartEditStore()
+  DatasetComponent,
+  CanvasRenderer,
+  LineChart,
+  GridComponent,
+  TooltipComponent,
+  LegendComponent,
+]);
+const chartEditStore = useChartEditStore();
 
 const option = reactive({
-  value: {}
+  value: {},
-})
+});
 
 // 渐变色处理
 watch(
   () => chartEditStore.getEditCanvasConfig.chartThemeColor,
   (newColor: keyof typeof chartColorsSearch) => {
     if (!isPreview()) {
-      const themeColor = chartColorsSearch[newColor] || chartColorsSearch[defaultTheme]
+      const themeColor = chartColorsSearch[newColor] || chartColorsSearch[defaultTheme];
       props.chartConfig.option.series.forEach((value: any, index: number) => {
         value.areaStyle.color = new graphic.LinearGradient(0, 0, 0, 1, [
           {
             offset: 0,
-            color: themeColor[3 + index]
+            color: themeColor[3 + index],
           },
           {
             offset: 1,
-            color: 'rgba(0,0,0, 0)'
+            color: "rgba(0,0,0, 0)",
-          }
+          },
-        ])
+        ]);
-      })
+      });
     }
-    option.value = mergeTheme(props.chartConfig.option, props.themeSetting, includes)
+    option.value = mergeTheme(props.chartConfig.option, props.themeSetting, includes);
-    props.chartConfig.option = option.value
+    props.chartConfig.option = option.value;
   },
   {
-    immediate: true
+    immediate: true,
   }
-)
+);
 
 watch(
   () => props.chartConfig.option.dataset,
   () => {
-    option.value = props.chartConfig.option
+    option.value = props.chartConfig.option;
   }
-)
+);
-
+const { vChartRef } = useChartDataFetch(props.chartConfig, useChartEditStore);
-const { vChartRef } = useChartDataFetch(props.chartConfig, useChartEditStore)
 </script>

src/packages/components/Charts/Lines/LineLinearSingle/config.ts

@@ -29,6 +29,7 @@ export const option = {
   series: [
     {
       type: 'line',
+      symbolSize: 5,   //设定实心点的大小
       lineStyle: {
         type: 'solid',
         width: 3,

src/packages/components/Charts/Lines/LineLinearSingle/config.vue

@@ -39,6 +39,17 @@
        ></n-select>
       </SettingItem>
     </SettingItemBox>
+    <SettingItemBox name="实心点">
+      <SettingItem name="大小">
+        <n-input-number
+          v-model:value="item.symbolSize"
+          :min="1"
+          :max="100"
+          size="small"
+          placeholder="自动计算"
+        ></n-input-number>
+      </SettingItem>
+    </SettingItemBox>
     <SettingItemBox name="阴影" :alone="true">
       <SettingItem name="颜色">
         <n-color-picker