Merge branch 'dev' of https://gitee.com/MTrun/go-view into master-fetch-dev

Merge pull request !47 from 秋名山路霸/master-fetch

.eslintrc.js

@@ -9,16 +9,17 @@ module.exports = {
     sourceType: 'module',
     ecmaFeatures: {
       jsx: true,
-      tsx: true,
-    },
+      tsx: true
+    }
   },
   env: {
     node: true,
+    // The Follow config only works with eslint-plugin-vue v8.0.0+
+    'vue/setup-compiler-macros': true
   },
-  extends: ["plugin:vue/vue3-essential", "eslint:recommended"],
+  extends: ['plugin:vue/vue3-essential', 'eslint:recommended'],
   rules: {
-    "no-console": process.env.NODE_ENV === "production" ? "warn" : "off",
-    "no-debugger": process.env.NODE_ENV === "production" ? "warn" : "off",
-  },
-};
-
+    'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
+    'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off'
+  }
+}

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021-present Naive Ui Admin
+Copyright (c) 2021-present GoView
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -122,6 +122,6 @@ export const http = (type?: RequestHttpEnum) => {
 
 QQ 群：1030129384
 
-![QQ群](readme/goView-QQ.png)
+![QQ群](readme/go-view-qq.png)
 
 ![渲染海报](readme/logo-poster.png)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "go-view",
-  "version": "2.0.3",
+  "version": "2.0.7",
   "scripts": {
     "dev": "vite --host",
     "build": "vue-tsc --noEmit && vite build",
@@ -12,11 +12,13 @@
     "@types/color": "^3.0.3",
     "@types/crypto-js": "^4.1.1",
     "@types/keymaster": "^1.6.30",
+    "@types/lodash": "^4.14.184",
     "animate.css": "^4.1.1",
     "axios": "^0.27.2",
     "color": "^4.2.3",
     "crypto-js": "^4.1.1",
     "echarts-liquidfill": "^3.1.0",
+    "echarts-stat": "^1.2.0",
     "highlight.js": "^11.5.0",
     "html2canvas": "^1.4.1",
     "keymaster": "^1.6.2",
@@ -59,8 +61,8 @@
     "prettier": "^2.6.2",
     "sass": "^1.49.11",
     "sass-loader": "^12.6.0",
-    "typescript": "^4.6.3",
-    "vite": "2.9.5",
+    "typescript": "4.6.3",
+    "vite": "2.9.9",
     "vite-plugin-compression": "^0.5.1",
     "vite-plugin-importer": "^0.2.5",
     "vite-plugin-mock": "^2.9.6",

src/api/axios.ts

@@ -23,10 +23,11 @@ axiosInstance.interceptors.request.use(
     if (!info) {
       routerTurnByName(PageEnum.BASE_LOGIN_NAME)
       return config
-    } 
+    }
+    const userInfo = info[SystemStoreEnum.USER_INFO]
     config.headers = {
       ...config.headers,
-      [RequestHttpHeaderEnum.TOKEN]: info[SystemStoreEnum.USER_INFO][SystemStoreUserInfoEnum.USER_TOKEN] || ''
+      [userInfo[SystemStoreUserInfoEnum.TOKEN_NAME]]: userInfo[SystemStoreUserInfoEnum.USER_TOKEN] || ''
     }
     return config
   },

src/api/mock/heatMapData.json

@@ -0,0 +1,199 @@
+{
+  "xAxis": [
+    "12a",
+    "1a",
+    "2a",
+    "3a",
+    "4a",
+    "5a",
+    "6a",
+    "7a",
+    "8a",
+    "9a",
+    "10a",
+    "11a",
+    "12p",
+    "1p",
+    "2p",
+    "3p",
+    "4p",
+    "5p",
+    "6p",
+    "7p",
+    "8p",
+    "9p",
+    "10p",
+    "11p"
+  ],
+  "yAxis": ["Saturday", "Friday", "Thursday", "Wednesday", "Tuesday", "Monday", "Sunday"],
+  "seriesData": [
+    [0, 0, "@integer(0, 10)"],
+    [1, 0, "@integer(0, 10)"],
+    [2, 0, "-"],
+    [3, 0, "-"],
+    [4, 0, "-"],
+    [5, 0, "-"],
+    [6, 0, "-"],
+    [7, 0, "-"],
+    [8, 0, "-"],
+    [9, 0, "-"],
+    [10, 0, "-"],
+    [11, 0, "@integer(0, 10)"],
+    [12, 0, "@integer(0, 10)"],
+    [13, 0, "@integer(0, 10)"],
+    [14, 0, "@integer(0, 10)"],
+    [15, 0, "@integer(0, 10)"],
+    [16, 0, "@integer(0, 10)"],
+    [17, 0, "@integer(0, 10)"],
+    [18, 0, "@integer(0, 10)"],
+    [19, 0, "@integer(0, 10)"],
+    [20, 0, "@integer(0, 10)"],
+    [21, 0, "@integer(0, 10)"],
+    [22, 0, "@integer(0, 10)"],
+    [23, 0, "@integer(0, 10)"],
+    [0, 1, 7],
+    [1, 1, "-"],
+    [2, 1, "-"],
+    [3, 1, "-"],
+    [4, 1, "-"],
+    [5, 1, "-"],
+    [6, 1, "-"],
+    [7, 1, "-"],
+    [8, 1, "-"],
+    [9, 1, "-"],
+    [10, 1, "@integer(0, 10)"],
+    [11, 1, "@integer(0, 10)"],
+    [12, 1, "@integer(0, 10)"],
+    [13, 1, "@integer(0, 10)"],
+    [14, 1, "@integer(0, 10)"],
+    [15, 1, "@integer(0, 10)"],
+    [16, 1, "@integer(0, 10)"],
+    [17, 1, "@integer(0, 10)"],
+    [18, 1, "@integer(0, 10)"],
+    [19, 1, "@integer(0, 10)"],
+    [20, 1, "@integer(0, 10)"],
+    [21, 1, "@integer(0, 10)"],
+    [22, 1, "@integer(0, 10)"],
+    [23, 1, "@integer(0, 10)"],
+    [0, 2, 1],
+    [1, 2, 1],
+    [2, 2, "-"],
+    [3, 2, "-"],
+    [4, 2, "-"],
+    [5, 2, "-"],
+    [6, 2, "-"],
+    [7, 2, "-"],
+    [8, 2, "-"],
+    [9, 2, "-"],
+    [10, 2, "@integer(0, 10)"],
+    [11, 2, "@integer(0, 10)"],
+    [12, 2, "@integer(0, 10)"],
+    [13, 2, "@integer(0, 10)"],
+    [14, 2, "@integer(0, 10)"],
+    [15, 2, "@integer(0, 10)"],
+    [16, 2, "@integer(0, 10)"],
+    [17, 2, "@integer(0, 10)"],
+    [18, 2, "@integer(0, 10)"],
+    [19, 2, "@integer(0, 10)"],
+    [20, 2, "@integer(0, 10)"],
+    [21, 2, "@integer(0, 10)"],
+    [22, 2, "@integer(0, 10)"],
+    [23, 2, "@integer(0, 10)"],
+    [0, 3, 7],
+    [1, 3, 3],
+    [2, 3, "-"],
+    [3, 3, "-"],
+    [4, 3, "-"],
+    [5, 3, "-"],
+    [6, 3, "-"],
+    [7, 3, "-"],
+    [8, 3, 1],
+    [9, 3, "-"],
+    [10, 3, "@integer(0, 10)"],
+    [11, 3, "@integer(0, 10)"],
+    [12, 3, "@integer(0, 10)"],
+    [13, 3, "@integer(0, 10)"],
+    [14, 3, "@integer(0, 10)"],
+    [15, 3, "@integer(0, 10)"],
+    [16, 3, "@integer(0, 10)"],
+    [17, 3, "@integer(0, 10)"],
+    [18, 3, "@integer(0, 10)"],
+    [19, 3, "@integer(0, 10)"],
+    [20, 3, "@integer(0, 10)"],
+    [21, 3, "@integer(0, 10)"],
+    [22, 3, "@integer(0, 10)"],
+    [23, 3, "@integer(0, 10)"],
+    [0, 4, "@integer(0, 10)"],
+    [1, 4, "@integer(0, 10)"],
+    [2, 4, "-"],
+    [3, 4, "-"],
+    [4, 4, "-"],
+    [5, 4, "@integer(0, 10)"],
+    [6, 4, "-"],
+    [7, 4, "-"],
+    [8, 4, "-"],
+    [9, 4, "@integer(0, 10)"],
+    [10, 4, "@integer(0, 10)"],
+    [11, 4, "@integer(0, 10)"],
+    [12, 4, "@integer(0, 10)"],
+    [13, 4, "@integer(0, 10)"],
+    [14, 4, "@integer(0, 10)"],
+    [15, 4, "@integer(0, 10)"],
+    [16, 4, "@integer(0, 10)"],
+    [17, 4, "@integer(0, 10)"],
+    [18, 4, "@integer(0, 10)"],
+    [19, 4, "@integer(0, 10)"],
+    [20, 4, "@integer(0, 10)"],
+    [21, 4, "@integer(0, 10)"],
+    [22, 4, "@integer(0, 10)"],
+    [23, 4, "-"],
+    [0, 5, "@integer(0, 10)"],
+    [1, 5, "@integer(0, 10)"],
+    [2, 5, "-"],
+    [3, 5, "@integer(0, 10)"],
+    [4, 5, "-"],
+    [5, 5, "-"],
+    [6, 5, "-"],
+    [7, 5, "-"],
+    [8, 5, "@integer(0, 10)"],
+    [9, 5, "-"],
+    [10, 5, "@integer(0, 10)"],
+    [11, 5, "@integer(0, 10)"],
+    [12, 5, "@integer(0, 10)"],
+    [13, 5, "@integer(0, 10)"],
+    [14, 5, "@integer(0, 10)"],
+    [15, 5, "@integer(0, 10)"],
+    [16, 5, "@integer(0, 10)"],
+    [17, 5, "@integer(0, 10)"],
+    [18, 5, "-"],
+    [19, 5, "@integer(0, 10)"],
+    [20, 5, "@integer(0, 10)"],
+    [21, 5, "@integer(0, 10)"],
+    [22, 5, "@integer(0, 10)"],
+    [23, 5, "-"],
+    [0, 6, "@integer(0, 10)"],
+    [1, 6, "-"],
+    [2, 6, "-"],
+    [3, 6, "-"],
+    [4, 6, "-"],
+    [5, 6, "-"],
+    [6, 6, "-"],
+    [7, 6, "-"],
+    [8, 6, "-"],
+    [9, 6, "-"],
+    [10, 6, "@integer(0, 10)"],
+    [11, 6, "-"],
+    [12, 6, "@integer(0, 10)"],
+    [13, 6, "@integer(0, 10)"],
+    [14, 6, "@integer(0, 10)"],
+    [15, 6, "@integer(0, 10)"],
+    [16, 6, "-"],
+    [17, 6, "-"],
+    [18, 6, "-"],
+    [19, 6, "-"],
+    [20, 6, "@integer(0, 10)"],
+    [21, 6, "@integer(0, 10)"],
+    [22, 6, "@integer(0, 10)"],
+    [23, 6, "@integer(0, 10)"]
+  ]
+}

src/api/mock/index.ts

@@ -4,12 +4,16 @@ import { RequestHttpEnum } from '@/enums/httpEnum'
 
 // 单个X数据
 export const chartDataUrl = '/mock/chartData'
+export const chartSingleDataUrl = '/mock/chartSingleData'
 export const numberFloatUrl = '/mock/number/float'
 export const numberIntUrl = '/mock/number/int'
 export const textUrl = '/mock/text'
 export const imageUrl = '/mock/image'
 export const rankListUrl = '/mock/rankList'
 export const scrollBoardUrl = '/mock/scrollBoard'
+export const radarUrl = '/mock/radarData'
+export const heatMapUrl = '/mock/heatMapData'
+export const scatterBasicUrl = '/mock/scatterBasic'
 
 const mockObject: MockMethod[] = [
   {
@@ -19,6 +23,11 @@ const mockObject: MockMethod[] = [
     method: RequestHttpEnum.GET,
     response: () => test.fetchMockData
   },
+  {
+    url: chartSingleDataUrl,
+    method: RequestHttpEnum.GET,
+    response: () => test.fetchMockSingleData
+  },
   {
     url: numberFloatUrl,
     method: RequestHttpEnum.GET,
@@ -48,7 +57,22 @@ const mockObject: MockMethod[] = [
     url: scrollBoardUrl,
     method: RequestHttpEnum.GET,
     response: () => test.fetchScrollBoard
-  }
+  },
+  {
+    url: radarUrl,
+    method: RequestHttpEnum.GET,
+    response: () => test.fetchRadar
+  },
+  {
+    url: heatMapUrl,
+    method: RequestHttpEnum.GET,
+    response: () => test.fetchHeatmap
+  },
+  {
+    url: scatterBasicUrl,
+    method: RequestHttpEnum.GET,
+    response: () => test.fetchScatterBasic
+  },
 ]
 
 export default mockObject

src/api/mock/scatter.json

@@ -0,0 +1,56 @@
+[
+  {
+    "dimensions": ["data1"],
+    "source": [
+      [10.0, "@integer(0, 100)"],
+      [8.07, "@integer(0, 100)"],
+      [13.0, "@integer(0, 100)"],
+      [9.05, "@integer(0, 100)"],
+      [11.0, "@integer(0, 100)"],
+      [14.0, "@integer(0, 100)"],
+      [13.4, "@integer(0, 100)"],
+      [10.0, "@integer(0, 100)"],
+      [14.0, "@integer(0, 100)"],
+      [12.5, "@integer(0, 100)"],
+      [9.15, "@integer(0, 100)"],
+      [11.5, "@integer(0, 100)"],
+      [3.03, "@integer(0, 100)"],
+      [12.2, "@integer(0, 100)"],
+      [2.02, "@integer(0, 100)"],
+      [1.05, "@integer(0, 100)"],
+      [4.05, "@integer(0, 100)"],
+      [6.03, "@integer(0, 100)"],
+      [12.0, "@integer(0, 100)"],
+      [12.0, "@integer(0, 100)"],
+      [7.08, "@integer(0, 100)"],
+      [5.02, "@integer(0, 100)"]
+    ]
+  },
+  {
+    "dimensions": ["data2"],
+    "source": [
+      [10.0, "@integer(0, 70)"],
+      [8.07, "@integer(0, 70)"],
+      [13.0, "@integer(0, 70)"],
+      [9.05, "@integer(0, 70)"],
+      [11.0, "@integer(0, 70)"],
+      [14.0, "@integer(0, 70)"],
+      [13.4, "@integer(0, 70)"],
+      [10.0, "@integer(0, 70)"],
+      [14.0, "@integer(0, 70)"],
+      [12.5, "@integer(0, 70)"],
+      [9.15, "@integer(0, 70)"],
+      [11.5, "@integer(0, 70)"],
+      [3.03, "@integer(0, 70)"],
+      [12.2, "@integer(0, 70)"],
+      [2.02, "@integer(0, 70)"],
+      [1.05, "@integer(0, 70)"],
+      [4.05, "@integer(0, 70)"],
+      [6.03, "@integer(0, 70)"],
+      [12.0, "@integer(0, 70)"],
+      [12.0, "@integer(0, 70)"],
+      [7.08, "@integer(0, 70)"],
+      [5.02, "@integer(0, 70)"]
+    ]
+  }
+]

src/api/mock/test.mock.ts

@@ -1,4 +1,42 @@
+import heatmapJson from './heatMapData.json'
+import scatterJson from './scatter.json'
+
 export default {
+  // 单图表
+  fetchMockSingleData: {
+    code: 0,
+    status: 200,
+    msg: '请求成功',
+    data: {
+      dimensions: ['product', 'dataOne'],
+      source: [
+        {
+          product: '@name',
+          'dataOne|0-900': 3
+        },
+        {
+          product: '@name',
+          'dataOne|0-900': 3
+        },
+        {
+          product: '@name',
+          'dataOne|0-900': 3
+        },
+        {
+          product: '@name',
+          'dataOne|0-900': 3
+        },
+        {
+          product: '@name',
+          'dataOne|0-900': 3
+        },
+        {
+          product: '@name',
+          'dataOne|0-900': 3
+        }
+      ]
+    }
+  },
   // 图表
   fetchMockData: {
     code: 0,
@@ -79,29 +117,86 @@ export default {
       ['行10列1', '行10列2', '行10列3']
     ]
   },
-  // 获取数字
+  // 获取数字-浮点型
   fetchNumberFloat: {
     code: 0,
     status: 200,
     msg: '请求成功',
     data: '@float(0, 0.99, 1, 4)'
   },
+  // 获取数字-整型
   fetchNumberInt: {
     code: 0,
     status: 200,
     msg: '请求成功',
     data: '@integer(0, 100)'
   },
+  // 文字
   fetchText: {
     code: 0,
     status: 200,
     msg: '请求成功',
     data: '@paragraph(1, 10)'
   },
+  // 图片
   fetchImage: (num: number) => ({
     code: 0,
     status: 200,
     msg: '请求成功',
     data: `https://robohash.org/${num}`
-  })
+  }),
+  // 雷达
+  fetchRadar: {
+    code: 0,
+    status: 200,
+    msg: '请求成功',
+    data: {
+      radarIndicator: [
+        { name: '@name', max: 10000 },
+        { name: '@name', max: 10000 },
+        { name: '@name', max: 10000 },
+        { name: '@name', max: 10000 },
+        { name: '@name', max: 10000 },
+        { name: '@name', max: 10000 }
+      ],
+      seriesData: [
+        {
+          value: [
+            '@integer(0, 10000)',
+            '@integer(0, 10000)',
+            '@integer(0, 10000)',
+            '@integer(0, 10000)',
+            '@integer(0, 10000)',
+            '@integer(0, 10000)'
+          ],
+          name: 'data1'
+        },
+        {
+          value: [
+            '@integer(0, 10000)',
+            '@integer(0, 10000)',
+            '@integer(0, 10000)',
+            '@integer(0, 10000)',
+            '@integer(0, 10000)',
+            '@integer(0, 10000)'
+          ],
+          name: 'data2'
+        }
+      ]
+    }
+  },
+  // 热力图
+  fetchHeatmap: {
+    code: 0,
+    status: 200,
+    msg: '请求成功',
+    data: heatmapJson
+  },
+  // 散点图
+  fetchScatterBasic: {
+    code: 0,
+    status: 200,
+    msg: '请求成功',
+    data: scatterJson
+  }
 }

