fix: 修复导入组件数据会错乱的问题

Merge pull request !72 from 关宏荣/dev

.eslintrc.js

@@ -9,16 +9,22 @@ 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',
+    'no-unused-vars': 'off',
+    'vue/no-unused-vars': 'off',
+    'vue/multi-word-component-names': 'off',
+    'vue/valid-template-root': 'off',
+    'vue/no-mutating-props': 'off'
+  }
+}

index.css

@@ -82,25 +82,4 @@
   to {
     opacity: 1;
   }
-}
-
-/* 小屏处理 0~1000*/
-.mobile-terminal {
-  display: none;
-}
-@media (max-width: 1000px) {
-  #app {
-    display: none;
-  }
-  .mobile-terminal {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    width: 100vw;
-    height: 100vh;
-    text-align: center;
-    font-size: 24px;
-    font-weight: 200;
-    background-image: linear-gradient(to top, #fff1eb 0%, #ace0f9 100%);
-  }
 }

index.html

@@ -24,9 +24,6 @@
         </div>
       </div>
     </div>
-    <div class="mobile-terminal">
-      <p>请使用 Web 端进行查看</p>
-    </div>
     <script type="module" src="/src/main.ts"></script>
   </body>
 </html>

package.json

@@ -1,12 +1,14 @@
 {
   "name": "go-view",
-  "version": "2.0.5",
+  "version": "2.0.91",
   "scripts": {
     "dev": "vite --host",
     "build": "vue-tsc --noEmit && vite build",
     "preview": "vite preview",
     "new": "plop --plopfile ./plop/plopfile.js",
-    "postinstall": "husky install"
+    "postinstall": "husky install",
+    "lint": "eslint --ext .js,.jsx,.ts,.tsx,.vue src",
+    "lint:fix": "eslint --ext .js,.jsx,.ts,.tsx,.vue src --fix"
   },
   "dependencies": {
     "@types/color": "^3.0.3",
@@ -18,11 +20,13 @@
     "color": "^4.2.3",
     "crypto-js": "^4.1.1",
     "echarts-liquidfill": "^3.1.0",
+    "echarts-stat": "^1.2.0",
+    "echarts-wordcloud": "^2.0.0",
     "highlight.js": "^11.5.0",
     "html2canvas": "^1.4.1",
     "keymaster": "^1.6.2",
     "monaco-editor": "^0.33.0",
-    "naive-ui": "2.30.3",
+    "naive-ui": "2.33.4",
     "pinia": "^2.0.13",
     "screenfull": "^6.0.1",
     "vue": "^3.2.31",
@@ -60,7 +64,7 @@
     "prettier": "^2.6.2",
     "sass": "^1.49.11",
     "sass-loader": "^12.6.0",
-    "typescript": "^4.6.3",
+    "typescript": "4.6.3",
     "vite": "2.9.9",
     "vite-plugin-compression": "^0.5.1",
     "vite-plugin-importer": "^0.2.5",

src/api/axios.ts

@@ -1,5 +1,5 @@
 import axios, { AxiosResponse, AxiosRequestConfig } from 'axios'
-import { ResultEnum, RequestHttpHeaderEnum } from "@/enums/httpEnum"
+import { ResultEnum } from "@/enums/httpEnum"
 import { PageEnum, ErrorPageNameMap } from "@/enums/pageEnum"
 import { StorageEnum } from '@/enums/storageEnum'
 import { axiosPre } from '@/settings/httpSetting'
@@ -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] || 'token']: userInfo[SystemStoreUserInfoEnum.USER_TOKEN] || ''
     }
     return config
   },
@@ -63,7 +64,6 @@ axiosInstance.interceptors.response.use(
     return Promise.resolve(res.data)
   },
   (err: AxiosResponse) => {
-    httpErrorHandle()
     Promise.reject(err)
   }
 )

src/api/http.ts

@@ -80,6 +80,32 @@ export const http = (type?: RequestHttpEnum) => {
       return get
   }
 }
