feat: supply option panel of gloabl and bar chart setting

src/components/GoVChart/index.vue

@@ -10,6 +10,8 @@
 <script setup lang="ts">
 import { ref, PropType, watch, onMounted, onBeforeUnmount, nextTick } from 'vue'
 import { VChart, type IVChart, type IInitOption, type ISpec } from '@visactor/vchart'
+import { transformHandler } from './transformProps'
+import { IOption } from '@/packages/components/VChart/index.d'
 
 // 事件说明 v1.13.0 https://www.visactor.io/vchart/api/API/event
 const event = [
@@ -189,13 +191,14 @@ watch(
 
 // 更新
 const createOrUpdateChart = (
-  chartProps: ISpec & {
+  chartProps: IOption & {
     dataset: any
   }
 ) => {
   if (vChartRef.value && !chart) {
+    const spec = transformHandler[chartProps.category](chartProps)
     chart = new VChart(
-      { ...chartProps, data: chartProps.dataset },
+      { ...spec, data: chartProps.dataset },
       {
         dom: vChartRef.value,
         ...props.initOptions
@@ -204,8 +207,8 @@ const createOrUpdateChart = (
     chart.renderSync()
     return true
   } else if (chart) {
-    chart.updateSpec(chartProps)
-    chart.renderSync()
+    const spec = transformHandler[chartProps.category](chartProps)
+    chart.updateSpec({ ...spec, data: chartProps.dataset })
     return true
   }
   return false

src/components/GoVChart/transformProps/bars.ts

@@ -0,0 +1,32 @@
+import { cloneDeep } from "lodash"
+
+export default (chartProps: any) => {
+  const spec = cloneDeep(chartProps)
+  delete spec.category
+
+  // tooltip
+  const keyFill = spec.tooltip.style.keyLabel.fill
+  const valueFill = spec.tooltip.style.valueLabel.fill
+  const titleFill = spec.tooltip.style.titleLabel.keyFill
+  delete spec.tooltip.style.keyLabel.fill
+  delete spec.tooltip.style.valueLabel.fill
+  delete spec.tooltip.style.titleLabel.keyFill
+  spec.tooltip.style.keyLabel.fontColor = keyFill
+  spec.tooltip.style.valueLabel.fontColor = valueFill
+  spec.tooltip.style.titleLabel.fontColor = titleFill
+
+  // axis
+  const { name: xAxisName, ...restXAxisProps } = chartProps.xAxis
+  const { name: yAxisName, ...restYAxisProps } = chartProps.yAxis
+  spec.axes = [{
+    orient: 'bottom',
+    ...restXAxisProps
+  }, {
+    orient: 'left',
+    ...restYAxisProps
+  }]
+  delete spec.xAxis
+  delete spec.yAxis
+  console.log('spec-transform', spec)
+  return spec
+}

src/components/GoVChart/transformProps/index.ts

@@ -0,0 +1,8 @@
+import { ChatCategoryEnum, IOption } from "@/packages/components/VChart/index.d";
+import bars from './bars'
+export const transformHandler: {
+  [key: string]: (args: IOption) => any
+} = {
+  [ChatCategoryEnum.BAR]: bars,
+  // todo: more charts handler
+}

src/components/Pages/VChartItemSetting/Axis.vue

@@ -0,0 +1,71 @@
+<template>
+  <collapse-item v-model:name="axis.name">
+    <template #header>
+      <n-switch v-model:value="axis.visible" size="small"></n-switch>
+    </template>
+    <setting-item-box name="轴标签">
+      <setting-item name="可见性">
+        <n-space>
+          <n-switch v-model:value="axis.label.visible" size="small"></n-switch>
+        </n-space>
+      </setting-item>
+      <setting-item name="角度">
+        <n-input-number v-model:value="axis.label.style.angle" :min="0" :max="360" size="small" />
+      </setting-item>
+      <FontStyle :style="axis.label.style"></FontStyle>
+    </setting-item-box>
+    <setting-item-box name="轴标题">
+      <setting-item name="可见性">
+        <n-space>
+          <n-switch v-model:value="axis.title.visible" size="small"></n-switch>
+        </n-space>
+      </setting-item>
+      <setting-item name="标题内容">
+        <n-input v-model:value="axis.title.style.text" size="small"></n-input>
+      </setting-item>
+      <FontStyle :style="axis.title.style"></FontStyle>
+    </setting-item-box>
+    <setting-item-box name="轴线">
+      <setting-item name="可见性">
+        <n-space>
+          <n-switch v-model:value="axis.domainLine.visible" size="small"></n-switch>
+        </n-space>
+      </setting-item>
+      <setting-item name=""> </setting-item>
+      <setting-item name="粗细">
+        <n-input-number v-model:value="axis.domainLine.style.lineWidth" :min="0" size="small" />
+      </setting-item>
+      <setting-item name="颜色">
+        <n-color-picker v-model:value="axis.domainLine.style.stroke" size="small" />
+      </setting-item>
+    </setting-item-box>
+    <setting-item-box name="网格线">
+      <setting-item name="可见性">
+        <n-space>
+          <n-switch v-model:value="axis.grid.visible" size="small"></n-switch>
+        </n-space>
+      </setting-item>
+      <setting-item name=""> </setting-item>
+      <setting-item name="粗细">
+        <n-input-number v-model:value="axis.grid.style.lineWidth" :min="0" size="small" />
+      </setting-item>
+      <setting-item name="颜色">
+        <n-color-picker v-model:value="axis.grid.style.stroke" size="small" />
+      </setting-item>
+    </setting-item-box>
+  </collapse-item>
+</template>
+
+<script setup lang="ts">
+import { PropType } from 'vue'
+import FontStyle from './common/FontStyle.vue'
+import { vChartGlobalThemeJsonType } from '@/settings/vchartThemes/index'
+import { CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
+
+defineProps({
+  axis: {
+    type: Object as PropType<vChartGlobalThemeJsonType>,
+    required: true
+  }
+})
+</script>

src/components/Pages/VChartItemSetting/Legends.vue

@@ -15,15 +15,7 @@
           </setting-item>
         </setting-item-box>
         <setting-item-box name="项配置">
-          <setting-item name="标题位置">
-            <n-select v-model:value="legendItem.item.align" size="small" :options="legendsConfig.align" />
-          </setting-item>
-          <setting-item name="颜色">
-            <n-color-picker size="small" v-model:value="legendItem.item.label.style.fill"></n-color-picker>
-          </setting-item>
-          <setting-item name="大小">
-            <n-input-number v-model:value="legendItem.item.label.style.fontSize" :min="1" size="small"></n-input-number>
-          </setting-item>
+          <FontStyle :style="legendItem.item.label.style"></FontStyle>
         </setting-item-box>
       </collapse-item>
     </div>
@@ -33,6 +25,7 @@
 <script setup lang="ts">
 import { PropType } from 'vue'
 import { legendsConfig } from '@/packages/chartConfiguration/vcharts/index'
+import FontStyle from './common/FontStyle.vue'
 import { vChartGlobalThemeJsonType } from '@/settings/vchartThemes/index'
 import { CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
 

src/components/Pages/VChartItemSetting/Tooltip.vue

@@ -0,0 +1,47 @@
+<template>
+  <!-- todo 补充常用配置项 -->
+  <div v-if="optionData.tooltip">
+    <collapse-item name="提示框">
+      <template #header>
+        <n-switch v-model:value="optionData.tooltip.visible" size="small"></n-switch>
+      </template>
+      <setting-item-box name="框">
+        <setting-item name="填充">
+          <n-color-picker v-model:value="optionData.tooltip.style.panel.backgroundColor" size="small" />
+        </setting-item>
+        <setting-item name="瞄边">
+          <n-color-picker v-model:value="optionData.tooltip.style.panel.border.color" size="small" />
+        </setting-item>
+        <setting-item name="粗细">
+          <n-input-number v-model:value="optionData.tooltip.style.panel.border.width" :min="0" size="small" />
+        </setting-item>
+        <setting-item name="圆角">
+          <n-input-number v-model:value="optionData.tooltip.style.panel.border.radius" :min="0" size="small" />
+        </setting-item>
+      </setting-item-box>
+      <setting-item-box name="标题">
+        <FontStyle :style="optionData.tooltip.style.titleLabel"></FontStyle>
+      </setting-item-box>
+      <setting-item-box name="名称">
+        <FontStyle :style="optionData.tooltip.style.keyLabel"></FontStyle>
+      </setting-item-box>
+      <setting-item-box name="值">
+        <FontStyle :style="optionData.tooltip.style.valueLabel"></FontStyle>
+      </setting-item-box>
+    </collapse-item>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { PropType } from 'vue'
+import FontStyle from './common/FontStyle.vue'
+import { vChartGlobalThemeJsonType } from '@/settings/vchartThemes/index'
+import { CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
+
+defineProps({
+  optionData: {
+    type: Object as PropType<vChartGlobalThemeJsonType>,
+    required: true
+  }
+})
+</script>

src/components/Pages/VChartItemSetting/VChartGlobalSetting.vue

@@ -1,14 +1,14 @@
 <template>
   <!-- 图例 -->
   <Legends :optionData="optionData"></Legends>
+  <Tooltip :optionData="optionData"></Tooltip>
 </template>
 
 <script setup lang="ts">
-import { PropType, computed } from 'vue'
-import { CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
+import { PropType } from 'vue'
 import { vChartGlobalThemeJsonType } from '@/settings/vchartThemes/index'
 import Legends from './Legends.vue'
-
+import Tooltip from './Tooltip.vue'
 const props = defineProps({
   optionData: {
     type: Object as PropType<vChartGlobalThemeJsonType>,

src/components/Pages/VChartItemSetting/common/FontStyle.vue

@@ -0,0 +1,33 @@
+<template>
+  <!-- todo 补充常用配置项 -->
+  <!-- <div v-if="style"> -->
+  <!-- <setting-item-box v-if="style" name=""> -->
+  <setting-item name="颜色">
+    <n-color-picker v-model:value="style.fill" size="small" />
+  </setting-item>
+  <setting-item name="大小">
+    <n-input-number v-model:value="style.fontSize" :min="1" size="small" />
+  </setting-item>
+  <setting-item name="字体">
+    <n-select v-model:value="style.fontFamily" :options="fontStyleConfig.fontFamily" size="small" />
+  </setting-item>
+  <setting-item name="字重">
+    <n-select v-model:value="style.fontSize" :options="fontStyleConfig.fontWeight" size="small" />
+  </setting-item>
+  <!-- </setting-item-box> -->
+  <!-- </div> -->
+</template>
+
+<script setup lang="ts">
+import { PropType } from 'vue'
+import { fontStyleConfig } from '@/packages/chartConfiguration/vcharts/index'
+import { FontType } from '@/settings/vchartThemes/index'
+import { SettingItem } from '@/components/Pages/ChartItemSetting'
+
+defineProps({
+  style: {
+    type: Object as PropType<FontType>,
+    required: true
+  }
+})
+</script>

src/components/Pages/VChartItemSetting/index.ts

@@ -1,3 +1,4 @@
 import VChartGlobalSetting from './VChartGlobalSetting.vue'
+import Axis from './Axis.vue'
 
-export { VChartGlobalSetting }
+export { VChartGlobalSetting, Axis }