src/components/GoSystemInfo/index.ts

@@ -0,0 +1,3 @@
+import GoSystemInfo from './index.vue';
+
+export { GoSystemInfo };

src/components/GoSystemInfo/index.vue

@@ -0,0 +1,76 @@
+<template>
+  <n-modal v-model:show="modelShow" @afterLeave="closeHandle">
+    <n-list bordered class="go-system-info">
+      <template #header>
+        <n-space justify="space-between">
+          <n-h3 class="go-mb-0">关于我们</n-h3>
+          <n-icon size="20" class="go-cursor-pointer" @click="closeHandle">
+            <close-icon></close-icon>
+          </n-icon>
+        </n-space>
+      </template>
+
+      <n-list-item>
+        <n-space :size="20">
+          <n-text class="item-left">版权声明：</n-text>
+          <n-text>
+            GoView 版权属于
+            <n-a href="https://gitee.com/MTrun/go-view" target="_blank">https://gitee.com/MTrun/go-view</n-a> 项目作者
+          </n-text>
+        </n-space>
+      </n-list-item>
+
+      <n-list-item>
+        <n-divider style="margin-top: 0" />
+        <n-space :size="20">
+          <n-text class="item-left">协议备注：</n-text>
+          <n-text>
+            请遵守开源 MIT 协议，以上声明 <n-text type="error">不可删除</n-text>，否则视作侵权行为，后果自负！
+          </n-text>
+        </n-space>
+      </n-list-item>
+
+      <n-list-item>
+        <n-divider style="margin-top: 0" />
+        <n-space :size="20">
+          <n-text class="item-left">商业授权：</n-text>
+          <n-text>
+            若不想保留版权声明，请通过仓库/交流群 联系项目作者，进行授权
+          </n-text>
+        </n-space>
+      </n-list-item>
+    </n-list>
+  </n-modal>
+</template>
+
+<script lang="ts" setup>
+import { icon } from '@/plugins'
+
+const { HelpOutlineIcon, CloseIcon } = icon.ionicons5
+const emit = defineEmits(['update:modelShow'])
+
+defineProps({
+  modelShow: Boolean
+})
+
+const closeHandle = () => {
+  emit('update:modelShow', false)
+}
+</script>
+
+<style lang="scss" scoped>
+@include go('system-info') {
+  @extend .go-background-filter;
+  min-width: 100px;
+  max-width: 60vw;
+  padding-bottom: 20px;
+  .item-left {
+    width: 200px;
+  }
+  @include deep() {
+    .n-list-item:not(:last-child) {
+      border-bottom: 0;
+    }
+  }
+}
+</style>

src/components/GoSystemSet/index.vue

