build: 升级版本到 1.2.5

Merge pull request !131 from Ryker/dev

.env

@@ -1,8 +1,14 @@
 # port
-VITE_DEV_PORT = '8080'
+VITE_DEV_PORT = '8001'
 
 # development path
-VITE_DEV_PATH = 'https://demo.mtruning.club'
+VITE_DEV_PATH = '/'
 
 # production path
-VITE_PRO_PATH = 'https://demo.mtruning.club'
+VITE_PRO_PATH = '/'
+
+# spa-title
+VITE_GLOB_APP_TITLE = GoView
+
+# spa shortname
+VITE_GLOB_APP_SHORT_NAME = GoView

.gitignore

@@ -4,4 +4,3 @@ dist
 dist-ssr
 *.local
 .vscode
-.idea

README.md

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

build/getConfigFileName.ts

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "go-view",
-  "version": "2.2.6",
+  "version": "1.2.5",
   "engines": {
     "node": ">=12.0"
   },
@@ -21,7 +21,7 @@
     "@types/keymaster": "^1.6.30",
     "@types/lodash": "^4.14.184",
     "animate.css": "^4.1.1",
-    "axios": "^1.4.0",
+    "axios": "^0.27.2",
     "color": "^4.2.3",
     "crypto-js": "^4.1.1",
     "dayjs": "^1.11.7",
@@ -33,7 +33,6 @@
     "highlight.js": "^11.5.0",
     "html2canvas": "^1.4.1",
     "keymaster": "^1.6.2",
-    "mitt": "^3.0.0",
     "monaco-editor": "^0.33.0",
     "naive-ui": "2.34.3",
     "pinia": "^2.0.13",
@@ -41,7 +40,7 @@
     "three": "^0.145.0",
     "vue": "^3.2.31",
     "vue-demi": "^0.13.1",
-    "vue-i18n": "9.2.2",
+    "vue-i18n": "^9.2.2",
     "vue-router": "4.0.12",
     "vue3-lazyload": "^0.2.5-beta",
     "vue3-sketch-ruler": "^1.3.3",
