build: 升级版本到 1.2.5

Merge pull request !152 from szy/fix/barcommon

.gitignore

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

README.md

@@ -1,30 +1,62 @@
-## 总览
+#### 总览
+<p align="center">
+    <img src="readme/logo-t-y.png" alt="go-view" />
+</p>
 
-![logo](readme/logo-t-y.png)
+<h4 align="center">开源、精美、便捷的「数据可视化」低代码开发平台</h4>
 
-GoView 是一个高效的拖拽式低代码数据可视化开发平台，将图表或页面元素封装为基础组件，无需编写代码即可制作数据大屏，减少心智负担。
+#### 长期赞助商
+<div>
+  <div align="center" style="column-gap: 20px;">
+    <a
+      href="http://www.ccflow.org/?from=goviewGitee"
+      target="_blank"
+      style="
+        padding: 10px 20px;
+        display: inline-block;
+        border-radius: 10px;
+        background: #f9f9f9;
+      ">
+      <img src="readme/sponsors/ccflow-banner.png" alt="go-view" style="width: 250px;" width="250px" />
+    </a>
+    <span> &nbsp;</span>
+    <a
+      href="https://www.qeasy.cloud/"
+      target="_blank"
+      style="
+        padding: 10px 20px;
+        display: inline-block;
+        border-radius: 10px;
+        background: #f9f9f9;
+      ">
+      <img src="readme/sponsors/qyy-banner.png" alt="go-view" style="width: 250px;" width="250px"/>
+    </a>
+  </div>
+</div>
 
-### 😶 纯 **前端** 分支： **`master`**
+#### 😶 **纯前端** 分支： **`master`**
 
-### 👻 携带 **后端** 请求分支: **`master-fetch`**
+#### 👻 携带 **后端** 请求分支: **`master-fetch`**
 
-### 📚 GoView **文档** 地址：[http://www.mtruning.club:81/](http://www.mtruning.club:81/)
+#### 📚 GoView **文档** 地址：[https://www.mtruning.club/](https://www.mtruning.club/)
 
