Merge remote-tracking branch 'origin/master-fetch-dev' into master-fetch

Merge pull request !94 from 吴医生/master0fetch-dev-my

.env

@@ -2,7 +2,7 @@
 VITE_DEV_PORT = '8080'
 
 # development path
-VITE_DEV_PATH = 'http://1.117.240.165:8080'
+VITE_DEV_PATH = 'https://demo.mtruning.club'
 
 # production path
-VITE_PRO_PATH = 'http://1.117.240.165:8080'
+VITE_PRO_PATH = 'https://demo.mtruning.club'

README.md

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "go-view",
-  "version": "2.1.0",
+  "version": "2.1.2",
   "scripts": {
     "dev": "vite --host",
     "build": "vue-tsc --noEmit && vite build",
@@ -11,6 +11,8 @@
     "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",

pnpm-lock.yaml

@@ -1,6 +1,8 @@
 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
@@ -65,6 +67,8 @@ 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
@@ -132,6 +136,14 @@ 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'}

src/App.vue

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

src/api/axios.config.ts

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

src/api/axios.ts

@@ -1,29 +1,70 @@
 import axios, { AxiosResponse, AxiosRequestConfig } from 'axios'
-import { ResultEnum } from "@/enums/httpEnum"
-import { ErrorPageNameMap } from "@/enums/pageEnum"
-import { redirectErrorPage } from '@/utils'
+import { ResultEnum, ModuleTypeEnum } from "@/enums/httpEnum"
+import { PageEnum, ErrorPageNameMap } from "@/enums/pageEnum"
+import { StorageEnum } from '@/enums/storageEnum'
+import { axiosPre } from '@/settings/httpSetting'
+import { SystemStoreEnum, SystemStoreUserInfoEnum } from '@/store/modules/systemStore/systemStore.d'
+import { redirectErrorPage, getLocalStorage, routerTurnByName, isPreview } 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)
   }
 )
 
 // 响应拦截器
 axiosInstance.interceptors.response.use(
   (res: AxiosResponse) => {
+    // 预览页面错误不进行处理
+    if (isPreview()) {
+      return Promise.resolve(res.data)
+    }
     const { code } = res.data as { code: number }
-    if (code === ResultEnum.SUCCESS) return Promise.resolve(res.data)
-    // 重定向
-    if (ErrorPageNameMap.get(code)) redirectErrorPage(code)
+
+    // 成功
+    if (code === ResultEnum.SUCCESS) {
+      return Promise.resolve(res.data)
+    }
+
+    // 登录过期
+    if (code === ResultEnum.TOKEN_OVERDUE) {
+      window['$message'].error(window['$t']('http.token_overdue_message'))
+      routerTurnByName(PageEnum.BASE_LOGIN_NAME)
+      return Promise.resolve(res.data)
+    }
+
+    // 固定错误码重定向
+    if (ErrorPageNameMap.get(code)) {
+      redirectErrorPage(code)
+      return Promise.resolve(res.data)
+    }
+    
+    // 提示错误
+    window['$message'].error(window['$t']((res.data as any).msg))
     return Promise.resolve(res.data)
   },
   (err: AxiosResponse) => {

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,
   })
 }
 

src/api/mock/index.ts

@@ -15,6 +15,7 @@ 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'
@@ -82,6 +83,11 @@ const mockObject: MockMethod[] = [
     method: RequestHttpEnum.GET,
     response: () => test.fetchMap
   },