@@ -50,16 +49,14 @@
   "devDependencies": {
     "@commitlint/cli": "^17.0.2",
     "@commitlint/config-conventional": "^17.0.2",
-    "@iconify/types": "^2.0.0",
-    "@iconify/vue": "^4.1.1",
     "@types/node": "^16.11.26",
     "@types/three": "^0.144.0",
     "@typescript-eslint/eslint-plugin": "^5.18.0",
     "@typescript-eslint/parser": "^5.18.0",
     "@vicons/carbon": "^0.12.0",
     "@vicons/ionicons5": "~0.11.0",
-    "@vitejs/plugin-vue": "^4.2.3",
-    "@vitejs/plugin-vue-jsx": "^3.0.1",
+    "@vitejs/plugin-vue": "^1.10.2",
+    "@vitejs/plugin-vue-jsx": "^1.3.9",
     "@vue/compiler-sfc": "^3.2.31",
     "@vueuse/core": "^7.7.1",
     "commitlint": "^17.0.2",
@@ -78,7 +75,7 @@
     "sass": "^1.49.11",
     "sass-loader": "^12.6.0",
     "typescript": "4.6.3",
-    "vite": "4.3.6",
+    "vite": "4.2.1",
     "vite-plugin-compression": "^0.5.1",
     "vite-plugin-importer": "^0.2.5",
     "vite-plugin-mock": "^2.9.6",

preview.yml

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

src/App.vue

@@ -17,7 +17,7 @@
 import { NConfigProvider } from 'naive-ui'
 import { GoAppProvider } from '@/components/GoAppProvider'
 import { I18n } from '@/components/I18n'
-import { useSystemInit, useDarkThemeHook, useThemeOverridesHook, useCode, useLang } from '@/hooks'
+import { useDarkThemeHook, useThemeOverridesHook, useCode, useLang } from '@/hooks'
 
 // 暗黑主题
 const darkTheme = useDarkThemeHook()
@@ -28,9 +28,6 @@ const overridesTheme = useThemeOverridesHook()
 // 代码主题
 const hljsTheme = useCode()
 
-// 系统全局数据初始化
-useSystemInit()
-
 // 全局语言
 const { locale, dateLocale } = useLang()
 

src/api/axios.config.ts

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

src/api/axios.ts

@@ -1,93 +1,34 @@
-import axios, { AxiosResponse, AxiosRequestConfig, Axios, AxiosError, InternalAxiosRequestConfig } from 'axios'
-import { RequestHttpHeaderEnum, 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'
-
-export interface MyResponseType<T> {
-  code: ResultEnum
-  data: T
-  message: string
-}
-
-export interface MyRequestInstance extends Axios {
-  <T = any>(config: AxiosRequestConfig): Promise<MyResponseType<T>>
-}
+import axios, { AxiosResponse, AxiosRequestConfig } from 'axios'
+import { ResultEnum } from "@/enums/httpEnum"
+import { ErrorPageNameMap } from "@/enums/pageEnum"
+import { redirectErrorPage } from '@/utils'
 
 const axiosInstance = axios.create({
-  baseURL: `${import.meta.env.PROD ? import.meta.env.VITE_PRO_PATH : ''}${axiosPre}`,
-  timeout: ResultEnum.TIMEOUT
-}) as unknown as MyRequestInstance
+  baseURL: import.meta.env.DEV ? import.meta.env.VITE_DEV_PATH : import.meta.env.VITE_PRO_PATH,
+  timeout: ResultEnum.TIMEOUT,
+})
 
 axiosInstance.interceptors.request.use(
-  (config: InternalAxiosRequestConfig) => {
-    // 白名单校验
-    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[userInfo[SystemStoreUserInfoEnum.TOKEN_NAME] || 'token'] =  userInfo[SystemStoreUserInfoEnum.USER_TOKEN] || ''
+  (config: AxiosRequestConfig) => {
     return config
   },
-  (err: AxiosError) => {
-    Promise.reject(err)
+  (error: AxiosRequestConfig) => {
+    Promise.reject(error)
   }
 )
 
 // 响应拦截器
 axiosInstance.interceptors.response.use(
   (res: AxiosResponse) => {
-    // 预览页面错误不进行处理
-    if (isPreview()) {
-      return Promise.resolve(res.data)
-    }
     const { code } = res.data as { code: number }
-
     if (code === undefined || code === null) return Promise.resolve(res.data)
-
-    // 成功
-    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))
+    if (code === ResultEnum.DATA_SUCCESS) return Promise.resolve(res.data)
+    // 重定向
+    if (ErrorPageNameMap.get(code)) redirectErrorPage(code)
     return Promise.resolve(res.data)
   },
-  (err: AxiosError) => {
-    const status = err.response?.status
-    switch (status) {
-      case 401:
-        routerTurnByName(PageEnum.BASE_LOGIN_NAME)
-        Promise.reject(err)
-        break
-
-      default:
-        Promise.reject(err)
-        break
-    }
+  (err: AxiosResponse) => {
+    Promise.reject(err)
   }
 )
 

src/api/http.ts

@@ -9,16 +9,16 @@ import {
 } from '@/enums/httpEnum'
 import type { RequestGlobalConfigType, RequestConfigType } from '@/store/modules/chartEditStore/chartEditStore.d'
 
-export const get = <T = any>(url: string, params?: object) => {
-  return axiosInstance<T>({
+export const get = (url: string, params?: object) => {
+  return axiosInstance({
     url: url,
     method: RequestHttpEnum.GET,
-    params: params,
+    params: params
   })
 }
 
-export const post = <T = any>(url: string, data?: object, headersType?: string) => {
-  return axiosInstance<T>({
+export const post = (url: string, data?: object, headersType?: string) => {
+  return axiosInstance({
     url: url,
     method: RequestHttpEnum.POST,
     data: data,
@@ -28,8 +28,8 @@ export const post = <T = any>(url: string, data?: object, headersType?: string)
   })
 }
 
-export const patch = <T = any>(url: string, data?: object, headersType?: string) => {
-  return axiosInstance<T>({
+export const patch = (url: string, data?: object, headersType?: string) => {
+  return axiosInstance({
     url: url,
     method: RequestHttpEnum.PATCH,
     data: data,
@@ -39,8 +39,8 @@ export const patch = <T = any>(url: string, data?: object, headersType?: string)
   })
 }
 
-export const put = <T = any>(url: string, data?: object, headersType?: ContentTypeEnum) => {
-  return axiosInstance<T>({
+export const put = (url: string, data?: object, headersType?: ContentTypeEnum) => {
+  return axiosInstance({
     url: url,
     method: RequestHttpEnum.PUT,
     data: data,
@@ -50,8 +50,8 @@ export const put = <T = any>(url: string, data?: object, headersType?: ContentTy
   })
 }
 
-export const del = <T = any>(url: string, params?: object) => {
-  return axiosInstance<T>({
+export const del = (url: string, params?: object) => {
+  return axiosInstance({
     url: url,
     method: RequestHttpEnum.DELETE,
     params
@@ -82,11 +82,11 @@ export const http = (type?: RequestHttpEnum) => {
 }
 const prefix = 'javascript:'
 // 对输入字符进行转义处理
-export const translateStr = (target: string | Record<any, any>) => {
+export const translateStr = (target: string | object) => {
   if (typeof target === 'string') {
     if (target.startsWith(prefix)) {
       const funcStr = target.split(prefix)[1]
-      let result
+      let result;
       try {
         result = new Function(`${funcStr}`)()
       } catch (error) {
@@ -100,8 +100,8 @@ export const translateStr = (target: string | Record<any, any>) => {
   }
   for (const key in target) {
     if (Object.prototype.hasOwnProperty.call(target, key)) {
-      const subTarget = target[key]
-      target[key] = translateStr(subTarget)
+      const subTarget = (target as any)[key];
+      (target as any)[key] = translateStr(subTarget)
     }
   }
   return target
@@ -163,6 +163,7 @@ export const customizeHttp = (targetParams: RequestConfigType, globalParams: Req
   params = translateStr(params)
   // form 类型处理
   let formData: FormData = new FormData()
+  formData.set('default', 'defaultData')
   // 类型处理
 
   switch (requestParamsBodyType) {

src/api/path/index.ts

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

src/api/path/project.api.ts

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

src/api/path/project.d.ts

@@ -1,39 +0,0 @@
-export type ProjectItem = {
-  /**
-   * 项目 id
-   */
-  id: string
-  /**
-   * 项目名称
-   */
-  projectName: string
-  /**
-   * 项目状态:\
-   * -1: 未发布\
-   * 1: 已发布
-   */
-  state: number
-  /**
-   * 创建时间
-   */
-  createTime: string
-  /**
-   * 预览图片url
-   */
-  indexImage: string
-  /**
-   * 创建者 id
-   */
-  createUserId: string
-  /**
-   * 项目备注
-   */
-  remarks: string
-}
-
-export interface ProjectDetail extends ProjectItem {
-  /**
-   * 项目参数
-   */
-   content: string
-}

src/api/path/system.api.ts

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

src/api/path/system.d.ts

@@ -1,26 +0,0 @@
-export interface LoginResult {
-  token: {
-    /**
-     * token 值
-     */
-    tokenValue: string
-    /**
-     * token key
-     */
-    tokenName: string
-  }
-  userinfo: {
-    /**
-     * 昵称
-     */
-    nickname: string
-    /**
-     * 用户名
-     */
-    username: string
-    /**
-     * 用户 id
-     */
-    id: string
-  }
-}

src/components/GoUserInfo/index.vue

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

src/components/Pages/ChartItemSetting/GlobalSetting.vue

@@ -257,36 +257,9 @@
       <n-switch v-model:value="legend.show" size="small"></n-switch>
     </template>
     <setting-item-box name="图例文字">
-      <setting-item name="颜色">
+      <setting-item>
         <n-color-picker size="small" v-model:value="legend.textStyle.color"></n-color-picker>
       </setting-item>
-      <setting-item name="大小">
-        <n-input-number v-model:value="legend.textStyle.fontSize" :min="1" size="small"></n-input-number>
-      </setting-item>
-    </setting-item-box>
-    <setting-item-box name="图例位置">
-      <setting-item name="x轴">
-        <n-select v-model:value="legend.x" size="small" :options="legendConfig.lengendX" />
-      </setting-item>
-      <setting-item name="y轴">
-        <n-select v-model:value="legend.y" size="small" :options="legendConfig.lengendY" />
-      </setting-item>
-    </setting-item-box>
-    <setting-item-box name="图例信息">
-      <setting-item name="方向">
-        <n-select v-model:value="legend.orient" size="small" :options="legendConfig.orient" />
-      </setting-item>
-      <setting-item name="形状">
-        <n-select v-model:value="legend.icon" size="small" :options="legendConfig.shape" />
-      </setting-item>
-    </setting-item-box>
-    <setting-item-box name="图例大小">
-      <setting-item name="宽">
-        <n-input-number v-model:value="legend.itemWidth" :min="1" size="small"></n-input-number>
-      </setting-item>
-      <setting-item name="高">
-        <n-input-number v-model:value="legend.itemHeight" :min="1" size="small"></n-input-number>
-      </setting-item>
     </setting-item-box>
   </collapse-item>
 
@@ -336,9 +309,9 @@
 </template>
 
 <script setup lang="ts">
-import { PropType, computed, watch } from 'vue'
+import { PropType, computed } from 'vue'
 import { GlobalThemeJsonType } from '@/settings/chartThemes/index'
-import { axisConfig, legendConfig } from '@/packages/chartConfiguration/echarts/index'
+import { axisConfig } from '@/packages/chartConfiguration/echarts/index'
 import { CollapseItem, SettingItemBox, SettingItem, GlobalSettingPosition } from '@/components/Pages/ChartItemSetting'
 import { icon } from '@/plugins'
 import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
@@ -387,18 +360,4 @@ const grid = computed(() => {
 const visualMap = computed(() => {
   return props.optionData.visualMap
 })
-
-// 监听legend color颜色改变type = scroll的颜色
-watch(() => legend.value && legend.value.textStyle.color, (newVal) => {
-  if (legend.value && newVal) {
-     if (!legend.value.pageTextStyle) {
-      legend.value.pageTextStyle = { color: newVal }
-    } else {
-      legend.value.pageTextStyle.color = newVal
-    }
-  }
-}, {
-  immediate: true,
-  deep: true,
-})
 </script>

src/components/Pages/ChartItemSetting/StylesSetting.vue

@@ -69,22 +69,6 @@
       </setting-item>
     </setting-item-box>
 
-    <!--  预设滤镜  -->
-    <div v-if="presetImageList.length" class="preset-filter">
-      <n-image
-        class="preset-img"
-        width="46"
-        preview-disabled
-        object-fit="scale-down"
-        v-for="(item, index) in presetImageList"
-        :key="index"
-        :class="{ 'active-preset': item.hueRotate === chartStyles.hueRotate }"
-        :style="{ filter: `hue-rotate(${item.hueRotate}deg)` }"
-        :src="item.src"
-        @click="() => (chartStyles.hueRotate = item.hueRotate)"
-      ></n-image>
-    </div>
-
     <!-- 混合模式 -->
     <setting-item-box v-if="!isCanvas" :alone="true">
       <template #name>
@@ -165,12 +149,10 @@
 </template>
 
 <script setup lang="ts">
-import { ref, PropType } from 'vue'
+import { PropType } from 'vue'
 import { PickCreateComponentType, BlendModeEnumList } from '@/packages/index.d'
 import { SettingItemBox, SettingItem, CollapseItem } from '@/components/Pages/ChartItemSetting'
 import { icon } from '@/plugins'
-import logoImg from '@/assets/logo.png'
-import { useDesignStore } from '@/store/modules/designStore/designStore'
 
 const props = defineProps({
   isGroup: {
@@ -193,48 +175,10 @@ const { HelpOutlineIcon } = icon.ionicons5
 const sliderFormatTooltip = (v: string) => {
   return `${(parseFloat(v) * 100).toFixed(0)}%`
 }
-
 // 角度格式化
 const degFormatTooltip = (v: string) => {
   return `${v}deg`
 }
-
-// 预设滤镜
-interface presetImageData {
-  index: number
-  src: string
-  hueRotate: number
-}
-
-const presetImageList = ref([] as presetImageData[])
-for (let i = 1; i <= 12; i++) {
-  presetImageList.value.push({
-    index: i,
-    src: logoImg,
-    hueRotate: i * 30
-  })
-}
 </script>
 
-<style lang="scss" scoped>
-// 预设滤镜
-.preset-filter {
-  margin: 20px 0 10px 0;
-  display: flex;
-  flex-wrap: wrap;
-  justify-content: space-between;
-  .preset-img {
-    margin-bottom: 10px;
-    padding: 2px;
-    border-radius: 6px;
-    transition: 0.2s all;
-    cursor: pointer;
-    &:hover {
-      box-shadow: 0 0 0 2px #66a9c9;
-    }
-  }
-  .active-preset {
-    box-shadow: 0 0 0 2px #66a9c9;
-  }
-}
-</style>
+<style lang="scss" scoped></style>

src/components/Pages/Flipper/index.vue

@@ -1,13 +1,13 @@
 <template>
-  <div class="go-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" setup>
-import { ref, PropType, watch, nextTick } from 'vue'
-import { FlipType } from './index'
+import { ref, PropType, watch } from 'vue'
+import { FlipType }  from './index'
 
 const props = defineProps({
   flipType: {
@@ -43,10 +43,6 @@ const props = defineProps({
   backColor: {
     type: String,
     default: '#000000'
-  },
-  borderWidth: {
-    type: Number,
-    default: 2
   }
 })
 
@@ -54,27 +50,19 @@ const isFlipping = ref(false)
 const frontTextFromData = ref(props.count || 0)
 const backTextFromData = ref(props.count || 0)
 
-let timeoutID: any = 0
-
 // 翻牌
-const flip = async (front: string | number, back: string | number) => {
+const flip = (front: string | number, back: string | number) => {
   // 如果处于翻转中，则不执行
-  if (isFlipping.value) {
-    isFlipping.value = false // 立即结束此次动画
-    clearTimeout(timeoutID) // 清除上一个计时器任务
-    await nextTick()
-    await flip(front, back) // 开始最后一次翻牌任务
-    return
-  }
-
+  if (isFlipping.value) return
   // 设置翻盘前后数据
   backTextFromData.value = back
   frontTextFromData.value = front
+
   // 设置翻转状态为true
   isFlipping.value = true
 
   // 翻牌结束的行为
-  timeoutID = setTimeout(() => {
+  setTimeout(() => {
     isFlipping.value = false // 设置翻转状态为false
     frontTextFromData.value = back
   }, props.duration)
@@ -98,7 +86,6 @@ $radius: v-bind('`${props.radius}px`');
 $width: v-bind('`${props.width}px`');
 $height: v-bind('`${props.height}px`');
 $perspective: v-bind('`${props.height * 2}px`');
-$borderWidth: v-bind('`${props.borderWidth * 2}px`');
 $speed: v-bind('`${props.duration / 1000}s`');
 $shadowColor: #000000;
 $lineColor: #4a9ef8;
@@ -138,12 +125,13 @@ $lineColor: #4a9ef8;
 }
 // #endregion
 
-.go-flipper {
+.go-Flipper {
   display: inline-block;
   position: relative;
   width: $width;
   height: $height;
   line-height: $height;
+  border: solid 1px $backColor;
   border-radius: $radius;
   background: $frontColor;
   font-size: $width;
@@ -151,17 +139,6 @@ $lineColor: #4a9ef8;
   box-shadow: 0 0 6px rgba($color: $shadowColor, $alpha: 0.5); // 阴影部分
   text-align: center;
   // font-family: 'Helvetica Neue';
-  &::after {
-    content: '';
-    position: absolute;
-    z-index: 10;
-    left: 0;
-    top: 0;
-    right: 0;
-    bottom: 0;
-    box-shadow: inset 0 0 $borderWidth 0 $frontColor; // 内测阴影部分
-    border-radius: $radius;
-  }
 
   .digital:before,
   .digital:after {
@@ -209,13 +186,11 @@ $lineColor: #4a9ef8;
   &.down.go .front:before {
     transform-origin: 50% 100%;
     animation: frontFlipDown $speed ease-in-out both;
-    box-shadow: 0 -2px $borderWidth 0 $frontColor;
+    box-shadow: 0 -2px 6px rgba($color: $lineColor, $alpha: 0.3);
     backface-visibility: hidden;
   }
   &.down.go .back:after {
     animation: backFlipDown $speed ease-in-out both;
-    box-shadow: 0 2px $borderWidth 0 $frontColor;
-    backface-visibility: hidden;
   }
   /*向上翻*/
   &.up .front:after {
@@ -233,13 +208,11 @@ $lineColor: #4a9ef8;
   &.up.go .front:after {
     transform-origin: 50% 0;
     animation: frontFlipUp $speed ease-in-out both;
-    box-shadow: 0 2px $borderWidth 0 $frontColor;
+    box-shadow: 0 2px 6px rgba($color: $lineColor, $alpha: 0.3);
     backface-visibility: hidden;
   }
   &.up.go .back:before {
     animation: backFlipUp $speed ease-in-out both;
-    box-shadow: 0 -2px $borderWidth 0 $frontColor;
-    backface-visibility: hidden;
   }
 }
 </style>

src/enums/editPageEnum.ts

@@ -48,6 +48,7 @@ export enum MenuEnum {
   UN_GROUP = 'unGroup',
   // 后退
   BACK = 'back',
+  // 前进
   FORWORD = 'forward',
   // 保存
   SAVE = 'save',
@@ -83,15 +84,3 @@ export enum MacKeyboard {
   ALT_SOURCE_KEY = '⌥',
   SPACE = 'Space'
 }
-
-// 同步状态枚举
-export enum SyncEnum {
-  // 等待
-  PENDING,
-  // 开始
-  START,
-  // 成功
-  SUCCESS,
-  // 失败
-  FAILURE
-}

src/enums/httpEnum.ts

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

src/enums/pageEnum.ts

@@ -26,15 +26,10 @@ export enum PageEnum {
   //重定向
   REDIRECT = '/redirect',
   REDIRECT_NAME = 'Redirect',
-
-  // 未发布
-  REDIRECT_UN_PUBLISH = '/redirect/unPublish',
-  REDIRECT_UN_PUBLISH_NAME = 'redirect-un-publish',
-
-  // 重载
   RELOAD = '/reload',
   RELOAD_NAME = 'Reload',
 
+
   // 首页
   BASE_HOME = '/project',
   BASE_HOME_NAME = 'Project',

src/enums/storageEnum.ts

@@ -1,8 +1,10 @@
 export enum StorageEnum {
   // 全局设置
-  GO_SETTING_STORE = 'GO_SETTING',
+  GO_SYSTEM_SETTING_STORE = 'GO_SYSTEM_SETTING',
+  // token 等信息
+  GO_ACCESS_TOKEN_STORE = 'GO_ACCESS_TOKEN',
   // 登录信息
-  GO_SYSTEM_STORE = 'GO_SYSTEM',
+  GO_LOGIN_INFO_STORE = 'GO_LOGIN_INFO',
   // 语言
   GO_LANG_STORE = 'GO_LANG',
   // 当前选择的主题
@@ -10,7 +12,5 @@ export enum StorageEnum {
   // 工作台布局配置
   GO_CHART_LAYOUT_STORE = 'GO_CHART_LAYOUT',
   // 工作台需要保存的数据
-  GO_CHART_STORAGE_LIST = 'GO_CHART_STORAGE_LIST',
-  // 用户存储的图片媒体
-  GO_USER_MEDIA_PHOTOS = 'GO_USER_MEDIA_PHOTOS'
+  GO_CHART_STORAGE_LIST = 'GO_CHART_STORAGE_LIST'
 }

src/hooks/index.ts

@@ -2,7 +2,6 @@ export * from '@/hooks/useTheme.hook'
 export * from '@/hooks/usePreviewScale.hook'
 export * from '@/hooks/useCode.hook'
 export * from '@/hooks/useChartDataFetch.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

@@ -90,7 +90,7 @@ export const useChartDataFetch = (
 
         // 普通初始化与组件交互处理监听
         watch(
-          () => targetComponent.request.requestParams,
+          () => targetComponent.request,
           () => {
             fetchFn()
           },
@@ -105,11 +105,7 @@ export const useChartDataFetch = (
         // 单位
         const unit = targetInterval && targetInterval.value ? targetUnit.value : globalUnit.value
         // 开启轮询
-        if (time) {
-          fetchInterval = setInterval(fetchFn, intervalUnitHandle(time, unit))
-        } else {
-          fetchFn()
-        }
+        if (time) fetchInterval = setInterval(fetchFn, intervalUnitHandle(time, unit))
       }
       // eslint-disable-next-line no-empty
     } catch (error) {
@@ -118,11 +114,10 @@ export const useChartDataFetch = (
   }
 
   if (isPreview()) {
+    // 判断是否是数据池类型
     targetComponent.request.requestDataType === RequestDataTypeEnum.Pond
       ? addGlobalDataInterface(targetComponent, useChartEditStore, updateCallback || echartsUpdateHandle)
       : requestIntervalFn()
-  } else {
-    requestIntervalFn()
   }
   return { vChartRef }
 }

src/hooks/useChartDataPondFetch.hook.ts

@@ -1,4 +1,4 @@
-import { toRaw, watch, computed, ComputedRef } from 'vue'
+import { toRaw } from 'vue'
 import { customizeHttp } from '@/api/http'
 import { CreateComponentType } from '@/packages/index.d'
 import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
@@ -20,7 +20,7 @@ const mittDataPondMap = new Map<string, DataPondMapType[]>()
 // 创建单个数据项轮询接口
 const newPondItemInterval = (
   requestGlobalConfig: RequestGlobalConfigType,
-  requestDataPondItem: ComputedRef<RequestDataPondItemType>,
+  requestDataPondItem: RequestDataPondItemType,
   dataPondMapItem?: DataPondMapType[]
 ) => {
   if (!dataPondMapItem) return
@@ -31,7 +31,8 @@ const newPondItemInterval = (
   // 请求
   const fetchFn = async () => {
     try {
-      const res = await customizeHttp(toRaw(requestDataPondItem.value.dataPondRequestConfig), toRaw(requestGlobalConfig))
+      const res = await customizeHttp(toRaw(requestDataPondItem.dataPondRequestConfig), toRaw(requestGlobalConfig))
+
       if (res) {
         try {
           // 遍历更新回调函数
@@ -48,32 +49,19 @@ const newPondItemInterval = (
     }
   }
 
-  watch(
-    () => requestDataPondItem.value.dataPondRequestConfig.requestParams.Params,
-    () => {
-      fetchFn()
-    },
-    {
-      immediate: false,
-      deep: true
-    }
-  )
-
-
   // 立即调用
   fetchFn()
 
-
-  const targetInterval = requestDataPondItem.value.dataPondRequestConfig.requestInterval
-  const targetUnit = requestDataPondItem.value.dataPondRequestConfig.requestIntervalUnit
+  const targetInterval = requestDataPondItem.dataPondRequestConfig.requestInterval
+  const targetUnit = requestDataPondItem.dataPondRequestConfig.requestIntervalUnit
 
   const globalRequestInterval = requestGlobalConfig.requestInterval
   const globalUnit = requestGlobalConfig.requestIntervalUnit
 
   // 定时时间
-  const time = targetInterval ? targetInterval : globalRequestInterval
+  const time = targetInterval  ? targetInterval : globalRequestInterval
   // 单位
-  const unit = targetInterval ? targetUnit : globalUnit
+  const unit = targetInterval  ? targetUnit : globalUnit
   // 开启轮询
   if (time) fetchInterval = setInterval(fetchFn, intervalUnitHandle(time, unit))
 }
@@ -108,16 +96,13 @@ export const useChartDataPondFetch = () => {
   }
 
   // 初始化数据池
-  const initDataPond = (useChartEditStore: ChartEditStoreType) => {
-    const { requestGlobalConfig } = useChartEditStore()
-    const chartEditStore = useChartEditStore()
+  const initDataPond = (requestGlobalConfig: RequestGlobalConfigType) => {
+    const { requestDataPond } = requestGlobalConfig
     // 根据 mapId 查找对应的数据池配置
     for (let pondKey of mittDataPondMap.keys()) {
-      const requestDataPondItem = computed(() => {
-        return requestGlobalConfig.requestDataPond.find(item => item.dataPondId === pondKey)
-      }) as ComputedRef<RequestDataPondItemType>
+      const requestDataPondItem = requestDataPond.find(item => item.dataPondId === pondKey)
       if (requestDataPondItem) {
-        newPondItemInterval(chartEditStore.requestGlobalConfig, requestDataPondItem, mittDataPondMap.get(pondKey))
+        newPondItemInterval(requestGlobalConfig, requestDataPondItem, mittDataPondMap.get(pondKey))
       }
     }
   }

src/hooks/useChartInteract.hook.ts

@@ -1,5 +1,4 @@
 import { toRefs } from 'vue'
-import { isPreview } from '@/utils'
 import { CreateComponentType } from '@/packages/index.d'
 import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
 
@@ -13,7 +12,6 @@ export const useChartInteract = (
   param: { [T: string]: any },
   interactEventOn: string
 ) => {
-  if (!isPreview()) return
   const chartEditStore = useChartEditStore()
   const { interactEvents } = chartConfig.events
   const fnOnEvent = interactEvents.filter(item => {
@@ -22,37 +20,20 @@ export const useChartInteract = (
 
   if (fnOnEvent.length === 0) return
   fnOnEvent.forEach(item => {
-
-    const globalConfigPindAprndex = chartEditStore.requestGlobalConfig.requestDataPond.findIndex(cItem =>
-      cItem.dataPondId === item.interactComponentId
-    )
-    if (globalConfigPindAprndex !== -1) {
-      const { Params, Header } = toRefs(chartEditStore.requestGlobalConfig.requestDataPond[globalConfigPindAprndex].dataPondRequestConfig.requestParams)
-
-      Object.keys(item.interactFn).forEach(key => {
-        if (key in Params.value) {
-          Params.value[key] = param[item.interactFn[key]]
-        }
-        if (key in Header.value) {
-          Header.value[key] = param[item.interactFn[key]]
-        }
-      })
-    } else {
-      const index = chartEditStore.fetchTargetIndex(item.interactComponentId)
-      if (index === -1) return
-      const { Params, Header } = toRefs(chartEditStore.componentList[index].request.requestParams)
-
-      Object.keys(item.interactFn).forEach(key => {
-        if (key in Params.value) {
-          Params.value[key] = param[item.interactFn[key]]
-        }
-        if (key in Header.value) {
-          Header.value[key] = param[item.interactFn[key]]
-        }
-      })
-    }
+    const index = chartEditStore.fetchTargetIndex(item.interactComponentId)
+    if (index === -1) return
+    const { Params, Header } = toRefs(chartEditStore.componentList[index].request.requestParams)
+    Object.keys(item.interactFn).forEach(key => {
+      if (Params.value[key]) {
+        Params.value[key] = param[item.interactFn[key]]
+      }
+      if (Header.value[key]) {
+        Header.value[key] = param[item.interactFn[key]]
+      }
+    })
   })
 }
+
 // 联动事件触发的 type 变更时，清除当前绑定内容
 export const clearInteractEvent = (chartConfig: CreateComponentType) => {
 

src/hooks/useLifeHandler.hook.ts

@@ -48,10 +48,10 @@ export const useLifeHandler = (chartConfig: CreateComponentType | CreateComponen
   try {
     return new Function(`
       return (
-        async function(components,mouseEvent){
+        async function(mouseEvent){
           ${fnStr}
         }
-      )`)().bind(undefined,components)
+      )`)()
   } catch (error) {
     console.error(error)
   }

src/hooks/usePreviewScale.hook.ts

@@ -1,218 +1,218 @@
-import throttle from 'lodash/throttle'
-
-// 拆出来是为了更好的分离单独复用
-
-// * 屏幕缩放适配（两边留白）
-export const usePreviewFitScale = (
-  width: number,
-  height: number,
-  scaleDom: HTMLElement | null,
-  callback?: (scale: {
-    width: number;
-    height: number;
-  }) => void
-) => {
-  // * 画布尺寸（px）
-  const baseWidth = width
-  const baseHeight = height
-
-  // * 默认缩放值
-  const scale = {
-    width: 1,
-    height: 1,
-  }
-
-  // * 需保持的比例
-  const baseProportion = parseFloat((baseWidth / baseHeight).toFixed(5))
-  const calcRate = () => {
-    // 当前屏幕宽高比
-    const currentRate = parseFloat(
-      (window.innerWidth / window.innerHeight).toFixed(5)
-    )
-    if (scaleDom) {
-      if (currentRate > baseProportion) {
-        // 表示更宽
-        scale.width = parseFloat(((window.innerHeight * baseProportion) / baseWidth).toFixed(5))
-        scale.height = parseFloat((window.innerHeight / baseHeight).toFixed(5))
-        scaleDom.style.transform = `scale(${scale.width}, ${scale.height})`
-      } else {
-        // 表示更高
-        scale.height = parseFloat(((window.innerWidth / baseProportion) / baseHeight).toFixed(5))
-        scale.width = parseFloat((window.innerWidth / baseWidth).toFixed(5))
-        scaleDom.style.transform = `scale(${scale.width}, ${scale.height})`
-      }
-      if (callback) callback(scale)
-    }
-  }
-
-  const resize = throttle(() => {
-    calcRate()
-  }, 200)
-
-  // * 改变窗口大小重新绘制
-  const windowResize = () => {
-    window.addEventListener('resize', resize)
-  }
-
-  // * 卸载监听
-  const unWindowResize = () => {
-    window.removeEventListener('resize', resize)
-  }
-
-  return {
-    calcRate,
-    windowResize,
-    unWindowResize,
-  }
-}
-
-// *  X轴撑满，Y轴滚动条
-export const usePreviewScrollYScale = (
-  width: number,
-  height: number,
-  scaleDom: HTMLElement | null,
-  callback?: (scale: {
-    width: number;
-    height: number;
-  }) => void
-) => {
-  // * 画布尺寸（px）
-  const baseWidth = width
-  const baseHeight = height
-
-  // * 默认缩放值
-  const scale = {
-    width: 1,
-    height: 1,
-  }
-
-  // * 需保持的比例
-  const baseProportion = parseFloat((baseWidth / baseHeight).toFixed(5))
-  const calcRate = () => {
-    if (scaleDom) {
-      scale.height = parseFloat(((window.innerWidth / baseProportion) / baseHeight).toFixed(5))
-      scale.width = parseFloat((window.innerWidth / baseWidth).toFixed(5))
-      scaleDom.style.transform = `scale(${scale.width}, ${scale.height})`
-      if (callback) callback(scale)
-    }
-  }
-
-  const resize = throttle(() => {
-    calcRate()
-  }, 200)
-
-  // * 改变窗口大小重新绘制
-  const windowResize = () => {
-    window.addEventListener('resize', resize)
-  }
-
-  // * 卸载监听
-  const unWindowResize = () => {
-    window.removeEventListener('resize', resize)
-  }
-
-  return {
-    calcRate,
-    windowResize,
-    unWindowResize,
-  }
-}
-
-// *  Y轴撑满，X轴滚动条
-export const usePreviewScrollXScale = (
-  width: number,
-  height: number,
-  scaleDom: HTMLElement | null,
-  callback?: (scale: {
-    width: number;
-    height: number;
-  }) => void
-) => {
-  // * 画布尺寸（px）
-  const baseWidth = width
-  const baseHeight = height
-
-  // * 默认缩放值
-  const scale = {
-    height: 1,
-    width: 1,
-  }
-
-  // * 需保持的比例
-  const baseProportion = parseFloat((baseWidth / baseHeight).toFixed(5))
-  const calcRate = () => {
-    if (scaleDom) {
-      scale.width = parseFloat(((window.innerHeight * baseProportion) / baseWidth).toFixed(5))
-      scale.height = parseFloat((window.innerHeight / baseHeight).toFixed(5))
-      scaleDom.style.transform = `scale(${scale.width}, ${scale.height})`
-      if (callback) callback(scale)
-    }
-  }
-
-  const resize = throttle(() => {
-    calcRate()
-  }, 200)
-
-  // * 改变窗口大小重新绘制
-  const windowResize = () => {
-    window.addEventListener('resize', resize)
-  }
-
-  // * 卸载监听
-  const unWindowResize = () => {
-    window.removeEventListener('resize', resize)
-  }
-
-  return {
-    calcRate,
-    windowResize,
-    unWindowResize,
-  }
-}
-
-// * 变形内容，宽高铺满
-export const usePreviewFullScale = (
-  width: number,
-  height: number,
-  scaleDom: HTMLElement | null,
-  callback?: (scale: {
-    width: number;
-    height: number;
-  }) => void
-) => {
-
-  // * 默认缩放值
-  const scale = {
-    width: 1,
-    height: 1,
-  }
-
-  const calcRate = () => {
-    if (scaleDom) {
-      scale.width = parseFloat((window.innerWidth / width).toFixed(5))
-      scale.height = parseFloat((window.innerHeight / height).toFixed(5))
-      scaleDom.style.transform = `scale(${scale.width}, ${scale.height})`
-      if (callback) callback(scale)
-    }
-  }
-
-  const resize = throttle(() => {
-    calcRate()
-  }, 200)
-
-  // * 改变窗口大小重新绘制
-  const windowResize = () => {
-    window.addEventListener('resize', resize)
-  }
-
-  // * 卸载监听
-  const unWindowResize = () => {
-    window.removeEventListener('resize', resize)
-  }
-
-  return {
-    calcRate,
-    windowResize,
-    unWindowResize,
-  }
+import throttle from 'lodash/throttle'
+
+// 拆出来是为了更好的分离单独复用
+
+// * 屏幕缩放适配（两边留白）
+export const usePreviewFitScale = (
+  width: number,
+  height: number,
+  scaleDom: HTMLElement | null,
+  callback?: (scale: {
+    width: number;
+    height: number;
+  }) => void
+) => {
+  // * 画布尺寸（px）
+  const baseWidth = width
+  const baseHeight = height
+
+  // * 默认缩放值
+  const scale = {
+    width: 1,
+    height: 1,
+  }
+
+  // * 需保持的比例
+  const baseProportion = parseFloat((baseWidth / baseHeight).toFixed(5))
+  const calcRate = () => {
+    // 当前屏幕宽高比
+    const currentRate = parseFloat(
+      (window.innerWidth / window.innerHeight).toFixed(5)
+    )
+    if (scaleDom) {
+      if (currentRate > baseProportion) {
+        // 表示更宽
+        scale.width = parseFloat(((window.innerHeight * baseProportion) / baseWidth).toFixed(5))
+        scale.height = parseFloat((window.innerHeight / baseHeight).toFixed(5))
+        scaleDom.style.transform = `scale(${scale.width}, ${scale.height})`
+      } else {
+        // 表示更高
+        scale.height = parseFloat(((window.innerWidth / baseProportion) / baseHeight).toFixed(5))
+        scale.width = parseFloat((window.innerWidth / baseWidth).toFixed(5))
+        scaleDom.style.transform = `scale(${scale.width}, ${scale.height})`
+      }
+      if (callback) callback(scale)
+    }
+  }
+
+  const resize = throttle(() => {
+    calcRate()
+  }, 200)
+
+  // * 改变窗口大小重新绘制
+  const windowResize = () => {
+    window.addEventListener('resize', resize)
+  }
+
+  // * 改变窗口大小重新绘制
+  const unWindowResize = () => {
+    window.removeEventListener('resize', resize)
+  }
+
+  return {
+    calcRate,
+    windowResize,
+    unWindowResize,
+  }
+}
+
+// *  X轴撑满，Y轴滚动条
+export const usePreviewScrollYScale = (
+  width: number,
+  height: number,
+  scaleDom: HTMLElement | null,
+  callback?: (scale: {
+    width: number;
+    height: number;
+  }) => void
+) => {
+  // * 画布尺寸（px）
+  const baseWidth = width
+  const baseHeight = height
+
+  // * 默认缩放值
+  const scale = {
+    width: 1,
+    height: 1,
+  }
+
+  // * 需保持的比例
+  const baseProportion = parseFloat((baseWidth / baseHeight).toFixed(5))
+  const calcRate = () => {
+    if (scaleDom) {
+      scale.height = parseFloat(((window.innerWidth / baseProportion) / baseHeight).toFixed(5))
+      scale.width = parseFloat((window.innerWidth / baseWidth).toFixed(5))
+      scaleDom.style.transform = `scale(${scale.width}, ${scale.height})`
+      if (callback) callback(scale)
+    }
+  }
+
+  const resize = throttle(() => {
+    calcRate()
+  }, 200)
+
+  // * 改变窗口大小重新绘制
+  const windowResize = () => {
+    window.addEventListener('resize', resize)
+  }
+
+  // * 改变窗口大小重新绘制
+  const unWindowResize = () => {
+    window.removeEventListener('resize', resize)
+  }
+
+  return {
+    calcRate,
+    windowResize,
+    unWindowResize,
+  }
+}
+
+// *  Y轴撑满，X轴滚动条
+export const usePreviewScrollXScale = (
+  width: number,
+  height: number,
+  scaleDom: HTMLElement | null,
+  callback?: (scale: {
+    width: number;
+    height: number;
+  }) => void
+) => {
+  // * 画布尺寸（px）
+  const baseWidth = width
+  const baseHeight = height
+
+  // * 默认缩放值
+  const scale = {
+    height: 1,
+    width: 1,
+  }
+
+  // * 需保持的比例
+  const baseProportion = parseFloat((baseWidth / baseHeight).toFixed(5))
+  const calcRate = () => {
+    if (scaleDom) {
+      scale.width = parseFloat(((window.innerHeight * baseProportion) / baseWidth).toFixed(5))
+      scale.height = parseFloat((window.innerHeight / baseHeight).toFixed(5))
+      scaleDom.style.transform = `scale(${scale.width}, ${scale.height})`
+      if (callback) callback(scale)
+    }
+  }
+
+  const resize = throttle(() => {
+    calcRate()
+  }, 200)
+
+  // * 改变窗口大小重新绘制
+  const windowResize = () => {
+    window.addEventListener('resize', resize)
+  }
+
+  // * 改变窗口大小重新绘制
+  const unWindowResize = () => {
+    window.removeEventListener('resize', resize)
+  }
+
+  return {
+    calcRate,
+    windowResize,
+    unWindowResize,
+  }
+}
+
+// * 变形内容，宽高铺满
+export const usePreviewFullScale = (
+  width: number,
+  height: number,
+  scaleDom: HTMLElement | null,
+  callback?: (scale: {
+    width: number;
+    height: number;
+  }) => void
+) => {
+
+  // * 默认缩放值
+  const scale = {
+    width: 1,
+    height: 1,
+  }
+
+  const calcRate = () => {
+    if (scaleDom) {
+      scale.width = parseFloat((window.innerWidth / width).toFixed(5))
+      scale.height = parseFloat((window.innerHeight / height).toFixed(5))
+      scaleDom.style.transform = `scale(${scale.width}, ${scale.height})`
+      if (callback) callback(scale)
+    }
+  }
+
+  const resize = throttle(() => {
+    calcRate()
+  }, 200)
+
+  // * 改变窗口大小重新绘制
+  const windowResize = () => {
+    window.addEventListener('resize', resize)
+  }
+
+  // * 改变窗口大小重新绘制
+  const unWindowResize = () => {
+    window.removeEventListener('resize', resize)
+  }
+
+  return {
+    calcRate,
+    windowResize,
+    unWindowResize,
+  }
 }

src/hooks/useSystemInit.hook.ts

@@ -1,23 +0,0 @@
-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({})
-    if (res && res.code === ResultEnum.SUCCESS) {
-      systemStore.setItem(SystemStoreEnum.FETCH_INFO, {
-        OSSUrl: res.data?.bucketURL
-      })
-    }
-  }
-
-  // 执行
-  getOssUrl()
-}

src/i18n/en/index.ts

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

src/i18n/en/login.ts

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

src/i18n/en/project.ts

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

src/i18n/zh/index.ts

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

src/i18n/zh/login.ts

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

src/i18n/zh/project.ts

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

src/packages/chartConfiguration/echarts/index.ts

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

src/packages/chartConfiguration/echarts/legend.ts

@@ -1,70 +0,0 @@
-export const legendConfig = {
-  // X轴位置
-  lengendX: [
-    {
-      label: '靠左',
-      value: 'left'
-    },
-    {
-      label: '居中',
-      value: 'center'
-    },
-    {
-      label: '靠右',
-      value: 'right'
-    }
-  ],
-  // y轴位置
-  lengendY: [
-    {
-      label: '靠上',
-      value: 'top'
-    },
-    {
-      label: '居中',
-      value: 'center'
-    },
-    {
-      label: '靠下',
-      value: 'bottom'
-    }
-  ],
-  // 排列方向
-  orient: [
-    {
-      label: '水平',
-      value: 'horizontal'
-    },
-    {
-      label: '垂直',
-      value: 'vertical'
-    }
-  ],
-  // 形状
-  shape: [
-    {
-      label: '圆形',
-      value: 'circle'
-    },
-    {
-      label: '方形',
-      value: 'rect'
-    },
-    {
-      label: '圆角方形',
-      value: 'roundRect'
-    },
-    {
-      label: '三角形',
-      value: 'triangle'
-    },
-    {
-      label: '钢笔形',
-      value: 'pin'
-    },
-    {
-      label: '箭头形',
-      value: 'arrow'
-    }
-  ]
-}

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

@@ -1,75 +0,0 @@
-import { echartOptionProfixHandle, PublicConfigClass } from '@/packages/public'
-import { BarLineConfig } from './index'
-import { CreateComponentType } from '@/packages/index.d'
-import cloneDeep from 'lodash/cloneDeep'
-import dataJson from './data.json'
-
-export const includes = ['legend', 'xAxis', 'yAxis', 'grid']
-// 柱状折线组合图 分别定义series
-// 写死name可以定义legend显示的名称
-export const barSeriesItem = {
-  type: 'bar',
-  barWidth: 15,
-  label: {
-    show: true,
-    position: 'top',
-    color: '#fff',
-    fontSize: 12
-  },
-  itemStyle: {
-    color: null,
-    borderRadius: 2
-  }
-}
-
-export const lineSeriesItem = {
-  type: 'line',
-  symbol: 'circle',
-  label: {
-    show: true,
-    position: 'top',
-    color: '#fff',
-    fontSize: 12
-  },
-  symbolSize: 5, //设定实心点的大小
-  itemStyle: {
-    color: '#FFE47A',
-    borderWidth: 1
-  },
-  lineStyle: {
-    type: 'solid',
-    width: 3,
-    color: null
-  }
-}
-
-export const option = {
-  tooltip: {
-    show: true,
-    trigger: 'axis',
-    axisPointer: {
-      show: true,
-      type: 'shadow'
-    }
-  },
-  legend: {
-    data: null
-  },
-  xAxis: {
-    show: true,
-    type: 'category'
-  },
-  yAxis: {
-    show: true,
-    type: 'value'
-  },
-  dataset: { ...dataJson },
-  series: [barSeriesItem, lineSeriesItem]
-}
-
-export default class Config extends PublicConfigClass implements CreateComponentType {
-  public key = BarLineConfig.key
-  public chartConfig = cloneDeep(BarLineConfig)
-  // 图表配置项
-  public option = echartOptionProfixHandle(option, includes)
-}

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

@@ -1,93 +0,0 @@
-<template>
-  <!-- Echarts 全局设置 -->
-  <global-setting :optionData="optionData"></global-setting>
-  <CollapseItem
-    v-for="(item, index) in seriesList"
-    :key="index"
-    :name="`${item.type == 'bar' ? '柱状图' : '折线图'}`"
-    :expanded="true"
-  >
-    <SettingItemBox name="图形" v-if="item.type == 'bar'">
-      <SettingItem name="宽度">
-        <n-input-number
-          v-model:value="item.barWidth"
-          :min="1"
-          :max="100"
-          size="small"
-          placeholder="自动计算"
-        ></n-input-number>
-      </SettingItem>
-      <SettingItem name="圆角">
-        <n-input-number v-model:value="item.itemStyle.borderRadius" :min="0" size="small"></n-input-number>
-      </SettingItem>
-    </SettingItemBox>
-    <SettingItemBox name="线条" v-if="item.type == 'line'">
-      <SettingItem name="宽度">
-        <n-input-number
-          v-model:value="item.lineStyle.width"
-          :min="1"
-          :max="100"
-          size="small"
-          placeholder="自动计算"
-        ></n-input-number>
-      </SettingItem>
-      <SettingItem name="类型">
-        <n-select v-model:value="item.lineStyle.type" size="small" :options="lineConf.lineStyle.type"></n-select>
-      </SettingItem>
-    </SettingItemBox>
-    <SettingItemBox name="实心点" v-if="item.type == 'line'">
-      <SettingItem name="大小">
-        <n-input-number
-          v-model:value="item.symbolSize"
-          :min="1"
-          :max="100"
-          size="small"
-          placeholder="自动计算"
-        ></n-input-number>
-      </SettingItem>
-    </SettingItemBox>
-    <setting-item-box name="标签">
-      <setting-item>
-        <n-space>
-          <n-switch v-model:value="item.label.show" size="small" />
-          <n-text>展示标签</n-text>
-        </n-space>
-      </setting-item>
-      <setting-item name="大小">
-        <n-input-number v-model:value="item.label.fontSize" size="small" :min="1"></n-input-number>
-      </setting-item>
-      <setting-item name="tip颜色">
-        <n-color-picker size="small" :modes="['hex']" v-model:value="item.label.color"></n-color-picker>
-      </setting-item>
-      <setting-item name="位置">
-        <n-select
-          v-model:value="item.label.position"
-          :options="[
-            { label: 'top', value: 'top' },
-            { label: 'left', value: 'left' },
-            { label: 'right', value: 'right' },
-            { label: 'bottom', value: 'bottom' }
-          ]"
-        />
-      </setting-item>
-    </setting-item-box>
-  </CollapseItem>
-</template>
-
-<script setup lang="ts">
-import { PropType, computed } from 'vue'
-import { GlobalSetting, CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
-import { lineConf } from '@/packages/chartConfiguration/echarts'
-import { GlobalThemeJsonType } from '@/settings/chartThemes'
-
-const props = defineProps({
-  optionData: {
-    type: Object as PropType<GlobalThemeJsonType>,
-    required: true
-  }
-})
-
-const seriesList = computed(() => {
-  return props.optionData.series
-})
-</script>

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

@@ -1,40 +0,0 @@
-{
-  "dimensions": ["product", "data1", "data2"],
-  "source": [
-    {
-      "product": "1月",
-      "data1": 104,
-      "data2": 30
-    },
-    {
-      "product": "2月",
-      "data1": 56,
-      "data2": 56
-    },
-    {
-      "product": "3月",
-      "data1": 136,
-      "data2": 36
-    },
-    {
-      "product": "4月",
-      "data1": 86,
-      "data2": 6
-    },
-    {
-      "product": "5月",
-      "data1": 98,
-      "data2": 10
-    },
-    {
-      "product": "6月",
-      "data1": 86,
-      "data2": 70
-    },
-    {
-      "product": "7月",
-      "data1": 77,
-      "data2": 57
-    }
-  ]
-}

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

@@ -1,16 +0,0 @@
-// 公共类型声明
-import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'
-// 当前[信息模块]分类声明
-import { ChatCategoryEnum,ChatCategoryEnumName } from '../../index.d'
-
-export const BarLineConfig: ConfigType = {
-  key: 'BarLine',
-  chartKey: 'VBarLine',
-  conKey: 'VCBarLine',
-  title: '柱状图 & 折线图',
-  category: ChatCategoryEnum.BAR,
-  categoryName: ChatCategoryEnumName.BAR,
-  package: PackagesCategoryEnum.CHARTS,
-  chartFrame: ChartFrameEnum.ECHARTS,
-  image: 'bar_line.png'
-}

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

@@ -1,73 +0,0 @@
-<template>
-  <v-chart
-    ref="vChartRef"
-    :init-options="initOptions"
-    :theme="themeColor"
-    :option="option"
-    :manual-update="isPreview()"
-    autoresize
-  ></v-chart>
-</template>
-
-<script setup lang="ts">
-import { ref, computed, watch, PropType, nextTick } from 'vue'
-import VChart from 'vue-echarts'
-import { useCanvasInitOptions } from '@/hooks/useCanvasInitOptions.hook'
-import { use } from 'echarts/core'
-import { CanvasRenderer } from 'echarts/renderers'
-//引入柱状图 折线图
-import { BarChart, LineChart } from 'echarts/charts'
-import config, { includes, barSeriesItem, lineSeriesItem } from './config'
-import { mergeTheme } from '@/packages/public/chart'
-import { useChartDataFetch } from '@/hooks'
-import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
-import { isPreview } from '@/utils'
-import { DatasetComponent, GridComponent, TooltipComponent, LegendComponent } from 'echarts/components'
-
-const props = defineProps({
-  themeSetting: {
-    type: Object,
-    required: true
-  },
-  themeColor: {
-    type: Object,
-    required: true
-  },
-  chartConfig: {
-    type: Object as PropType<config>,
-    required: true
-  }
-})
-
-const initOptions = useCanvasInitOptions(props.chartConfig.option, props.themeSetting)
-
-use([DatasetComponent, CanvasRenderer, BarChart, LineChart, GridComponent, TooltipComponent, LegendComponent])
-
-const replaceMergeArr = ref<string[]>()
-
-const option = computed(() => {
-  return mergeTheme(props.chartConfig.option, props.themeSetting, includes)
-})
-
-watch(
-  () => props.chartConfig.option.dataset,
-  (newData, oldData) => {
-    if (newData.dimensions.length !== oldData.dimensions.length) {
-      const seriesArr = []
-      for (let i = 0; i < newData.dimensions.length - 1; i++) {
-        seriesArr.push(barSeriesItem, lineSeriesItem)
-      }
-      replaceMergeArr.value = ['series']
-      props.chartConfig.option.series = seriesArr
-      nextTick(() => {
-        replaceMergeArr.value = []
-      })
-    }
-  },
-  {
-    deep: false
-  }
-)
-
-const { vChartRef } = useChartDataFetch(props.chartConfig, useChartEditStore)
-</script>

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

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

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

@@ -33,10 +33,6 @@ export const option = {
         width: 3,
         color: {
           type: 'linear',
-          x: 0,
-          y: 0,
-          x2: 0,
-          y2: 1,
           colorStops: [
             {
               offset: 0,

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

@@ -16,8 +16,7 @@ export enum ThemeEnum {
   MACARON = 'macaron',
   BLUE = 'blue',
   DARKBLUE = 'darkblue',
-  WINE = 'wine',
-  WEIXIN = 'tileLayer'
+  WINE = 'wine'
 }
 
 export enum LangEnum {

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

@@ -134,10 +134,6 @@ const themeOptions = [
   {
     value: ThemeEnum.WINE,
     label: '酱籽'
-  },
-  {
-    value: ThemeEnum.WEIXIN,
-    label: '卫星'
   }
 ]
 

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

@@ -8,7 +8,7 @@ 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, ThemeEnum } from './config'
+import { MarkerEnum } from './config'
 import { isArray } from '@/utils'
 
 const props = defineProps({
@@ -51,6 +51,7 @@ const initMap = (newData: any) => {
         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 度
@@ -59,14 +60,6 @@ const initMap = (newData: any) => {
         willReadFrequently: true
       })
       dataHandle(props.chartConfig.option.dataset)
-      let satellite = new AMap.TileLayer.Satellite()
-      let roadNet = new AMap.TileLayer.RoadNet()
-      if (newData.amapStyleKey === ThemeEnum.WEIXIN) {
-        mapIns.add([satellite, roadNet])
-      } else {
-        mapIns.remove([satellite, roadNet])
-        mapIns.setMapStyle(`amap://styles/${amapStyleKeyCustom.value !== '' ? amapStyleKeyCustom.value : amapStyleKey.value}`)
-      }
     })
     .catch(e => {})
 }

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

@@ -11,10 +11,7 @@ export const option = {
   dataset: dataJson,
   mapRegion: {
     adcode: 'china',
-    showHainanIsLands: true,
-    enter: false,
-    backSize: 20,
-    backColor: '#ffffff'
+    showHainanIsLands: true
   },
   tooltip: {
     show: true,
@@ -87,10 +84,7 @@ export const option = {
         shadowColor: '#E1FFFF',
         shadowBlur: 10
       },
-      data: [],
-      encode: {
-        value: 2
-      }
+      data: []
     },
     {
       name: '区域',
@@ -106,19 +100,19 @@ export const option = {
         borderColor: 'rgba(147, 235, 248, 0.8)',
         textStyle: {
           color: '#FFFFFF',
-          fontSize: 12
+          fontSize: 12,
         }
       },
       label: {
         show: false,
         color: '#FFFFFF',
-        fontSize: 12
+        fontSize: 12,
       },
       emphasis: {
         disabled: false,
         label: {
           color: '#FFFFFF',
-          fontSize: 12
+          fontSize: 12,
         },
         itemStyle: {
           areaColor: '#389BB7',
@@ -151,26 +145,6 @@ export const option = {
         shadowOffsetY: 2,
         shadowBlur: 10
       }
-    },
-    {
-      type: 'lines',
-      zlevel: 2,
-      effect: {
-        show: true,
-        period: 4, //箭头指向速度，值越小速度越快
-        trailLength: 0.4, //特效尾迹长度[0,1]值越大，尾迹越长重
-        symbol: 'arrow', //箭头图标
-        symbolSize: 7 //图标大小
-      },
-      lineStyle: {
-        normal: {
-          color: '#4fb6d2',
-          width: 1, //线条宽度
-          opacity: 0.1, //尾迹线条透明度
-          curveness: 0.3 //尾迹线条曲直度
-        }
-      },
-      data: []
     }
   ]
 }

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

@@ -69,7 +69,11 @@
         </n-space>
       </SettingItem>
       <SettingItem name="字体颜色">
-        <n-color-picker size="small" :modes="['hex']" v-model:value="seriesList[1].label.color"></n-color-picker>
+        <n-color-picker
+          size="small"
+          :modes="['hex']"
+          v-model:value="seriesList[1].label.color"
+        ></n-color-picker>
       </SettingItem>
       <SettingItem name="字体大小">
         <n-input-number
@@ -125,7 +129,7 @@
         ></n-color-picker>
       </SettingItem>
     </SettingItemBox>
-
+    
     <SettingItemBox name="悬浮弹窗">
       <SettingItem name="显示">
         <n-space>
@@ -176,22 +180,6 @@
       <SettingItem>
         <n-checkbox v-model:checked="mapRegion.showHainanIsLands" size="small">显示南海群岛</n-checkbox>
       </SettingItem>
-      <SettingItem v-if="seriesList[2]">
-        <n-checkbox v-model:checked="mapRegion.enter" size="small">点击进入下级</n-checkbox>
-      </SettingItem>
-    </SettingItemBox>
-    <SettingItemBox name="返回图标" v-if="mapRegion.enter">
-      <SettingItem name="颜色">
-        <n-color-picker size="small" :modes="['hex']" v-model:value="mapRegion.backColor"></n-color-picker>
-      </SettingItem>
-      <SettingItem name="大小">
-        <n-input-number
-          v-model:value="mapRegion.backSize"
-          :min="1"
-          size="small"
-          placeholder="请输入字体大小"
-        ></n-input-number>
-      </SettingItem>
     </SettingItemBox>
   </CollapseItem>
   <CollapseItem name="标记" :expanded="true">
@@ -203,7 +191,7 @@
         <n-color-picker size="small" :modes="['hex']" v-model:value="seriesList[0].itemStyle.color"></n-color-picker>
       </SettingItem>
     </SettingItemBox>
-
+      
     <SettingItemBox name="文本">
       <SettingItem name="显示">
         <n-space>
@@ -235,47 +223,6 @@
       </SettingItem>
     </SettingItemBox>
   </CollapseItem>
-
-  <CollapseItem v-if="seriesList[2]" name="飞线" :expanded="true">
-    <SettingItemBox name="箭头">
-      <SettingItem name="速度">
-        <n-tooltip trigger="hover">
-          <template #trigger>
-            <n-input-number v-model:value="seriesList[2].effect.period" size="small" :min="0"></n-input-number>
-          </template>
-          值越小速度越快
-        </n-tooltip>
-      </SettingItem>
-      <SettingItem name="尾迹">
-        <n-tooltip trigger="hover">
-          <template #trigger>
-            <n-input-number
-              v-model:value="seriesList[2].effect.trailLength"
-              size="small"
-              :min="0"
-              :max="1"
-            ></n-input-number>
-          </template>
-          特效尾迹长度[0,1]值越大，尾迹越长重
-        </n-tooltip>
-      </SettingItem>
-      <SettingItem name="大小">
-        <n-input-number v-model:value="seriesList[2].effect.symbolSize" size="small" :min="0"></n-input-number>
-      </SettingItem>
-    </SettingItemBox>
-    <SettingItemBox name="配置">
-      <SettingItem name="颜色">
-        <n-color-picker
-          size="small"
-          :modes="['hex']"
-          v-model:value="seriesList[2].lineStyle.normal.color"
-        ></n-color-picker>
-      </SettingItem>
-      <SettingItem name="宽度">
-        <n-input-number v-model:value="seriesList[2].lineStyle.normal.width" size="small" :min="1"></n-input-number>
-      </SettingItem>
-    </SettingItemBox>
-  </CollapseItem>
 </template>
 
 <script setup lang="ts">

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

@@ -21,32 +21,6 @@
       "value": [126.642464, 45.756967, 101]
     }
   ],
-  "line": [
-    {
-      "coords": [
-        [113.665412, 34.757975],
-        [116.405285, 39.904989]
-      ]
-    },
-    {
-      "coords": [
-        [101.778916, 36.623178],
-        [116.405285, 39.904989]
-      ]
-    },
-    {
-      "coords": [
-        [106.278179, 38.46637],
-        [116.405285, 39.904989]
-      ]
-    },
-    {
-      "coords": [
-        [126.642464, 45.756967],
-        [116.405285, 39.904989]
-      ]
-    }
-  ],
   "map": [
     {
       "name": "北京市",

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

@@ -1,256 +1,156 @@
-<template>
-  <div>
-    <div class="back-icon" v-if="(enter && levelHistory.length !== 0) || (enter && !isPreview())" @click="backLevel">
-      <n-icon :color="backColor" :size="backSize * 1.1">
-        <ArrowBackIcon />
-      </n-icon>
-      <span
-        :style="{
-          'font-weight': 200,
-          color: backColor,
-          'font-size': `${backSize}px`
-        }"
-      >
-        返回上级
-      </span>
-    </div>
-    <v-chart
-      ref="vChartRef"
-      :init-options="initOptions"
-      :theme="themeColor"
-      :option="option.value"
-      :manual-update="isPreview()"
-      autoresize
-      @click="chartPEvents"
-    >
-    </v-chart>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { PropType, reactive, watch, ref, nextTick, toRefs } from 'vue'
-import config, { includes } from './config'
-import VChart from 'vue-echarts'
-import { icon } from '@/plugins'
-import { useCanvasInitOptions } from '@/hooks/useCanvasInitOptions.hook'
-import { use, registerMap } from 'echarts/core'
-import { EffectScatterChart, MapChart } from 'echarts/charts'
-import { CanvasRenderer } from 'echarts/renderers'
-import { useChartDataFetch } from '@/hooks'
-import { mergeTheme, setOption } from '@/packages/public/chart'
-import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
-import { isPreview } from '@/utils'
-import mapJsonWithoutHainanIsLands from './mapWithoutHainanIsLands.json'
-import mapChinaJson from './mapGeojson/china.json'
-import { DatasetComponent, GridComponent, TooltipComponent, GeoComponent, VisualMapComponent } from 'echarts/components'
-
-const props = defineProps({
-  themeSetting: {
-    type: Object,
-    required: true
-  },
-  themeColor: {
-    type: Object,
-    required: true
-  },
-  chartConfig: {
-    type: Object as PropType<config>,
-    required: true
-  }
-})
-
-const { ArrowBackIcon } = icon.ionicons5
-let levelHistory: any = ref([])
-
-const { backColor, backSize, enter } = toRefs(props.chartConfig.option.mapRegion)
-const initOptions = useCanvasInitOptions(props.chartConfig.option, props.themeSetting)
-
-use([
-  MapChart,
-  DatasetComponent,
-  CanvasRenderer,
-  GridComponent,
-  TooltipComponent,
-  GeoComponent,
-  EffectScatterChart,
-  VisualMapComponent
-])
-
-const option = reactive({
-  value: mergeTheme(props.chartConfig.option, props.themeSetting, includes)
-})
-const vChartRef = ref<typeof VChart>()
-
-//动态获取json注册地图
-const getGeojson = (regionId: string) => {
-  return new Promise<boolean>(resolve => {
-    import(`./mapGeojson/${regionId}.json`).then(data => {
-      registerMap(regionId, { geoJSON: data.default as any, specialAreas: {} })
-      resolve(true)
-    })
-  })
-}
-
-//异步时先注册空的 保证初始化不报错
-registerMap(`${props.chartConfig.option.mapRegion.adcode}`, { geoJSON: {} as any, specialAreas: {} })
-
-// 进行更换初始化地图 如果为china 单独处理
-const registerMapInitAsync = async () => {
-  await nextTick()
-  const adCode = `${props.chartConfig.option.mapRegion.adcode}`
-  if (adCode !== 'china') {
-    await getGeojson(adCode)
-  } else {
-    await hainanLandsHandle(props.chartConfig.option.mapRegion.showHainanIsLands)
-  }
-  vEchartsSetOption()
-}
-registerMapInitAsync()
-
-// 手动触发渲染
-const vEchartsSetOption = () => {
-  option.value = props.chartConfig.option
-  setOption(vChartRef.value, props.chartConfig.option)
-}
-
-// 更新数据处理
-const dataSetHandle = async (dataset: any) => {
-  props.chartConfig.option.series.forEach((item: any) => {
-    if (item.type === 'effectScatter' && dataset.point) item.data = dataset.point
-    else if (item.type === 'lines' && dataset.line) {
-      item.data = dataset.line.map((it: any) => {
-        return {
-          ...it,
-          lineStyle: {
-            color: props.chartConfig.option.series[2].lineStyle.normal.color
-          }
-        }
-      })
-    } else if (item.type === 'map' && dataset.map) item.data = dataset.map
-  })
-  if (dataset.pieces) props.chartConfig.option.visualMap.pieces = dataset.pieces
-
-  isPreview() && vEchartsSetOption()
-}
-// 处理海南群岛
-const hainanLandsHandle = async (newData: boolean) => {
-  if (newData) {
-    await getGeojson('china')
-  } else {
-    registerMap('china', { geoJSON: mapJsonWithoutHainanIsLands as any, specialAreas: {} })
-  }
-}
-
-// 点击区域
-const chartPEvents = (e: any) => {
-  if (e.seriesType !== 'map') return
-  if (!props.chartConfig.option.mapRegion.enter) {
-    return
-  }
-  mapChinaJson.features.forEach(item => {
-    var pattern = new RegExp(e.name)
-    if (pattern.test(item.properties.name)) {
-      let code = String(item.properties.adcode)
-      levelHistory.value.push(code)
-      checkOrMap(code)
-    }
-  })
-}
-
-// 返回上一级
-const backLevel = () => {
-  levelHistory.value = []
-  if (levelHistory.value.length > 1) {
-    levelHistory.value.pop()
-    const code = levelHistory[levelHistory.value.length - 1]
-    checkOrMap(code)
-  } else {
-    checkOrMap('china')
-  }
-}
-
-// 切换地图
-const checkOrMap = async (newData: string) => {
-  await getGeojson(newData)
-  props.chartConfig.option.geo.map = newData
-  props.chartConfig.option.series.forEach((item: any) => {
-    if (item.type === 'map') item.map = newData
-  })
-  vEchartsSetOption()
-}
-
-//监听 dataset 数据发生变化
-watch(
-  () => props.chartConfig.option.dataset,
-  newData => {
-    dataSetHandle(newData)
-  },
-  {
-    immediate: true,
-    deep: false
-  }
-)
-
-// 监听线的颜色
-if (props.chartConfig.option.series[2] && !isPreview()) {
-  watch(
-    () => props.chartConfig.option.series[2].lineStyle.normal.color,
-    () => {
-      dataSetHandle(props.chartConfig.option.dataset)
-    },
-    {
-      deep: false
-    }
-  )
-}
-
-//监听是否显示南海群岛
-if (!isPreview()) {
-  watch(
-    () => props.chartConfig.option.mapRegion.showHainanIsLands,
-    async newData => {
-      try {
-        await hainanLandsHandle(newData)
-        vEchartsSetOption()
-      } catch (error) {
-        console.log(error)
-      }
-    },
-    {
-      deep: false
-    }
-  )
-}
-//监听地图展示区域发生变化
-watch(
-  () => `${props.chartConfig.option.mapRegion.adcode}`,
-  newData => {
-    try {
-      checkOrMap(newData)
-    } catch (error) {
-      console.log(error)
-    }
-  },
-  {
-    deep: false
-  }
-)
-
-// 预览
-useChartDataFetch(props.chartConfig, useChartEditStore, (newData: any) => {
-  dataSetHandle(newData)
-})
-</script>
-
-<style scope lang="scss">
-.back-icon {
-  z-index: 50;
-  cursor: pointer;
-  position: absolute;
-  display: flex;
-  align-items: center;
-  top: 0;
-  left: 0;
-  gap: 2px;
-}
-</style>
+<template>
+  <v-chart ref="vChartRef" :init-options="initOptions" :theme="themeColor" :option="option.value" :manual-update="isPreview()" autoresize>
+  </v-chart>
+</template>
+
+<script setup lang="ts">
+import { PropType, reactive, watch, ref, nextTick } from 'vue'
+import config, { includes } from './config'
+import VChart from 'vue-echarts'
+import { useCanvasInitOptions } from '@/hooks/useCanvasInitOptions.hook'
+import { use, registerMap } from 'echarts/core'
+import { EffectScatterChart, MapChart } from 'echarts/charts'
+import { CanvasRenderer } from 'echarts/renderers'
+import { useChartDataFetch } from '@/hooks'
+import { mergeTheme, setOption } from '@/packages/public/chart'
+import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
+import { isPreview } from '@/utils'
+import mapJsonWithoutHainanIsLands from './mapWithoutHainanIsLands.json'
+import { DatasetComponent, GridComponent, TooltipComponent, GeoComponent, VisualMapComponent } from 'echarts/components'
+
+const props = defineProps({
+  themeSetting: {
+    type: Object,
+    required: true
+  },
+  themeColor: {
+    type: Object,
+    required: true
+  },
+  chartConfig: {
+    type: Object as PropType<config>,
+    required: true
+  }
+})
+
+const initOptions = useCanvasInitOptions(props.chartConfig.option, props.themeSetting)
+
+use([
+  MapChart,
+  DatasetComponent,
+  CanvasRenderer,
+  GridComponent,
+  TooltipComponent,
+  GeoComponent,
+  EffectScatterChart,
+  VisualMapComponent
+])
+
+const option = reactive({
+  value: mergeTheme(props.chartConfig.option, props.themeSetting, includes)
+})
+const vChartRef = ref<typeof VChart>()
+
+//动态获取json注册地图
+const getGeojson = (regionId: string) => {
+  return new Promise<boolean>(resolve => {
+    import(`./mapGeojson/${regionId}.json`).then(data => {
+      registerMap(regionId, { geoJSON: data.default as any, specialAreas: {} })
+      resolve(true)
+    })
+  })
+}
+
+//异步时先注册空的 保证初始化不报错
+registerMap(`${props.chartConfig.option.mapRegion.adcode}`, { geoJSON: {} as any, specialAreas: {} })
+
+// 进行更换初始化地图 如果为china 单独处理
+const registerMapInitAsync = async () => {
+  await nextTick()
+  const adCode = `${props.chartConfig.option.mapRegion.adcode}`;
+  if (adCode !== 'china') {
+    await getGeojson(adCode)
+  } else {
+    await hainanLandsHandle(props.chartConfig.option.mapRegion.showHainanIsLands)
+  }
+  vEchartsSetOption()
+}
+registerMapInitAsync()
+
+// 手动触发渲染
+const vEchartsSetOption = () => {
+  option.value = props.chartConfig.option
+  setOption(vChartRef.value, props.chartConfig.option)
+}
+
+// 更新数据处理
+const dataSetHandle = async (dataset: any) => {
+  props.chartConfig.option.series.forEach((item: any) => {
+    if (item.type === 'effectScatter' && dataset.point) item.data = dataset.point
+    else if (item.type === 'map' && dataset.map) item.data = dataset.map
+  })
+  if (dataset.pieces) props.chartConfig.option.visualMap.pieces = dataset.pieces
+
+  isPreview() && vEchartsSetOption()
+}
+// 处理海南群岛
+const hainanLandsHandle = async (newData: boolean) => {
+  if (newData) {
+    await getGeojson('china')
+  } else {
+    registerMap('china', { geoJSON: mapJsonWithoutHainanIsLands as any, specialAreas: {} })
+  }
+}
+//监听 dataset 数据发生变化
+watch(
+  () => props.chartConfig.option.dataset,
+  newData => {
+    dataSetHandle(newData)
+  },
+  {
+    immediate: true,
+    deep: false
+  }
+)
+
+//监听是否显示南海群岛
+watch(
+  () => props.chartConfig.option.mapRegion.showHainanIsLands,
+  async newData => {
+    try {
+      await hainanLandsHandle(newData)
+      vEchartsSetOption()
+    } catch (error) {
+      console.log(error)
+    }
+  },
+  {
+    deep: false
+  }
+)
+
+//监听地图展示区域发生变化
+watch(
+  () => `${props.chartConfig.option.mapRegion.adcode}`,
+  async newData => {
+    try {
+      await getGeojson(newData)
+      props.chartConfig.option.geo.map = newData
+      props.chartConfig.option.series.forEach((item: any) => {
+        if (item.type === 'map') item.map = newData
+      })
+      vEchartsSetOption()
+    } catch (error) {
+      console.log(error)
+    }
+  },
+  {
+    deep: false
+  }
+)
+
+// 预览
+useChartDataFetch(props.chartConfig, useChartEditStore, (newData: any) => {
+  dataSetHandle(newData)
+})
+</script>

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

@@ -9,8 +9,7 @@ export const includes = []
 // 关系图布局
 export const GraphLayout = [
   { label: '无', value: 'none' },
-  { label: '环形', value: 'circular' },
-  { label: '力引导', value: 'force' }
+  { label: '环形', value: 'circular' }
 ]
 
 // 标签开关
@@ -25,57 +24,44 @@ export const LabelPosition = [
   { label: '右侧', value: 'right' },
   { label: '顶部', value: 'top' },
   { label: '底部', value: 'bottom' },
-  { label: '内部', value: 'inside' }
-]
-
-// 图-迭代动画
-export const LayoutAnimation = [
-  { label: '开启', value: 1 },
-  { label: '关闭', value: 0 }
+  { label: '内部', value: 'inside' },
 ]
 
 export const option = {
-  dataset: { ...dataJson },
-  tooltip: {},
-  legend: {
-    show: true,
-    textStyle: {
-      color: '#eee',
-      fontSize: 14
+    dataset: { ...dataJson },
+    tooltip: {},
+    legend:{
+      show:true,
+      textStyle:{
+        color:"#eee",
+        fontSize: 14 ,
+      },
+      data: dataJson.categories.map(function (a) {
+          return a.name;
+      })
     },
-    data: dataJson.categories.map(function (a) {
-      return a.name
-    })
-  },
-  series: [
-    {
-      type: 'graph',
-      layout: 'none', // none circular环形布局
-      data: dataJson.nodes,
-      links: dataJson.links,
-      categories: dataJson.categories,
-      label: {
-        show: 1,
-        position: 'right',
-        formatter: '{b}'
-      },
-      labelLayout: {
-        hideOverlap: true
-      },
-      lineStyle: {
-        color: 'source', // 线条颜色
-        curveness: 0.2 // 线条卷曲程度
-      },
-      force: {
-        repulsion: 100,
-        gravity: 0.1,
-        edgeLength: 30,
-        layoutAnimation: 1,
-        friction: 0.6
+    series: [
+      {
+        type: 'graph',
+        layout: 'none', // none circular环形布局
+        data: dataJson.nodes,
+        links: dataJson.links,
+        categories: dataJson.categories,
+        label: { // 标签
+          show: 1,
+          position: 'right',
+          formatter: '{b}'
+        },
+        labelLayout: {
+          hideOverlap: true
+        },
+        lineStyle: {
+          color: 'source', // 线条颜色
+          curveness: 0.2 // 线条卷曲程度
+        }
       }
-    }
-  ]
-}
+    ]
+  };
 
 export default class Config extends PublicConfigClass implements CreateComponentType {
   public key = GraphConfig.key

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

@@ -16,14 +16,14 @@
       </SettingItemBox>
       <SettingItemBox name="线条">
         <SettingItem name="弧线">
-          <!-- 需要输入两位的小数才会变化 -->
+        <!-- 需要输入两位的小数才会变化 -->
           <n-input-number
-            v-model:value="optionData.series[0].lineStyle.curveness"
-            :min="0"
-            :step="0.01"
-            placeholder="弯曲程度"
-            size="small"
-          ></n-input-number>
+          v-model:value="optionData.series[0].lineStyle.curveness"
+          :min="0"
+          :step="0.01"
+          placeholder="弯曲程度"
+          size="small"
+        ></n-input-number>
         </SettingItem>
       </SettingItemBox>
       <SettingItemBox name="图例">
@@ -32,61 +32,10 @@
             size="small"
             :modes="['hex']"
             v-model:value="optionData.legend.textStyle.color"
-          ></n-color-picker>
+        ></n-color-picker>
         </SettingItem>
         <SettingItem name="文本">
-          <n-input-number
-            v-model:value="optionData.legend.textStyle.fontSize"
-            :min="0"
-            :step="1"
-            size="small"
-            placeholder="文字大小"
-          >
-          </n-input-number>
-        </SettingItem>
-      </SettingItemBox>
-      <SettingItemBox name="力引导" v-if="optionData.series[0].force && graphConfig.layout == 'force'">
-        <SettingItem name="斥力因子" v-if="optionData.series[0].force.repulsion">
-          <n-input-number
-            v-model:value="optionData.series[0].force.repulsion"
-            :min="0"
-            :step="1"
-            size="small"
-            placeholder="斥力因子大小"
-          >
-          </n-input-number>
-        </SettingItem>
-        <SettingItem name="引力因子" v-if="optionData.series[0].force.gravity">
-          <n-input-number
-            v-model:value="optionData.series[0].force.gravity"
-            :min="0"
-            :step="0.1"
-            size="small"
-            placeholder="引力因子"
-          >
-          </n-input-number>
-        </SettingItem>
-        <SettingItem name="节点距离">
-          <n-input-number
-            v-model:value="optionData.series[0].force.edgeLength"
-            :min="0"
-            :step="1"
-            size="small"
-            placeholder="节点距离"
-          >
-          </n-input-number>
-        </SettingItem>
-        <SettingItem name="迭代动画">
-          <n-select v-model:value="graphConfig.force.layoutAnimation" :options="LayoutAnimation" size="small" />
-        </SettingItem>
-        <SettingItem name="节点速度">
-          <n-input-number
-            v-model:value="optionData.series[0].force.friction"
-            :min="0"
-            :step="0.1"
-            size="small"
-            placeholder="节点速度"
-          >
+          <n-input-number v-model:value="optionData.legend.textStyle.fontSize" :min="0" :step="1" size="small" placeholder="文字大小">
           </n-input-number>
         </SettingItem>
       </SettingItemBox>
@@ -97,7 +46,7 @@
 <script setup lang="ts">
 import { PropType, computed } from 'vue'
 import { CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
-import { option, GraphLayout, LabelSwitch, LabelPosition, LayoutAnimation } from './config'
+import { option, GraphLayout, LabelSwitch, LabelPosition } from './config'
 import { GlobalThemeJsonType } from '@/settings/chartThemes/index'
 
 const props = defineProps({
@@ -107,7 +56,7 @@ const props = defineProps({
   }
 })
 
-const graphConfig = computed<(typeof option.series)[0]>(() => {
+const graphConfig = computed<typeof option.series[0]>(() => {
   return props.optionData.series[0]
 })
 </script>

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

@@ -1,12 +1,5 @@
 <template>
-  <v-chart
-    ref="vChartRef"
-    :init-options="initOptions"
-    :theme="themeColor"
-    :option="option"
-    :manual-update="isPreview()"
-    autoresize
-  ></v-chart>
+  <v-chart ref="vChartRef" :init-options="initOptions" :theme="themeColor" :option="option" :manual-update="isPreview()" autoresize></v-chart>
 </template>
 
 <script setup lang="ts">

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

@@ -3,7 +3,7 @@
     :type="type"
     :height="h"
     :processing="processing"
-    :percentage="dataset"
+    :percentage="option.dataset"
     :indicator-placement="indicatorPlacement"
     :color="color"
     :rail-color="railColor"
@@ -15,7 +15,7 @@
         fontSize: `${indicatorTextSize}px`
       }"
     >
-      {{ dataset }} {{ unit }}
+      {{ option.dataset }} {{ unit }}
     </n-text>
   </n-progress>
 </template>

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

@@ -8,14 +8,4 @@ import { DialConfig } from './Dial/index'
 import { SankeyConfig } from './Sankey/index'
 import { GraphConfig } from './Graph/index'
 
-export default [
-  ProcessConfig,
-  RadarConfig,
-  FunnelConfig,
-  HeatmapConfig,
-  WaterPoloConfig,
-  TreeMapConfig,
-  GraphConfig,
-  SankeyConfig,
-  DialConfig
-]
+export default [ProcessConfig, RadarConfig, FunnelConfig, HeatmapConfig, WaterPoloConfig, TreeMapConfig, GraphConfig, SankeyConfig, DialConfig]

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

@@ -7,22 +7,6 @@
         </n-input-number>
       </SettingItem>
     </SettingItemBox>
-    <!-- 中心标题 -->
-    <SettingItemBox v-if="config.title" name="标题">
-      <SettingItem name="颜色">
-        <n-color-picker size="small" :modes="['hex']" v-model:value="config.title.textStyle.color"></n-color-picker>
-      </SettingItem>
-      <SettingItem name="字体大小">
-        <n-input-number
-          v-model:value="config.title.textStyle.fontSize"
-          :min="0"
-          :step="1"
-          size="small"
-          placeholder="字体大小"
-        >
-        </n-input-number>
-      </SettingItem>
-    </SettingItemBox>
     <!-- Echarts 全局设置 -->
     <SettingItemBox name="进度条">
       <SettingItem name="颜色">
@@ -47,8 +31,24 @@
         ></n-color-picker>
       </SettingItem>
     </SettingItemBox>
+    <!-- 中心标题 -->
+    <SettingItemBox v-if="config.title" name="标题">
+      <SettingItem name="颜色">
+        <n-color-picker size="small" :modes="['hex']" v-model:value="config.title.textStyle.color"></n-color-picker>
+      </SettingItem>
+      <SettingItem name="字体大小">
+        <n-input-number
+          v-model:value="config.title.textStyle.fontSize"
+          :min="0"
+          :step="1"
+          size="small"
+          placeholder="字体大小"
+        >
+        </n-input-number>
+      </SettingItem>
+    </SettingItemBox>
     <!-- 其他样式 -->
-    <SettingItemBox name="轨道">
+    <SettingItemBox name="轨道样式">
       <SettingItem name="颜色">
         <n-color-picker size="small" :modes="['hex']" v-model:value="item.data[1].itemStyle.color"></n-color-picker>
       </SettingItem>
@@ -69,18 +69,6 @@
           v-model:value="item.data[1].itemStyle.shadowColor"
         ></n-color-picker>
       </SettingItem>
-      <SettingItem name="轨道宽度">
-        <n-select
-          v-model:value="item.radius[0]"
-          size="small"
-          :options="[
-            { label: '窄', value: '75%' },
-            { label: '中', value: '60%' },
-            { label: '宽', value: '45%' },
-            { label: '更宽', value: '30%' }
-          ]"
-        />
-      </SettingItem>
     </SettingItemBox>
   </CollapseItem>
 </template>

src/packages/components/Charts/Pies/PieCircle/index.vue

@@ -41,7 +41,7 @@ const option = reactive({
 const dataHandle = (newData: any) => {
   const d = parseFloat(`${newData}`) * 100
   let config = props.chartConfig.option
-  config.title.text = `${+d.toFixed(2)}%`
+  config.title.text = d.toFixed(2) + '%'
   config.series[0].data[0].value[0] = d
   config.series[0].data[1].value[0] = 100 - d
   option.value = mergeTheme(props.chartConfig.option, props.themeSetting, includes)
@@ -68,7 +68,7 @@ watch(
 useChartDataFetch(props.chartConfig, useChartEditStore, (resData: number) => {
   let d = parseFloat(`${resData}`) * 100
   // @ts-ignore
-  option.value.title.text = `${+d.toFixed(2)}%`
+  option.value.title.text = d.toFixed(2) + '%'
   // @ts-ignore
   option.value.series[0].data[0].value[0] = d
   // @ts-ignore

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

@@ -18,14 +18,7 @@ export const PieTypeObject = {
   [PieTypeEnum.ROSE]: 'rose'
 }
 
-// 其它配置
-const otherConfig = {
-  // 轮播动画
-  isCarousel: false,
-}
-
 const option = {
-  ...otherConfig,
   type: 'ring',
   tooltip: {
     show: true,

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

@@ -1,99 +1,88 @@
-<template>
-  <!-- Echarts 全局设置 -->
-  <global-setting :optionData="optionData"></global-setting>
-  <CollapseItem name="饼图配置" :expanded="true">
-    <SettingItemBox name="类型">
-      <SettingItem>
-        <n-select v-model:value="optionData.type" size="small" :options="fontWeightOptions" />
-      </SettingItem>
-    </SettingItemBox>
-    <SettingItemBox name="动画" :alone="true">
-      <SettingItem>
-        <n-space>
-          <n-switch v-model:value="optionData.isCarousel" size="small"></n-switch>
-          <n-text>开启<n-text :depth="3">（将自动隐藏图例）</n-text></n-text>
-        </n-space>
-      </SettingItem>
-      <SettingItem>
-        <n-text :depth="3">无鼠标点击图例场景时，可强行打开图例</n-text>
-      </SettingItem>
-    </SettingItemBox>
-    <SettingItemBox name="标签">
-      <SettingItem>
-        <n-space>
-          <n-switch v-model:value="optionData.series[0].label.show" size="small"></n-switch>
-          <n-text>展示标签</n-text>
-        </n-space>
-      </SettingItem>
-      <setting-item>
-        <n-space>
-          <n-switch v-model:value="optionData.series[0].labelLine.show" size="small"></n-switch>
-          <n-text>引导线</n-text>
-        </n-space>
-      </setting-item>
-      <SettingItem name="位置">
-        <n-select v-model:value="optionData.series[0].label.position" size="small" :options="labelConfig.position" />
-      </SettingItem>
-      <setting-item name="展示类型">
-        <n-select v-model:value="optionData.series[0].label.formatter" size="small" :options="labelFormatterOptions" />
-      </setting-item>
-    </SettingItemBox>
-    <setting-item-box name="圆角">
-      <setting-item>
-        <n-space>
-          <n-input-number
-            v-model:value="optionData.series[0].itemStyle.borderRadius"
-            size="small"
-            :min="0"
-          ></n-input-number>
-          <n-text>圆角大小</n-text>
-        </n-space>
-      </setting-item>
-      <setting-item>
-        <n-space>
-          <n-input-number
-            v-model:value="optionData.series[0].itemStyle.borderWidth"
-            size="small"
-            :min="0"
-          ></n-input-number>
-          <n-text>线条宽度</n-text>
-        </n-space>
-      </setting-item>
-    </setting-item-box>
-  </CollapseItem>
-</template>
-
-<script setup lang="ts">
-import { PropType, watch } from 'vue'
-import { GlobalThemeJsonType } from '@/settings/chartThemes/index'
-import { GlobalSetting, CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
-import { PieTypeObject, PieTypeEnum } from './config'
-import { labelConfig } from '@/packages/chartConfiguration/echarts'
-
-const props = defineProps({
-  optionData: {
-    type: Object as PropType<GlobalThemeJsonType>,
-    required: true
-  }
-})
-const fontWeightOptions = [
-  {
-    label: PieTypeEnum.NORMAL,
-    value: PieTypeObject[PieTypeEnum.NORMAL]
-  },
-  {
-    label: PieTypeEnum.RING,
-    value: PieTypeObject[PieTypeEnum.RING]
-  },
-  {
-    label: PieTypeEnum.ROSE,
-    value: PieTypeObject[PieTypeEnum.ROSE]
-  }
-]
-
-const labelFormatterOptions = [
-  { label: '数据名', value: '{b}' },
-  { label: '百分比', value: '{d}' },
-  { label: '列名:百分比', value: '{b}:{d}%' }
-]
-</script>
+<template>
+  <!-- Echarts 全局设置 -->
+  <global-setting :optionData="optionData"></global-setting>
+  <CollapseItem name="饼图配置" :expanded="true">
+    <SettingItemBox name="类型">
+      <SettingItem>
+        <n-select v-model:value="optionData.type" size="small" :options="fontWeightOptions" />
+      </SettingItem>
+    </SettingItemBox>
+    <SettingItemBox name="标签">
+      <SettingItem>
+        <n-space>
+          <n-switch v-model:value="optionData.series[0].label.show" size="small"></n-switch>
+          <n-text>展示标签</n-text>
+        </n-space>
+      </SettingItem>
+      <setting-item>
+        <n-space>
+          <n-switch v-model:value="optionData.series[0].labelLine.show" size="small"></n-switch>
+          <n-text>引导线</n-text>
+        </n-space>
+      </setting-item>
+      <SettingItem name="位置">
+        <n-select v-model:value="optionData.series[0].label.position" size="small" :options="labelConfig.position" />
+      </SettingItem>
+      <setting-item name="展示类型">
+        <n-select v-model:value="optionData.series[0].label.formatter" size="small" :options="labelFormatterOptions" />
+      </setting-item>
+    </SettingItemBox>
+    <setting-item-box name="圆角">
+      <setting-item>
+        <n-space>
+          <n-input-number
+            v-model:value="optionData.series[0].itemStyle.borderRadius"
+            size="small"
+            :min="0"
+          ></n-input-number>
+          <n-text>圆角大小</n-text>
+        </n-space>
+      </setting-item>
+      <setting-item>
+        <n-space>
+          <n-input-number
+            v-model:value="optionData.series[0].itemStyle.borderWidth"
+            size="small"
+            :min="0"
+          ></n-input-number>
+          <n-text>线条宽度</n-text>
+        </n-space>
+      </setting-item>
+    </setting-item-box>
+  </CollapseItem>
+</template>
+
+<script setup lang="ts">
+import { PropType, watch } from 'vue'
+import { GlobalThemeJsonType } from '@/settings/chartThemes/index'
+import { GlobalSetting, CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
+import { PieTypeObject, PieTypeEnum } from './config'
+import { labelConfig } from '@/packages/chartConfiguration/echarts'
+
+const props = defineProps({
+  optionData: {
+    type: Object as PropType<GlobalThemeJsonType>,
+    required: true
+  }
+})
+const fontWeightOptions = [
+  {
+    label: PieTypeEnum.NORMAL,
+    value: PieTypeObject[PieTypeEnum.NORMAL]
+  },
+  {
+    label: PieTypeEnum.RING,
+    value: PieTypeObject[PieTypeEnum.RING]
+  },
+  {
+    label: PieTypeEnum.ROSE,
+    value: PieTypeObject[PieTypeEnum.ROSE]
+  }
+]
+
+const labelFormatterOptions = [
+  { label: '数据名', value: '{b}' },
+  { label: '百分比', value: '{d}' },
+  { label: '列名:百分比', value: '{b}:{d}%' }
+]
+</script>

src/packages/components/Charts/Pies/PieCommon/index.vue

@@ -1,146 +1,64 @@
-<template>
-  <v-chart
-    ref="vChartRef"
-    autoresize
-    :init-options="initOptions"
-    :theme="themeColor"
-    :option="option"
-    :manual-update="isPreview()"
-    @mouseover="handleHighlight"
-    @mouseout="handleDownplay"
-  ></v-chart>
-</template>
-
-<script setup lang="ts">
-import { computed, PropType, onMounted, watch } from 'vue'
-import VChart from 'vue-echarts'
-import { useCanvasInitOptions } from '@/hooks/useCanvasInitOptions.hook'
-import { use } from 'echarts/core'
-import { CanvasRenderer } from 'echarts/renderers'
-import { PieChart } from 'echarts/charts'
-import { mergeTheme } from '@/packages/public/chart'
-import config, { includes } from './config'
-import { useChartDataFetch } from '@/hooks'
-import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
-import { isPreview } from '@/utils'
-import { DatasetComponent, GridComponent, TooltipComponent, LegendComponent } from 'echarts/components'
-import dataJson from './data.json'
-
-const props = defineProps({
-  themeSetting: {
-    type: Object,
-    required: true
-  },
-  themeColor: {
-    type: Object,
-    required: true
-  },
-  chartConfig: {
-    type: Object as PropType<config>,
-    required: true
-  }
-})
-const initOptions = useCanvasInitOptions(props.chartConfig.option, props.themeSetting)
-let seriesDataNum = -1
-let seriesDataMaxLength = 0
-let intervalInstance: any = null
-
-use([DatasetComponent, CanvasRenderer, PieChart, GridComponent, TooltipComponent, LegendComponent])
-
-const option = computed(() => {
-  return mergeTheme(props.chartConfig.option, props.themeSetting, includes)
-})
-
-// 会重新选择需要选中和展示的数据
-const handleSeriesData = () => {
-  if (seriesDataNum > -1) {
-    vChartRef.value?.dispatchAction({
-      type: 'downplay',
-      dataIndex: seriesDataNum
-    })
-  }
-  seriesDataNum = seriesDataNum >= seriesDataMaxLength - 1 ? 0 : seriesDataNum + 1
-  vChartRef.value?.dispatchAction({
-    type: 'highlight',
-    dataIndex: seriesDataNum
-  })
-}
-
-// 新增轮播
-const addPieInterval = (newData?: typeof dataJson, skipPre = false) => {
-  if (!skipPre && !Array.isArray(newData?.source)) return
-  if (!skipPre) seriesDataMaxLength = newData?.source.length || 0
-  clearInterval(intervalInstance)
-  intervalInstance = setInterval(() => {
-    handleSeriesData()
-  }, 1000)
-}
-
-// 取消轮播
-const clearPieInterval = () => {
-  vChartRef.value?.dispatchAction({
-    type: 'downplay',
-    dataIndex: seriesDataNum
-  })
-  clearInterval(intervalInstance)
-  intervalInstance = null
-}
-
-// 处理鼠标聚焦高亮内容
-const handleHighlight = () => {
-  clearPieInterval()
-}
-
-// 处理鼠标取消悬浮
-const handleDownplay = () => {
-  if (props.chartConfig.option.isCarousel && !intervalInstance) {
-    // 恢复轮播
-    addPieInterval(undefined, true)
-  }
-}
-
-watch(
-  () => props.chartConfig.option.type,
-  newData => {
-    try {
-      if (newData === 'nomal') {
-        props.chartConfig.option.series[0].radius = '70%'
-        props.chartConfig.option.series[0].roseType = false
-      } else if (newData === 'ring') {
-        props.chartConfig.option.series[0].radius = ['40%', '65%']
-        props.chartConfig.option.series[0].roseType = false
-      } else {
-        props.chartConfig.option.series[0].radius = '70%'
-        props.chartConfig.option.series[0].roseType = true
-      }
-    } catch (error) {
-      console.log(error)
-    }
-  },
-  { deep: false, immediate: true }
-)
-
-watch(
-  () => props.chartConfig.option.isCarousel,
-  newData => {
-    if (newData) {
-      addPieInterval(undefined, true)
-      props.chartConfig.option.legend.show = false
-    } else {
-      props.chartConfig.option.legend.show = true
-      clearPieInterval()
-    }
-  }
-)
-
-const { vChartRef } = useChartDataFetch(props.chartConfig, useChartEditStore, (newData: typeof dataJson) => {
-  addPieInterval(newData)
-})
-
-onMounted(() => {
-  seriesDataMaxLength = dataJson.source.length
-  if (props.chartConfig.option.isCarousel) {
-    addPieInterval(undefined, true)
-  }
-})
-</script>
+<template>
+  <v-chart ref="vChartRef" :init-options="initOptions" :theme="themeColor" :option="option" :manual-update="isPreview()" autoresize></v-chart>
+</template>
+
+<script setup lang="ts">
+import { computed, PropType, reactive, watch } from 'vue'
+import VChart from 'vue-echarts'
+import { useCanvasInitOptions } from '@/hooks/useCanvasInitOptions.hook'
+import { use } from 'echarts/core'
+import { CanvasRenderer } from 'echarts/renderers'
+import { PieChart } from 'echarts/charts'
+import { mergeTheme } from '@/packages/public/chart'
+import config, { includes } from './config'
+import { useChartDataFetch } from '@/hooks'
+import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
+import { isPreview } from '@/utils'
+import { DatasetComponent, GridComponent, TooltipComponent, LegendComponent } from 'echarts/components'
+
+const props = defineProps({
+  themeSetting: {
+    type: Object,
+    required: true
+  },
+  themeColor: {
+    type: Object,
+    required: true
+  },
+  chartConfig: {
+    type: Object as PropType<config>,
+    required: true
+  }
+})
+
+const initOptions = useCanvasInitOptions(props.chartConfig.option, props.themeSetting)
+
+use([DatasetComponent, CanvasRenderer, PieChart, GridComponent, TooltipComponent, LegendComponent])
+
+const option = computed(() => {
+  return mergeTheme(props.chartConfig.option, props.themeSetting, includes)
+})
+
+watch(
+  () => props.chartConfig.option.type,
+  newData => {
+    try {
+      if (newData === 'nomal') {
+        props.chartConfig.option.series[0].radius = '70%'
+        props.chartConfig.option.series[0].roseType = false
+      } else if (newData === 'ring') {
+        props.chartConfig.option.series[0].radius = ['40%', '65%']
+        props.chartConfig.option.series[0].roseType = false
+      } else {
+        props.chartConfig.option.series[0].radius = '70%'
+        props.chartConfig.option.series[0].roseType = true
+      }
+    } catch (error) {
+      console.log(error)
+    }
+  },
+  { deep: false, immediate: true }
+)
+
+const { vChartRef } = useChartDataFetch(props.chartConfig, useChartEditStore)
+</script>

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

@@ -14,6 +14,5 @@ export enum ChatCategoryEnumName {
   LINE = '折线图',
   SCATTER = '散点图',
   MAP = '地图',
-  COMBINATION = '组合图',
   MORE = '更多'
 }

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

@@ -16,7 +16,6 @@ export interface OptionType {
   flipperGap: number
   flipperType: FlipType
   flipperSpeed: number
-  flipperBorderWidth: number
 }
 
 export const option: OptionType = {
@@ -29,8 +28,7 @@ export const option: OptionType = {
   flipperRadius: 5,
   flipperGap: 10,
   flipperType: 'down',
-  flipperSpeed: 450,
-  flipperBorderWidth: 0,
+  flipperSpeed: 450
 }
 
 export default class Config extends PublicConfigClass implements CreateComponentType {

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

@@ -16,16 +16,12 @@
       <setting-item name="高度">
         <n-input-number v-model:value="optionData.flipperHeight" size="small" :min="1"></n-input-number>
       </setting-item>
-      <setting-item name="边框">
-        <n-input-number v-model:value="optionData.flipperBorderWidth" size="small" :min="0" :max="10"></n-input-number>
+      <setting-item name="间隔">
+        <n-input-number v-model:value="optionData.flipperGap" size="small" :min="0"></n-input-number>
       </setting-item>
       <setting-item name="圆角">
         <n-input-number v-model:value="optionData.flipperRadius" size="small" :min="0"></n-input-number>
       </setting-item>
-      <setting-item name="翻牌间隔">
-        <n-input-number v-model:value="optionData.flipperGap" size="small" :min="0"></n-input-number>
-      </setting-item>
-      <setting-item />
       <setting-item name="背景色">
         <n-color-picker
           size="small"

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

@@ -9,7 +9,6 @@
       :radius="flipperRadius"
       :flip-type="flipperType"
       :duration="flipperSpeed"
-      :border-width="flipperBorderWidth"
       v-for="(item, index) in flipperData"
       :key="index"
       class="go-d-block"
@@ -43,8 +42,7 @@ const {
   flipperRadius,
   flipperGap,
   flipperType,
-  flipperSpeed,
-  flipperBorderWidth
+  flipperSpeed
 } = toRefs(props.chartConfig.option as OptionType)
 
 const flipperData = ref<string[] | number[]>([])
@@ -63,7 +61,7 @@ watch(
   () => props.chartConfig.option,
   newVal => {
     try {
-      updateDatasetHandler((newVal as any as OptionType).dataset)
+      updateDatasetHandler((newVal as OptionType).dataset)
     } catch (error) {
       console.log(error)
     }

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

@@ -1,18 +0,0 @@
-import { PublicConfigClass } from '@/packages/public'
-import { CreateComponentType } from '@/packages/index.d'
-import { chartInitConfig } from '@/settings/designSetting'
-import { FullScreenConfig } from './index'
-import cloneDeep from 'lodash/cloneDeep'
-
-export const option = {
-  border: 6,
-  bgColor: '#84a5e9',
-  borderColor: '#84a5e9'
-}
-
-export default class Config extends PublicConfigClass implements CreateComponentType {
-  public key = FullScreenConfig.key
-  public attr = { ...chartInitConfig, w: 150, h: 150, zIndex: -1 }
-  public chartConfig = cloneDeep(FullScreenConfig)
-  public option = cloneDeep(option)
-}

src/packages/components/Decorates/Mores/FullScreen/config.vue

@@ -1,28 +0,0 @@
-<template>
-  <CollapseItem name="全屏按钮" expanded>
-    <SettingItemBox name="按钮">
-      <SettingItem name="背景色">
-        <n-color-picker size="small" :modes="['hex']" v-model:value="optionData.bgColor"></n-color-picker>
-      </SettingItem>
-      <SettingItem name="边框色">
-        <n-color-picker size="small" :modes="['hex']" v-model:value="optionData.borderColor"></n-color-picker>
-      </SettingItem>
-      <SettingItem name="边框大小">
-        <n-input-number v-model:value="optionData.border" size="small" :step="0.5" :min="0"></n-input-number>
-      </SettingItem>
-    </SettingItemBox>
-  </CollapseItem>
-</template>
-
-<script setup lang="ts">
-import { PropType } from 'vue'
-import { CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
-import { option } from './config'
-
-const props = defineProps({
-  optionData: {
-    type: Object as PropType<typeof option>,
-    required: true
-  }
-})
-</script>

src/packages/components/Decorates/Mores/FullScreen/index.ts

@@ -1,14 +0,0 @@
-import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'
-import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'
-
-export const FullScreenConfig: ConfigType = {
-  key: 'FullScreen',
-  chartKey: 'VFullScreen',
-  conKey: 'VCFullScreen',
-  title: '全屏按钮',
-  category: ChatCategoryEnum.MORE,
-  categoryName: ChatCategoryEnumName.MORE,
-  package: PackagesCategoryEnum.DECORATES,
-  chartFrame: ChartFrameEnum.STATIC,
-  image: 'fullScreen.png'
-}

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

@@ -1,111 +0,0 @@
-<template>
-  <svg @click="toggleFullscreen" v-if="!isFullscreen" viewBox="0 0 1024 1024">
-    <path
-      d="M665.6 1017.6c-19.2 0-38.4-19.2-38.4-38.4s19.2-38.4 38.4-38.4h268.8l6.4-268.8c0-19.2 19.2-38.4 38.4-38.4s38.4 19.2 38.4 38.4v294.4c0 32-25.6 51.2-51.2 51.2h-300.8zM51.2 396.8c-19.2 0-38.4-19.2-38.4-38.4V64C12.8 32 38.4 12.8 64 12.8h294.4c19.2 0 38.4 19.2 38.4 38.4s-19.2 38.4-38.4 38.4H89.6v268.8c0 19.2-19.2 38.4-38.4 38.4zM64 1017.6c-32 0-51.2-25.6-51.2-51.2v-294.4c0-19.2 19.2-38.4 38.4-38.4s38.4 19.2 38.4 38.4v217.6l198.4-198.4c6.4-6.4 19.2-12.8 25.6-12.8s19.2 6.4 25.6 12.8c6.4 6.4 12.8 19.2 12.8 25.6 0 12.8-6.4 19.2-12.8 25.6l-198.4 198.4h217.6c19.2 0 38.4 19.2 38.4 38.4s-19.2 38.4-38.4 38.4H64z m915.2-620.8c-19.2 0-38.4-19.2-38.4-38.4V140.8l-198.4 198.4c-6.4 6.4-19.2 12.8-25.6 12.8-12.8 0-19.2-6.4-25.6-12.8-12.8-12.8-12.8-38.4 0-51.2l198.4-198.4h-217.6c-19.2 0-38.4-19.2-38.4-38.4s19.2-38.4 38.4-38.4h294.4c32 0 51.2 25.6 51.2 51.2v294.4c0 19.2-19.2 38.4-38.4 38.4z"
-      class="fullScreen-border"
-    ></path>
-  </svg>
-  <svg @click="toggleFullscreen" v-else viewBox="0 0 1024 1024">
-    <path
-      d="M379.336 697.237L153.362 921.55c-14.11 14.007-36.905 13.922-50.912-0.188-14.007-14.11-13.922-36.905 0.188-50.912l227.6-225.927H138.645c-18.99 0-34.385-15.446-34.385-34.5 0-19.053 15.395-34.5 34.385-34.5H413.72c18.99 0 34.384 15.447 34.384 34.5v276c0 9.15-3.622 17.926-10.07 24.396a34.326 34.326 0 0 1-24.314 10.104 34.326 34.326 0 0 1-24.314-10.104 34.559 34.559 0 0 1-10.071-24.396V697.237z m263.395-366.88l227.813-227.813c14.059-14.059 36.853-14.059 50.912 0 14.059 14.059 14.059 36.853 0 50.912l-225.18 225.18h187.147c18.99 0 34.385 15.445 34.385 34.5 0 19.053-15.395 34.5-34.385 34.5H608.346c-18.99 0-34.384-15.447-34.384-34.5v-276c0-9.15 3.622-17.926 10.07-24.396a34.326 34.326 0 0 1 24.314-10.105c9.12 0 17.865 3.635 24.314 10.105a34.559 34.559 0 0 1 10.07 24.395v193.223zM99.385 410a34.326 34.326 0 0 1-24.314-10.105A34.559 34.559 0 0 1 65 375.5v-276C65 80.446 80.395 65 99.385 65h275.077c18.99 0 34.384 15.446 34.384 34.5 0 19.054-15.394 34.5-34.384 34.5H133.769v241.5c0 9.15-3.622 17.925-10.07 24.395A34.326 34.326 0 0 1 99.384 410z m825.23 552H649.538c-18.99 0-34.384-15.446-34.384-34.5 0-19.054 15.394-34.5 34.384-34.5h240.693V651.5c0-19.054 15.394-34.5 34.384-34.5 18.99 0 34.385 15.446 34.385 34.5v276c0 19.054-15.395 34.5-34.385 34.5z"
-      class="fullScreen-border"
-    ></path>
-  </svg>
-</template>
-
-<script setup lang="ts">
-import { PropType, toRefs, ref, onMounted, onUnmounted } from 'vue'
-import { CreateComponentType } from '@/packages/index.d'
-import { option } from './config'
-
-const props = defineProps({
-  chartConfig: {
-    type: Object as PropType<CreateComponentType & typeof option>,
-    required: true
-  }
-})
-
-let { border, bgColor, borderColor } = toRefs(props.chartConfig.option)
-const isFullscreen = ref(false)
-const checkFullscreen = () => {
-  isFullscreen.value = !!(
-    document.fullscreenElement ||
-    (document as any).webkitFullscreenElement ||
-    (document as any).mozFullScreenElement ||
-    (document as any).msFullscreenElement
-  )
-}
-checkFullscreen()
-
-const requestFullscreen = (element: Element) => {
-  if (element.requestFullscreen) {
-    element.requestFullscreen()
-  } else if ((document as any).mozRequestFullScreen) {
-    /* Firefox */
-    (document as any).mozRequestFullScreen()
-  } else if ((document as any).webkitRequestFullscreen) {
-    /* Chrome, Safari and Opera */
-    (document as any).webkitRequestFullscreen()
-  } else if ((document as any).msRequestFullscreen) {
-    /* IE/Edge */
-    (document as any).msRequestFullscreen()
-  }
-}
-
-const exitFullscreen = () => {
-  if (document.fullscreenElement && document.exitFullscreen) {
-    document.exitFullscreen()
-  } else if ((document as any).mozFullScreenElement && (document as any).mozCancelFullScreen) {
-    /* Firefox */
-    (document as any).mozCancelFullScreen()
-  } else if ((document as any).webkitFullscreenElement && (document as any).webkitExitFullscreen) {
-    /* Chrome, Safari and Opera */
-    (document as any).webkitExitFullscreen()
-  } else if ((document as any).msFullscreenElement && (document as any).msExitFullscreen) {
-    /* IE/Edge */
-    (document as any).msExitFullscreen()
-  }
-}
-
-const toggleFullscreen = () => {
-  if (!isFullscreen.value) {
-    requestFullscreen(document.documentElement)
-  } else {
-    exitFullscreen()
-  }
-  isFullscreen.value = !isFullscreen.value
-  // 由于全屏状态的改变不会立即生效，所以需要延迟一段时间再去获取全屏状态
-  setTimeout(() => {
-    checkFullscreen()
-  }, 1000)
-}
-
-// 监听全屏状态的改变，保证多个全屏组件的状态一致
-onMounted(() => {
-  document.addEventListener('fullscreenchange', checkFullscreen)
-  document.addEventListener('webkitfullscreenchange', checkFullscreen)
-  document.addEventListener('mozfullscreenchange', checkFullscreen)
-  document.addEventListener('MSFullscreenChange', checkFullscreen)
-})
-
-onUnmounted(() => {
-  document.removeEventListener('fullscreenchange', checkFullscreen)
-  document.removeEventListener('webkitfullscreenchange', checkFullscreen)
-  document.removeEventListener('mozfullscreenchange', checkFullscreen)
-  document.removeEventListener('MSFullscreenChange', checkFullscreen)
-})
-</script>
-
-<style lang="scss" scoped>
-svg {
-  display: block;
-  width: 100%;
-  height: 100%;
-  cursor: pointer;
-}
-.fullScreen-border {
-  stroke: v-bind('borderColor');
-  stroke-width: v-bind('border+"px"');
-  fill: v-bind('bgColor');
-}
-</style>

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

@@ -1,19 +0,0 @@
-import { PublicConfigClass } from '@/packages/public'
-import { CreateComponentType } from '@/packages/index.d'
-import { chartInitConfig } from '@/settings/designSetting'
-import { PipelineHConfig } from './index'
-import cloneDeep from 'lodash/cloneDeep'
-
-export const option = {
-  color_type: 1,
-  o_color: '#0a7ae2',
-  i_color: '#119bfa',
-  line_class: 'svg_ani_flow'
-}
-
-export default class Config extends PublicConfigClass implements CreateComponentType {
-  public key = PipelineHConfig.key
-  public attr = { ...chartInitConfig, w: 500, h: 15, zIndex: -1 }
-  public chartConfig = cloneDeep(PipelineHConfig)
-  public option = cloneDeep(option)
-}

src/packages/components/Decorates/Mores/PipelineH/config.vue

@@ -1,77 +0,0 @@
-<template>
-  <CollapseItem name="管道" :expanded="true">
-    <SettingItemBox name="默认颜色">
-      <SettingItem>
-        <n-select v-model:value="optionData.color_type" :options="colorOptions" @update:value="handleColorChange" />
-      </SettingItem>
-    </SettingItemBox>
-    <SettingItemBox name="管道颜色">
-      <SettingItem>
-        <n-color-picker size="small" :modes="['hex']" v-model:value="optionData.o_color"></n-color-picker>
-      </SettingItem>
-    </SettingItemBox>
-    <SettingItemBox name="水流颜色">
-      <SettingItem>
-        <n-color-picker size="small" :modes="['hex']" v-model:value="optionData.i_color"></n-color-picker>
-      </SettingItem>
-    </SettingItemBox>
-    <SettingItemBox name="流向">
-      <SettingItem>
-        <n-select v-model:value="optionData.line_class" :options="options" />
-      </SettingItem>
-    </SettingItemBox>
-  </CollapseItem>
-</template>
-
-<script setup lang="ts">
-import { PropType, ref } from 'vue'
-import { CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
-import { option } from './config'
-
-const props = defineProps({
-  optionData: {
-    type: Object as PropType<typeof option>,
-    required: true
-  }
-})
-
-const options = ref([
-  {
-    value: 'svg_ani_flow',
-    label: '正向'
-  },
-  {
-    value: 'svg_ani_flow_back',
-    label: '反向'
-  },
-  {
-    value: 'svg_ani_flow_stop',
-    label: '停止'
-  }
-])
-
-const colorOptions = ref([
-  {
-    value: 1,
-    label: '蓝'
-  },
-  {
-    value: 2,
-    label: '黄'
-  }
-])
-
-// 默认颜色
-const handleColorChange = (e: number) => {
-  switch (e) {
-    case 1:
-      props.optionData.o_color = '#0a7ae2'
-      props.optionData.i_color = '#119bfa'
-      break
-    case 2:
-      props.optionData.o_color = '#ff9d00'
-      props.optionData.i_color = '#f7ea37'
-      break
-  }
-}
-</script>

src/packages/components/Decorates/Mores/PipelineH/index.ts

@@ -1,13 +0,0 @@
-import { ConfigType, PackagesCategoryEnum } from '@/packages/index.d'
-import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'
-
-export const PipelineHConfig: ConfigType = {
-  key: 'PipelineH',
-  chartKey: 'VPipelineH',
-  conKey: 'VCPipelineH',
-  title: '管道-横向',
-  category: ChatCategoryEnum.MORE,
-  categoryName: ChatCategoryEnumName.MORE,
-  package: PackagesCategoryEnum.DECORATES,
-  image: 'Pipeline_H.png'
-}

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

@@ -1,141 +0,0 @@
-<template>
-  <div class="go-decorates-line">
-    <svg :width="w" :height="h">
-      <line :x1="0" :y1="h / 2" :x2="w" :y2="h / 2" :stroke="o_color" :stroke-width="h"></line>
-      <line :x1="0" :y1="h / 2" :x2="w" :y2="h / 2" :stroke="i_color" :stroke-width="h / 2" :class="line_class"></line>
-    </svg>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { PropType, toRefs } from 'vue'
-import { CreateComponentType } from '@/packages/index.d'
-
-const props = defineProps({
-  chartConfig: {
-    type: Object as PropType<CreateComponentType>,
-    required: true
-  }
-})
-
-const { w, h } = toRefs(props.chartConfig.attr)
-const { o_color, i_color, line_class } = toRefs(props.chartConfig.option)
-</script>
-
-<style lang="scss" scoped>
-.go-decorates-line {
-  font-size: 0;
-}
-
-/* 正向流动效果 */
-.svg_ani_flow {
-  stroke-dasharray: 1000;
-  stroke-dashoffset: 1000;
-  animation: ani_flow 10s linear infinite;
-  animation-fill-mode: forwards;
-  -webkit-animation: ani_flow 10s linear infinite;
-  -webkit-animation-fill-mode: forwards;
-}
-
-@keyframes ani_flow {
-  from {
-    stroke-dasharray: 10, 5;
-  }
-
-  to {
-    stroke-dasharray: 13, 5;
-  }
-}
-@-webkit-keyframes ani_flow {
-  from {
-    stroke-dasharray: 10, 5;
-  }
-
-  to {
-    stroke-dasharray: 13, 5;
-  }
-}
-
-/* 停止流动效果 */
-.svg_ani_flow_stop {
-  stroke-dasharray: 1000;
-  stroke-dashoffset: 1000;
-  animation: ani_flow_stop 10s linear infinite;
-  animation-fill-mode: forwards;
-  -webkit-animation: ani_flow_stop 10s linear infinite;
-  -webkit-animation-fill-mode: forwards;
-}
-
-@keyframes ani_flow_stop {
-  from {
-    stroke-dasharray: 10, 5;
-  }
-
-  to {
-    stroke-dasharray: 10, 5;
-  }
-}
-@-webkit-keyframes ani_flow_stop {
-  from {
-    stroke-dasharray: 10, 5;
-  }
-
-  to {
-    stroke-dasharray: 10, 5;
-  }
-}
-/* 反向流动效果 */
-.svg_ani_flow_back {
-  stroke-dasharray: 1000;
-  stroke-dashoffset: 1000;
-  animation: ani_flow_back 10s linear infinite;
-  animation-fill-mode: forwards;
-  -webkit-animation: ani_flow_back 10s linear infinite;
-  -webkit-animation-fill-mode: forwards;
-}
-
-@keyframes ani_flow_back {
-  from {
-    stroke-dasharray: 13, 5;
-  }
-
-  to {
-    stroke-dasharray: 10, 5;
-  }
-}
-@-webkit-keyframes ani_flow_stop {
-  from {
-    stroke-dasharray: 10, 5;
-  }
-
-  to {
-    stroke-dasharray: 10, 5;
-  }
-}
-/* 以最大40高度填充 */
-.svg_ani_fill_h40 {
-  animation: ani_fill_h40 5s linear infinite;
-  animation-fill-mode: forwards;
-  -webkit-animation: ani_fill_h40 5s linear infinite;
-  -webkit-animation-fill-mode: forwards;
-}
-
-@keyframes ani_fill_h40 {
-  from {
-    height: 0px;
-  }
-
-  to {
-    height: 40px;
-  }
-}
-@-webkit-keyframes ani_flow_stop {
-  from {
-    stroke-dasharray: 10, 5;
-  }
-
-  to {
-    stroke-dasharray: 10, 5;
-  }
-}
-</style>

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

@@ -1,19 +0,0 @@
-import { PublicConfigClass } from '@/packages/public'
-import { CreateComponentType } from '@/packages/index.d'
-import { chartInitConfig } from '@/settings/designSetting'
-import { PipelineVConfig } from './index'
-import cloneDeep from 'lodash/cloneDeep'
-
-export const option = {
-  color_type: 1,
-  o_color: '#0a7ae2',
-  i_color: '#119bfa',
-  line_class: 'svg_ani_flow'
-}
-
-export default class Config extends PublicConfigClass implements CreateComponentType {
-  public key = PipelineVConfig.key
-  public attr = { ...chartInitConfig, w: 15, h: 500, zIndex: -1 }
-  public chartConfig = cloneDeep(PipelineVConfig)
-  public option = cloneDeep(option)
-}

src/packages/components/Decorates/Mores/PipelineV/config.vue

@@ -1,77 +0,0 @@
-<template>
-  <CollapseItem name="管道" :expanded="true">
-    <SettingItemBox name="默认颜色">
-      <SettingItem>
-        <n-select v-model:value="optionData.color_type" :options="colorOptions" @update:value="handleColorChange" />
-      </SettingItem>
-    </SettingItemBox>
-    <SettingItemBox name="管道颜色">
-      <SettingItem>
-        <n-color-picker size="small" :modes="['hex']" v-model:value="optionData.o_color"></n-color-picker>
-      </SettingItem>
-    </SettingItemBox>
-    <SettingItemBox name="水流颜色">
-      <SettingItem>
-        <n-color-picker size="small" :modes="['hex']" v-model:value="optionData.i_color"></n-color-picker>
-      </SettingItem>
-    </SettingItemBox>
-    <SettingItemBox name="流向">
-      <SettingItem>
-        <n-select v-model:value="optionData.line_class" :options="options" />
-      </SettingItem>
-    </SettingItemBox>
-  </CollapseItem>
-</template>
-
-<script setup lang="ts">
-import { PropType, ref } from 'vue'
-import { CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
-import { option } from './config'
-
-const props = defineProps({
-  optionData: {
-    type: Object as PropType<typeof option>,
-    required: true
-  }
-})
-
-const options = ref([
-  {
-    value: 'svg_ani_flow',
-    label: '正向'
-  },
-  {
-    value: 'svg_ani_flow_back',
-    label: '反向'
-  },
-  {
-    value: 'svg_ani_flow_stop',
-    label: '停止'
-  }
-])
-
-const colorOptions = ref([
-  {
-    value: 1,
-    label: '蓝'
-  },
-  {
-    value: 2,
-    label: '黄'
-  }
-])
-
-// 默认颜色
-const handleColorChange = (e: number) => {
-  switch (e) {
-    case 1:
-      props.optionData.o_color = '#0a7ae2'
-      props.optionData.i_color = '#119bfa'
-      break
-    case 2:
-      props.optionData.o_color = '#ff9d00'
-      props.optionData.i_color = '#f7ea37'
-      break
-  }
-}
-</script>

src/packages/components/Decorates/Mores/PipelineV/index.ts

@@ -1,14 +0,0 @@
-import { ConfigType, PackagesCategoryEnum } from '@/packages/index.d'
-import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'
-
-export const PipelineVConfig: ConfigType = {
-  key: 'PipelineV',
-  chartKey: 'VPipelineV',
-  conKey: 'VCPipelineV',
-  title: '管道-纵向',
-  category: ChatCategoryEnum.MORE,
-  categoryName: ChatCategoryEnumName.MORE,
-  package: PackagesCategoryEnum.DECORATES,
-  image: 'Pipeline_V.png'
-}
-

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

@@ -1,115 +0,0 @@
-<template>
-  <div class="go-decorates-line">
-    <svg :width="w" :height="h">
-      <line :x1="w / 2" :y1="0" :x2="w / 2" :y2="h" :stroke="o_color" :stroke-width="w"></line>
-      <line :x1="w / 2" :y1="0" :x2="w / 2" :y2="h" :stroke="i_color" :stroke-width="w / 2" :class="line_class"></line>
-    </svg>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { PropType, toRefs } from 'vue'
-import { CreateComponentType } from '@/packages/index.d'
-
-const props = defineProps({
-  chartConfig: {
-    type: Object as PropType<CreateComponentType>,
-    required: true
-  }
-})
-
-const { w, h } = toRefs(props.chartConfig.attr)
-const { o_color, i_color, line_class } = toRefs(props.chartConfig.option)
-</script>
-
-<style lang="scss" scoped>
-.go-decorates-line {
-  font-size: 0;
-}
-
-/* 正向流动效果 */
-.svg_ani_flow {
-  stroke-dasharray: 1000;
-  stroke-dashoffset: 1000;
-  animation: ani_flow 10s linear infinite;
-  animation-fill-mode: forwards;
-  -webkit-animation: ani_flow 10s linear infinite;
-  -webkit-animation-fill-mode: forwards;
-}
-
-@keyframes ani_flow {
-  from {
-    stroke-dasharray: 10, 5;
-  }
-
-  to {
-    stroke-dasharray: 13, 5;
-  }
-}
-@-webkit-keyframes ani_flow {
-  from {
-    stroke-dasharray: 10, 5;
-  }
-
-  to {
-    stroke-dasharray: 13, 5;
-  }
-}
-
-/* 停止流动效果 */
-.svg_ani_flow_stop {
-  stroke-dasharray: 1000;
-  stroke-dashoffset: 1000;
-  animation: ani_flow_stop 10s linear infinite;
-  animation-fill-mode: forwards;
-  -webkit-animation: ani_flow_stop 10s linear infinite;
-  -webkit-animation-fill-mode: forwards;
-}
-
-@keyframes ani_flow_stop {
-  from {
-    stroke-dasharray: 10, 5;
-  }
-
-  to {
-    stroke-dasharray: 10, 5;
-  }
-}
-@-webkit-keyframes ani_flow_stop {
-  from {
-    stroke-dasharray: 10, 5;
-  }
-
-  to {
-    stroke-dasharray: 10, 5;
-  }
-}
-/* 反向流动效果 */
-.svg_ani_flow_back {
-  stroke-dasharray: 1000;
-  stroke-dashoffset: 1000;
-  animation: ani_flow_back 10s linear infinite;
-  animation-fill-mode: forwards;
-  -webkit-animation: ani_flow_back 10s linear infinite;
-  -webkit-animation-fill-mode: forwards;
-}
-
-@keyframes ani_flow_back {
-  from {
-    stroke-dasharray: 13, 5;
-  }
-
-  to {
-    stroke-dasharray: 10, 5;
-  }
-}
-@-webkit-keyframes ani_flow_back {
-  from {
-    stroke-dasharray: 13, 5;
-  }
-
-  to {
-    stroke-dasharray: 10, 5;
-  }
-}
-</style>

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

@@ -1,19 +1,7 @@
 import { NumberConfig } from './Number/index'
 import { TimeCommonConfig } from './TimeCommon/index'
 import { ClockConfig } from './Clock/index'
-import { FullScreenConfig } from './FullScreen/index'
 import { CountDownConfig } from './CountDown/index'
 import { FlipperNumberConfig } from './FlipperNumber'
-import { PipelineHConfig } from './PipelineH/index'
-import { PipelineVConfig } from './PipelineV/index'
 
-export default [
-  NumberConfig,
-  FlipperNumberConfig,
-  TimeCommonConfig,
-  CountDownConfig,
-  ClockConfig,
-  FullScreenConfig,
-  PipelineHConfig,
-  PipelineVConfig
-]
+export default [NumberConfig, FlipperNumberConfig, TimeCommonConfig, CountDownConfig, ClockConfig]

src/packages/components/Decorates/Three/ThreeEarth01/code/Utils/arc.ts

@@ -1,3 +1,4 @@
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-nocheck
 import {
   ArcCurve,

src/packages/components/Decorates/Three/ThreeEarth01/code/world/Basic.ts

@@ -1,63 +1,62 @@
-/**
- * 创建 threejs 四大天王
- * 场景、相机、渲染器、控制器
- */
-
-import * as THREE from 'three'
-import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls'
-
-export class Basic {
-  public scene!: THREE.Scene
-  public camera!: THREE.PerspectiveCamera
-  public renderer!: THREE.WebGLRenderer
-  public controls!: OrbitControls
-  public dom: HTMLElement
-
-  constructor(dom: HTMLElement) {
-    this.dom = dom
-    this.initScenes()
-    this.setControls()
-  }
-
-  /**
-   * 初始化场景
-   */
-  initScenes() {
-    this.scene = new THREE.Scene()
-
-    this.camera = new THREE.PerspectiveCamera(45, window.innerWidth / window.innerHeight, 1, 100000)
-    this.camera.position.set(0, 30, -250)
-
-    this.renderer = new THREE.WebGLRenderer({
-      // canvas: this.dom,
-      alpha: true, // 透明
-      antialias: true, // 抗锯齿
-      preserveDrawingBuffer: true
-    })
-    this.renderer.setPixelRatio(window.devicePixelRatio) // 设置屏幕像素比
-    this.renderer.setSize(window.innerWidth, window.innerHeight) // 设置渲染器宽高
-    this.dom.appendChild(this.renderer.domElement) // 添加到dom中
-  }
-
-  /**
-   * 设置控制器
-   */
-  setControls() {
-    // 鼠标控制      相机，渲染dom
-    this.controls = new OrbitControls(this.camera, this.renderer.domElement)
-
-    this.controls.autoRotateSpeed = 3
-    // 使动画循环使用时阻尼或自转 意思是否有惯性
-    this.controls.enableDamping = true
-    // 动态阻尼系数 就是鼠标拖拽旋转灵敏度
-    this.controls.dampingFactor = 0.05
-    // 是否可以缩放
-    this.controls.enableZoom = true
-    // 设置相机距离原点的最远距离
-    this.controls.minDistance = 100
-    // 设置相机距离原点的最远距离
-    this.controls.maxDistance = 300
-    // 是否开启右键拖拽
-    this.controls.enablePan = false
-  }
-}
+/**
+ * 创建 threejs 四大天王
+ * 场景、相机、渲染器、控制器
+ */
+
+import * as THREE from 'three'
+import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls'
+
+export class Basic {
+  public scene!: THREE.Scene
+  public camera!: THREE.PerspectiveCamera
+  public renderer!: THREE.WebGLRenderer
+  public controls!: OrbitControls
+  public dom: HTMLElement
+
+  constructor(dom: HTMLElement) {
+    this.dom = dom
+    this.initScenes()
+    this.setControls()
+  }
+
+  /**
+   * 初始化场景
+   */
+  initScenes() {
+    this.scene = new THREE.Scene()
+
+    this.camera = new THREE.PerspectiveCamera(45, window.innerWidth / window.innerHeight, 1, 100000)
+    this.camera.position.set(0, 30, -250)
+
+    this.renderer = new THREE.WebGLRenderer({
+      // canvas: this.dom,
+      alpha: true, // 透明
+      antialias: true // 抗锯齿
+    })
+    this.renderer.setPixelRatio(window.devicePixelRatio) // 设置屏幕像素比
+    this.renderer.setSize(window.innerWidth, window.innerHeight) // 设置渲染器宽高
+    this.dom.appendChild(this.renderer.domElement) // 添加到dom中
+  }
+
+  /**
+   * 设置控制器
+   */
+  setControls() {
+    // 鼠标控制      相机，渲染dom
+    this.controls = new OrbitControls(this.camera, this.renderer.domElement)
+
+    this.controls.autoRotateSpeed = 3
+    // 使动画循环使用时阻尼或自转 意思是否有惯性
+    this.controls.enableDamping = true
+    // 动态阻尼系数 就是鼠标拖拽旋转灵敏度
+    this.controls.dampingFactor = 0.05
+    // 是否可以缩放
+    this.controls.enableZoom = true
+    // 设置相机距离原点的最远距离
+    this.controls.minDistance = 100
+    // 设置相机距离原点的最远距离
+    this.controls.maxDistance = 300
+    // 是否开启右键拖拽
+    this.controls.enablePan = false
+  }
+}

src/packages/components/Icons/Common/index.ts

@@ -1,84 +0,0 @@
-import { IconConfig } from '../Default/Icon/index'
-import { PackagesCategoryEnum } from '@/packages/index.d'
-import { ChatCategoryEnum, ChatCategoryEnumName } from '../index.d'
-
-const iconNames = [
-  'uim:adobe',
-  'uim:airplay',
-  'uim:align',
-  'uim:angle-double-down',
-  'uim:angle-double-left',
-  'uim:angle-double-right',
-  'uim:angle-double-up',
-  'uim:angle-down',
-  'uim:angle-left',
-  'uim:angle-right',
-  'uim:angle-up',
-  'uim:android-alt',
-  'uim:apple',
-  'uim:apps',
-  'uim:bag',
-  'uim:battery-bolt',
-  'uim:bing',
-  'uim:box',
-  'uim:briefcase',
-  'uim:calender',
-  'uim:chart',
-  'uim:chart-pie',
-  'uim:circle-layer',
-  'uim:clinic-medical',
-  'uim:clock',
-  'uim:comment-alt',
-  'uim:comment-alt-dots',
-  'uim:docker',
-  'uim:download-alt',
-  'uim:dribbble',
-  'uim:dropbox',
-  'uim:entry',
-  'uim:exclamation-circle',
-  'uim:exclamation-triangle',
-  'uim:exit',
-  'uim:facebook',
-  'uim:facebook-messenger',
-  'uim:facebook-messenger-alt',
-  'uim:google-drive',
-  'uim:google-play',
-  'uim:graph-bar',
-  'uim:head-side-mask',
-  'uim:horizontal-align-left',
-  'uim:hospital',
-  'uim:house-user',
-  'uim:image-v',
-  'uim:key-skeleton',
-  'uim:layer-group',
-  'uim:layers-alt',
-  'uim:link-h',
-  'uim:microscope',
-  'uim:microsoft',
-  'uim:object-group',
-  'uim:object-ungroup',
-  'uim:paypal',
-  'uim:refresh',
-  'uim:repeat',
-  'uim:right-indent-alt',
-  'uim:rocket',
-  'uim:shield-plus',
-  'uim:social-distancing',
-  'uim:telegram-alt',
-  'uim:user-md',
-  'uim:toilet-paper',
-  'uim:youtube'
-]
-const iconList = iconNames.map(name => ({
-  ...IconConfig,
-  category: ChatCategoryEnum.COMMON,
-  categoryName: ChatCategoryEnumName.COMMON,
-  package: PackagesCategoryEnum.ICONS,
-  image: name,
-  icon: name,
-  dataset: name,
-  title: name.replace('uim:', ''),
-  redirectComponent: `${IconConfig.package}/${IconConfig.category}/${IconConfig.key}` // 跳转组件路径规则：packageName/categoryName/componentKey
-}))
-
-export default iconList

src/packages/components/Icons/Default/Icon/config.ts

@@ -1,20 +0,0 @@
-import { PublicConfigClass } from '@/packages/public'
-import { CreateComponentType } from '@/packages/index.d'
-import { chartInitConfig } from '@/settings/designSetting'
-import { IconConfig } from './index'
-import cloneDeep from 'lodash/cloneDeep'
-
-export const option = {
-  // 图标名称
-  dataset: 'uim:apple',
-  color: '#03A9F4',
-  size: 64,
-  rotate: 0 // 旋转角度
-}
-
-export default class Config extends PublicConfigClass implements CreateComponentType {
-  public key = IconConfig.key
-  public attr = { ...chartInitConfig, w: 64, h: 64, zIndex: 1 }
-  public chartConfig = cloneDeep(IconConfig)
-  public option = cloneDeep(option)
-}

src/packages/components/Icons/Default/Icon/config.vue

@@ -1,50 +0,0 @@
-<template>
-  <collapse-item name="属性" :expanded="true">
-    <setting-item-box name="样式">
-      <setting-item name="颜色">
-        <n-color-picker size="small" :modes="['hex']" v-model:value="optionData.color"></n-color-picker>
-      </setting-item>
-      <setting-item name="尺寸">
-        <n-input-number v-model:value="optionData.size" size="small" :min="0" placeholder="尺寸"></n-input-number>
-      </setting-item>
-    </setting-item-box>
-    <setting-item-box name="旋转">
-      <setting-item name="旋转">
-        <n-select v-model:value="optionData.rotate" size="small" :options="rotateMode"></n-select>
-      </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
-  }
-})
-
-// 旋转方式
-const rotateMode = [
-  {
-    value: 0,
-    label: '0°'
-  },
-  {
-    value: 1,
-    label: '90°'
-  },
-  {
-    value: 2,
-    label: '180°'
-  },
-  {
-    value: 3,
-    label: '270°'
-  }
-]
-</script>