@@ -115,6 +115,13 @@ const list = reactive<ListType[]>([
     desc: '',
     value: ''
   },
+  {
+    key: SettingStoreEnums.CHART_TOOLS_STATUS_HIDE,
+    value: settingStore.getChartToolsStatusHide,
+    type: 'switch',
+    name: '隐藏工具栏',
+    desc: '鼠标移入时，会展示切换到展开模式',
+  },
   {
     key: SettingStoreEnums.CHART_TOOLS_STATUS,
     value: settingStore.getChartToolsStatus,

src/components/GoUserInfo/index.vue

@@ -20,14 +20,17 @@
 
   <!-- 系统设置 model -->
   <go-system-set v-model:modelShow="modelShow"></go-system-set>
+  <!-- 关于软件 model -->
+  <go-system-info v-model:modelShow="modelShowInfo"></go-system-info>
 </template>
 
 <script lang="ts" setup>
 import { h, ref } from 'vue'
 import { NAvatar, NText } from 'naive-ui'
 import { renderIcon } from '@/utils'
-import { openDoc, logout, renderLang } from '@/utils'
+import { logout, renderLang } from '@/utils'
 import { GoSystemSet } from '@/components/GoSystemSet/index'
+import { GoSystemInfo } from '@/components/GoSystemInfo/index'
 import Person from './person.png'
 
 import { icon } from '@/plugins'
@@ -40,6 +43,7 @@ const {
 
 const t = window['$t']
 
+const modelShowInfo = ref(false)
 const modelShow = ref(false)
 
 // 是否失败
@@ -77,16 +81,16 @@ const options = ref([
     type: 'divider',
     key: 'd1'
   },
-  {
-    label: renderLang('global.contact'),
-    key: 'contact',
-    icon: renderIcon(ChatboxEllipsesIcon)
-  },
   {
     label: renderLang('global.sys_set'),
     key: 'sysSet',
     icon: renderIcon(SettingsSharpIcon)
   },
+  {
+    label: renderLang('global.contact'),
+    key: 'contact',
+    icon: renderIcon(ChatboxEllipsesIcon)
+  },
   {
     type: 'divider',
     key: 'd3'
@@ -108,10 +112,15 @@ const sysSetHandle = () => {
   modelShow.value = true
 }
 
+// 系统设置
+const sysInfoHandle = () => {
+  modelShowInfo.value = true
+}
+
 const handleSelect = (key: string) => {
   switch (key) {
     case 'contact':
-      openDoc()
+      sysInfoHandle()
       break
     case 'sysSet':
       sysSetHandle()

src/components/Pages/ChartItemSetting/GlobalSetting.vue

@@ -1,163 +1,104 @@
 <template>
   <collapse-item v-if="title" name="标题">
     <template #header>
-      <n-switch
-        v-show="inChart"
-        v-model:value="title.show"
-        size="small"
-      ></n-switch>
+      <n-switch v-model:value="title.show" size="small"></n-switch>
     </template>
     <setting-item-box name="标题">
       <setting-item name="颜色">
-        <n-color-picker
-          v-model:value="title.textStyle.color"
-          size="small"
-        ></n-color-picker>
+        <n-color-picker v-model:value="title.textStyle.color" size="small"></n-color-picker>
       </setting-item>
       <setting-item name="大小">
-        <n-input-number
-          v-model:value="title.textStyle.fontSize"
-          :min="1"
-          size="small"
-        ></n-input-number>
+        <n-input-number v-model:value="title.textStyle.fontSize" :min="1" size="small"></n-input-number>
       </setting-item>
     </setting-item-box>
     <setting-item-box name="副标题">
       <setting-item name="颜色">
-        <n-color-picker
-          size="small"
-          v-model:value="title.subtextStyle.color"
-        ></n-color-picker>
+        <n-color-picker size="small" v-model:value="title.subtextStyle.color"></n-color-picker>
       </setting-item>
       <setting-item name="大小">
-        <n-input-number
-          v-model:value="title.subtextStyle.fontSize"
-          :min="1"
-          size="small"
-        ></n-input-number>
+        <n-input-number v-model:value="title.subtextStyle.fontSize" :min="1" size="small"></n-input-number>
       </setting-item>
     </setting-item-box>
   </collapse-item>
 
   <collapse-item v-if="xAxis" name="X轴">
     <template #header>
-      <n-switch
-        v-show="inChart"
-        v-model:value="xAxis.show"
-        size="small"
-      ></n-switch>
+      <n-switch v-model:value="xAxis.show" size="small"></n-switch>
     </template>
     <setting-item-box name="单位">
       <setting-item name="名称">
         <n-input v-model:value="xAxis.name" size="small"></n-input>
       </setting-item>
       <setting-item name="颜色">
-        <n-color-picker
-          size="small"
-          v-model:value="xAxis.nameTextStyle.color"
-        ></n-color-picker>
+        <n-color-picker size="small" v-model:value="xAxis.nameTextStyle.color"></n-color-picker>
       </setting-item>
       <setting-item name="大小">
-         <n-input-number
-          v-model:value="xAxis.nameTextStyle.fontSize"
-          :min="12"
-          size="small"
-        ></n-input-number>
+        <n-input-number v-model:value="xAxis.nameTextStyle.fontSize" :min="12" size="small"></n-input-number>
       </setting-item>
       <setting-item name="偏移量">
-         <n-input-number
-          v-model:value="xAxis.nameGap"
-          :min="5"
-          size="small"
-        ></n-input-number>
+        <n-input-number v-model:value="xAxis.nameGap" :min="5" size="small"></n-input-number>
       </setting-item>
     </setting-item-box>
     <setting-item-box name="标签">
-      <setting-item v-show="inChart" name="展示">
+      <setting-item name="展示">
         <n-space>
-          <n-switch
-            v-model:value="xAxis.axisLabel.show"
-            size="small"
-          ></n-switch>
+          <n-switch v-model:value="xAxis.axisLabel.show" size="small"></n-switch>
         </n-space>
       </setting-item>
       <setting-item name="颜色">
-        <n-color-picker
-          size="small"
-          v-model:value="xAxis.axisLabel.color"
-        ></n-color-picker>
+        <n-color-picker size="small" v-model:value="xAxis.axisLabel.color"></n-color-picker>
       </setting-item>
       <setting-item name="大小">
-        <n-input-number
-          v-model:value="xAxis.axisLabel.fontSize"
-          :min="8"
-          size="small"
-        ></n-input-number>
+        <n-input-number v-model:value="xAxis.axisLabel.fontSize" :min="8" size="small"></n-input-number>
       </setting-item>
     </setting-item-box>
     <setting-item-box name="轴线">
+      <setting-item name="展示">
+        <n-space>
+          <n-switch v-model:value="xAxis.axisLine.show" size="small"></n-switch>
+        </n-space>
+      </setting-item>
       <setting-item name="颜色">
-        <n-color-picker
-          v-model:value="xAxis.axisLine.lineStyle.color"
-          size="small"
-        ></n-color-picker>
+        <n-color-picker v-model:value="xAxis.axisLine.lineStyle.color" size="small"></n-color-picker>
       </setting-item>
       <setting-item name="粗细">
-        <n-input-number
-          v-model:value="xAxis.axisLine.lineStyle.width"
-          :min="1"
-          size="small"
-        ></n-input-number>
+        <n-input-number v-model:value="xAxis.axisLine.lineStyle.width" :min="1" size="small"></n-input-number>
+      </setting-item>
+      <setting-item name="位置">
+        <n-select v-model:value="xAxis.position" size="small" :options="axisConfig.xposition"></n-select>
       </setting-item>
       <setting-item name="对齐零">
         <n-space>
-          <n-switch
-            v-model:value="xAxis.axisLine.onZero"
-            size="small"
-          ></n-switch>
+          <n-switch v-model:value="xAxis.axisLine.onZero" size="small"></n-switch>
         </n-space>
       </setting-item>
-      <setting-item v-show="inChart" name="反向">
+      <setting-item name="反向">
         <n-space>
           <n-switch v-model:value="xAxis.inverse" size="small"></n-switch>
         </n-space>
       </setting-item>
     </setting-item-box>
     <setting-item-box name="刻度">
-      <setting-item v-show="inChart" name="展示">
+      <setting-item name="展示">
         <n-space>
           <n-switch v-model:value="xAxis.axisTick.show" size="small"></n-switch>
         </n-space>
       </setting-item>
       <setting-item name="长度">
-        <n-input-number
-          v-model:value="xAxis.axisTick.length"
-          :min="1"
-          size="small"
-        ></n-input-number>
+        <n-input-number v-model:value="xAxis.axisTick.length" :min="1" size="small"></n-input-number>
       </setting-item>
     </setting-item-box>
     <setting-item-box name="分割线">
-      <setting-item v-show="inChart" name="展示">
+      <setting-item name="展示">
         <n-space>
-          <n-switch
-            v-model:value="xAxis.splitLine.show"
-            size="small"
-          ></n-switch>
+          <n-switch v-model:value="xAxis.splitLine.show" size="small"></n-switch>
         </n-space>
       </setting-item>
       <setting-item name="颜色">
-        <n-color-picker
-          v-model:value="xAxis.splitLine.lineStyle.color"
-          size="small"
-        ></n-color-picker>
+        <n-color-picker v-model:value="xAxis.splitLine.lineStyle.color" size="small"></n-color-picker>
       </setting-item>
       <setting-item name="粗细">
-        <n-input-number
-          v-model:value="xAxis.splitLine.lineStyle.width"
-          :min="1"
-          size="small"
-        ></n-input-number>
+        <n-input-number v-model:value="xAxis.splitLine.lineStyle.width" :min="1" size="small"></n-input-number>
       </setting-item>
       <setting-item name="类型">
         <n-select
@@ -166,140 +107,87 @@
           :options="axisConfig.splitLint.lineStyle.type"
         ></n-select>
       </setting-item>
-      <setting-item name="位置">
-        <n-select
-          v-model:value="xAxis.position"
-          size="small"
-          :options="axisConfig.xposition"
-        ></n-select>
-      </setting-item>
     </setting-item-box>
   </collapse-item>
 
   <collapse-item v-if="yAxis" name="Y轴">
     <template #header>
-      <n-switch
-        v-show="inChart"
-        v-model:value="yAxis.show"
-        size="small"
-      ></n-switch>
+      <n-switch v-model:value="yAxis.show" size="small"></n-switch>
     </template>
     <setting-item-box name="单位">
       <setting-item name="名称">
         <n-input v-model:value="yAxis.name" size="small"></n-input>
       </setting-item>
       <setting-item name="颜色">
-        <n-color-picker
-          size="small"
-          v-model:value="yAxis.nameTextStyle.color"
-        ></n-color-picker>
+        <n-color-picker size="small" v-model:value="yAxis.nameTextStyle.color"></n-color-picker>
       </setting-item>
-       <setting-item name="大小">
-        <n-input-number
-          v-model:value="yAxis.nameTextStyle.fontSize"
-          :min="8"
-          size="small"
-        ></n-input-number>
+      <setting-item name="大小">
+        <n-input-number v-model:value="yAxis.nameTextStyle.fontSize" :min="8" size="small"></n-input-number>
       </setting-item>
       <setting-item name="偏移量">
-         <n-input-number
-          v-model:value="yAxis.nameGap"
-          :min="5"
-          size="small"
-        ></n-input-number>
+        <n-input-number v-model:value="yAxis.nameGap" :min="5" size="small"></n-input-number>
       </setting-item>
     </setting-item-box>
     <setting-item-box name="标签">
-      <setting-item v-show="inChart" name="展示">
+      <setting-item name="展示">
         <n-space>
-          <n-switch
-            v-model:value="yAxis.axisLabel.show"
-            size="small"
-          ></n-switch>
+          <n-switch v-model:value="yAxis.axisLabel.show" size="small"></n-switch>
         </n-space>
       </setting-item>
       <setting-item name="颜色">
-        <n-color-picker
-          size="small"
-          v-model:value="yAxis.axisLabel.color"
-        ></n-color-picker>
+        <n-color-picker size="small" v-model:value="yAxis.axisLabel.color"></n-color-picker>
       </setting-item>
       <setting-item name="大小">
-        <n-input-number
-          v-model:value="yAxis.axisLabel.fontSize"
-          :min="8"
-          size="small"
-        ></n-input-number>
+        <n-input-number v-model:value="yAxis.axisLabel.fontSize" :min="8" size="small"></n-input-number>
       </setting-item>
     </setting-item-box>
     <setting-item-box name="轴线">
-      <setting-item v-show="inChart" name="展示">
+      <setting-item name="展示">
         <n-space>
           <n-switch v-model:value="yAxis.axisLine.show" size="small"></n-switch>
         </n-space>
       </setting-item>
       <setting-item name="颜色">
-        <n-color-picker
-          v-model:value="yAxis.axisLine.lineStyle.color"
-          size="small"
-        ></n-color-picker>
+        <n-color-picker v-model:value="yAxis.axisLine.lineStyle.color" size="small"></n-color-picker>
       </setting-item>
       <setting-item name="粗细">
-        <n-input-number
-          v-model:value="yAxis.axisLine.lineStyle.width"
-          :min="1"
-          size="small"
-        ></n-input-number>
+        <n-input-number v-model:value="yAxis.axisLine.lineStyle.width" :min="1" size="small"></n-input-number>
+      </setting-item>
+      <setting-item name="位置">
+        <n-select v-model:value="yAxis.position" size="small" :options="axisConfig.yposition"></n-select>
       </setting-item>
       <setting-item name="对齐零">
         <n-space>
-          <n-switch
-            v-model:value="yAxis.axisLine.onZero"
-            size="small"
-          ></n-switch>
+          <n-switch v-model:value="yAxis.axisLine.onZero" size="small"></n-switch>
         </n-space>
       </setting-item>
-      <setting-item v-show="inChart" name="反向">
+      <setting-item name="反向">
         <n-space>
           <n-switch v-model:value="yAxis.inverse" size="small"></n-switch>
         </n-space>
       </setting-item>
     </setting-item-box>
     <setting-item-box name="刻度">
-      <setting-item v-show="inChart" name="展示">
+      <setting-item name="展示">
         <n-space>
           <n-switch v-model:value="yAxis.axisTick.show" size="small"></n-switch>
         </n-space>
       </setting-item>
       <setting-item name="长度">
-        <n-input-number
-          v-model:value="yAxis.axisTick.length"
-          :min="1"
-          size="small"
-        ></n-input-number>
+        <n-input-number v-model:value="yAxis.axisTick.length" :min="1" size="small"></n-input-number>
       </setting-item>
     </setting-item-box>
     <setting-item-box name="分割线">
-      <setting-item v-show="inChart" name="展示">
+      <setting-item name="展示">
         <n-space>
-          <n-switch
-            v-model:value="yAxis.splitLine.show"
-            size="small"
-          ></n-switch>
+          <n-switch v-model:value="yAxis.splitLine.show" size="small"></n-switch>
         </n-space>
       </setting-item>
       <setting-item name="颜色">
-        <n-color-picker
-          v-model:value="yAxis.splitLine.lineStyle.color"
-          size="small"
-        ></n-color-picker>
+        <n-color-picker v-model:value="yAxis.splitLine.lineStyle.color" size="small"></n-color-picker>
       </setting-item>
       <setting-item name="粗细">
-        <n-input-number
-          v-model:value="yAxis.splitLine.lineStyle.width"
-          :min="1"
-          size="small"
-        ></n-input-number>
+        <n-input-number v-model:value="yAxis.splitLine.lineStyle.width" :min="1" size="small"></n-input-number>
       </setting-item>
       <setting-item name="类型">
         <n-select
@@ -308,44 +196,78 @@
           :options="axisConfig.splitLint.lineStyle.type"
         ></n-select>
       </setting-item>
-      <setting-item name="位置">
-        <n-select
-          v-model:value="yAxis.position"
-          size="small"
-          :options="axisConfig.yposition"
-        ></n-select>
-      </setting-item>
     </setting-item-box>
   </collapse-item>
 
   <collapse-item v-if="legend" name="图例">
     <template #header>
-      <n-switch
-        v-show="inChart"
-        v-model:value="legend.show"
-        size="small"
-      ></n-switch>
+      <n-switch v-model:value="legend.show" size="small"></n-switch>
     </template>
     <setting-item-box name="图例文字">
       <setting-item>
-        <n-color-picker
-          size="small"
-          v-model:value="legend.textStyle.color"
-        ></n-color-picker>
+        <n-color-picker size="small" v-model:value="legend.textStyle.color"></n-color-picker>
       </setting-item>
     </setting-item-box>
   </collapse-item>
+
+  <collapse-item v-if="visualMap" name="视觉映射">
+    <template #header>
+      <n-switch v-model:value="visualMap.show" size="small"></n-switch>
+    </template>
+
+    <setting-item-box name="范围">
+      <setting-item name="最小值">
+        <n-input-number v-model:value="visualMap.min" size="small"></n-input-number>
+      </setting-item>
+      <setting-item name="最大值">
+        <n-input-number v-model:value="visualMap.max" size="small"></n-input-number>
+      </setting-item>
+    </setting-item-box>
+
+    <setting-item-box name="颜色">
+      <setting-item :name="`层级-${index + 1}`" v-for="(item, index) in visualMap.inRange.color" :key="index">
+        <n-color-picker v-model:value="visualMap.inRange.color[index]" size="small"></n-color-picker>
+      </setting-item>
+    </setting-item-box>
+
+    <setting-item-box name="视觉映射">
+      <setting-item name="放置方向">
+        <n-select v-model:value="visualMap.orient" size="small" :options="axisConfig.visualMap.orient"></n-select>
+      </setting-item>
+      <setting-item name="宽度">
+        <n-input-number v-model:value="visualMap.temWidth" size="small"></n-input-number>
+      </setting-item>
+      <setting-item name="高度">
+        <n-input-number v-model:value="visualMap.itemHeight" size="small"></n-input-number>
+      </setting-item>
+      <setting-item name="反转">
+        <n-space>
+          <n-switch v-model:value="visualMap.inverse" size="small"></n-switch>
+        </n-space>
+      </setting-item>
+      <setting-item name="拖拽组件实时更新">
+        <n-space>
+          <n-switch v-model:value="visualMap.realtime" size="small"></n-switch>
+        </n-space>
+      </setting-item>
+    </setting-item-box>
+    <global-setting-position :targetData="visualMap"></global-setting-position>
+    <!-- <setting-item-box name="位置">
+      <setting-item name="距离底部">
+        <n-input-number v-model:value="visualMap.bottom" size="small"></n-input-number>
+      </setting-item>
+      <setting-item name="距离左侧">
+        <n-input-number v-model:value="visualMap.left" size="small"></n-input-number>
+      </setting-item>
+    </setting-item-box> -->
+  </collapse-item>
 </template>
 
 <script setup lang="ts">
 import { PropType, computed } from 'vue'
 import { GlobalThemeJsonType } from '@/settings/chartThemes/index'
 import { axisConfig } from '@/packages/chartConfiguration/echarts/index'
-import {
-  CollapseItem,
-  SettingItemBox,
-  SettingItem
-} from '@/components/Pages/ChartItemSetting'
+import { CollapseItem, SettingItemBox, SettingItem, GlobalSettingPosition } from '@/components/Pages/ChartItemSetting'
 
 const props = defineProps({
   optionData: {
@@ -374,4 +296,8 @@ const yAxis = computed(() => {
 const legend = computed(() => {
   return props.optionData.legend
 })
+
+const visualMap = computed(() => {
+  return props.optionData.visualMap
+})
 </script>

src/components/Pages/ChartItemSetting/GlobalSettingPosition.vue

@@ -0,0 +1,29 @@
+<template>
+  <setting-item-box name="位置">
+    <setting-item :name="`偏移 X：${targetData.left || 0}px`">
+      <n-input-number v-model:value="targetData.left" size="small" step="10"></n-input-number>
+    </setting-item>
+    <setting-item :name="`偏移 Y：${targetData.top || 0}px`">
+      <n-input-number v-model:value="targetData.top" size="small" step="10"></n-input-number>
+    </setting-item>
+  </setting-item-box>
+</template>
+
+<script setup lang="ts">
+import { PropType, reactive } from 'vue'
+import { CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
+
+type positionType = {
+  top?: number | string | null
+  left?: number | string | null
+  right?: number | string | null
+  bottom?: number | string | null
+}
+
+const props = defineProps({
+  targetData: {
+    type: Object as PropType<positionType>,
+    required: true
+  }
+})
+</script>

src/components/Pages/ChartItemSetting/SizeSetting.vue

@@ -3,6 +3,7 @@
     <n-input-number
       v-model:value="chartAttr.w"
       :min="50"
+      :disabled="isGroup"
       size="small"
       placeholder="px"
     >
@@ -13,6 +14,7 @@
     <n-input-number
       v-model:value="chartAttr.h"
       :min="50"
+      :disabled="isGroup"
       size="small"
       placeholder="px"
     >
@@ -32,6 +34,10 @@ const props = defineProps({
   chartAttr: {
     type: Object as PropType<Omit<PickCreateComponentType<'attr'>, 'node' | 'conNode'>>,
     required: true
+  },
+  isGroup: {
+    type: Boolean,
+    required: false
   }
 })
 </script>

src/components/Pages/ChartItemSetting/StylesSetting.vue

@@ -1,5 +1,13 @@
 <template>
+  <div v-show="isGroup">
+    <n-divider n-divider style="margin: 10px 0"></n-divider>
+    <n-tag type="warning"> 解散分组「  {{ isCanvas ? '滤镜' : '滤镜 / 变换' }} 」也将消失!</n-tag>
+  </div>
+
   <collapse-item :name="isCanvas ? '滤镜' : '滤镜 / 变换'">
+    <template #header>
+      <n-switch v-if="isCanvas" v-model:value="chartStyles.filterShow" size="small"></n-switch>
+    </template>
     <setting-item-box name="色相" :alone="true">
       <setting-item :name="`值：${chartStyles.hueRotate}deg`">
         <!-- 透明度 -->
@@ -13,9 +21,7 @@
       </setting-item>
     </setting-item-box>
     <setting-item-box name="饱和度" :alone="true">
-      <setting-item
-        :name="`值：${(parseFloat(String(chartStyles.saturate)) * 100).toFixed(0)}%`"
-      >
+      <setting-item :name="`值：${(parseFloat(String(chartStyles.saturate)) * 100).toFixed(0)}%`">
         <!-- 透明度 -->
         <n-slider
           v-model:value="chartStyles.saturate"
@@ -27,9 +33,7 @@
       </setting-item>
     </setting-item-box>
     <setting-item-box name="对比度" :alone="true">
-      <setting-item
-        :name="`值：${(parseFloat(String(chartStyles.contrast)) * 100).toFixed(0)}%`"
-      >
+      <setting-item :name="`值：${(parseFloat(String(chartStyles.contrast)) * 100).toFixed(0)}%`">
         <!-- 透明度 -->
         <n-slider
           v-model:value="chartStyles.contrast"
@@ -41,9 +45,7 @@
       </setting-item>
     </setting-item-box>
     <setting-item-box name="亮度" :alone="true">
-      <setting-item
-        :name="`值：${(parseFloat(String(chartStyles.brightness)) * 100).toFixed(0)}%`"
-      >
+      <setting-item :name="`值：${(parseFloat(String(chartStyles.brightness)) * 100).toFixed(0)}%`">
         <!-- 透明度 -->
         <n-slider
           v-model:value="chartStyles.brightness"
@@ -55,9 +57,7 @@
       </setting-item>
     </setting-item-box>
     <setting-item-box name="透明度" :alone="true">
-      <setting-item
-        :name="`值：${(parseFloat(String(chartStyles.opacity)) * 100).toFixed(0)}%`"
-      >
+      <setting-item :name="`值：${(parseFloat(String(chartStyles.opacity)) * 100).toFixed(0)}%`">
         <!-- 透明度 -->
         <n-slider
           v-model:value="chartStyles.opacity"
@@ -68,7 +68,7 @@
         ></n-slider>
       </setting-item>
     </setting-item-box>
-    
+
     <!-- 变换 -->
     <setting-item-box v-if="!isCanvas" name="旋转°">
       <setting-item name="Z轴(平面) - 旋转">
@@ -124,27 +124,30 @@
         ></n-input-number>
       </setting-item>
     </setting-item-box>
+
+    <!-- 提示 -->
+    <n-tag v-show="isCanvas" type="warning"> 若预览时大屏模糊，可以尝试关闭滤镜进行修复 </n-tag>
   </collapse-item>
 </template>
 
 <script setup lang="ts">
 import { PropType } from 'vue'
 import { PickCreateComponentType } from '@/packages/index.d'
-import {
-  SettingItemBox,
-  SettingItem,
-  CollapseItem,
-} from '@/components/Pages/ChartItemSetting'
+import { SettingItemBox, SettingItem, CollapseItem } from '@/components/Pages/ChartItemSetting'
 
 const props = defineProps({
+  isGroup: {
+    type: Boolean,
+    required: false
+  },
   isCanvas: {
     type: Boolean,
     default: false
   },
   chartStyles: {
     type: Object as PropType<Omit<PickCreateComponentType<'styles'>, 'animations'>>,
-    required: true,
-  },
+    required: true
+  }
 })
 
 // 百分比格式化persen

src/components/Pages/ChartItemSetting/index.ts

@@ -5,6 +5,9 @@ import CollapseItem from './CollapseItem.vue'
 
 // 全局配置属性
 import GlobalSetting from './GlobalSetting.vue'
+// 全局配置属性-位置
+import GlobalSettingPosition from './GlobalSettingPosition.vue'
+
 // 名称
 import NameSetting from './NameSetting.vue'
 // 方向
@@ -14,4 +17,4 @@ import SizeSetting from './SizeSetting.vue'
 // 样式
 import StylesSetting from './StylesSetting.vue'
 
-export { CollapseItem, SettingItemBox, SettingItem, GlobalSetting, NameSetting, PositionSetting, SizeSetting, StylesSetting }
+export { CollapseItem, SettingItemBox, SettingItem, GlobalSetting, GlobalSettingPosition, NameSetting, PositionSetting, SizeSetting, StylesSetting }

src/components/Tips/MacOsControlBtn/index.vue

@@ -37,7 +37,9 @@ const props = defineProps({
   hidden: {
     request: false,
     type: Array,
-    default: []
+    default() {
+      return []
+    }
   },
   // 使用全屏功能
   narrow: {
@@ -76,7 +78,7 @@ const btnList: {
     icon: RemoveIcon
   },
   {
-    title: isFull ? '缩小' : '放大',
+    title: isFull.value ? '缩小' : '放大',
     key: props.narrow ? 'fullResize' : 'resize',
     icon: ResizeIcon
   }

src/enums/editPageEnum.ts

@@ -1,23 +1,44 @@
-// 页面拖拽键名
-export enum DragKeyEnum {
-  DROG_KEY = 'ChartData'
+// 鼠标点击左右键
+export enum MouseEventButton {
+  LEFT = 1,
+  RIGHT = 2,
 }
 
-// 右键枚举
+// 页面拖拽键名
+export enum DragKeyEnum {
+  DRAG_KEY = 'ChartData'
+}
+
+// 操作枚举
 export enum MenuEnum {
+  // 移动
   ARROW_UP = 'up',
   ARROW_RIGHT = 'right',
   ARROW_DOWN = 'down',
   ARROW_LEFT = 'left',
+  // 删除
   DELETE = 'delete',
+  // 复制
   COPY = 'copy',
+  // 剪切
   CUT = 'cut',
+  // 粘贴
   PARSE = 'parse',
+  // 置顶
   TOP = 'top',
+  // 置底
   BOTTOM = 'bottom',
+  // 上移
   UP = 'up',
+  // 下移
   DOWN = 'down',
+  // 清空剪贴板
   CLEAR = 'clear',
+  // 成组
+  GROUP = 'group',
+  // 解组
+  UN_GROUP = 'unGroup',
+  // 后退
   BACK = 'back',
   FORWORD = 'forward',
   SAVE = 'save'
@@ -28,6 +49,9 @@ export enum WinKeyboard {
   CTRL = 'ctrl',
   SHIFT = 'shift',
   ALT = ' alt',
+  CTRL_SOURCE_KEY = "control",
+  SHIFT_SOURCE_KEY = "shift",
+  ALT_SOURCE_KEY = "alt"
 }
 
 // Mac 键盘枚举
@@ -36,6 +60,9 @@ export enum MacKeyboard {
   CTRL = '⌘',
   SHIFT = '⇧',
   ALT = '⌥',
+  CTRL_SOURCE_KEY = "⌘",
+  SHIFT_SOURCE_KEY = "⇧",
+  ALT_SOURCE_KEY = "⌥"
 }
 
 // 同步状态枚举
@@ -48,4 +75,4 @@ export enum SyncEnum {
   SUCCESS,
   // 失败
   FAILURE
-}
+}

src/hooks/useChartDataFetch.hook.ts

@@ -62,16 +62,15 @@ export const useChartDataFetch = (
           if (res && res.data) {
             try {
               const filter = targetComponent.filter
+              // eCharts 组件配合 vChart 库更新方式
+              if (chartFrame === ChartFrameEnum.ECHARTS) {
+                if (vChartRef.value) {
+                  vChartRef.value.setOption({ dataset: newFunctionHandle(res.data, filter) })
+                }
+              }
               // 更新回调函数
               if (updateCallback) {
                 updateCallback(newFunctionHandle(res.data, filter))
-              } else {
-                // eCharts 组件配合 vChart 库更新方式
-                if (chartFrame === ChartFrameEnum.ECHARTS) {
-                  if (vChartRef.value) {
-                    vChartRef.value.setOption({ dataset: newFunctionHandle(res.data, filter) })
-                  }
-                }
               }
             } catch (error) {
               console.error(error)

src/i18n/en/index.ts

@@ -9,7 +9,7 @@ const global = {
   // header
   doc: 'Document',
   help: 'Help',
-  contact: 'Contact Us',
+  contact: 'About Software',
   logout: 'Logout',
   logout_success: 'Logout success！',
   logout_failure: 'Logout Failed！',

src/i18n/zh/index.ts

@@ -9,7 +9,7 @@ const global = {
   // 头部
   doc: '说明文档',
   help: '帮助中心',
-  contact: '联系我们',
+  contact: '关于软件',
   logout: '退出登录',
   logout_success: '退出成功！',
   logout_failure: '退出失败！',

src/packages/chartConfiguration/echarts/axis.ts

@@ -1,40 +1,56 @@
 export const axisConfig = {
+  // X轴位置
   xposition: [
     {
-      label: 'top',
+      label: '顶部',
       value: 'top'
     },
     {
-      label: 'bottom',
+      label: '底部',
       value: 'bottom'
     }
   ],
+  // Y轴位置
   yposition: [
     {
-      label: 'left',
+      label: '左侧',
       value: 'left'
     },
     {
-      label: 'right',
+      label: '右侧',
       value: 'right'
     }
   ],
+  // 线条
   splitLint: {
     lineStyle: {
       type: [
         {
-          label: 'solid',
+          label: '实线',
           value: 'solid'
         },
         {
-          label: 'dashed',
+          label: '虚线',
           value: 'dashed'
         },
         {
-          label: 'dotted',
+          label: '点线',
           value: 'dotted'
         }
       ]
     }
+  },
+  // 视觉映射
+  visualMap: {
+    orient: [
+      {
+        label: '竖直',
+        value: 'vertical'
+      },
+      {
+        label: '水平',
+        value: 'horizontal'
+      }
+    ]
   }
 }

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

@@ -1,4 +1,4 @@
-import { echartOptionProfixHandle, publicConfig } from '@/packages/public'
+import { echartOptionProfixHandle, PublicConfigClass } from '@/packages/public'
 import { BarCommonConfig } from './index'
 import { CreateComponentType } from '@/packages/index.d'
 import cloneDeep from 'lodash/cloneDeep'
@@ -6,6 +6,15 @@ import dataJson from './data.json'
 
 export const includes = ['legend', 'xAxis', 'yAxis']
 
+export const seriesItem = {
+  type: 'bar',
+  barWidth: null,
+  itemStyle: {
+    color: null,
+    borderRadius: 0
+  }
+}
+
 export const option = {
   tooltip: {
     show: true,
@@ -27,27 +36,10 @@ export const option = {
     type: 'value'
   },
   dataset: { ...dataJson },
-  series: [
-    {
-      type: 'bar',
-      barWidth: null,
-      itemStyle: {
-        color: null,
-        borderRadius: 0
-      }
-    },
-    {
-      type: 'bar',
-      barWidth: null,
-      itemStyle: {
-        color: null,
-        borderRadius: 0
-      }
-    }
-  ]
+  series: [seriesItem, seriesItem]
 }
 
-export default class Config extends publicConfig implements CreateComponentType {
+export default class Config extends PublicConfigClass implements CreateComponentType {
   public key = BarCommonConfig.key
   public chartConfig = cloneDeep(BarCommonConfig)
   // 图表配置项

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

@@ -1,4 +1,6 @@
 <template>
+   <!-- Echarts 全局设置 --> 
+  <global-setting :optionData="optionData"></global-setting>
   <CollapseItem
     v-for="(item, index) in seriesList"
     :key="index"
@@ -36,8 +38,6 @@
       </SettingItem>
     </SettingItemBox>
   </CollapseItem>
-  <!-- Echarts 全局设置 --> 
-  <global-setting :optionData="optionData" :in-chart="true"></global-setting>
 </template>
 
 <script setup lang="ts">

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

@@ -1,25 +1,29 @@
 <template>
-  <v-chart ref="vChartRef" :theme="themeColor" :option="option" :manual-update="isPreview()" autoresize></v-chart>
+  <v-chart
+    ref="vChartRef"
+    :theme="themeColor"
+    :option="option"
+    :manual-update="isPreview()"
+    :update-options="{
+      replaceMerge: replaceMergeArr
+    }"
+    autoresize
+  ></v-chart>
 </template>
 
 <script setup lang="ts">
-import { computed, PropType } from 'vue'
+import { ref, nextTick, computed, watch, PropType } from 'vue'
 import VChart from 'vue-echarts'
 import { use } from 'echarts/core'
 import { CanvasRenderer } from 'echarts/renderers'
 import { BarChart } from 'echarts/charts'
-import { includes } from './config'
+import config, { includes, seriesItem } from './config'
 import { mergeTheme } from '@/packages/public/chart'
 import { useChartDataFetch } from '@/hooks'
 import { CreateComponentType } from '@/packages/index.d'
 import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
 import { isPreview } from '@/utils'
-import {
-  DatasetComponent,
-  GridComponent,
-  TooltipComponent,
-  LegendComponent
-} from 'echarts/components'
+import { DatasetComponent, GridComponent, TooltipComponent, LegendComponent } from 'echarts/components'
 
 const props = defineProps({
   themeSetting: {
@@ -31,23 +35,39 @@ const props = defineProps({
     required: true
   },
   chartConfig: {
-    type: Object as PropType<CreateComponentType>,
+    type: Object as PropType<config>,
     required: true
   }
 })
 
-use([
-  DatasetComponent,
-  CanvasRenderer,
-  BarChart,
-  GridComponent,
-  TooltipComponent,
-  LegendComponent
-])
+use([DatasetComponent, CanvasRenderer, BarChart, GridComponent, TooltipComponent, LegendComponent])
+
+const replaceMergeArr = ref<string[]>()
 
 const option = computed(() => {
   return mergeTheme(props.chartConfig.option, props.themeSetting, includes)
 })
 
+// dataset 无法变更条数的补丁
+watch(
+  () => props.chartConfig.option.dataset,
+  (newData, oldData) => {
+    if (newData.dimensions.length !== oldData.dimensions.length) {
+      const seriesArr = []
+      for (let i = 0; i < newData.dimensions.length - 1; i++) {
+        seriesArr.push(seriesItem)
+      }
+      replaceMergeArr.value = ['series']
+      props.chartConfig.option.series = seriesArr
+      nextTick(() => {
+        replaceMergeArr.value = []
+      })
+    }
+  },
+  {
+    deep: false
+  }
+)
+
 const { vChartRef } = useChartDataFetch(props.chartConfig, useChartEditStore)
 </script>

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

@@ -1,4 +1,4 @@
-import { echartOptionProfixHandle, publicConfig } from '@/packages/public'
+import { echartOptionProfixHandle, PublicConfigClass } from '@/packages/public'
 import { BarCrossrangeConfig } from './index'
 import { CreateComponentType } from '@/packages/index.d'
 import cloneDeep from 'lodash/cloneDeep'
@@ -6,50 +6,40 @@ import dataJson from './data.json'
 
 export const includes = ['legend', 'xAxis', 'yAxis']
 
+export const seriesItem = {
+  type: 'bar',
+  barWidth: null,
+  itemStyle: {
+    color: null,
+    borderRadius: 0
+  }
+}
+
 export const option = {
   tooltip: {
     show: true,
     trigger: 'axis',
     axisPointer: {
       show: true,
-      type: 'shadow',
-    },
+      type: 'shadow'
+    }
   },
   legend: {
-    show: true,
+    show: true
   },
   xAxis: {
     show: true,
     type: 'value',
-    data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
   },
   yAxis: {
     show: true,
-    type: 'category',
+    type: 'category'
   },
   dataset: { ...dataJson },
-  series: [
-    {
-      type: 'bar',
-      barWidth: null,
-      itemStyle: {
-        color: null,
-        borderRadius: 0,
-      },
-    },
-    {
-      type: 'bar',
-      barWidth: null,
-      itemStyle: {
-        color: null,
-        borderRadius: 0,
-      },
-    },
-  ],
+  series: [seriesItem, seriesItem]
 }
 
-export default class Config extends publicConfig
-  implements CreateComponentType {
+export default class Config extends PublicConfigClass implements CreateComponentType {
   public key = BarCrossrangeConfig.key
   public chartConfig = cloneDeep(BarCrossrangeConfig)
   // 图表配置项

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

@@ -1,4 +1,6 @@
 <template>
+  <!-- Echarts 全局设置 --> 
+  <global-setting :optionData="optionData"></global-setting>
   <CollapseItem v-for="(item, index) in seriesList" :key="index" :name="`柱状图-${index+1}`" :expanded="true">
     <SettingItemBox name="图形">
       <SettingItem name="颜色">
@@ -25,8 +27,6 @@
       </SettingItem>
     </SettingItemBox>
   </CollapseItem>
-  <!-- Echarts 全局设置 --> 
-  <global-setting :optionData="optionData" :in-chart="true"></global-setting>
 </template>
 
 <script setup lang="ts">

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

@@ -1,24 +1,28 @@
 <template>
-  <v-chart ref="vChartRef" :theme="themeColor" :option="option" :manual-update="isPreview()" autoresize></v-chart>
+  <v-chart
+    ref="vChartRef"
+    :theme="themeColor"
+    :option="option"
+    :manual-update="isPreview()"
+    :update-options="{
+      replaceMerge: replaceMergeArr
+    }"
+    autoresize
+  ></v-chart>
 </template>
 
 <script setup lang="ts">
-import { computed, PropType } from 'vue'
+import { ref, nextTick, computed, watch, PropType } from 'vue'
 import VChart from 'vue-echarts'
 import { use } from 'echarts/core'
 import { CanvasRenderer } from 'echarts/renderers'
 import { BarChart } from 'echarts/charts'
 import { mergeTheme } from '@/packages/public/chart'
-import config, { includes } from './config'
+import config, { includes, seriesItem } from './config'
 import { useChartDataFetch } from '@/hooks'
 import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
 import { isPreview } from '@/utils'
-import {
-  DatasetComponent,
-  GridComponent,
-  TooltipComponent,
-  LegendComponent,
-} from 'echarts/components'
+import { DatasetComponent, GridComponent, TooltipComponent, LegendComponent } from 'echarts/components'
 
 const props = defineProps({
   themeSetting: {
@@ -35,18 +39,34 @@ const props = defineProps({
   }
 })
 
-use([
-  DatasetComponent,
-  CanvasRenderer,
-  BarChart,
-  GridComponent,
-  TooltipComponent,
-  LegendComponent,
-])
+use([DatasetComponent, CanvasRenderer, BarChart, GridComponent, TooltipComponent, LegendComponent])
+
+const replaceMergeArr = ref<string[]>()
 
 const option = computed(() => {
   return mergeTheme(props.chartConfig.option, props.themeSetting, includes)
 })
 
+// dataset 无法变更条数的补丁
+watch(
+  () => props.chartConfig.option.dataset,
+  (newData, oldData) => {
+    if (newData?.dimensions.length !== oldData?.dimensions.length) {
+      const seriesArr = []
+      for (let i = 0; i < newData.dimensions.length - 1; i++) {
+        seriesArr.push(seriesItem)
+      }
+      replaceMergeArr.value = ['series']
+      props.chartConfig.option.series = seriesArr
+      nextTick(() => {
+        replaceMergeArr.value = []
+      })
+    }
+  },
+  {
+    deep: false
+  }
+)
+
 const { vChartRef } = useChartDataFetch(props.chartConfig, useChartEditStore)
 </script>

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

@@ -1,4 +1,4 @@
-import { echartOptionProfixHandle, publicConfig } from '@/packages/public'
+import { echartOptionProfixHandle, PublicConfigClass } from '@/packages/public'
 import { LineCommonConfig } from './index'
 import { CreateComponentType } from '@/packages/index.d'
 import { defaultTheme, chartColorsSearch } from '@/settings/chartThemes/index'
@@ -6,6 +6,18 @@ import dataJson from './data.json'
 
 export const includes = ['legend', 'xAxis', 'yAxis']
 
+export const seriesItem = {
+  type: 'line',
+  lineStyle: {
+    type: 'solid',
+    width: 3,
+    itemStyle: {
+      color: null,
+      borderRadius: 0
+    }
+  }
+}
+
 export const option = {
   tooltip: {
     show: true,
@@ -19,43 +31,17 @@ export const option = {
   },
   xAxis: {
     show: true,
-    type: 'category',
+    type: 'category'
   },
   yAxis: {
     show: true,
     type: 'value'
   },
   dataset: { ...dataJson },
-  series: [
-    {
-      type: 'line',
-      lineStyle: {
-        type: 'solid',
-        width: 3,
-        color: {
-          type: 'linear',
-          colorStops: [
-            {
-              offset: 0,
-              color: chartColorsSearch[defaultTheme][0] // 0% 处的颜色
-            },
-            {
-              offset: 1,
-              color: chartColorsSearch[defaultTheme][1] // 100% 处的颜色
-            }
-          ],
-          globalCoord: false // 缺省为 false
-        },
-        shadowColor: chartColorsSearch[defaultTheme][2],
-        shadowBlur: 10,
-        shadowOffsetY: 20
-      },
-    }
-  ]
+  series: [seriesItem, seriesItem]
 }
 
-export default class Config extends publicConfig
-  implements CreateComponentType {
+export default class Config extends PublicConfigClass implements CreateComponentType {
   public key: string = LineCommonConfig.key
   public chartConfig = LineCommonConfig
   // 图表配置项

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

@@ -1,4 +1,6 @@
 <template>
+  <!-- Echarts 全局设置 -->
+  <global-setting :optionData="optionData"></global-setting>
   <CollapseItem
     v-for="(item, index) in seriesList"
     :key="index"
@@ -6,20 +8,6 @@
     :expanded="true"
   >
     <SettingItemBox name="线条">
-      <SettingItem name="颜色">
-        <n-color-picker
-          size="small"
-          :modes="['hex']"
-          v-model:value="item.lineStyle.color.colorStops[0].color"
-       ></n-color-picker>
-      </SettingItem>
-      <SettingItem name="颜色">
-        <n-color-picker
-          size="small"
-          :modes="['hex']"
-          v-model:value="item.lineStyle.color.colorStops[1].color"
-       ></n-color-picker>
-      </SettingItem>
       <SettingItem name="宽度">
         <n-input-number
           v-model:value="item.lineStyle.width"
@@ -37,29 +25,7 @@
        ></n-select>
       </SettingItem>
     </SettingItemBox>
-    <SettingItemBox name="阴影" :alone="true">
-      <SettingItem name="颜色">
-        <n-color-picker
-          size="small"
-          :modes="['hex']"
-          v-model:value="item.lineStyle.shadowColor"
-      ></n-color-picker>
-      </SettingItem>
-      
-    </SettingItemBox>
-    <SettingItemBox name="设置">
-     <SettingItem name="阴影">
-        <n-button
-          size="small"
-          @click="item.lineStyle.shadowColor = 'rgba(0, 0, 0, 0)'"
-        >
-          去除阴影
-        </n-button>
-      </SettingItem>
-    </SettingItemBox>
   </CollapseItem>
-  <!-- Echarts 全局设置 -->
-  <global-setting :optionData="optionData" :in-chart="true"></global-setting>
 </template>
 
 <script setup lang="ts">

src/packages/components/Charts/Lines/LineCommon/data.json

@@ -1,33 +1,40 @@
 {
-  "dimensions": ["product", "data1"],
+  "dimensions": ["product", "data1", "data2"],
   "source": [
     {
       "product": "Mon",
-      "data1": 120
+      "data1": 120,
+      "data2": 130
     },
     {
       "product": "Tue",
-      "data1": 200
+      "data1": 200,
+      "data2": 130
     },
     {
       "product": "Wed",
-      "data1": 150
+      "data1": 150,
+      "data2": 312
     },
     {
       "product": "Thu",
-      "data1": 80
+      "data1": 80,
+      "data2": 268
     },
     {
       "product": "Fri",
-      "data1": 70
+      "data1": 70,
+      "data2": 155
     },
     {
       "product": "Sat",
-      "data1": 110
+      "data1": 110,
+      "data2": 117
     },
     {
       "product": "Sun",
-      "data1": 130
+      "data1": 130,
+      "data2": 160
     }
   ]
 }

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

@@ -1,26 +1,29 @@
 <template>
-  <v-chart 
-    ref="vChartRef" 
-    :theme="themeColor" 
-    :option="option.value" 
-    :manual-update="isPreview()" 
-    autoresize>
+  <v-chart
+    ref="vChartRef"
+    :theme="themeColor"
+    :option="option"
+    :manual-update="isPreview()"
+    :update-options="{
+      replaceMerge: replaceMergeArr
+    }"
+    autoresize
+  >
   </v-chart>
 </template>
 
 <script setup lang="ts">
-import { PropType, watch, reactive } from 'vue';
+import { PropType, computed, watch, ref, nextTick } from 'vue'
 import VChart from 'vue-echarts'
 import { use } from 'echarts/core'
 import { CanvasRenderer } from 'echarts/renderers'
 import { LineChart } from 'echarts/charts'
-import config, { includes } from './config'
+import config, { includes, seriesItem } from './config'
 import { mergeTheme } from '@/packages/public/chart'
 import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
-import { chartColorsSearch, defaultTheme } from '@/settings/chartThemes/index'
-import { DatasetComponent, GridComponent, TooltipComponent, LegendComponent } from 'echarts/components'
 import { useChartDataFetch } from '@/hooks'
 import { isPreview } from '@/utils'
+import { DatasetComponent, GridComponent, TooltipComponent, LegendComponent } from 'echarts/components'
 
 const props = defineProps({
   themeSetting: {
@@ -37,41 +40,34 @@ const props = defineProps({
   }
 })
 
-use([
-  DatasetComponent,
-  CanvasRenderer,
-  LineChart,
-  GridComponent,
-  TooltipComponent,
-  LegendComponent
-])
+use([DatasetComponent, CanvasRenderer, LineChart, GridComponent, TooltipComponent, LegendComponent])
 
-const chartEditStore = useChartEditStore()
-const option = reactive({
-  value: {}
+const replaceMergeArr = ref<string[]>()
+
+const option = computed(() => {
+  return mergeTheme(props.chartConfig.option, props.themeSetting, includes)
 })
 
-// 初始化与渐变色处理
-watch(() => chartEditStore.getEditCanvasConfig.chartThemeColor, (newColor: keyof typeof chartColorsSearch) => {
-  if (!isPreview()) {
-    const themeColor = chartColorsSearch[newColor] || chartColorsSearch[defaultTheme]
-    props.chartConfig.option.series.forEach((value: any) => {
-      value.lineStyle.shadowColor = themeColor[2]
-      value.lineStyle.color.colorStops.forEach((v: { color: string }, i: number) => {
-        v.color = themeColor[i]
+// dataset 无法变更条数的补丁
+watch(
+  () => props.chartConfig.option.dataset,
+  (newData, oldData) => {
+    if (newData?.dimensions.length !== oldData?.dimensions.length) {
+      const seriesArr = []
+      for (let i = 0; i < newData.dimensions.length - 1; i++) {
+        seriesArr.push(seriesItem)
+      }
+      replaceMergeArr.value = ['series']
+      props.chartConfig.option.series = seriesArr
+      nextTick(() => {
+        replaceMergeArr.value = []
       })
-    })
+    }
+  },
+  {
+    deep: false
   }
-  option.value = mergeTheme(props.chartConfig.option, props.themeSetting, includes)
-  props.chartConfig.option = option.value
-}, {
-  immediate: true,
-})
-
-
-watch(() => props.chartConfig.option.dataset, () => {
-  option.value = props.chartConfig.option
-})
+)
 
 const { vChartRef } = useChartDataFetch(props.chartConfig, useChartEditStore)
-</script>
+</script>

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

@@ -1,4 +1,4 @@
-import { echartOptionProfixHandle, publicConfig } from '@/packages/public'
+import { echartOptionProfixHandle, PublicConfigClass } from '@/packages/public'
 import { LineGradientSingleConfig } from './index'
 import { CreateComponentType } from '@/packages/index.d'
 import { graphic } from 'echarts/core'
@@ -20,7 +20,7 @@ const options = {
   },
   xAxis: {
     show: true,
-    type: 'category',
+    type: 'category'
   },
   yAxis: {
     show: true,
@@ -52,8 +52,7 @@ const options = {
   ]
 }
 
-export default class Config extends publicConfig
-  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

@@ -1,4 +1,6 @@
 <template>
+  <!-- Echarts 全局设置 -->
+  <global-setting :optionData="optionData"></global-setting>
   <CollapseItem
     v-for="(item, index) in seriesList"
     :key="index"
@@ -24,8 +26,6 @@
       </SettingItem>
     </SettingItemBox>
   </CollapseItem>
-  <!-- Echarts 全局设置 -->
-  <global-setting :optionData="optionData" :in-chart="true"></global-setting>
 </template>
 
 <script setup lang="ts">

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

@@ -6,7 +6,7 @@ export const LineGradientSingleConfig: ConfigType = {
   key: 'LineGradientSingle',
   chartKey: 'VLineGradientSingle',
   conKey: 'VCLineGradientSingle',
-  title: '单折线面积图',
+  title: '单折线渐变面积图',
   category: ChatCategoryEnum.LINE,
   categoryName: ChatCategoryEnumName.LINE,
   package: PackagesCategoryEnum.CHARTS,

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

@@ -1,10 +1,5 @@
 <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>
 
@@ -37,14 +32,7 @@ const props = defineProps({
   }
 })
 
-use([
-  DatasetComponent,
-  CanvasRenderer,
-  LineChart,
-  GridComponent,
-  TooltipComponent,
-  LegendComponent,
-])
+use([DatasetComponent, CanvasRenderer, LineChart, GridComponent, TooltipComponent, LegendComponent])
 const chartEditStore = useChartEditStore()
 
 const option = reactive({
@@ -52,32 +40,41 @@ const option = reactive({
 })
 
 // 渐变色处理
-watch(() => chartEditStore.getEditCanvasConfig.chartThemeColor, (newColor: keyof typeof chartColorsSearch) => {
-  if (!isPreview()) {
-    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]
-        },
-        {
-          offset: 1,
-          color: 'rgba(0,0,0, 0)'
-        }
-      ])
-    })
+watch(
+  () => chartEditStore.getEditCanvasConfig.chartThemeColor,
+  (newColor: keyof typeof chartColorsSearch) => {
+    if (!isPreview()) {
+      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]
+          },
+          {
+            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, () => {
-  option.value = props.chartConfig.option
-})
+watch(
+  () => props.chartConfig.option.dataset,
+  () => {
+    option.value = props.chartConfig.option
+  },
+  {
+    deep: false
+  }
+)
 
 const { vChartRef } = useChartDataFetch(props.chartConfig, useChartEditStore)
 </script>

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

@@ -1,4 +1,4 @@
-import { echartOptionProfixHandle, publicConfig } from '@/packages/public'
+import { echartOptionProfixHandle, PublicConfigClass } from '@/packages/public'
 import { LineGradientsConfig } from './index'
 import { CreateComponentType } from '@/packages/index.d'
 import { graphic } from 'echarts/core'
@@ -20,7 +20,7 @@ const option = {
   },
   xAxis: {
     show: true,
-    type: 'category',
+    type: 'category'
   },
   yAxis: {
     show: true,
@@ -33,7 +33,7 @@ const option = {
       smooth: false,
       lineStyle: {
         width: 3,
-        type: 'solid',
+        type: 'solid'
       },
       areaStyle: {
         opacity: 0.8,
@@ -47,15 +47,14 @@ const option = {
             color: 'rgba(0,0,0,0)'
           }
         ])
-      },
+      }
     },
     {
       type: 'line',
       smooth: false,
       lineStyle: {
-        normal: {
-          width: 3
-        }
+        width: 3,
+        type: 'solid'
       },
       areaStyle: {
         opacity: 0.8,
@@ -69,13 +68,12 @@ const option = {
             color: 'rgba(0,0,0,0)'
           }
         ])
-      },
+      }
     }
   ]
 }
 
-export default class Config extends publicConfig
-  implements CreateComponentType {
+export default class Config extends PublicConfigClass implements CreateComponentType {
   public key: string = LineGradientsConfig.key
   public chartConfig = LineGradientsConfig
   // 图表配置项

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

@@ -1,4 +1,6 @@
 <template>
+  <!-- Echarts 全局设置 -->
+  <global-setting :optionData="optionData"></global-setting>
   <CollapseItem
     v-for="(item, index) in seriesList"
     :key="index"
@@ -24,8 +26,6 @@
       </SettingItem>
     </SettingItemBox>
   </CollapseItem>
-  <!-- Echarts 全局设置 -->
-  <global-setting :optionData="optionData" :in-chart="true"></global-setting>
 </template>
 
 <script setup lang="ts">

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

@@ -1,4 +1,4 @@
-import image from '@/assets/images/chart/charts/line_gradient2.png'
+import image from '@/assets/images/chart/charts/line_gradient.png'
 import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'
 import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'
 
@@ -6,7 +6,7 @@ export const LineGradientsConfig: ConfigType = {
   key: 'LineGradients',
   chartKey: 'VLineGradients',
   conKey: 'VCLineGradients',
-  title: '双折线面积图',
+  title: '双折线渐变面积图',
   category: ChatCategoryEnum.LINE,
   categoryName: ChatCategoryEnumName.LINE,
   package: PackagesCategoryEnum.CHARTS,

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

@@ -31,14 +31,7 @@ const props = defineProps({
   }
 })
 
-use([
-  DatasetComponent,
-  CanvasRenderer,
-  LineChart,
-  GridComponent,
-  TooltipComponent,
-  LegendComponent,
-])
+use([DatasetComponent, CanvasRenderer, LineChart, GridComponent, TooltipComponent, LegendComponent])
 const chartEditStore = useChartEditStore()
 
 const option = reactive({
@@ -46,31 +39,38 @@ const option = reactive({
 })
 
 // 渐变色处理
-watch(() => chartEditStore.getEditCanvasConfig.chartThemeColor, (newColor: keyof typeof chartColorsSearch) => {
-  if (!isPreview()) {
-    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]
-        },
-        {
-          offset: 1,
-          color: 'rgba(0,0,0, 0)'
-        }
-      ])
-    })
+watch(
+  () => chartEditStore.getEditCanvasConfig.chartThemeColor,
+  (newColor: keyof typeof chartColorsSearch) => {
+    if (!isPreview()) {
+      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]
+          },
+          {
+            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, () => {
-  option.value = props.chartConfig.option
-})
+watch(
+  () => props.chartConfig.option.dataset,
+  () => {
+    option.value = props.chartConfig.option
+  }
+)
 
 const { vChartRef } = useChartDataFetch(props.chartConfig, useChartEditStore)
 </script>

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

@@ -0,0 +1,62 @@
+import { echartOptionProfixHandle, PublicConfigClass } from '@/packages/public'
+import { LineLinearSingleConfig } from './index'
+import { CreateComponentType } from '@/packages/index.d'
+import { defaultTheme, chartColorsSearch } from '@/settings/chartThemes/index'
+import dataJson from './data.json'
+
+export const includes = ['legend', 'xAxis', 'yAxis']
+
+export const option = {
+  tooltip: {
+    show: true,
+    trigger: 'axis',
+    axisPointer: {
+      type: 'line'
+    }
+  },
+  legend: {
+    show: true
+  },
+  xAxis: {
+    show: true,
+    type: 'category'
+  },
+  yAxis: {
+    show: true,
+    type: 'value'
+  },
+  dataset: { ...dataJson },
+  series: [
+    {
+      type: 'line',
+      lineStyle: {
+        type: 'solid',
+        width: 3,
+        color: {
+          type: 'linear',
+          colorStops: [
+            {
+              offset: 0,
+              color: chartColorsSearch[defaultTheme][0] // 0% 处的颜色
+            },
+            {
+              offset: 1,
+              color: chartColorsSearch[defaultTheme][1] // 100% 处的颜色
+            }
+          ],
+          globalCoord: false // 缺省为 false
+        },
+        shadowColor: chartColorsSearch[defaultTheme][2],
+        shadowBlur: 10,
+        shadowOffsetY: 20
+      }
+    }
+  ]
+}
+
+export default class Config extends PublicConfigClass implements CreateComponentType {
+  public key: string = LineLinearSingleConfig.key
+  public chartConfig = LineLinearSingleConfig
+  // 图表配置项
+  public option = echartOptionProfixHandle(option, includes)
+}

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

@@ -0,0 +1,86 @@
+<template>
+  <!-- Echarts 全局设置 -->
+  <global-setting :optionData="optionData"></global-setting>
+  <CollapseItem
+    v-for="(item, index) in seriesList"
+    :key="index"
+    :name="`样式`"
+    :expanded="true"
+  >
+    <SettingItemBox name="线条">
+      <SettingItem name="颜色">
+        <n-color-picker
+          size="small"
+          :modes="['hex']"
+          v-model:value="item.lineStyle.color.colorStops[0].color"
+       ></n-color-picker>
+      </SettingItem>
+      <SettingItem name="颜色">
+        <n-color-picker
+          size="small"
+          :modes="['hex']"
+          v-model:value="item.lineStyle.color.colorStops[1].color"
+       ></n-color-picker>
+      </SettingItem>
+      <SettingItem name="宽度">
+        <n-input-number
+          v-model:value="item.lineStyle.width"
+          :min="1"
+          :max="100"
+          size="small"
+          placeholder="自动计算"
+       ></n-input-number>
+      </SettingItem>
+      <SettingItem name="类型">
+        <n-select
+          v-model:value="item.lineStyle.type"
+          size="small"
+          :options="lineConf.lineStyle.type"
+       ></n-select>
+      </SettingItem>
+    </SettingItemBox>
+    <SettingItemBox name="阴影" :alone="true">
+      <SettingItem name="颜色">
+        <n-color-picker
+          size="small"
+          :modes="['hex']"
+          v-model:value="item.lineStyle.shadowColor"
+      ></n-color-picker>
+      </SettingItem>
+      
+    </SettingItemBox>
+    <SettingItemBox name="设置">
+     <SettingItem name="阴影">
+        <n-button
+          size="small"
+          @click="item.lineStyle.shadowColor = 'rgba(0, 0, 0, 0)'"
+        >
+          去除阴影
+        </n-button>
+      </SettingItem>
+    </SettingItemBox>
+  </CollapseItem>
+</template>
+
+<script setup lang="ts">
+import { PropType, computed } from 'vue'
+import { lineConf } from '@/packages/chartConfiguration/echarts/index'
+import { GlobalThemeJsonType } from '@/settings/chartThemes/index'
+import {
+  GlobalSetting,
+  CollapseItem,
+  SettingItemBox,
+  SettingItem
+} from '@/components/Pages/ChartItemSetting'
+
+const props = defineProps({
+  optionData: {
+    type: Object as PropType<GlobalThemeJsonType>,
+    required: true
+  }
+})
+
+const seriesList = computed(() => {
+  return props.optionData.series
+})
+</script>

src/packages/components/Charts/Lines/LineLinearSingle/data.json

@@ -0,0 +1,33 @@
+{
+  "dimensions": ["product", "data1"],
+  "source": [
+    {
+      "product": "Mon",
+      "data1": 120
+    },
+    {
+      "product": "Tue",
+      "data1": 200
+    },
+    {
+      "product": "Wed",
+      "data1": 150
+    },
+    {
+      "product": "Thu",
+      "data1": 80
+    },
+    {
+      "product": "Fri",
+      "data1": 70
+    },
+    {
+      "product": "Sat",
+      "data1": 110
+    },
+    {
+      "product": "Sun",
+      "data1": 130
+    }
+  ]
+}

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

@@ -0,0 +1,15 @@
+import image from '@/assets/images/chart/charts/line_linear_single.png'
+import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'
+import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'
+
+export const LineLinearSingleConfig: ConfigType = {
+  key: 'LineLinearSingle',
+  chartKey: 'VLineLinearSingle',
+  conKey: 'VCLineLinearSingle',
+  title: '单折线渐变图',
+  category: ChatCategoryEnum.LINE,
+  categoryName: ChatCategoryEnumName.LINE,
+  package: PackagesCategoryEnum.CHARTS,
+  chartFrame: ChartFrameEnum.ECHARTS,
+  image
+}

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

@@ -0,0 +1,74 @@
+<template>
+  <v-chart ref="vChartRef" :theme="themeColor" :option="option.value" :manual-update="isPreview()" autoresize>
+  </v-chart>
+</template>
+
+<script setup lang="ts">
+import { PropType, watch, reactive } from 'vue'
+import VChart from 'vue-echarts'
+import { use } from 'echarts/core'
+import { CanvasRenderer } from 'echarts/renderers'
+import { LineChart } from 'echarts/charts'
+import config, { includes } from './config'
+import { mergeTheme } from '@/packages/public/chart'
+import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
+import { chartColorsSearch, defaultTheme } from '@/settings/chartThemes/index'
+import { DatasetComponent, GridComponent, TooltipComponent, LegendComponent } from 'echarts/components'
+import { useChartDataFetch } from '@/hooks'
+import { isPreview } from '@/utils'
+
+const props = defineProps({
+  themeSetting: {
+    type: Object,
+    required: true
+  },
+  themeColor: {
+    type: Object,
+    required: true
+  },
+  chartConfig: {
+    type: Object as PropType<config>,
+    required: true
+  }
+})
+
+use([DatasetComponent, CanvasRenderer, LineChart, GridComponent, TooltipComponent, LegendComponent])
+
+const chartEditStore = useChartEditStore()
+const option = reactive({
+  value: {}
+})
+
+// 初始化与渐变色处理
+watch(
+  () => chartEditStore.getEditCanvasConfig.chartThemeColor,
+  (newColor: keyof typeof chartColorsSearch) => {
+    if (!isPreview()) {
+      const themeColor = chartColorsSearch[newColor] || chartColorsSearch[defaultTheme]
+      props.chartConfig.option.series.forEach((value: any) => {
+        value.lineStyle.shadowColor = themeColor[2]
+        value.lineStyle.color.colorStops.forEach((v: { color: string }, i: number) => {
+          v.color = themeColor[i]
+        })
+      })
+    }
+    option.value = mergeTheme(props.chartConfig.option, props.themeSetting, includes)
+    props.chartConfig.option = option.value
+  },
+  {
+    immediate: true
+  }
+)
+
+watch(
+  () => props.chartConfig.option.dataset,
+  () => {
+    option.value = props.chartConfig.option
+  },
+  {
+    deep: false
+  }
+)
+
+const { vChartRef } = useChartDataFetch(props.chartConfig, useChartEditStore)
+</script>

src/packages/components/Charts/Lines/index.ts

@@ -1,5 +1,6 @@
 import { LineCommonConfig } from './LineCommon/index'
+import { LineLinearSingleConfig } from './LineLinearSingle/index'
 import { LineGradientSingleConfig } from './LineGradientSingle/index'
 import { LineGradientsConfig } from './LineGradients/index'
 
-export default [LineCommonConfig, LineGradientSingleConfig, LineGradientsConfig]
+export default [LineCommonConfig, LineLinearSingleConfig, LineGradientSingleConfig, LineGradientsConfig]

src/packages/components/Charts/Maps/MapChina/config.ts

@@ -0,0 +1,68 @@
+import { echartOptionProfixHandle, PublicConfigClass } from '@/packages/public'
+import { MapChinaConfig } from './index'
+import { chartInitConfig } from '@/settings/designSetting'
+import { CreateComponentType } from '@/packages/index.d'
+import dataJson from './data.json'
+
+export const includes = []
+
+export const option = {
+  dataset: dataJson,
+  tooltip: {
+    show: true,
+    trigger: 'item'
+  },
+  geo: {
+    show: false,
+    type: 'map',
+    roam: false,
+    map: 'china'
+  },
+  series: [
+    {
+      type: 'effectScatter',
+      coordinateSystem: 'geo',
+      symbolSize: 6,
+      zlevel: 1,
+      label: {
+        show: false
+      },
+      itemStyle: {
+        shadowBlur: 10,
+        color: '#00ECC8'
+      },
+      data: []
+    },
+    {
+      name: '地图',
+      type: 'map',
+      map: 'china',
+      zoom: 1, //缩放
+      itemStyle: {
+        // 背景色
+        areaColor: 'rgba(117, 236, 170, 0.3)',
+        emphasis: {
+          areaColor: 'rgba(117, 236, 170, .8)',
+          borderWidth: 1,
+          shadowBlur: 10,
+          shadowColor: '#75ecaa'
+        },
+        color: '#ffffff',
+        borderColor: '#75ecaa',
+        borderWidth: 1,
+        showHainanIsLands: true // 是否显示南海群岛
+      },
+      label: {
+        show: true,
+        color: '#ffffff'
+      },
+      data: []
+    }
+  ]
+}
+export default class Config extends PublicConfigClass implements CreateComponentType {
+  public key: string = MapChinaConfig.key
+  public attr = { ...chartInitConfig, w: 750, h: 800, zIndex: -1 }
+  public chartConfig = MapChinaConfig
+  public option = echartOptionProfixHandle(option, includes)
+}

src/packages/components/Charts/Maps/MapChina/config.vue

@@ -0,0 +1,80 @@
+<template>
+  <!-- Echarts 全局设置 -->
+  <global-setting :optionData="optionData"></global-setting>
+  <CollapseItem name="地图" :expanded="true">
+    <SettingItemBox name="省份" :alone="true">
+      <SettingItem name="背景颜色">
+        <n-color-picker
+          size="small"
+          :modes="['hex']"
+          v-model:value="seriesList[1].itemStyle.areaColor"
+        ></n-color-picker>
+      </SettingItem>
+      <SettingItem name="聚焦颜色（预览可见）">
+        <n-color-picker
+          size="small"
+          :modes="['hex']"
+          v-model:value="seriesList[1].itemStyle.emphasis.areaColor"
+        ></n-color-picker>
+      </SettingItem>
+      <SettingItem name="聚焦阴影（预览可见）">
+        <n-color-picker
+          size="small"
+          :modes="['hex']"
+          v-model:value="seriesList[1].itemStyle.emphasis.shadowColor"
+        ></n-color-picker>
+      </SettingItem>
+    </SettingItemBox>
+    <SettingItemBox name="边框">
+      <SettingItem name="颜色">
+        <n-color-picker
+          size="small"
+          :modes="['hex']"
+          v-model:value="seriesList[1].itemStyle.borderColor"
+        ></n-color-picker>
+      </SettingItem>
+      <SettingItem name="大小">
+        <n-input-number
+          v-model:value="seriesList[1].itemStyle.borderWidth"
+          :min="1"
+          size="small"
+          placeholder="请输入边框大小"
+        ></n-input-number>
+      </SettingItem>
+    </SettingItemBox>
+    <SettingItemBox name="其他">
+      <SettingItem>
+        <n-checkbox v-model:checked="seriesList[1].itemStyle.showHainanIsLands" size="small">显示南海群岛</n-checkbox>
+      </SettingItem>
+    </SettingItemBox>
+  </CollapseItem>
+  <CollapseItem name="标记" :expanded="true">
+    <SettingItemBox name="样式">
+      <SettingItem name="大小">
+        <n-input-number v-model:value="seriesList[0].symbolSize" size="small" :min="0"></n-input-number>
+      </SettingItem>
+      <SettingItem name="颜色">
+        <n-color-picker size="small" :modes="['hex']" v-model:value="seriesList[0].itemStyle.color"></n-color-picker>
+      </SettingItem>
+    </SettingItemBox>
+  </CollapseItem>
+</template>
+
+<script setup lang="ts">
+import { PropType, computed } from 'vue'
+import { CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
+import { lineConf } from '@/packages/chartConfiguration/echarts/index'
+import { GlobalThemeJsonType } from '@/settings/chartThemes/index'
+import { GlobalSetting } from '@/components/Pages/ChartItemSetting'
+
+const props = defineProps({
+  optionData: {
+    type: Object as PropType<GlobalThemeJsonType>,
+    required: true
+  }
+})
+
+const seriesList = computed(() => {
+  return props.optionData.series
+})
+</script>

src/packages/components/Charts/Maps/MapChina/data.json

@@ -0,0 +1,146 @@
+{
+  "point": [
+    {
+      "name": "北京",
+      "value": [116.2, 39.56, 1000]
+    }
+  ],
+  "map": [
+    {
+      "name": "北京市",
+      "value": 100
+    },
+    {
+      "name": "天津市",
+      "value": 99
+    },
+    {
+      "name": "河北省",
+      "value": 98
+    },
+    {
+      "name": "山西省",
+      "value": 97
+    },
+    {
+      "name": "内蒙古自治区",
+      "value": 96
+    },
+    {
+      "name": "辽宁省",
+      "value": 95
+    },
+    {
+      "name": "吉林省",
+      "value": 94
+    },
+    {
+      "name": "黑龙江省",
+      "value": 93
+    },
+    {
+      "name": "上海市",
+      "value": 92
+    },
+    {
+      "name": "江苏省",
+      "value": 91
+    },
+    {
+      "name": "浙江省",
+      "value": 90
+    },
+    {
+      "name": "安徽省",
+      "value": 89
+    },
+    {
+      "name": "福建省",
+      "value": 88
+    },
+    {
+      "name": "江西省",
+      "value": 87
+    },
+    {
+      "name": "山东省",
+      "value": 86
+    },
+    {
+      "name": "河南省",
+      "value": 85
+    },
+    {
+      "name": "湖北省",
+      "value": 84
+    },
+    {
+      "name": "湖南省",
+      "value": 83
+    },
+    {
+      "name": "广东省",
+      "value": 82
+    },
+    {
+      "name": "广西壮族自治区",
+      "value": 81
+    },
+    {
+      "name": "海南省",
+      "value": 80
+    },
+    {
+      "name": "重庆市",
+      "value": 79
+    },
+    {
+      "name": "四川省",
+      "value": 78
+    },
+    {
+      "name": "贵州省",
+      "value": 77
+    },
+    {
+      "name": "云南省",
+      "value": 76
+    },
+    {
+      "name": "西藏自治区",
+      "value": 75
+    },
+    {
+      "name": "陕西省",
+      "value": 74
+    },
+    {
+      "name": "甘肃省",
+      "value": 73
+    },
+    {
+      "name": "青海省",
+      "value": 72
+    },
+    {
+      "name": "宁夏回族自治区",
+      "value": 71
+    },
+    {
+      "name": "新疆维吾尔自治区",
+      "value": 70
+    },
+    {
+      "name": "台湾省",
+      "value": 69
+    },
+    {
+      "name": "香港特别行政区",
+      "value": 68
+    },
+    {
+      "name": "澳门特别行政区",
+      "value": 67
+    }
+  ]
+}

src/packages/components/Charts/Maps/MapChina/index.ts

@@ -1,14 +1,15 @@
 import image from '@/assets/images/chart/charts/map.png'
-import { ConfigType, PackagesCategoryEnum } from '@/packages/index.d'
+import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'
 import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'
 
-export const MapChineConfig: ConfigType = {
-  key: 'MapChine',
-  chartKey: 'VMapChine',
-  conKey: 'VCMapChine',
-  title: '北京地图',
+export const MapChinaConfig: ConfigType = {
+  key: 'MapChina',
+  chartKey: 'VMapChina',
+  conKey: 'VCMapChina',
+  title: '地图',
   category: ChatCategoryEnum.MAP,
   categoryName: ChatCategoryEnumName.MAP,
   package: PackagesCategoryEnum.CHARTS,
+  chartFrame: ChartFrameEnum.COMMON,
   image
 }

src/packages/components/Charts/Maps/MapChina/index.vue

@@ -0,0 +1,94 @@
+<template>
+  <v-chart ref="vChartRef" :theme="themeColor" :option="option.value" :manual-update="isPreview()" autoresize>
+  </v-chart>
+</template>
+
+<script setup lang="ts">
+import { PropType, reactive, watch } from 'vue'
+import config, { includes } from './config'
+import VChart from 'vue-echarts'
+import { use, registerMap } from 'echarts/core'
+import { EffectScatterChart, MapChart } from 'echarts/charts'
+import { CanvasRenderer } from 'echarts/renderers'
+import { useChartDataFetch } from '@/hooks'
+import { mergeTheme } from '@/packages/public/chart'
+import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
+import { isPreview } from '@/utils'
+import mapJson from './map.json'
+import mapJsonWithoutHainanIsLands from './mapWithoutHainanIsLands.json'
+import { DatasetComponent, GridComponent, TooltipComponent, LegendComponent, GeoComponent } from 'echarts/components'
+
+const props = defineProps({
+  themeSetting: {
+    type: Object,
+    required: true
+  },
+  themeColor: {
+    type: Object,
+    required: true
+  },
+  chartConfig: {
+    type: Object as PropType<config>,
+    required: true
+  }
+})
+
+use([
+  MapChart,
+  DatasetComponent,
+  CanvasRenderer,
+  GridComponent,
+  TooltipComponent,
+  LegendComponent,
+  GeoComponent,
+  EffectScatterChart
+])
+
+registerMap('china', { geoJSON: mapJson as any, specialAreas: {} })
+
+const option = reactive({
+  value: mergeTheme(props.chartConfig.option, props.themeSetting, includes)
+})
+
+const dataSetHandle = (dataset: any) => {
+  props.chartConfig.option.series.forEach((item: any) => {
+    if (item.type === 'effectScatter' && dataset.point) item.data = dataset.point
+    else if (item.type === 'map' && dataset.point) item.data = dataset.map
+    option.value = props.chartConfig.option
+  })
+}
+
+const mapTypeHandle = (show: boolean) => {
+  show
+    ? registerMap('china', { geoJSON: mapJson as any, specialAreas: {} })
+    : registerMap('china', { geoJSON: mapJsonWithoutHainanIsLands as any, specialAreas: {} })
+  option.value = props.chartConfig.option
+}
+
+watch(
+  () => props.chartConfig.option.series[1].itemStyle.showHainanIsLands,
+  newData => {
+    mapTypeHandle(newData)
+  },
+  {
+    deep: true,
+    immediate: true
+  }
+)
+
+watch(
+  () => props.chartConfig.option.dataset,
+  newData => {
+    dataSetHandle(newData)
+  },
+  {
+    immediate: true,
+    deep: false
+  }
+)
+
+// 预览
+useChartDataFetch(props.chartConfig, useChartEditStore, (newData: any) => {
+  dataSetHandle(newData)
+})
+</script>

src/packages/components/Charts/Maps/MapChine/config.vue

@@ -1,6 +0,0 @@
-<template>
-</template>
-
-<script setup lang="ts">
-
-</script>

src/packages/components/Charts/Maps/MapChine/index.vue

@@ -1,13 +0,0 @@
-<template>
-  <div>
-    line组件渲染
-  </div>
-</template>
-
-<script setup lang="ts">
-
-</script>
-
-<style lang="scss" scoped>
-
-</style>

src/packages/components/Charts/Maps/index.ts

@@ -1,3 +1,3 @@
-import { MapChineConfig } from './MapChine/index'
+import { MapChinaConfig } from './MapChina/index'
 
-export default [MapChineConfig]
+export default [MapChinaConfig]

src/packages/components/Charts/Mores/Funnel/config.ts

@@ -0,0 +1,62 @@
+import { echartOptionProfixHandle, PublicConfigClass } from '@/packages/public'
+import { FunnelConfig } from './index'
+import { CreateComponentType } from '@/packages/index.d'
+import cloneDeep from 'lodash/cloneDeep'
+import dataJson from './data.json'
+
+export const includes = ['legend']
+
+// 排序枚举
+export const FunnelOrderEnumList = [
+  { label: '倒三角', value: 'descending' },
+  { label: '正三角', value: 'ascending' }
+]
+// 标签位置枚举
+export const FunnelLabelPositionEnumList = [
+  { label: '内部', value: 'inside' },
+  { label: '外部', value: 'outside' },
+  { label: '内部左侧', value: 'insideLeft' },
+  { label: '内部右侧', value: 'insideRight' }
+]
+
+export const option = {
+  tooltip: {},
+  legend: {},
+  dataset: { ...dataJson },
+  series: [
+    {
+      name: 'Funnel',
+      type: 'funnel',
+      top: 70,
+      left: '10%',
+      width: '80%',
+      min: 0,
+      minSize: '0%',
+      maxSize: '100%',
+      sort: 'descending', // descending | ascending
+      gap: 5,
+      label: {
+        show: true,
+        position: 'inside',
+        fontSize: 12
+      },
+      itemStyle: {
+        borderColor: '#fff',
+        borderWidth: 0
+      },
+      emphasis: {
+        label: {
+          fontSize: 20
+        }
+      }
+    }
+  ]
+}
+
+export default class Config extends PublicConfigClass implements CreateComponentType {
+  public key: string = FunnelConfig.key
+  public chartConfig = cloneDeep(FunnelConfig)
+
+  // 图表配置项
+  public option = echartOptionProfixHandle(option, includes)
+}

src/packages/components/Charts/Mores/Funnel/config.vue

@@ -1,6 +1,67 @@
 <template>
+  <!-- Echarts 全局设置 -->
+  <global-setting :optionData="optionData"> </global-setting>
+  <!-- 漏斗图 -->
+  <collapse-item v-for="(item, index) in seriesList" :key="index" :name="`漏斗图`" expanded>
+    <setting-item-box name="排序" alone>
+      <setting-item>
+        <n-select v-model:value="item.sort" :options="FunnelOrderEnumList" size="small" />
+      </setting-item>
+    </setting-item-box>
+
+    <SettingItemBox name="范围" :alone="true">
+      <setting-item :name="`顶部距离：${item.top}px`">
+        <n-slider v-model:value="item.top" :min="0" :max="300" :format-tooltip="sliderFormatTooltip"></n-slider>
+      </setting-item>
+    </SettingItemBox>
+
+    <setting-item-box name="区块">
+      <setting-item name="边框大小">
+        <n-input-number v-model:value="item.itemStyle.borderWidth" :min="0" :max="10" size="small" />
+      </setting-item>
+      <setting-item name="边框颜色">
+        <n-color-picker v-model:value="item.itemStyle.borderColor" :modes="['hex']" size="small" />
+      </setting-item>
+      <setting-item name="间隔">
+        <n-input-number v-model:value="item.gap" :min="0" :max="20" size="small" />
+      </setting-item>
+    </setting-item-box>
+
+    <setting-item-box name="标签">
+      <setting-item name="是否显示">
+        <n-checkbox v-model:checked="item.label.show" size="small">标签</n-checkbox>
+      </setting-item>
+      <setting-item name="位置">
+        <n-select v-model:value="item.label.position" :options="FunnelLabelPositionEnumList" size="small" />
+      </setting-item>
+      <setting-item name="大小">
+        <n-input-number v-model:value="item.label.fontSize" :min="0" size="small" />
+      </setting-item>
+      <setting-item name="悬停时大小">
+        <n-input-number v-model:value="item.emphasis.label.fontSize" :min="0" size="small" />
+      </setting-item>
+    </setting-item-box>
+  </collapse-item>
 </template>
 
 <script setup lang="ts">
+import { PropType, computed } from 'vue'
+import { GlobalSetting, CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
+import { GlobalThemeJsonType } from '@/settings/chartThemes/index'
+import { option, FunnelOrderEnumList, FunnelLabelPositionEnumList } from './config'
 
+const props = defineProps({
+  optionData: {
+    type: Object as PropType<typeof option & GlobalThemeJsonType>,
+    required: true
+  }
+})
+
+const seriesList = computed(() => {
+  return props.optionData.series
+})
+
+const sliderFormatTooltip = (v: number) => {
+  return `${v}px`
+}
 </script>

src/packages/components/Charts/Mores/Funnel/data.json

@@ -0,0 +1,10 @@
+{
+  "dimensions": ["product", "dataOne"],
+  "source": [
+    { "product": "data1", "dataOne": 20 },
+    { "product": "data2", "dataOne": 40 },
+    { "product": "data3", "dataOne": 60 },
+    { "product": "data4", "dataOne": 80 },
+    { "product": "data5", "dataOne": 100 }
+  ]
+}

src/packages/components/Charts/Mores/Funnel/index.ts

@@ -1,5 +1,5 @@
 import image from '@/assets/images/chart/charts/funnel.png'
-import { ConfigType, PackagesCategoryEnum } from '@/packages/index.d'
+import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'
 import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'
 
 export const FunnelConfig: ConfigType = {
@@ -10,5 +10,6 @@ export const FunnelConfig: ConfigType = {
   category: ChatCategoryEnum.MORE,
   categoryName: ChatCategoryEnumName.MORE,
   package: PackagesCategoryEnum.CHARTS,
+  chartFrame: ChartFrameEnum.ECHARTS,
   image
 }

src/packages/components/Charts/Mores/Funnel/index.vue

@@ -1,13 +1,41 @@
 <template>
-  <div>
-    水波
-  </div>
+  <v-chart ref="vChartRef" :theme="themeColor" :option="option" :manual-update="isPreview()" autoresize></v-chart>
 </template>
 
 <script setup lang="ts">
+import { computed, PropType } from 'vue'
+import VChart from 'vue-echarts'
+import { use } from 'echarts/core'
+import { CanvasRenderer } from 'echarts/renderers'
+import { FunnelChart } from 'echarts/charts'
+import { includes } from './config'
+import { mergeTheme } from '@/packages/public/chart'
+import { useChartDataFetch } from '@/hooks'
+import { CreateComponentType } from '@/packages/index.d'
+import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
+import { isPreview } from '@/utils'
+import { DatasetComponent, GridComponent, TooltipComponent, LegendComponent } from 'echarts/components'
 
+const props = defineProps({
+  themeSetting: {
+    type: Object,
+    required: true
+  },
+  themeColor: {
+    type: Object,
+    required: true
+  },
+  chartConfig: {
+    type: Object as PropType<CreateComponentType>,
+    required: true
+  }
+})
+
+use([DatasetComponent, CanvasRenderer, FunnelChart, GridComponent, TooltipComponent, LegendComponent])
+
+const option = computed(() => {
+  return mergeTheme(props.chartConfig.option, props.themeSetting, includes)
+})
+
+const { vChartRef } = useChartDataFetch(props.chartConfig, useChartEditStore)
 </script>
-
-<style lang="scss" scoped>
-
-</style>

src/packages/components/Charts/Mores/Heatmap/config.ts

@@ -0,0 +1,61 @@
+import { echartOptionProfixHandle, PublicConfigClass } from '@/packages/public'
+import { HeatmapConfig } from './index'
+import { CreateComponentType } from '@/packages/index.d'
+import { cloneDeep } from 'lodash'
+import dataJson from './data.json'
+
+export const includes = ['xAxis', 'yAxis']
+
+export const option = {
+  dataset: { ...dataJson },
+  tooltip: {
+    position: 'top'
+  },
+  xAxis: {
+    data: dataJson.xAxis
+  },
+  yAxis: {
+    data: dataJson.yAxis
+  },
+  visualMap: {
+    show: true,
+    min: 0,
+    max: 10,
+    itemWidth: 20,
+    itemHeight: 140,
+    calculable: true,
+    orient: 'horizontal',
+    inRange: {
+      // 高 -> 低
+      color: ['#4661c2', '#263253']
+    }
+  },
+  series: [
+    {
+      name: '',
+      type: 'heatmap',
+      data: dataJson.seriesData,
+      label: {
+        show: true
+      },
+      emphasis: {
+        itemStyle: {
+          borderColor: '#333',
+          borderWidth: 1,
+          shadowBlur: 10,
+          shadowColor: 'rgba(0, 0, 0, 0.5)'
+        }
+      },
+      progressive: 1000,
+      animation: false
+    }
+  ]
+}
+
+export default class Config extends PublicConfigClass implements CreateComponentType {
+  public key: string = HeatmapConfig.key
+  public chartConfig = cloneDeep(HeatmapConfig)
+
+  // 图表配置项
+  public option = echartOptionProfixHandle(option, includes)
+}

src/packages/components/Charts/Mores/Heatmap/config.vue

@@ -1,6 +1,24 @@
 <template>
+  <div>
+    <global-setting :optionData="optionData"></global-setting>
+  </div>
 </template>
 
 <script setup lang="ts">
+  import { PropType, computed } from 'vue'
+import { GlobalSetting } from '@/components/Pages/ChartItemSetting'
+import { option } from './config'
+import { GlobalThemeJsonType } from '@/settings/chartThemes/index'
+
+const props = defineProps({
+  optionData: {
+    type: Object as PropType<typeof option & GlobalThemeJsonType>,
+      required: true
+  }
+})
+
+const heatMapConfig = computed<typeof option>(() => {
+  return props.optionData
+})
 
 </script>

src/packages/components/Charts/Mores/Heatmap/data.json

@@ -0,0 +1,199 @@
+{
+  "xAxis": [
+    "12a",
+    "1a",
+    "2a",
+    "3a",
+    "4a",
+    "5a",
+    "6a",
+    "7a",
+    "8a",
+    "9a",
+    "10a",
+    "11a",
+    "12p",
+    "1p",
+    "2p",
+    "3p",
+    "4p",
+    "5p",
+    "6p",
+    "7p",
+    "8p",
+    "9p",
+    "10p",
+    "11p"
+  ],
+  "yAxis": ["Saturday", "Friday", "Thursday", "Wednesday", "Tuesday", "Monday", "Sunday"],
+  "seriesData": [
+    [0, 0, 5],
+    [1, 0, 1],
+    [2, 0, "-"],
+    [3, 0, "-"],
+    [4, 0, "-"],
+    [5, 0, "-"],
+    [6, 0, "-"],
+    [7, 0, "-"],
+    [8, 0, "-"],
+    [9, 0, "-"],
+    [10, 0, "-"],
+    [11, 0, 2],
+    [12, 0, 4],
+    [13, 0, 1],
+    [14, 0, 1],
+    [15, 0, 3],
+    [16, 0, 4],
+    [17, 0, 6],
+    [18, 0, 4],
+    [19, 0, 4],
+    [20, 0, 3],
+    [21, 0, 3],
+    [22, 0, 2],
+    [23, 0, 5],
+    [0, 1, 7],
+    [1, 1, "-"],
+    [2, 1, "-"],
+    [3, 1, "-"],
+    [4, 1, "-"],
+    [5, 1, "-"],
+    [6, 1, "-"],
+    [7, 1, "-"],
+    [8, 1, "-"],
+    [9, 1, "-"],
+    [10, 1, 5],
+    [11, 1, 2],
+    [12, 1, 2],
+    [13, 1, 6],
+    [14, 1, 9],
+    [15, 1, 11],
+    [16, 1, 6],
+    [17, 1, 7],
+    [18, 1, 8],
+    [19, 1, 12],
+    [20, 1, 5],
+    [21, 1, 5],
+    [22, 1, 7],
+    [23, 1, 2],
+    [0, 2, 1],
+    [1, 2, 1],
+    [2, 2, "-"],
+    [3, 2, "-"],
+    [4, 2, "-"],
+    [5, 2, "-"],
+    [6, 2, "-"],
+    [7, 2, "-"],
+    [8, 2, "-"],
+    [9, 2, "-"],
+    [10, 2, 3],
+    [11, 2, 2],
+    [12, 2, 1],
+    [13, 2, 9],
+    [14, 2, 8],
+    [15, 2, 10],
+    [16, 2, 6],
+    [17, 2, 5],
+    [18, 2, 5],
+    [19, 2, 5],
+    [20, 2, 7],
+    [21, 2, 4],
+    [22, 2, 2],
+    [23, 2, 4],
+    [0, 3, 7],
+    [1, 3, 3],
+    [2, 3, "-"],
+    [3, 3, "-"],
+    [4, 3, "-"],
+    [5, 3, "-"],
+    [6, 3, "-"],
+    [7, 3, "-"],
+    [8, 3, 1],
+    [9, 3, "-"],
+    [10, 3, 5],
+    [11, 3, 4],
+    [12, 3, 7],
+    [13, 3, 14],
+    [14, 3, 13],
+    [15, 3, 12],
+    [16, 3, 9],
+    [17, 3, 5],
+    [18, 3, 5],
+    [19, 3, 10],
+    [20, 3, 6],
+    [21, 3, 4],
+    [22, 3, 4],
+    [23, 3, 1],
+    [0, 4, 1],
+    [1, 4, 3],
+    [2, 4, "-"],
+    [3, 4, "-"],
+    [4, 4, "-"],
+    [5, 4, 1],
+    [6, 4, "-"],
+    [7, 4, "-"],
+    [8, 4, "-"],
+    [9, 4, 2],
+    [10, 4, 4],
+    [11, 4, 4],
+    [12, 4, 2],
+    [13, 4, 4],
+    [14, 4, 4],
+    [15, 4, 14],
+    [16, 4, 12],
+    [17, 4, 1],
+    [18, 4, 8],
+    [19, 4, 5],
+    [20, 4, 3],
+    [21, 4, 7],
+    [22, 4, 3],
+    [23, 4, "-"],
+    [0, 5, 2],
+    [1, 5, 1],
+    [2, 5, "-"],
+    [3, 5, 3],
+    [4, 5, "-"],
+    [5, 5, "-"],
+    [6, 5, "-"],
+    [7, 5, "-"],
+    [8, 5, 2],
+    [9, 5, "-"],
+    [10, 5, 4],
+    [11, 5, 1],
+    [12, 5, 5],
+    [13, 5, 10],
+    [14, 5, 5],
+    [15, 5, 7],
+    [16, 5, 11],
+    [17, 5, 6],
+    [18, 5, "-"],
+    [19, 5, 5],
+    [20, 5, 3],
+    [21, 5, 4],
+    [22, 5, 2],
+    [23, 5, "-"],
+    [0, 6, 1],
+    [1, 6, "-"],
+    [2, 6, "-"],
+    [3, 6, "-"],
+    [4, 6, "-"],
+    [5, 6, "-"],
+    [6, 6, "-"],
+    [7, 6, "-"],
+    [8, 6, "-"],
+    [9, 6, "-"],
+    [10, 6, 1],
+    [11, 6, "-"],
+    [12, 6, 2],
+    [13, 6, 1],
+    [14, 6, 3],
+    [15, 6, 4],
+    [16, 6, "-"],
+    [17, 6, "-"],
+    [18, 6, "-"],
+    [19, 6, "-"],
+    [20, 6, 1],
+    [21, 6, 2],
+    [22, 6, 2],
+    [23, 6, 6]
+  ]
+}

src/packages/components/Charts/Mores/Heatmap/index.ts

@@ -1,5 +1,5 @@
 import image from '@/assets/images/chart/charts/heatmap.png'
-import { ConfigType, PackagesCategoryEnum } from '@/packages/index.d'
+import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'
 import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'
 
 export const HeatmapConfig: ConfigType = {
@@ -10,5 +10,6 @@ export const HeatmapConfig: ConfigType = {
   category: ChatCategoryEnum.MORE,
   categoryName: ChatCategoryEnumName.MORE,
   package: PackagesCategoryEnum.CHARTS,
+  chartFrame: ChartFrameEnum.COMMON,
   image
 }

src/packages/components/Charts/Mores/Heatmap/index.vue

@@ -1,13 +1,88 @@
 <template>
-  <div>
-    水波
-  </div>
+  <v-chart ref="vChartRef" :theme="themeColor" :option="option" :manual-update="isPreview()" autoresize></v-chart>
 </template>
 
 <script setup lang="ts">
+import { ref, watch, computed, PropType } from 'vue'
+import VChart from 'vue-echarts'
+import dataJson from './data.json'
+import { use } from 'echarts/core'
+import { CanvasRenderer } from 'echarts/renderers'
+import { HeatmapChart } from 'echarts/charts'
+import { includes } from './config'
+import { mergeTheme } from '@/packages/public/chart'
+import { useChartDataFetch } from '@/hooks'
+import { CreateComponentType } from '@/packages/index.d'
+import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
+import { isPreview } from '@/utils'
+import {
+  DatasetComponent,
+  GridComponent,
+  TooltipComponent,
+  LegendComponent,
+  VisualMapComponent
+} from 'echarts/components'
 
+const props = defineProps({
+  themeSetting: {
+    type: Object,
+    required: true
+  },
+  themeColor: {
+    type: Object,
+    required: true
+  },
+  chartConfig: {
+    type: Object as PropType<CreateComponentType>,
+    required: true
+  }
+})
+
+use([
+  DatasetComponent,
+  CanvasRenderer,
+  HeatmapChart,
+  GridComponent,
+  TooltipComponent,
+  LegendComponent,
+  VisualMapComponent
+])
+
+const option = computed(() => {
+  return mergeTheme(props.chartConfig.option, props.themeSetting, includes)
+})
+
+const vChartRef = ref<typeof VChart>()
+
+const dataSetHandle = (dataset: typeof dataJson) => {
+  const { seriesData, xAxis, yAxis } = dataset
+  if (xAxis) {
+    // @ts-ignore
+    props.chartConfig.option.xAxis.data = xAxis
+  }
+  if (yAxis) {
+    // @ts-ignore
+    props.chartConfig.option.yAxis.data = yAxis
+  }
+  if (seriesData) {
+    props.chartConfig.option.series[0].data = seriesData
+  }
+  if (vChartRef.value && isPreview()) {
+    vChartRef.value.setOption(props.chartConfig.option)
+  }
+}
+
+watch(
+  () => props.chartConfig.option.dataset,
+  newData => {
+    dataSetHandle(newData)
+  },
+  {
+    deep: false
+  }
+)
+
+useChartDataFetch(props.chartConfig, useChartEditStore, (newData: typeof dataJson) => {
+  dataSetHandle(newData)
+})
 </script>
-
-<style lang="scss" scoped>
-
-</style>

src/packages/components/Charts/Mores/Point/config.vue

@@ -1,6 +0,0 @@
-<template>
-</template>
-
-<script setup lang="ts">
-
-</script>

src/packages/components/Charts/Mores/Point/index.ts

@@ -1,14 +0,0 @@
-import image from '@/assets/images/chart/charts/Point.png'
-import { ConfigType, PackagesCategoryEnum } from '@/packages/index.d'
-import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'
-
-export const PointConfig: ConfigType = {
-  key: 'Point',
-  chartKey: 'VPoint',
-  conKey: 'VCPoint',
-  title: '热力图',
-  category: ChatCategoryEnum.MORE,
-  categoryName: ChatCategoryEnumName.MORE,
-  package: PackagesCategoryEnum.CHARTS,
-  image
-}

src/packages/components/Charts/Mores/Point/index.vue

@@ -1,13 +0,0 @@
-<template>
-  <div>
-    水波
-  </div>
-</template>
-
-<script setup lang="ts">
-
-</script>
-
-<style lang="scss" scoped>
-
-</style>

src/packages/components/Charts/Mores/Process/config.ts

@@ -1,4 +1,4 @@
-import { publicConfig } from '@/packages/public'
+import { PublicConfigClass } from '@/packages/public'
 import { CreateComponentType } from '@/packages/index.d'
 import { ProcessConfig } from './index'
 import { chartInitConfig } from '@/settings/designSetting'
@@ -53,7 +53,7 @@ export const option = {
   offsetDegree: 0
 }
 
-export default class Config extends publicConfig implements CreateComponentType {
+export default class Config extends PublicConfigClass implements CreateComponentType {
   public key = ProcessConfig.key
   public attr = { ...chartInitConfig, h: 500, zIndex: -1 }
   public chartConfig = cloneDeep(ProcessConfig)