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

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

.env

@@ -1,14 +1,8 @@
 # port
-VITE_DEV_PORT = '8001'
+VITE_DEV_PORT = '8080'
 
 # development path
-VITE_DEV_PATH = '/'
+VITE_DEV_PATH = 'http://1.117.240.165:8080'
 
 # production path
-VITE_PRO_PATH = '/'
-
-# spa-title
-VITE_GLOB_APP_TITLE = GoView
-
-# spa shortname
-VITE_GLOB_APP_SHORT_NAME = GoView
+VITE_PRO_PATH = 'http://1.117.240.165:8080'

.workflow/branch-pipeline.yml

@@ -1,51 +0,0 @@
-version: '1.0'
-name: branch-pipeline
-displayName: BranchPipeline
-stages:
-  - stage: 
-    name: compile
-    displayName: 编译
-    steps:
-      - step: build@nodejs
-        name: build_nodejs
-        displayName: Nodejs 构建
-        # 支持8.16.2、10.17.0、12.16.1、14.16.0、15.12.0五个版本
-        nodeVersion: 14.16.0
-        # 构建命令：安装依赖 -> 清除上次打包产物残留 -> 执行构建 【请根据项目实际产出进行填写】
-        commands:
-          - npm install && rm -rf ./dist && npm run build
-        # 非必填字段，开启后表示将构建产物暂存，但不会上传到制品库中，7天后自动清除
-        artifacts:
-            # 构建产物名字，作为产物的唯一标识可向下传递，支持自定义，默认为BUILD_ARTIFACT。在下游可以通过${BUILD_ARTIFACT}方式引用来获取构建物地址
-          - name: BUILD_ARTIFACT
-            # 构建产物获取路径，是指代码编译完毕之后构建物的所在路径
-            path:
-              - ./dist
-      - step: publish@general_artifacts
-        name: publish_general_artifacts
-        displayName: 上传制品
-        # 上游构建任务定义的产物名，默认BUILD_ARTIFACT
-        dependArtifact: BUILD_ARTIFACT
-        # 上传到制品库时的制品命名，默认output
-        artifactName: output
-        dependsOn: build_nodejs
-  - stage: 
-    name: release
-    displayName: 发布
-    steps:
-      - step: publish@release_artifacts
-        name: publish_release_artifacts
-        displayName: '发布'
-        # 上游上传制品任务的产出
-        dependArtifact: output
-        # 发布制品版本号
-        version: '1.0.0.0'
-        # 是否开启版本号自增，默认开启
-        autoIncrement: true
-triggers:
-  push:
-    branches:
-      exclude:
-        - master
-      include:
-        - .*

.workflow/master-pipeline.yml

@@ -1,49 +0,0 @@
-version: '1.0'
-name: master-pipeline
-displayName: MasterPipeline
-stages:
-  - stage: 
-    name: compile
-    displayName: 编译
-    steps:
-      - step: build@nodejs
-        name: build_nodejs
-        displayName: Nodejs 构建
-        # 支持8.16.2、10.17.0、12.16.1、14.16.0、15.12.0五个版本
-        nodeVersion: 14.16.0
-        # 构建命令：安装依赖 -> 清除上次打包产物残留 -> 执行构建 【请根据项目实际产出进行填写】
-        commands:
-          - npm install && rm -rf ./dist && npm run build
-        # 非必填字段，开启后表示将构建产物暂存，但不会上传到制品库中，7天后自动清除
-        artifacts:
-            # 构建产物名字，作为产物的唯一标识可向下传递，支持自定义，默认为BUILD_ARTIFACT。在下游可以通过${BUILD_ARTIFACT}方式引用来获取构建物地址
-          - name: BUILD_ARTIFACT
-            # 构建产物获取路径，是指代码编译完毕之后构建物的所在路径
-            path:
-              - ./dist
-      - step: publish@general_artifacts
-        name: publish_general_artifacts
-        displayName: 上传制品
-        # 上游构建任务定义的产物名，默认BUILD_ARTIFACT
-        dependArtifact: BUILD_ARTIFACT
-        # 上传到制品库时的制品命名，默认output
-        artifactName: output
-        dependsOn: build_nodejs
-  - stage: 
-    name: release
-    displayName: 发布
-    steps:
-      - step: publish@release_artifacts
-        name: publish_release_artifacts
-        displayName: '发布'
-        # 上游上传制品任务的产出
-        dependArtifact: output
-        # 发布制品版本号
-        version: '1.0.0.0'
-        # 是否开启版本号自增，默认开启
-        autoIncrement: true
-triggers:
-  push:
-    branches:
-      include:
-        - master

.workflow/pr-pipeline.yml

@@ -1,36 +0,0 @@
-version: '1.0'
-name: pr-pipeline
-displayName: PRPipeline
-stages:
-  - stage: 
-    name: compile
-    displayName: 编译
-    steps:
-      - step: build@nodejs
-        name: build_nodejs
-        displayName: Nodejs 构建
-        # 支持8.16.2、10.17.0、12.16.1、14.16.0、15.12.0五个版本
-        nodeVersion: 14.16.0
-        # 构建命令：安装依赖 -> 清除上次打包产物残留 -> 执行构建 【请根据项目实际产出进行填写】
-        commands:
-          - npm install && rm -rf ./dist && npm run build
-        # 非必填字段，开启后表示将构建产物暂存，但不会上传到制品库中，7天后自动清除
-        artifacts:
-            # 构建产物名字，作为产物的唯一标识可向下传递，支持自定义，默认为BUILD_ARTIFACT。在下游可以通过${BUILD_ARTIFACT}方式引用来获取构建物地址
-          - name: BUILD_ARTIFACT
-            # 构建产物获取路径，是指代码编译完毕之后构建物的所在路径
-            path:
-              - ./dist
-      - step: publish@general_artifacts
-        name: publish_general_artifacts
-        displayName: 上传制品
-        # 上游构建任务定义的产物名，默认BUILD_ARTIFACT
-        dependArtifact: BUILD_ARTIFACT
-        # 上传到制品库时的制品命名，默认output
-        artifactName: output
-        dependsOn: build_nodejs
-triggers:
-  pr:
-    branches:
-      include:
-        - master

README.md

@@ -1,156 +1,127 @@
-#### 总览
-<p align="center">
-    <img src="readme/logo-t-y.png" alt="go-view" />
-</p>
+## 总览
 
-<h4 align="center">开源、精美、便捷的「数据可视化」低代码开发平台</h4>
+![logo](readme/logo-t-y.png)
 
-#### 长期赞助商
-<div>
-  <div align="center" style="column-gap: 20px;">
-    <a
-      href="http://www.ccflow.org/?from=goviewGitee"
-      target="_blank"
-      style="
-        padding: 10px 20px;
-        display: inline-block;
-        border-radius: 10px;
-        background: #f9f9f9;
-      ">
-      <img src="readme/sponsors/ccflow-banner.png" alt="go-view" style="width: 250px;" width="250px" />
-    </a>
-    <span> &nbsp;</span>
-    <a
-      href="https://www.qeasy.cloud/"
-      target="_blank"
-      style="
-        padding: 10px 20px;
-        display: inline-block;
-        border-radius: 10px;
-        background: #f9f9f9;
-      ">
-      <img src="readme/sponsors/qyy-banner.png" alt="go-view" style="width: 250px;" width="250px"/>
-    </a>
-  </div>
-</div>
+**`master-fetch` 分支是带有后端接口请求的分支**
 