+const prefix = 'javascript:'
+// 对输入字符进行转义处理
+export const translateStr = (target: string | object) => {
+  if (typeof target === 'string') {
+    if (target.startsWith(prefix)) {
+      const funcStr = target.split(prefix)[1]
+      let result;
+      try {
+        result = new Function(`${funcStr}`)()
+      } catch (error) {
+        console.log(error)
+        window['$message'].error('js内容解析有误！')
+      }
+      return result
+    } else {
+      return target
+    }
+  }
+  for (const key in target) {
+    if (Object.prototype.hasOwnProperty.call(target, key)) {
+      const subTarget = (target as any)[key];
+      (target as any)[key] = translateStr(subTarget)
+    }
+  }
+  return target
+}
 
 /**
  * * 自定义请求
@@ -87,7 +113,7 @@ export const http = (type?: RequestHttpEnum) => {
  * @param globalParams 全局参数
  */
 export const customizeHttp = (targetParams: RequestConfigType, globalParams: RequestGlobalConfigType) => {
-  if(!targetParams || !globalParams) {
+  if (!targetParams || !globalParams) {
     return
   }
 
@@ -125,15 +151,17 @@ export const customizeHttp = (targetParams: RequestConfigType, globalParams: Req
   }
 
   // 处理头部
-  const headers: RequestParamsObjType = {
+  let headers: RequestParamsObjType = {
     ...globalRequestParams.Header,
-    ...targetRequestParams.Header,
+    ...targetRequestParams.Header
   }
+  headers = translateStr(headers)
 
   // data 参数
   let data: RequestParamsObjType | FormData | string = {}
   // params 参数
-  let params: RequestParamsObjType = targetRequestParams.Params
+  let params: RequestParamsObjType = { ...targetRequestParams.Params }
+  params = translateStr(params)
   // form 类型处理
   let formData: FormData = new FormData()
   formData.set('default', 'defaultData')
@@ -145,33 +173,35 @@ export const customizeHttp = (targetParams: RequestConfigType, globalParams: Req
 
     case RequestBodyEnum.JSON:
       headers['Content-Type'] = ContentTypeEnum.JSON
-      data = JSON.parse(targetRequestParams.Body['json'])
+      data = translateStr(JSON.parse(targetRequestParams.Body['json']))
       // json 赋值给 data
       break
 
     case RequestBodyEnum.XML:
       headers['Content-Type'] = ContentTypeEnum.XML
       // xml 字符串赋值给 data
-      data = targetRequestParams.Body['xml']
+      data = translateStr(targetRequestParams.Body['xml'])
       break
 
-    case RequestBodyEnum.X_WWW_FORM_URLENCODED:
+    case RequestBodyEnum.X_WWW_FORM_URLENCODED: {
       headers['Content-Type'] = ContentTypeEnum.FORM_URLENCODED
       const bodyFormData = targetRequestParams.Body['x-www-form-urlencoded']
-      for (const i in bodyFormData) formData.set(i, bodyFormData[i])
+      for (const i in bodyFormData) formData.set(i, translateStr(bodyFormData[i]))
       // FormData 赋值给 data
       data = formData
       break
+    }
 
-    case RequestBodyEnum.FORM_DATA:
+    case RequestBodyEnum.FORM_DATA: {
       headers['Content-Type'] = ContentTypeEnum.FORM_DATA
       const bodyFormUrlencoded = targetRequestParams.Body['form-data']
       for (const i in bodyFormUrlencoded) {
-        formData.set(i, bodyFormUrlencoded[i])
+        formData.set(i, translateStr(bodyFormUrlencoded[i]))
       }
       // FormData 赋值给 data
       data = formData
       break
+    }
   }
 
   // sql 处理
@@ -180,11 +210,17 @@ export const customizeHttp = (targetParams: RequestConfigType, globalParams: Req
     data = requestSQLContent
   }
 
-  return axiosInstance({
-    url: `${requestOriginUrl}${requestUrl}`,
-    method: requestHttpType,
-    data,
-    params,
-    headers
-  })
+  try {
+    const url =  (new Function("return `" + `${requestOriginUrl}${requestUrl}`.trim() + "`"))();
+    return axiosInstance({
+        url,
+        method: requestHttpType,
+        data,
+        params,
+        headers
+    })
+  } catch (error) {
+    console.log(error)
+    window['$message'].error('URL地址格式有误！')
+  }
 }

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,19 @@ 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'
+export const mapUrl = '/mock/map'
+export const wordCloudUrl = '/mock/wordCloud'
+export const treemapUrl = '/mock/treemap'
 
 const mockObject: MockMethod[] = [
   {
@@ -19,6 +26,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 +60,37 @@ 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
+  },
+  {
+    url: mapUrl,
+    method: RequestHttpEnum.GET,
+    response: () => test.fetchMap
+  },
+  {
+    url: wordCloudUrl,
+    method: RequestHttpEnum.GET,
+    response: () => test.fetchWordCloud
+  },
+  {
+    url: treemapUrl,
+    method: RequestHttpEnum.GET,
+    response: () => test.fetchTreemap
+  },
 ]
 
 export default mockObject

src/api/mock/map.json

@@ -0,0 +1,79 @@
+{
+  "point": [
+    {
+      "name": "北京",
+      "value": [116.405285, 39.904989, 200]
+    },
+    {
+      "name": "郑州",
+      "value": [113.665412, 34.757975, 888]
+    },
+    {
+      "name": "青海",
+      "value": [101.778916, 36.623178, 666]
+    },
+    {
+      "name": "宁夏回族自治区",
+      "value": [106.278179, 38.46637, 66]
+    },
+    {
+      "name": "哈尔滨市",
+      "value": [126.642464, 45.756967, 101]
+    }
+  ],
+  "map": [
+    {
+      "name": "北京市",
+      "value": "@integer(0, 1000)"
+    },
+    {
+      "name": "河北省",
+      "value": "@integer(0, 1000)"
+    },
+
+    {
+      "name": "江苏省",
+      "value": "@integer(0, 1000)"
+    },
+    {
+      "name": "福建省",
+      "value": "@integer(0, 1000)"
+    },
+    {
+      "name": "山东省",
+      "value": "@integer(0, 1000)"
+    },
+    {
+      "name": "河南省",
+      "value": "@integer(0, 1000)"
+    },
+    {
+      "name": "湖北省",
+      "value": "@integer(0, 1000)"
+    },
+    {
+      "name": "广西壮族自治区",
+      "value": "@integer(0, 1000)"
+    },
+    {
+      "name": "海南省",
+      "value": "@integer(0, 1000)"
+    },
+    {
+      "name": "青海省",
+      "value": "@integer(0, 1000)"
+    },
+    {
+      "name": "新疆维吾尔自治区",
+      "value": "@integer(0, 1000)"
+    }
+  ],
+  "pieces": [
+    { "gte": 1000, "label": ">1000" },
+    { "gte": 600, "lte": 999, "label": "600-999" },
+    { "gte": 200, "lte": 599, "label": "200-599" },
+    { "gte": 50, "lte": 199, "label": "49-199" },
+    { "gte": 10, "lte": 49, "label": "10-49" },
+    { "lte": 9, "label": "<9" }
+  ]
+}

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,44 @@
+import heatmapJson from './heatMapData.json'
+import scatterJson from './scatter.json'
+import mapJson from './map.json'
+import tTreemapJson from './treemap.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 +119,139 @@ 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
+  },
+  // 中国地图
+  fetchMap: {
+    code: 0,
+    status: 200,
+    msg: '请求成功',
+    data: mapJson
+  },
+  // 词云
+  fetchWordCloud: {
+    code: 0,
+    status: 200,
+    msg: '请求成功',
+    data: [
+      {
+        name: '@name',
+        value: 8000,
+        textStyle: {
+          color: '#78fbb2'
+        },
+        emphasis: {
+          textStyle: {
+            color: 'red'
+          }
+        }
+      },
+      { name: '@name', value: '@integer(10, 8000)' },
+      { name: '@name', value: '@integer(10, 8000)' },
+      { name: '@name', value: '@integer(10, 8000)' },
+      { name: '@name', value: '@integer(10, 8000)' },
+      { name: '@name', value: '@integer(10, 8000)' },
+      { name: '@name', value: '@integer(10, 8000)' },
+      { name: '@name', value: '@integer(10, 8000)' },
+      { name: '@name', value: '@integer(10, 8000)' },
+      { name: '@name', value: '@integer(10, 8000)' },
+      { name: '@name', value: '@integer(10, 8000)' },
+      { name: '@name', value: '@integer(10, 8000)' },
+      { name: '@name', value: '@integer(10, 8000)' },
+      { name: '@name', value: '@integer(10, 8000)' },
+      { name: '@name', value: '@integer(10, 8000)' },
+      { name: '@name', value: '@integer(10, 8000)' },
+      { name: '@name', value: '@integer(10, 8000)' },
+      { name: '@name', value: '@integer(10, 8000)' },
+      { name: '@name', value: '@integer(10, 8000)' },
+      { name: '@name', value: '@integer(10, 8000)' }
+    ]
+  },
+  // 树图
+  fetchTreemap: {
+    code: 0,
+    status: 200,
+    msg: '请求成功',
+    data: tTreemapJson
+  },
 }