-项目纯前端-Demo 地址：[https://www.mtruning.club](https://www.mtruning.club)
+项目纯前端-Demo 地址：[https://vue.mtruning.club/](https://vue.mtruning.club/)
 
-项目带后端-Demo 地址：[后端 Demo 地址](http://1.117.240.165:8080/goview/#/login)
+项目带后端-Demo 地址：[https://demo.mtruning.club/](https://demo.mtruning.club/)
 
-文档-在线地址：[http://www.mtruning.club:81/](http://www.mtruning.club:81/)
+Cloud IDE 代码在线预览地址：[https://idegitee.com/dromara/go-view](https://idegitee.com/dromara/go-view)
 
-文档-源码地址：[https://gitee.com/MTrun/go-view-doc](https://gitee.com/MTrun/go-view-doc)
+#### 🤯 后端项目看这里!
 
-### 🤯 后端项目
+后端地址（社区实现，仅供参考）：
 
-后端项目 gitee 地址：[https://gitee.com/MTrun/go-view-serve](https://gitee.com/MTrun/go-view-serve)
+- `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) (不是最新, 以前端代码为准)
 
-接口说明地址：[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)
-
-技术点：
+#### 整体介绍
 
 - 框架：基于 `Vue3` 框架编写，使用 `hooks` 写法抽离部分逻辑，使代码结构更加清晰；
 
@@ -36,31 +68,41 @@ GoView 是一个高效的拖拽式低代码数据可视化开发平台，将图
 
 - 封装：项目进行了详细的工具类封装如：路由、存储、加/解密、文件处理、主题、NaiveUI 全局方法、组件等
 
-- 可视化：基于开源图表库[ECharts](https://echarts.apache.org/zh/index.html) 和 [VChart](https://www.visactor.io/vchart) 编写，具有丰富的图表类型和适配大屏的主题效果；
-
 - 入选 NaiveUI 社区精选资源推荐：[查看 NaiveUI 推荐列表](https://www.naiveui.com/zh-CN/light/docs/community)
 
 说明文档：
 ![说明文档](readme/go-view-doc.png)
 
 工作台：
-![项目截图](readme/go-view-canvas.png)
+![工作台](readme/go-view-canvas.png)
 
 请求配置：
-![项目截图](readme/go-view-fetch.png)
+![请求配置](readme/go-view-fetch.png)
 
 数据过滤：
-![项目截图](readme/go-view-filter.png)
+![数据过滤](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-color.png)
+
+亮白主题：
+![亮白主题](readme/go-view-theme.png)
 
 主要技术栈为：
 
 | 名称                | 版本  | 名称        | 版本   |
 | ------------------- | ----- | ----------- | ------ |
 | Vue                 | 3.2.x | TypeScript4 | 4.6.x  |
-| Vite                | 4.2.x | NaiveUI     | 2.34.x |
+| Vite                | 2.9.x | NaiveUI     | 2.27.x |
 | ECharts             | 5.3.x | Pinia       | 2.0.x  |
 | 详见 `package.json` | 😁    | 🥰          | 🤗     |
 
@@ -68,19 +110,22 @@ GoView 是一个高效的拖拽式低代码数据可视化开发平台，将图
 
 | 名称 | 版本    | 名称    | 版本  |
 | ---- | ------- | ------- | ----- |
-| node | 16.16.x | npm     | 8.5.x |
+| node | 16.14.x | npm     | 8.5.x |
 | pnpm | 7.1.x   | windows | 11    |
 
 已完成图表：
 
-| 分类   | 名称             | 名称             | 名称     |
-| ------ | ---------------- | ---------------- | -------- |
-| 图表   | 柱状图           | 横向柱状图       | 折线图   |
-| \*     | 单/多 折线面积图 | 饼图             | 水球图   |
-| \*     | 环形图           | NaiveUI 多种进度 | 🤠       |
-| 信息   | 文字             | 图片             | 😶       |
-| 列表   | 滚动排名列表     | 滚动表格         | 🤓       |
-| 小组件 | 边框-01~13       | 装饰-01~05       | 数字翻牌 |
+| 分类   | 名称             | 名称       | 名称           | 名称                     |
+| ------ | ---------------- | ---------- | -------------- | ------------------------ |
+| 图表   | 柱状图           | 横向柱状图 | 折线图         | 单/多 折线面积图(渐变色) |
+| \*     | 饼图             | 环形图     | 水球图         | 雷达图                   |
+| \*     | NaiveUI 多种进度 | 散点图     | 对数回归散点图 | 热力图                   |
+| \*     | 漏斗图           | 中国地图   | 高德地图       | 🦊                       |
+| 信息   | 文字             | 渐变文字   | 词云           | 嵌套网页                 |
+| \*     | 图片             | 视频       | 😺             | 🐯                       |
+| 列表   | 滚动排名列表     | 滚动表格   | 🐮             | 🐐                       |
+| 小组件 | 边框-01~13       | 装饰-01~05 | 数字翻牌       | 通用时间                 |
+| \*     | 数字计数         | 倒计时     | 时钟           | 🦁                       |
 
 ## 浏览器支持
 
@@ -88,52 +133,7 @@ GoView 是一个高效的拖拽式低代码数据可视化开发平台，将图
 
 ## 安装
 
-本项目采用` pnpm` 进行包管理
-
-```shell
-#建议使用 nrm 切换到淘宝源 https://registry.npmmirror.com/
-#pnpm
-pnpm install
-
-#yarn
-yarn install
-
-#npm
-npm install
-```
-
-## 启动
-
-```shell
-#pnpm
-pnpm dev
-
-# npm
-npm run dev
-
-#yarn
-yarn dev
-
-#Makefile
-make dev
-```
-
-## 编译
-
-```shell
-#pnpm
-pnpm run build
-
-# npm
-npm run build
-
-#yarn
-yarn run build
-
-#Makefile
-make dist
-
-```
+请查看文档：[https://www.mtruning.club/](https://www.mtruning.club/)
 
 ## 代码提交
 
@@ -149,10 +149,9 @@ make dist
 - 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)

index.html

@@ -7,8 +7,10 @@
     <meta name="description" content="GoView 是高效、高性能的拖拽式低代码数据可视化开发平台，将页面元素封装为基础组件，无需编写代码即可完成业务需求。">
     <meta name="keywords" content="GoView，goview，低代码，可视化">
     <meta name="author" content="奔跑的面条，面条">
-    <meta name="viewport" content="width=device-width,initial-scale=1.0,minimum-scale=1,maximum-scale=1,user-scalable=0">
-    <meta name="viewport" content="width=device-width,initial-scale=1.0,user-scalable=yes" media="(min-width: 769px)">
+    <meta
+      name="viewport"
+      content="width=device-width,initial-scale=1.0,minimum-scale=1.0,maximum-scale=1.0,user-scalable=0"
+    />
     <link rel="icon" href="./favicon.ico" />
     <title>GoView</title>
     <link rel="stylesheet" href="./index.css" />

package.json

@@ -1,12 +1,12 @@
 {
   "name": "go-view",
-  "version": "1.1.11",
+  "version": "1.2.5",
   "engines": {
-    "node": ">=16.14"
+    "node": ">=12.0"
   },
   "scripts": {
     "dev": "vite --host",
-    "build": "vite build",
+    "build": "vue-tsc --noEmit && vite build",
     "preview": "vite preview",
     "new": "plop --plopfile ./plop/plopfile.js",
     "postinstall": "husky install",
@@ -16,15 +16,12 @@
   "dependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",
     "@amap/amap-jsapi-types": "^0.0.8",
-    "@iconify/json": "^2.2.158",
     "@types/color": "^3.0.3",
     "@types/crypto-js": "^4.1.1",
     "@types/keymaster": "^1.6.30",
     "@types/lodash": "^4.14.184",
-    "@visactor/vchart": "^2.0.0",
-    "@visactor/vchart-theme": "^1.12.2",
     "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",
@@ -35,17 +32,15 @@
     "gsap": "^3.11.3",
     "highlight.js": "^11.5.0",
     "html2canvas": "^1.4.1",
-    "iconify-icon": "^1.0.8",
     "keymaster": "^1.6.2",
-    "mitt": "^3.0.0",
     "monaco-editor": "^0.33.0",
-    "naive-ui": "2.40.3",
+    "naive-ui": "2.34.3",
     "pinia": "^2.0.13",
     "screenfull": "^6.0.1",
     "three": "^0.145.0",
-    "vue": "^3.5.13",
+    "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",
@@ -60,8 +55,8 @@
     "@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",
@@ -77,10 +72,10 @@
     "mockjs": "^1.1.0",
     "plop": "^3.0.5",
     "prettier": "^2.6.2",
-    "sass": "1.49.11",
+    "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

@@ -30,5 +30,5 @@ const hljsTheme = useCode()
 
 // 全局语言
 const { locale, dateLocale } = useLang()
-//测试提交
+
 </script>

src/api/axios.ts

@@ -1,4 +1,4 @@
-import axios, { AxiosResponse, InternalAxiosRequestConfig, AxiosError } from 'axios'
+import axios, { AxiosResponse, AxiosRequestConfig } from 'axios'
 import { ResultEnum } from "@/enums/httpEnum"
 import { ErrorPageNameMap } from "@/enums/pageEnum"
 import { redirectErrorPage } from '@/utils'
@@ -9,10 +9,10 @@ const axiosInstance = axios.create({
 })
 
 axiosInstance.interceptors.request.use(
-  (config: InternalAxiosRequestConfig) => {
+  (config: AxiosRequestConfig) => {
     return config
   },
-  (error: AxiosError) => {
+  (error: AxiosRequestConfig) => {
     Promise.reject(error)
   }
 )

src/api/http.ts

@@ -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/mock/index.ts

@@ -1,5 +1,4 @@
 import test from './test.mock'
-import vchart from './vchart.mock'
 import { MockMethod } from 'vite-plugin-mock'
 import { RequestHttpEnum } from '@/enums/httpEnum'
 
@@ -23,8 +22,6 @@ export const threeEarth01Url = '/mock/threeEarth01Data'
 export const sankeyUrl = '/mock/sankey'
 export const graphUrl = '/mock/graphData'
 
-export const vchartBarDataUrl = '/mock/vchart/barDataUrl'
-
 const mockObject: MockMethod[] = [
   {
     // 正则
@@ -118,11 +115,6 @@ const mockObject: MockMethod[] = [
     method: RequestHttpEnum.GET,
     response: () => test.graphData
   },
-  {
-    url: vchartBarDataUrl,
-    method: RequestHttpEnum.GET,
-    response: () => vchart.bar
-  }
 ]
 
 export default mockObject

src/api/mock/vchart.mock.ts

@@ -1,10 +0,0 @@
-import bar from './vchart/bar.json'
-
-export default {
-  bar: {
-    code: 0,
-    status: 200,
-    msg: '请求成功',
-    data: bar
-  }
-}

src/api/mock/vchart/bar.json

@@ -1,16 +0,0 @@
-{
-  "values": [
-    { "type": "Nail polish", "year": "Africa", "value|100-900": 3 },
-    { "type": "Nail polish", "year": "EU", "value|100-900": 3 },
-    { "type": "Nail polish", "year": "China", "value|100-900": 3 },
-    { "type": "Nail polish", "year": "USA", "value|100-900": 3 },
-    { "type": "Eyebrow pencil", "year": "Africa", "value|100-900": 3 },
-    { "type": "Eyebrow pencil", "year": "EU", "value|100-900": 3 },
-    { "type": "Eyebrow pencil", "year": "China", "value|100-900": 3 },
-    { "type": "Eyebrow pencil", "year": "USA", "value|100-900": 3 },
-    { "type": "Rouge", "year": "Africa", "value|100-900": 3 },
-    { "type": "Rouge", "year": "EU", "value|100-900": 3 },
-    { "type": "Rouge", "year": "China", "value|100-900": 3 },
-    { "type": "Rouge", "year": "USA", "value|100-900": 3 }
-  ]
-}

src/components/GoIconify/index.ts

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

src/components/GoIconify/index.vue

@@ -1,34 +0,0 @@
-<template>
-  <iconify-icon
-    :icon="icon"
-    :rotate="`${rotate}deg`"
-    :width="width"
-    :style="{
-      color: color
-    }"
-  ></iconify-icon>
-</template>
-
-<script setup lang="ts">
-defineProps({
-  icon: {
-    type: String,
-    required: true
-  },
-  color: {
-    type: String,
-    default: '#999999',
-    required: false
-  },
-  width: {
-    type: [String, Number],
-    default: '20',
-    required: false
-  },
-  rotate: {
-    type: [String, Number],
-    default: '0',
-    required: false
-  }
-})
-</script>

src/components/GoVChart/index.ts

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

src/components/GoVChart/index.vue

@@ -1,250 +0,0 @@
-<template>
-  <div
-    ref="vChartRef"
-    v-on="{
-      ...Object.fromEntries(event.map((eventName: string) => [eventName, (eventData: MouseEvent) => eventHandlers(eventData, eventName)]))
-    }"
-  ></div>
-</template>
-
-<script setup lang="ts">
-import { ref, PropType, watch, onBeforeUnmount, nextTick, toRaw, toRefs } from 'vue'
-import { VChart, type IVChart, type IInitOption } from '@visactor/vchart'
-import { transformHandler } from './transformProps'
-import { IOption } from '@/packages/components/VChart/index.d'
-import { registerChartsAndComponents } from './register'
-
-// VChart按需加载: 注册图表及组件
-registerChartsAndComponents()
-
-// 事件说明 v1.13.0 https://www.visactor.io/vchart/api/API/event
-const event = [
-  'mousedown',
-  'mouseup',
-  'mouseupoutside',
-  'rightdown',
-  'rightup',
-  'rightupoutside',
-  'click',
-  'dblclick',
-  'mousemove',
-  'mouseover',
-  'mouseout',
-  'mouseenter',
-  'mouseleave',
-  'wheel',
-  'touchstart',
-  'touchend',
-  'touchendoutside',
-  'touchmove',
-  'touchcancel',
-  'tap',
-  'dragstart',
-  'dragend',
-  'drag',
-  'dragenter',
-  'dragleave',
-  'dragover',
-  'drop',
-  'pan',
-  'panstart',
-  'panend',
-  'press',
-  'pressup',
-  'pressend',
-  'pinch',
-  'pinchstart',
-  'pinchend',
-  'swipe',
-  'dimensionHover',
-  'dimensionClick',
-  'dataZoomChange',
-  'scrollBarChange',
-  'brushStart',
-  'brushChange',
-  'brushEnd',
-  'brushClear',
-  'drill',
-  'legendItemClick',
-  'legendItemHover',
-  'legendItemUnHover',
-  'legendFilter',
-  'initialized',
-  'rendered',
-  'renderFinished',
-  'animationFinished',
-  'layoutStart',
-  'layoutEnd',
-  'afterResizef'
-]
-const emit = defineEmits([
-  'mousedown',
-  'mouseup',
-  'mouseupoutside',
-  'rightdown',
-  'rightup',
-  'rightupoutside',
-  'click',
-  'dblclick',
-  'mousemove',
-  'mouseover',
-  'mouseout',
-  'mouseenter',
-  'mouseleave',
-  'wheel',
-  'touchstart',
-  'touchend',
-  'touchendoutside',
-  'touchmove',
-  'touchcancel',
-  'tap',
-  'dragstart',
-  'dragend',
-  'drag',
-  'dragenter',
-  'dragleave',
-  'dragover',
-  'drop',
-  'pan',
-  'panstart',
-  'panend',
-  'press',
-  'pressup',
-  'pressend',
-  'pinch',
-  'pinchstart',
-  'pinchend',
-  'swipe',
-  'dimensionHover',
-  'dimensionClick',
-  'dataZoomChange',
-  'scrollBarChange',
-  'brushStart',
-  'brushChange',
-  'brushEnd',
-  'brushClear',
-  'drill',
-  'legendItemClick',
-  'legendItemHover',
-  'legendItemUnHover',
-  'legendFilter',
-  'initialized',
-  'rendered',
-  'renderFinished',
-  'animationFinished',
-  'layoutStart',
-  'layoutEnd',
-  'afterResizef'
-])
-
-const props = defineProps({
-  option: {
-    type: Object as PropType<
-      IOption & {
-        dataset: any
-      }
-    >,
-    required: true
-  },
-  initOptions: {
-    type: Object as PropType<
-      IInitOption & {
-        deepWatch?: boolean | number
-      }
-    >,
-    required: false,
-    default: () => ({})
-  }
-})
-
-const vChartRef = ref()
-let chart: IVChart
-
-// 解构 props.option，排除 dataset
-const { dataset, ...restOfOption } = toRefs(props.option)
-
-// 排除 data 监听
-watch(
-  () => ({
-    ...restOfOption
-  }),
-  () => {
-    nextTick(() => {
-      createOrUpdateChart(props.option)
-    })
-  },
-  {
-    deep: props.initOptions?.deepWatch || true,
-    immediate: true
-  }
-)
-watch(
-  () => dataset.value,
-  () => {
-    nextTick(() => {
-      createOrUpdateChart(props.option)
-    })
-  },
-  {
-    deep: false
-  }
-)
-
-// 更新
-const createOrUpdateChart = (
-  chartProps: IOption & {
-    dataset: any
-  }
-) => {
-  if (vChartRef.value && !chart) {
-    const spec = transformHandler[chartProps.category || '']?.(chartProps)
-    chart = new VChart(
-      { ...spec, data: chartProps.dataset },
-      {
-        dom: vChartRef.value,
-        ...props.initOptions
-      }
-    )
-    chart.renderSync()
-    return true
-  } else if (chart) {
-    const spec = transformHandler[chartProps.category || '']?.(chartProps)
-    chart.updateSpec({ ...spec, data: toRaw(chartProps.dataset), dataset: undefined }, false, undefined, {
-      change: false,
-      reMake: true,
-      reAnimate: true
-    })
-    return true
-  }
-  return false
-}
-
-// 刷新
-const refresh = () => {
-  if (chart) {
-    chart.renderSync()
-  }
-}
-
-// 抛出事件
-const eventHandlers = (eventData: MouseEvent, eventName: string) => {
-  if (event.includes(eventName)) emit(eventName as any, eventData)
-}
-
-// 卸载
-onBeforeUnmount(() => {
-  if (chart) {
-    chart.release()
-  }
-})
-
-defineExpose({
-  // 重刷新
-  refresh,
-  release: () => {
-    if (chart) {
-      chart.release()
-    }
-  }
-})
-</script>

src/components/GoVChart/register.ts

@@ -1,29 +0,0 @@
-import { VChart } from '@visactor/vchart/esm/core';
-import { registerBarChart, registerAreaChart, registerLineChart, registerPieChart, registerFunnelChart, registerWordCloudChart, registerScatterChart } from '@visactor/vchart/esm/chart';
-import { registerTooltip, registerCartesianCrossHair, registerDiscreteLegend, registerLabel } from '@visactor/vchart/esm/component';
-import { registerDomTooltipHandler } from '@visactor/vchart/esm/plugin/components';
-import { registerAnimate } from '@visactor/vchart';
-
-export const registerChartsAndComponents = () => {
-  VChart.useRegisters([
-    // 图表
-    registerBarChart,
-    registerAreaChart,
-    registerLineChart,
-    registerPieChart,
-    registerScatterChart,
-    registerFunnelChart,
-    registerWordCloudChart,
-
-    // 组件
-    registerTooltip,
-    registerDomTooltipHandler,
-    registerCartesianCrossHair,
-    registerDiscreteLegend,
-    registerLabel,
-
-    // 动画
-    registerAnimate
-  ]);
-}
-

src/components/GoVChart/transformProps/areas.ts

@@ -1,32 +0,0 @@
-import { cloneDeep } from "lodash"
-
-export default (chartProps: any) => {
-  const spec = cloneDeep(chartProps)
-  delete spec.category
-
-  // tooltip
-  const keyFill = spec.tooltip.style.keyLabel.fill
-  const valueFill = spec.tooltip.style.valueLabel.fill
-  const titleFill = spec.tooltip.style.titleLabel.keyFill
-  delete spec.tooltip.style.keyLabel.fill
-  delete spec.tooltip.style.valueLabel.fill
-  delete spec.tooltip.style.titleLabel.keyFill
-  spec.tooltip.style.keyLabel.fontColor = keyFill
-  spec.tooltip.style.valueLabel.fontColor = valueFill
-  spec.tooltip.style.titleLabel.fontColor = titleFill
-
-  // axis
-  const { name: xAxisName, ...restXAxisProps } = chartProps.xAxis
-  const { name: yAxisName, ...restYAxisProps } = chartProps.yAxis
-  spec.axes = [{
-    orient: 'bottom',
-    ...restXAxisProps
-  }, {
-    orient: 'left',
-    ...restYAxisProps
-  }]
-  delete spec.xAxis
-  delete spec.yAxis
-  // console.log('spec-area-transform', spec)
-  return spec
-}

src/components/GoVChart/transformProps/bars.ts

@@ -1,45 +0,0 @@
-import { cloneDeep } from 'lodash'
-
-export default (chartProps: any) => {
-  const spec = cloneDeep(chartProps)
-  delete spec.category
-
-  // tooltip
-  const keyFill = spec.tooltip.style.keyLabel.fill
-  const valueFill = spec.tooltip.style.valueLabel.fill
-  const titleFill = spec.tooltip.style.titleLabel.keyFill
-  delete spec.tooltip.style.keyLabel.fill
-  delete spec.tooltip.style.valueLabel.fill
-  delete spec.tooltip.style.titleLabel.keyFill
-  spec.tooltip.style.keyLabel.fontColor = keyFill
-  spec.tooltip.style.valueLabel.fontColor = valueFill
-  spec.tooltip.style.titleLabel.fontColor = titleFill
-
-  // axis
-  const { name: xAxisName, ...restXAxisProps } = chartProps.xAxis
-  const { name: yAxisName, ...restYAxisProps } = chartProps.yAxis
-  spec.axes = [
-    {
-      orient: 'bottom',
-      ...restXAxisProps
-      // paddingInner: 0.5
-    },
-    {
-      orient: 'left',
-      ...restYAxisProps
-    }
-  ]
-
-  delete spec.xAxis
-  delete spec.yAxis
-
-  spec.label = {
-    ...spec.label,
-    style: {
-      ...spec.label?.style,
-      lineWidth: 0
-    }
-  }
-  // console.log('spec-bar-transform', spec)
-  return spec
-}

src/components/GoVChart/transformProps/funnels.ts

@@ -1,28 +0,0 @@
-import { Datum } from "@visactor/vchart/esm/typings"
-import { cloneDeep } from "lodash"
-const INNER_RADIUS = 0.75
-const OUTER_RADIUS = 0.68
-
-export default (chartProps: any) => {
-  const spec = cloneDeep(chartProps)
-
-
-  // tooltip
-  const keyFill = spec.tooltip.style.keyLabel.fill
-  const valueFill = spec.tooltip.style.valueLabel.fill
-  const titleFill = spec.tooltip.style.titleLabel.keyFill
-  delete spec.tooltip.style.keyLabel.fill
-  delete spec.tooltip.style.valueLabel.fill
-  delete spec.tooltip.style.titleLabel.keyFill
-  spec.tooltip.style.keyLabel.fontColor = keyFill
-  spec.tooltip.style.valueLabel.fontColor = valueFill
-  spec.tooltip.style.titleLabel.fontColor = titleFill
-
-  // label
-  spec.label = {
-    visible: true,
-  }
-
-  // console.log('spec-funnel-transform', spec)
-  return spec
-}

src/components/GoVChart/transformProps/index.ts

@@ -1,20 +0,0 @@
-import { ChatCategoryEnum, IOption } from "@/packages/components/VChart/index.d";
-import bars from './bars'
-import pies from './pies'
-import lines from './lines'
-import areas from './areas'
-import funnels from "./funnels";
-import wordClouds from "./wordClouds";
-import scatters from "./scatters";
-export const transformHandler: {
-  [key: string]: (args: IOption) => any
-} = {
-  [ChatCategoryEnum.BAR]: bars,
-  [ChatCategoryEnum.PIE]: pies,
-  [ChatCategoryEnum.LINE]: lines,
-  [ChatCategoryEnum.AREA]: areas,
-  [ChatCategoryEnum.FUNNEL]: funnels,
-  [ChatCategoryEnum.WORDCLOUD]: wordClouds,
-  [ChatCategoryEnum.SCATTER]: scatters,
-  // todo: more charts handler
-}

src/components/GoVChart/transformProps/lines.ts

@@ -1,43 +0,0 @@
-import { cloneDeep } from 'lodash'
-
-export default (chartProps: any) => {
-  const spec = cloneDeep(chartProps)
-  delete spec.category
-
-  // tooltip
-  const keyFill = spec.tooltip.style.keyLabel.fill
-  const valueFill = spec.tooltip.style.valueLabel.fill
-  const titleFill = spec.tooltip.style.titleLabel.keyFill
-  delete spec.tooltip.style.keyLabel.fill
-  delete spec.tooltip.style.valueLabel.fill
-  delete spec.tooltip.style.titleLabel.keyFill
-  spec.tooltip.style.keyLabel.fontColor = keyFill
-  spec.tooltip.style.valueLabel.fontColor = valueFill
-  spec.tooltip.style.titleLabel.fontColor = titleFill
-
-  // axis
-  const { name: xAxisName, ...restXAxisProps } = chartProps.xAxis
-  const { name: yAxisName, ...restYAxisProps } = chartProps.yAxis
-  spec.axes = [
-    {
-      orient: 'bottom',
-      ...restXAxisProps
-    },
-    {
-      orient: 'left',
-      ...restYAxisProps
-    }
-  ]
-  delete spec.xAxis
-  delete spec.yAxis
-
-  spec.label = {
-    ...spec.label,
-    style: {
-      ...spec.label?.style,
-      lineWidth: 0
-    }
-  }
-  // console.log('spec-line-transform', spec)
-  return spec
-}

src/components/GoVChart/transformProps/pies.ts

@@ -1,132 +0,0 @@
-import { Datum } from '@visactor/vchart/esm/typings'
-import { cloneDeep } from 'lodash'
-
-export default (chartProps: any) => {
-  const spec = cloneDeep(chartProps)
-  delete spec.category
-
-  // tooltip
-  const keyFill = spec.tooltip.style.keyLabel.fill
-  const valueFill = spec.tooltip.style.valueLabel.fill
-  const titleFill = spec.tooltip.style.titleLabel.keyFill
-  delete spec.tooltip.style.keyLabel.fill
-  delete spec.tooltip.style.valueLabel.fill
-  delete spec.tooltip.style.titleLabel.keyFill
-  spec.tooltip.style.keyLabel.fontColor = keyFill
-  spec.tooltip.style.valueLabel.fontColor = valueFill
-  spec.tooltip.style.titleLabel.fontColor = titleFill
-
-  if (spec.extensionMark) {
-    // extensionMark
-    spec.extensionMark = [
-      {
-        name: 'arc_inner_shadow',
-        type: 'arc',
-        dataId: 'id0',
-        style: {
-          interactive: false,
-          startAngle: (datum: Datum) => {
-            return datum['__VCHART_ARC_START_ANGLE']
-          },
-          endAngle: (datum: Datum) => {
-            return datum['__VCHART_ARC_END_ANGLE']
-          },
-          innerRadius: (datum: Datum, context: any) => {
-            return context.getLayoutRadius() * spec.innerRadius - 30
-          },
-          outerRadius: (datum: Datum, context: any) => {
-            return context.getLayoutRadius() * spec.innerRadius
-          },
-          fillOpacity: 0.3,
-          fill: (datum: Datum, context: any) => {
-            return context.seriesColor(datum[spec.seriesField])
-          },
-          visible: true,
-          x: (datum: Datum, context: any) => {
-            return context.getCenter().x()
-          },
-          y: (datum: Datum, context: any) => {
-            return context.getCenter().y()
-          }
-        }
-      },
-      {
-        name: 'arc_inner',
-        type: 'symbol',
-        // dataId: 'id0',
-        style: {
-          interactive: false,
-          size: (datum: Datum, context: any) => {
-            return context.getLayoutRadius() * 2 * spec.innerRadius - 100
-          },
-          fillOpacity: 0,
-          lineWidth: 1,
-          strokeOpacity: 0.5,
-          stroke: {
-            gradient: 'conical',
-            startAngle: 0,
-            endAngle: Math.PI * 2,
-            stops: [
-              {
-                offset: 0,
-                color: '#FFF',
-                opacity: 0
-              },
-              {
-                offset: 1,
-                color: '#FFF',
-                opacity: 1
-              }
-            ]
-          },
-          visible: true,
-          x: (datum: Datum, context: any) => {
-            return context.getCenter().x()
-          },
-          y: (datum: Datum, context: any) => {
-            return context.getCenter().y()
-          }
-        }
-      },
-      {
-        name: 'arc_outer',
-        type: 'symbol',
-        // dataId: 'id0',
-        style: {
-          interactive: false,
-          size: (datum: Datum, context: any) => {
-            return context.getLayoutRadius() * 2 * spec.outerRadius + 50
-          },
-          fillOpacity: 0,
-          lineWidth: 1,
-          strokeOpacity: 0.5,
-          stroke: {
-            gradient: 'conical',
-            startAngle: 0,
-            endAngle: Math.PI * 2,
-            stops: [
-              {
-                offset: 0,
-                color: '#FFF',
-                opacity: 0
-              },
-              {
-                offset: 1,
-                color: '#FFF',
-                opacity: 1
-              }
-            ]
-          },
-          visible: true,
-          x: (datum: Datum, context: any) => {
-            return context.getCenter().x()
-          },
-          y: (datum: Datum, context: any) => {
-            return context.getCenter().y()
-          }
-        }
-      }
-    ]
-  }
-  return spec
-}

src/components/GoVChart/transformProps/scatters.ts

@@ -1,35 +0,0 @@
-import { cloneDeep } from "lodash"
-
-export default (chartProps: any) => {
-  const spec = cloneDeep(chartProps)
-
-  // tooltip
-  const keyFill = spec.tooltip.style.keyLabel.fill
-  const valueFill = spec.tooltip.style.valueLabel.fill
-  const titleFill = spec.tooltip.style.titleLabel.keyFill
-  delete spec.tooltip.style.keyLabel.fill
-  delete spec.tooltip.style.valueLabel.fill
-  delete spec.tooltip.style.titleLabel.keyFill
-  spec.tooltip.style.keyLabel.fontColor = keyFill
-  spec.tooltip.style.valueLabel.fontColor = valueFill
-  spec.tooltip.style.titleLabel.fontColor = titleFill
-
-  // axis
-  const { name: xAxisName, ...restXAxisProps } = chartProps.xAxis
-  const { name: yAxisName, ...restYAxisProps } = chartProps.yAxis
-  spec.axes = [{
-    orient: 'bottom',
-    ...restXAxisProps,
-    label: {
-      formatMethod: (value: string) => Number(value).toFixed(2)
-    }
-  }, {
-    orient: 'left',
-    ...restYAxisProps
-  }]
-
-  delete spec.xAxis
-  delete spec.yAxis
-  // console.log('spec-scatter-transform', spec)
-  return spec
-}

src/components/GoVChart/transformProps/wordClouds.ts

@@ -1,21 +0,0 @@
-import { Datum } from "@visactor/vchart/esm/typings"
-import { cloneDeep } from "lodash"
-
-export default (chartProps: any) => {
-  const spec = cloneDeep(chartProps)
-
-  // tooltip
-  const keyFill = spec.tooltip.style.keyLabel.fill
-  const valueFill = spec.tooltip.style.valueLabel.fill
-  const titleFill = spec.tooltip.style.titleLabel.keyFill
-  delete spec.tooltip.style.keyLabel.fill
-  delete spec.tooltip.style.valueLabel.fill
-  delete spec.tooltip.style.titleLabel.keyFill
-  spec.tooltip.style.keyLabel.fontColor = keyFill
-  spec.tooltip.style.valueLabel.fontColor = valueFill
-  spec.tooltip.style.titleLabel.fontColor = titleFill
-
-
-  // console.log('spec-word-cloud-transform', spec)
-  return spec
-}

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/components/Pages/VChartItemSetting/Axis.vue

@@ -1,110 +0,0 @@
-<template>
-  <collapse-item :name="axis.name">
-    <template #header>
-      <n-switch v-model:value="axis.visible" size="small"></n-switch>
-    </template>
-    <setting-item-box name="单位">
-      <setting-item name="可见性">
-        <n-space>
-          <n-switch v-model:value="axis.unit.visible" size="small"></n-switch>
-        </n-space>
-      </setting-item>
-      <setting-item name="内容">
-        <n-input v-model:value="axis.unit.text" size="small"></n-input>
-      </setting-item>
-      <FontStyle :style="toRefs(axis.unit.style)"></FontStyle>
-    </setting-item-box>
-    <setting-item-box name="轴标签">
-      <setting-item v-if="axis.label" name="可见性">
-        <n-space>
-          <n-switch v-model:value="axis.label.visible" size="small"></n-switch>
-        </n-space>
-      </setting-item>
-      <setting-item v-if="axis.label" name="角度">
-        <n-input-number v-model:value="axis.label.style.angle" :min="0" :max="360" size="small" />
-      </setting-item>
-      <FontStyle v-if="axis.label" :style="toRefs(axis.label.style)"></FontStyle>
-    </setting-item-box>
-    <setting-item-box name="轴标题">
-      <setting-item name="可见性">
-        <n-space>
-          <n-switch v-model:value="axis.title.visible" size="small"></n-switch>
-        </n-space>
-      </setting-item>
-      <setting-item name="内容">
-        <n-input v-model:value="axis.title.style.text" size="small"></n-input>
-      </setting-item>
-      <setting-item name="位置">
-        <n-select v-model:value="axis.title.position" :options="legendsConfig.position" size="small" />
-      </setting-item>
-      <setting-item name="角度">
-        <n-input-number v-model:value="axis.title.angle" :min="0" :max="360" size="small" />
-      </setting-item>
-      <FontStyle :style="toRefs(axis.title.style)"></FontStyle>
-    </setting-item-box>
-    <setting-item-box name="轴线">
-      <setting-item name="可见性">
-        <n-space>
-          <n-switch v-model:value="axis.domainLine.visible" size="small"></n-switch>
-        </n-space>
-      </setting-item>
-      <setting-item name=""> </setting-item>
-      <setting-item name="粗细">
-        <n-input-number v-model:value="axis.domainLine.style.lineWidth" :min="0" size="small" />
-      </setting-item>
-      <setting-item name="颜色">
-        <n-color-picker v-model:value="axis.domainLine.style.stroke" size="small" />
-      </setting-item>
-    </setting-item-box>
-    <setting-item-box name="网格线">
-      <setting-item name="可见性">
-        <n-space>
-          <n-switch v-model:value="axis.grid.visible" size="small"></n-switch>
-        </n-space>
-      </setting-item>
-      <setting-item name="开启虚线">
-        <n-space>
-          <n-switch v-model:value="isLineDashRef" size="small" @update:value="changeLineDash"></n-switch>
-        </n-space>
-      </setting-item>
-      <setting-item name="粗细">
-        <n-input-number v-model:value="axis.grid.style.lineWidth" :min="0" size="small" />
-      </setting-item>
-      <setting-item name="颜色">
-        <n-color-picker v-model:value="axis.grid.style.stroke" size="small" />
-      </setting-item>
-    </setting-item-box>
-  </collapse-item>
-</template>
-
-<script setup lang="ts">
-import { PropType, ref, toRefs } from 'vue'
-import FontStyle from './common/FontStyle.vue'
-import { vChartGlobalThemeJsonType } from '@/settings/vchartThemes/index'
-import { CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
-import { legendsConfig } from '@/packages/chartConfiguration/vcharts/index'
-
-const props = defineProps({
-  axis: {
-    type: Object as PropType<vChartGlobalThemeJsonType>,
-    required: true
-  }
-})
-
-// 判断是否是虚线
-const isDash = (data: undefined | Array<number>) => {
-  if (!data || data.length === 0 || data[0] === 0) return false
-  return true
-}
-
-// 虚线
-const isLineDashRef = ref(isDash(props.axis.grid.style.lineDash))
-
-const changeLineDash = (data: boolean) => {
-  if (data) {
-    props.axis.grid.style.lineDash = [4, 4] // 设置为虚线
-  } else {
-    props.axis.grid.style.lineDash = [0] // 设置为实线
-  }
-}
-</script>

src/components/Pages/VChartItemSetting/Bar.vue

@@ -1,52 +0,0 @@
-<template>
-  <template v-if="optionData.bar">
-    <collapse-item name="柱体">
-      <SettingItemBox name="样式">
-        <setting-item v-if="'width' in optionData.bar.style" name="宽度">
-          <n-input-number v-model:value="optionData.bar.style.width" size="small" :min="1"></n-input-number>
-        </setting-item>
-        <setting-item v-if="'height' in (optionData.bar.style as any)" name="高度">
-          <n-input-number v-model:value="(optionData.bar.style as any).height" size="small" :min="1"></n-input-number>
-        </setting-item>
-        <setting-item name="圆角大小">
-          <n-input-number v-model:value="optionData.bar.style.cornerRadius" size="small" :min="0"></n-input-number>
-        </setting-item>
-        <setting-item name="填充透明度">
-          <n-input-number
-            v-model:value="optionData.bar.style.fillOpacity"
-            :step="0.1"
-            size="small"
-            :min="0"
-            :max="1"
-          ></n-input-number>
-        </setting-item>
-        <setting-item name="整体透明度">
-          <n-input-number
-            v-model:value="optionData.bar.style.opacity"
-            :step="0.1"
-            size="small"
-            :min="0"
-            :max="1"
-          ></n-input-number>
-        </setting-item>
-        <setting-item name="纹理类型">
-          <n-select v-model:value="optionData.bar.style.texture" :options="styleConfig.texture" size="small"></n-select>
-        </setting-item>
-      </SettingItemBox>
-    </collapse-item>
-  </template>
-</template>
-
-<script setup lang="ts">
-import { PropType } from 'vue'
-import { vChartGlobalThemeJsonType } from '@/settings/vchartThemes/index'
-import { CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
-import { styleConfig } from '@/packages/chartConfiguration/vcharts/index'
-
-defineProps({
-  optionData: {
-    type: Object as PropType<vChartGlobalThemeJsonType>,
-    required: true
-  }
-})
-</script>

src/components/Pages/VChartItemSetting/Label.vue

@@ -1,46 +0,0 @@
-<template>
-  <template v-if="optionData.label">
-    <collapse-item name="标签">
-      <template #header>
-        <n-switch v-model:value="optionData.label.visible" size="small"></n-switch>
-      </template>
-
-      <setting-item-box name="布局">
-        <setting-item name="位置">
-          <n-select
-            v-model:value="optionData.label.position"
-            size="small"
-            :options="positionOptions || labelConfig.barPosition"
-          />
-        </setting-item>
-
-        <setting-item name="间距">
-          <n-input-number v-model:value="optionData.label.offset" :min="1" size="small" />
-        </setting-item>
-      </setting-item-box>
-
-      <setting-item-box name="字体">
-        <FontStyle :style="toRefs(optionData.label.style)"></FontStyle>
-      </setting-item-box>
-    </collapse-item>
-  </template>
-</template>
-
-<script setup lang="ts">
-import { PropType, toRefs } from 'vue'
-import { labelConfig } from '@/packages/chartConfiguration/vcharts/index'
-import FontStyle from './common/FontStyle.vue'
-import { vChartGlobalThemeJsonType } from '@/settings/vchartThemes/index'
-import { CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
-
-defineProps({
-  optionData: {
-    type: Object as PropType<vChartGlobalThemeJsonType>,
-    required: true
-  },
-  positionOptions: {
-    type: Array,
-    required: false
-  }
-})
-</script>

src/components/Pages/VChartItemSetting/Legends.vue

@@ -1,38 +0,0 @@
-<template>
-  <!-- todo 补充常用配置项 -->
-  <div v-if="optionData.legends">
-    <div v-for="(legendItem, index) in optionData.legends" :key="index">
-      <collapse-item name="图例">
-        <template #header>
-          <n-switch v-model:value="legendItem.visible" size="small"></n-switch>
-        </template>
-        <setting-item-box name="布局">
-          <setting-item name="位置">
-            <n-select v-model:value="legendItem.orient" size="small" :options="legendsConfig.orient" />
-          </setting-item>
-          <setting-item name="对齐方式">
-            <n-select v-model:value="legendItem.position" size="small" :options="legendsConfig.position" />
-          </setting-item>
-        </setting-item-box>
-        <setting-item-box name="项配置">
-          <FontStyle :style="toRefs(legendItem.item.label.style)"></FontStyle>
-        </setting-item-box>
-      </collapse-item>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { PropType, toRefs } from 'vue'
-import { legendsConfig } from '@/packages/chartConfiguration/vcharts/index'
-import FontStyle from './common/FontStyle.vue'
-import { vChartGlobalThemeJsonType } from '@/settings/vchartThemes/index'
-import { CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
-
-defineProps({
-  optionData: {
-    type: Object as PropType<vChartGlobalThemeJsonType>,
-    required: true
-  }
-})
-</script>

src/components/Pages/VChartItemSetting/Line.vue

@@ -1,33 +0,0 @@
-<template>
-  <collapse-item name="线条" v-if="optionData.line">
-    <SettingItemBox name="样式">
-      <setting-item name="宽度">
-        <n-input-number v-model:value="optionData.line.style.lineWidth" size="small" :min="1"></n-input-number>
-      </setting-item>
-      <setting-item name="线条类型">
-        <n-select
-          v-model:value="optionData.line.style.curveType"
-          :options="styleConfig.curveType"
-          size="small"
-        ></n-select>
-      </setting-item>
-      <setting-item name="末端样式">
-        <n-select v-model:value="optionData.line.style.lineCap" :options="styleConfig.lineCap" size="small"></n-select>
-      </setting-item>
-    </SettingItemBox>
-  </collapse-item>
-</template>
-
-<script setup lang="ts">
-import { PropType } from 'vue'
-import { vChartGlobalThemeJsonType } from '@/settings/vchartThemes/index'
-import { CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
-import { styleConfig } from '@/packages/chartConfiguration/vcharts/index'
-
-defineProps({
-  optionData: {
-    type: Object as PropType<vChartGlobalThemeJsonType>,
-    required: true
-  }
-})
-</script>

src/components/Pages/VChartItemSetting/Point.vue

@@ -1,56 +0,0 @@
-<template>
-  <template v-if="optionData.point">
-    <collapse-item name="实心点(图元)">
-      <template #header>
-        <n-switch v-model:value="optionData.point.visible" size="small"></n-switch>
-      </template>
-
-      <setting-item-box name="样式">
-        <setting-item name="位置">
-          <n-select v-model:value="optionData.point.style.symbolType" size="small" :options="styleConfig.symbolType" />
-        </setting-item>
-
-        <setting-item name="大小">
-          <n-input-number v-model:value="optionData.point.style.size" :min="0" size="small" />
-        </setting-item>
-        <setting-item name="填充透明度">
-          <n-input-number v-model:value="optionData.point.style.fillOpacity" :step="0.1" :min="0" size="small" />
-        </setting-item>
-        <setting-item name="边框宽度">
-          <n-input-number v-model:value="optionData.point.style.lineWidth" :min="0" size="small" />
-        </setting-item>
-        <setting-item name="边框颜色">
-          <n-color-picker v-model:value="optionData.point.style.stroke" size="small" />
-        </setting-item>
-        <setting-item name="边框透明度">
-          <n-input-number v-model:value="optionData.point.style.strokeOpacity" :step="0.1" :min="0" size="small" />
-        </setting-item>
-        <setting-item name="偏移X">
-          <n-input-number v-model:value="optionData.point.style.dx" :min="0" size="small" />
-        </setting-item>
-        <setting-item name="偏移Y">
-          <n-input-number v-model:value="optionData.point.style.dy" :min="0" size="small" />
-        </setting-item>
-      </setting-item-box>
-    </collapse-item>
-  </template>
-</template>
-
-<script setup lang="ts">
-import { PropType, toRefs } from 'vue'
-import { styleConfig } from '@/packages/chartConfiguration/vcharts/index'
-import FontStyle from './common/FontStyle.vue'
-import { vChartGlobalThemeJsonType } from '@/settings/vchartThemes/index'
-import { CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
-
-defineProps({
-  optionData: {
-    type: Object as PropType<vChartGlobalThemeJsonType>,
-    required: true
-  },
-  positionOptions: {
-    type: Array,
-    required: false
-  }
-})
-</script>

src/components/Pages/VChartItemSetting/Tooltip.vue

@@ -1,47 +0,0 @@
-<template>
-  <!-- todo 补充常用配置项 -->
-  <div v-if="optionData.tooltip">
-    <collapse-item name="提示框">
-      <template #header>
-        <n-switch v-model:value="optionData.tooltip.visible" size="small"></n-switch>
-      </template>
-      <setting-item-box name="框">
-        <setting-item name="填充">
-          <n-color-picker v-model:value="optionData.tooltip.style.panel.backgroundColor" size="small" />
-        </setting-item>
-        <setting-item name="瞄边">
-          <n-color-picker v-model:value="optionData.tooltip.style.panel.border.color" size="small" />
-        </setting-item>
-        <setting-item name="粗细">
-          <n-input-number v-model:value="optionData.tooltip.style.panel.border.width" :min="0" size="small" />
-        </setting-item>
-        <setting-item name="圆角">
-          <n-input-number v-model:value="optionData.tooltip.style.panel.border.radius" :min="0" size="small" />
-        </setting-item>
-      </setting-item-box>
-      <setting-item-box name="标题">
-        <FontStyle :style="toRefs(optionData.tooltip.style.titleLabel)"></FontStyle>
-      </setting-item-box>
-      <setting-item-box name="名称">
-        <FontStyle :style="toRefs(optionData.tooltip.style.keyLabel)"></FontStyle>
-      </setting-item-box>
-      <setting-item-box name="值">
-        <FontStyle :style="toRefs(optionData.tooltip.style.valueLabel)"></FontStyle>
-      </setting-item-box>
-    </collapse-item>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { PropType, toRefs } from 'vue'
-import FontStyle from './common/FontStyle.vue'
-import { vChartGlobalThemeJsonType } from '@/settings/vchartThemes/index'
-import { CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
-
-defineProps({
-  optionData: {
-    type: Object as PropType<vChartGlobalThemeJsonType>,
-    required: true
-  }
-})
-</script>

src/components/Pages/VChartItemSetting/VChartGlobalSetting.vue

@@ -1,18 +0,0 @@
-<template>
-  <!-- 图例 -->
-  <Legends :optionData="optionData"></Legends>
-  <Tooltip :optionData="optionData"></Tooltip>
-</template>
-
-<script setup lang="ts">
-import { PropType } from 'vue'
-import { vChartGlobalThemeJsonType } from '@/settings/vchartThemes/index'
-import Legends from './Legends.vue'
-import Tooltip from './Tooltip.vue'
-const props = defineProps({
-  optionData: {
-    type: Object as PropType<vChartGlobalThemeJsonType>,
-    required: true
-  }
-})
-</script>

src/components/Pages/VChartItemSetting/common/FontStyle.vue

@@ -1,40 +0,0 @@
-<template>
-  <!-- todo 补充常用配置项 -->
-  <template v-if="style">
-    <setting-item name="颜色">
-      <n-color-picker v-model:value="style.fill.value" size="small" />
-    </setting-item>
-    <setting-item name="大小">
-      <n-input-number v-model:value="style.fontSize.value" :min="1" size="small" />
-    </setting-item>
-    <setting-item name="字体">
-      <n-select v-model:value="style.fontFamily.value" :options="fontStyleConfig.fontFamily" size="small" />
-    </setting-item>
-    <setting-item name="字重">
-      <n-select v-model:value="style.fontWeight.value" :options="fontStyleConfig.fontWeight" size="small" />
-    </setting-item>
-    <setting-item v-if="style?.dx" name="X轴偏移">
-      <n-input-number v-model:value="style.dx.value" size="small" />
-    </setting-item>
-    <setting-item v-if="style?.dy" name="Y轴偏移">
-      <n-input-number v-model:value="style.dy.value" size="small" />
-    </setting-item>
-    <setting-item v-if="style?.angle" name="旋转">
-      <n-input-number v-model:value="style.angle.value" :step="0.1" :min="0" :max="360" size="small" />
-    </setting-item>
-  </template>
-</template>
-
-<script setup lang="ts">
-import { PropType } from 'vue'
-import { fontStyleConfig } from '@/packages/chartConfiguration/vcharts/index'
-import { FontType } from '@/settings/vchartThemes/index'
-import { SettingItem } from '@/components/Pages/ChartItemSetting'
-
-defineProps({
-  style: {
-    type: Object as PropType<any>,
-    required: true
-  }
-})
-</script>

src/components/Pages/VChartItemSetting/common/Padding.vue

@@ -1,84 +0,0 @@
-<template>
-  <setting-item name="间距">
-    <n-input v-model:value="paddingArray" size="small" @update:value="updateHandle"/>
-  </setting-item>
-</template>
-
-<script setup lang="ts">
-import type { ICartesianTitle } from '@visactor/vchart/esm/component/axis'
-import { forEach, isNumber } from 'lodash'
-import { SettingItem } from '@/components/Pages/ChartItemSetting'
-import { PropType, ref } from 'vue'
-
-const props = defineProps({
-  axis: {
-    type: Object as PropType<ICartesianTitle>,
-    required: true
-  }
-})
-
-// 解析间距
-const paddingInit = (padding: ICartesianTitle['padding']) => {
-  const arr = [0, 0, 0, 0]
-  if (!padding) {
-    return arr
-  }
-  if (isNumber(padding)) {
-    arr.forEach((item, index) => {
-      arr[index] = padding
-    })
-  } else if (Array.isArray(padding)) {
-    if (padding.length === 1) {
-      arr.forEach((item, index) => {
-        arr[index] = padding[0]
-      })
-    } else if (padding.length === 2) {
-      arr[0] = padding[0]
-      arr[1] = padding[1]
-      arr[2] = padding[0]
-      arr[3] = padding[1]
-    } else if (padding.length === 3) {
-      arr[0] = padding[0]
-      arr[1] = padding[1]
-      arr[2] = padding[2]
-      arr[3] = padding[1]
-    } else if (padding.length === 4) {
-      arr[0] = padding[0]
-      arr[1] = padding[1]
-      arr[2] = padding[2]
-      arr[3] = padding[3]
-    }
-  }
-
-  // 转成字符串，逗号分隔
-  return arr.map(item => item.toString()).join(',')
-}
-
-// 间距处理
-const paddingArray = ref(paddingInit(props.axis.padding))
-
-// 字符串转成数组
-const paddingArrayToNumber = (padding: string) => {
-  const arr = padding.split(',').map(item => parseFloat(item.trim()))
-  if (arr.length === 1) {
-    return [arr[0], arr[0], arr[0], arr[0]]
-  } else if (arr.length === 2) {
-    return [arr[0], arr[1], arr[0], arr[1]]
-  } else if (arr.length === 3) {
-    return [arr[0], arr[1], arr[2], arr[1]]
-  } else if (arr.length === 4) {
-    return arr
-  }
-  return [0, 0, 0, 0]
-}
-
-const updateHandle = (value: string) => {
-  const padding = paddingArrayToNumber(value)
-  forEach(padding, (item, index) => {
-    if (isNaN(item)) {
-      padding[index] = 0
-    }
-  })
-  props.axis.padding = padding
-}
-</script>

src/components/Pages/VChartItemSetting/index.ts

@@ -1,8 +0,0 @@
-import VChartGlobalSetting from './VChartGlobalSetting.vue'
-import Axis from './Axis.vue'
-import Label from './Label.vue'
-import Bar from './Bar.vue'
-import Line from './Line.vue'
-import Point from './Point.vue'
-
-export { VChartGlobalSetting, Axis, Label, Bar, Line, Point }

src/enums/storageEnum.ts

@@ -12,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

@@ -5,5 +5,4 @@ export * from '@/hooks/useChartDataFetch.hook'
 export * from '@/hooks/useChartDataPondFetch.hook'
 export * from '@/hooks/useLifeHandler.hook'
 export * from '@/hooks/useLang.hook'
-export * from '@/hooks/useChartInteract.hook'
-export * from '@/hooks/useVCharts.hook'
+export * from '@/hooks/useChartInteract.hook'

src/hooks/useChartDataFetch.hook.ts

@@ -7,7 +7,6 @@ import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore
 import { RequestDataTypeEnum } from '@/enums/httpEnum'
 import { isPreview, newFunctionHandle, intervalUnitHandle } from '@/utils'
 import { setOption } from '@/packages/public/chart'
-import { isNil } from 'lodash'
 
 // 获取类型
 type ChartEditStoreType = typeof useChartEditStore
@@ -36,7 +35,7 @@ export const useChartDataFetch = (
   const echartsUpdateHandle = (dataset: any) => {
     if (chartFrame === ChartFrameEnum.ECHARTS) {
       if (vChartRef.value) {
-        setOption(vChartRef.value, { dataset: dataset }, false)
+        setOption(vChartRef.value, { dataset: dataset })
       }
     }
   }
@@ -91,7 +90,7 @@ export const useChartDataFetch = (
 
         // 普通初始化与组件交互处理监听
         watch(
-          () => targetComponent.request.requestParams,
+          () => targetComponent.request,
           () => {
             fetchFn()
           },
@@ -102,13 +101,11 @@ export const useChartDataFetch = (
         )
 
         // 定时时间
-        const time = targetInterval && !isNil(targetInterval.value) ? targetInterval.value : globalRequestInterval.value
+        const time = targetInterval && targetInterval.value ? targetInterval.value : globalRequestInterval.value
         // 单位
-        const unit = targetInterval && !isNil(targetInterval.value) ? targetUnit.value : globalUnit.value
+        const unit = targetInterval && targetInterval.value ? targetUnit.value : globalUnit.value
         // 开启轮询
-        if (time) {
-          fetchInterval = setInterval(fetchFn, intervalUnitHandle(time, unit))
-        }
+        if (time) fetchInterval = setInterval(fetchFn, intervalUnitHandle(time, unit))
       }
       // eslint-disable-next-line no-empty
     } catch (error) {
@@ -117,14 +114,10 @@ export const useChartDataFetch = (
   }
 
   if (isPreview()) {
+    // 判断是否是数据池类型
     targetComponent.request.requestDataType === RequestDataTypeEnum.Pond
-      ? addGlobalDataInterface(targetComponent, useChartEditStore, (newData: any) => {
-          echartsUpdateHandle(newData)
-          if (updateCallback) updateCallback(newData)
-        })
+      ? 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/useVCharts.hook.ts

@@ -1,164 +0,0 @@
-import { watch } from 'vue'
-import { VChart, type ITheme } from '@visactor/vchart'
-
-import light from '@visactor/vchart-theme/public/light.json'
-import dark from '@visactor/vchart-theme/public/dark.json'
-import vScreenVolcanoBlue from '@visactor/vchart-theme/public/vScreenVolcanoBlue.json'
-import vScreenClean from '@visactor/vchart-theme/public/vScreenClean.json'
-import vScreenOutskirts from '@visactor/vchart-theme/public/vScreenOutskirts.json'
-import vScreenBlueOrange from '@visactor/vchart-theme/public/vScreenBlueOrange.json'
-import vScreenFinanceYellow from '@visactor/vchart-theme/public/vScreenFinanceYellow.json'
-import vScreenWenLvCyan from '@visactor/vchart-theme/public/vScreenWenLvCyan.json'
-import vScreenElectricGreen from '@visactor/vchart-theme/public/vScreenElectricGreen.json'
-import vScreenECommercePurple from '@visactor/vchart-theme/public/vScreenECommercePurple.json'
-import vScreenRedBlue from '@visactor/vchart-theme/public/vScreenRedBlue.json'
-import vScreenPartyRed from '@visactor/vchart-theme/public/vScreenPartyRed.json'
-// 行业色板
-import veODesignLightFinance from '@visactor/vchart-theme/public/veODesignLightFinance.json'
-import veODesignDarkFinance from '@visactor/vchart-theme/public/veODesignDarkFinance.json'
-
-import veODesignLightGovernment from '@visactor/vchart-theme/public/veODesignLightGovernment.json'
-import veODesignDarkGovernment from '@visactor/vchart-theme/public/veODesignDarkGovernment.json'
-
-import veODesignLightConsumer from '@visactor/vchart-theme/public/veODesignLightConsumer.json'
-import veODesignDarkConsumer from '@visactor/vchart-theme/public/veODesignDarkConsumer.json'
-
-import veODesignLightAutomobile from '@visactor/vchart-theme/public/veODesignLightAutomobile.json'
-import veODesignDarkAutomobile from '@visactor/vchart-theme/public/veODesignDarkAutomobile.json'
-
-import veODesignLightCulturalTourism from '@visactor/vchart-theme/public/veODesignLightCulturalTourism.json'
-import veODesignDarkCulturalTourism from '@visactor/vchart-theme/public/veODesignDarkCulturalTourism.json'
-
-import veODesignLightMedical from '@visactor/vchart-theme/public/veODesignLightMedical.json'
-import veODesignDarkMedical from '@visactor/vchart-theme/public/veODesignDarkMedical.json'
-
-import veODesignLightNewEnergy from '@visactor/vchart-theme/public/veODesignLightNewEnergy.json'
-import veODesignDarkNewEnergy from '@visactor/vchart-theme/public/veODesignDarkNewEnergy.json'
-
-const themeMap = {
-  // 明亮
-  light: light,
-  // 暗黑
-  dark: dark,
-  // 火山蓝
-  vScreenVolcanoBlue: vScreenVolcanoBlue,
-  // 党建红
-  vScreenPartyRed: vScreenPartyRed,
-  // 清新蜡笔
-  vScreenClean: vScreenClean,
-  // 郊外
-  vScreenOutskirts: vScreenOutskirts,
-  // 汽车蓝橙
-  vScreenBlueOrange: vScreenBlueOrange,
-  // 金融黄
-  vScreenFinanceYellow: vScreenFinanceYellow,
-  // 文旅青
-  vScreenWenLvCyan: vScreenWenLvCyan,
-  // 电力绿
-  vScreenElectricGreen: vScreenElectricGreen,
-  // 电商紫
-  vScreenECommercePurple: vScreenECommercePurple,
-  // 红蓝
-  vScreenRedBlue: vScreenRedBlue,
-  // 金融行业色板
-  veODesignLightFinance: veODesignLightFinance,
-  veODesignDarkFinance: veODesignDarkFinance,
-  // 政府行业色板
-  veODesignLightGovernment: veODesignLightGovernment,
-  veODesignDarkGovernment: veODesignDarkGovernment,
-  // 消费行业色板
-  veODesignLightConsumer: veODesignLightConsumer,
-  veODesignDarkConsumer: veODesignDarkConsumer,
-  // 汽车行业色板
-  veODesignLightAutomobile: veODesignLightAutomobile,
-  veODesignDarkAutomobile: veODesignDarkAutomobile,
-  // 文旅行业色板
-  veODesignLightCulturalTourism: veODesignLightCulturalTourism,
-  veODesignDarkCulturalTourism: veODesignDarkCulturalTourism,
-  // 医疗行业色板
-  veODesignLightMedical: veODesignLightMedical,
-  veODesignDarkMedical: veODesignDarkMedical,
-  // 新能源行业色板
-  veODesignLightNewEnergy: veODesignLightNewEnergy,
-  veODesignDarkNewEnergy: veODesignDarkNewEnergy
-}
-
-export const useVCharts = () => {
-  const getThemeMap = () => {
-    return themeMap
-  }
-
-  // 注册主题（支持自定义主题）
-  const registerTheme = (themeName: keyof typeof themeMap, theme: any) => {
-    VChart.ThemeManager.registerTheme(themeName, (themeMap[themeName] as any) || theme)
-  }
-
-  // 设置当前主题
-  const setCurrentTheme = (themeName = 'vScreenVolcanoBlue') => {
-    VChart.ThemeManager.setCurrentTheme(themeName)
-  }
-
-  // 判断主题是否存在
-  const themeExist = (name: string): boolean => {
-    return VChart.ThemeManager.themeExist(name)
-  }
-
-  // 获取主题
-  const getTheme = (name: string): ITheme => {
-    return VChart.ThemeManager.getTheme(name)
-  }
-
-  // 获取当前主题
-  const getCurrentTheme = (): ITheme => {
-    return VChart.ThemeManager.getCurrentTheme()
-  }
-
-  // 设置主题
-  const setTheme = (name: keyof typeof themeMap): boolean => {
-    if (themeExist(name)) {
-      setCurrentTheme(name)
-      return true
-    } else {
-      // 先注册
-      const theme = themeMap[name]
-      if (theme) {
-        registerTheme(name, theme)
-        setCurrentTheme(name)
-        return true
-      } else {
-        // 注册默认主题
-        registerTheme('vScreenVolcanoBlue', vScreenVolcanoBlue)
-      }
-    }
-    return false
-  }
-
-  return {
-    getThemeMap,
-    registerTheme,
-    setCurrentTheme,
-    themeExist,
-    getTheme,
-    setTheme,
-    getCurrentTheme
-  }
-}
-
-// 主题初始化
-export const useInitVChartsTheme = (chartEditStore: any) => {
-  const vCharts = useVCharts()
-
-  const initVChartsThemeIns = watch(
-    () => chartEditStore.getEditCanvasConfig.vChartThemeName,
-    (newTheme: string) => {
-      vCharts.setTheme(newTheme as any)
-    },
-    {
-      immediate: true
-    }
-  )
-
-  return {
-    initVChartsThemeIns
-  }
-}

src/i18n/en/project.ts

@@ -1,11 +1,11 @@
 export default {
-  create_btn: 'Create',
+  create_btn: 'Creat',
   create_tip: 'Please select a content for development',
   project: 'Project',
   my: 'My',
   new_project: 'New Project',
   all_project: 'All Project',
-  my_template: 'My Template',
+  my_templete: 'My Templete',
   template_market: 'Template Market',
 
   // items 

src/i18n/zh/project.ts

@@ -6,7 +6,7 @@ export default {
   my: '我的',
   new_project: '新项目',
   all_project: '全部项目',
-  my_template: '我的模板',
+  my_templete: '我的模板',
   template_market: '模板市场',
 
   // items 

src/layout/components/LayoutHeader/index.vue

@@ -38,16 +38,18 @@ const isProject = computed(() => {
 </script>
 
 <style lang="scss" scoped>
+$min-width: 520px;
 @include go(header) {
   &-box {
-    display: flex;
-    justify-content: space-between;
+    display: grid;
+    grid-template-columns: repeat(3, 33%);
     &.is-project {
       grid-template-columns: none;
     }
     .header-item {
       display: flex;
       align-items: center;
+      min-width: $min-width;
       &.left {
         justify-content: start;
       }

src/main.ts

@@ -1,67 +1,59 @@
-import { createApp } from 'vue'
-import App from './App.vue'
-import router, { setupRouter } from '@/router'
-import i18n from '@/i18n/index'
-import { setupStore } from '@/store'
-import { setupNaive, setupDirectives, setupCustomComponents, initFunction } from '@/plugins'
-import { GoAppProvider } from '@/components/GoAppProvider/index'
-import { setHtmlTheme } from '@/utils'
-import { addCollection } from 'iconify-icon'
-import uimIcons from '@iconify/json/json/uim.json'
-import lineMdIcons from '@iconify/json/json/line-md.json'
-import wiIcons from '@iconify/json/json/wi.json'
-
-// 引入全局样式
-import '@/styles/pages/index.scss'
-// 引入动画
-import 'animate.css/animate.min.css'
-// 引入标尺
-import 'vue3-sketch-ruler/lib/style.css'
-// 注册图标
-addCollection(uimIcons)
-addCollection(lineMdIcons)
-addCollection(wiIcons)
-
-async function appInit() {
-  const goAppProvider = createApp(GoAppProvider)
-
-  const app = createApp(App)
-
-  // 注册全局常用的 naive-ui 组件
-  setupNaive(app)
-
-  // 注册全局自定义指令
-  setupDirectives(app)
-
-  // 注册全局自定义组件
-  setupCustomComponents(app)
-
-  // 挂载状态管理
-  setupStore(app)
-
-  // 解决路由守卫，Axios中可使用，Dialog，Message 等全局组件
-  goAppProvider.mount('#appProvider', true)
-
-  // 挂载路由
-  setupRouter(app)
-
-  // 路由准备就绪后挂载APP实例
-  await router.isReady()
-
-  // Store 准备就绪后处理主题色
-  setHtmlTheme()
-
-  // 语言注册
-  app.use(i18n)
-
-  // 挂载到页面
-  app.mount('#app', true)
-
-  // 挂载到 window
-  window['$vue'] = app
-}
-
-appInit().then(() => {
-  initFunction()
-})
-
+import { createApp } from 'vue'
+import App from './App.vue'
+import router, { setupRouter } from '@/router'
+import i18n from '@/i18n/index'
+import { setupStore } from '@/store'
+import { setupNaive, setupDirectives, setupCustomComponents, initFunction } from '@/plugins'
+import { GoAppProvider } from '@/components/GoAppProvider/index'
+import { setHtmlTheme } from '@/utils'
+
+// 引入全局样式
+import '@/styles/pages/index.scss'
+// 引入动画
+import 'animate.css/animate.min.css'
+// 引入标尺
+import 'vue3-sketch-ruler/lib/style.css'
+
+async function appInit() {
+  const goAppProvider = createApp(GoAppProvider)
+
+  const app = createApp(App)
+
+  // 注册全局常用的 naive-ui 组件
+  setupNaive(app)
+
+  // 注册全局自定义指令
+  setupDirectives(app)
+
+  // 注册全局自定义组件
+  setupCustomComponents(app)
+
+  // 挂载状态管理
+  setupStore(app)
+
+  // 解决路由守卫，Axios中可使用，Dialog，Message 等全局组件
+  goAppProvider.mount('#appProvider', true)
+
+  // 挂载路由
+  setupRouter(app)
+
+  // 路由准备就绪后挂载APP实例
+  await router.isReady()
+
+  // Store 准备就绪后处理主题色
+  setHtmlTheme()
+
+  // 语言注册
+  app.use(i18n)
+
+  // 挂载到页面
+  app.mount('#app', true)
+
+  // 挂载到 window
+  window['$vue'] = app
+}
+
+appInit().then(() => {
+  initFunction()
+})
+

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

@@ -3,11 +3,5 @@ export const labelConfig = {
     { label: '外侧', value: 'outside' },
     { label: '内部', value: 'inside' },
     { label: '中心', value: 'center' }
-  ],
-  fontWeight: [
-    { label: '正常', value: 'normal' },
-    { label: '普通加粗', value: 'bold' },
-    { label: '加粗', value: 'bolder' },
-    { label: '细体', value: 'lighter' }
   ]
 }

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/chartConfiguration/vcharts/index.ts

@@ -1,3 +0,0 @@
-export * from './legends'
-export * from './label'
-export * from './style'

src/packages/chartConfiguration/vcharts/label.ts

@@ -1,120 +0,0 @@
-export const labelConfig = {
-  position: [
-    {
-      label: '外部',
-      value: 'outside'
-    },
-    {
-      label: '内部',
-      value: 'inside'
-    },
-    {
-      label: '内部-外',
-      value: 'inside-outer'
-    },
-    {
-      label: '内部-里',
-      value: 'inside-inner'
-    },
-    {
-      label: '内部-居中',
-      value: 'inside-center'
-    }
-  ],
-  barPosition: [
-    {
-      label: '外部',
-      value: 'outside'
-    },
-    {
-      label: '内部',
-      value: 'inside'
-    },
-    {
-      label: '顶部',
-      value: 'top'
-    },
-    {
-      label: '底部',
-      value: 'bottom'
-    },
-    {
-      label: '左侧',
-      value: 'left'
-    },
-    {
-      label: '右侧',
-      value: 'right'
-    },
-    {
-      label: '内部-顶',
-      value: 'inside-top'
-    },
-    {
-      label: '内部-底',
-      value: 'inside-bottom'
-    },
-    {
-      label: '内部-右',
-      value: 'inside-right'
-    },
-    {
-      label: '内部-左',
-      value: 'inside-left'
-    },
-    {
-      label: '顶部-右',
-      value: 'top-right'
-    },
-    {
-      label: '顶部-左',
-      value: 'top-left'
-    },
-    {
-      label: '底部-右',
-      value: 'bottom-right'
-    },
-    {
-      label: '底部-左',
-      value: 'bottom-left'
-    }
-  ],
-  linePosition: [
-    {
-      label: '顶部',
-      value: 'top'
-    },
-    {
-      label: '底部',
-      value: 'bottom'
-    },
-    {
-      label: '左侧',
-      value: 'left'
-    },
-    {
-      label: '右侧',
-      value: 'right'
-    },
-    {
-      label: '顶部-右',
-      value: 'top-right'
-    },
-    {
-      label: '顶部-左',
-      value: 'top-left'
-    },
-    {
-      label: '底部-右',
-      value: 'bottom-right'
-    },
-    {
-      label: '底部-左',
-      value: 'bottom-left'
-    },
-    {
-      label: '居中',
-      value: 'center'
-    }
-  ]
-}

src/packages/chartConfiguration/vcharts/legends.ts

@@ -1,99 +0,0 @@
-export const legendsConfig = {
-  // 位置
-  orient: [
-    {
-      label: '顶部',
-      value: 'top'
-    },
-    {
-      label: '底部',
-      value: 'bottom'
-    },
-    {
-      label: '左侧',
-      value: 'left'
-    },
-    {
-      label: '右侧',
-      value: 'right'
-    }
-  ],
-  // 对齐方式
-  position: [
-    {
-      label: '起始',
-      value: 'start'
-    },
-    {
-      label: '居中',
-      value: 'middle'
-    },
-    {
-      label: '末尾',
-      value: 'end'
-    }
-  ],
-  // 每一项的图例位置
-  align: [
-    {
-      label: '居左',
-      value: 'left'
-    },
-    {
-      label: '居右',
-      value: 'right'
-    }
-  ]
-}
-
-export const fontStyleConfig = {
-  // 字重
-  fontWeight: [
-    {
-      label: '100',
-      value: 100
-    },
-    {
-      label: '200',
-      value: 200
-    },
-    {
-      label: '300',
-      value: 300
-    },
-    {
-      label: '400',
-      value: 400
-    },
-    {
-      label: '500',
-      value: 500
-    },
-    {
-      label: '600',
-      value: 600
-    },
-    {
-      label: '正常',
-      value: "normal"
-    },
-    {
-      label: '加粗',
-      value: "bold"
-    }
-  ],
-  fontFamily: [
-    {
-      label: '宋体',
-      value: 'SimSun'
-    },
-    {
-      label: '黑体',
-      value: 'SimHei'
-    },
-    {
-      label: '楷体',
-      value: '楷体'
-    }
-  ]
-}

src/packages/chartConfiguration/vcharts/style.ts

@@ -1,150 +0,0 @@
-export const styleConfig = {
-  texture: [
-    {
-      label: '无纹理',
-      value: ''
-    },
-    {
-      label: '圆形',
-      value: 'circle'
-    },
-    {
-      label: '钻石',
-      value: 'diamond'
-    },
-    {
-      label: '矩形',
-      value: 'rect'
-    },
-    {
-      label: '竖线',
-      value: 'horizontal-line'
-    },
-    {
-      label: '横线',
-      value: 'vertical-line'
-    },
-    {
-      label: '右向左斜线',
-      value: 'bias-rl'
-    },
-    {
-      label: '左向右斜线',
-      value: 'bias-lr'
-    },
-    {
-      label: '格子',
-      value: 'grid'
-    }
-  ],
-  curveType: [
-    {
-      label: '线性',
-      value: 'linear'
-    },
-    {
-      label: '平滑',
-      value: 'monotone'
-    },
-    {
-      label: '平滑趋近X',
-      value: 'monotoneX'
-    },
-    {
-      label: '台阶',
-      value: 'step'
-    },
-    {
-      label: '连线闭合',
-      value: 'catmullRom'
-    },
-    {
-      label: '顺滑闭合',
-      value: 'catmullRomClosed'
-    }
-  ],
-  lineCap: [
-    {
-      label: '默认',
-      value: 'butt'
-    },
-    {
-      label: '圆形',
-      value: 'round'
-    },
-    {
-      label: '方形',
-      value: 'square'
-    }
-  ],
-  symbolType: [
-    {
-      label: '圆形',
-      value: 'circle'
-    },
-    {
-      label: '方形',
-      value: 'rect'
-    },
-    {
-      label: '菱形',
-      value: 'diamond'
-    },
-    {
-      label: '三角形',
-      value: 'square'
-    },
-    {
-      label: '指向向上',
-      value: 'arrow'
-    },
-    {
-      label: '指向向左',
-      value: 'arrow2Left'
-    },
-    {
-      label: '箭头向右',
-      value: 'arrow2Right'
-    },
-    {
-      label: '瘦箭头向上',
-      value: 'wedge'
-    },
-    {
-      label: '箭头向上',
-      value: 'triangle'
-    },
-    {
-      label: '箭头向下',
-      value: 'triangleDown'
-    },
-    {
-      label: '箭头向右',
-      value: 'triangleRight'
-    },
-    {
-      label: '箭头向左',
-      value: 'triangleLeft'
-    },
-    {
-      label: '星星',
-      value: 'star'
-    },
-    {
-      label: 'y字形物',
-      value: 'wye'
-    },
-    {
-      label: '矩形',
-      value: 'rect'
-    },
-    {
-      label: '圆角矩形',
-      value: 'rectRound'
-    },
-    {
-      label: '扁平矩形',
-      value: 'roundLine'
-    }
-  ]
-}

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

@@ -28,7 +28,7 @@ export const option = {
       type: 'shadow'
     }
   },
-  xAxis: {
+xAxis: {
     show: true,
     type: 'category'
   },

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

@@ -1,14 +1,8 @@
 <template>
-  <v-chart
-    ref="vChartRef"
-    :init-options="initOptions"
-    :theme="themeColor"
-    :option="option"
+  <v-chart ref="vChartRef" :init-options="initOptions" :theme="themeColor" :option="option" :manual-update="isPreview()"
     :update-options="{
       replaceMerge: replaceMergeArr
-    }"
-    autoresize
-  ></v-chart>
+    }" autoresize></v-chart>
 </template>
 
 <script setup lang="ts">
@@ -91,7 +85,5 @@ watch(
   }
 )
 
-const { vChartRef } = useChartDataFetch(props.chartConfig, useChartEditStore, (newData: any) => {
-  props.chartConfig.option.dataset = newData
-})
+const { vChartRef } = useChartDataFetch(props.chartConfig, useChartEditStore)
 </script>

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

@@ -4,6 +4,7 @@
     :init-options="initOptions"
     :theme="themeColor"
     :option="option"
+    :manual-update="isPreview()"
     :update-options="{
       replaceMerge: replaceMergeArr
     }"
@@ -22,6 +23,7 @@ import { mergeTheme } from '@/packages/public/chart'
 import config, { includes, seriesItem } from './config'
 import { useChartDataFetch } from '@/hooks'
 import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
+import { isPreview } from '@/utils'
 import { DatasetComponent, GridComponent, TooltipComponent, LegendComponent } from 'echarts/components'
 import isObject from 'lodash/isObject'
 import cloneDeep from 'lodash/cloneDeep'
@@ -77,7 +79,5 @@ watch(
   }
 )
 
-const { vChartRef } = useChartDataFetch(props.chartConfig, useChartEditStore, (newData: any) => {
-  props.chartConfig.option.dataset = newData
-})
+const { vChartRef } = useChartDataFetch(props.chartConfig, useChartEditStore)
 </script>

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

@@ -1,74 +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: {
-    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,138 +0,0 @@
-<template>
-  <!-- Echarts 全局设置 -->
-  <global-setting :optionData="optionData"></global-setting>
-  <CollapseItem
-    v-for="(item, index) in seriesList"
-    :key="index"
-    :name="`系列${index + 1}`"
-    :expanded="true"
-  >
-    <template #header>
-      <n-text class="go-fs-13" depth="3">
-        {{ item.type == 'bar' ? '「柱状图」' : '「折线图」' }}
-      </n-text>
-    </template>
-    <SettingItemBox name="类型">
-      <SettingItem name="宽度">
-        <n-select
-          :value="item.type"
-          size="small"
-          :options="[
-            { label: '柱状图', value: 'bar' },
-            { label: '折线图', value: 'line' }
-          ]"
-          @update:value="(value: any) => {
-            updateHandle(item, value)
-          }"
-        />
-      </SettingItem>
- 
-    </SettingItemBox>
-    <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>
-      <setting-item>
-        <n-space>
-          <n-switch v-model:value="item.smooth" size="small" />
-          <n-text>曲线</n-text>
-        </n-space>
-      </setting-item>
-    </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: '顶部', value: 'top' },
-            { label: '左侧', value: 'left' },
-            { label: '右侧', value: 'right' },
-            { label: '底部', value: 'bottom' }
-          ]"
-        />
-      </setting-item>
-    </setting-item-box>
-  </CollapseItem>
-</template>
-
-<script setup lang="ts">
-import { PropType, computed, toRaw } from 'vue'
-import { merge, cloneDeep } from 'lodash';
-
-import GlobalSetting from '@/components/Pages/ChartItemSetting/GlobalSetting.vue'
-import CollapseItem from '@/components/Pages/ChartItemSetting/CollapseItem.vue'
-import SettingItemBox from '@/components/Pages/ChartItemSetting/SettingItemBox.vue'
-import SettingItem from '@/components/Pages/ChartItemSetting/SettingItem.vue'
-
-import { lineConf } from '@/packages/chartConfiguration/echarts'
-import { GlobalThemeJsonType } from '@/settings/chartThemes'
-import { barSeriesItem, lineSeriesItem } from './config'
-
-
-const props = defineProps({
-  optionData: {
-    type: Object as PropType<GlobalThemeJsonType>,
-    required: true
-  }
-})
-
-const seriesList = computed(() => {
-  return props.optionData.series
-})
-
-const updateHandle = (item:any, value:string) => {
-  const _label = cloneDeep(toRaw(item.label))
-  lineSeriesItem.label = _label
-  if (value === 'line') {
-    merge(item, lineSeriesItem)
-  } else {
-    merge(item, barSeriesItem)
-  }
-}
-</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,96 +0,0 @@
-<template>
-  <v-chart
-    ref="vChartRef"
-    :init-options="initOptions"
-    :theme="themeColor"
-    :option="option"
-    :update-options="{
-      replaceMerge: replaceMergeArr
-    }"
-    autoresize
-  ></v-chart>
-</template>
-
-<script setup lang="ts">
-import { ref, computed, watch, PropType, nextTick } from 'vue'
-import VChart from 'vue-echarts'
-import { isObject, cloneDeep } from 'lodash'
-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: any, oldData) => {
-    try {
-      if (!isObject(newData) || !('dimensions' in newData)) return
-      if (Array.isArray((newData as any)?.dimensions)) {
-        const seriesArr: typeof barSeriesItem[] = []
-        // 对oldData进行判断，防止传入错误数据之后对旧维度判断产生干扰
-        // 此处计算的是dimensions的Y轴维度，若是dimensions.length为0或1，则默认为1，排除X轴维度干扰
-        const oldDimensions =
-          Array.isArray(oldData?.dimensions) && oldData.dimensions.length >= 1 ? oldData.dimensions.length : 1
-        const newDimensions = (newData as any).dimensions.length >= 1 ? (newData as any).dimensions.length : 1
-        const dimensionsGap = newDimensions - oldDimensions
-        if (dimensionsGap < 0) {
-          props.chartConfig.option.series.splice(newDimensions - 1)
-        } else if (dimensionsGap > 0) {
-          if (!oldData || !oldData?.dimensions || !Array.isArray(oldData?.dimensions) || !oldData?.dimensions.length) {
-            props.chartConfig.option.series = []
-          }
-          for (let i = 0; i < dimensionsGap; i++) {
-            seriesArr.push(cloneDeep(barSeriesItem))
-          }
-          props.chartConfig.option.series.push(...seriesArr)
-        }
-        replaceMergeArr.value = ['series']
-        nextTick(() => {
-          replaceMergeArr.value = []
-        })
-      }
-    } catch (error) {
-      console.log(error)
-    }
-  },
-  {
-    deep: false
-  }
-)
-
-const { vChartRef } = useChartDataFetch(props.chartConfig, useChartEditStore, (newData: any) => {
-  props.chartConfig.option.dataset = newData
-})
-</script>

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

@@ -124,14 +124,7 @@ const calcData = (data: any, type?: string) => {
 const calcCapsuleLengthAndLabelData = (dataset: any) => {
   try {
     const { source } = dataset
-    if (!source) return
-
-    if (source.length === 0) {
-      // 清空数据
-      state.capsuleLength = []
-      state.labelData = []
-      return
-    }
+    if (!source || !source.length) return
 
     state.capsuleItemHeight = numberSizeHandle(state.mergedConfig.itemHeight)
     const capsuleValue = source.map((item: DataProps) => item[state.mergedConfig.dataset.dimensions[1]])
@@ -147,8 +140,9 @@ const calcCapsuleLengthAndLabelData = (dataset: any) => {
     const labelData = Array.from(new Set(new Array(6).fill(0).map((v, i) => Math.ceil(i * oneFifth))))
 
     state.labelData = labelData
+
   } catch (error) {
-    console.warn(error)
+    console.warn(error);
   }
 }
 

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

@@ -4,6 +4,7 @@
     :init-options="initOptions"
     :theme="themeColor"
     :option="option"
+    :manual-update="isPreview()"
     :update-options="{
       replaceMerge: replaceMergeArr
     }"
@@ -23,9 +24,9 @@ import config, { includes, seriesItem } from './config'
 import { mergeTheme } from '@/packages/public/chart'
 import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
 import { useChartDataFetch } from '@/hooks'
+import { isPreview } from '@/utils'
 import { DatasetComponent, GridComponent, TooltipComponent, LegendComponent } from 'echarts/components'
 import isObject from 'lodash/isObject'
-import { cloneDeep } from 'lodash'
 
 const props = defineProps({
   themeSetting: {
@@ -61,7 +62,7 @@ watch(
       if (Array.isArray(newData?.dimensions)) {
         const seriesArr = []
         for (let i = 0; i < newData.dimensions.length - 1; i++) {
-          seriesArr.push(cloneDeep(seriesItem))
+          seriesArr.push(seriesItem)
         }
         replaceMergeArr.value = ['series']
         props.chartConfig.option.series = seriesArr
@@ -78,7 +79,5 @@ watch(
   }
 )
 
-const { vChartRef } = useChartDataFetch(props.chartConfig, useChartEditStore, (newData: any) => {
-  props.chartConfig.option.dataset = newData
-})
+const { vChartRef } = useChartDataFetch(props.chartConfig, useChartEditStore)
 </script>