-#### 😶 **纯前端** 分支： **`master`**
+**后端项目地址：[https://gitee.com/MTrun/go-view-serve](https://gitee.com/MTrun/go-view-serve)**
 
-#### 👻 携带 **后端** 请求分支: **`master-fetch`**
+**接口说明地址：[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)**
 
-#### 📚 GoView **文档** 地址：[https://www.mtruning.club/](https://www.mtruning.club/)
+## 使用
 
-项目纯前端-Demo 地址：[https://vue.mtruning.club/](https://vue.mtruning.club/)
+所有的接口地址位置：`src\api\path\*`
 
-项目带后端-Demo 地址：[https://demo.mtruning.club/](https://demo.mtruning.club/)
+接口地址修改：`.env`
 
-文档-源码地址：[https://gitee.com/MTrun/go-view-doc](https://gitee.com/MTrun/go-view-doc)
+### 🤯 后端项目
 
-Cloud IDE 代码在线预览地址：[https://idegitee.com/dromara/go-view](https://idegitee.com/dromara/go-view)
+后端项目gitee地址：[https://gitee.com/MTrun/go-view-serve](https://gitee.com/MTrun/go-view-serve)
 
-#### 🤯 后端项目看这里!
+接口说明地址：[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)
 
-后端项目 gitee 地址：[https://gitee.com/MTrun/go-view-serve](https://gitee.com/MTrun/go-view-serve)
+```shell
+# port
+VITE_DEV_PORT = '8080'
 
-接口说明地址：[https://docs.apipost.cn/...](https://docs.apipost.cn/preview/5aa85d10a59d66ce/ddb813732007ad2b?target_id=84dbc5b0-158f-4bcb-8f74-793ac604ada3#3e053622-1e76-43f9-a039-756aee822dbb)
+# development path
+VITE_DEV_PATH = 'http://127.0.0.1:8080'
 
-其它后端方案地址：
+# production path
+VITE_PRO_PATH = 'http://127.0.0.1:8080'
+```
 
-- 【.NET】[https://gitee.com/sun_xiang_yu/go-view-dotnet](https://gitee.com/sun_xiang_yu/go-view-dotnet)
+公共前缀修改：`src\settings\httpSetting.ts`
 
-#### 整体介绍
+```shell
+// 请求前缀
+export const axiosPre = '/api/goview'
+```
 
-- 框架：基于 `Vue3` 框架编写，使用 `hooks` 写法抽离部分逻辑，使代码结构更加清晰；
+接口封装：`src\api\http.ts`
 
-- 类型：使用 `TypeScript` 进行类型约束，减少未知错误发生概率，可以大胆修改逻辑内容；
+```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,
+  })
+}
 
-- 存储：拥有本地记忆，部分配置项采用 `storage` 存储本地，提升使用体验；
+export const post = (url: string, data?: object, headersType?: string) => {
+  return axiosInstance({
+    url: url,
+    method: RequestHttpEnum.POST,
+    data: data,
+    headers: {
+      'Content-Type': headersType || ContentTypeEnum.JSON
+    }
+  })
+}
 
-- 封装：项目进行了详细的工具类封装如：路由、存储、加/解密、文件处理、主题、NaiveUI 全局方法、组件等
+export const put = (url: string, data?: object, headersType?: string) => {
+  return axiosInstance({
+    url: url,
+    method: RequestHttpEnum.PUT,
+    data: data,
+    headers: {
+      'Content-Type': headersType || ContentTypeEnum.JSON
+    }
+  })
+}
 
-- 入选 NaiveUI 社区精选资源推荐：[查看 NaiveUI 推荐列表](https://www.naiveui.com/zh-CN/light/docs/community)
+export const del = (url: string, params?: object) => {
+  return axiosInstance({
+    url: url,
+    method: RequestHttpEnum.DELETE,
+    params
+  })
+}
 
-说明文档：
-![说明文档](readme/go-view-doc.png)
+// 获取请求函数，默认get
+export const http = (type?: RequestHttpEnum) => {
+  switch (type) {
+    case RequestHttpEnum.GET:
+      return get
 
-工作台：
-![工作台](readme/go-view-canvas.png)
+    case RequestHttpEnum.POST:
+      return post
 
-请求配置：
-![请求配置](readme/go-view-fetch.png)
+    case RequestHttpEnum.PUT:
+      return put
 
-数据过滤：
-![数据过滤](readme/go-view-filter.png)
+    case RequestHttpEnum.DELETE:
+      return del
 
-高级事件编辑:
-![高级事件编辑](readme/go-view-event.png)
+    default:
+      return get
+  }
+}
 
-快捷主页：
-![快捷主页](readme/go-view-indexpage.png)
-
-主题色：
-![主题色](readme/go-view-color.png)
-
-亮白主题：
-![亮白主题](readme/go-view-theme.png)
-
-主要技术栈为：
-
-| 名称                | 版本  | 名称        | 版本   |
-| ------------------- | ----- | ----------- | ------ |
-| Vue                 | 3.2.x | TypeScript4 | 4.6.x  |
-| Vite                | 2.9.x | NaiveUI     | 2.27.x |
-| ECharts             | 5.3.x | Pinia       | 2.0.x  |
-| 详见 `package.json` | 😁    | 🥰          | 🤗     |
-
-开发环境:
-
-| 名称 | 版本    | 名称    | 版本  |
-| ---- | ------- | ------- | ----- |
-| node | 16.14.x | npm     | 8.5.x |
-| pnpm | 7.1.x   | windows | 11    |
-
-已完成图表：
-
-| 分类   | 名称             | 名称       | 名称           | 名称                     |
-| ------ | ---------------- | ---------- | -------------- | ------------------------ |
-| 图表   | 柱状图           | 横向柱状图 | 折线图         | 单/多 折线面积图(渐变色) |
-| \*     | 饼图             | 环形图     | 水球图         | 雷达图                   |
-| \*     | NaiveUI 多种进度 | 散点图     | 对数回归散点图 | 热力图                   |
-| \*     | 漏斗图           | 中国地图   | 高德地图       | 🦊                       |
-| 信息   | 文字             | 渐变文字   | 词云           | 嵌套网页                 |
-| \*     | 图片             | 视频       | 😺             | 🐯                       |
-| 列表   | 滚动排名列表     | 滚动表格   | 🐮             | 🐐                       |
-| 小组件 | 边框-01~13       | 装饰-01~05 | 数字翻牌       | 通用时间                 |
-| \*     | 数字计数         | 倒计时     | 时钟           | 🦁                       |
-
-## 浏览器支持
-
-开发和测试平台均在 `Google` 和最新版 `EDGE` 上完成，暂未测试 `IE11` 等其它浏览器，如有需求请自行测试与兼容。
-
-## 安装
-
-请查看文档：[https://www.mtruning.club/](https://www.mtruning.club/)
+```
 
 ## 代码提交
 
-- feat: 新功能
-- fix: 修复 Bug
-- docs: 文档修改
-- perf: 性能优化
-- revert: 版本回退
-- ci: CICD 集成相关
-- test: 添加测试代码
-- refactor: 代码重构
-- build: 影响项目构建或依赖修改
-- style: 不影响程序逻辑的代码修改
-- chore: 不属于以上类型的其他类型(日常事务)
+* feat: 新功能
+* fix: 修复 Bug
+* docs: 文档修改
+* perf: 性能优化
+* revert: 版本回退
+* ci: CICD集成相关
+* test: 添加测试代码
+* refactor: 代码重构
+* build: 影响项目构建或依赖修改
+* style: 不影响程序逻辑的代码修改
+* chore: 不属于以上类型的其他类型(日常事务)
 
-## 交流群
+## 交流
 
-QQ 群：663629294
-<img width="260px" src="readme/go-view-qq.png" alt="QQ群" style="border-radius: 20px" />
+QQ 群：1030129384
+
+![QQ群](readme/go-view-qq.png)
 
 ![渲染海报](readme/logo-poster.png)

build/constant.ts

@@ -1,4 +1,3 @@
-import path from 'path'
 export const OUTPUT_DIR = 'dist'
 
 // monaco-editor 路径
@@ -7,7 +6,7 @@ export const prefix = `monaco-editor/esm/vs`
 // chunk 警告大小
 export const chunkSizeWarningLimit = 2000
 
-// 禁用 brotliSize 压缩大小报告
+// 禁用 brotli 压缩大小报告
 export const brotliSize = false
 
 // 分包
@@ -15,12 +14,7 @@ export const rollupOptions = {
   output: {
     chunkFileNames: 'static/js/[name]-[hash].js',
     entryFileNames: 'static/js/[name]-[hash].js',
-    assetFileNames: (chunkInfo) => {
-      if(['.png', '.jpg', '.jpeg'].includes(path.extname(chunkInfo.name))) {
-        return `static/[ext]/[name].[ext]`
-      }
-      return `static/[ext]/[name]-[hash].[ext]`
-    },
+    assetFileNames: 'static/[ext]/[name]-[hash].[ext]',
     manualChunks: {
       jsonWorker: [`${prefix}/language/json/json.worker`],
       cssWorker: [`${prefix}/language/css/css.worker`],

build/getConfigFileName.ts

@@ -1,9 +0,0 @@
-/**
- * Get the configuration file variable name
- * @param env
- */
-export const getConfigFileName = (env: Record<string, any>) => {
-  return `__PRODUCTION__${env.VITE_GLOB_APP_SHORT_NAME || '__APP'}__CONF__`
-    .toUpperCase()
-    .replace(/\s/g, '');
-};

package.json

@@ -1,9 +1,6 @@
 {
   "name": "go-view",
-  "version": "1.2.1",
-  "engines": {
-    "node": ">=16.14 <18.0.0"
-  },
+  "version": "2.0.91",
   "scripts": {
     "dev": "vite --host",
     "build": "vue-tsc --noEmit && vite build",
@@ -14,8 +11,6 @@
     "lint:fix": "eslint --ext .js,.jsx,.ts,.tsx,.vue src --fix"
   },
   "dependencies": {
-    "@amap/amap-jsapi-loader": "^1.0.1",
-    "@amap/amap-jsapi-types": "^0.0.8",
     "@types/color": "^3.0.3",
     "@types/crypto-js": "^4.1.1",
     "@types/keymaster": "^1.6.30",
@@ -24,22 +19,19 @@
     "axios": "^0.27.2",
     "color": "^4.2.3",
     "crypto-js": "^4.1.1",
-    "dom-helpers": "^5.2.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.34.3",
+    "naive-ui": "2.33.4",
     "pinia": "^2.0.13",
     "screenfull": "^6.0.1",
-    "three": "^0.145.0",
     "vue": "^3.2.31",
     "vue-demi": "^0.13.1",
-    "vue-i18n": "^9.2.2",
+    "vue-i18n": "9.1.10",
     "vue-router": "4.0.12",
     "vue3-lazyload": "^0.2.5-beta",
     "vue3-sketch-ruler": "^1.3.3",
@@ -49,7 +41,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",
@@ -82,4 +73,4 @@
     "vue-echarts": "^6.0.2",
     "vue-tsc": "^0.28.10"
   }
-}
+}

pnpm-lock.yaml

@@ -1,8 +1,6 @@
 lockfileVersion: 5.4
 
 specifiers:
-  '@amap/amap-jsapi-loader': ^1.0.1
-  '@amap/amap-jsapi-types': ^0.0.8
   '@commitlint/cli': ^17.0.2
   '@commitlint/config-conventional': ^17.0.2
   '@types/color': ^3.0.3
@@ -10,7 +8,6 @@ specifiers:
   '@types/keymaster': ^1.6.30
   '@types/lodash': ^4.14.184
   '@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
@@ -25,7 +22,6 @@ specifiers:
   commitlint: ^17.0.2
   crypto-js: ^4.1.1
   default-passive-events: ^2.0.0
-  dom-helpers: ^5.2.1
   echarts: ^5.3.2
   echarts-liquidfill: ^3.1.0
   echarts-stat: ^1.2.0
@@ -35,7 +31,6 @@ specifiers:
   eslint-plugin-import: ^2.26.0
   eslint-plugin-prettier: ^4.0.0
   eslint-plugin-vue: ^8.5.0
-  gsap: ^3.11.3
   highlight.js: ^11.5.0
   html2canvas: ^1.4.1
   husky: ^8.0.1
@@ -43,14 +38,13 @@ specifiers:
   lodash: ~4.17.21
   mockjs: ^1.1.0
   monaco-editor: ^0.33.0
-  naive-ui: 2.34.3
+  naive-ui: 2.33.4
   pinia: ^2.0.13
   plop: ^3.0.5
   prettier: ^2.6.2
   sass: ^1.49.11
   sass-loader: ^12.6.0
   screenfull: ^6.0.1
-  three: ^0.145.0
   typescript: 4.6.3
   vite: 2.9.9
   vite-plugin-compression: ^0.5.1
@@ -60,7 +54,7 @@ specifiers:
   vue: ^3.2.31
   vue-demi: ^0.13.1
   vue-echarts: ^6.0.2
-  vue-i18n: ^9.2.2
+  vue-i18n: 9.1.10
   vue-router: 4.0.12
   vue-tsc: ^0.28.10
   vue3-lazyload: ^0.2.5-beta
@@ -68,8 +62,6 @@ specifiers:
   vuedraggable: ^4.1.0
 
 dependencies:
-  '@amap/amap-jsapi-loader': 1.0.1
-  '@amap/amap-jsapi-types': 0.0.8
   '@types/color': 3.0.3
   '@types/crypto-js': 4.1.1
   '@types/keymaster': 1.6.30
@@ -78,22 +70,19 @@ dependencies:
   axios: 0.27.2
   color: 4.2.3
   crypto-js: 4.1.1
-  dom-helpers: 5.2.1
   echarts-liquidfill: 3.1.0_echarts@5.3.3
   echarts-stat: 1.2.0
   echarts-wordcloud: 2.0.0_echarts@5.3.3
-  gsap: 3.11.3
   highlight.js: 11.5.1
   html2canvas: 1.4.1
   keymaster: 1.6.2
   monaco-editor: 0.33.0
-  naive-ui: 2.34.3_vue@3.2.37
+  naive-ui: 2.33.4_vue@3.2.37
   pinia: 2.0.14_ub5l46u3nefphax5x2tezui4oq
   screenfull: 6.0.1
-  three: 0.145.0
   vue: 3.2.37
   vue-demi: 0.13.1_vue@3.2.37
-  vue-i18n: 9.2.2_vue@3.2.37
+  vue-i18n: 9.1.10_vue@3.2.37
   vue-router: 4.0.12_vue@3.2.37
   vue3-lazyload: 0.2.5-beta_2yymnzrok6eda47acnj2yjm3ae
   vue3-sketch-ruler: 1.3.4_vue@3.2.37
@@ -103,7 +92,6 @@ devDependencies:
   '@commitlint/cli': 17.0.2
   '@commitlint/config-conventional': 17.0.2
   '@types/node': 16.11.40
-  '@types/three': 0.144.0
   '@typescript-eslint/eslint-plugin': 5.28.0_evi7yu7wunhzwb24olrfvzynny
   '@typescript-eslint/parser': 5.28.0_sfmgizikprcxt7r54j7cnzjamu
   '@vicons/carbon': 0.12.0
@@ -138,14 +126,6 @@ devDependencies:
 
 packages:
 
-  /@amap/amap-jsapi-loader/1.0.1:
-    resolution: {integrity: sha512-nPyLKt7Ow/ThHLkSvn2etQlUzqxmTVgK7bIgwdBRTg2HK5668oN7xVxkaiRe3YZEzGzfV2XgH5Jmu2T73ljejw==}
-    dev: false
-
-  /@amap/amap-jsapi-types/0.0.8:
-    resolution: {integrity: sha512-q0FyZDIJcXjsMLGc3oS9rjfJsErOvt9rcp6AgzY4k14vo7bBhdq4eKwoSdVp/pYjR/rfaKBns5v10ycZOFwf/A==}
-    dev: false
-
   /@ampproject/remapping/2.2.0:
     resolution: {integrity: sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==}
     engines: {node: '>=6.0.0'}
@@ -404,13 +384,6 @@ packages:
       - supports-color
     dev: true
 
-  /@babel/runtime/7.20.6:
-    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      regenerator-runtime: 0.13.11
-    dev: false
-
   /@babel/template/7.16.7:
     resolution: {integrity: sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==}
     engines: {node: '>=6.9.0'}
@@ -680,42 +653,60 @@ packages:
     resolution: {integrity: sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==}
     dev: true
 
-  /@intlify/core-base/9.2.2:
-    resolution: {integrity: sha512-JjUpQtNfn+joMbrXvpR4hTF8iJQ2sEFzzK3KIESOx+f+uwIjgw20igOyaIdhfsVVBCds8ZM64MoeNSx+PHQMkA==}
-    engines: {node: '>= 14'}
+  /@intlify/core-base/9.1.10:
+    resolution: {integrity: sha512-So9CNUavB/IsZ+zBmk2Cv6McQp6vc2wbGi1S0XQmJ8Vz+UFcNn9MFXAe9gY67PreIHrbLsLxDD0cwo1qsxM1Nw==}
+    engines: {node: '>= 10'}
     dependencies:
-      '@intlify/devtools-if': 9.2.2
-      '@intlify/message-compiler': 9.2.2
-      '@intlify/shared': 9.2.2
-      '@intlify/vue-devtools': 9.2.2
+      '@intlify/devtools-if': 9.1.10
+      '@intlify/message-compiler': 9.1.10
+      '@intlify/message-resolver': 9.1.10
+      '@intlify/runtime': 9.1.10
+      '@intlify/shared': 9.1.10
+      '@intlify/vue-devtools': 9.1.10
     dev: false
 
-  /@intlify/devtools-if/9.2.2:
-    resolution: {integrity: sha512-4ttr/FNO29w+kBbU7HZ/U0Lzuh2cRDhP8UlWOtV9ERcjHzuyXVZmjyleESK6eVP60tGC9QtQW9yZE+JeRhDHkg==}
-    engines: {node: '>= 14'}
+  /@intlify/devtools-if/9.1.10:
+    resolution: {integrity: sha512-SHaKoYu6sog3+Q8js1y3oXLywuogbH1sKuc7NSYkN3GElvXSBaMoCzW+we0ZSFqj/6c7vTNLg9nQ6rxhKqYwnQ==}
+    engines: {node: '>= 10'}
     dependencies:
-      '@intlify/shared': 9.2.2
+      '@intlify/shared': 9.1.10
     dev: false
 
-  /@intlify/message-compiler/9.2.2:
-    resolution: {integrity: sha512-IUrQW7byAKN2fMBe8z6sK6riG1pue95e5jfokn8hA5Q3Bqy4MBJ5lJAofUsawQJYHeoPJ7svMDyBaVJ4d0GTtA==}
-    engines: {node: '>= 14'}
+  /@intlify/message-compiler/9.1.10:
+    resolution: {integrity: sha512-+JiJpXff/XTb0EadYwdxOyRTB0hXNd4n1HaJ/a4yuV960uRmPXaklJsedW0LNdcptd/hYUZtCkI7Lc9J5C1gxg==}
+    engines: {node: '>= 10'}
     dependencies:
-      '@intlify/shared': 9.2.2
+      '@intlify/message-resolver': 9.1.10
+      '@intlify/shared': 9.1.10
       source-map: 0.6.1
     dev: false
 
-  /@intlify/shared/9.2.2:
-    resolution: {integrity: sha512-wRwTpsslgZS5HNyM7uDQYZtxnbI12aGiBZURX3BTR9RFIKKRWpllTsgzHWvj3HKm3Y2Sh5LPC1r0PDCKEhVn9Q==}
-    engines: {node: '>= 14'}
+  /@intlify/message-resolver/9.1.10:
+    resolution: {integrity: sha512-5YixMG/M05m0cn9+gOzd4EZQTFRUu8RGhzxJbR1DWN21x/Z3bJ8QpDYj6hC4FwBj5uKsRfKpJQ3Xqg98KWoA+w==}
+    engines: {node: '>= 10'}
     dev: false
 
-  /@intlify/vue-devtools/9.2.2:
-    resolution: {integrity: sha512-+dUyqyCHWHb/UcvY1MlIpO87munedm3Gn6E9WWYdWrMuYLcoIoOEVDWSS8xSwtlPU+kA+MEQTP6Q1iI/ocusJg==}
-    engines: {node: '>= 14'}
+  /@intlify/runtime/9.1.10:
+    resolution: {integrity: sha512-7QsuByNzpe3Gfmhwq6hzgXcMPpxz8Zxb/XFI6s9lQdPLPe5Lgw4U1ovRPZTOs6Y2hwitR3j/HD8BJNGWpJnOFA==}
+    engines: {node: '>= 10'}
     dependencies:
-      '@intlify/core-base': 9.2.2
-      '@intlify/shared': 9.2.2
+      '@intlify/message-compiler': 9.1.10
+      '@intlify/message-resolver': 9.1.10
+      '@intlify/shared': 9.1.10
+    dev: false
+
+  /@intlify/shared/9.1.10:
+    resolution: {integrity: sha512-Om54xJeo1Vw+K1+wHYyXngE8cAbrxZHpWjYzMR9wCkqbhGtRV5VLhVc214Ze2YatPrWlS2WSMOWXR8JktX/IgA==}
+    engines: {node: '>= 10'}
+    dev: false
+
+  /@intlify/vue-devtools/9.1.10:
+    resolution: {integrity: sha512-5l3qYARVbkWAkagLu1XbDUWRJSL8br1Dj60wgMaKB0+HswVsrR6LloYZTg7ozyvM621V6+zsmwzbQxbVQyrytQ==}
+    engines: {node: '>= 10'}
+    dependencies:
+      '@intlify/message-resolver': 9.1.10
+      '@intlify/runtime': 9.1.10
+      '@intlify/shared': 9.1.10
     dev: false
 
   /@jridgewell/gen-mapping/0.1.1:
@@ -880,10 +871,6 @@ packages:
     resolution: {integrity: sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==}
     dev: true
 
-  /@types/katex/0.14.0:
-    resolution: {integrity: sha512-+2FW2CcT0K3P+JMR8YG846bmDwplKUTsWgT2ENwdQ1UdVfRk3GQrh6Mi4sTopy30gI8Uau5CEqHTDZ6YvWIUPA==}
-    dev: false
-
   /@types/keymaster/1.6.30:
     resolution: {integrity: sha512-mtL/NuDBX72zmyIa3cYHA1bQj1WAYlSC4eZcIQj+DHJkcRyTRF2XJXo7DBmkkY8TEq7XaAf7B8TGxs5PHhjRtw==}
     dev: false
@@ -918,7 +905,7 @@ packages:
     dev: true
 
   /@types/node/17.0.43:
-    resolution: {integrity: sha512-jnUpgw8fL9kP2iszfIDyBQtw5Mf4/XSqy0Loc1J9pI14ejL83XcCEvSf50Gs/4ET0I9VCCDoOfufQysj0S66xA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npm.taobao.org/@types/node/-/node-17.0.43.tgz}
+    resolution: {integrity: sha512-jnUpgw8fL9kP2iszfIDyBQtw5Mf4/XSqy0Loc1J9pI14ejL83XcCEvSf50Gs/4ET0I9VCCDoOfufQysj0S66xA==, registry: https://registry.npm.taobao.org/}
 
   /@types/normalize-package-data/2.4.1:
     resolution: {integrity: sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==}
@@ -934,22 +921,12 @@ packages:
       '@types/node': 17.0.43
     dev: true
 
-  /@types/three/0.144.0:
-    resolution: {integrity: sha512-psvEs6q5rLN50jUYZ3D4pZMfxTbdt3A243blt0my7/NcL6chaCZpHe2csbCtx0SOD9fI/XnF3wnVUAYZGqCSYg==}
-    dependencies:
-      '@types/webxr': 0.5.0
-    dev: true
-
   /@types/through/0.0.30:
     resolution: {integrity: sha512-FvnCJljyxhPM3gkRgWmxmDZyAQSiBQQWLI0A0VFL0K7W1oRUrPJSqNO0NvTnLkBcotdlp3lKvaT0JrnyRDkzOg==}
     dependencies:
       '@types/node': 17.0.43
     dev: true
 
-  /@types/webxr/0.5.0:
-    resolution: {integrity: sha512-IUMDPSXnYIbEO2IereEFcgcqfDREOgmbGqtrMpVPpACTU6pltYLwHgVkrnYv0XhWEcjio9sYEfIEzgn3c7nDqA==}
-    dev: true
-
   /@typescript-eslint/eslint-plugin/5.28.0_evi7yu7wunhzwb24olrfvzynny:
     resolution: {integrity: sha512-DXVU6Cg29H2M6EybqSg2A+x8DgO9TCUBRp4QEXQHJceLS7ogVDP0g3Lkg/SZCqcvkAP/RruuQqK0gdlkgmhSUA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -1214,10 +1191,6 @@ packages:
     resolution: {integrity: sha512-IiA0SvDrJEgXvVxjNkHPFfDx6SXw0b/TUkqMcDZWNg9fnCAHbTpoo59YfJ9QLFkwa3raau5vSlRVzMSLDnfdtQ==}
     dev: false
 
-  /@vue/devtools-api/6.4.5:
-    resolution: {integrity: sha512-JD5fcdIuFxU4fQyXUu3w2KpAJHzTVdN+p4iOX2lMWSHMOoQdMAcpFLZzm9Z/2nmsoZ1a96QEhZ26e50xLBsgOQ==}
-    dev: false
-
   /@vue/reactivity-transform/3.2.37:
     resolution: {integrity: sha512-IWopkKEb+8qpu/1eMKVeXrK0NLw9HicGviJzhJDEyfxTR9e1WtpnnbYkJWurX6WwoFP0sz10xQg8yL8lgskAZg==}
     dependencies:
@@ -1911,7 +1884,7 @@ packages:
     dev: true
 
   /csstype/2.6.20:
-    resolution: {integrity: sha512-/WwNkdXfckNgw6S5R125rrW8ez139lBHWouiBvX8dfMFtcn6V81REDqnH7+CRpRipfYlyU1CmOnOxrmGcFOjeA==}
+    resolution: {integrity: sha512-/WwNkdXfckNgw6S5R125rrW8ez139lBHWouiBvX8dfMFtcn6V81REDqnH7+CRpRipfYlyU1CmOnOxrmGcFOjeA==, registry: https://registry.npm.taobao.org/}
     dev: false
 
   /csstype/3.0.11:
@@ -2064,13 +2037,6 @@ packages:
     resolution: {integrity: sha512-LLBi6pEqS6Do3EKQ3J0NqHWV5hhb78Pi8vvESYwyOy2c31ZEZVdtitdzsQsKb7878PEERhzUk0ftqGhG6Mz+pQ==}
     dev: true
 
-  /dom-helpers/5.2.1:
-    resolution: {integrity: sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==}
-    dependencies:
-      '@babel/runtime': 7.20.6
-      csstype: 3.0.11
-    dev: false
-
   /dom-serializer/1.4.1:
     resolution: {integrity: sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==}
     dependencies:
@@ -2125,7 +2091,7 @@ packages:
     dev: false
 
   /echarts-wordcloud/2.0.0_echarts@5.3.3:
-    resolution: {integrity: sha512-K7l6pTklqdW7ZWzT/1CS0KhBSINr/cd7c5N1fVMzZMwLQHEwT7x+nivK7g5hkVh7WNcAv4Dn6/ZS5zMKRozC1g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npm.taobao.org/echarts-wordcloud/-/echarts-wordcloud-2.0.0.tgz}
+    resolution: {integrity: sha512-K7l6pTklqdW7ZWzT/1CS0KhBSINr/cd7c5N1fVMzZMwLQHEwT7x+nivK7g5hkVh7WNcAv4Dn6/ZS5zMKRozC1g==, registry: https://registry.npm.taobao.org/}
     peerDependencies:
       echarts: ^5.0.1
     dependencies:
@@ -3066,10 +3032,6 @@ packages:
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==}
     dev: true
 
-  /gsap/3.11.3:
-    resolution: {integrity: sha512-xc/iIJy+LWiMbRa4IdMtdnnKa/7PXEK6NNzV71gdOYUVeTZN7UWnLU0fB7Hi1iwiz4ZZoYkBZPPYGg+2+zzFHA==}
-    dev: false
-
   /handlebars/4.7.7:
     resolution: {integrity: sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==}
     engines: {node: '>=0.4.7'}
@@ -3080,7 +3042,7 @@ packages:
       source-map: 0.6.1
       wordwrap: 1.0.0
     optionalDependencies:
-      uglify-js: 3.17.4
+      uglify-js: 3.16.0
     dev: true
 
   /hard-rejection/2.1.0:
@@ -3836,14 +3798,13 @@ packages:
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
-  /naive-ui/2.34.3_vue@3.2.37:
-    resolution: {integrity: sha512-fUMr0dzb/iGsOTWgoblPVobY5X5dihQ1eam5dA+H74oyLYAvgX4pL96xQFPBLIYqvyRFBAsN85kHN5pLqdtpxA==}
+  /naive-ui/2.33.4_vue@3.2.37:
+    resolution: {integrity: sha512-4tK2lWx3v8sbEeTLG/tL5Ur9VvZyUxSnC0VcTO6NO1rM/D15JXg8jVwQCRFYnEp7mp3gfD5B3i8kN4JisTeiFA==}
     peerDependencies:
       vue: ^3.0.0
     dependencies:
       '@css-render/plugin-bem': 0.15.10_css-render@0.15.10
       '@css-render/vue3-ssr': 0.15.10_vue@3.2.37
-      '@types/katex': 0.14.0
       '@types/lodash': 4.14.185
       '@types/lodash-es': 4.17.6
       async-validator: 4.1.1
@@ -4469,10 +4430,6 @@ packages:
       strip-indent: 3.0.0
     dev: true
 
-  /regenerator-runtime/0.13.11:
-    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
-    dev: false
-
   /regexp.prototype.flags/1.4.3:
     resolution: {integrity: sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==}
     engines: {node: '>= 0.4'}
@@ -4868,10 +4825,6 @@ packages:
     resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==}
     dev: true
 
-  /three/0.145.0:
-    resolution: {integrity: sha512-EKoHQEtEJ4CB6b2BGMBgLZrfwLjXcSUfoI/MiIXUuRpeYsfK5aPWbYhdtIVWOH+x6X0TouldHKHBuc/LAiFzAw==}
-    dev: false
-
   /through/2.3.8:
     resolution: {integrity: sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==}
     dev: true
@@ -5025,8 +4978,8 @@ packages:
     hasBin: true
     dev: true
 
-  /uglify-js/3.17.4:
-    resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==}
+  /uglify-js/3.16.0:
+    resolution: {integrity: sha512-FEikl6bR30n0T3amyBh3LoiBdqHRy/f4H80+My34HOesOKyHfOsxAPAxOoqC0JUnC1amnO0IwkYC3sko51caSw==}
     engines: {node: '>=0.8.0'}
     hasBin: true
     requiresBuild: true
@@ -5396,16 +5349,16 @@ packages:
       - supports-color
     dev: true
 
-  /vue-i18n/9.2.2_vue@3.2.37:
-    resolution: {integrity: sha512-yswpwtj89rTBhegUAv9Mu37LNznyu3NpyLQmozF3i1hYOhwpG8RjcjIFIIfnu+2MDZJGSZPXaKWvnQA71Yv9TQ==}
-    engines: {node: '>= 14'}
+  /vue-i18n/9.1.10_vue@3.2.37:
+    resolution: {integrity: sha512-jpr7gV5KPk4n+sSPdpZT8Qx3XzTcNDWffRlHV/cT2NUyEf+sEgTTmLvnBAibjOFJ0zsUyZlVTAWH5DDnYep+1g==}
+    engines: {node: '>= 10'}
     peerDependencies:
       vue: ^3.0.0
     dependencies:
-      '@intlify/core-base': 9.2.2
-      '@intlify/shared': 9.2.2
-      '@intlify/vue-devtools': 9.2.2
-      '@vue/devtools-api': 6.4.5
+      '@intlify/core-base': 9.1.10
+      '@intlify/shared': 9.1.10
+      '@intlify/vue-devtools': 9.1.10
+      '@vue/devtools-api': 6.1.4
       vue: 3.2.37
     dev: false
 

preview.yml

@@ -1,10 +0,0 @@
-# preview.yml
-autoOpen: true # 打开工作空间时是否自动开启所有应用的预览
-apps:
-  - port: 3000 # 应用的端口
-    run: npm i --registry=https://registry.npmmirror.com && npm run dev # 应用的启动命令
-    command: # 使用此命令启动服务，且不执行run
-    root: ./ # 应用的启动目录
-    name: GoView # 应用名称
-    description: 开源、精美、便捷的「数据可视化」低代码开发平台 # 应用描述
-    autoOpen: true # 打开工作空间时是否自动开启预览（优先级高于根级 autoOpen)

src/App.vue

@@ -1,9 +1,9 @@
 <template>
   <n-config-provider
+    :locale="zhCN"
     :theme="darkTheme"
     :hljs="hljsTheme"
-    :locale="locale"
-    :date-locale="dateLocale"
+    :date-locale="dateZhCN"
     :theme-overrides="overridesTheme"
   >
     <go-app-provider>
@@ -14,10 +14,11 @@
 </template>
 
 <script lang="ts" setup>
-import { NConfigProvider } from 'naive-ui'
+import { zhCN, dateZhCN, NConfigProvider } from 'naive-ui'
 import { GoAppProvider } from '@/components/GoAppProvider'
 import { I18n } from '@/components/I18n'
-import { useDarkThemeHook, useThemeOverridesHook, useCode, useLang } from '@/hooks'
+
+import { useSystemInit, useDarkThemeHook, useThemeOverridesHook, useCode } from '@/hooks'
 
 // 暗黑主题
 const darkTheme = useDarkThemeHook()
@@ -28,7 +29,6 @@ const overridesTheme = useThemeOverridesHook()
 // 代码主题
 const hljsTheme = useCode()
 
-// 全局语言
-const { locale, dateLocale } = useLang()
-
+// 系统全局数据初始化
+useSystemInit()
 </script>

src/api/axios.config.ts

@@ -0,0 +1,14 @@
+import { ModuleTypeEnum } from '@/enums/httpEnum'
+
+// 接口白名单（免登录）
+export const fetchAllowList = [
+  // 登录
+  `${ModuleTypeEnum.SYSTEM}/login`,
+  // 获取 OSS 接口
+  `${ModuleTypeEnum.SYSTEM}/getOssInfo`,
+  // 预览获取数据
+  `${ModuleTypeEnum.PROJECT}/getData`,
+]
+
+// 接口黑名单
+export const fetchBlockList = []

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 { 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] || 'token']: userInfo[SystemStoreUserInfoEnum.USER_TOKEN] || ''
+    }
     return config
   },
-  (error: AxiosRequestConfig) => {
-    Promise.reject(error)
+  (err: AxiosRequestConfig) => {
+    Promise.reject(err)
   }
 )
 
@@ -21,10 +40,27 @@ axiosInstance.interceptors.request.use(
 axiosInstance.interceptors.response.use(
   (res: AxiosResponse) => {
     const { code } = res.data as { code: number }
-    if (code === undefined || code === null) return Promise.resolve(res)
-    if (code === ResultEnum.DATA_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) => {

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,
   })
 }
 
@@ -116,6 +116,7 @@ export const customizeHttp = (targetParams: RequestConfigType, globalParams: Req
   if (!targetParams || !globalParams) {
     return
   }
+
   // 全局
   const {
     // 全局请求源地址

src/api/mock/index.ts

@@ -15,10 +15,8 @@ export const radarUrl = '/mock/radarData'
 export const heatMapUrl = '/mock/heatMapData'
 export const scatterBasicUrl = '/mock/scatterBasic'
 export const mapUrl = '/mock/map'
-export const capsuleUrl = '/mock/capsule'
 export const wordCloudUrl = '/mock/wordCloud'
 export const treemapUrl = '/mock/treemap'
-export const threeEarth01Url = '/mock/threeEarth01Data'
 
 const mockObject: MockMethod[] = [
   {
@@ -83,11 +81,6 @@ const mockObject: MockMethod[] = [
     method: RequestHttpEnum.GET,
     response: () => test.fetchMap
   },
-  {
-    url: capsuleUrl,
-    method: RequestHttpEnum.GET,
-    response: () => test.fetchCapsule
-  },
   {
     url: wordCloudUrl,
     method: RequestHttpEnum.GET,
@@ -98,11 +91,6 @@ const mockObject: MockMethod[] = [
     method: RequestHttpEnum.GET,
     response: () => test.fetchTreemap
   },
-  {
-    url: threeEarth01Url,
-    method: RequestHttpEnum.GET,
-    response: () => test.threeEarth01Data
-  },
 ]
 
 export default mockObject

src/api/mock/map.json

@@ -1,9 +1,79 @@
 {
-  "markers|50": [
+  "point": [
     {
-      "name": "某某地市",
-      "value": "@integer(2, 20)",
-      "position": ["@float(115, 117, 1, 6)", "@float(38, 40, 1, 6)"]
+      "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

@@ -10,8 +10,28 @@ export default {
     status: 200,
     msg: '请求成功',
     data: {
-    dimensions: ['product', 'dataOne'],
-      'source|20': [
+      dimensions: ['product', 'dataOne'],
+      source: [
+        {
+          product: '@name',
+          'dataOne|0-900': 3
+        },
+        {
+          product: '@name',
+          'dataOne|0-900': 3
+        },
+        {
+          product: '@name',
+          'dataOne|0-900': 3
+        },
+        {
+          product: '@name',
+          'dataOne|0-900': 3
+        },
+        {
+          product: '@name',
+          'dataOne|0-900': 3
+        },
         {
           product: '@name',
           'dataOne|0-900': 3
@@ -19,31 +39,43 @@ export default {
       ]
     }
   },
-  // 胶囊图
-  fetchCapsule: {
-    code: 0,
-    status: 200,
-    msg: '请求成功',
-    data: {
-      dimensions: ['name', 'value'],
-      "source|2-5": [
-        { 'name|+1': ["厦门","福州","北京","上海","新疆","郑州","湖南","内蒙古"], 'value|0-40': 20 },
-      ]
-    }
-  },
   // 图表
   fetchMockData: {
     code: 0,
     status: 200,
     msg: '请求成功',
     data: {
-      dimensions: ['product', 'dataOne', 'dataTwo', 'dataThree'],
-      'source|20': [
+      dimensions: ['product', 'dataOne', 'dataTwo'],
+      source: [
         {
           product: '@name',
           'dataOne|100-900': 3,
-          'dataTwo|100-900': 3,
-          'dataThree|100-900': 3
+          'dataTwo|100-900': 3
+        },
+        {
+          product: '@name',
+          'dataOne|100-900': 3,
+          'dataTwo|100-900': 3
+        },
+        {
+          product: '@name',
+          'dataOne|100-900': 3,
+          'dataTwo|100-900': 3
+        },
+        {
+          product: '@name',
+          'dataOne|100-900': 3,
+          'dataTwo|100-900': 3
+        },
+        {
+          product: '@name',
+          'dataOne|100-900': 3,
+          'dataTwo|100-900': 3
+        },
+        {
+          product: '@name',
+          'dataOne|100-900': 3,
+          'dataTwo|100-900': 3
         }
       ]
     }
@@ -53,7 +85,21 @@ export default {
     code: 0,
     status: 200,
     msg: '请求成功',
-    'data|50': [{ name: '@name', 'value|100-900': 5 }]
+    data: [
+      { name: '@name', 'value|100-900': 5 },
+      { name: '@name', 'value|100-900': 5 },
+      { name: '@name', 'value|100-900': 5 },
+      { name: '@name', 'value|100-900': 5 },
+      { name: '@name', 'value|100-900': 5 },
+      { name: '@name', 'value|100-900': 5 },
+      { name: '@name', 'value|100-900': 5 },
+      { name: '@name', 'value|100-900': 5 },
+      { name: '@name', 'value|100-900': 5 },
+      { name: '@name', 'value|100-900': 5 },
+      { name: '@name', 'value|100-900': 5 },
+      { name: '@name', 'value|100-900': 5 },
+      { name: '@name', 'value|100-900': 5 }
+    ]
   },
   // 轮播表格
   fetchScrollBoard: {
@@ -208,16 +254,4 @@ export default {
     msg: '请求成功',
     data: tTreemapJson
   },
-  // 三维地球
-  threeEarth01Data: {
-    code: 0,
-    status: 200,
-    msg: '请求成功',
-    data: [
-      {
-        startArray: { name: '@name', N: '@integer(10, 100)', E: '@integer(10, 100)' },
-        'endArray|10': [{ name: '@name', N: '@integer(10, 100)', E: '@integer(10, 100)' }]
-      }
-    ]
-  }
 }

src/api/path/index.ts

@@ -0,0 +1,2 @@
+export * from '@/api/path/project.api'
+export * from '@/api/path/system.api'

src/api/path/project.api.ts

@@ -0,0 +1,84 @@
+import { http } from '@/api/http'
+import { httpErrorHandle } from '@/utils'
+import { ContentTypeEnum, RequestHttpEnum, ModuleTypeEnum } from '@/enums/httpEnum'
+
+// * 项目列表
+export const projectListApi = async (data: object) => {
+  try { 
+    const res = await http(RequestHttpEnum.GET)(`${ModuleTypeEnum.PROJECT}/list`, data);
+    return res;
+  } catch {
+    httpErrorHandle();
+  }
+}
+
+// * 新增项目
+export const createProjectApi = async (data: object) => {
+  try { 
+    const res = await http(RequestHttpEnum.POST)(`${ModuleTypeEnum.PROJECT}/create`, data);
+    return res;
+  } catch {
+    httpErrorHandle();
+  }
+}
+
+// * 获取项目
+export const fetchProjectApi = async (data: object) => {
+  try { 
+    const res = await http(RequestHttpEnum.GET)(`${ModuleTypeEnum.PROJECT}/getData`, data);
+    return res;
+  } catch {
+    httpErrorHandle();
+  }
+}
+
+// * 保存项目
+export const saveProjectApi = async (data: object) => {
+  try { 
+    const res = await http(RequestHttpEnum.POST)(`${ModuleTypeEnum.PROJECT}/save/data`, data, ContentTypeEnum.FORM_URLENCODED);
+    return res;
+  } catch {
+    httpErrorHandle();
+  }
+}
+
+// * 修改项目基础信息
+export const updateProjectApi = async (data: object) => {
+  try {
+    const res = await http(RequestHttpEnum.POST)(`${ModuleTypeEnum.PROJECT}/edit`, data);
+    return res;
+  } catch {
+    httpErrorHandle();
+  }
+}
+
+
+// * 删除项目
+export const deleteProjectApi = async (data: object) => {
+  try { 
+    const res = await http(RequestHttpEnum.DELETE)(`${ModuleTypeEnum.PROJECT}/delete`, data);
+    return res;
+  } catch {
+    httpErrorHandle();
+  }
+}
+
+// * 修改发布状态 [-1未发布,1发布]
+export const changeProjectReleaseApi = async (data: object) => {
+  try { 
+    const res = await http(RequestHttpEnum.PUT)(`${ModuleTypeEnum.PROJECT}/publish`, data);
+    return res;
+  } catch {
+    httpErrorHandle();
+  }
+}
+
+// * 上传文件
+export const uploadFile = async (url:string, data: object) => {
+  try { 
+    const res = await http(RequestHttpEnum.POST)(url, data, ContentTypeEnum.FORM_DATA);
+    return res;
+  } catch {
+    httpErrorHandle();
+  }
+}

src/api/path/system.api.ts

@@ -0,0 +1,33 @@
+import { http } from '@/api/http'
+import { httpErrorHandle } from '@/utils'
+import { RequestHttpEnum, ModuleTypeEnum } from '@/enums/httpEnum'
+
+// * 登录
+export const loginApi = async (data: object) => {
+  try {
+    const res = await http(RequestHttpEnum.POST)(`${ModuleTypeEnum.SYSTEM}/login`, data);
+    return res;
+  } catch(err) {
+    httpErrorHandle();
+  }
+}
+
+// * 登出
+export const logoutApi = async () => {
+  try {
+    const res = await http(RequestHttpEnum.GET)(`${ModuleTypeEnum.SYSTEM}/logout`);
+    return res;
+  } catch(err) {
+    httpErrorHandle();
+  }
+}
+
+// * 获取 oss 上传接口
+export const ossUrlApi = async (data: object) => {
+  try {
+    const res = await http(RequestHttpEnum.GET)(`${ModuleTypeEnum.SYSTEM}/getOssInfo`, data);
+    return res;
+  } catch(err) {
+    httpErrorHandle();
+  }
+}

src/components/Flipper/index.ts

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

src/components/Flipper/index.vue

@@ -1,13 +1,19 @@
 <template>
-  <div class="go-Flipper" :class="[flipType, { go: isFlipping }]">
+  <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 './index'
+import { FlipType } from '.'
 
 const props = defineProps({
   flipType: {
@@ -125,7 +131,7 @@ $lineColor: #4a9ef8;
 }
 // #endregion
 
-.go-Flipper {
+.M-Flipper {
   display: inline-block;
   position: relative;
   width: $width;

src/components/GoLangSelect/index.vue

@@ -14,19 +14,16 @@
 </template>
 
 <script lang="ts" setup>
-import { useI18n } from "vue-i18n";
 import { useLangStore } from '@/store/modules/langStore/langStore'
 import { langList } from '@/i18n/index'
 import { LangEnum } from '@/enums/styleEnum'
 import { icon } from '@/plugins'
 
 const { LanguageIcon } = icon.ionicons5
-const { locale } = useI18n();
 const langStore = useLangStore()
 const options = langList
 
 const handleSelect = (key: LangEnum) => {
-  locale.value = key;
   langStore.changeLang(key)
 }
 </script>

src/components/GoSystemInfo/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <n-modal v-model:show="modelShowRef" @afterLeave="closeHandle">
+  <n-modal v-model:show="modelShow" @afterLeave="closeHandle">
     <n-list bordered class="go-system-info">
       <template #header>
         <n-space justify="space-between">
@@ -11,7 +11,7 @@
       </template>
 
       <n-list-item>
-        <n-space class="go-my-2" :size="20">
+        <n-space :size="20">
           <n-text class="item-left">版权声明：</n-text>
           <n-text>
             GoView 版权属于
@@ -21,7 +21,8 @@
       </n-list-item>
 
       <n-list-item>
-        <n-space class="go-my-2" :size="20">
+        <n-divider style="margin-top: 0" />
+        <n-space :size="20">
           <n-text class="item-left">协议备注：</n-text>
           <n-text>
             请遵守开源 MIT 协议，以上声明 <n-text type="error">不可删除</n-text>，否则视作侵权行为，后果自负！
@@ -30,7 +31,8 @@
       </n-list-item>
 
       <n-list-item>
-        <n-space  class="go-mt-2" :size="20">
+        <n-divider style="margin-top: 0" />
+        <n-space :size="20">
           <n-text class="item-left">商业授权：</n-text>
           <n-text>
             若不想保留版权声明，请通过仓库/交流群 联系项目作者，进行授权
@@ -42,19 +44,13 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, watch } from 'vue'
 import { icon } from '@/plugins'
 
-const props = defineProps({
-  modelShow: Boolean
-})
-
-const emit = defineEmits(['update:modelShow'])
 const { HelpOutlineIcon, CloseIcon } = icon.ionicons5
-const modelShowRef = ref(false)
+const emit = defineEmits(['update:modelShow'])
 
-watch(() => props.modelShow, (newValue) => {
-  modelShowRef.value = newValue
+defineProps({
+  modelShow: Boolean
 })
 
 const closeHandle = () => {

src/components/GoSystemSet/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <n-modal v-model:show="modelShowRef" @afterLeave="closeHandle">
+  <n-modal v-model:show="modelShow" @afterLeave="closeHandle">
     <n-list bordered class="go-system-setting">
       <template #header>
         <n-space justify="space-between">
@@ -69,20 +69,21 @@
 </template>
 
 <script script lang="ts" setup>
-import { reactive, ref, watch } from 'vue'
+import { reactive } from 'vue'
 import { ListType } from './index.d'
 import { useSettingStore } from '@/store/modules/settingStore/settingStore'
 import { SettingStoreEnums, ToolsStatusEnum } from '@/store/modules/settingStore/settingStore.d'
 import { icon } from '@/plugins'
 
-const props = defineProps({
+const { HelpOutlineIcon, CloseIcon } = icon.ionicons5
+
+const emit = defineEmits(['update:modelShow'])
+
+defineProps({
   modelShow: Boolean
 })
 
-const emit = defineEmits(['update:modelShow'])
-const { HelpOutlineIcon, CloseIcon } = icon.ionicons5
 const settingStore = useSettingStore()
-const modelShowRef = ref(false)
 
 const list = reactive<ListType[]>([
   {
@@ -167,10 +168,6 @@ const list = reactive<ListType[]>([
   }
 ])
 
-watch(() => props.modelShow, (newValue) => {
-  modelShowRef.value = newValue
-})
-
 const closeHandle = () => {
   emit('update:modelShow', false)
 }

src/components/Pages/ChartGlobImage/index.ts

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

src/components/Pages/ChartGlobImage/index.vue

@@ -1,31 +0,0 @@
-<template>
-  <img class="list-img" v-lazy="imageInfo" alt="图表图片" />
-</template>
-
-<script setup lang="ts">
-import { ref, PropType, watch } from 'vue'
-import { fetchImages } from '@/packages'
-import { ConfigType } from '@/packages/index.d'
-
-const props = defineProps({
-  chartConfig: {
-    type: Object as PropType<ConfigType>,
-    required: true
-  }
-})
-
-const imageInfo = ref('')
-
-// 获取图片
-const fetchImageUrl = async () => {
-  imageInfo.value = await fetchImages(props.chartConfig)
-}
-
-watch(
-  () => props.chartConfig.key,
-  () => fetchImageUrl(),
-  {
-    immediate: true
-  }
-)
-</script>

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="展示">
@@ -312,10 +289,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/ThemeColorSelect/components/ColorList.vue

@@ -99,7 +99,6 @@ const colorSelectHandle = (color: AppThemeColorType) => {
       overflow: hidden;
       border-radius: 5px;
       @extend .go-background-filter-shallow;
-      backdrop-filter: none;
     }
     &-color {
       width: 8px;

src/enums/editPageEnum.ts

@@ -9,12 +9,6 @@ export enum DragKeyEnum {
   DRAG_KEY = 'ChartData'
 }
 
-// 不同页面保存操作
-export enum SavePageEnum {
-  CHART = 'SaveChart',
-  JSON = 'SaveJSON'
-}
-
 // 操作枚举
 export enum MenuEnum {
   // 移动
@@ -46,7 +40,6 @@ export enum MenuEnum {
   UN_GROUP = 'unGroup',
   // 后退
   BACK = 'back',
-  // 前进
   FORWORD = 'forward',
   // 保存
   SAVE = 'save',
@@ -67,8 +60,7 @@ export enum WinKeyboard {
   ALT = ' alt',
   CTRL_SOURCE_KEY = 'control',
   SHIFT_SOURCE_KEY = 'shift',
-  ALT_SOURCE_KEY = 'alt',
-  SPACE = 'Space'
+  ALT_SOURCE_KEY = 'alt'
 }
 
 // Mac 键盘枚举
@@ -79,6 +71,17 @@ export enum MacKeyboard {
   ALT = '⌥',
   CTRL_SOURCE_KEY = '⌘',
   SHIFT_SOURCE_KEY = '⇧',
-  ALT_SOURCE_KEY = '⌥',
-  SPACE = 'Space'
+  ALT_SOURCE_KEY = '⌥'
+}
+
+// 同步状态枚举
+export enum SyncEnum {
+  // 等待
+  PENDING,
+  // 开始
+  START,
+  // 成功
+  SUCCESS,
+  // 失败
+  FAILURE
 }

src/enums/eventEnum.ts

@@ -1,31 +0,0 @@
-// 基础事件类型(vue不加 on)
-export enum BaseEvent {
-  // 点击
-  ON_CLICK = 'click',
-  // 双击
-  ON_DBL_CLICK = 'dblclick',
-  // 移入
-  ON_MOUSE_ENTER = 'mouseenter',
-  // 移出
-  ON_MOUSE_LEAVE = 'mouseleave',
-}
-
-// vue3 生命周期事件
-export enum EventLife { 
-  // 渲染之后
-  VNODE_MOUNTED = 'vnodeMounted',
-  // 渲染之前
-  VNODE_BEFORE_MOUNT = 'vnodeBeforeMount',
-}
-
-// 内置字符串函数对象列表
-export const excludeParseEventKeyList = [
-  EventLife.VNODE_BEFORE_MOUNT,
-  EventLife.VNODE_MOUNTED,
-  BaseEvent.ON_CLICK,
-  BaseEvent.ON_DBL_CLICK,
-  BaseEvent.ON_MOUSE_ENTER,
-  BaseEvent.ON_MOUSE_LEAVE,
-  //过滤器
-  'filter'
-]

src/enums/httpEnum.ts

@@ -1,13 +1,18 @@
-/**
- * @description: 请求结果集
- */
+// 模块 Path 前缀分类
+export enum ModuleTypeEnum {
+  SYSTEM = 'sys',
+  PROJECT = 'project',
+}
+
+// 请求结果集
 export enum ResultEnum {
   DATA_SUCCESS = 0,
   SUCCESS = 200,
   SERVER_ERROR = 500,
   SERVER_FORBIDDEN = 403,
   NOT_FOUND = 404,
-  TIMEOUT = 60000
+  TOKEN_OVERDUE = 886,
+  TIMEOUT = 60000,
 }
 
 // 数据相关
@@ -15,9 +20,7 @@ export enum RequestDataTypeEnum {
   // 静态数据
   STATIC = 0,
   // 请求数据
-  AJAX = 1,
-  // 数据池
-  Pond = 2
+  AJAX = 1
 }
 
 // 请求主体类型
@@ -28,9 +31,13 @@ export enum RequestContentTypeEnum {
   SQL = 1
 }
 
-/**
- * @description: 请求方法
- */
+// 头部
+export enum RequestHttpHeaderEnum {
+  TOKEN = 'Token',
+  COOKIE = 'Cookie'
+}
+
+// 请求方法
 export enum RequestHttpEnum {
   GET = 'get',
   POST = 'post',
@@ -111,9 +118,7 @@ export type RequestParams = {
   }
 }
 
-/**
- * @description:  常用的contentTyp类型
- */
+// 常用的contentTyp类型
 export enum ContentTypeEnum {
   // json
   JSON = 'application/json;charset=UTF-8',

src/enums/pageEnum.ts

@@ -12,12 +12,6 @@ export enum PreviewEnum {
   CHART_PREVIEW_NAME = 'ChartPreview',
 }
 
-export enum EditEnum {
-  //  图表JSON编辑
-  CHART_EDIT = '/chart/edit/:id(.*)*',
-  CHART_EDIT_NAME = 'ChartEdit',
-}
-
 export enum PageEnum {
   // 登录
   BASE_LOGIN = '/login',
@@ -26,10 +20,15 @@ export enum PageEnum {
   //重定向
   REDIRECT = '/redirect',
   REDIRECT_NAME = 'Redirect',
+
+  // 未发布
+  REDIRECT_UN_PUBLISH = '/redirect/unPublish',
+  REDIRECT_UN_PUBLISH_NAME = 'redirect-un-publish',
+
+  // 重载
   RELOAD = '/reload',
   RELOAD_NAME = 'Reload',
 
-
   // 首页
   BASE_HOME = '/project',
   BASE_HOME_NAME = 'Project',

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,6 +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/useChartDataPondFetch.hook'
-export * from '@/hooks/useLifeHandler.hook'
-export * from '@/hooks/useLang.hook'
+export * from '@/hooks/useSystemInit.hook'

src/hooks/useChartDataFetch.hook.ts

@@ -1,12 +1,10 @@
 import { ref, toRefs, toRaw } from 'vue'
 import type VChart from 'vue-echarts'
 import { customizeHttp } from '@/api/http'
-import { useChartDataPondFetch } from '@/hooks/'
 import { CreateComponentType, ChartFrameEnum } from '@/packages/index.d'
 import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
 import { RequestDataTypeEnum } from '@/enums/httpEnum'
 import { isPreview, newFunctionHandle, intervalUnitHandle } from '@/utils'
-import { setOption } from '@/packages/public/chart'
 
 // 获取类型
 type ChartEditStoreType = typeof useChartEditStore
@@ -25,21 +23,6 @@ export const useChartDataFetch = (
   const vChartRef = ref<typeof VChart | null>(null)
   let fetchInterval: any = 0
 
-  // 数据池
-  const { addGlobalDataInterface } = useChartDataPondFetch()
-
-  // 组件类型
-  const { chartFrame } = targetComponent.chartConfig
-
-  // eCharts 组件配合 vChart 库更新方式
-  const echartsUpdateHandle = (dataset: any) => {
-    if (chartFrame === ChartFrameEnum.ECHARTS) {
-      if (vChartRef.value) {
-        setOption(vChartRef.value, { dataset: dataset })
-      }
-    }
-  }
-
   const requestIntervalFn = () => {
     const chartEditStore = useChartEditStore()
 
@@ -58,6 +41,9 @@ export const useChartDataFetch = (
       requestInterval: targetInterval
     } = toRefs(targetComponent.request)
 
+    // 组件类型
+    const { chartFrame } = targetComponent.chartConfig
+
     // 非请求类型
     if (requestDataType.value !== RequestDataTypeEnum.AJAX) return
 
@@ -72,14 +58,19 @@ export const useChartDataFetch = (
         clearInterval(fetchInterval)
 
         const fetchFn = async () => {
-          const res = await customizeHttp(toRaw(targetComponent.request), toRaw(chartEditStore.getRequestGlobalConfig))
-          if (res) {
+          const res = await customizeHttp(toRaw(targetComponent.request), toRaw(chartEditStore.requestGlobalConfig))
+          if (res && res.data) {
             try {
               const filter = targetComponent.filter
-              echartsUpdateHandle(newFunctionHandle(res?.data, res, filter))
+              // eCharts 组件配合 vChart 库更新方式
+              if (chartFrame === ChartFrameEnum.ECHARTS) {
+                if (vChartRef.value) {
+                  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)
@@ -89,6 +80,7 @@ export const useChartDataFetch = (
 
         // 立即调用
         fetchFn()
+
         // 定时时间
         const time = targetInterval && targetInterval.value ? targetInterval.value : globalRequestInterval.value
         // 单位
@@ -98,15 +90,10 @@ export const useChartDataFetch = (
       }
       // eslint-disable-next-line no-empty
     } catch (error) {
-      console.log(error)
+      console.log(error);
     }
   }
 
-  if (isPreview()) {
-    // 判断是否是数据池类型
-    targetComponent.request.requestDataType === RequestDataTypeEnum.Pond
-      ? addGlobalDataInterface(targetComponent, useChartEditStore, updateCallback || echartsUpdateHandle)
-      : requestIntervalFn()
-  }
+  isPreview() && requestIntervalFn()
   return { vChartRef }
 }

src/hooks/useChartDataPondFetch.hook.ts

@@ -1,115 +0,0 @@
-import { toRaw } from 'vue'
-import { customizeHttp } from '@/api/http'
-import { CreateComponentType } from '@/packages/index.d'
-import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
-import { RequestGlobalConfigType, RequestDataPondItemType } from '@/store/modules/chartEditStore/chartEditStore.d'
-import { newFunctionHandle, intervalUnitHandle } from '@/utils'
-
-// 获取类型
-type ChartEditStoreType = typeof useChartEditStore
-
-// 数据池存储的数据类型
-type DataPondMapType = {
-  updateCallback: (...args: any) => any
-  filter?: string | undefined
-}
-
-// 数据池 Map 中请求对应 callback
-const mittDataPondMap = new Map<string, DataPondMapType[]>()
-
-// 创建单个数据项轮询接口
-const newPondItemInterval = (
-  requestGlobalConfig: RequestGlobalConfigType,
-  requestDataPondItem: RequestDataPondItemType,
-  dataPondMapItem?: DataPondMapType[]
-) => {
-  if (!dataPondMapItem) return
-  let fetchInterval: any = 0
-
-  clearInterval(fetchInterval)
-
-  // 请求
-  const fetchFn = async () => {
-    try {
-      const res = await customizeHttp(toRaw(requestDataPondItem.dataPondRequestConfig), toRaw(requestGlobalConfig))
-
-      if (res) {
-        try {
-          // 遍历更新回调函数
-          dataPondMapItem.forEach(item => {
-            item.updateCallback(newFunctionHandle(res?.data, res, item.filter))
-          })
-        } catch (error) {
-          console.error(error)
-          return error
-        }
-      }
-    } catch (error) {
-      return error
-    }
-  }
-
-  // 立即调用
-  fetchFn()
-
-  const targetInterval = requestDataPondItem.dataPondRequestConfig.requestInterval
-  const targetUnit = requestDataPondItem.dataPondRequestConfig.requestIntervalUnit
-
-  const globalRequestInterval = requestGlobalConfig.requestInterval
-  const globalUnit = requestGlobalConfig.requestIntervalUnit
-
-  // 定时时间
-  const time = targetInterval  ? targetInterval : globalRequestInterval
-  // 单位
-  const unit = targetInterval  ? targetUnit : globalUnit
-  // 开启轮询
-  if (time) fetchInterval = setInterval(fetchFn, intervalUnitHandle(time, unit))
-}
-
-/**
- * 数据池接口处理
- */
-export const useChartDataPondFetch = () => {
-  // 新增全局接口
-  const addGlobalDataInterface = (
-    targetComponent: CreateComponentType,
-    useChartEditStore: ChartEditStoreType,
-    updateCallback: (...args: any) => any
-  ) => {
-    const chartEditStore = useChartEditStore()
-    const { requestDataPond } = chartEditStore.getRequestGlobalConfig
-
-    // 组件对应的数据池 Id
-    const requestDataPondId = targetComponent.request.requestDataPondId as string
-    // 新增数据项
-    const mittPondIdArr = mittDataPondMap.get(requestDataPondId) || []
-    mittPondIdArr.push({
-      updateCallback: updateCallback,
-      filter: targetComponent.filter
-    })
-    mittDataPondMap.set(requestDataPondId, mittPondIdArr)
-  }
-
-  // 清除旧数据
-  const clearMittDataPondMap = () => {
-    mittDataPondMap.clear()
-  }
-
-  // 初始化数据池
-  const initDataPond = (requestGlobalConfig: RequestGlobalConfigType) => {
-    const { requestDataPond } = requestGlobalConfig
-    // 根据 mapId 查找对应的数据池配置
-    for (let pondKey of mittDataPondMap.keys()) {
-      const requestDataPondItem = requestDataPond.find(item => item.dataPondId === pondKey)
-      if (requestDataPondItem) {
-        newPondItemInterval(requestGlobalConfig, requestDataPondItem, mittDataPondMap.get(pondKey))
-      }
-    }
-  }
-
-  return {
-    addGlobalDataInterface,
-    clearMittDataPondMap,
-    initDataPond
-  }
-}

src/hooks/useLang.hook.ts

@@ -1,24 +0,0 @@
-import { computed } from 'vue'
-import { LangEnum } from '@/enums/styleEnum'
-import { useLangStore } from '@/store/modules/langStore/langStore'
-import { zhCN, enUS, dateEnUS, dateZhCN } from 'naive-ui'
-
-type LangStoreType = typeof useLangStore
-
-// 语言切换
-export const useLang = () => {
-  const lang = useLangStore()
-  
-  const locale = computed(() => {
-    return lang.getLang === LangEnum.ZH ? zhCN : enUS
-  })
-
-  const dateLocale = computed(() => {
-    return lang.getLang === LangEnum.ZH ? dateZhCN : dateEnUS
-  })
-
-  return {
-    locale,
-    dateLocale
-  }
-}

src/hooks/useLifeHandler.hook.ts

@@ -1,79 +0,0 @@
-import { CreateComponentType, CreateComponentGroupType } from '@/packages/index.d'
-import { EventLife } from '@/enums/eventEnum'
-import * as echarts from 'echarts'
-
-// 所有图表组件集合对象
-const components: { [K in string]?: any } = {}
-
-// 项目提供的npm 包变量
-export const npmPkgs = { echarts }
-
-// 组件事件处理 hook
-export const useLifeHandler = (chartConfig: CreateComponentType | CreateComponentGroupType) => {
-  if (!chartConfig.events) return {}
-
-  // 处理基础事件
-  const baseEvent: { [key: string]: any } = {}
-  for (const key in chartConfig.events.baseEvent) {
-    const fnStr: string | undefined = (chartConfig.events.baseEvent as any)[key]
-    // 动态绑定基础事件
-    if (fnStr) {
-      baseEvent[key] = generateBaseFunc(fnStr)
-    }
-  }
-
-  // 生成生命周期事件
-  const events = chartConfig.events.advancedEvents || {}
-  const lifeEvents = {
-    [EventLife.VNODE_BEFORE_MOUNT](e: any) {
-      // 存储组件
-      components[chartConfig.id] = e.component
-      const fnStr = (events[EventLife.VNODE_BEFORE_MOUNT] || '').trim()
-      generateFunc(fnStr, e)
-    },
-    [EventLife.VNODE_MOUNTED](e: any) {
-      const fnStr = (events[EventLife.VNODE_MOUNTED] || '').trim()
-      generateFunc(fnStr, e)
-    }
-  }
-  return { ...baseEvent, ...lifeEvents }
-}
-
-/**
- * 生成基础函数
- * @param fnStr 用户方法体代码
- * @param event 鼠标事件
- */
- export function generateBaseFunc(fnStr: string) {
-  try {
-    return new Function(`
-      return (
-        async function(mouseEvent){
-          ${fnStr}
-        }
-      )`)()
-  } catch (error) {
-    console.error(error)
-  }
-}
-
-/**
- * 生成高级函数
- * @param fnStr 用户方法体代码
- * @param e 执行生命周期的动态组件实例
- */
-function generateFunc(fnStr: string, e: any) {
-  try {
-    // npmPkgs 便于拷贝 echarts 示例时设置option 的formatter等相关内容
-    Function(`
-      "use strict";
-      return (
-        async function(e, components, node_modules){
-          const {${Object.keys(npmPkgs).join()}} = node_modules;
-          ${fnStr}
-        }
-      )`)().bind(e?.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/i18n/en/index.ts

@@ -11,6 +11,8 @@ const global = {
   help: 'Help',
   contact: 'About Software',
   logout: 'Logout',
+  logout_success: 'Logout success！',
+  logout_failure: 'Logout Failed！',
   // system setting
   sys_set: 'System Setting',
   lang_set: 'Language Setting',
@@ -26,8 +28,14 @@ const global = {
   r_more: 'More',
 }
 
+const http = {
+  error_message: 'The interface is abnormal, please check the interface!',
+  token_overdue_message: 'Login expired, please log in again!'
+}
+
 export default {
   global,
+  http,
   login,
   project
 }

src/i18n/en/login.ts

@@ -2,6 +2,6 @@ export default {
   desc: "Login",
   form_auto: "Sign in automatically",
   form_button: "Login",
-  login_success: "Login success",
-  login_message: "Please complete the letter",
+  login_success: "Login success!",
+  login_message: "Please complete the letter!",
 }

src/i18n/en/project.ts

@@ -1,6 +1,8 @@
 export default {
   create_btn: 'Creat',
-  create_tip: 'Please select a content for development',
+  create_success: 'Creat Success!',
+  create_failure: 'Failed to create, please try again later！',
+  create_tip: 'Please select a content for development!',
   project: 'Project',
   my: 'My',
   new_project: 'New Project',

src/i18n/index.ts

@@ -23,8 +23,6 @@ export const langList = [
 ]
 
 const i18n = createI18n({
-  legacy: false,
-  globalInjection:true,
   locale: langStorage?.lang || lang,
   fallbackLocale: langStorage?.lang || lang,
   messages: {

src/i18n/zh/index.ts

@@ -11,6 +11,8 @@ const global = {
   help: '帮助中心',
   contact: '关于软件',
   logout: '退出登录',
+  logout_success: '退出成功！',
+  logout_failure: '退出失败！',
   // 系统设置
   sys_set: '系统设置',
   lang_set: '语言设置',
@@ -18,16 +20,27 @@ const global = {
   r_edit: '编辑',
   r_preview: '预览',
   r_copy: '克隆',
+  r_copy_success: '克隆成功！',
   r_rename: '重命名',
+  r_rename_success: '重命名成功！',
   r_publish: '发布',
+  r_publish_success: '成功发布！',
   r_unpublish: '取消发布',
+  r_unpublish_success: '取消成功！',
   r_download: '下载',
   r_delete: '删除',
+  r_delete_success: '删除成功！',
   r_more: '更多',
 }
 
+const http = {
+  error_message: '获取数据失败，请稍后重试！',
+  token_overdue_message: '登录过期，请重新登录！'
+}
+
 export default {
   global,
+  http,
   login,
   project
 }

src/i18n/zh/login.ts

@@ -2,6 +2,6 @@ export default {
   desc: "登录",
   form_auto: "自动登录",
   form_button: "登录",
-  login_success: "登录成功",
   login_message: "请填写完整信息",
+  login_success: "登录成功！",
 }

src/i18n/zh/project.ts

@@ -1,6 +1,8 @@
 export default {
   // aside
   create_btn: '新建',
+  create_success: '新建成功！',
+  create_failure: '新建失败，请稍后重试！',
   create_tip: '从哪里出发好呢？',
   project: '项目',
   my: '我的',

src/main.ts

@@ -3,7 +3,7 @@ import App from './App.vue'
 import router, { setupRouter } from '@/router'
 import i18n from '@/i18n/index'
 import { setupStore } from '@/store'
-import { setupNaive, setupDirectives, setupCustomComponents, initFunction } from '@/plugins'
+import { setupNaive, setupDirectives, setupCustomComponents } from '@/plugins'
 import { GoAppProvider } from '@/components/GoAppProvider/index'
 import { setHtmlTheme } from '@/utils'
 
@@ -53,7 +53,4 @@ async function appInit() {
   window['$vue'] = app
 }
 
-appInit().then(() => {
-  initFunction()
-})
-
+void appInit()

src/packages/chartConfiguration/echarts/index.ts

@@ -1,3 +1,2 @@
 export * from './axis'
-export * from './line'
-export * from './label'
+export * from './line'

src/packages/chartConfiguration/echarts/label.ts

@@ -1,7 +0,0 @@
-export const labelConfig = {
-  position: [
-    { label: '外侧', value: 'outside' },
-    { label: '内部', value: 'inside' },
-    { label: '中心', value: 'center' }
-  ]
-}

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,8 +1,25 @@
 <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>
+      </SettingItem>
+      <SettingItem>
+        <n-button size="small" @click="item.itemStyle.color = null">
+          恢复默认
+        </n-button>
+      </SettingItem>
       <SettingItem name="宽度">
         <n-input-number
           v-model:value="item.barWidth"
@@ -13,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.ts

@@ -1,3 +1,4 @@
+import image from '@/assets/images/chart/charts/bar_x.png'
 import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'
 import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'
 
@@ -10,5 +11,5 @@ export const BarCommonConfig: ConfigType = {
   categoryName: ChatCategoryEnumName.BAR,
   package: PackagesCategoryEnum.CHARTS,
   chartFrame: ChartFrameEnum.ECHARTS,
-  image: 'bar_x.png'
+  image
 }

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

@@ -53,21 +53,17 @@ const option = computed(() => {
 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 = []
-        })
+    if (!isObject(newData) || !('dimensions' in newData)) return
+    if (newData?.dimensions.length !== oldData?.dimensions.length) {
+      const seriesArr = []
+      for (let i = 0; i < newData.dimensions.length - 1; i++) {
+        seriesArr.push(seriesItem)
       }
-    } 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

@@ -3,6 +3,12 @@
   <global-setting :optionData="optionData"></global-setting>
   <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>
+      </SettingItem>
+      <SettingItem>
+        <n-button size="small" @click="item.itemStyle.color = null">恢复默认</n-button>
+      </SettingItem>
       <SettingItem name="宽度">
           <n-input-number
           v-model:value="item.barWidth"
@@ -20,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.ts

@@ -1,3 +1,4 @@
+import image from '@/assets/images/chart/charts/bar_y.png'
 import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'
 import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'
 
@@ -10,5 +11,5 @@ export const BarCrossrangeConfig: ConfigType = {
   categoryName: ChatCategoryEnumName.BAR,
   package: PackagesCategoryEnum.CHARTS,
   chartFrame: ChartFrameEnum.ECHARTS,
-  image: 'bar_y.png'
+  image
 }

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

@@ -52,21 +52,17 @@ const option = computed(() => {
 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 = []
-        })
+    if (!isObject(newData) || !('dimensions' in newData)) return
+    if (newData?.dimensions.length !== oldData?.dimensions.length) {
+      const seriesArr = []
+      for (let i = 0; i < newData.dimensions.length - 1; i++) {
+        seriesArr.push(seriesItem)
       }
-    } catch (error) {
-      console.log(error)
+      replaceMergeArr.value = ['series']
+      props.chartConfig.option.series = seriesArr
+      nextTick(() => {
+        replaceMergeArr.value = []
+      })
     }
   },
   {

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

@@ -1,25 +0,0 @@
-import { PublicConfigClass } from '@/packages/public'
-import { CapsuleChartConfig } from './index'
-import { CreateComponentType } from '@/packages/index.d'
-import { chartInitConfig } from '@/settings/designSetting'
-
-import cloneDeep from 'lodash/cloneDeep'
-import dataJson from './data.json'
-
-export const option = {
-  dataset: dataJson,
-  colors: ['#c4ebad', '#6be6c1', '#a0a7e6', '#96dee8', '#3fb1e3' ],
-  unit: '',
-  itemHeight: 10,
-  valueFontSize: 16,
-  paddingRight: 50,
-  paddingLeft: 50,
-  showValue: true
-}
-
-export default class Config extends PublicConfigClass implements CreateComponentType {
-  public key: string = CapsuleChartConfig.key
-  public attr = { ...chartInitConfig, zIndex: -1 }
-  public chartConfig = cloneDeep(CapsuleChartConfig)
-  public option = cloneDeep(option)
-}

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

@@ -1,53 +0,0 @@
-<template>
-  <!-- Echarts 全局设置 -->
-  <global-setting :optionData="optionData"> </global-setting>
-  <!-- 胶囊柱图 -->
-  <collapse-item name="胶囊柱图" expanded>
-    <SettingItemBox name="布局">
-      <setting-item name="左侧边距">
-        <n-input-number v-model:value="optionData.paddingLeft" :min="10" :step="1" size="small"></n-input-number>
-      </setting-item>
-      <setting-item name="右侧边距">
-        <n-input-number v-model:value="optionData.paddingRight" :min="10" :step="1" size="small"></n-input-number>
-      </setting-item>
-      <setting-item name="每块高度(px)">
-        <n-input-number v-model:value="optionData.itemHeight" :min="0" :step="1" size="small"></n-input-number>
-      </setting-item>
-    </SettingItemBox>
-    <SettingItemBox name="文本">
-      <setting-item name="所有文字大小">
-        <n-input-number v-model:value="optionData.valueFontSize" :min="0" :step="1" size="small"></n-input-number>
-      </setting-item>
-      <setting-item name="单位">
-        <n-input v-model:value="optionData.unit" size="small"></n-input>
-      </setting-item>
-
-      <SettingItem>
-        <n-space>
-          <n-switch v-model:value="optionData.showValue" size="small"></n-switch>
-          <n-text>显示数值</n-text>
-        </n-space>
-      </SettingItem>
-    </SettingItemBox>
-    <SettingItemBox name="颜色">
-      <setting-item v-for="(item, index) in optionData.colors" :key="index" :name="`颜色${index}`">
-        <n-color-picker v-model:value="optionData.colors[index]" size="small" :modes="['hex']"></n-color-picker>
-      </setting-item>
-    </SettingItemBox>
-  </collapse-item>
-</template>
-
-<script setup lang="ts">
-import { PropType, computed } from 'vue'
-import { GlobalSetting, CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
-import { GlobalThemeJsonType } from '@/settings/chartThemes/index'
-
-import { option } from './config'
-
-const props = defineProps({
-  optionData: {
-    type: Object as PropType<typeof option & GlobalThemeJsonType>,
-    required: true
-  }
-})
-</script>

src/packages/components/Charts/Bars/CapsuleChart/data.json

@@ -1,10 +0,0 @@
-{
-  "dimensions": ["name", "value"],
-  "source": [
-    { "name": "厦门", "value": 20 },
-    { "name": "南阳", "value": 40 },
-    { "name": "北京", "value": 60 },
-    { "name": "上海", "value": 80 },
-    { "name": "新疆", "value": 100 }
-  ]
-}

src/packages/components/Charts/Bars/CapsuleChart/index.ts

@@ -1,14 +0,0 @@
-import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'
-import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'
-
-export const CapsuleChartConfig: ConfigType = {
-  key: 'CapsuleChart',
-  chartKey: 'VCapsuleChart',
-  conKey: 'VCCapsuleChart',
-  title: '胶囊柱图',
-  category: ChatCategoryEnum.BAR,
-  categoryName: ChatCategoryEnumName.BAR,
-  package: PackagesCategoryEnum.CHARTS,
-  chartFrame: ChartFrameEnum.COMMON,
-  image: 'capsule.png'
-}

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

@@ -1,231 +0,0 @@
-<template>
-  <div
-    v-if="state.mergedConfig"
-    class="go-dv-capsule-chart"
-    :style="{
-      fontSize: numberSizeHandle(state.mergedConfig.valueFontSize),
-      paddingLeft: numberSizeHandle(state.mergedConfig.paddingLeft),
-      paddingRight: numberSizeHandle(state.mergedConfig.paddingRight)
-    }"
-  >
-    <div class="label-column">
-      <div
-        v-for="item in state.mergedConfig.dataset.source"
-        :key="item[state.mergedConfig.dataset.dimensions[0]]"
-        :style="{ height: state.capsuleItemHeight, lineHeight: state.capsuleItemHeight }"
-      >
-        {{ item[state.mergedConfig.dataset.dimensions[0]] }}
-      </div>
-      <div class="laset">&nbsp;</div>
-    </div>
-
-    <div class="capsule-container">
-      <div
-        v-for="(capsule, index) in state.capsuleLength"
-        :key="index"
-        class="capsule-item"
-        :style="{ height: state.capsuleItemHeight }"
-      >
-        <div
-          class="capsule-item-column"
-          :style="`width: ${capsule * 100}%; background-color: ${
-            state.mergedConfig.colors[index % state.mergedConfig.colors.length]
-          };height:calc(100% - ${2}px);`"
-        >
-          <div v-if="state.mergedConfig.showValue" class="capsule-item-value">
-            {{ state.capsuleValue[index] }}
-          </div>
-        </div>
-      </div>
-
-      <div class="unit-label">
-        <div v-for="(label, index) in state.labelData" :key="label + index">
-          {{ label }}
-        </div>
-      </div>
-    </div>
-
-    <div v-if="state.mergedConfig.unit" class="unit-text">
-      {{ state.mergedConfig.unit }}
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { onMounted, watch, reactive, PropType } from 'vue'
-import { useChartDataFetch } from '@/hooks'
-import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
-import config, { option } from './config'
-import cloneDeep from 'lodash/cloneDeep'
-
-type DataProps = {
-  name: string | number
-  value: string | number
-  [key: string]: string | number
-}
-
-interface StateProps {
-  defaultConfig: {
-    dataset: {
-      dimensions: Array<string>
-      source: Array<DataProps>
-    }
-    colors: Array<string>
-    unit: string
-    showValue: boolean
-    itemHeight: number
-    valueFontSize: number
-    paddingLeft: number
-    paddingRight: number
-  }
-  mergedConfig: any
-  capsuleLength: Array<number>
-  capsuleValue: Array<string | Object>
-  labelData: Array<number>
-  capsuleItemHeight: string
-}
-
-const props = defineProps({
-  chartConfig: {
-    type: Object as PropType<config>,
-    default: () => ({})
-  }
-})
-
-const state = reactive<StateProps>({
-  defaultConfig: option,
-  mergedConfig: null,
-  capsuleLength: [],
-  capsuleValue: [],
-  labelData: [],
-  capsuleItemHeight: ''
-})
-
-watch(
-  () => props.chartConfig.option,
-  newVal => {
-    calcData(newVal)
-  },
-  {
-    deep: true
-  }
-)
-
-const calcData = (data: any, type?: string) => {
-  let cloneConfig = cloneDeep(props.chartConfig.option || {})
-  state.mergedConfig = cloneConfig
-  if (type == 'preview') {
-    cloneConfig.dataset = data
-  }
-  calcCapsuleLengthAndLabelData(state.mergedConfig.dataset)
-}
-
-// 数据解析
-const calcCapsuleLengthAndLabelData = (dataset: any) => {
-  try {
-    const { source } = dataset
-    if (!source || !source.length) return
-
-    state.capsuleItemHeight = numberSizeHandle(state.mergedConfig.itemHeight)
-    const capsuleValue = source.map((item: DataProps) => item[state.mergedConfig.dataset.dimensions[1]])
-
-    const maxValue = Math.max(...capsuleValue)
-
-    state.capsuleValue = capsuleValue
-
-    state.capsuleLength = capsuleValue.map((v: any) => (maxValue ? v / maxValue : 0))
-
-    const oneFifth = maxValue / 5
-
-    const labelData = Array.from(new Set(new Array(6).fill(0).map((v, i) => Math.ceil(i * oneFifth))))
-
-    state.labelData = labelData
-
-  } catch (error) {
-    console.warn(error);
-  }
-}
-
-const numberSizeHandle = (val: string | number) => {
-  return val + 'px'
-}
-
-onMounted(() => {
-  calcData(props.chartConfig.option)
-})
-
-// 预览
-useChartDataFetch(props.chartConfig, useChartEditStore, (newData: any) => {
-  calcData(newData, 'preview')
-})
-</script>
-
-<style lang="scss" scoped>
-@include go('dv-capsule-chart') {
-  position: relative;
-  display: flex;
-  flex-direction: row;
-  box-sizing: border-box;
-  padding: 20px;
-  padding-right: 50px;
-  color: #b9b8cc;
-
-  .label-column {
-    display: flex;
-    flex-direction: column;
-    justify-content: space-between;
-    box-sizing: border-box;
-    padding-right: 10px;
-    text-align: right;
-    > div:not(:last-child) {
-      margin: 5px 0;
-    }
-  }
-
-  .capsule-container {
-    flex: 1;
-    display: flex;
-    flex-direction: column;
-    justify-content: space-between;
-  }
-
-  .capsule-item {
-    box-shadow: 0 0 3px #999;
-    height: 10px;
-    margin: 5px 0px;
-    border-radius: 5px;
-
-    .capsule-item-column {
-      position: relative;
-      height: 8px;
-      margin-top: 1px;
-      border-radius: 5px;
-      transition: all 0.3s;
-      display: flex;
-      justify-content: flex-end;
-      align-items: center;
-
-      .capsule-item-value {
-        padding-left: 10px;
-        transform: translateX(100%);
-      }
-    }
-  }
-
-  .unit-label {
-    height: 20px;
-    position: relative;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-  }
-
-  .unit-text {
-    text-align: right;
-    display: flex;
-    align-items: flex-end;
-    line-height: 20px;
-    margin-left: 10px;
-  }
-}
-</style>

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

@@ -1,5 +1,4 @@
 import { BarCommonConfig } from './BarCommon/index'
 import { BarCrossrangeConfig } from './BarCrossrange/index'
-import { CapsuleChartConfig } from './CapsuleChart/index'
 
-export default [BarCommonConfig, BarCrossrangeConfig, CapsuleChartConfig]
+export default [BarCommonConfig, BarCrossrangeConfig]

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

@@ -1,27 +1,20 @@
 import { echartOptionProfixHandle, PublicConfigClass } from '@/packages/public'
 import { LineCommonConfig } from './index'
 import { CreateComponentType } from '@/packages/index.d'
-import cloneDeep from 'lodash/cloneDeep'
+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'
@@ -47,7 +43,7 @@ export const option = {
 
 export default class Config extends PublicConfigClass implements CreateComponentType {
   public key: string = LineCommonConfig.key
-  public chartConfig = cloneDeep(LineCommonConfig)
+  public chartConfig = LineCommonConfig
   // 图表配置项
   public option = echartOptionProfixHandle(option, includes)
 }

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

@@ -1,7 +1,12 @@
 <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="线条">
       <SettingItem name="宽度">
         <n-input-number
@@ -10,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>
 
@@ -59,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.ts

@@ -1,3 +1,4 @@
+import image from '@/assets/images/chart/charts/line.png'
 import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'
 import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'
 
@@ -10,5 +11,5 @@ export const LineCommonConfig: ConfigType = {
   categoryName: ChatCategoryEnumName.LINE,
   package: PackagesCategoryEnum.CHARTS,
   chartFrame: ChartFrameEnum.ECHARTS,
-  image: 'line.png'
+  image
 }

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

@@ -53,21 +53,17 @@ const option = computed(() => {
 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 = []
-        })
+    if (!isObject(newData) || !('dimensions' in newData)) return
+    if (newData?.dimensions.length !== oldData?.dimensions.length) {
+      const seriesArr = []
+      for (let i = 0; i < newData.dimensions.length - 1; i++) {
+        seriesArr.push(seriesItem)
       }
-    } catch (error) {
-      console.log(error)
+      replaceMergeArr.value = ['series']
+      props.chartConfig.option.series = seriesArr
+      nextTick(() => {
+        replaceMergeArr.value = []
+      })
     }
   },
   {

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

@@ -3,10 +3,9 @@ import { LineGradientSingleConfig } from './index'
 import { CreateComponentType } from '@/packages/index.d'
 import { graphic } from 'echarts/core'
 import { defaultTheme, chartColorsSearch } from '@/settings/chartThemes/index'
-import cloneDeep from 'lodash/cloneDeep'
 import dataJson from './data.json'
 
-export const includes = ['legend', 'xAxis', 'yAxis', 'grid']
+export const includes = ['legend', 'xAxis', 'yAxis']
 
 const options = {
   tooltip: {
@@ -16,6 +15,9 @@ const options = {
       type: 'line'
     }
   },
+  legend: {
+    show: true
+  },
   xAxis: {
     show: true,
     type: 'category'
@@ -29,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
@@ -59,7 +54,7 @@ const options = {
 
 export default class Config extends PublicConfigClass implements CreateComponentType {
   public key: string = LineGradientSingleConfig.key
-  public chartConfig = cloneDeep(LineGradientSingleConfig)
+  public chartConfig = LineGradientSingleConfig
   // 图表配置项
   public option = echartOptionProfixHandle(options, includes)
 }

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.ts

@@ -1,3 +1,4 @@
+import image from '@/assets/images/chart/charts/line_gradient_single.png'
 import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'
 import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'
 
@@ -10,5 +11,5 @@ export const LineGradientSingleConfig: ConfigType = {
   categoryName: ChatCategoryEnumName.LINE,
   package: PackagesCategoryEnum.CHARTS,
   chartFrame: ChartFrameEnum.ECHARTS,
-  image: 'line_gradient_single.png'
+  image
 }

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

@@ -15,7 +15,7 @@ import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore
 import { chartColorsSearch, defaultTheme } from '@/settings/chartThemes/index'
 import { DatasetComponent, GridComponent, TooltipComponent, LegendComponent } from 'echarts/components'
 import { useChartDataFetch } from '@/hooks'
-import { isPreview, colorGradientCustomMerge} from '@/utils'
+import { isPreview } from '@/utils'
 
 const props = defineProps({
   themeSetting: {
@@ -43,29 +43,23 @@ const option = reactive({
 watch(
   () => chartEditStore.getEditCanvasConfig.chartThemeColor,
   (newColor: keyof typeof chartColorsSearch) => {
-    try {
-      if (!isPreview()) {
-        const themeColor =
-          colorGradientCustomMerge(chartEditStore.getEditCanvasConfig.chartCustomThemeColorInfo)[newColor] ||
-          colorGradientCustomMerge(chartEditStore.getEditCanvasConfig.chartCustomThemeColorInfo)[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
@@ -76,6 +70,9 @@ watch(
   () => props.chartConfig.option.dataset,
   () => {
     option.value = props.chartConfig.option
+  },
+  {
+    deep: false
   }
 )
 

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

@@ -3,12 +3,14 @@ import { LineGradientsConfig } from './index'
 import { CreateComponentType } from '@/packages/index.d'
 import { graphic } from 'echarts/core'
 import { defaultTheme, chartColorsSearch } from '@/settings/chartThemes/index'
-import cloneDeep from 'lodash/cloneDeep'
 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',
@@ -29,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'
@@ -57,12 +52,6 @@ const option = {
     {
       type: 'line',
       smooth: false,
-      label: {
-        show: true,
-        position: 'top',
-        color: '#fff',
-        fontSize: 12
-      },
       lineStyle: {
         width: 3,
         type: 'solid'
@@ -86,7 +75,7 @@ const option = {
 
 export default class Config extends PublicConfigClass implements CreateComponentType {
   public key: string = LineGradientsConfig.key
-  public chartConfig = cloneDeep(LineGradientsConfig)
+  public chartConfig = LineGradientsConfig
   // 图表配置项
   public option = echartOptionProfixHandle(option, includes)
 }

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.ts

@@ -1,3 +1,4 @@
+import image from '@/assets/images/chart/charts/line_gradient.png'
 import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'
 import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'
 
@@ -10,5 +11,5 @@ export const LineGradientsConfig: ConfigType = {
   categoryName: ChatCategoryEnumName.LINE,
   package: PackagesCategoryEnum.CHARTS,
   chartFrame: ChartFrameEnum.ECHARTS,
-  image: 'line_gradient.png'
+  image
 }

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

@@ -14,7 +14,7 @@ import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore
 import { chartColorsSearch, defaultTheme } from '@/settings/chartThemes/index'
 import { DatasetComponent, GridComponent, TooltipComponent, LegendComponent } from 'echarts/components'
 import { useChartDataFetch } from '@/hooks'
-import { isPreview, colorGradientCustomMerge} from '@/utils'
+import { isPreview } from '@/utils'
 
 const props = defineProps({
   themeSetting: {
@@ -42,29 +42,23 @@ const option = reactive({
 watch(
   () => chartEditStore.getEditCanvasConfig.chartThemeColor,
   (newColor: keyof typeof chartColorsSearch) => {
-    try {
-      if (!isPreview()) {
-        const themeColor =
-          colorGradientCustomMerge(chartEditStore.getEditCanvasConfig.chartCustomThemeColorInfo)[newColor] ||
-          colorGradientCustomMerge(chartEditStore.getEditCanvasConfig.chartCustomThemeColorInfo)[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
@@ -77,5 +71,6 @@ watch(
     option.value = props.chartConfig.option
   }
 )
+
 const { vChartRef } = useChartDataFetch(props.chartConfig, useChartEditStore)
 </script>

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

@@ -2,10 +2,9 @@ import { echartOptionProfixHandle, PublicConfigClass } from '@/packages/public'
 import { LineLinearSingleConfig } from './index'
 import { CreateComponentType } from '@/packages/index.d'
 import { defaultTheme, chartColorsSearch } from '@/settings/chartThemes/index'
-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 option = {
   tooltip: {
@@ -15,6 +14,9 @@ export const option = {
       type: 'line'
     }
   },
+  legend: {
+    show: true
+  },
   xAxis: {
     show: true,
     type: 'category'
@@ -27,7 +29,6 @@ export const option = {
   series: [
     {
       type: 'line',
-      symbolSize: 5, //设定实心点的大小
       lineStyle: {
         type: 'solid',
         width: 3,
@@ -55,7 +56,7 @@ export const option = {
 
 export default class Config extends PublicConfigClass implements CreateComponentType {
   public key: string = LineLinearSingleConfig.key
-  public chartConfig = cloneDeep(LineLinearSingleConfig)
+  public chartConfig = LineLinearSingleConfig
   // 图表配置项
   public option = echartOptionProfixHandle(option, includes)
 }

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.ts

@@ -1,3 +1,4 @@
+import image from '@/assets/images/chart/charts/line_linear_single.png'
 import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'
 import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'
 
@@ -10,5 +11,5 @@ export const LineLinearSingleConfig: ConfigType = {
   categoryName: ChatCategoryEnumName.LINE,
   package: PackagesCategoryEnum.CHARTS,
   chartFrame: ChartFrameEnum.ECHARTS,
-  image: 'line_linear_single.png'
+  image
 }

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

@@ -15,7 +15,7 @@ import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore
 import { chartColorsSearch, defaultTheme } from '@/settings/chartThemes/index'
 import { DatasetComponent, GridComponent, TooltipComponent, LegendComponent } from 'echarts/components'
 import { useChartDataFetch } from '@/hooks'
-import { isPreview, colorGradientCustomMerge } from '@/utils'
+import { isPreview } from '@/utils'
 
 const props = defineProps({
   themeSetting: {
@@ -43,23 +43,17 @@ const option = reactive({
 watch(
   () => chartEditStore.getEditCanvasConfig.chartThemeColor,
   (newColor: keyof typeof chartColorsSearch) => {
-    try {
-      if (!isPreview()) {
-        const themeColor =
-          colorGradientCustomMerge(chartEditStore.getEditCanvasConfig.chartCustomThemeColorInfo)[newColor] ||
-          colorGradientCustomMerge(chartEditStore.getEditCanvasConfig.chartCustomThemeColorInfo)[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/MapAmap/config.ts

@@ -1,83 +0,0 @@
-import { PublicConfigClass } from '@/packages/public'
-import { CreateComponentType } from '@/packages/index.d'
-import { MapAmapConfig } from './index'
-import { chartInitConfig } from '@/settings/designSetting'
-import cloneDeep from 'lodash/cloneDeep'
-import dataJson from './data.json'
-
-export enum ThemeEnum {
-  NORMAL = 'normal',
-  DARK = 'dark',
-  LIGHT = 'light',
-  WHITES_MOKE = 'whitesmoke',
-  FRESH = 'fresh',
-  GREY = 'grey',
-  GRAFFITI = 'graffiti',
-  MACARON = 'macaron',
-  BLUE = 'blue',
-  DARKBLUE = 'darkblue',
-  WINE = 'wine'
-}
-
-export enum LangEnum {
-  ZH_CN = 'zh_cn',
-  EN = 'en',
-  ZH_EN = 'zh_en'
-}
-
-export enum ViewModeEnum {
-  PLANE = '2D',
-  STEREOSCOPIC = '3D'
-}
-
-export enum FeaturesEnum {
-  BG = 'bg',
-  POINT = 'point',
-  ROAD = 'road',
-  BUILDING = 'building'
-}
-
-export enum MarkerEnum {
-  // 圆圈
-  CIRCLE_MARKER = 'CircleMarker',
-  // 定位标点
-  MARKER = 'Marker',
-  // 暂无
-  NONE = 'none'
-}
-
-export const option = {
-  dataset: dataJson,
-  mapOptions: {
-    pitch: 60,
-    skyColor: '#53A9DE',
-    amapKey: 'd5f3e16589dbecae64d05fe90e2ba4f2',
-    amapStyleKey: ThemeEnum.DARK,
-    amapStyleKeyCustom: '',
-    amapLon: 116.397428,
-    amapLat: 39.90923,
-    amapZindex: 11,
-    marker: {
-      fillColor: '#E98984FF',
-      fillOpacity: 0.5,
-      strokeColor: 'white',
-      strokeWeight: 2,
-      strokeOpacity: 0.5,
-      zIndex: 10,
-      bubble: true,
-      cursor: 'pointer',
-      clickable: true
-    },
-    mapMarkerType: MarkerEnum.CIRCLE_MARKER,
-    viewMode: ViewModeEnum.PLANE,
-    lang: LangEnum.ZH_CN,
-    features: [FeaturesEnum.BG, FeaturesEnum.POINT, FeaturesEnum.ROAD, FeaturesEnum.BUILDING]
-  }
-}
-
-export default class Config extends PublicConfigClass implements CreateComponentType {
-  public key = MapAmapConfig.key
-  public attr = { ...chartInitConfig, w: 1000, h: 800, zIndex: -1 }
-  public chartConfig = cloneDeep(MapAmapConfig)
-  public option = cloneDeep(option)
-}

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

@@ -1,199 +0,0 @@
-<template>
-  <collapse-item name="基础" :expanded="true">
-    <setting-item-box name="语言类型" :alone="true">
-      <setting-item>
-        <n-select size="small" v-model:value="optionData.mapOptions.lang" :options="langOptions" />
-      </setting-item>
-    </setting-item-box>
-    <setting-item-box name="Key" :alone="true">
-      <setting-item name="请务必使用自己的高德应用 key">
-        <n-input v-model:value="optionData.mapOptions.amapKey" size="small"></n-input>
-      </setting-item>
-    </setting-item-box>
-    <setting-item-box name="自定义地图样式ID" :alone="true">
-      <setting-item>
-        <n-input size="small" v-model:value="optionData.mapOptions.amapStyleKeyCustom" />
-      </setting-item>
-    </setting-item-box>
-  </collapse-item>
-  <collapse-item name="地图" :expanded="true">
-    <setting-item-box name="主题">
-      <setting-item>
-        <n-select size="small" v-model:value="optionData.mapOptions.amapStyleKey" :options="themeOptions" />
-      </setting-item>
-    </setting-item-box>
-    <setting-item-box name="内容" :alone="true">
-      <n-checkbox-group v-model:value="optionData.mapOptions.features">
-        <n-space item-style="display: flex;">
-          <n-checkbox :value="item.value" :label="item.label" v-for="(item, index) in featuresOptions" :key="index" />
-        </n-space>
-      </n-checkbox-group>
-    </setting-item-box>
-    <setting-item-box name="位置">
-      <setting-item name="经度">
-        <n-input-number v-model:value="optionData.mapOptions.amapLon" :show-button="false" size="small">
-          <template #suffix>°</template>
-        </n-input-number>
-      </setting-item>
-      <setting-item name="纬度">
-        <n-input-number v-model:value="optionData.mapOptions.amapLat" :show-button="false" size="small">
-          <template #suffix>°</template>
-        </n-input-number>
-      </setting-item>
-      <setting-item name="初始缩放">
-        <n-input-number v-model:value="optionData.mapOptions.amapZindex" :min="0" size="small"></n-input-number>
-      </setting-item>
-    </setting-item-box>
-    <setting-item-box name="模式" :alone="true">
-      <setting-item>
-        <n-radio-group v-model:value="optionData.mapOptions.viewMode" name="radiogroup">
-          <n-space>
-            <n-radio v-for="song in viewModeOptions" :key="song.value" :value="song.value">
-              {{ song.label }}
-            </n-radio>
-          </n-space>
-        </n-radio-group>
-      </setting-item>
-    </setting-item-box>
-    <template v-if="optionData.mapOptions.viewMode === '3D'">
-      <setting-item-box>
-        <setting-item name="天空色">
-          <n-color-picker size="small" :modes="['hex']" v-model:value="optionData.mapOptions.skyColor"></n-color-picker>
-        </setting-item>
-        <setting-item name="俯仰角">
-          <n-input-number v-model:value="optionData.mapOptions.pitch" :min="0" :max="83" size="small"></n-input-number>
-        </setting-item>
-      </setting-item-box>
-    </template>
-  </collapse-item>
-  <collapse-item name="标记" :expanded="true">
-    <setting-item-box name="样式">
-      <setting-item name="类型">
-        <n-select size="small" v-model:value="optionData.mapOptions.mapMarkerType" :options="MarkerOptions" />
-      </setting-item>
-      <setting-item name="颜色">
-        <n-color-picker v-model:value="optionData.mapOptions.marker.fillColor" size="small"></n-color-picker>
-      </setting-item>
-    </setting-item-box>
-  </collapse-item>
-</template>
-
-<script setup lang="ts">
-import { PropType } from 'vue'
-import { option, MarkerEnum, ThemeEnum, LangEnum, ViewModeEnum, FeaturesEnum } from './config'
-import { CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
-
-defineProps({
-  optionData: {
-    type: Object as PropType<typeof option>,
-    required: true
-  }
-})
-
-const themeOptions = [
-  {
-    value: ThemeEnum.NORMAL,
-    label: '标准'
-  },
-  {
-    value: ThemeEnum.DARK,
-    label: '幻影黑'
-  },
-  {
-    value: ThemeEnum.LIGHT,
-    label: '月光银'
-  },
-  {
-    value: ThemeEnum.WHITES_MOKE,
-    label: '远山黛'
-  },
-  {
-    value: ThemeEnum.FRESH,
-    label: '草色青'
-  },
-  {
-    value: ThemeEnum.GREY,
-    label: '雅士灰'
-  },
-  {
-    value: ThemeEnum.GRAFFITI,
-    label: '涂鸦'
-  },
-  {
-    value: ThemeEnum.MACARON,
-    label: '马卡龙'
-  },
-  {
-    value: ThemeEnum.BLUE,
-    label: '靛青蓝'
-  },
-  {
-    value: ThemeEnum.DARKBLUE,
-    label: '极夜蓝'
-  },
-  {
-    value: ThemeEnum.WINE,
-    label: '酱籽'
-  }
-]
-
-const langOptions = [
-  {
-    value: LangEnum.ZH_CN,
-    label: '中文简体'
-  },
-  {
-    value: LangEnum.EN,
-    label: '英文'
-  },
-  {
-    value: LangEnum.ZH_EN,
-    label: '中英文对照'
-  }
-]
-
-const viewModeOptions = [
-  {
-    value: ViewModeEnum.PLANE,
-    label: '2D'
-  },
-  {
-    value: ViewModeEnum.STEREOSCOPIC,
-    label: '3D'
-  }
-]
-
-const featuresOptions = [
-  {
-    value: FeaturesEnum.BG,
-    label: '显示地图背景'
-  },
-  {
-    value: FeaturesEnum.POINT,
-    label: '显示标识'
-  },
-  {
-    value: FeaturesEnum.ROAD,
-    label: '显示道路'
-  },
-  {
-    value: FeaturesEnum.BUILDING,
-    label: '显示建筑'
-  }
-]
-
-const MarkerOptions = [
-  {
-    value: MarkerEnum.CIRCLE_MARKER,
-    label: '圆形标点'
-  },
-  {
-    value: MarkerEnum.MARKER,
-    label: '定位标点'
-  },
-  {
-    value: MarkerEnum.NONE,
-    label: '隐藏标点'
-  }
-]
-</script>

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

@@ -1,19 +0,0 @@
-{
-  "markers": [
-    {
-      "name": "某某地市",
-      "value": 10,
-      "position": [116.300467, 39.907761]
-    },
-    {
-      "name": "某某地市",
-      "value": 15,
-      "position": [116.400567, 39.908761]
-    },
-    {
-      "name": "某某地市",
-      "value": 20,
-      "position": [116.200467, 39.937761]
-    }
-  ]
-}

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

@@ -1,14 +0,0 @@
-import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'
-import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'
-
-export const MapAmapConfig: ConfigType = {
-  key: 'MapAmap',
-  chartKey: 'VMapAmap',
-  conKey: 'VCMapAmap',
-  title: '高德地图',
-  category: ChatCategoryEnum.MAP,
-  categoryName: ChatCategoryEnumName.MAP,
-  package: PackagesCategoryEnum.CHARTS,
-  chartFrame: ChartFrameEnum.COMMON,
-  image: 'map_amap.png'
-}

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

@@ -1,130 +0,0 @@
-<template>
-  <div ref="vChartRef"></div>
-</template>
-
-<script setup lang="ts">
-import { ref, PropType, toRefs, watch } from 'vue'
-import AMapLoader from '@amap/amap-jsapi-loader'
-import { CreateComponentType } from '@/packages/index.d'
-import { useChartDataFetch } from '@/hooks'
-import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
-import { MarkerEnum } from './config'
-import { isArray } from '@/utils'
-
-const props = defineProps({
-  chartConfig: {
-    type: Object as PropType<CreateComponentType>,
-    required: true
-  }
-})
-let {
-  amapKey,
-  amapStyleKey,
-  amapLon,
-  amapLat,
-  amapZindex,
-  mapMarkerType,
-  lang,
-  amapStyleKeyCustom,
-  features,
-  viewMode,
-  pitch,
-  skyColor,
-  marker
-} = toRefs(props.chartConfig.option.mapOptions)
-
-let mapIns: any = null
-let markers: any = []
-let AMapIns: any = null
-const vChartRef = ref<HTMLElement>()
-
-const initMap = (newData: any) => {
-  // 初始化
-  AMapLoader.load({
-    key: amapKey.value, //api服务key--另外需要在public中使用安全密钥！！！
-    version: '1.4.8', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
-    plugins: ['AMap.PlaceSearch', 'AMap.AutoComplete'] // 需要使用的的插件列表
-  })
-    .then(AMap => {
-      AMapIns = AMap
-      mapIns = new AMap.Map(vChartRef.value, {
-        resizeEnable: true,
-        zoom: amapZindex.value, // 地图显示的缩放级别
-        center: [amapLon.value, amapLat.value],
-        mapStyle: `amap://styles/${amapStyleKeyCustom.value !== '' ? amapStyleKeyCustom.value : amapStyleKey.value}`, //自定义地图的显示样式
-        lang: lang.value,
-        features: features.value,
-        pitch: pitch.value, // 地图俯仰角度，有效范围 0 度- 83 度
-        skyColor: skyColor.value,
-        viewMode: viewMode.value, // 地图模式
-        willReadFrequently: true
-      })
-      dataHandle(props.chartConfig.option.dataset)
-    })
-    .catch(e => {})
-}
-
-const dataHandle = (newData: any) => {
-  if (!mapIns && !AMapIns) {
-    initMap(props.chartConfig.option)
-    return
-  }
-  if (isArray(newData.markers)) {
-    // 先清除旧标记
-    mapIns.remove(markers)
-    markers = []
-    // 记录新标记
-    if (mapMarkerType.value === MarkerEnum.MARKER) {
-      newData.markers.forEach((markerItem: any) => {
-        const markerInstance = new AMapIns.Marker({
-          position: [markerItem.position[0], markerItem.position[1]],
-          offset: new AMapIns.Pixel(-13, -30)
-        })
-        markers.push(markerInstance)
-        markerInstance.setMap(mapIns)
-      })
-    } else if (mapMarkerType.value === MarkerEnum.CIRCLE_MARKER) {
-      newData.markers.forEach((markerItem: any) => {
-        const markerInstance = new AMapIns.CircleMarker({
-          center: [markerItem.position[0], markerItem.position[1]],
-          radius: markerItem.value,
-          ...marker.value
-        })
-        markers.push(markerInstance)
-        markerInstance.setMap(mapIns)
-      })
-    }
-  }
-}
-
-const stopWatch = watch(
-  () => props.chartConfig.option.mapOptions,
-  option => {
-    initMap(option)
-  },
-  {
-    immediate: true,
-    deep: true
-  }
-)
-
-watch(
-  () => props.chartConfig.option.dataset,
-  newData => {
-    try {
-      dataHandle(newData)
-    } catch (error) {
-      console.log(error)
-    }
-  },
-  {
-    deep: false
-  }
-)
-
-// 预览
-useChartDataFetch(props.chartConfig, useChartEditStore, (newData: any) => {
-  stopWatch()
-  dataHandle(newData)
-})
-</script>

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

@@ -2,7 +2,6 @@ import { echartOptionProfixHandle, PublicConfigClass } from '@/packages/public'
 import { MapBaseConfig } from './index'
 import { chartInitConfig } from '@/settings/designSetting'
 import { CreateComponentType } from '@/packages/index.d'
-import cloneDeep from 'lodash/cloneDeep'
 import dataJson from './data.json'
 
 export const includes = []
@@ -152,6 +151,6 @@ 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 = cloneDeep(MapBaseConfig)
+  public chartConfig = MapBaseConfig
   public option = echartOptionProfixHandle(option, includes)
 }

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

@@ -1,4 +1,5 @@
 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 = {
@@ -10,5 +11,5 @@ export const MapBaseConfig: ConfigType = {
     categoryName: ChatCategoryEnumName.MAP,
     package: PackagesCategoryEnum.CHARTS,
     chartFrame: ChartFrameEnum.COMMON,
-    image: 'map.png'
-}
+    image
+  }