src/api/mock/treemap.json

@@ -0,0 +1,50 @@
+[
+  {
+    "name": "@name",
+    "value": "@integer(0, 1000)",
+    "children": [
+      {
+        "name": "@name",
+        "value": "@integer(0, 500)"
+      },
+      {
+        "name": "@name",
+        "value": "@integer(0, 500)"
+      }
+    ]
+  },
+  {
+    "name": "@name",
+    "value": "@integer(0, 1000)",
+    "children": [
+      {
+        "name": "@name",
+        "value": "@integer(0, 00)"
+      },
+      {
+        "name": "@name",
+        "value": "@integer(0, 500)"
+      }
+    ]
+  },
+  {
+    "name": "@name",
+    "value": "@integer(0, 1000)",
+    "children": [
+      {
+        "name": "@name",
+        "value": "@integer(0, 1000)"
+      }
+    ]
+  },
+  {
+    "name": "@name",
+    "value": "@integer(0, 1000)",
+    "children": [
+      {
+        "name": "@name",
+        "value": "@integer(0, 1000)"
+      }
+    ]
+  }
+]

src/components/Flipper/index.ts

@@ -0,0 +1,4 @@
+import Flipper from './index.vue'
+type FlipType = 'up' | 'down'
+
+export { Flipper, FlipType }

src/components/Flipper/index.vue

@@ -0,0 +1,224 @@
+<template>
+  <div class="M-Flipper" :class="[flipType, { go: isFlipping }]">
+    <div class="digital front" :data-front="frontTextFromData"></div>
+    <div class="digital back" :data-back="backTextFromData"></div>
+  </div>
+</template>
+
+<script lang="ts">
+export default {
+  name: 'Flipper'
+}
+</script>
+
+<script lang="ts" setup>
+import { ref, PropType, watch } from 'vue'
+import { FlipType } from '.'
+
+const props = defineProps({
+  flipType: {
+    type: String as PropType<FlipType>,
+    default: () => {
+      return 'down'
+    }
+  },
+  count: {
+    type: [Number, String],
+    default: 0
+  },
+  duration: {
+    type: Number,
+    default: 600
+  },
+  width: {
+    type: Number,
+    default: 60
+  },
+  height: {
+    type: Number,
+    default: 100
+  },
+  radius: {
+    type: Number,
+    default: 10
+  },
+  frontColor: {
+    type: String,
+    default: '#ffffff'
+  },
+  backColor: {
+    type: String,
+    default: '#000000'
+  }
+})
+
+const isFlipping = ref(false)
+const frontTextFromData = ref(props.count || 0)
+const backTextFromData = ref(props.count || 0)
+
+// 翻牌
+const flip = (front: string | number, back: string | number) => {
+  // 如果处于翻转中，则不执行
+  if (isFlipping.value) return
+  // 设置翻盘前后数据
+  backTextFromData.value = back
+  frontTextFromData.value = front
+
+  // 设置翻转状态为true
+  isFlipping.value = true
+
+  // 翻牌结束的行为
+  setTimeout(() => {
+    isFlipping.value = false // 设置翻转状态为false
+    frontTextFromData.value = back
+  }, props.duration)
+}
+
+watch(
+  () => props.count,
+  (newVal, oldVal) => {
+    flip(oldVal as string | number, newVal as string | number)
+  },
+  {
+    immediate: true
+  }
+)
+</script>
+
+<style lang="scss" scoped>
+$frontColor: v-bind('props.frontColor');
+$backColor: v-bind('props.backColor');
+$radius: v-bind('`${props.radius}px`');
+$width: v-bind('`${props.width}px`');
+$height: v-bind('`${props.height}px`');
+$perspective: v-bind('`${props.height * 2}px`');
+$speed: v-bind('`${props.duration / 1000}s`');
+$shadowColor: #000000;
+$lineColor: #4a9ef8;
+
+// #region 动画效果
+@keyframes frontFlipDown {
+  0% {
+    transform: perspective($perspective) rotateX(0deg);
+  }
+  100% {
+    transform: perspective($perspective) rotateX(-180deg);
+  }
+}
+@keyframes backFlipDown {
+  0% {
+    transform: perspective($perspective) rotateX(180deg);
+  }
+  100% {
+    transform: perspective($perspective) rotateX(0deg);
+  }
+}
+@keyframes frontFlipUp {
+  0% {
+    transform: perspective($perspective) rotateX(0deg);
+  }
+  100% {
+    transform: perspective($perspective) rotateX(180deg);
+  }
+}
+@keyframes backFlipUp {
+  0% {
+    transform: perspective($perspective) rotateX(-180deg);
+  }
+  100% {
+    transform: perspective($perspective) rotateX(0deg);
+  }
+}
+// #endregion
+
+.M-Flipper {
+  display: inline-block;
+  position: relative;
+  width: $width;
+  height: $height;
+  line-height: $height;
+  border: solid 1px $backColor;
+  border-radius: $radius;
+  background: $frontColor;
+  font-size: $width;
+  color: $frontColor;
+  box-shadow: 0 0 6px rgba($color: $shadowColor, $alpha: 0.5); // 阴影部分
+  text-align: center;
+  // font-family: 'Helvetica Neue';
+
+  .digital:before,
+  .digital:after {
+    content: '';
+    position: absolute;
+    left: 0;
+    right: 0;
+    background: $backColor;
+    overflow: hidden;
+    box-sizing: border-box;
+  }
+  .digital.front:before,
+  .digital.front:after {
+    content: attr(data-front) !important;
+  }
+  .digital.back:before,
+  .digital.back:after {
+    content: attr(data-back) !important;
+  }
+  .digital:before {
+    top: 0;
+    bottom: 50%;
+    border-radius: $radius $radius 0 0;
+    border-bottom: solid 1px rgba($color: $lineColor, $alpha: 0.3); // 中间线颜色
+  }
+  .digital:after {
+    top: 50%;
+    bottom: 0;
+    border-radius: 0 0 $radius $radius;
+    line-height: 0;
+  }
+  /*向下翻*/
+  &.down .front:before {
+    z-index: 3;
+  }
+  &.down .back:after {
+    z-index: 2;
+    transform-origin: 50% 0%;
+    transform: perspective($perspective) rotateX(180deg);
+  }
+  &.down .front:after,
+  &.down .back:before {
+    z-index: 1;
+  }
+  &.down.go .front:before {
+    transform-origin: 50% 100%;
+    animation: frontFlipDown $speed ease-in-out both;
+    box-shadow: 0 -2px 6px rgba($color: $lineColor, $alpha: 0.3);
+    backface-visibility: hidden;
+  }
+  &.down.go .back:after {
+    animation: backFlipDown $speed ease-in-out both;
+  }
+  /*向上翻*/
+  &.up .front:after {
+    z-index: 3;
+  }
+  &.up .back:before {
+    z-index: 2;
+    transform-origin: 50% 100%;
+    transform: perspective($perspective) rotateX(-180deg);
+  }
+  &.up .front:before,
+  &.up .back:after {
+    z-index: 1;
+  }
+  &.up.go .front:after {
+    transform-origin: 50% 0;
+    animation: frontFlipUp $speed ease-in-out both;
+    box-shadow: 0 2px 6px rgba($color: $lineColor, $alpha: 0.3);
+    backface-visibility: hidden;
+  }
+  &.up.go .back:before {
+    animation: backFlipUp $speed ease-in-out both;
+  }
+}
+</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,
@@ -183,11 +190,14 @@ const handleChange = (e: MouseEvent, item: ListType) => {
     width: 100px;
   }
   .select-min-width {
-    width: 110px;
+    width: 115px;
   }
   @include deep() {
-    .n-list-item:not(:last-child) {
-      border-bottom: 0;
+    .n-list-item {
+      border-bottom: 0!important;
+    }
+    .n-list-item__divider {
+      display: none!important;
     }
   }
 }

