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

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

.eslintrc.js

@@ -20,11 +20,6 @@ module.exports = {
   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-unused-vars': 'off',
-    'vue/no-unused-vars': 'off',
-    'vue/multi-word-component-names': 'off',
-    'vue/valid-template-root': 'off',
-    'vue/no-mutating-props': 'off'
+    'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off'
   }
 }

README.md

@@ -4,71 +4,124 @@
 
 **`master-fetch` 分支是带有后端接口请求的分支**
 
+**后端项目地址：[https://gitee.com/MTrun/go-view-serve](https://gitee.com/MTrun/go-view-serve)**
 
-### feat-unify-test 分支目标
-+ 实现 backend 后端工厂
-将后端业务逻辑集中到 backend 了，控制 BackEndFactory 就可以适配不同的后端。
-伪代码如下：
-export const BackEndFactory = ():IBackend=>{
-switch(项目后端配置){
-case "无数据库":
-return new MockBackend() // 等同： -master ，没有存储
-case "indexdb":
-return new IndexDbBackend() // 这次开发的，用 indexdb 做测试
-case "java":
-return new JavaBackend() // 等同： -fetch， 没 java 环境，还没做
-case "python":
-return new PythonBackend() // 自定义开发的后端
-。。。 其他 oss 、云平台的后端 。。。
-}}
-意义：
-1 unify 统一 -fetch 和 master 分支，消除分支之间的差异。
-2 方便接入不同的自定义后端平台。
-3 前端存储功能让测试工作更加方便
+**接口说明地址：[https://docs.apipost.cn/preview/5aa85d10a59d66ce/ddb813732007ad2b?target_id=84dbc5b0-158f-4bcb-8f74-793ac604ada3#3e053622-1e76-43f9-a039-756aee822dbb](https://docs.apipost.cn/preview/5aa85d10a59d66ce/ddb813732007ad2b?target_id=84dbc5b0-158f-4bcb-8f74-793ac604ada3#3e053622-1e76-43f9-a039-756aee822dbb)**
 
-+ 完善事件处理机制
-在事件中修改图表配置
-在事件中修改图表数据
-在事件中调用图表 exposed 函数
-数据驱动界面
+## 使用
 
-### 试验功能1：Backend 后端工厂
-+ 对比 -fetch 分支，梳理后端逻辑到 backend 目录的 ibackend 接口
-  + 登录 - login
-  + 登出 - logout
-  + 预览，token 注入或单点登陆 - checkToken
-  + 显示项目列表和分页 - projectList
-  + 保存、发布、修改名称 - updateProject
-  + 复制项目 - copyProject
-  + 图表内的图片上传 - uploadFile
-  + 上传图片显示处理 - getFileUrl
-+ IndexDbBackend 用indexdb浏览器数据库实现了 project 相关所有功能。
-+ Todo: 统一后端错误处理
-+ Todo：开发 javabackend，适配现有的后端
+所有的接口地址位置：`src\api\path\*`
 
-### 试验功能2：事件处理机制
-+ 实现最常用的互动：找到图表元素、显示或隐藏、修改数据
-+ 核心代码：useLifeHandler.hook.ts
-+ 在事件代码中通过 runtime 实现运行时刻的图表管理，提供基础函数：
-  + selectComponents 选择多个图表
-  + selectOneComponent 选择一个图表
-  + getChartConfig 读取图表
-  + setChartConfig 设置图表
-  + callExposed 调用图表 exposed 的函数
-+ 以下例子可以在点击事件中加入代码并预览，测试效果。
+接口地址修改：`.env`
 
-+ 例子1 切换显示名称为 饼图 和 柱状图 的图表：
-const range = runtime.fn.selectComponents("饼图 柱状图")
-const h = runtime.fn.getChartConfig(range, "hide")
-runtime.fn.setChartConfig(range, "hide", !h)
+### 🤯 后端项目
 
-+ 例子2 修改一个名称 柱状图001 组件id 2wolqibrx3c000 的图表数据，以下两句等效
-runtime.fn.setChartConfig("柱状图001", "dataset", {"dimensions":["product","data1","data2"],"source":[{"product":"Mon","data1":120,"data2":130}]})
-runtime.fn.setChartConfig("#2wolqibrx3c000", "dataset", {"dimensions":["product","data1","data2"],"source":[{"product":"Mon","data1":120,"data2":230}]})
+后端项目gitee地址：[https://gitee.com/MTrun/go-view-serve](https://gitee.com/MTrun/go-view-serve)
 
-+ 例子3 找到一个组并隐藏
-const c = runtime.fn.selectOneComponent("分组")
-if(c){
-  console.log(runtime.fn.getChartConfig(c, "isGroup" ))
-  runtime.fn.setChartConfig(c, "hide", true)
-}
+接口说明地址：[https://docs.apipost.cn/preview/5aa85d10a59d66ce/ddb813732007ad2b?target_id=84dbc5b0-158f-4bcb-8f74-793ac604ada3#3e053622-1e76-43f9-a039-756aee822dbb](https://docs.apipost.cn/preview/5aa85d10a59d66ce/ddb813732007ad2b?target_id=84dbc5b0-158f-4bcb-8f74-793ac604ada3#3e053622-1e76-43f9-a039-756aee822dbb)
+
+```shell
+# port
+VITE_DEV_PORT = '8080'
+
+# development path
+VITE_DEV_PATH = 'http://127.0.0.1:8080'
+
+# production path
+VITE_PRO_PATH = 'http://127.0.0.1:8080'
+```
+
+公共前缀修改：`src\settings\httpSetting.ts`
+
+```shell
+// 请求前缀
+export const axiosPre = '/api/goview'
+```
+
+接口封装：`src\api\http.ts`
+
+```ts
+import axiosInstance from './axios'
+import { RequestHttpEnum, ContentTypeEnum } from '@/enums/httpEnum'
+
+export const get = (url: string, params?: object) => {
+  return axiosInstance({
+    url: url,
+    method: RequestHttpEnum.GET,
+    params: params,
+  })
+}
+
+export const post = (url: string, data?: object, headersType?: string) => {
+  return axiosInstance({
+    url: url,
+    method: RequestHttpEnum.POST,
+    data: data,
+    headers: {
+      'Content-Type': headersType || ContentTypeEnum.JSON
+    }
+  })
+}
+
+export const put = (url: string, data?: object, headersType?: string) => {
+  return axiosInstance({
+    url: url,
+    method: RequestHttpEnum.PUT,
+    data: data,
+    headers: {
+      'Content-Type': headersType || ContentTypeEnum.JSON
+    }
+  })
+}
+
+export const del = (url: string, params?: object) => {
+  return axiosInstance({
+    url: url,
+    method: RequestHttpEnum.DELETE,
+    params
+  })
+}
+
+// 获取请求函数，默认get
+export const http = (type?: RequestHttpEnum) => {
+  switch (type) {
+    case RequestHttpEnum.GET:
+      return get
+
+    case RequestHttpEnum.POST:
+      return post
+
+    case RequestHttpEnum.PUT:
+      return put
+
+    case RequestHttpEnum.DELETE:
+      return del
+
+    default:
+      return get
+  }
+}
+
+```
+
+## 代码提交
+
+* feat: 新功能
+* fix: 修复 Bug
+* docs: 文档修改
+* perf: 性能优化
+* revert: 版本回退
+* ci: CICD集成相关
+* test: 添加测试代码
+* refactor: 代码重构
+* build: 影响项目构建或依赖修改
+* style: 不影响程序逻辑的代码修改
+* chore: 不属于以上类型的其他类型(日常事务)
+
+## 交流
+
+QQ 群：1030129384
+
+![QQ群](readme/go-view-qq.png)
+
+![渲染海报](readme/logo-poster.png)

index.css

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

package.json

@@ -1,14 +1,12 @@
 {
   "name": "go-view",
-  "version": "2.1.0",
+  "version": "2.0.7",
   "scripts": {
     "dev": "vite --host",
     "build": "vue-tsc --noEmit && vite build",
     "preview": "vite preview",
     "new": "plop --plopfile ./plop/plopfile.js",
-    "postinstall": "husky install",
-    "lint": "eslint --ext .js,.jsx,.ts,.tsx,.vue src",
-    "lint:fix": "eslint --ext .js,.jsx,.ts,.tsx,.vue src --fix"
+    "postinstall": "husky install"
   },
   "dependencies": {
     "@types/color": "^3.0.3",
@@ -21,16 +19,13 @@
     "crypto-js": "^4.1.1",
     "echarts-liquidfill": "^3.1.0",
     "echarts-stat": "^1.2.0",
-    "echarts-wordcloud": "^2.0.0",
-    "gsap": "^3.11.3",
     "highlight.js": "^11.5.0",
     "html2canvas": "^1.4.1",
     "keymaster": "^1.6.2",
     "monaco-editor": "^0.33.0",
-    "naive-ui": "2.33.4",
+    "naive-ui": "2.30.3",
     "pinia": "^2.0.13",
     "screenfull": "^6.0.1",
-    "three": "^0.145.0",
     "vue": "^3.2.31",
     "vue-demi": "^0.13.1",
     "vue-i18n": "9.1.10",
@@ -43,7 +38,6 @@
     "@commitlint/cli": "^17.0.2",
     "@commitlint/config-conventional": "^17.0.2",
     "@types/node": "^16.11.26",
-    "@types/three": "^0.144.0",
     "@typescript-eslint/eslint-plugin": "^5.18.0",
     "@typescript-eslint/parser": "^5.18.0",
     "@vicons/carbon": "^0.12.0",

src/api/axios.config.ts

@@ -1,7 +1,4 @@
-export enum ModuleTypeEnum {
-  SYSTEM = 'sys',
-  PROJECT = 'project',
-}
+import { ModuleTypeEnum } from '@/enums/httpEnum'
 
 // 接口白名单（免登录）
 export const fetchAllowList = [

src/api/axios.ts

@@ -1,19 +1,38 @@
 import axios, { AxiosResponse, AxiosRequestConfig } from 'axios'
-import { ResultEnum } from "@/enums/httpEnum"
-import { ErrorPageNameMap } from "@/enums/pageEnum"
-import { redirectErrorPage } from '@/utils'
+import { ResultEnum, RequestHttpHeaderEnum } from "@/enums/httpEnum"
+import { PageEnum, ErrorPageNameMap } from "@/enums/pageEnum"
+import { StorageEnum } from '@/enums/storageEnum'
+import { axiosPre } from '@/settings/httpSetting'
+import { SystemStoreEnum, SystemStoreUserInfoEnum } from '@/store/modules/systemStore/systemStore.d'
+import { redirectErrorPage, getLocalStorage, routerTurnByName, httpErrorHandle } from '@/utils'
+import { fetchAllowList } from './axios.config'
+import includes from 'lodash/includes'
 
 const axiosInstance = axios.create({
-  baseURL: import.meta.env.DEV ? import.meta.env.VITE_DEV_PATH : import.meta.env.VITE_PRO_PATH,
+  baseURL: `${import.meta.env.PROD ? import.meta.env.VITE_PRO_PATH : ''}${axiosPre}`,
   timeout: ResultEnum.TIMEOUT,
 })
 
 axiosInstance.interceptors.request.use(
   (config: AxiosRequestConfig) => {
+    // 白名单校验
+    if (includes(fetchAllowList, config.url)) return config
+    // 获取 token
+    const info = getLocalStorage(StorageEnum.GO_SYSTEM_STORE)
+    // 重新登录
+    if (!info) {
+      routerTurnByName(PageEnum.BASE_LOGIN_NAME)
+      return config
+    }
+    const userInfo = info[SystemStoreEnum.USER_INFO]
+    config.headers = {
+      ...config.headers,
+      [userInfo[SystemStoreUserInfoEnum.TOKEN_NAME]]: userInfo[SystemStoreUserInfoEnum.USER_TOKEN] || ''
+    }
     return config
   },
-  (error: AxiosRequestConfig) => {
-    Promise.reject(error)
+  (err: AxiosRequestConfig) => {
+    Promise.reject(err)
   }
 )
 
@@ -21,12 +40,31 @@ axiosInstance.interceptors.request.use(
 axiosInstance.interceptors.response.use(
   (res: AxiosResponse) => {
     const { code } = res.data as { code: number }
-    if (code === ResultEnum.SUCCESS) return Promise.resolve(res.data)
-    // 重定向
-    if (ErrorPageNameMap.get(code)) redirectErrorPage(code)
+
+    // 成功
+    if (code === ResultEnum.SUCCESS) {
+      return Promise.resolve(res.data)
+    }
+
+    // 登录过期
+    if (code === ResultEnum.TOKEN_OVERDUE) {
+      window['$message'].error(window['$t']('http.token_overdue_message'))
+      routerTurnByName(PageEnum.BASE_LOGIN_NAME)
+      return Promise.resolve(res.data)
+    }
+
+    // 固定错误码重定向
+    if (ErrorPageNameMap.get(code)) {
+      redirectErrorPage(code)
+      return Promise.resolve(res.data)
+    }
+    
+    // 提示错误
+    window['$message'].error(window['$t']((res.data as any).msg))
     return Promise.resolve(res.data)
   },
   (err: AxiosResponse) => {
+    httpErrorHandle()
     Promise.reject(err)
   }
 )

src/api/http.ts

@@ -13,7 +13,7 @@ export const get = (url: string, params?: object) => {
   return axiosInstance({
     url: url,
     method: RequestHttpEnum.GET,
-    params: params
+    params: params,
   })
 }
 
@@ -80,32 +80,6 @@ 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
-}
 
 /**
  * * 自定义请求
@@ -113,7 +87,7 @@ export const translateStr = (target: string | object) => {
  * @param globalParams 全局参数
  */
 export const customizeHttp = (targetParams: RequestConfigType, globalParams: RequestGlobalConfigType) => {
-  if (!targetParams || !globalParams) {
+  if(!targetParams || !globalParams) {
     return
   }
 
@@ -151,17 +125,15 @@ export const customizeHttp = (targetParams: RequestConfigType, globalParams: Req
   }
 
   // 处理头部
-  let headers: RequestParamsObjType = {
+  const headers: RequestParamsObjType = {
     ...globalRequestParams.Header,
-    ...targetRequestParams.Header
+    ...targetRequestParams.Header,
   }
-  headers = translateStr(headers)
 
   // data 参数
   let data: RequestParamsObjType | FormData | string = {}
   // params 参数
-  let params: RequestParamsObjType = { ...targetRequestParams.Params }
-  params = translateStr(params)
+  let params: RequestParamsObjType = targetRequestParams.Params
   // form 类型处理
   let formData: FormData = new FormData()
   formData.set('default', 'defaultData')
@@ -173,35 +145,33 @@ export const customizeHttp = (targetParams: RequestConfigType, globalParams: Req
 
     case RequestBodyEnum.JSON:
       headers['Content-Type'] = ContentTypeEnum.JSON
-      data = translateStr(JSON.parse(targetRequestParams.Body['json']))
+      data = JSON.parse(targetRequestParams.Body['json'])
       // json 赋值给 data
       break
 
     case RequestBodyEnum.XML:
       headers['Content-Type'] = ContentTypeEnum.XML
       // xml 字符串赋值给 data
-      data = translateStr(targetRequestParams.Body['xml'])
+      data = 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, translateStr(bodyFormData[i]))
+      for (const i in bodyFormData) formData.set(i, 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, translateStr(bodyFormUrlencoded[i]))
+        formData.set(i, bodyFormUrlencoded[i])
       }
       // FormData 赋值给 data
       data = formData
       break
-    }
   }
 
   // sql 处理
@@ -210,17 +180,11 @@ export const customizeHttp = (targetParams: RequestConfigType, globalParams: Req
     data = requestSQLContent
   }
 
-  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地址格式有误！')
-  }
+  return axiosInstance({
+    url: `${requestOriginUrl}${requestUrl}`,
+    method: requestHttpType,
+    data,
+    params,
+    headers
+  })
 }

src/api/mock/index.ts

@@ -14,10 +14,6 @@ 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'
-export const threeEarth01Url = '/mock/threeEarth01Data'
 
 const mockObject: MockMethod[] = [
   {
@@ -77,26 +73,6 @@ const mockObject: MockMethod[] = [
     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
-  },
-  {
-    url: threeEarth01Url,
-    method: RequestHttpEnum.GET,
-    response: () => test.threeEarth01Data
-  },
 ]
 
 export default mockObject

src/api/mock/map.json

@@ -1,79 +0,0 @@
-{
-  "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/test.mock.ts

@@ -1,7 +1,5 @@
 import heatmapJson from './heatMapData.json'
 import scatterJson from './scatter.json'
-import mapJson from './map.json'
-import tTreemapJson from './treemap.json'
 
 export default {
   // 单图表
@@ -200,75 +198,5 @@ export default {
     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
-  },
-  // 三维地球
-  threeEarth01Data: {
-    code: 0,
-    status: 200,
-    msg: '请求成功',
-    data: [
-      {
-        startArray: { name: '@name', N: '@integer(10, 100)', E: '@integer(10, 100)' },
-        endArray: [
-          { name: '@name', N: '@integer(10, 100)', E: '@integer(10, 100)' },
-          { name: '@name', N: '@integer(10, 100)', E: '@integer(10, 100)' },
-          { name: '@name', N: '@integer(10, 100)', E: '@integer(10, 100)' },
-          { name: '@name', N: '@integer(10, 100)', E: '@integer(10, 100)' }
-        ]
-      }
-    ]
   }
 }

src/api/mock/treemap.json

@@ -1,50 +0,0 @@
-[
-  {
-    "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/backend/ibackend.ts

@@ -1,146 +0,0 @@
-
-/**
- * 后端接口，相关功能对应表：
- *   登录 - login
- *   登出 - logout
- *   预览，token 注入或单点登陆 - checkToken
- *   显示项目列表和分页 - projectList
- *   保存、发布、修改名称 - updateProject
- *   复制项目 - copyProject
- *   图表内的图片上传 - uploadFile
- *   上传图片显示处理 - getFileUrl
- * 所有接口返回格式：MyResponseType
- */
-import { IndexDbBackend } from "./indexdb/indexdbbackend";
-// import { PythonBackend } from "./python/pythonbackend";
-
-export interface MyResponseType {
-    code: number; // 状态：200 表示接口调用成功，参考：HttpEnum
-    msg: string;  // 提示信息，配合 data 和 code 
-    data: any;   // data = null 表示接口结果错误，错误原因放在 msg
-}
-
-export class MyResponse implements MyResponseType {
-    code: number = 200;
-    msg: string = "";
-    data: any = {};
-}
-
-/**
- * 实现 IBackend 后端接口
- * 错误处理：
- */
-export interface IBackend {
-    /**
-     * 初始化后端系统，测试后端连接，oss地址等
-     * @param data 可选，备用
-     */
-    init(data:any):any
-
-    /**
-     * 登陆
-     * @param data {} .username .password
-     * @return MyResponseType 
-     * .data 须包含：
-     *      token:{tokenValue:"", tokenName:""},
-     *      userinfo:{nickname:"",  username: "", id: 用户ID}
-     * 错误处理：
-     *   1 接口错误 .code 不为 200 .msg 可选，后端反馈错误信息
-     *   2 登陆错误 .code=200  .data = null, msg 可选，反馈不能登陆的原因
-     * 登陆信息.data 记录：
-     *   setLocalStorage(GO_LOGIN_INFO_STORE, res.data)
-     */
-    login(data:any):any
-
-    /**
-     * 通知后端登出
-     */
-    logout():any
-
-    /**
-     * 检查Token是否有效，配合预览页面和单点登陆，备用
-     * @param data {tokenValue, tokenName} 
-     * @return 同 login()
-     */
-    checkToken(data:any):any
-
-    /**
-     * 项目列表
-     * @param data {} .page, .limit
-     * @return [项目]，字段名称需要进行 map 
-     *   id: projectId
-     *   title:projectName
-     *   release,
-     *   label:remarks
-     *   image:indexImage 如果需要挂刷新，在这里处理。如果需要拼接 url（getFileUrl），也在这里处理好。
-     */
-    projectList(data:any):any
-    
-    /**
-     * 新增项目
-     * @param data 
-     *   .projectName
-     * @return id 新项目 ID
-     */
-    createProject(data: any):any
-
-    /**
-     * 获取项目
-     * @param data .projectId
-     * @return 
-        id:projectId
-        projectName,
-        state: release,
-        remarks,
-        content
-     */
-    fetchProject(data: any):any
-
-    /**
-     * 修改项目
-     * @param data 
-     *   .projectId 必须
-     *   .projectName 可选
-     *   .release 可选
-     *   .content 可选
-     *   .object File 可选 对象
-     *   .remarks 可选
-     * @return 
-     */
-    updateProject(data: any):any
-
-    /**
-     * 复制项目
-     * @param data 
-     *   .copyId 需要复制的项目ID
-     *   .projectName 
-     * @return id 新项目ID
-     */
-    copyProject(data: any):any
-
-    /**
-     * 删除项目
-     * @param data 
-     *   .projectId
-     * @return 
-     */
-    deleteProject(data: any):any
-
-    /**
-     * 文件上传
-     * @param file File 图片对象 
-     * @param params 备用 Todo: 上传文件可带上项目ID和其他附加信息，以便后端文件管理
-     * @return .uri 文件对象 uri。建议在图表中保存相对地址，通过 getFileUrl 得到完整地址
-     */
-    uploadFile(file: File, params: any):any
-    /**
-     * 文件地址转换，处理 uploadFile 的返回地址。如果是绝对地址，可以不处理
-     * @param uploadUri 上传返回的 uri
-     * @return 供 image.src 使用的地址信息
-     */
-    getFileUrl(uploadUri:string):string
-}
-
-export const BackEndFactory = new IndexDbBackend();
-// export const BackEndFactory = new MockBackend();
-// export const BackEndFactory = new PythonBackend();

src/backend/indexdb/indexdb.ts

@@ -1,147 +0,0 @@
-/**
- * IndexDb 帮助类
- */
-
-const win: { [k: string]: any } = window || globalThis;
-const indexedDB =
-	win.indexedDB || win.mozIndexedDB || win.webkitIndexedDB || win.msIndexedDB;
-const dbs: { [k: string]: IDBDatabase } = {};
-let databaseName: string;
-let request: IDBOpenDBRequest;
-interface AnyEvent {
-	[k: string]: any;
-}
-
-export interface TableOption {
-	storeName: string;
-	option: { [K: string]: any };
-	index: { [K: string]: any }[];
-}
-
-export const createDB = (
-	name: string,
-	version?: string,
-	options?: TableOption[],
-) =>
-	new Promise<IDBDatabase>((resolve, reject) => {
-		if (!indexedDB) reject('浏览器不支持indexedDB');
-		databaseName = name;
-		if (dbs?.[name]) {
-			resolve(dbs[name]);
-			return;
-		}
-		request = indexedDB.open(name, version);
-		createTable(options)?.then((db: IDBDatabase) => resolve(db));
-		request.onsuccess = (event: AnyEvent) => {
-			// IDBDatabase
-			const db = event.target.result;
-			// 缓存起来
-			dbs[name] = db;
-			resolve(db);
-		};
-		request.onerror = (event: AnyEvent) => reject(event);
-	});
-
-export const createTable = (options?: TableOption[]) => {
-	if (!options) return;
-	return new Promise<IDBDatabase>((resolve) => {
-		request.onupgradeneeded = (event: AnyEvent) => {
-			const db = event.target.result;
-			dbs[databaseName] = db;
-			for (const i in options) {
-				// 判断是否存在表
-				if (!db.objectStoreNames.contains(options[i].storeName)) {
-					const objectStore = db.createObjectStore(
-						options[i].storeName,
-						options[i].option,
-					);
-					for (const j of options[i].index) {
-						objectStore.createIndex(j.name, j.keyPath, {
-							unique: j.unique,
-						});
-					}
-				}
-			}
-			resolve(db);
-		};
-	});
-};
-
-const getTransaction = async (name: string, version?: string) => {
-	let db: IDBDatabase;
-	// 先从缓存获取
-	if (dbs[databaseName]) {
-		db = dbs[databaseName];
-	} else {
-		db = await createDB(databaseName, version);
-	}
-	return db.transaction(name, 'readwrite');
-};
-
-const getObjectStore = async (
-	name: string,
-	version?: string,
-): Promise<IDBObjectStore> => {
-	const transaction = await getTransaction(name, version);
-	return transaction.objectStore(name);
-};
-
-const getStore = (name: string, type: string, data: any) =>
-	new Promise<IDBDatabase>((resolve) => {
-		getObjectStore(name).then((objectStore: IDBObjectStore | any) => {
-			const request = objectStore[type](data);
-			request.onsuccess = (event: AnyEvent) =>
-				resolve(event.target.result);
-		});
-	});
-
-
-const findStore = (
-	name: string,
-	start: any,
-	end: any,
-	startInclude: any,
-	endInclude: any,
-) =>
-	new Promise<IDBDatabase>((resolve, reject) => {
-		getObjectStore(name).then((objectStore: IDBObjectStore) => {
-			const request = objectStore.openCursor(
-				IDBKeyRange.bound(start, end, startInclude, endInclude),
-			);
-			request.onsuccess = (event: AnyEvent) =>
-				resolve(event.target.result);
-			request.onerror = (event: AnyEvent) => reject(event);
-		});
-	});
-
-export interface DBSelect {
-	add: (data: any) => Promise<IDBDatabase>;
-	get: (data: any) => Promise<IDBDatabase>;
-	getAll: () => Promise<IDBDatabase>;
-	del: (data: any) => Promise<IDBDatabase>;
-	clear: (data: any) => Promise<IDBDatabase>;
-	put: (data: any) => Promise<IDBDatabase>;
-	find: (
-		start: any,
-		end: any,
-		startInclude: any,
-		endInclude: any,
-	) => Promise<IDBDatabase>;
-}
-// 获取一个store
-export const onDBSelect = async (
-	name: string,
-	version: string
-): Promise<DBSelect> => {
-	const add = (data: any) => getStore(name, 'add', data);
-	const get = (data: any) => getStore(name, 'get', data);
-	const getAll = () => getStore(name, 'getAll', null);
-	const del = (data: any) => getStore(name, 'delete', data);
-	const clear = (data: any) => getStore(name, 'clear', data);
-	const put = (data: any) => getStore(name, 'put', data);
-	const find = (start: any, end: any, startInclude: any, endInclude: any) =>
-		findStore(name, start, end, startInclude, endInclude);
-	const options: DBSelect = { add, get, getAll, clear, del, put, find };
-	getObjectStore(name, version);
-	return options;
-};

src/backend/indexdb/indexdbbackend.ts

@@ -1,155 +0,0 @@
-import { MyResponse, IBackend } from '../ibackend'
-import { createDB, DBSelect, onDBSelect } from '../indexdb/indexdb'
-import { fileToUrl, fileToBlob } from "@/utils"
-
-const PROJECT_TABLE = "project"
-const IMAGE_TABLE = "image" // 保存图片，未实现，Todo
-const DB_NAME = "goview"
-const DB_VER = "1"
-
-export class IndexDbBackend implements IBackend {
-    public async init(data: any) {
-        let rtn:MyResponse = new MyResponse;
-        const db:IDBDatabase = await createDB(DB_NAME, DB_VER, [
-            {
-                storeName: PROJECT_TABLE,
-                option: {
-                    keyPath: "projectId", autoIncrement:true
-                },
-                index: [
-                    {name: 'projectId', keyPath: "projectId", unique: true},
-                    {name: 'projectName', keyPath: "projectName", unique: false},
-                    {name: 'release', keyPath: "release", unique: false},
-                    {name: 'remarks', keyPath: "remarks", unique: false},
-                    {name: 'content', keyPath: "content", unique: false},
-                    {name: 'indexImage', keyPath: "indexImage", unique: false}
-                ]
-            }
-        ])
-        return rtn;
-    }
-
-    public async login(data:any) {
-        let rtn:MyResponse = new MyResponse;
-        if(data.password == "123456" && data.username == "admin"){
-            rtn.data = {
-                token:{tokenValue:"mockToken", tokenName:"name"},
-                userinfo:{nickname:"nickname", username:data.username, id:1}
-            }
-        }else{
-            rtn.data = null
-            rtn.msg = "admin 和 123456"
-        }
-        return rtn;
-    }
-
-    public async logout() {
-        let rtn:MyResponse = new MyResponse;
-        return rtn;
-    }
-
-    public async checkToken(data: any) {
-        let rtn:MyResponse = new MyResponse;
-        console.log("CheckToken: " + data.token)
-        rtn.data = {
-            token:{tokenValue:"mockToken", tokenName:"name"},
-            userinfo:{nickname:"nickname", username:data.username, id:1}
-        }
-        return rtn;
-    }
-
-    public async projectList(data:any){
-        let rtn:MyResponse = new MyResponse;
-        const db:DBSelect = await onDBSelect(PROJECT_TABLE, DB_VER)
-        const r:any = await db.getAll()
-        rtn.data = []
-        r.map(function (item: any) {
-            let url = ""
-            if(item.indexImage){
-                const Url = URL || window.URL || window.webkitURL
-                url = Url.createObjectURL(item.indexImage)
-            }
-            rtn.data.push({
-                id: item.projectId,
-                title: item.projectName,
-                release: item.release == 1,
-                label:item.remarks,
-                image:url
-            })
-        })
-        return rtn;
-    }
-
-    public async createProject(data: any){
-        let rtn:MyResponse = new MyResponse;
-        const db:DBSelect = await onDBSelect(PROJECT_TABLE, DB_VER)
-        rtn.data.id = await db.add({ projectName:data.projectName })
-        return rtn;
-    }
-
-    public async fetchProject(data: any){
-        let rtn:MyResponse = new MyResponse;
-        const db:DBSelect = await onDBSelect(PROJECT_TABLE, DB_VER)
-        const r:any = await db.get(parseInt(data.projectId))
-        rtn.data = {
-            id:r.projectId,
-            projectName: r.projectName,
-            state: r.release,
-            remarks: r.remarks,
-            content: r.content
-        }
-        return rtn;
-    }
-
-    public async updateProject(data: any){
-        let rtn:MyResponse = new MyResponse;
-        const db:DBSelect = await onDBSelect(PROJECT_TABLE, DB_VER)
-        const row:any = await db.get(parseInt(data.projectId))
-        if("content" in data) row.content = data.content
-        if("projectName" in data) row.projectName = data.projectName
-        if("release" in data) row.release = data.release
-        if("remarks" in data) row.remarks = data.remarks
-        if("object" in data) {
-            row.indexImage = await fileToBlob(data.object)
-        }
-        await db.put(row)
-        return rtn;
-    }
-
-    public async copyProject(data: any){
-        let rtn:MyResponse = new MyResponse;
-        const db:DBSelect = await onDBSelect(PROJECT_TABLE, DB_VER)
-        const row:any = await db.get(parseInt(data.copyId))
-        rtn.data.id =await db.add({
-            projectName:data.projectName,
-            content:row.content,
-            indexImage:row.indexImage,
-            remarks:row.remarks
-        })
-        return rtn;
-    }
-
-    public async deleteProject(data: any){
-        let rtn:MyResponse = new MyResponse;
-        const db:DBSelect = await onDBSelect(PROJECT_TABLE, DB_VER)
-        await db.del(parseInt(data.projectId))
-        return rtn;
-    }
-
-    public async changeProjectRelease(data: any){
-        let rtn:MyResponse = new MyResponse;
-        return rtn;
-    }
-
-    public async uploadFile(data: File, params:any){
-        // Todo: 图片可以保存在表中
-        let rtn:MyResponse = new MyResponse;
-        rtn.data.uri = fileToUrl(data)
-        return rtn;
-    }
-
-    public getFileUrl(uploadUri:string){
-        return uploadUri;
-    }
-}
-

src/backend/java/axios.ts

@@ -1,71 +0,0 @@
-import axios, { AxiosResponse, AxiosRequestConfig } from 'axios'
-import { ResultEnum } from "@/enums/httpEnum"
-import { PageEnum, ErrorPageNameMap } from "@/enums/pageEnum"
-import { StorageEnum } from '@/enums/storageEnum'
-import { axiosPre } from '@/settings/httpSetting'
-import { SystemStoreEnum, SystemStoreUserInfoEnum } from '@/store/modules/systemStore/systemStore.d'
-import { redirectErrorPage, getLocalStorage, routerTurnByName, httpErrorHandle } from '@/utils'
-import { fetchAllowList } from './axios.config'
-import includes from 'lodash/includes'
-
-const axiosInstance = axios.create({
-  baseURL: `${import.meta.env.PROD ? import.meta.env.VITE_PRO_PATH : ''}${axiosPre}`,
-  timeout: ResultEnum.TIMEOUT,
-})
-
-axiosInstance.interceptors.request.use(
-  (config: AxiosRequestConfig) => {
-    // 白名单校验
-    if (includes(fetchAllowList, config.url)) return config
-    // 获取 token
-    const info = getLocalStorage(StorageEnum.GO_SYSTEM_STORE)
-    // 重新登录
-    if (!info) {
-      routerTurnByName(PageEnum.BASE_LOGIN_NAME)
-      return config
-    }
-    const userInfo = info[SystemStoreEnum.USER_INFO]
-    config.headers = {
-      ...config.headers,
-      [userInfo[SystemStoreUserInfoEnum.TOKEN_NAME] || 'token']: userInfo[SystemStoreUserInfoEnum.USER_TOKEN] || ''
-    }
-    return config
-  },
-  (err: AxiosRequestConfig) => {
-    Promise.reject(err)
-  }
-)
-
-// 响应拦截器
-axiosInstance.interceptors.response.use(
-  (res: AxiosResponse) => {
-    const { code } = res.data as { code: number }
-
-    // 成功
-    if (code === ResultEnum.SUCCESS) {
-      return Promise.resolve(res.data)
-    }
-
-    // 登录过期
-    if (code === ResultEnum.TOKEN_OVERDUE) {
-      window['$message'].error(window['$t']('http.token_overdue_message'))
-      routerTurnByName(PageEnum.BASE_LOGIN_NAME)
-      return Promise.resolve(res.data)
-    }
-
-    // 固定错误码重定向
-    if (ErrorPageNameMap.get(code)) {
-      redirectErrorPage(code)
-      return Promise.resolve(res.data)
-    }
-    
-    // 提示错误
-    window['$message'].error(window['$t']((res.data as any).msg))
-    return Promise.resolve(res.data)
-  },
-  (err: AxiosResponse) => {
-    Promise.reject(err)
-  }
-)
-
-export default axiosInstance

src/backend/java/http.ts

@@ -1,226 +0,0 @@
-import axiosInstance from './axios'
-import {
-  RequestHttpEnum,
-  ContentTypeEnum,
-  RequestBodyEnum,
-  RequestDataTypeEnum,
-  RequestContentTypeEnum,
-  RequestParamsObjType
-} from '@/enums/httpEnum'
-import type { RequestGlobalConfigType, RequestConfigType } from '@/store/modules/chartEditStore/chartEditStore.d'
-
-export const get = (url: string, params?: object) => {
-  return axiosInstance({
-    url: url,
-    method: RequestHttpEnum.GET,
-    params: params,
-  })
-}
-
-export const post = (url: string, data?: object, headersType?: string) => {
-  return axiosInstance({
-    url: url,
-    method: RequestHttpEnum.POST,
-    data: data,
-    headers: {
-      'Content-Type': headersType || ContentTypeEnum.JSON
-    }
-  })
-}
-
-export const patch = (url: string, data?: object, headersType?: string) => {
-  return axiosInstance({
-    url: url,
-    method: RequestHttpEnum.PATCH,
-    data: data,
-    headers: {
-      'Content-Type': headersType || ContentTypeEnum.JSON
-    }
-  })
-}
-
-export const put = (url: string, data?: object, headersType?: ContentTypeEnum) => {
-  return axiosInstance({
-    url: url,
-    method: RequestHttpEnum.PUT,
-    data: data,
-    headers: {
-      'Content-Type': headersType || ContentTypeEnum.JSON
-    }
-  })
-}
-
-export const del = (url: string, params?: object) => {
-  return axiosInstance({
-    url: url,
-    method: RequestHttpEnum.DELETE,
-    params
-  })
-}
-
-// 获取请求函数，默认get
-export const http = (type?: RequestHttpEnum) => {
-  switch (type) {
-    case RequestHttpEnum.GET:
-      return get
-
-    case RequestHttpEnum.POST:
-      return post
-
-    case RequestHttpEnum.PATCH:
-      return patch
-
-    case RequestHttpEnum.PUT:
-      return put
-
-    case RequestHttpEnum.DELETE:
-      return del
-
-    default:
-      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
-}
-
-/**
- * * 自定义请求
- * @param targetParams 当前组件参数
- * @param globalParams 全局参数
- */
-export const customizeHttp = (targetParams: RequestConfigType, globalParams: RequestGlobalConfigType) => {
-  if (!targetParams || !globalParams) {
-    return
-  }
-
-  // 全局
-  const {
-    // 全局请求源地址
-    requestOriginUrl,
-    // 全局请求内容
-    requestParams: globalRequestParams
-  } = globalParams
-
-  // 目标组件（优先级 > 全局组件）
-  const {
-    // 请求地址
-    requestUrl,
-    // 普通 / sql
-    requestContentType,
-    // 获取数据的方式
-    requestDataType,
-    // 请求方式 get/post/del/put/patch
-    requestHttpType,
-    // 请求体类型 none / form-data / x-www-form-urlencoded / json /xml
-    requestParamsBodyType,
-    // SQL 请求对象
-    requestSQLContent,
-    // 请求内容 params / cookie / header / body: 同 requestParamsBodyType
-    requestParams: targetRequestParams
-  } = targetParams
-
-  // 静态排除
-  if (requestDataType === RequestDataTypeEnum.STATIC) return
-
-  if (!requestUrl) {
-    return
-  }
-
-  // 处理头部
-  let headers: RequestParamsObjType = {
-    ...globalRequestParams.Header,
-    ...targetRequestParams.Header
-  }
-  headers = translateStr(headers)
-
-  // data 参数
-  let data: RequestParamsObjType | FormData | string = {}
-  // params 参数
-  let params: RequestParamsObjType = { ...targetRequestParams.Params }
-  params = translateStr(params)
-  // form 类型处理
-  let formData: FormData = new FormData()
-  formData.set('default', 'defaultData')
-  // 类型处理
-
-  switch (requestParamsBodyType) {
-    case RequestBodyEnum.NONE:
-      break
-
-    case RequestBodyEnum.JSON:
-      headers['Content-Type'] = ContentTypeEnum.JSON
-      data = translateStr(JSON.parse(targetRequestParams.Body['json']))
-      // json 赋值给 data
-      break
-
-    case RequestBodyEnum.XML:
-      headers['Content-Type'] = ContentTypeEnum.XML
-      // xml 字符串赋值给 data
-      data = translateStr(targetRequestParams.Body['xml'])
-      break
-
-    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, translateStr(bodyFormData[i]))
-      // FormData 赋值给 data
-      data = formData
-      break
-    }
-
-    case RequestBodyEnum.FORM_DATA: {
-      headers['Content-Type'] = ContentTypeEnum.FORM_DATA
-      const bodyFormUrlencoded = targetRequestParams.Body['form-data']
-      for (const i in bodyFormUrlencoded) {
-        formData.set(i, translateStr(bodyFormUrlencoded[i]))
-      }
-      // FormData 赋值给 data
-      data = formData
-      break
-    }
-  }
-
-  // sql 处理
-  if (requestContentType === RequestContentTypeEnum.SQL) {
-    headers['Content-Type'] = ContentTypeEnum.JSON
-    data = requestSQLContent
-  }
-
-  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/backend/mock/mockbackend.ts

@@ -1,130 +0,0 @@
-import { MyResponse, IBackend } from './ibackend'
-import { fileToUrl } from '@/utils'
-
-
-/**
- * MockBackend
- * 模拟纯前端，不会保存，也不报错。
- */
-
-export class MockBackend implements IBackend {
-    public async init(data: any) {
-        let rtn:MyResponse = new MyResponse;
-        return rtn;
-    }
-
-    public async login(data:any) {
-        let rtn:MyResponse = new MyResponse;
-        if(data.password == "123456" && data.username == "admin"){
-            rtn.data = {
-                token:{tokenValue:"mockToken", tokenName:"name"},
-                userinfo:{nickname:"nickname", username:data.username, id:1}
-            }
-        }else{
-            rtn.data = null
-            rtn.msg = "用户名或密码错误！"
-        }
-        return rtn;
-    }
-
-    public async logout() {
-        let rtn:MyResponse = new MyResponse;
-        return rtn;
-    }
-
-    public async checkToken(data:any){
-        let rtn:MyResponse = new MyResponse;
-        return rtn;
-    }
-
-    public async projectList(data:any){
-        let rtn:MyResponse = new MyResponse;
-        rtn.data =[
-            {
-              id: 1,
-              title: '假数据不可用',
-              release: true,
-              label: '官方案例'
-            },
-            {
-              id: 2,
-              title: '物料2-假数据不可用',
-              release: false,
-              label: '官方案例'
-            },
-            {
-              id: 3,
-              title: '物料3-假数据不可用',
-              release: false,
-              label: '官方案例'
-            },
-            {
-              id: 4,
-              title: '物料4-假数据不可用',
-              release: false,
-              label: '官方案例'
-            },
-            {
-              id: 5,
-              title: '物料5-假数据不可用',
-              release: false,
-              label: '官方案例'
-            }
-          ];
-        return rtn;
-    }
-
-    public async createProject(data: any){
-        let rtn:MyResponse = new MyResponse;
-        rtn.data.id = "newId"
-        return rtn;
-    }
-
-    public async fetchProject(data: any){
-        let rtn:MyResponse = new MyResponse;
-        rtn.data = {
-            id:data.projectId,
-            projectName: '假数据不可用',
-            indexImage:'',
-            state: 0,
-            remarks: '官方案例',
-            content: null
-        }
-        return rtn;
-    }
-
-    public async saveProject(data: object){
-        let rtn:MyResponse = new MyResponse;
-        return rtn;
-    }
- 
-    public async updateProject(data: any){
-        let rtn:MyResponse = new MyResponse;
-        return rtn;
-    }
-
-    public async copyProject(data: any){
-        let rtn:MyResponse = new MyResponse;
-        return rtn;
-    }
-
-    public async deleteProject(data: any){
-        let rtn:MyResponse = new MyResponse;
-        return rtn;
-    }
-
-    public async changeProjectRelease(data: any){
-        let rtn:MyResponse = new MyResponse;
-        return rtn;
-    }
-
-    public async uploadFile(data: File, params:any){
-        let rtn:MyResponse = new MyResponse;
-        rtn.data.uri = fileToUrl(data)
-        return rtn;
-    }
-
-    public getFileUrl(uploadUri:string){
-        return uploadUri;
-    }
-}

src/components/Flipper/index.ts

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

src/components/Flipper/index.vue

@@ -1,224 +0,0 @@
-<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

@@ -190,14 +190,11 @@ const handleChange = (e: MouseEvent, item: ListType) => {
     width: 100px;
   }
   .select-min-width {
-    width: 115px;
+    width: 110px;
   }
   @include deep() {
-    .n-list-item {
-      border-bottom: 0!important;
-    }
-    .n-list-item__divider {
-      display: none!important;
+    .n-list-item:not(:last-child) {
+      border-bottom: 0;
     }
   }
 }

src/components/I18n/index.vue

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

src/components/Pages/ChartItemSetting/GlobalSetting.vue

@@ -21,23 +21,6 @@
     </setting-item-box>
   </collapse-item>
 
-  <collapse-item v-if="grid" name="容器">
-    <setting-item-box name="距离">
-      <setting-item name="左侧距离">
-        <n-input v-model:value="grid.left" size="small"></n-input>
-      </setting-item>
-      <setting-item name="右侧距离">
-        <n-input v-model:value="grid.right" size="small"></n-input>
-      </setting-item>
-      <setting-item name="上侧距离">
-        <n-input v-model:value="grid.top" size="small"></n-input>
-      </setting-item>
-      <setting-item name="下侧距离">
-        <n-input v-model:value="grid.bottom" size="small"></n-input>
-      </setting-item>
-    </setting-item-box>
-  </collapse-item>
-
   <collapse-item v-if="xAxis" name="X轴">
     <template #header>
       <n-switch v-model:value="xAxis.show" size="small"></n-switch>
@@ -68,9 +51,6 @@
       <setting-item name="大小">
         <n-input-number v-model:value="xAxis.axisLabel.fontSize" :min="8" size="small"></n-input-number>
       </setting-item>
-      <setting-item name="偏移量">
-        <n-input-number v-model:value="xAxis.axisLabel.rotate" :min="-90" :max="90" size="small"></n-input-number>
-      </setting-item>
     </setting-item-box>
     <setting-item-box name="轴线">
       <setting-item name="展示">
@@ -160,9 +140,6 @@
       <setting-item name="大小">
         <n-input-number v-model:value="yAxis.axisLabel.fontSize" :min="8" size="small"></n-input-number>
       </setting-item>
-      <setting-item name="偏移量">
-        <n-input-number v-model:value="yAxis.axisLabel.rotate" :min="-90" :max="90" size="small"></n-input-number>
-      </setting-item>
     </setting-item-box>
     <setting-item-box name="轴线">
       <setting-item name="展示">
@@ -253,15 +230,15 @@
       </setting-item>
     </setting-item-box>
 
-    <setting-item-box name="控制块">
+    <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>
+        <n-input-number v-model:value="visualMap.temWidth" size="small"></n-input-number>
       </setting-item>
       <setting-item name="高度">
-        <n-input-number v-model:value="visualMap.itemHeight" :min="5" size="small"></n-input-number>
+        <n-input-number v-model:value="visualMap.itemHeight" size="small"></n-input-number>
       </setting-item>
       <setting-item name="反转">
         <n-space>
@@ -275,6 +252,14 @@
       </setting-item>
     </setting-item-box>
     <global-setting-position :targetData="visualMap"></global-setting-position>
+    <!-- <setting-item-box name="位置">
+      <setting-item name="距离底部">
+        <n-input-number v-model:value="visualMap.bottom" size="small"></n-input-number>
+      </setting-item>
+      <setting-item name="距离左侧">
+        <n-input-number v-model:value="visualMap.left" size="small"></n-input-number>
+      </setting-item>
+    </setting-item-box> -->
   </collapse-item>
 </template>
 
@@ -312,10 +297,6 @@ const legend = computed(() => {
   return props.optionData.legend
 })
 
-const grid = computed(() => {
-  return props.optionData.grid
-})
-
 const visualMap = computed(() => {
   return props.optionData.visualMap
 })

src/components/Pages/ChartItemSetting/GlobalSettingPosition.vue

@@ -1,5 +1,5 @@
 <template>
-  <setting-item-box v-if="targetData" name="位置">
+  <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>

src/components/Pages/ChartItemSetting/StylesSetting.vue

@@ -1,12 +1,12 @@
 <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>
+      <n-switch v-if="isCanvas" v-model:value="chartStyles.filterShow" size="small"></n-switch>
     </template>
     <setting-item-box name="色相" :alone="true">
       <setting-item :name="`值：${chartStyles.hueRotate}deg`">
@@ -69,24 +69,6 @@
       </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轴(平面) - 旋转">
@@ -144,15 +126,14 @@
     </setting-item-box>
 
     <!-- 提示 -->
-    <n-tag type="warning"> 若预览时大屏模糊，可以尝试关闭滤镜进行修复 </n-tag>
+    <n-tag v-show="isCanvas" type="warning"> 若预览时大屏模糊，可以尝试关闭滤镜进行修复 </n-tag>
   </collapse-item>
 </template>
 
 <script setup lang="ts">
 import { PropType } from 'vue'
-import { PickCreateComponentType, BlendModeEnumList } from '@/packages/index.d'
+import { PickCreateComponentType } from '@/packages/index.d'
 import { SettingItemBox, SettingItem, CollapseItem } from '@/components/Pages/ChartItemSetting'
-import { icon } from '@/plugins'
 
 const props = defineProps({
   isGroup: {
@@ -169,14 +150,14 @@ const props = defineProps({
   }
 })
 
-const { HelpOutlineIcon } = icon.ionicons5
-
-// 百分比格式化 person
+// 百分比格式化persen
 const sliderFormatTooltip = (v: string) => {
+  // @ts-ignore
   return `${(parseFloat(v) * 100).toFixed(0)}%`
 }
 // 角度格式化
 const degFormatTooltip = (v: string) => {
+  // @ts-ignore
   return `${v}deg`
 }
 </script>

src/components/Plugins/DialogContent/index.vue

@@ -1,7 +1,6 @@
-<!-- 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,4 +1,3 @@
-<!-- eslint-disable vue/valid-template-root -->
 <template></template>
 
 <script lang="ts" setup>

src/components/Plugins/MessageContent/index.vue

@@ -1,8 +1,7 @@
-<!-- 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/enums/editPageEnum.ts

@@ -1,7 +1,7 @@
 // 鼠标点击左右键
 export enum MouseEventButton {
   LEFT = 1,
-  RIGHT = 2
+  RIGHT = 2,
 }
 
 // 页面拖拽键名
@@ -41,16 +41,7 @@ export enum MenuEnum {
   // 后退
   BACK = 'back',
   FORWORD = 'forward',
-  // 保存
-  SAVE = 'save',
-  // 锁定
-  LOCK = 'lock',
-  // 解除锁定
-  UNLOCK = 'unLock',
-  // 隐藏
-  HIDE = 'hide',
-  // 显示
-  SHOW = 'show'
+  SAVE = 'save'
 }
 
 // Win 键盘枚举
@@ -58,9 +49,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 键盘枚举
@@ -69,9 +60,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

@@ -1,6 +1,10 @@
-/**
- * @description: 请求结果集
- */
+// 模块 Path 前缀分类
+export enum ModuleTypeEnum {
+  SYSTEM = 'sys',
+  PROJECT = 'project',
+}
+
+// 请求结果集
 export enum ResultEnum {
   DATA_SUCCESS = 0,
   SUCCESS = 200,
@@ -8,7 +12,7 @@ export enum ResultEnum {
   SERVER_FORBIDDEN = 403,
   NOT_FOUND = 404,
   TOKEN_OVERDUE = 886,
-  TIMEOUT = 60000
+  TIMEOUT = 10042,
 }
 
 // 数据相关
@@ -33,9 +37,7 @@ export enum RequestHttpHeaderEnum {
   COOKIE = 'Cookie'
 }
 
-/**
- * @description: 请求方法
- */
+// 请求方法
 export enum RequestHttpEnum {
   GET = 'get',
   POST = 'post',
@@ -116,9 +118,7 @@ export type RequestParams = {
   }
 }
 
-/**
- * @description:  常用的contentTyp类型
- */
+// 常用的contentTyp类型
 export enum ContentTypeEnum {
   // json
   JSON = 'application/json;charset=UTF-8',

src/enums/storageEnum.ts

@@ -1,10 +1,8 @@
 export enum StorageEnum {
   // 全局设置
-  GO_SYSTEM_SETTING_STORE = 'GO_SYSTEM_SETTING',
-  // token 等信息
-  GO_ACCESS_TOKEN_STORE = 'GO_ACCESS_TOKEN',
+  GO_SETTING_STORE = 'GO_SETTING',
   // 登录信息
-  GO_LOGIN_INFO_STORE = 'GO_LOGIN_INFO',
+  GO_SYSTEM_STORE = 'GO_SYSTEM',
   // 语言
   GO_LANG_STORE = 'GO_LANG',
   // 当前选择的主题

src/hooks/index.ts

@@ -2,4 +2,4 @@ export * from '@/hooks/useTheme.hook'
 export * from '@/hooks/usePreviewScale.hook'
 export * from '@/hooks/useCode.hook'
 export * from '@/hooks/useChartDataFetch.hook'
-export * from '@/hooks/useLifeHandler.hook'
+export * from '@/hooks/useSystemInit.hook'

src/hooks/useChartDataFetch.hook.ts

@@ -25,7 +25,7 @@ export const useChartDataFetch = (
 
   const requestIntervalFn = () => {
     const chartEditStore = useChartEditStore()
-
+    
     // 全局数据
     const {
       requestOriginUrl,
@@ -59,18 +59,18 @@ export const useChartDataFetch = (
 
         const fetchFn = async () => {
           const res = await customizeHttp(toRaw(targetComponent.request), toRaw(chartEditStore.requestGlobalConfig))
-          if (res) {
+          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, res, filter) })
+                  vChartRef.value.setOption({ dataset: newFunctionHandle(res.data, filter) })
                 }
               }
               // 更新回调函数
               if (updateCallback) {
-                updateCallback(newFunctionHandle(res?.data, res, filter))
+                updateCallback(newFunctionHandle(res.data, filter))
               }
             } catch (error) {
               console.error(error)
@@ -88,10 +88,7 @@ export const useChartDataFetch = (
         // 开启轮询
         if (time) fetchInterval = setInterval(fetchFn, intervalUnitHandle(time, unit))
       }
-      // eslint-disable-next-line no-empty
-    } catch (error) {
-      console.log(error)
-    }
+    } catch (error) {}
   }
 
   isPreview() && requestIntervalFn()

src/hooks/useLifeHandler.hook.ts

@@ -1,280 +0,0 @@
-import { CreateComponentType, EventLife } from '@/packages/index.d'
-import * as echarts from 'echarts'
-import { BackEndFactory } from '@/backend/ibackend'
-import { reactive, toRef , watch, computed} from 'vue';
-
-/**
- * 事件测试：
- * 
-切换显示名称为 饼图 和 柱状图 的图标
-const range = runtime.fn.selectComponents("饼图 柱状图")
-const h = runtime.fn.getChartConfig(range, "hide")
-runtime.fn.setChartConfig(range, "hide", !h)
-
-修改一个名称 柱状图001 组件id 2wolqibrx3c000 的图表数据，以下两句等效
-runtime.fn.setChartConfig("柱状图001", "dataset", {"dimensions":["product","data1","data2"],"source":[{"product":"Mon","data1":120,"data2":130}]})
-runtime.fn.setChartConfig("#2wolqibrx3c000", "dataset", {"dimensions":["product","data1","data2"],"source":[{"product":"Mon","data1":120,"data2":230}]})
-
-找到一个组并隐藏
-const c = runtime.fn.selectOneComponent("分组")
-if(c){
-  console.log(runtime.fn.getChartConfig(c, "isGroup" ))
-  runtime.fn.setChartConfig(c, "hide", true)
-}
-
-调用组件 exposed 函数的例子
-组件中增加： defineExpose({ actionTest:actionTest })
-以下调用名称为 柱状图 组件的 actionTest
-runtime.fn.callExposed("柱状图", "actionTest")
-
-
-数据驱动界面：
-图表A 的 MOUNTED 加入对 status1 的 Watch， = "0" 隐藏
-watch(()=>runtime.variables.status1, newValue => runtime.fn.setChartConfig(this, "hide", newValue == "0"))
-图表B 的 MOUNTED 也加入对 status1 的 Watch = "1" 隐藏
-watch(()=>runtime.variables.status1, newValue => runtime.fn.setChartConfig(this, "hide", newValue == "1"))
-点击事件代码，实现图表A 和 图表B 的切换显示：
-if(runtime.variables.status1 == "0"){
-  runtime.variables.status1 = "1"
-} else{
-  runtime.variables.status1 = "0"
-}
-
-图表A 的 MOUNTED 加入对 data1 的 Watch
-watch(()=>runtime.datasets.data1, 
-newValue => runtime.fn.setChartConfig(this, "dataset", newValue))
-图表B 的 MOUNTED 加入对 data1 的 Watch
-watch(()=>runtime.datasets.data1, 
-newValue => runtime.fn.setChartConfig(this, "dataset", newValue))
-点击事件代码，修改datasets.data1，同时更新图表A 和 图表B 的数据 ：
-runtime.datasets.data1 = {"dimensions":["product","data1","data2"],"source":[{"product":"Mon","data1":120,"data2":230}]}
-
- * 
- */
-
-
-
-
-
-// * 初始化
-export const useSystemInit = async () => {
-  const res = await BackEndFactory.init({}) as any;
-}
-
-const getOneChartConfig = (component:any, configName:string, params?:any)=>{
-  let root = null
-  if(component.proxy.chartConfig) root = component.proxy.chartConfig
-  else if (component.proxy.groupData) root = component.proxy.groupData
-  // if(!root) return null
-  switch(configName){
-    case "hide":
-      return root.status.hide
-      break;
-    case "dataset":
-      return root.option.dataset
-      break;
-    case "isGroup":
-      return root.isGroup
-      break;
-    case "key":
-      return root.key
-      break;
-    case "attr":
-      return root.attr
-      break; 
-    case "name":
-      return root.chartConfig.title
-  }
-}
-
-const setOneChartConfig = (component:any, configName:string, newValue:any, params?:any)=>{
-  let root = null
-  if(component.proxy.chartConfig) root = component.proxy.chartConfig
-  else if (component.proxy.groupData) root = component.proxy.groupData
-  switch(configName){
-    case "hide":
-      root.status.hide = newValue
-      break;
-    case "dataset":
-      root.option.dataset = newValue
-      break;
-  }
-}
-
-
-/**
- * 选择器语法：参考 css selectors
- *     名称 组件名称，不能有空格和特殊字符（. # 引号等）
- *     [name=名称]   Todo
- *     #id  组件编号
- *     .key 组件类型  Todo
- * @param selectors 
- * @returns []
- */
-const getComponentsBySelectors = (selectors:string):any[]=>{
-  // 返回：数组，可能多个
-  let  rtn:any[] = []
-  const ar = selectors.split(" ")
-  for(let a of ar){
-    rtn = rtn.concat(getComponentsBySelector(a))
-  }
-  return rtn
-}
-
-const getComponentsBySelector = (selector:string):any[]=>{
-  // 返回：数组，可能多个
-  const rtn:any[] = []
-  if(selector.substring(0,1) == "#")
-  {
-    const key = selector.substring(1)
-    if(key in components){
-      return [components[key]]
-    }
-    return rtn
-  }
-  for (let key in components) {
-    if(getOneChartConfig(components[key], "name") == selector){
-      rtn.push(components[key])
-    }
-  }
-  return rtn
-}
-
-
-// 所有图表组件集合对象
-const components: { [K in string]?: any } = {}
-
-const runtime = {
-  // 变量，管理各种状态
-  variables:reactive({}),
-  // 数据集
-  datasets:reactive({}),
-  // 组件列表 {}
-  components:components,
-  // 帮助类
-  fn:{
-    /**
-     * 选择一个组件
-     * @param selectors string 选择器语法 | component | [component]
-     * @return 第一个符合要求的 component 或 null
-     */
-    selectOneComponent:(selectors:any)=>{
-      const cList = runtime.fn.selectComponents(selectors)
-      if(cList.length > 0){
-        return cList[0]
-      }
-      return null
-    },
-    /**
-     * 选择组件
-     * @param selectors string 选择器语法 | component | [component]
-     * @return 要求的 [component] 或 []
-     */
-    selectComponents:(selectors:any):any[]=>{
-      if(!selectors) return []
-      if(typeof selectors == "string") return getComponentsBySelectors(selectors)
-      if(Array.isArray(selectors)) return selectors
-      return [selectors]
-    },
-    /**
-     * 获取组件的值，如果多个，使用第一个
-     * @param selectors string 选择器语法 | component | [component]
-     * @param configName 配置名称
-     * @param params 备用参数，可选
-     * @returns 配置的值
-     */
-    getChartConfig:(selectors:any, configName:string, params?:any)=>{
-      const component:any = runtime.fn.selectOneComponent(selectors)
-      if(!component && !component.proxy) return null
-      return getOneChartConfig(component, configName, params)
-    },
-    /**
-     * 设置组件的值，支持多个
-     * @param selectors string 选择器语法 | component | [component]
-     * @param configName 配置名称
-     * @param newValue 新值
-     * @param params 备用参数，可选
-     * @returns 配置的值
-     */
-    setChartConfig:(selectors:any, configName:string, newValue:any, params?:any)=>{
-      const cList:any[] = runtime.fn.selectComponents(selectors)
-      for(let c of cList){
-        if(!c && !c.proxy) return null
-        setOneChartConfig(c, configName, newValue, params)
-      }
-    },
-    /**
-     * 调用组件暴露的函数，组件中使用 defineExpose 进行定义
-     * @param selectors string 选择器语法 | component | [component]
-     * @param action 组件中 defineExpose 的函数名
-     * @param params 调用的参数只支持一个参数或没有参数
-     * @returns 无
-     */
-    callExposed:(selectors:any, action:string, params?:any)=>{
-      const cList:any[] = runtime.fn.selectComponents(selectors)
-      for(let c of cList){
-        if(!c && !c.exposed) return null
-        if(typeof c.exposed[action] == "function") c.exposed[action](params)
-      }
-    }
-  }
-}
-
-// 项目提供的npm 包变量
-export const npmPkgs = { echarts, toRef , watch, computed, runtime }
-
-export const useLifeHandler = (chartConfig: CreateComponentType) => {
-  const events = chartConfig.events || {}
-  console.log("chartConfig.events") 
-  console.log(chartConfig.events) 
-  // 生成生命周期事件
-  let lifeEvents = {
-    [EventLife.BEFORE_MOUNT](e: any) {
-      // 存储组件
-      components[chartConfig.id] = e.component
-      const fnStr = (events[EventLife.BEFORE_MOUNT] || '').trim()
-      generateFunc(fnStr, e, e.component)
-    },
-    [EventLife.MOUNTED](e: any) {
-      const fnStr = (events[EventLife.MOUNTED] || '').trim()
-      generateFunc(fnStr, e, e.component)
-    }
-  }
-  // 遍历，按需侦听
-  for(let key in EventLife)
-  {
-    if(key != "BEFORE_MOUNT" && key != "MOUNTED"){
-      const k = EventLife[key as keyof typeof EventLife] 
-      const fnStr = (events[<EventLife>k] || '').trim()
-      if(fnStr){
-        lifeEvents[k as keyof typeof lifeEvents] = (e:any) => {
-          const fnStr = (events[<EventLife>k] || '').trim()
-          generateFunc(fnStr, e, components[chartConfig.id])
-        }
-      }
-    }
-  }
-  return lifeEvents
-}
-
-/**
- *
- * @param fnStr 用户方法体代码
- * @param e 执行生命周期的动态组件实例
- */
-function generateFunc(fnStr: string, e: any, component:any) {
-  if(fnStr == "") return
-  try {
-    // npmPkgs 便于拷贝 echarts 示例时设置option 的formatter等相关内容
-    Function(`
-      "use strict";
-      return (
-        async function(e, components, node_modules){
-          const {${Object.keys(npmPkgs).join()}} = node_modules;
-          ${fnStr}
-        }
-      )`)().bind(component)(e, components, npmPkgs)
-  } catch (error) {
-    console.error(error)
-  }
-}

src/hooks/useSystemInit.hook.ts

@@ -0,0 +1,23 @@
+import { useSystemStore } from '@/store/modules/systemStore/systemStore'
+import { SystemStoreEnum } from '@/store/modules/systemStore/systemStore.d'
+import { ResultEnum } from '@/enums/httpEnum'
+import { ossUrlApi } from '@/api/path/'
+
+
+// * 初始化
+export const useSystemInit = async () => {
+  const systemStore = useSystemStore()
+
+  // 获取 OSS 信息
+  const getOssUrl = async () => {
+    const res = await ossUrlApi({}) as unknown as MyResponseType
+    if (res.code === ResultEnum.SUCCESS) {
+      systemStore.setItem(SystemStoreEnum.FETCH_INFO, {
+        OSSUrl: res.data?.bucketURL
+      })
+    }
+  }
+
+  // 执行
+  getOssUrl()
+}

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

@@ -4,21 +4,17 @@ import { CreateComponentType } from '@/packages/index.d'
 import cloneDeep from 'lodash/cloneDeep'
 import dataJson from './data.json'
 
-export const includes = ['legend', 'xAxis', 'yAxis', 'grid']
+export const includes = ['legend', 'xAxis', 'yAxis']
+
 export const seriesItem = {
   type: 'bar',
-  barWidth: 15,
-  label: {
-    show: true,
-    position: 'top',
-    color: '#fff',
-    fontSize: 12
-  },
+  barWidth: null,
   itemStyle: {
     color: null,
-    borderRadius: 2
+    borderRadius: 0
   }
 }
+
 export const option = {
   tooltip: {
     show: true,
@@ -28,7 +24,10 @@ export const option = {
       type: 'shadow'
     }
   },
-xAxis: {
+  legend: {
+    show: true
+  },
+  xAxis: {
     show: true,
     type: 'category'
   },

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

@@ -1,13 +1,24 @@
 <template>
-  <!-- Echarts 全局设置 -->
+   <!-- Echarts 全局设置 --> 
   <global-setting :optionData="optionData"></global-setting>
-  <CollapseItem v-for="(item, index) in seriesList" :key="index" :name="`柱状图-${index + 1}`" :expanded="true">
+  <CollapseItem
+    v-for="(item, index) in seriesList"
+    :key="index"
+    :name="`柱状图-${index + 1}`"
+    :expanded="true"
+  >
     <SettingItemBox name="图形">
       <SettingItem name="颜色">
-        <n-color-picker size="small" :modes="['hex']" v-model:value="item.itemStyle.color"></n-color-picker>
+        <n-color-picker
+          size="small"
+          :modes="['hex']"
+          v-model:value="item.itemStyle.color"
+        ></n-color-picker>
       </SettingItem>
       <SettingItem>
-        <n-button size="small" @click="item.itemStyle.color = null"> 恢复默认 </n-button>
+        <n-button size="small" @click="item.itemStyle.color = null">
+          恢复默认
+        </n-button>
       </SettingItem>
       <SettingItem name="宽度">
         <n-input-number
@@ -19,40 +30,24 @@
         ></n-input-number>
       </SettingItem>
       <SettingItem name="圆角">
-        <n-input-number v-model:value="item.itemStyle.borderRadius" :min="0" size="small"></n-input-number>
+        <n-input-number
+          v-model:value="item.itemStyle.borderRadius"
+          :min="0"
+          size="small"
+        ></n-input-number>
       </SettingItem>
     </SettingItemBox>
-    <setting-item-box name="标签">
-      <setting-item>
-        <n-space>
-          <n-switch v-model:value="item.label.show" size="small" />
-          <n-text>展示标签</n-text>
-        </n-space>
-      </setting-item>
-      <setting-item name="大小">
-        <n-input-number v-model:value="item.label.fontSize" size="small" :min="1"></n-input-number>
-      </setting-item>
-      <setting-item name="颜色">
-        <n-color-picker size="small" :modes="['hex']" v-model:value="item.label.color"></n-color-picker>
-      </setting-item>
-      <setting-item name="位置">
-        <n-select
-          v-model:value="item.label.position"
-          :options="[
-            { label: 'top', value: 'top' },
-            { label: 'left', value: 'left' },
-            { label: 'right', value: 'right' },
-            { label: 'bottom', value: 'bottom' }
-          ]"
-        />
-      </setting-item>
-    </setting-item-box>
   </CollapseItem>
 </template>
 
 <script setup lang="ts">
 import { PropType, computed } from 'vue'
-import { GlobalSetting, CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
+import {
+  GlobalSetting,
+  CollapseItem,
+  SettingItemBox,
+  SettingItem
+} from '@/components/Pages/ChartItemSetting'
 import { GlobalThemeJsonType } from '@/settings/chartThemes/index'
 
 const props = defineProps({

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

@@ -24,7 +24,6 @@ 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 isObject from 'lodash/isObject'
 
 const props = defineProps({
   themeSetting: {
@@ -52,22 +51,17 @@ const option = computed(() => {
 // dataset 无法变更条数的补丁
 watch(
   () => props.chartConfig.option.dataset,
-  (newData: { dimensions: any }, oldData) => {
-    try {
-      if (!isObject(newData) || !('dimensions' in newData)) return
-      if (Array.isArray(newData?.dimensions)) {
-        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 = []
-        })
+  (newData, oldData) => {
+    if (newData.dimensions.length !== oldData.dimensions.length) {
+      const seriesArr = []
+      for (let i = 0; i < newData.dimensions.length - 1; i++) {
+        seriesArr.push(seriesItem)
       }
-    } catch (error) {
-      console.log(error)
+      replaceMergeArr.value = ['series']
+      props.chartConfig.option.series = seriesArr
+      nextTick(() => {
+        replaceMergeArr.value = []
+      })
     }
   },
   {

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

@@ -4,21 +4,17 @@ import { CreateComponentType } from '@/packages/index.d'
 import cloneDeep from 'lodash/cloneDeep'
 import dataJson from './data.json'
 
-export const includes = ['legend', 'xAxis', 'yAxis', 'grid']
+export const includes = ['legend', 'xAxis', 'yAxis']
+
 export const seriesItem = {
   type: 'bar',
   barWidth: null,
-  label: {
-    show: true,
-    position: 'right',
-    color: '#fff',
-    fontSize: 12
-  },
   itemStyle: {
     color: null,
     borderRadius: 0
   }
 }
+
 export const option = {
   tooltip: {
     show: true,
@@ -28,9 +24,12 @@ export const option = {
       type: 'shadow'
     }
   },
+  legend: {
+    show: true
+  },
   xAxis: {
     show: true,
-    type: 'value'
+    type: 'value',
   },
   yAxis: {
     show: true,

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

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

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

@@ -23,7 +23,6 @@ import { useChartDataFetch } from '@/hooks'
 import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
 import { isPreview } from '@/utils'
 import { DatasetComponent, GridComponent, TooltipComponent, LegendComponent } from 'echarts/components'
-import isObject from 'lodash/isObject'
 
 const props = defineProps({
   themeSetting: {
@@ -51,22 +50,17 @@ const option = computed(() => {
 // dataset 无法变更条数的补丁
 watch(
   () => props.chartConfig.option.dataset,
-  (newData: { dimensions: any }, oldData) => {
-    try {
-      if (!isObject(newData) || !('dimensions' in newData)) return
-      if (Array.isArray(newData?.dimensions)) {
-        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 = []
-        })
+  (newData, oldData) => {
+    if (newData?.dimensions.length !== oldData?.dimensions.length) {
+      const seriesArr = []
+      for (let i = 0; i < newData.dimensions.length - 1; i++) {
+        seriesArr.push(seriesItem)
       }
-    } catch (error) {
-      console.log(error)
+      replaceMergeArr.value = ['series']
+      props.chartConfig.option.series = seriesArr
+      nextTick(() => {
+        replaceMergeArr.value = []
+      })
     }
   },
   {

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

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

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

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

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

@@ -24,7 +24,6 @@ import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore
 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: {
@@ -52,22 +51,17 @@ const option = computed(() => {
 // dataset 无法变更条数的补丁
 watch(
   () => props.chartConfig.option.dataset,
-  (newData: { dimensions: any }, oldData) => {
-    try {
-      if (!isObject(newData) || !('dimensions' in newData)) return
-      if (Array.isArray(newData?.dimensions)) {
-        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 = []
-        })
+  (newData, oldData) => {
+    if (newData?.dimensions.length !== oldData?.dimensions.length) {
+      const seriesArr = []
+      for (let i = 0; i < newData.dimensions.length - 1; i++) {
+        seriesArr.push(seriesItem)
       }
-    } catch (error) {
-      console.log(error)
+      replaceMergeArr.value = ['series']
+      props.chartConfig.option.series = seriesArr
+      nextTick(() => {
+        replaceMergeArr.value = []
+      })
     }
   },
   {

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

@@ -5,7 +5,7 @@ import { graphic } from 'echarts/core'
 import { defaultTheme, chartColorsSearch } from '@/settings/chartThemes/index'
 import dataJson from './data.json'
 
-export const includes = ['legend', 'xAxis', 'yAxis', 'grid']
+export const includes = ['legend', 'xAxis', 'yAxis']
 
 const options = {
   tooltip: {
@@ -15,6 +15,9 @@ const options = {
       type: 'line'
     }
   },
+  legend: {
+    show: true
+  },
   xAxis: {
     show: true,
     type: 'category'
@@ -28,13 +31,6 @@ const options = {
     {
       type: 'line',
       smooth: false,
-      symbolSize: 5, //设定实心点的大小
-      label: {
-        show: true,
-        position: 'top',
-        color: '#fff',
-        fontSize: 12
-      },
       lineStyle: {
         type: 'solid',
         width: 3

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

@@ -1,7 +1,12 @@
 <template>
   <!-- Echarts 全局设置 -->
   <global-setting :optionData="optionData"></global-setting>
-  <CollapseItem v-for="(item, index) in seriesList" :key="index" name="单折线面积图" :expanded="true">
+  <CollapseItem
+    v-for="(item, index) in seriesList"
+    :key="index"
+    name="单折线面积图"
+    :expanded="true"
+  >
     <SettingItemBox name="线条">
       <SettingItem name="宽度">
         <n-input-number
@@ -13,45 +18,13 @@
         ></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="实心点">
-      <SettingItem name="大小">
-        <n-input-number
-          v-model:value="item.symbolSize"
-          :min="1"
-          :max="100"
-          size="small"
-          placeholder="自动计算"
-        ></n-input-number>
-      </SettingItem>
-    </SettingItemBox>
-    <setting-item-box name="标签">
-      <setting-item>
-        <n-space>
-          <n-switch v-model:value="item.label.show" size="small" />
-          <n-text>展示标签</n-text>
-        </n-space>
-      </setting-item>
-      <setting-item name="大小">
-        <n-input-number v-model:value="item.label.fontSize" size="small" :min="1"></n-input-number>
-      </setting-item>
-      <setting-item name="颜色">
-        <n-color-picker size="small" :modes="['hex']" v-model:value="item.label.color"></n-color-picker>
-      </setting-item>
-      <setting-item name="位置">
         <n-select
-          v-model:value="item.label.position"
-          :options="[
-            { label: 'top', value: 'top' },
-            { label: 'left', value: 'left' },
-            { label: 'right', value: 'right' },
-            { label: 'bottom', value: 'bottom' }
-          ]"
-        />
-      </setting-item>
-    </setting-item-box>
+          v-model:value="item.lineStyle.type"
+          size="small"
+          :options="lineConf.lineStyle.type"
+        ></n-select>
+      </SettingItem>
+    </SettingItemBox>
   </CollapseItem>
 </template>
 
@@ -59,13 +32,18 @@
 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'
+import {
+  GlobalSetting,
+  CollapseItem,
+  SettingItemBox,
+  SettingItem
+} from '@/components/Pages/ChartItemSetting'
 
 const props = defineProps({
   optionData: {
     type: Object as PropType<GlobalThemeJsonType>,
     required: true
-  }
+  },
 })
 
 const seriesList = computed(() => {

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

@@ -43,27 +43,23 @@ const option = reactive({
 watch(
   () => chartEditStore.getEditCanvasConfig.chartThemeColor,
   (newColor: keyof typeof chartColorsSearch) => {
-    try {
-      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
-    } catch (error) {
-      console.log(error)
+    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
@@ -74,6 +70,9 @@ watch(
   () => props.chartConfig.option.dataset,
   () => {
     option.value = props.chartConfig.option
+  },
+  {
+    deep: false
   }
 )
 

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

@@ -5,9 +5,12 @@ import { graphic } from 'echarts/core'
 import { defaultTheme, chartColorsSearch } from '@/settings/chartThemes/index'
 import dataJson from './data.json'
 
-export const includes = ['legend', 'xAxis', 'yAxis', 'grid']
+export const includes = ['legend', 'xAxis', 'yAxis']
 
 const option = {
+  legend: {
+    show: true
+  },
   tooltip: {
     show: true,
     trigger: 'axis',
@@ -28,13 +31,6 @@ const option = {
     {
       type: 'line',
       smooth: false,
-      symbolSize: 5, //设定实心点的大小
-      label: {
-        show: true,
-        position: 'top',
-        color: '#fff',
-        fontSize: 12
-      },
       lineStyle: {
         width: 3,
         type: 'solid'
@@ -56,12 +52,6 @@ const option = {
     {
       type: 'line',
       smooth: false,
-      label: {
-        show: true,
-        position: 'top',
-        color: '#fff',
-        fontSize: 12
-      },
       lineStyle: {
         width: 3,
         type: 'solid'

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

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

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

@@ -42,27 +42,23 @@ const option = reactive({
 watch(
   () => chartEditStore.getEditCanvasConfig.chartThemeColor,
   (newColor: keyof typeof chartColorsSearch) => {
-    try {
-      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
-    } catch (error) {
-      console.log(error)
+    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
@@ -75,5 +71,6 @@ watch(
     option.value = props.chartConfig.option
   }
 )
+
 const { vChartRef } = useChartDataFetch(props.chartConfig, useChartEditStore)
 </script>

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

@@ -4,7 +4,7 @@ import { CreateComponentType } from '@/packages/index.d'
 import { defaultTheme, chartColorsSearch } from '@/settings/chartThemes/index'
 import dataJson from './data.json'
 
-export const includes = ['legend', 'xAxis', 'yAxis', 'grid']
+export const includes = ['legend', 'xAxis', 'yAxis']
 
 export const option = {
   tooltip: {
@@ -14,6 +14,9 @@ export const option = {
       type: 'line'
     }
   },
+  legend: {
+    show: true
+  },
   xAxis: {
     show: true,
     type: 'category'
@@ -26,7 +29,6 @@ export const option = {
   series: [
     {
       type: 'line',
-      symbolSize: 5, //设定实心点的大小
       lineStyle: {
         type: 'solid',
         width: 3,

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

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

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

@@ -43,21 +43,17 @@ const option = reactive({
 watch(
   () => chartEditStore.getEditCanvasConfig.chartThemeColor,
   (newColor: keyof typeof chartColorsSearch) => {
-    try {
-      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]
-          })
+    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
-    } catch (error) {
-      console.log(error)
+      })
     }
+    option.value = mergeTheme(props.chartConfig.option, props.themeSetting, includes)
+    props.chartConfig.option = option.value
   },
   {
     immediate: true

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

@@ -1,156 +0,0 @@
-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

@@ -1,277 +0,0 @@
-<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

@@ -1,79 +0,0 @@
-{
-  "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

@@ -1,15 +0,0 @@
-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

@@ -1,152 +0,0 @@
-<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 => {
-    try {
-      await hainanLandsHandle(newData)
-      vEchartsSetOption()
-    } catch (error) {
-      console.log(error)
-    }
-  },
-  {
-    deep: false
-  }
-)
-
-//监听地图展示区域发生变化
-watch(
-  () => props.chartConfig.option.mapRegion.adcode,
-  async newData => {
-    try {
-      await getGeojson(newData)
-      props.chartConfig.option.geo.map = newData
-      props.chartConfig.option.series.forEach((item: any) => {
-        if (item.type === 'map') item.map = newData
-      })
-      vEchartsSetOption()
-    } catch (error) {
-      console.log(error)
-    }
-  },
-  {
-    deep: false
-  }
-)
-
-// 预览
-useChartDataFetch(props.chartConfig, useChartEditStore, (newData: any) => {
-  dataSetHandle(newData)
-})
-</script>