+  {
+    url: capsuleUrl,
+    method: RequestHttpEnum.GET,
+    response: () => test.fetchCapsule
+  },
   {
     url: wordCloudUrl,
     method: RequestHttpEnum.GET,

src/api/mock/map.json

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

@@ -11,27 +11,7 @@ export default {
     msg: '请求成功',
     data: {
       dimensions: ['product', 'dataOne'],
-      source: [
-        {
-          product: '@name',
-          'dataOne|0-900': 3
-        },
-        {
-          product: '@name',
-          'dataOne|0-900': 3
-        },
-        {
-          product: '@name',
-          'dataOne|0-900': 3
-        },
-        {
-          product: '@name',
-          'dataOne|0-900': 3
-        },
-        {
-          product: '@name',
-          'dataOne|0-900': 3
-        },
+      'source|50': [
         {
           product: '@name',
           'dataOne|0-900': 3
@@ -39,6 +19,22 @@ export default {
       ]
     }
   },
+  // 胶囊图
+  fetchCapsule: {
+    code: 0,
+    status: 200,
+    msg: '请求成功',
+    data: {
+      dimensions: ['name', 'value'],
+      source: [
+        { name: '厦门', 'value|0-40': 20 },
+        { name: '南阳', 'value|20-60': 40 },
+        { name: '北京', 'value|40-80': 60 },
+        { name: '上海', 'value|60-100': 80 },
+        { name: '新疆', value: 100 }
+      ]
+    }
+  },
   // 图表
   fetchMockData: {
     code: 0,
@@ -46,32 +42,7 @@ export default {
     msg: '请求成功',
     data: {
       dimensions: ['product', 'dataOne', 'dataTwo'],
-      source: [
-        {
-          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
-        },
+      'source|50': [
         {
           product: '@name',
           'dataOne|100-900': 3,
@@ -85,21 +56,7 @@ export default {
     code: 0,
     status: 200,
     msg: '请求成功',
-    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 }
-    ]
+    'data|50': [{ name: '@name', 'value|100-900': 5 }]
   },
   // 轮播表格
   fetchScrollBoard: {
@@ -262,12 +219,7 @@ export default {
     data: [
       {
         startArray: { name: '@name', N: '@integer(10, 100)', E: '@integer(10, 100)' },
-        endArray: [
-          { name: '@name', N: '@integer(10, 100)', E: '@integer(10, 100)' },
-          { name: '@name', N: '@integer(10, 100)', E: '@integer(10, 100)' },
-          { name: '@name', N: '@integer(10, 100)', E: '@integer(10, 100)' },
-          { name: '@name', N: '@integer(10, 100)', E: '@integer(10, 100)' }
-        ]
+        'endArray|10': [{ name: '@name', N: '@integer(10, 100)', E: '@integer(10, 100)' }]
       }
     ]
   }

src/api/path/project.api.ts

@@ -74,9 +74,9 @@ export const changeProjectReleaseApi = async (data: object) => {
 }
 
 // * 上传文件
-export const uploadFile = async (url:string, data: object) => {
+export const uploadFile = async (data: object) => {
   try { 
-    const res = await http(RequestHttpEnum.POST)(url, data, ContentTypeEnum.FORM_DATA);
+    const res = await http(RequestHttpEnum.POST)(`${ModuleTypeEnum.PROJECT}/upload`, data, ContentTypeEnum.FORM_DATA);
     return res;
   } catch {
     httpErrorHandle();

src/backend/ibackend.ts

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

src/backend/indexdb/indexdb.ts

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

src/backend/indexdb/indexdbbackend.ts

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

src/backend/java/axios.ts

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

src/backend/java/http.ts

@@ -1,226 +0,0 @@
-import axiosInstance from './axios'
-import {
-  RequestHttpEnum,
-  ContentTypeEnum,
-  RequestBodyEnum,
-  RequestDataTypeEnum,
-  RequestContentTypeEnum,
-  RequestParamsObjType
-} from '@/enums/httpEnum'
-import type { RequestGlobalConfigType, RequestConfigType } from '@/store/modules/chartEditStore/chartEditStore.d'
-
-export const get = (url: string, params?: object) => {
-  return axiosInstance({
-    url: url,
-    method: RequestHttpEnum.GET,
-    params: params,
-  })
-}
-
-export const post = (url: string, data?: object, headersType?: string) => {
-  return axiosInstance({
-    url: url,
-    method: RequestHttpEnum.POST,
-    data: data,
-    headers: {
-      'Content-Type': headersType || ContentTypeEnum.JSON
-    }
-  })
-}
-
-export const patch = (url: string, data?: object, headersType?: string) => {
-  return axiosInstance({
-    url: url,
-    method: RequestHttpEnum.PATCH,
-    data: data,
-    headers: {
-      'Content-Type': headersType || ContentTypeEnum.JSON
-    }
-  })
-}
-
-export const put = (url: string, data?: object, headersType?: ContentTypeEnum) => {
-  return axiosInstance({
-    url: url,
-    method: RequestHttpEnum.PUT,
-    data: data,
-    headers: {
-      'Content-Type': headersType || ContentTypeEnum.JSON
-    }
-  })
-}
-
-export const del = (url: string, params?: object) => {
-  return axiosInstance({
-    url: url,
-    method: RequestHttpEnum.DELETE,
-    params
-  })
-}
-
-// 获取请求函数，默认get
-export const http = (type?: RequestHttpEnum) => {
-  switch (type) {
-    case RequestHttpEnum.GET:
-      return get
-
-    case RequestHttpEnum.POST:
-      return post
-
-    case RequestHttpEnum.PATCH:
-      return patch
-
-    case RequestHttpEnum.PUT:
-      return put
-
-    case RequestHttpEnum.DELETE:
-      return del
-
-    default:
-      return get
-  }
-}
-const prefix = 'javascript:'
-// 对输入字符进行转义处理
-export const translateStr = (target: string | object) => {
-  if (typeof target === 'string') {
-    if (target.startsWith(prefix)) {
-      const funcStr = target.split(prefix)[1]
-      let result;
-      try {
-        result = new Function(`${funcStr}`)()
-      } catch (error) {
-        console.log(error)
-        window['$message'].error('js内容解析有误！')
-      }
-      return result
-    } else {
-      return target
-    }
-  }
-  for (const key in target) {
-    if (Object.prototype.hasOwnProperty.call(target, key)) {
-      const subTarget = (target as any)[key];
-      (target as any)[key] = translateStr(subTarget)
-    }
-  }
-  return target
-}
-
-/**
- * * 自定义请求
- * @param targetParams 当前组件参数
- * @param globalParams 全局参数
- */
-export const customizeHttp = (targetParams: RequestConfigType, globalParams: RequestGlobalConfigType) => {
-  if (!targetParams || !globalParams) {
-    return
-  }
-
-  // 全局
-  const {
-    // 全局请求源地址
-    requestOriginUrl,
-    // 全局请求内容
-    requestParams: globalRequestParams
-  } = globalParams
-
-  // 目标组件（优先级 > 全局组件）
-  const {
-    // 请求地址
-    requestUrl,
-    // 普通 / sql
-    requestContentType,
-    // 获取数据的方式
-    requestDataType,
-    // 请求方式 get/post/del/put/patch
-    requestHttpType,
-    // 请求体类型 none / form-data / x-www-form-urlencoded / json /xml
-    requestParamsBodyType,
-    // SQL 请求对象
-    requestSQLContent,
-    // 请求内容 params / cookie / header / body: 同 requestParamsBodyType
-    requestParams: targetRequestParams
-  } = targetParams
-
-  // 静态排除
-  if (requestDataType === RequestDataTypeEnum.STATIC) return
-
-  if (!requestUrl) {
-    return
-  }
-
-  // 处理头部
-  let headers: RequestParamsObjType = {
-    ...globalRequestParams.Header,
-    ...targetRequestParams.Header
-  }
-  headers = translateStr(headers)
-
-  // data 参数
-  let data: RequestParamsObjType | FormData | string = {}
-  // params 参数
-  let params: RequestParamsObjType = { ...targetRequestParams.Params }
-  params = translateStr(params)
-  // form 类型处理
-  let formData: FormData = new FormData()
-  formData.set('default', 'defaultData')
-  // 类型处理
-
-  switch (requestParamsBodyType) {
-    case RequestBodyEnum.NONE:
-      break
-
-    case RequestBodyEnum.JSON:
-      headers['Content-Type'] = ContentTypeEnum.JSON
-      data = translateStr(JSON.parse(targetRequestParams.Body['json']))
-      // json 赋值给 data
-      break
-
-    case RequestBodyEnum.XML:
-      headers['Content-Type'] = ContentTypeEnum.XML
-      // xml 字符串赋值给 data
-      data = translateStr(targetRequestParams.Body['xml'])
-      break
-
-    case RequestBodyEnum.X_WWW_FORM_URLENCODED: {
-      headers['Content-Type'] = ContentTypeEnum.FORM_URLENCODED
-      const bodyFormData = targetRequestParams.Body['x-www-form-urlencoded']
-      for (const i in bodyFormData) formData.set(i, translateStr(bodyFormData[i]))
-      // FormData 赋值给 data
-      data = formData
-      break
-    }
-
-    case RequestBodyEnum.FORM_DATA: {
-      headers['Content-Type'] = ContentTypeEnum.FORM_DATA
-      const bodyFormUrlencoded = targetRequestParams.Body['form-data']
-      for (const i in bodyFormUrlencoded) {
-        formData.set(i, translateStr(bodyFormUrlencoded[i]))
-      }
-      // FormData 赋值给 data
-      data = formData
-      break
-    }
-  }
-
-  // sql 处理
-  if (requestContentType === RequestContentTypeEnum.SQL) {
-    headers['Content-Type'] = ContentTypeEnum.JSON
-    data = requestSQLContent
-  }
-
-  try {
-    const url =  (new Function("return `" + `${requestOriginUrl}${requestUrl}`.trim() + "`"))();
-    return axiosInstance({
-        url,
-        method: requestHttpType,
-        data,
-        params,
-        headers
-    })
-  } catch (error) {
-    console.log(error)
-    window['$message'].error('URL地址格式有误！')
-  }
-}

src/backend/mock/mockbackend.ts

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

src/components/GoSystemInfo/index.vue

@@ -11,7 +11,7 @@
       </template>
 
       <n-list-item>
-        <n-space :size="20">
+        <n-space class="go-my-2" :size="20">
           <n-text class="item-left">版权声明：</n-text>
           <n-text>
             GoView 版权属于
@@ -21,8 +21,7 @@
       </n-list-item>
 
       <n-list-item>
-        <n-divider style="margin-top: 0" />
-        <n-space :size="20">
+        <n-space class="go-my-2" :size="20">
           <n-text class="item-left">协议备注：</n-text>
           <n-text>
             请遵守开源 MIT 协议，以上声明 <n-text type="error">不可删除</n-text>，否则视作侵权行为，后果自负！
@@ -31,8 +30,7 @@
       </n-list-item>
 
       <n-list-item>
-        <n-divider style="margin-top: 0" />
-        <n-space :size="20">
+        <n-space  class="go-mt-2" :size="20">
           <n-text class="item-left">商业授权：</n-text>
           <n-text>
             若不想保留版权声明，请通过仓库/交流群 联系项目作者，进行授权

src/components/GoUserInfo/index.vue

@@ -27,7 +27,9 @@
 <script lang="ts" setup>
 import { h, ref } from 'vue'
 import { NAvatar, NText } from 'naive-ui'
-import { renderIcon } from '@/utils'
+import { renderIcon, getLocalStorage } from '@/utils'
+import { SystemStoreEnum, SystemStoreUserInfoEnum } from '@/store/modules/systemStore/systemStore.d'
+import { StorageEnum } from '@/enums/storageEnum'
 import { logout, renderLang } from '@/utils'
 import { GoSystemSet } from '@/components/GoSystemSet/index'
 import { GoSystemInfo } from '@/components/GoSystemInfo/index'
@@ -64,7 +66,17 @@ const renderUserInfo = () => {
       }),
       h('div', null, [
         h('div', null, [
-          h(NText, { depth: 2 }, { default: () => '奔跑的面条' })
+            h(NText, { depth: 2 }, {
+                default: () => {
+                    const info = getLocalStorage(StorageEnum.GO_SYSTEM_STORE)
+                    if (info) {
+                        return info[SystemStoreEnum.USER_INFO][SystemStoreUserInfoEnum.USER_NAME];
+                    }
+                    else {
+                        return 'admin';
+                    }
+                }
+            })
         ])
       ])
     ]
@@ -137,4 +149,4 @@ const handleSelect = (key: string) => {
   cursor: pointer;
   transform: scale(0.7);
 }
-</style>
+</style>

src/components/Pages/Flipper/index.ts

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

src/components/Pages/Flipper/index.vue

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

src/enums/editPageEnum.ts

@@ -9,6 +9,12 @@ export enum DragKeyEnum {
   DRAG_KEY = 'ChartData'
 }
 
+// 不同页面保存操作
+export enum SavePageEnum {
+  CHART = 'SaveChart',
+  JSON = 'SaveJSON'
+}
+
 // 操作枚举
 export enum MenuEnum {
   // 移动

src/enums/httpEnum.ts

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

src/enums/pageEnum.ts

@@ -12,6 +12,12 @@ 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',

src/enums/storageEnum.ts

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

src/hooks/index.ts

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

src/hooks/useChartDataFetch.hook.ts

@@ -1,6 +1,7 @@
 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'
@@ -23,6 +24,22 @@ export const useChartDataFetch = (
   const vChartRef = ref<typeof VChart | null>(null)
   let fetchInterval: any = 0
 
+  // 数据池
+  const { addGlobalDataInterface } = useChartDataPondFetch()
+  const { requestDataPondId } = toRefs(targetComponent.request)
+
+  // 组件类型
+  const { chartFrame } = targetComponent.chartConfig
+  
+  // eCharts 组件配合 vChart 库更新方式
+  const echartsUpdateHandle = (dataset: any) => {
+    if (chartFrame === ChartFrameEnum.ECHARTS) {
+      if (vChartRef.value) {
+        vChartRef.value.setOption({ dataset: dataset })
+      }
+    }
+  }
+
   const requestIntervalFn = () => {
     const chartEditStore = useChartEditStore()
 
@@ -41,9 +58,6 @@ export const useChartDataFetch = (
       requestInterval: targetInterval
     } = toRefs(targetComponent.request)
 
-    // 组件类型
-    const { chartFrame } = targetComponent.chartConfig
-
     // 非请求类型
     if (requestDataType.value !== RequestDataTypeEnum.AJAX) return
 
@@ -58,16 +72,11 @@ export const useChartDataFetch = (
         clearInterval(fetchInterval)
 
         const fetchFn = async () => {
-          const res = await customizeHttp(toRaw(targetComponent.request), toRaw(chartEditStore.requestGlobalConfig))
+          const res = await customizeHttp(toRaw(targetComponent.request), toRaw(chartEditStore.getRequestGlobalConfig))
           if (res) {
             try {
               const filter = targetComponent.filter
-              // eCharts 组件配合 vChart 库更新方式
-              if (chartFrame === ChartFrameEnum.ECHARTS) {
-                if (vChartRef.value) {
-                  vChartRef.value.setOption({ dataset: newFunctionHandle(res?.data, res, filter) })
-                }
-              }
+              echartsUpdateHandle(newFunctionHandle(res?.data, res, filter))
               // 更新回调函数
               if (updateCallback) {
                 updateCallback(newFunctionHandle(res?.data, res, filter))
@@ -94,6 +103,11 @@ export const useChartDataFetch = (
     }
   }
 
-  isPreview() && requestIntervalFn()
+  if (isPreview()) {
+    // 判断是否有数据池对应 id
+    requestDataPondId
+      ? addGlobalDataInterface(targetComponent, useChartEditStore, updateCallback || echartsUpdateHandle)
+      : requestIntervalFn()
+  }
   return { vChartRef }
 }

src/hooks/useChartDataPondFetch.hook.ts

@@ -0,0 +1,93 @@
+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 } 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
+
+  // 请求
+  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()
+}
+
+/**
+ * 数据池接口处理
+ */
+export const useChartDataPondFetch = () => {
+  // 新增全局接口
+  const addGlobalDataInterface = (
+    targetComponent: CreateComponentType,
+    useChartEditStore: ChartEditStoreType,
+    updateCallback: (...args: any) => any
+  ) => {
+    const chartEditStore = useChartEditStore()
+    const { requestDataPond } = chartEditStore.getRequestGlobalConfig
+
+    // 组件对应的数据池 Id
+    const requestDataPondId = '111' || (targetComponent.request.requestDataPondId as string)
+    // 新增数据项
+    const mittPondIdArr = mittDataPondMap.get(requestDataPondId) || []
+    mittPondIdArr.push({
+      updateCallback: updateCallback,
+      filter: targetComponent.filter
+    })
+    mittDataPondMap.set(requestDataPondId, mittPondIdArr)
+  }
+
+  // 初始化数据池
+  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,
+    initDataPond
+  }
+}

src/hooks/useLang.hook.ts

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

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

@@ -3,12 +3,6 @@
   <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"

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

@@ -3,12 +3,6 @@
   <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"

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

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

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

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

@@ -0,0 +1,15 @@
+import image from '@/assets/images/chart/charts/capsule.png'
+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
+}

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

@@ -0,0 +1,226 @@
+<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) => {
+  mergeConfig(props.chartConfig.option)
+  calcCapsuleLengthAndLabelData()
+}
+
+const mergeConfig = (data: any) => {
+  state.mergedConfig = cloneDeep(data || {})
+}
+
+// 数据解析
+const calcCapsuleLengthAndLabelData = () => {
+  const { source } = state.mergedConfig.dataset
+  if (!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
+}
+
+const numberSizeHandle = (val: string | number) => {
+  return val + 'px'
+}
+
+onMounted(() => {
+  calcData(props.chartConfig.option)
+})
+
+// 预览
+useChartDataFetch(props.chartConfig, useChartEditStore, (newData: any) => {
+  calcData(newData)
+})
+</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,4 +1,5 @@
 import { BarCommonConfig } from './BarCommon/index'
 import { BarCrossrangeConfig } from './BarCrossrange/index'
+import { CapsuleChartConfig } from './CapsuleChart/index'
 
-export default [BarCommonConfig, BarCrossrangeConfig]
+export default [BarCommonConfig, BarCrossrangeConfig, CapsuleChartConfig]

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

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

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

@@ -3,9 +3,6 @@
   <global-setting :optionData="optionData"></global-setting>
   <CollapseItem v-for="(item, index) in seriesList" :key="index" :name="`折线图-${index + 1}`" :expanded="true">
     <SettingItemBox name="线条">
-      <setting-item name="颜色">
-        <n-color-picker size="small" :modes="['hex']" v-model:value="item.lineStyle.color"></n-color-picker>
-      </setting-item>
       <SettingItem name="宽度">
         <n-input-number
           v-model:value="item.lineStyle.width"

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

@@ -3,6 +3,7 @@ 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']
@@ -58,7 +59,7 @@ const options = {
 
 export default class Config extends PublicConfigClass implements CreateComponentType {
   public key: string = LineGradientSingleConfig.key
-  public chartConfig = LineGradientSingleConfig
+  public chartConfig = cloneDeep(LineGradientSingleConfig)
   // 图表配置项
   public option = echartOptionProfixHandle(options, includes)
 }

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

@@ -3,6 +3,7 @@ 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']
@@ -85,7 +86,7 @@ const option = {
 
 export default class Config extends PublicConfigClass implements CreateComponentType {
   public key: string = LineGradientsConfig.key
-  public chartConfig = LineGradientsConfig
+  public chartConfig = cloneDeep(LineGradientsConfig)
   // 图表配置项
   public option = echartOptionProfixHandle(option, includes)
 }

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

@@ -2,6 +2,7 @@ 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']
@@ -54,7 +55,7 @@ export const option = {
 
 export default class Config extends PublicConfigClass implements CreateComponentType {
   public key: string = LineLinearSingleConfig.key
-  public chartConfig = LineLinearSingleConfig
+  public chartConfig = cloneDeep(LineLinearSingleConfig)
   // 图表配置项
   public option = echartOptionProfixHandle(option, includes)
 }

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

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

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

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

@@ -0,0 +1,15 @@
+import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'
+import image from '@/assets/images/chart/charts/map_amap.png'
+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
+}

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

@@ -0,0 +1,130 @@
+<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,6 +2,7 @@ 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 = []
@@ -151,6 +152,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 = MapBaseConfig
+  public chartConfig = cloneDeep(MapBaseConfig)
   public option = echartOptionProfixHandle(option, includes)
 }

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

@@ -1,3 +1,4 @@
 import { MapBaseConfig } from './MapBase/index'
+import { MapAmapConfig } from './MapAmap/index'
 
-export default [ MapBaseConfig ]
+export default [MapBaseConfig, MapAmapConfig]

src/packages/components/Charts/Pies/PieCircle/config.ts

@@ -1,6 +1,7 @@
 import { echartOptionProfixHandle, PublicConfigClass } from '@/packages/public'
 import { PieCircleConfig } from './index'
 import { CreateComponentType } from '@/packages/index.d'
+import cloneDeep from 'lodash/cloneDeep'
 
 export const includes = []
 
@@ -57,7 +58,7 @@ const option = {
 export default class Config extends PublicConfigClass implements CreateComponentType {
   public key: string = PieCircleConfig.key
 
-  public chartConfig = PieCircleConfig
+  public chartConfig = cloneDeep(PieCircleConfig)
 
   // 图表配置项
   public option = echartOptionProfixHandle(option, includes)

src/packages/components/Charts/Pies/PieCommon/config.ts

@@ -1,6 +1,7 @@
 import { echartOptionProfixHandle, PublicConfigClass } from '@/packages/public'
 import { PieCommonConfig } from './index'
 import { CreateComponentType } from '@/packages/index.d'
+import cloneDeep from 'lodash/cloneDeep'
 import dataJson from './data.json'
 
 export const includes = ['legend']
@@ -61,7 +62,7 @@ const option = {
 export default class Config extends PublicConfigClass implements CreateComponentType {
   public key: string = PieCommonConfig.key
 
-  public chartConfig = PieCommonConfig
+  public chartConfig = cloneDeep(PieCommonConfig)
 
   // 图表配置项
   public option = echartOptionProfixHandle(option, includes)

src/packages/components/Decorates/Mores/CountDown/config.ts

@@ -3,7 +3,7 @@ import { CreateComponentType } from '@/packages/index.d'
 import { CountDownConfig } from './index'
 import cloneDeep from 'lodash/cloneDeep'
 import { chartInitConfig } from '@/settings/designSetting'
-import { FlipType } from '@/components/Flipper'
+import { FlipType } from '@/components/Pages/Flipper'
 
 type STYLE = '时分秒' | '冒号'
 

src/packages/components/Decorates/Mores/CountDown/index.vue

@@ -76,7 +76,7 @@
 <script setup lang="ts">
 import { PropType, toRefs, watch, ref, onMounted } from 'vue'
 import { CreateComponentType } from '@/packages/index.d'
-import { Flipper } from '@/components/Flipper'
+import { Flipper } from '@/components/Pages/Flipper'
 import { OptionType } from './config'
 import { CountdownInst, CountdownProps } from 'naive-ui/es/countdown/src/Countdown'
 

src/packages/components/Decorates/Mores/FlipperNumber/config.ts

@@ -3,7 +3,7 @@ import { CreateComponentType } from '@/packages/index.d'
 import { FlipperNumberConfig } from './index'
 import cloneDeep from 'lodash/cloneDeep'
 import { chartInitConfig } from '@/settings/designSetting'
-import { FlipType } from '@/components/Flipper'
+import { FlipType } from '@/components/Pages/Flipper'
 
 export interface OptionType {
   dataset: number | string

src/packages/components/Decorates/Mores/FlipperNumber/index.vue

@@ -21,7 +21,7 @@ import { PropType, toRefs, watch, ref } from 'vue'
 import { CreateComponentType } from '@/packages/index.d'
 import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
 import { useChartDataFetch } from '@/hooks'
-import { Flipper } from '@/components/Flipper'
+import { Flipper } from '@/components/Pages/Flipper'
 import { OptionType } from './config'
 
 const props = defineProps({

src/packages/components/Decorates/Three/ThreeEarth01/index.vue

@@ -67,7 +67,7 @@ watch(
 onMounted(() => {
   try {
     if (navigator.userAgent.indexOf('Chrome') < -1 || navigator.userAgent.indexOf('Edg') > -1) {
-      window['$message'].error('此组件仅在【谷歌】浏览器上能正常展示！')
+      window['$message'].error('三维地图组件仅在【谷歌】浏览器上能正常展示！')
       chartEditStore.removeComponentList(undefined, false)
       return
     }

src/packages/components/Informations/Mores/Iframe/config.ts

@@ -0,0 +1,20 @@
+import { PublicConfigClass } from '@/packages/public'
+import { CreateComponentType } from '@/packages/index.d'
+import { chartInitConfig } from '@/settings/designSetting'
+import { IframeConfig } from './index'
+import cloneDeep from 'lodash/cloneDeep'
+
+export const option = {
+  // 网站路径
+  dataset: "https://www.mtruning.club/",
+  // 圆角
+  borderRadius: 10
+}
+
+export default class Config extends PublicConfigClass implements CreateComponentType
+{
+  public key = IframeConfig.key
+  public attr = { ...chartInitConfig, w: 800, h: 800, zIndex: -1 }
+  public chartConfig = cloneDeep(IframeConfig)
+  public option = cloneDeep(option)
+}

src/packages/components/Informations/Mores/Iframe/config.vue

@@ -0,0 +1,36 @@
+<template>
+  <collapse-item name="属性" :expanded="true">
+    <setting-item-box name="路径" :alone="true">
+      <setting-item name="请填写 https 协议的网址">
+        <n-input v-model:value="optionData.dataset" size="small"></n-input>
+      </setting-item>
+    </setting-item-box>
+    <setting-item-box name="样式">
+      <setting-item name="圆角">
+        <n-input-number
+          v-model:value="optionData.borderRadius"
+          size="small"
+          :min="0"
+          placeholder="圆角"
+        ></n-input-number>
+      </setting-item>
+    </setting-item-box>
+  </collapse-item>
+</template>
+
+<script setup lang="ts">
+import { PropType } from "vue";
+import { option } from "./config";
+import {
+  CollapseItem,
+  SettingItemBox,
+  SettingItem,
+} from "@/components/Pages/ChartItemSetting";
+
+const props = defineProps({
+  optionData: {
+    type: Object as PropType<typeof option>,
+    required: true,
+  },
+});
+</script>

src/packages/components/Informations/Mores/Iframe/index.ts

@@ -0,0 +1,15 @@
+import image from '@/assets/images/chart/informations/iframe.png'
+import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'
+import { ChatCategoryEnum,ChatCategoryEnumName } from '../../index.d'
+
+export const IframeConfig: ConfigType = {
+  key: 'Iframe',
+  chartKey: 'VIframe',
+  conKey: 'VCIframe',
+  title: '远程网页',
+  category: ChatCategoryEnum.MORE,
+  categoryName: ChatCategoryEnumName.MORE,
+  package: PackagesCategoryEnum.INFORMATIONS,
+  chartFrame: ChartFrameEnum.COMMON,
+  image
+}

src/packages/components/Informations/Mores/Iframe/index.vue

@@ -0,0 +1,49 @@
+<template>
+  <div :style="getStyle(borderRadius)">
+    <iframe :src="option.dataset" :width="w" :height="h" style="border-width: 0"></iframe>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { PropType, shallowReactive, watch, toRefs } from 'vue'
+import { useChartDataFetch } from '@/hooks'
+import { CreateComponentType } from '@/packages/index.d'
+import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
+
+const props = defineProps({
+  chartConfig: {
+    type: Object as PropType<CreateComponentType>,
+    required: true
+  }
+})
+
+const { w, h } = toRefs(props.chartConfig.attr)
+const { borderRadius } = toRefs(props.chartConfig.option)
+
+const option = shallowReactive({
+  dataset: ''
+})
+
+const getStyle = (radius: number) => {
+  return {
+    borderRadius: `${radius}px`,
+    overflow: 'hidden'
+  }
+}
+
+// 编辑更新
+watch(
+  () => props.chartConfig.option.dataset,
+  (newData: string) => {
+    option.dataset = newData
+  },
+  {
+    immediate: true
+  }
+)
+
+// 预览更新
+useChartDataFetch(props.chartConfig, useChartEditStore, (newData: string) => {
+  option.dataset = newData
+})
+</script>

src/packages/components/Informations/Mores/Image/index.vue

@@ -46,8 +46,7 @@ watch(
     option.dataset = newData
   },
   {
-    immediate: true,
-    deep: false
+    immediate: true
   }
 )
 

src/packages/components/Informations/Mores/Video/index.ts

@@ -10,6 +10,6 @@ export const VideoConfig: ConfigType = {
   category: ChatCategoryEnum.MORE,
   categoryName: ChatCategoryEnumName.MORE,
   package: PackagesCategoryEnum.INFORMATIONS,
-  chartFrame: ChartFrameEnum.ECHARTS,
+  chartFrame: ChartFrameEnum.COMMON,
   image
 }

src/packages/components/Informations/Mores/index.ts

@@ -1,5 +1,6 @@
 import { ImageConfig } from './Image/index'
+import { IframeConfig } from './Iframe/index'
 import { VideoConfig } from './Video/index'
 import { WordCloudConfig } from './WordCloud/index'
 
-export default [ImageConfig, VideoConfig, WordCloudConfig]
+export default [WordCloudConfig, ImageConfig, VideoConfig, IframeConfig]

src/packages/components/Informations/Texts/TextBarrage/config.ts

@@ -0,0 +1,42 @@
+import { PublicConfigClass } from '@/packages/public'
+import { CreateComponentType } from '@/packages/index.d'
+import { TextBarrageConfig } from './index'
+import { chartInitConfig } from '@/settings/designSetting'
+import cloneDeep from 'lodash/cloneDeep'
+
+export enum FontWeightEnum {
+  NORMAL = '常规',
+  BOLD = '加粗',
+}
+
+export const FontWeightObject = {
+  [FontWeightEnum.NORMAL]: 'normal',
+  [FontWeightEnum.BOLD]: 'bold',
+}
+
+export const option = {
+  
+  dataset: '让数字化看得见',
+  fontSize: 32,
+  fontColor: '#ffffff',
+  fontWeight: 'normal',
+  // 字间距
+  letterSpacing: 5,
+  //阴影
+  showShadow:  true,
+  boxShadow: 'none',
+  hShadow: 0,
+  vShadow: 0,
+  blurShadow: 8,
+  colorShadow: '#0075ff',
+  //动画
+  animationTime: 0,
+  animationSpeed: 50,
+}
+
+export default class Config extends PublicConfigClass implements CreateComponentType {
+  public key = TextBarrageConfig.key
+  public attr = { ...chartInitConfig, w: 500, h: 70, zIndex: -1 }
+  public chartConfig = cloneDeep(TextBarrageConfig)
+  public option = cloneDeep(option)
+}

src/packages/components/Informations/Texts/TextBarrage/config.vue

@@ -0,0 +1,89 @@
+<template>
+  <collapse-item name="信息" :expanded="true">
+    <setting-item-box name="文字" :alone="true">
+      <setting-item>
+        <n-input v-model:value="optionData.dataset" size="small"></n-input>
+      </setting-item>
+    </setting-item-box>
+  </collapse-item>
+
+  <collapse-item name="样式" :expanded="true">
+    <setting-item-box name="文字">
+      <setting-item name="颜色">
+        <n-color-picker size="small" :modes="['hex']" v-model:value="optionData.fontColor"></n-color-picker>
+      </setting-item>
+      <setting-item name="字体大小">
+        <n-input-number v-model:value="optionData.fontSize" size="small" placeholder="字体大小"></n-input-number>
+      </setting-item>
+      <setting-item name="字体粗细">
+        <n-select v-model:value="optionData.fontWeight" size="small" :options="fontWeightOptions" />
+      </setting-item>
+
+      <setting-item name="字间距">
+        <n-input-number v-model:value="optionData.letterSpacing" size="small" placeholder="输入字间距"></n-input-number>
+      </setting-item>
+    </setting-item-box>
+    <setting-item-box name="阴影">
+      <setting-item>
+        <n-space>
+          <n-switch v-model:value="optionData.showShadow" size="small" />
+          <n-text>展示阴影</n-text>
+        </n-space>
+      </setting-item>
+      <setting-item name="颜色">
+        <n-color-picker size="small" :modes="['hex']" v-model:value="optionData.colorShadow"></n-color-picker
+      ></setting-item>
+      <setting-item name="x">
+        <n-input-number v-model:value="optionData.hShadow" size="small"></n-input-number
+      ></setting-item>
+      <setting-item name="y">
+        <n-input-number v-model:value="optionData.vShadow" size="small"></n-input-number
+      ></setting-item>
+      <setting-item name="模糊">
+        <n-input-number v-model:value="optionData.blurShadow" size="small"></n-input-number
+      ></setting-item>
+    </setting-item-box>
+
+    <setting-item-box name="动画">
+      <setting-item name="动画速度">
+        <n-input-number
+          v-model:value="optionData.animationSpeed"
+          size="small"
+          placeholder="动画速度"
+          :min="0"
+        ></n-input-number>
+      </setting-item>
+      <setting-item name="动画间隔">
+        <n-input-number
+          v-model:value="optionData.animationTime"
+          size="small"
+          placeholder="动画间隔"
+          :min="0"
+        ></n-input-number>
+      </setting-item>
+    </setting-item-box>
+  </collapse-item>
+</template>
+
+<script setup lang="ts">
+import { PropType } from 'vue'
+import { option, FontWeightEnum, FontWeightObject } from './config'
+import { CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
+const props = defineProps({
+  optionData: {
+    type: Object as PropType<typeof option>,
+    required: true
+  }
+})
+
+const fontWeightOptions = [
+  {
+    label: FontWeightEnum.NORMAL,
+    value: FontWeightObject[FontWeightEnum.NORMAL]
+  },
+  {
+    label: FontWeightEnum.BOLD,
+    value: FontWeightObject[FontWeightEnum.BOLD]
+  }
+]
+</script>

src/packages/components/Informations/Texts/TextBarrage/index.ts

@@ -0,0 +1,14 @@
+import image from '@/assets/images/chart/informations/text_barrage.png'
+import { ConfigType, PackagesCategoryEnum } from '@/packages/index.d'
+import { ChatCategoryEnum,ChatCategoryEnumName } from '../../index.d'
+
+export const TextBarrageConfig: ConfigType = {
+  key: 'TextBarrage',
+  chartKey: 'VTextBarrage',
+  conKey: 'VCTextBarrage',
+  title: '弹幕文字',
+  category: ChatCategoryEnum.TEXT,
+  categoryName: ChatCategoryEnumName.TEXT,
+  package: PackagesCategoryEnum.INFORMATIONS,
+  image
+}

src/packages/components/Informations/Texts/TextBarrage/index.vue

@@ -0,0 +1,102 @@
+<template>
+  <div class="go-text-box">
+    <div class="content">
+      <span>
+        {{ option.dataset }}
+      </span>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { PropType, toRefs, shallowReactive, watch, computed, ref } from 'vue'
+import { CreateComponentType } from '@/packages/index.d'
+import { useChartDataFetch } from '@/hooks'
+import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
+import { option as configOption } from './config'
+import { values } from 'lodash'
+
+const props = defineProps({
+  chartConfig: {
+    type: Object as PropType<CreateComponentType & typeof option>,
+    required: true
+  }
+})
+
+const { w } = toRefs(props.chartConfig.attr)
+
+const { fontColor, fontSize, letterSpacing, fontWeight, animationTime, animationSpeed, boxShadow } = toRefs(
+  props.chartConfig.option
+)
+
+const option = shallowReactive({
+  dataset: configOption.dataset
+})
+
+// 手动更新
+watch(
+  () => props.chartConfig.option.dataset,
+  (newData: any) => {
+    option.dataset = newData
+  },
+  {
+    immediate: true,
+    deep: false
+  }
+)
+
+//阴影
+watch(
+  props.chartConfig.option,
+  () => {
+    try {
+      if (props.chartConfig.option.showShadow) {
+        boxShadow.value = `${props.chartConfig.option.hShadow}px ${props.chartConfig.option.vShadow}px ${props.chartConfig.option.blurShadow}px ${props.chartConfig.option.colorShadow}`
+      } else {
+        boxShadow.value = 'none'
+      }
+    } catch (error) {
+      console.log(error)
+    }
+  },
+  {
+    immediate: true
+  }
+)
+
+const transitionDuration = computed(() => {
+  return Math.floor((w.value as any) / (animationSpeed.value as any))
+})
+
+// 预览更新
+useChartDataFetch(props.chartConfig, useChartEditStore, (newData: string) => {
+  option.dataset = newData
+})
+</script>
+
+<style lang="scss" scoped>
+@include go('text-box') {
+  display: flex;
+  align-items: center;
+  .content {
+    width: 100%;
+    color: v-bind('fontColor');
+    font-size: v-bind('fontSize + "px"');
+    letter-spacing: v-bind('letterSpacing + "px"');
+    font-weight: v-bind('fontWeight');
+    text-shadow: v-bind('boxShadow');
+    position: absolute;
+    animation: barrage v-bind('transitionDuration + "s"') linear v-bind('animationTime + "s"') infinite;
+  }
+  @keyframes barrage {
+    from {
+      left: 100%;
+      transform: translateX(0);
+    }
+    to {
+      left: 0;
+      transform: translateX(-100%);
+    }
+  }
+}
+</style>

src/packages/components/Informations/Texts/index.ts

@@ -1,4 +1,5 @@
 import { TextCommonConfig } from './TextCommon/index'
+import { TextBarrageConfig } from './TextBarrage/index'
 import { TextGradientConfig } from './TextGradient/index'
 
-export default [TextCommonConfig, TextGradientConfig]
+export default [TextCommonConfig, TextGradientConfig, TextBarrageConfig]

src/packages/components/Tables/Tables/TableList/index.vue

@@ -62,7 +62,7 @@ const status = reactive({
 const calcRowsData = () => {
   let { dataset, rowNum, sort } = status.mergedConfig
   // @ts-ignore
-  sort && dataset.sort(({ value: a }, { value: b }) => {
+  sort &&dataset.sort(({ value: a }, { value: b  } )  => {
       if (a > b) return -1
       if (a < b) return 1
       if (a === b) return 0
@@ -94,6 +94,7 @@ const calcHeights = (onresize = false) => {
   const { rowNum, dataset } = status.mergedConfig
   const avgHeight = h.value / rowNum
   status.avgHeight = avgHeight
+
   if (!onresize) status.heights = new Array(dataset.length).fill(avgHeight)
 }
 
@@ -131,12 +132,17 @@ const stopAnimation = () => {
 const onRestart = async () => {
   try {
     if (!status.mergedConfig) return
+    let { dataset, rowNum, sort } = status.mergedConfig
     stopAnimation()
     calcRowsData()
-    calcHeights(true)
-    animation(true)
+    let flag = true
+    if (dataset.length <= rowNum) {
+      flag=false
+    }
+    calcHeights(flag)
+    animation(flag)
   } catch (error) {
-    console.log(error)
+    console.error(error)
   }
 }
 

src/packages/index.d.ts

@@ -90,19 +90,24 @@ export const BlendModeEnumList = [
   { label: '亮度', value: 'luminosity' }
 ]
 
+// 基础事件类型(vue不加 on)
+export enum BaseEvent {
+  // 点击
+  ON_CLICK = 'click',
+  // 双击
+  ON_DBL_CLICK = 'dblclick',
+  // 移入
+  ON_MOUSE_ENTER = 'mouseenter',
+  // 移出
+  ON_MOUSE_LEAVE = 'mouseleave',
+}
+
 // vue3 生命周期事件
-export enum EventLife {
+export enum EventLife { 
   // 渲染之后
-  MOUNTED = 'vnodeMounted',
+  VNODE_MOUNTED = 'vnodeMounted',
   // 渲染之前
-  BEFORE_MOUNT = 'vnodeBeforeMount',
-  // 鼠标事件
-  MOUSE_CLICK = 'click',
-  MOUSE_OVER = "mouseover",
-  MOUSE_LEAVE = "mouseleave",
-  // 图表事件
-  ECHART_LEGEND_SELECT_CHANGED = "legendselectchanged",
-  ECHART_HIGH_LIGHT = "highlight"
+  VNODE_BEFORE_MOUNT = 'vnodeBeforeMount',
 }
 
 // 组件实例类
@@ -130,15 +135,20 @@ export interface PublicConfigType {
   }
   filter?: string
   status: StatusType
-  events?: {
-    [K in EventLife]?: string
+  events: {
+    baseEvent: {
+      [K in BaseEvent]?: string
+    },
+    advancedEvents: {
+      [K in EventLife]?: string
+    }
   }
 }
 
 export interface CreateComponentType extends PublicConfigType, requestConfig {
   key: string
   chartConfig: ConfigType
-  option: GlobalThemeJsonType
+  option: GlobalThemeJsonType,
 }
 
 // 组件成组实例类

src/packages/public/publicConfig.ts

@@ -1,5 +1,4 @@
 import { getUUID } from '@/utils'
-import { ChartFrameEnum, PublicConfigType, CreateComponentType, CreateComponentGroupType } from '@/packages/index.d'
 import { RequestConfigType } from '@/store/modules/chartEditStore/chartEditStore.d'
 import { groupTitle } from '@/settings/designSetting'
 import {
@@ -9,6 +8,14 @@ import {
   RequestContentTypeEnum,
   RequestBodyEnum
 } from '@/enums/httpEnum'
+import {
+  BaseEvent,
+  EventLife,
+  ChartFrameEnum,
+  PublicConfigType,
+  CreateComponentType,
+  CreateComponentGroupType
+} from '@/packages/index.d'
 import { chartInitConfig } from '@/settings/designSetting'
 import cloneDeep from 'lodash/cloneDeep'
 
@@ -82,7 +89,18 @@ export class PublicConfigClass implements PublicConfigType {
   // 数据过滤
   public filter = undefined
   // 事件
-  public events = undefined
+  public events = {
+    baseEvent: {
+      [BaseEvent.ON_CLICK]: undefined,
+      [BaseEvent.ON_DBL_CLICK]: undefined,
+      [BaseEvent.ON_MOUSE_ENTER]: undefined,
+      [BaseEvent.ON_MOUSE_LEAVE]: undefined
+    },
+    advancedEvents: {
+      [EventLife.VNODE_MOUNTED]: undefined,
+      [EventLife.VNODE_BEFORE_MOUNT]: undefined
+    }
+  }
 }
 
 // 多选成组类

src/plugins/icon.ts

@@ -27,6 +27,7 @@ import {
   LockClosedOutline as LockClosedOutlineIcon,
   HelpCircleOutline as HelpOutlineIcon,
   CodeSlash as CodeSlashIcon,
+  Create as CreateIcon,
   Rocket as RocketIcon,
   Duplicate as DuplicateIcon,
   DuplicateOutline as DuplicateOutlineIcon,
@@ -63,7 +64,8 @@ import {
   Images as ImagesIcon,
   List as ListIcon,
   EyeOutline as EyeOutlineIcon,
-  EyeOffOutline as EyeOffOutlineIcon
+  EyeOffOutline as EyeOffOutlineIcon,
+  Albums as AlbumsIcon
 } from '@vicons/ionicons5'
 
 import {
@@ -96,7 +98,8 @@ import {
   Carbon3DCursor as Carbon3DCursorIcon,
   Carbon3DSoftware as Carbon3DSoftwareIcon,
   Filter as FilterIcon,
-  FilterEdit as FilterEditIcon
+  FilterEdit as FilterEditIcon,
+  Laptop as LaptopIcon
 } from '@vicons/carbon'
 
 const ionicons5 = {
@@ -108,6 +111,8 @@ const ionicons5 = {
   DuplicateOutlineIcon,
   // 代码
   CodeSlashIcon,
+  // 修改代码
+  CreateIcon,
   // 事件(火箭)
   RocketIcon,
   // 退出
@@ -229,7 +234,9 @@ const ionicons5 = {
   ListIcon,
   // 眼睛
   EyeOutlineIcon,
-  EyeOffOutlineIcon
+  EyeOffOutlineIcon,
+  // 图表列表 
+  AlbumsIcon
 }
 
 const carbon = {
@@ -282,7 +289,9 @@ const carbon = {
   Carbon3DSoftwareIcon,
   // 过滤器
   FilterIcon,
-  FilterEditIcon
+  FilterEditIcon,
+  // 图层
+  LaptopIcon
 }
 
 // https://www.xicons.org/#/ 还有很多

src/router/index.ts

@@ -21,7 +21,8 @@ const RootRoute: Array<RouteRecordRaw> = [
       ...RedirectRoute,
       modules.projectRoutes,
       modules.chartRoutes,
-      modules.previewRoutes
+      modules.previewRoutes,
+      modules.editRoutes
     ]
   }
 ]

src/router/modules/chart.route.ts

@@ -12,7 +12,8 @@ const chartRoutes: RouteRecordRaw = {
   component: importPath['ChartEnum.CHART_HOME_NAME'],
   meta: {
     title: '工作空间',
-    isRoot: true
+    isRoot: true,
+    noKeepAlive: true,
   }
 }
 

src/router/modules/edit.route.ts

@@ -0,0 +1,20 @@
+import { RouteRecordRaw } from 'vue-router'
+import { EditEnum } from '@/enums/pageEnum'
+
+// 引入路径
+const importPath = {
+  [EditEnum.CHART_EDIT_NAME]: () => import('@/views/edit/index.vue')
+}
+
+const chartRoutes: RouteRecordRaw = {
+  path: EditEnum.CHART_EDIT,
+  name: EditEnum.CHART_EDIT_NAME,
+  component: importPath[EditEnum.CHART_EDIT_NAME],
+  meta: {
+    title: '编辑',
+    isRoot: true
+  }
+}
+
+
+export default chartRoutes

src/router/modules/index.ts

@@ -1,9 +1,11 @@
 import projectRoutes from './project.router'
 import chartRoutes from './chart.route'
 import previewRoutes from './preview.route'
+import editRoutes from './edit.route'
 
 export default {
   projectRoutes,
   chartRoutes,
-  previewRoutes
+  previewRoutes,
+  editRoutes
 }

src/router/modules/preview.route.ts

@@ -3,7 +3,7 @@ import { PreviewEnum } from '@/enums/pageEnum'
 
 // 引入路径
 const importPath = {
-  'PreviewEnum.CHART_PREVIEW_NAME': () => import('@/views/preview/index.vue')
+  'PreviewEnum.CHART_PREVIEW_NAME': () => import('@/views/preview/wrapper.vue')
 }
 
 const chartRoutes: RouteRecordRaw = {

src/router/router-guards.ts

@@ -18,13 +18,11 @@ export function createRouterGuards(router: Router) {
     const isErrorPage = router.getRoutes().findIndex((item) => item.name === to.name);
     if (isErrorPage === -1) {
       next({ name: PageEnum.ERROR_PAGE_NAME_404 })
-      return
     }
 
     // @ts-ignore
     if (!routerAllowList.includes(to.name) && !loginCheck()) {
       next({ name: PageEnum.BASE_LOGIN_NAME })
-      return
     }
     next()
   })

src/settings/animations/index.ts

@@ -11,7 +11,6 @@ export const animations = [
       { label: '放大晃动缩小', value: 'tada' },
       { label: '扇形摇摆', value: 'wobble' },
       { label: '左右上下晃动', value: 'jello' },
-      { label: 'Y轴旋转', value: 'flip' }
     ]
   },
   {

src/settings/designSetting.ts

@@ -55,7 +55,10 @@ export const backgroundImageSize = 5
 // 预览展示方式
 export const previewScaleType = PreviewScaleEnum.FIT
 
-// 数据请求间隔（s）
+// 编辑工作台同步到 JSON 的轮询间隔（5S）
+export const editToJsonInterval = 5000
+
+// 数据请求间隔
 export const requestInterval = 30
 
 // 工作台自动保存间隔（s）

src/settings/pathConst.ts

@@ -1,10 +1,10 @@
 // * 外部路径地址
 
 // 项目文档地址
-export const docPath = "http://www.mtruning.club:81/"
+export const docPath = "https://www.mtruning.club/"
 
 // 项目源码
-export const giteeSourceCodePath = "https://gitee.com/MTrun/go-view/"
+export const giteeSourceCodePath = "https://gitee.com/dromara/go-view"
 
 // 赞助
-export const sponsorPath = "http://www.mtruning.club:81/more/sponsor.html"
+export const sponsorPath = "https://www.mtruning.club/sponsor/"

src/store/index.ts

@@ -1,10 +1,10 @@
 import type { App } from 'vue';
 import { createPinia } from 'pinia';
 
-const store = createPinia();
+const pinia = createPinia();
 
 export function setupStore(app: App<Element>) {
-  app.use(store);
+  app.use(pinia);
 }
 
-export { store };
+export { pinia };

src/store/modules/chartEditStore/chartEditStore.d.ts

@@ -185,16 +185,27 @@ type RequestPublicConfigType = {
   requestParams: RequestParams
 }
 
+// 数据池项类型
+export type RequestDataPondItemType = {
+  dataPondId: string,
+  dataPondName: string,
+  dataPondRequestConfig: RequestConfigType
+}
+
 // 全局的图表请求配置
 export interface RequestGlobalConfigType extends RequestPublicConfigType {
   // 组件定制轮询时间
   requestInterval: number
   // 请求源地址
   requestOriginUrl?: string
+  // 公共数据池
+  requestDataPond: RequestDataPondItemType[]
 }
 
 // 单个图表请求配置
 export interface RequestConfigType extends RequestPublicConfigType {
+  // 所选全局数据池的对应 id
+  requestDataPondId?: string
   // 组件定制轮询时间
   requestInterval?: number
   // 获取数据的方式

src/store/modules/chartEditStore/chartEditStore.ts

@@ -126,11 +126,12 @@ export const useChartEditStore = defineStore({
       chartThemeColor: defaultTheme || 'dark',
       // 全局配置
       chartThemeSetting: globalThemeJson,
-      // 预览方式
+      // 适配方式
       previewScaleType: previewScaleType
     },
     // 数据请求处理（需存储给后端）
     requestGlobalConfig: {
+      requestDataPond: [],
       requestOriginUrl: '',
       requestInterval: requestInterval,
       requestIntervalUnit: requestIntervalUnit,

src/store/modules/chartLayoutStore/chartLayoutStore.d.ts

@@ -1,3 +1,8 @@
+export enum ChartModeEnum {
+  SINGLE= 'single',
+  DOUBLE = 'double'
+}
+
 export enum LayerModeEnum {
   THUMBNAIL = 'thumbnail',
   TEXT = 'text'
@@ -7,6 +12,7 @@ export enum ChartLayoutStoreEnum {
   LAYERS = 'layers',
   CHARTS = 'charts',
   DETAILS = 'details',
+  Chart_TYPE = 'chartType',
   LAYER_TYPE = 'layerType'
 }
 
@@ -17,6 +23,8 @@ export interface ChartLayoutType {
   [ChartLayoutStoreEnum.CHARTS]: boolean
   // 详情设置
   [ChartLayoutStoreEnum.DETAILS]: boolean
+  // 组件展示方式
+  [ChartLayoutStoreEnum.Chart_TYPE]: ChartModeEnum
   // 层级展示方式
   [ChartLayoutStoreEnum.LAYER_TYPE]: LayerModeEnum
 }

src/store/modules/chartLayoutStore/chartLayoutStore.ts

@@ -1,5 +1,5 @@
 import { defineStore } from 'pinia'
-import { ChartLayoutType, LayerModeEnum } from './chartLayoutStore.d'
+import { ChartLayoutType, LayerModeEnum, ChartModeEnum } from './chartLayoutStore.d'
 import { setLocalStorage, getLocalStorage } from '@/utils'
 import { StorageEnum } from '@/enums/storageEnum'
 import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
@@ -8,22 +8,25 @@ const chartEditStore = useChartEditStore()
 
 const { GO_CHART_LAYOUT_STORE } = StorageEnum
 
-const storageChartLayout: ChartLayoutType = getLocalStorage(GO_CHART_LAYOUT_STORE)
+const storageChartLayout: Partial<ChartLayoutType> = getLocalStorage(GO_CHART_LAYOUT_STORE)
 
 // 编辑区域布局和静态设置
 export const useChartLayoutStore = defineStore({
   id: 'useChartLayoutStore',
-  state: (): ChartLayoutType =>
-    storageChartLayout || {
-      // 图层控制
-      layers: true,
-      // 图表组件
-      charts: true,
-      // 详情设置（收缩为true）
-      details: false,
-      // 图层类型（默认图片）
-      layerType: LayerModeEnum.THUMBNAIL
-    },
+  state: (): ChartLayoutType => ({
+    // 图层控制
+    layers: true,
+    // 图表组件
+    charts: true,
+    // 详情设置（收缩为true）
+    details: false,
+    // 组件列表展示类型（默认单列）
+    chartType: ChartModeEnum.SINGLE,
+    // 图层类型（默认图片）
+    layerType: LayerModeEnum.THUMBNAIL,
+    // 防止值不存在
+    ...storageChartLayout
+  }),
   getters: {
     getLayers(): boolean {
       return this.layers
@@ -34,6 +37,9 @@ export const useChartLayoutStore = defineStore({
     getDetails(): boolean {
       return this.details
     },
+    getChartType(): ChartModeEnum {
+      return this.chartType
+    },
     getLayerType(): LayerModeEnum {
       return this.layerType
     }
@@ -41,8 +47,8 @@ export const useChartLayoutStore = defineStore({
   actions: {
     setItem<T extends keyof ChartLayoutType, K extends ChartLayoutType[T]>(key: T, value: K): void {
       this.$patch(state => {
-        state[key]= value
-      });
+        state[key] = value
+      })
       setLocalStorage(GO_CHART_LAYOUT_STORE, this.$state)
       // 重新计算拖拽区域缩放比例
       setTimeout(() => {

src/store/modules/langStore/langStore.ts

@@ -6,10 +6,8 @@ import i18n from '@/i18n/index'
 import { setLocalStorage, getLocalStorage, reloadRoutePage } from '@/utils'
 import { StorageEnum } from '@/enums/storageEnum'
 import { useSettingStore } from '@/store/modules/settingStore/settingStore'
-const settingStore = useSettingStore()
 
 const { GO_LANG_STORE } = StorageEnum
-
 const storageLang: LangStateType = getLocalStorage(GO_LANG_STORE)
 
 // 语言
@@ -17,7 +15,7 @@ export const useLangStore = defineStore({
   id: 'useLangStore',
   state: (): LangStateType =>
     storageLang || {
-      lang,
+      lang
     },
   getters: {
     getLang(): LangEnum {
@@ -26,6 +24,8 @@ export const useLangStore = defineStore({
   },
   actions: {
     changeLang(lang: LangEnum): void {
+      const settingStore = useSettingStore()
+      
       if (this.lang === lang) return
       this.lang = lang
       i18n.global.locale = lang

src/store/modules/settingStore/settingStore.ts

@@ -4,10 +4,10 @@ import { asideCollapsedWidth } from '@/settings/designSetting'
 import { SettingStoreType, ToolsStatusEnum } from './settingStore.d'
 import { setLocalStorage, getLocalStorage } from '@/utils'
 import { StorageEnum } from '@/enums/storageEnum'
-const { GO_SYSTEM_SETTING_STORE } = StorageEnum
+const { GO_SETTING_STORE } = StorageEnum
 
 const storageSetting: SettingStoreType = getLocalStorage(
-  GO_SYSTEM_SETTING_STORE
+  GO_SETTING_STORE
 )
 
 // 全局设置
@@ -48,7 +48,7 @@ export const useSettingStore = defineStore({
       this.$patch(state => {
         state[key] = value
       })
-      setLocalStorage(GO_SYSTEM_SETTING_STORE, this.$state)
+      setLocalStorage(GO_SETTING_STORE, this.$state)
     }
   }
 })

src/styles/pages/index.scss

@@ -1 +1,9 @@
-// 页面全局样式
+// 页面全局样式
+// 去除高德地图 logo
+.amap-logo {
+  display: none !important;
+  opacity: 0 !important;
+}
+.amap-copyright {
+  opacity: 0 !important;
+}

src/utils/file.ts

@@ -25,23 +25,6 @@ export const base64toFile = (dataurl: string, fileName: string) => {
   return ImageUrl
 }
 
-/**
- * file转 blob
- * @param { File } file 文件对象
- */
-export const fileToBlob = (file:File) =>{
-  return new Promise<Blob>(function (resolve, reject) {
-    let reader = new FileReader()
-    reader.readAsArrayBuffer(file)
-    reader.onload =  function (e: ProgressEvent<FileReader>) {
-      if(e.target){
-          const blob = new Blob([<ArrayBuffer>e.target.result], { type: file.type });
-          resolve(blob);
-      }
-    }
-  })
-}
-
 /**
  * * url转file
  */

src/utils/http.ts

@@ -1,27 +1,6 @@
 /**
- * 请求失败统一处理，allowRoute 允许跳转。
- * @param MyResponse MyResponseType，可以为空。
- * @return 
+ * * 请求失败统一处理
  */
- import { ResultEnum } from "@/enums/httpEnum"
- import { PageEnum, ErrorPageNameMap } from "@/enums/pageEnum"
- import { redirectErrorPage, routerTurnByName } from '@/utils'
- 
- export const httpErrorHandle = (MyResponse?:any, allowRoute:boolean = true) => {
-   if(MyResponse){
-    const {code, msg} = MyResponse
-    if (MyResponse.code === ResultEnum.TOKEN_OVERDUE) {
-      window['$message'].error(msg || window['$t']('http.token_overdue_message'))
-      if(allowRoute) routerTurnByName(PageEnum.BASE_LOGIN_NAME)
-      return
-    }
- 
-    if (MyResponse.code != ResultEnum.SUCCESS) {
-      // 其他错误处理 Todo
-      if (ErrorPageNameMap.get(code) && allowRoute) {
-        redirectErrorPage(code)
-      }
-    }
-  }
+export const httpErrorHandle = () => {
   window['$message'].error(window['$t']('http.error_message'))
 }

src/utils/router.ts

@@ -2,10 +2,11 @@ import { useRoute } from 'vue-router'
 import { ResultEnum, RequestHttpHeaderEnum } from '@/enums/httpEnum'
 import { ErrorPageNameMap, PageEnum, PreviewEnum } from '@/enums/pageEnum'
 import { docPath, giteeSourceCodePath } from '@/settings/pathConst'
+import { SystemStoreEnum, SystemStoreUserInfoEnum } from '@/store/modules/systemStore/systemStore.d'
 import { StorageEnum } from '@/enums/storageEnum'
 import { clearLocalStorage, getLocalStorage, clearCookie } from './storage'
 import router from '@/router'
-import { BackEndFactory } from '@/backend/ibackend'
+import { logoutApi } from '@/api/path'
 
 /**
  * * 根据名字跳转路由
@@ -105,11 +106,11 @@ export const reloadRoutePage = () => {
  */
 export const logout = async () => {
   try {
-    const res = await BackEndFactory.logout() as any
+    const res = await logoutApi() as unknown as MyResponseType
     if(res.code === ResultEnum.SUCCESS) {
       window['$message'].success(window['$t']('global.logout_success'))
       clearCookie(RequestHttpHeaderEnum.COOKIE)
-      clearLocalStorage(StorageEnum.GO_LOGIN_INFO_STORE)
+      clearLocalStorage(StorageEnum.GO_SYSTEM_STORE)
       routerTurnByName(PageEnum.BASE_LOGIN_NAME)
     }
   } catch (error) {
@@ -146,8 +147,7 @@ export const openGiteeSourceCode = () => {
  * @returns boolean
  */
 export const isPreview = () => {
-  return false
-  //return document.location.hash.includes('preview')
+  return document.location.hash.includes('preview')
 }
 
 /**
@@ -163,15 +163,6 @@ export const fetchRouteParams = () => {
   }
 }
 
-export const fetchRouteQuery = () => {
-  try {
-    const route = useRoute()
-    return route.query
-  } catch (error) {
-    window['$message'].warning('查询路由信息失败，请联系管理员！')
-  }
-}
-
 /**
  * * 通过硬解析获取当前路由下的参数
  * @returns object
@@ -197,17 +188,18 @@ export const goHome = () => {
  * * 判断是否登录
  * @return boolean
  */
- export const loginCheck = () => {
+export const loginCheck = () => {
   try {
-    const info = getLocalStorage(StorageEnum.GO_LOGIN_INFO_STORE)
+    const info = getLocalStorage(StorageEnum.GO_SYSTEM_STORE)
     if (!info) return false
-    // 检查 Token ?
-    if(info.token && info.userinfo) return true
+    if (info[SystemStoreEnum.USER_INFO][SystemStoreUserInfoEnum.USER_TOKEN]) {
+      return true
+    }
     return false
   } catch (error) {
     return false
   }
-} 
+}
 
 /**
  * * 预览地址