src/components/I18n/index.vue

@@ -1,3 +1,4 @@
+<!-- eslint-disable vue/valid-template-root -->
 <template></template>
 
 <script lang="ts" setup>

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,70 @@
           :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.itemWidth" :min="5" size="small"></n-input-number>
+      </setting-item>
+      <setting-item name="高度">
+        <n-input-number v-model:value="visualMap.itemHeight" :min="5" 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>
+  </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 +288,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/StylesSetting.vue

@@ -1,10 +1,13 @@
 <template>
   <div v-show="isGroup">
     <n-divider n-divider style="margin: 10px 0"></n-divider>
-    <n-tag type="warning"> 解散分组「  {{ isCanvas ? '滤镜' : '滤镜 / 变换' }} 」也将消失!</n-tag>
+    <n-tag type="warning"> 解散分组「 {{ isCanvas ? '滤镜' : '滤镜 / 变换' }} 」也将消失!</n-tag>
   </div>
 
   <collapse-item :name="isCanvas ? '滤镜' : '滤镜 / 变换'">
+    <template #header>
+      <n-switch v-model:value="chartStyles.filterShow" size="small"></n-switch>
+    </template>
     <setting-item-box name="色相" :alone="true">
       <setting-item :name="`值：${chartStyles.hueRotate}deg`">
         <!-- 透明度 -->
@@ -66,6 +69,24 @@
       </setting-item>
     </setting-item-box>
 
+    <!-- 混合模式 -->
+    <setting-item-box v-if="!isCanvas" :alone="true">
+      <template #name>
+        <n-text>混合</n-text>
+        <n-tooltip trigger="hover">
+          <template #trigger>
+            <n-icon size="21" :depth="3">
+              <help-outline-icon></help-outline-icon>
+            </n-icon>
+          </template>
+          <n-text>视频组件需要底色透明一般选中滤色</n-text>
+        </n-tooltip>
+      </template>
+      <setting-item>
+        <n-select v-model:value="chartStyles.blendMode" size="small" filterable :options="BlendModeEnumList"></n-select>
+      </setting-item>
+    </setting-item-box>
+
     <!-- 变换 -->
     <setting-item-box v-if="!isCanvas" name="旋转°">
       <setting-item name="Z轴(平面) - 旋转">
@@ -121,13 +142,17 @@
         ></n-input-number>
       </setting-item>
     </setting-item-box>
+
+    <!-- 提示 -->
+    <n-tag type="warning"> 若预览时大屏模糊，可以尝试关闭滤镜进行修复 </n-tag>
   </collapse-item>
 </template>
 
 <script setup lang="ts">
 import { PropType } from 'vue'
-import { PickCreateComponentType } from '@/packages/index.d'
+import { PickCreateComponentType, BlendModeEnumList } from '@/packages/index.d'
 import { SettingItemBox, SettingItem, CollapseItem } from '@/components/Pages/ChartItemSetting'
+import { icon } from '@/plugins'
 
 const props = defineProps({
   isGroup: {
@@ -144,14 +169,14 @@ const props = defineProps({
   }
 })
 
-// 百分比格式化persen
+const { HelpOutlineIcon } = icon.ionicons5
+
+// 百分比格式化 person
 const sliderFormatTooltip = (v: string) => {
-  // @ts-ignore
   return `${(parseFloat(v) * 100).toFixed(0)}%`
 }
 // 角度格式化
 const degFormatTooltip = (v: string) => {
-  // @ts-ignore
   return `${v}deg`
 }
 </script>

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/Plugins/DialogContent/index.vue

@@ -1,6 +1,7 @@
+<!-- eslint-disable vue/valid-template-root -->
 <template></template>
 <script lang="ts" setup>
-import { useDialog } from 'naive-ui';
+import { useDialog } from 'naive-ui'
 //挂载在 window 方便与在js中使用
-window['$dialog'] = useDialog();
+window['$dialog'] = useDialog()
 </script>

src/components/Plugins/LoadingContent/index.vue

@@ -1,3 +1,4 @@
+<!-- eslint-disable vue/valid-template-root -->
 <template></template>
 
 <script lang="ts" setup>

src/components/Plugins/MessageContent/index.vue

@@ -1,7 +1,8 @@
+<!-- eslint-disable vue/valid-template-root -->
 <template></template>
 
 <script lang="ts" setup>
-import { useMessage } from 'naive-ui';
+import { useMessage } from 'naive-ui'
 //挂载在 window 方便与在js中使用
-window['$message'] = useMessage();
+window['$message'] = useMessage()
 </script>

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,7 +1,7 @@
 // 鼠标点击左右键
 export enum MouseEventButton {
   LEFT = 1,
-  RIGHT = 2,
+  RIGHT = 2
 }
 
 // 页面拖拽键名
@@ -41,7 +41,16 @@ export enum MenuEnum {
   // 后退
   BACK = 'back',
   FORWORD = 'forward',
-  SAVE = 'save'
+  // 保存
+  SAVE = 'save',
+  // 锁定
+  LOCK = 'lock',
+  // 解除锁定
+  UNLOCK = 'unLock',
+  // 隐藏
+  HIDE = 'hide',
+  // 显示
+  SHOW = 'show'
 }
 
 // Win 键盘枚举
@@ -49,9 +58,9 @@ export enum WinKeyboard {
   CTRL = 'ctrl',
   SHIFT = 'shift',
   ALT = ' alt',
-  CTRL_SOURCE_KEY = "control",
-  SHIFT_SOURCE_KEY = "shift",
-  ALT_SOURCE_KEY = "alt"
+  CTRL_SOURCE_KEY = 'control',
+  SHIFT_SOURCE_KEY = 'shift',
+  ALT_SOURCE_KEY = 'alt'
 }
 
 // Mac 键盘枚举
@@ -60,9 +69,9 @@ export enum MacKeyboard {
   CTRL = '⌘',
   SHIFT = '⇧',
   ALT = '⌥',
-  CTRL_SOURCE_KEY = "⌘",
-  SHIFT_SOURCE_KEY = "⇧",
-  ALT_SOURCE_KEY = "⌥"
+  CTRL_SOURCE_KEY = '⌘',
+  SHIFT_SOURCE_KEY = '⇧',
+  ALT_SOURCE_KEY = '⌥'
 }
 
 // 同步状态枚举

src/enums/httpEnum.ts

@@ -12,7 +12,7 @@ export enum ResultEnum {
   SERVER_FORBIDDEN = 403,
   NOT_FOUND = 404,
   TOKEN_OVERDUE = 886,
-  TIMEOUT = 10042,
+  TIMEOUT = 60000,
 }
 
 // 数据相关

src/hooks/useChartDataFetch.hook.ts

@@ -25,7 +25,7 @@ export const useChartDataFetch = (
 
   const requestIntervalFn = () => {
     const chartEditStore = useChartEditStore()
-    
+
     // 全局数据
     const {
       requestOriginUrl,
@@ -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)
@@ -89,7 +88,10 @@ export const useChartDataFetch = (
         // 开启轮询
         if (time) fetchInterval = setInterval(fetchFn, intervalUnitHandle(time, unit))
       }
-    } catch (error) {}
+      // eslint-disable-next-line no-empty
+    } catch (error) {
+      console.log(error);
+    }
   }
 
   isPreview() && requestIntervalFn()

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,30 @@
 <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'
+import isObject from 'lodash/isObject'
 
 const props = defineProps({
   themeSetting: {
@@ -31,23 +36,40 @@ 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: { dimensions: any }, oldData) => {
+    if (!isObject(newData) || !('dimensions' in newData)) return
+    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,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 { 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'
+import isObject from 'lodash/isObject'
 
 const props = defineProps({
   themeSetting: {
@@ -35,18 +40,35 @@ 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: { dimensions: any }, oldData) => {
+    if (!isObject(newData) || !('dimensions' in newData)) return
+    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,30 @@
 <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'
+import isObject from 'lodash/isObject'
 
 const props = defineProps({
   themeSetting: {
@@ -37,41 +41,35 @@ 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: { dimensions: any }, oldData) => {
+    if (!isObject(newData) || !('dimensions' in newData)) return
+    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/MapBase/config.ts

@@ -0,0 +1,156 @@
+import { echartOptionProfixHandle, PublicConfigClass } from '@/packages/public'
+import { MapBaseConfig } 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,
+  mapRegion: {
+    adcode: 'china',
+    showHainanIsLands: true
+  },
+  tooltip: {
+    show: true,
+    trigger: 'item'
+  },
+  visualMap: {
+    show: true,
+    orient: 'vertical',
+    pieces: [
+      { gte: 1000, label: '>1000' }, // 不指定 max，表示 max 为无限大（Infinity）。
+      { gte: 600, lte: 999, label: '600-999' },
+      { gte: 200, lte: 599, label: '200-599' },
+      { gte: 50, lte: 199, label: '49-199' },
+      { gte: 10, lte: 49, label: '10-49' },
+      { lte: 9, label: '<9' } // 不指定 min，表示 min 为无限大（-Infinity）。
+    ],
+    inRange: {
+      // 渐变颜色，从小到大
+      color: ['#c3d7df', '#5cb3cc', '#8abcd1', '#66a9c9', '#2f90b9', '#1781b5']
+    },
+    textStyle: {
+      color: '#fff'
+    }
+  },
+  geo: {
+    show: false,
+    type: 'map',
+    roam: false,
+    map: 'china',
+    selectedMode: false, //是否允许选中多个区域
+    zoom: 1
+  },
+  series: [
+    {
+      name: '',
+      type: 'effectScatter',
+      coordinateSystem: 'geo',
+      symbolSize: 4,
+      legendHoverLink: true,
+      showEffectOn: 'render',
+      rippleEffect: {
+        scale: 6,
+        color: '#FFFFFF',
+        brushType: 'fill'
+      },
+      tooltip: {
+        show: true,
+        backgroundColor: 'rgba(0,0,0,.6)',
+        borderColor: 'rgba(147, 235, 248, .8)',
+        textStyle: {
+          color: '#FFF'
+        }
+      },
+      label: {
+        formatter: '{b}',
+        fontSize: 11,
+        offset: [0, 2],
+        position: 'bottom',
+        textBorderColor: '#fff',
+        textShadowColor: '#000',
+        textShadowBlur: 10,
+        textBorderWidth: 0,
+        color: '#FFFFFF',
+        show: true
+      },
+      itemStyle: {
+        color: '#FFFFFF',
+        borderColor: 'rgba(225,255,255,2)',
+        borderWidth: 4,
+        shadowColor: '#E1FFFF',
+        shadowBlur: 10
+      },
+      data: []
+    },
+    {
+      name: '区域',
+      type: 'map',
+      map: 'china',
+      data: [],
+      selectedMode: false,
+      zoom: 1,
+      geoIndex: 1,
+      tooltip: {
+        show: true,
+        backgroundColor: '#00000060',
+        borderColor: 'rgba(147, 235, 248, 0.8)',
+        textStyle: {
+          color: '#FFFFFF',
+          fontSize: 12,
+        }
+      },
+      label: {
+        show: false,
+        color: '#FFFFFF',
+        fontSize: 12,
+      },
+      emphasis: {
+        disabled: false,
+        label: {
+          color: '#FFFFFF',
+          fontSize: 12,
+        },
+        itemStyle: {
+          areaColor: '#389BB7',
+          shadowColor: '#389BB7',
+          borderWidth: 1
+        }
+      },
+      itemStyle: {
+        borderColor: '#93EBF8',
+        borderWidth: 1,
+        areaColor: {
+          type: 'radial',
+          x: 0.5,
+          y: 0.5,
+          r: 0.8,
+          colorStops: [
+            {
+              offset: 0,
+              color: '#93ebf800' // 0% 处的颜色
+            },
+            {
+              offset: 1,
+              color: '#93ebf820' // 100% 处的颜色
+            }
+          ],
+          globalCoord: false
+        },
+        shadowColor: '#80D9F842',
+        shadowOffsetX: -2,
+        shadowOffsetY: 2,
+        shadowBlur: 10
+      }
+    }
+  ]
+}
+export const MapDefaultConfig = { ...option }
+export default class Config extends PublicConfigClass implements CreateComponentType {
+  public key: string = MapBaseConfig.key
+  public attr = { ...chartInitConfig, w: 750, h: 800, zIndex: -1 }
+  public chartConfig = MapBaseConfig
+  public option = echartOptionProfixHandle(option, includes)
+}

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

@@ -0,0 +1,277 @@
+<template>
+  <!-- Echarts 全局设置 -->
+  <global-setting :optionData="optionData"></global-setting>
+  <CollapseItem name="地图" :expanded="true">
+    <SettingItemBox name="地图区域">
+      <SettingItem name="默认中国">
+        <n-select
+          size="small"
+          v-model:value="mapRegion.adcode"
+          :options="mapRegionOptions"
+          value-field="adcode"
+          label-field="name"
+        />
+      </SettingItem>
+    </SettingItemBox>
+
+    <SettingItemBox name="区域颜色">
+      <SettingItem name="0%处颜色">
+        <n-color-picker
+          size="small"
+          :modes="['hex']"
+          v-model:value="seriesList[1].itemStyle.areaColor.colorStops[0].color"
+        ></n-color-picker>
+      </SettingItem>
+      <SettingItem name="100%处颜色">
+        <n-color-picker
+          size="small"
+          :modes="['hex']"
+          v-model:value="seriesList[1].itemStyle.areaColor.colorStops[1].color"
+        ></n-color-picker>
+      </SettingItem>
+    </SettingItemBox>
+    <SettingItemBox name="阴影">
+      <SettingItem name="颜色">
+        <n-color-picker
+          size="small"
+          :modes="['hex']"
+          v-model:value="seriesList[1].itemStyle.shadowColor"
+        ></n-color-picker>
+      </SettingItem>
+      <SettingItem name="模糊程度">
+        <n-input-number
+          v-model:value="seriesList[1].itemStyle.shadowBlur"
+          :min="0"
+          size="small"
+          placeholder="请输入模糊程度"
+        ></n-input-number>
+      </SettingItem>
+      <SettingItem name="水平偏移">
+        <n-input-number
+          v-model:value="seriesList[1].itemStyle.shadowOffsetX"
+          size="small"
+          placeholder="请输入水平偏移大小"
+        ></n-input-number>
+      </SettingItem>
+      <SettingItem name="垂直偏移">
+        <n-input-number
+          v-model:value="seriesList[1].itemStyle.shadowOffsetY"
+          size="small"
+          placeholder="请输入垂直偏移大小"
+        ></n-input-number>
+      </SettingItem>
+    </SettingItemBox>
+
+    <SettingItemBox name="地理信息名称">
+      <SettingItem name="显示">
+        <n-space>
+          <n-switch v-model:value="seriesList[1].label.show" size="small"></n-switch>
+        </n-space>
+      </SettingItem>
+      <SettingItem name="字体颜色">
+        <n-color-picker
+          size="small"
+          :modes="['hex']"
+          v-model:value="seriesList[1].label.color"
+        ></n-color-picker>
+      </SettingItem>
+      <SettingItem name="字体大小">
+        <n-input-number
+          v-model:value="seriesList[1].label.fontSize"
+          :min="1"
+          size="small"
+          placeholder="请输入字体大小"
+        ></n-input-number>
+      </SettingItem>
+    </SettingItemBox>
+
+    <SettingItemBox name="悬浮 （预览可见）">
+      <SettingItem name="禁用">
+        <n-space>
+          <n-switch v-model:value="seriesList[1].emphasis.disabled" size="small"></n-switch>
+        </n-space>
+      </SettingItem>
+      <SettingItem name="颜色">
+        <n-color-picker
+          size="small"
+          :modes="['hex']"
+          v-model:value="seriesList[1].emphasis.itemStyle.areaColor"
+        ></n-color-picker>
+      </SettingItem>
+      <SettingItem name="字体大小">
+        <n-input-number
+          v-model:value="seriesList[1].emphasis.label.fontSize"
+          :min="1"
+          size="small"
+          placeholder="请输入字体大小"
+        ></n-input-number>
+      </SettingItem>
+      <SettingItem name="阴影">
+        <n-color-picker
+          size="small"
+          :modes="['hex']"
+          v-model:value="seriesList[1].emphasis.itemStyle.shadowColor"
+        ></n-color-picker>
+      </SettingItem>
+      <SettingItem name="边框大小">
+        <n-input-number
+          v-model:value="seriesList[1].emphasis.itemStyle.borderWidth"
+          :min="1"
+          size="small"
+          placeholder="请输入边框大小"
+        ></n-input-number>
+      </SettingItem>
+      <SettingItem name="文字颜色">
+        <n-color-picker
+          size="small"
+          :modes="['hex']"
+          v-model:value="seriesList[1].emphasis.label.color"
+        ></n-color-picker>
+      </SettingItem>
+    </SettingItemBox>
+    
+    <SettingItemBox name="悬浮弹窗">
+      <SettingItem name="显示">
+        <n-space>
+          <n-switch v-model:value="seriesList[1].tooltip.show" size="small"></n-switch>
+        </n-space>
+      </SettingItem>
+      <SettingItem name="字体大小">
+        <n-input-number
+          v-model:value="seriesList[1].tooltip.textStyle.fontSize"
+          :min="1"
+          size="small"
+          placeholder="请输入字体大小"
+        ></n-input-number>
+      </SettingItem>
+      <SettingItem name="字体颜色">
+        <n-color-picker
+          size="small"
+          :modes="['hex']"
+          v-model:value="seriesList[1].tooltip.textStyle.color"
+        ></n-color-picker>
+      </SettingItem>
+      <SettingItem name="背景颜色">
+        <n-color-picker
+          size="small"
+          :modes="['hex']"
+          v-model:value="seriesList[1].tooltip.backgroundColor"
+        ></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="其他" v-if="mapRegion.adcode === 'china'">
+      <SettingItem>
+        <n-checkbox v-model:checked="mapRegion.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>
+      
+    <SettingItemBox name="文本">
+      <SettingItem name="显示">
+        <n-space>
+          <n-switch v-model:value="seriesList[0].label.show" size="small"></n-switch>
+        </n-space>
+      </SettingItem>
+      <SettingItem name="字体大小">
+        <n-input-number v-model:value="seriesList[0].label.fontSize" size="small" :min="0"></n-input-number>
+      </SettingItem>
+      <SettingItem name="字体颜色">
+        <n-color-picker size="small" :modes="['hex']" v-model:value="seriesList[0].label.color"></n-color-picker>
+      </SettingItem>
+    </SettingItemBox>
+
+    <SettingItemBox name="涟漪">
+      <SettingItem name="涟漪大小">
+        <n-input-number
+          v-model:value="seriesList[0].rippleEffect.scale"
+          :min="1"
+          size="small"
+          placeholder="请输入涟漪大小"
+        ></n-input-number>
+      </SettingItem>
+      <SettingItem name="涟漪颜色">
+        <n-color-picker size="small" :modes="['hex']" v-model:value="seriesList[0].rippleEffect.color"></n-color-picker>
+      </SettingItem>
+      <SettingItem name="涟漪的绘制方式">
+        <n-select size="small" v-model:value="seriesList[0].rippleEffect.brushType" :options="rippleEffectOptions" />
+      </SettingItem>
+    </SettingItemBox>
+  </CollapseItem>
+</template>
+
+<script setup lang="ts">
+import { PropType, computed } from 'vue'
+import { CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
+import { GlobalThemeJsonType } from '@/settings/chartThemes/index'
+import { GlobalSetting } from '@/components/Pages/ChartItemSetting'
+import { ref } from 'vue'
+import mapChinaJson from './mapGeojson/china.json'
+
+const mapRegionOptions = ref([
+  {
+    adcode: 'china',
+    name: '中国'
+  }
+])
+
+const rippleEffectOptions = ref([
+  {
+    value: 'fill',
+    label: '实心'
+  },
+  {
+    value: 'stroke',
+    label: '空心'
+  }
+])
+
+const props = defineProps({
+  optionData: {
+    type: Object as PropType<GlobalThemeJsonType>,
+    required: true
+  }
+})
+
+const initMapRegionOptions = () => {
+  mapChinaJson.features.forEach((element: any) => {
+    if (element.properties.name) {
+      mapRegionOptions.value.push({ ...element.properties })
+    }
+  })
+}
+initMapRegionOptions()
+
+const seriesList = computed(() => {
+  return props.optionData.series
+})
+
+const mapRegion = computed(() => {
+  return props.optionData.mapRegion
+})
+</script>

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

@@ -0,0 +1,79 @@
+{
+  "point": [
+    {
+      "name": "北京",
+      "value": [116.405285, 39.904989, 200]
+    },
+    {
+      "name": "郑州",
+      "value": [113.665412, 34.757975, 888]
+    },
+    {
+      "name": "青海",
+      "value": [101.778916, 36.623178, 666]
+    },
+    {
+      "name": "宁夏回族自治区",
+      "value": [106.278179, 38.46637, 66]
+    },
+    {
+      "name": "哈尔滨市",
+      "value": [126.642464, 45.756967, 101]
+    }
+  ],
+  "map": [
+    {
+      "name": "北京市",
+      "value": 666
+    },
+    {
+      "name": "河北省",
+      "value": 98
+    },
+
+    {
+      "name": "江苏省",
+      "value": 300
+    },
+    {
+      "name": "福建省",
+      "value": 1199
+    },
+    {
+      "name": "山东省",
+      "value": 86
+    },
+    {
+      "name": "河南省",
+      "value": 850
+    },
+    {
+      "name": "湖北省",
+      "value": 84
+    },
+    {
+      "name": "广西壮族自治区",
+      "value": 81
+    },
+    {
+      "name": "海南省",
+      "value": 900
+    },
+    {
+      "name": "青海省",
+      "value": 800
+    },
+    {
+      "name": "新疆维吾尔自治区",
+      "value": 7
+    }
+  ],
+  "pieces": [
+    { "gte": 1000, "label": ">1000" },
+    { "gte": 600, "lte": 999, "label": "600-999" },
+    { "gte": 200, "lte": 599, "label": "200-599" },
+    { "gte": 50, "lte": 199, "label": "49-199" },
+    { "gte": 10, "lte": 49, "label": "10-49" },
+    { "lte": 9, "label": "<9" }
+  ]
+}

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

@@ -0,0 +1,15 @@
+import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'
+import image from '@/assets/images/chart/charts/map.png'
+import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'
+
+export const MapBaseConfig: ConfigType = {
+    key: 'MapBase',
+    chartKey: 'VMapBase',
+    conKey: 'VCMapBase',
+    title: '地图(可选省份)',
+    category: ChatCategoryEnum.MAP,
+    categoryName: ChatCategoryEnumName.MAP,
+    package: PackagesCategoryEnum.CHARTS,
+    chartFrame: ChartFrameEnum.COMMON,
+    image
+  }

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

@@ -0,0 +1,144 @@
+<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, ref, nextTick } 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 mapJsonWithoutHainanIsLands from './mapWithoutHainanIsLands.json'
+import { DatasetComponent, GridComponent, TooltipComponent, GeoComponent, VisualMapComponent } 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,
+  GeoComponent,
+  EffectScatterChart,
+  VisualMapComponent
+])
+
+const option = reactive({
+  value: mergeTheme(props.chartConfig.option, props.themeSetting, includes)
+})
+const vChartRef = ref<typeof VChart>()
+
+//动态获取json注册地图
+const getGeojson = (regionId: string) => {
+  return new Promise<boolean>(resolve => {
+    import(`./mapGeojson/${regionId}.json`).then(data => {
+      registerMap(regionId, { geoJSON: data.default as any, specialAreas: {} })
+      resolve(true)
+    })
+  })
+}
+
+//异步时先注册空的 保证初始化不报错
+registerMap(props.chartConfig.option.mapRegion.adcode, { geoJSON: {} as any, specialAreas: {} })
+
+// 进行更换初始化地图 如果为china 单独处理
+const registerMapInitAsync = async () => {
+  await nextTick()
+  if (props.chartConfig.option.mapRegion.adcode!="china") {
+    await getGeojson(props.chartConfig.option.mapRegion.adcode)
+  }else{
+    await hainanLandsHandle(props.chartConfig.option.mapRegion.showHainanIsLands)
+  }
+  vEchartsSetOption()
+}
+registerMapInitAsync()
+
+// 手动触发渲染
+const vEchartsSetOption = () => {
+  option.value = props.chartConfig.option
+  vChartRef.value?.setOption(props.chartConfig.option)
+}
+
+// 更新数据处理
+const dataSetHandle = async (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.map) item.data = dataset.map
+  })
+  if (dataset.pieces) props.chartConfig.option.visualMap.pieces = dataset.pieces
+
+  isPreview() && vEchartsSetOption()
+}
+// 处理海南群岛
+const hainanLandsHandle=async(newData:boolean)=>{
+  if (newData) {
+      await getGeojson('china')
+    } else {
+      registerMap('china', { geoJSON: mapJsonWithoutHainanIsLands as any, specialAreas: {} })
+    }
+}
+//监听 dataset 数据发生变化
+watch(
+  () => props.chartConfig.option.dataset,
+  newData => {
+    dataSetHandle(newData)
+  },
+  {
+    immediate: true,
+    deep: false
+  }
+)
+
+//监听是否显示南海群岛
+watch(
+  () => props.chartConfig.option.mapRegion.showHainanIsLands,
+  async newData => {
+    await hainanLandsHandle(newData)
+    vEchartsSetOption()
+  },
+  {
+    deep: false
+  }
+)
+
+//监听地图展示区域发生变化
+watch(
+  () => props.chartConfig.option.mapRegion.adcode,
+  async newData => {
+    await getGeojson(newData)
+    props.chartConfig.option.geo.map = newData
+    props.chartConfig.option.series.forEach((item: any) => {
+      if (item.type === 'map') item.map = newData
+    })
+    vEchartsSetOption()
+  },
+  {
+    deep: false
+  }
+)
+
+// 预览
+useChartDataFetch(props.chartConfig, useChartEditStore, (newData: any) => {
+  dataSetHandle(newData)
+})
+</script>