feat: 补充 GC 失去的视频资源

Merge pull request !211 from Denny/N/A

.gitignore

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

README.md

@@ -1,30 +1,161 @@
-## 总览
+<p align="center">
+  <a
+      href="https://ai.goviewlink.com/?channel=mayun"
+      target="_blank"
+      style="
+        padding: 10px 20px;
+        display: inline-block;
+        border-radius: 10px;
+      ">
+    <img src="readme/GoViewPro.png" alt="go-view" />
+  </a>
+</p>
 
-![logo](readme/logo-t-y.png)
+<p align="center">
+    <img src="readme/logo-t-y.png" alt="go-view" />
+</p>
 
-GoView 是一个高效的拖拽式低代码数据可视化开发平台，将图表或页面元素封装为基础组件，无需编写代码即可制作数据大屏，减少心智负担。
+<h4 align="center">开源、精美、便捷的「数据可视化」低代码开发平台</h4>
 
-### 😶 纯 **前端** 分支： **`master`**
+#### 长期赞助商
 
-### 👻 携带 **后端** 请求分支: **`master-fetch`**
+<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://fastbee.cn/"
+      target="_blank"
+      style="
+        padding: 10px 20px;
+        display: inline-block;
+        border-radius: 10px;
+        background: #f9f9f9;
+      ">
+      <img src="readme/sponsors/fb-banner.gif" alt="go-view" style="width: 250px;" width="250px"/>
+    </a>
+    <br/>
+    <br/>
+    <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>
+    <span> &nbsp;</span>
+    <a
+      href="http://doc.zyplayer.com/#/integrate/zyplayer-doc?utm=goview"
+      target="_blank"
+      style="
+        padding: 10px 20px;
+        display: inline-block;
+        border-radius: 10px;
+        background: #f9f9f9;
+      ">
+      <img src="readme/sponsors/zyplayer-banner.png" alt="go-view" style="width: 250px;" width="250px"/>
+    </a>  
+    <br/>
+    <br/>
+    <a
+      href="https://gitee.com/dandiankeji/icampus"
+      target="_blank"
+      style="
+        padding: 10px 20px;
+        display: inline-block;
+        border-radius: 10px;
+        background: #f9f9f9;
+      ">
+      <img src="readme/sponsors/dandian-banner.png" alt="go-view" style="width: 250px;" width="250px"/>
+    </a>  
+    <a
+      href="https://www.mingdao.com?s=utm_88&utm_source=Goview&utm_medium=banner&utm_campaign=gitee&utm_content=IT%E8%B5%8B%E8%83%BD%E4%B8%9A%E5%8A%A1"
+      target="_blank"
+      style="
+        padding: 10px 20px;
+        display: inline-block;
+        border-radius: 10px;
+        background: #f9f9f9;
+      ">
+      <img src="readme/sponsors/mdy-banner.png" alt="go-view" style="width: 270px;" width="270px"/>
+    </a>
+    <br/>
+    <br/>
+    <a
+      href="https://iotdoc.sagoo.cn/"
+      target="_blank"
+      style="
+        padding: 10px 20px;
+        display: inline-block;
+        border-radius: 10px;
+        background: #f9f9f9;
+      ">
+      <img src="readme/sponsors/shaguo-banner.png" alt="go-view" style="width: 270px;" width="270px"/>
+    </a>
+    <a
+      href="http://www.yunchengxc.com/"
+      target="_blank"
+      style="
+        padding: 10px 20px;
+        display: inline-block;
+        border-radius: 10px;
+        background: #f9f9f9;
+      ">
+      <img src="readme/sponsors/yuncheng-banner.png" alt="go-view" style="width: 270px;" width="270px"/>
+    </a>
+    <br/>
+    <br/>
+    <a
+      href="https://www.diboot.com?from=gv/"
+      target="_blank"
+      style="
+        padding: 10px 20px;
+        display: inline-block;
+        border-radius: 10px;
+        background: #f9f9f9;
+      ">
+      <img src="readme/sponsors/diboot-banner.png" alt="go-view" style="width: 270px;" width="270px"/>
+    </a>
+  </div>
+</div>
 
-### 📚 GoView **文档** 地址：[http://www.mtruning.club:81/](http://www.mtruning.club:81/)
+#### 😶 **纯前端** 分支： **`master`**
 
-项目纯前端-Demo 地址：[https://www.mtruning.club](https://www.mtruning.club)
+#### 👻 携带 **后端** 请求分支: **`master-fetch`**
 
-项目带后端-Demo 地址：[后端 Demo 地址](http://1.117.240.165:8080/goview/#/login)
+#### 📚 GoView **文档** 地址：[https://www.mtruning.club/](https://www.mtruning.club/)
 
-文档-在线地址：[http://www.mtruning.club:81/](http://www.mtruning.club:81/)
+项目纯前端-Demo 地址：[https://vue.mtruning.club/](https://vue.mtruning.club/)
 
-文档-源码地址：[https://gitee.com/MTrun/go-view-doc](https://gitee.com/MTrun/go-view-doc)
+项目带后端-Demo 地址：[https://demo.mtruning.club/](https://demo.mtruning.club/)
 
-### 🤯 后端项目
+Cloud IDE 代码在线预览地址：[https://idegitee.com/dromara/go-view](https://idegitee.com/dromara/go-view)
 
-后端项目 gitee 地址：[https://gitee.com/MTrun/go-view-serve](https://gitee.com/MTrun/go-view-serve)
+#### 🤯 后端项目看这里!
 
-接口说明地址：[https://docs.apipost.cn/preview/5aa85d10a59d66ce/ddb813732007ad2b?target_id=84dbc5b0-158f-4bcb-8f74-793ac604ada3#3e053622-1e76-43f9-a039-756aee822dbb](https://docs.apipost.cn/preview/5aa85d10a59d66ce/ddb813732007ad2b?target_id=84dbc5b0-158f-4bcb-8f74-793ac604ada3#3e053622-1e76-43f9-a039-756aee822dbb)
+后端地址（社区实现，仅供参考）：
 
-技术点：
+- `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) (不是最新, 以前端代码为准)
+
+#### 整体介绍
 
 - 框架：基于 `Vue3` 框架编写，使用 `hooks` 写法抽离部分逻辑，使代码结构更加清晰；
 
@@ -36,17 +167,34 @@ GoView 是一个高效的拖拽式低代码数据可视化开发平台，将图
 
 - 封装：项目进行了详细的工具类封装如：路由、存储、加/解密、文件处理、主题、NaiveUI 全局方法、组件等
 
+- 入选 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)
 
 主要技术栈为：
 
@@ -66,14 +214,17 @@ GoView 是一个高效的拖拽式低代码数据可视化开发平台，将图
 
 已完成图表：
 
-| 分类   | 名称             | 名称             | 名称     |
-| ------ | ---------------- | ---------------- | -------- |
-| 图表   | 柱状图           | 横向柱状图       | 折线图   |
-| \*     | 单/多 折线面积图 | 饼图             | 水球图   |
-| \*     | 环形图           | NaiveUI 多种进度 | 🤠       |
-| 信息   | 文字             | 图片             | 😶       |
-| 列表   | 滚动排名列表     | 滚动表格         | 🤓       |
-| 小组件 | 边框-01~13       | 装饰-01~05       | 数字翻牌 |
+| 分类   | 名称             | 名称       | 名称           | 名称                     |
+| ------ | ---------------- | ---------- | -------------- | ------------------------ |
+| 图表   | 柱状图           | 横向柱状图 | 折线图         | 单/多 折线面积图(渐变色) |
+| \*     | 饼图             | 环形图     | 水球图         | 雷达图                   |
+| \*     | NaiveUI 多种进度 | 散点图     | 对数回归散点图 | 热力图                   |
+| \*     | 漏斗图           | 中国地图   | 高德地图       | 🦊                       |
+| 信息   | 文字             | 渐变文字   | 词云           | 嵌套网页                 |
+| \*     | 图片             | 视频       | 😺             | 🐯                       |
+| 列表   | 滚动排名列表     | 滚动表格   | 🐮             | 🐐                       |
+| 小组件 | 边框-01~13       | 装饰-01~05 | 数字翻牌       | 通用时间                 |
+| \*     | 数字计数         | 倒计时     | 时钟           | 🦁                       |
 
 ## 浏览器支持
 
@@ -81,52 +232,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/)
 
 ## 代码提交
 
@@ -142,10 +248,14 @@ make dist
 - style: 不影响程序逻辑的代码修改
 - chore: 不属于以上类型的其他类型(日常事务)
 
-## 交流
+## 交流群
 
-QQ 群：1030129384
+QQ 群：647239611
 
-![QQ群](readme/go-view-qq.png)
+<img width="260px" src="readme/go-view-qq.jpg" alt="QQ群" style="border-radius: 20px" />
+
+## Pro 部分功能展示
+
+体验地址： <a href="https://ai.goviewlink.com/" target="_blank">https://ai.goviewlink.com/</a>
 
 ![渲染海报](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,8 +1,8 @@
 {
   "name": "go-view",
-  "version": "1.1.11",
+  "version": "1.3.0",
   "engines": {
-    "node": ">=16.14"
+    "node": ">=12.0"
   },
   "scripts": {
     "dev": "vite --host",
@@ -21,8 +21,6 @@
     "@types/crypto-js": "^4.1.1",
     "@types/keymaster": "^1.6.30",
     "@types/lodash": "^4.14.184",
-    "@visactor/vchart": "^1.12.12",
-    "@visactor/vchart-theme": "^1.12.2",
     "animate.css": "^4.1.1",
     "axios": "^1.4.0",
     "color": "^4.2.3",
@@ -39,11 +37,11 @@
     "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-router": "4.0.12",

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

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

src/components/GoVChart/index.vue

@@ -1,242 +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, type ISpec } from '@visactor/vchart'
-import { transformHandler } from './transformProps'
-import { IOption } from '@/packages/components/VChart/index.d'
-
-// 事件说明 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 })
-    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/transformProps/bars.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-transform', spec)
-  return spec
-}

src/components/GoVChart/transformProps/index.ts

@@ -1,8 +0,0 @@
-import { ChatCategoryEnum, IOption } from "@/packages/components/VChart/index.d";
-import bars from './bars'
-export const transformHandler: {
-  [key: string]: (args: IOption) => any
-} = {
-  [ChatCategoryEnum.BAR]: bars,
-  // todo: more charts handler
-}

src/components/Pages/VChartItemSetting/Axis.vue

@@ -1,71 +0,0 @@
-<template>
-  <collapse-item v-model: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.label.visible" size="small"></n-switch>
-        </n-space>
-      </setting-item>
-      <setting-item name="角度">
-        <n-input-number v-model:value="axis.label.style.angle" :min="0" :max="360" size="small" />
-      </setting-item>
-      <FontStyle :style="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>
-      <FontStyle :style="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=""> </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 } from 'vue'
-import FontStyle from './common/FontStyle.vue'
-import { vChartGlobalThemeJsonType } from '@/settings/vchartThemes/index'
-import { CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
-
-defineProps({
-  axis: {
-    type: Object as PropType<vChartGlobalThemeJsonType>,
-    required: true
-  }
-})
-</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="legendItem.item.label.style"></FontStyle>
-        </setting-item-box>
-      </collapse-item>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { PropType } 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/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="optionData.tooltip.style.titleLabel"></FontStyle>
-      </setting-item-box>
-      <setting-item-box name="名称">
-        <FontStyle :style="optionData.tooltip.style.keyLabel"></FontStyle>
-      </setting-item-box>
-      <setting-item-box name="值">
-        <FontStyle :style="optionData.tooltip.style.valueLabel"></FontStyle>
-      </setting-item-box>
-    </collapse-item>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { PropType } 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,33 +0,0 @@
-<template>
-  <!-- todo 补充常用配置项 -->
-  <!-- <div v-if="style"> -->
-  <!-- <setting-item-box v-if="style" name=""> -->
-  <setting-item name="颜色">
-    <n-color-picker v-model:value="style.fill" size="small" />
-  </setting-item>
-  <setting-item name="大小">
-    <n-input-number v-model:value="style.fontSize" :min="1" size="small" />
-  </setting-item>
-  <setting-item name="字体">
-    <n-select v-model:value="style.fontFamily" :options="fontStyleConfig.fontFamily" size="small" />
-  </setting-item>
-  <setting-item name="字重">
-    <n-select v-model:value="style.fontSize" :options="fontStyleConfig.fontWeight" size="small" />
-  </setting-item>
-  <!-- </setting-item-box> -->
-  <!-- </div> -->
-</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<FontType>,
-    required: true
-  }
-})
-</script>

src/components/Pages/VChartItemSetting/index.ts

@@ -1,4 +0,0 @@
-import VChartGlobalSetting from './VChartGlobalSetting.vue'
-import Axis from './Axis.vue'
-
-export { VChartGlobalSetting, Axis }

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 })
       }
     }
   }
@@ -102,12 +101,14 @@ 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))
+        } else {
+          fetchFn()
         }
       }
       // eslint-disable-next-line no-empty

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

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

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/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

@@ -33,6 +33,7 @@ export const lineSeriesItem = {
   },
   symbolSize: 5, //设定实心点的大小
   itemStyle: {
+    color: '#FFE47A',
     borderWidth: 1
   },
   lineStyle: {

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

@@ -4,30 +4,9 @@
   <CollapseItem
     v-for="(item, index) in seriesList"
     :key="index"
-    :name="`系列${index + 1}`"
+    :name="`${item.type == 'bar' ? '柱状图' : '折线图'}`"
     :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
@@ -55,12 +34,6 @@
       <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="大小">
@@ -90,10 +63,10 @@
         <n-select
           v-model:value="item.label.position"
           :options="[
-            { label: '顶部', value: 'top' },
-            { label: '左侧', value: 'left' },
-            { label: '右侧', value: 'right' },
-            { label: '底部', value: 'bottom' }
+            { label: 'top', value: 'top' },
+            { label: 'left', value: 'left' },
+            { label: 'right', value: 'right' },
+            { label: 'bottom', value: 'bottom' }
           ]"
         />
       </setting-item>
@@ -102,18 +75,10 @@
 </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 { PropType, computed } from 'vue'
+import { GlobalSetting, CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
 import { lineConf } from '@/packages/chartConfiguration/echarts'
 import { GlobalThemeJsonType } from '@/settings/chartThemes'
-import { barSeriesItem, lineSeriesItem } from './config'
-
 
 const props = defineProps({
   optionData: {
@@ -125,14 +90,4 @@ const props = defineProps({
 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/index.vue

@@ -4,9 +4,7 @@
     :init-options="initOptions"
     :theme="themeColor"
     :option="option"
-    :update-options="{
-      replaceMerge: replaceMergeArr
-    }"
+    :manual-update="isPreview()"
     autoresize
   ></v-chart>
 </template>
@@ -14,7 +12,6 @@
 <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'
@@ -54,35 +51,17 @@ const option = computed(() => {
 
 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 = []
-        })
+  (newData, oldData) => {
+    if (newData.dimensions.length !== oldData.dimensions.length) {
+      const seriesArr = []
+      for (let i = 0; i < newData.dimensions.length - 1; i++) {
+        seriesArr.push(barSeriesItem, lineSeriesItem)
       }
-    } catch (error) {
-      console.log(error)
+      replaceMergeArr.value = ['series']
+      props.chartConfig.option.series = seriesArr
+      nextTick(() => {
+        replaceMergeArr.value = []
+      })
     }
   },
   {
@@ -90,7 +69,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/Lines/LineCommon/index.vue

@@ -4,6 +4,7 @@
     :init-options="initOptions"
     :theme="themeColor"
     :option="option"
+    :manual-update="isPreview()"
     :update-options="{
       replaceMerge: replaceMergeArr
     }"
@@ -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>

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

@@ -1,5 +1,5 @@
 <template>
-  <v-chart ref="vChartRef" :init-options="initOptions" :theme="themeColor" :option="option.value" autoresize>
+  <v-chart ref="vChartRef" :init-options="initOptions" :theme="themeColor" :option="option.value" :manual-update="isPreview()" autoresize>
   </v-chart>
 </template>
 
@@ -82,7 +82,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/Lines/LineGradients/index.vue

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

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

@@ -1,5 +1,5 @@
 <template>
-  <v-chart ref="vChartRef" :init-options="initOptions" :theme="themeColor" :option="option.value" autoresize>
+  <v-chart ref="vChartRef" :init-options="initOptions" :theme="themeColor" :option="option.value" :manual-update="isPreview()" autoresize>
   </v-chart>
 </template>
 
@@ -79,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/Maps/MapAmap/config.ts

@@ -16,7 +16,8 @@ export enum ThemeEnum {
   MACARON = 'macaron',
   BLUE = 'blue',
   DARKBLUE = 'darkblue',
-  WINE = 'wine'
+  WINE = 'wine',
+  WEIXIN = 'tileLayer'
 }
 
 export enum LangEnum {
@@ -30,11 +31,6 @@ export enum ViewModeEnum {
   STEREOSCOPIC = '3D'
 }
 
-export const ShowHideEnum = {
-  SHOW: true,
-  HIDE: false
-}
-
 export enum FeaturesEnum {
   BG = 'bg',
   POINT = 'point',
@@ -75,25 +71,6 @@ export const option = {
     },
     mapMarkerType: MarkerEnum.CIRCLE_MARKER,
     viewMode: ViewModeEnum.PLANE,
-    showLabel: ShowHideEnum.SHOW,
-    satelliteTileLayer: {
-      show: ShowHideEnum.HIDE,
-      zIndex: 1,
-      opacity: 1,
-      zooms: [3, 18]
-    },
-    roadNetTileLayer: {
-      show: ShowHideEnum.HIDE,
-      zIndex: 2,
-      opacity: 1,
-      zooms: [3, 18]
-    },
-    trafficTileLayer: {
-      show: ShowHideEnum.HIDE,
-      zIndex: 3,
-      opacity: 1,
-      zooms: [3, 18]
-    },
     lang: LangEnum.ZH_CN,
     features: [FeaturesEnum.BG, FeaturesEnum.POINT, FeaturesEnum.ROAD, FeaturesEnum.BUILDING]
   }

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

@@ -22,21 +22,13 @@
         <n-select size="small" v-model:value="optionData.mapOptions.amapStyleKey" :options="themeOptions" />
       </setting-item>
     </setting-item-box>
-    <setting-item-box name="显示要素" :alone="true">
+    <setting-item-box name="内容" :alone="true">
       <n-checkbox-group v-model:value="optionData.mapOptions.features">
         <n-space item-style="display: flex;">
           <n-checkbox :value="item.value" :label="item.label" v-for="(item, index) in featuresOptions" :key="index" />
         </n-space>
       </n-checkbox-group>
     </setting-item-box>
-    <setting-item-box name="文字标注" :alone="true">
-      <setting-item>
-        <n-space>
-          <n-switch v-model:value="optionData.mapOptions.showLabel" size="small" />
-          <n-text>是否显示</n-text>
-        </n-space>
-      </setting-item>
-    </setting-item-box>
     <setting-item-box name="位置">
       <setting-item name="经度">
         <n-input-number v-model:value="optionData.mapOptions.amapLon" :show-button="false" size="small">
@@ -84,94 +76,11 @@
       </setting-item>
     </setting-item-box>
   </collapse-item>
-  <collapse-item name="图层" :expanded="true">
-    <setting-item-box name="卫星图层">
-      <setting-item>
-        <n-space>
-          <n-switch v-model:value="optionData.mapOptions.satelliteTileLayer.show" size="small" />
-          <n-text>是否显示</n-text>
-        </n-space>
-      </setting-item>
-      <setting-item name="叠加顺序值">
-        <n-input-number
-          v-model:value="optionData.mapOptions.satelliteTileLayer.zIndex"
-          :min="0"
-          size="small"
-        ></n-input-number>
-      </setting-item>
-      <setting-item name="透明度">
-        <n-input-number
-          v-model:value="optionData.mapOptions.satelliteTileLayer.opacity"
-          :min="0"
-          :max="1"
-          step="0.1"
-          size="small"
-        ></n-input-number>
-      </setting-item>
-      <setting-item name="缩放级别范围">
-        <n-slider v-model:value="optionData.mapOptions.satelliteTileLayer.zooms" range :step="1" :max="18" :min="3" />
-      </setting-item>
-    </setting-item-box>
-    <setting-item-box name="路网图层">
-      <setting-item>
-        <n-space>
-          <n-switch v-model:value="optionData.mapOptions.roadNetTileLayer.show" size="small" />
-          <n-text>是否显示</n-text>
-        </n-space>
-      </setting-item>
-      <setting-item name="叠加顺序值">
-        <n-input-number
-          v-model:value="optionData.mapOptions.roadNetTileLayer.zIndex"
-          :min="0"
-          size="small"
-        ></n-input-number>
-      </setting-item>
-      <setting-item name="透明度">
-        <n-input-number
-          v-model:value="optionData.mapOptions.roadNetTileLayer.opacity"
-          :min="0"
-          :max="1"
-          step="0.1"
-          size="small"
-        ></n-input-number>
-      </setting-item>
-      <setting-item name="缩放级别范围">
-        <n-slider v-model:value="optionData.mapOptions.roadNetTileLayer.zooms" range :step="1" :max="18" :min="3" />
-      </setting-item>
-    </setting-item-box>
-    <setting-item-box name="实时交通">
-      <setting-item>
-        <n-space>
-          <n-switch v-model:value="optionData.mapOptions.trafficTileLayer.show" size="small" />
-          <n-text>是否显示</n-text>
-        </n-space>
-      </setting-item>
-      <setting-item name="叠加顺序值">
-        <n-input-number
-          v-model:value="optionData.mapOptions.trafficTileLayer.zIndex"
-          :min="0"
-          size="small"
-        ></n-input-number>
-      </setting-item>
-      <setting-item name="透明度">
-        <n-input-number
-          v-model:value="optionData.mapOptions.trafficTileLayer.opacity"
-          :min="0"
-          :max="1"
-          step="0.1"
-          size="small"
-        ></n-input-number>
-      </setting-item>
-      <setting-item name="缩放级别范围">
-        <n-slider v-model:value="optionData.mapOptions.trafficTileLayer.zooms" range :step="1" :max="18" :min="3" />
-      </setting-item>
-    </setting-item-box>
-  </collapse-item>
 </template>
 
 <script setup lang="ts">
 import { PropType } from 'vue'
-import { option, MarkerEnum, ThemeEnum, LangEnum, ViewModeEnum, ShowHideEnum, FeaturesEnum } from './config'
+import { option, MarkerEnum, ThemeEnum, LangEnum, ViewModeEnum, FeaturesEnum } from './config'
 import { CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
 
 defineProps({
@@ -225,6 +134,10 @@ const themeOptions = [
   {
     value: ThemeEnum.WINE,
     label: '酱籽'
+  },
+  {
+    value: ThemeEnum.WEIXIN,
+    label: '卫星'
   }
 ]
 
@@ -257,19 +170,19 @@ const viewModeOptions = [
 const featuresOptions = [
   {
     value: FeaturesEnum.BG,
-    label: '区域面'
+    label: '显示地图背景'
   },
   {
     value: FeaturesEnum.POINT,
-    label: '标注'
+    label: '显示标识'
   },
   {
     value: FeaturesEnum.ROAD,
-    label: '道路'
+    label: '显示道路'
   },
   {
     value: FeaturesEnum.BUILDING,
-    label: '建筑物'
+    label: '显示建筑'
   }
 ]
 

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

@@ -28,13 +28,9 @@ let {
   amapStyleKeyCustom,
   features,
   viewMode,
-  showLabel,
   pitch,
   skyColor,
-  marker,
-  satelliteTileLayer,
-  roadNetTileLayer,
-  trafficTileLayer
+  marker
 } = toRefs(props.chartConfig.option.mapOptions)
 
 let mapIns: any = null
@@ -46,7 +42,7 @@ const initMap = (newData: any) => {
   // 初始化
   AMapLoader.load({
     key: amapKey.value, //api服务key--另外需要在public中使用安全密钥！！！
-    version: '1.4.15', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
+    version: '1.4.8', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
     plugins: ['AMap.PlaceSearch', 'AMap.AutoComplete'] // 需要使用的的插件列表
   })
     .then(AMap => {
@@ -60,40 +56,17 @@ const initMap = (newData: any) => {
         pitch: pitch.value, // 地图俯仰角度，有效范围 0 度- 83 度
         skyColor: skyColor.value,
         viewMode: viewMode.value, // 地图模式
-        showLabel: showLabel.value, // 是否显示地图文字标记
         willReadFrequently: true
       })
       dataHandle(props.chartConfig.option.dataset)
-
-      let satelliteLayer = new AMap.TileLayer.Satellite({
-        zIndex: satelliteTileLayer.value.zIndex,
-        opacity: satelliteTileLayer.value.opacity,
-        zooms: satelliteTileLayer.value.zooms
-      })
-      let roadNetLayer = new AMap.TileLayer.RoadNet({
-        zIndex: roadNetTileLayer.value.zIndex,
-        opacity: roadNetTileLayer.value.opacity,
-        zooms: roadNetTileLayer.value.zooms
-      })
-      let trafficLayer = new AMap.TileLayer.Traffic({
-        zIndex: trafficTileLayer.value.zIndex,
-        opacity: trafficTileLayer.value.opacity,
-        zooms: trafficTileLayer.value.zooms
-      })
-      mapIns.remove([satelliteLayer, roadNetLayer, trafficLayer])
-      if (satelliteTileLayer.value.show) {
-        mapIns.add([satelliteLayer])
+      let satellite = new AMap.TileLayer.Satellite()
+      let roadNet = new AMap.TileLayer.RoadNet()
+      if (newData.amapStyleKey === ThemeEnum.WEIXIN) {
+        mapIns.add([satellite, roadNet])
+      } else {
+        mapIns.remove([satellite, roadNet])
+        mapIns.setMapStyle(`amap://styles/${amapStyleKeyCustom.value !== '' ? amapStyleKeyCustom.value : amapStyleKey.value}`)
       }
-      if (roadNetTileLayer.value.show) {
-        mapIns.add([roadNetLayer])
-      }
-      if (trafficTileLayer.value.show) {
-        mapIns.add([trafficLayer])
-      }
-
-      mapIns.setMapStyle(
-        `amap://styles/${amapStyleKeyCustom.value !== '' ? amapStyleKeyCustom.value : amapStyleKey.value}`
-      )
     })
     .catch(e => {})
 }

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

@@ -81,8 +81,8 @@
       </SettingItem>
     </SettingItemBox>
 
-    <SettingItemBox name="鼠标悬停聚焦">
-      <SettingItem name="禁用（预览可见）">
+    <SettingItemBox name="悬浮 （预览可见）">
+      <SettingItem name="禁用">
         <n-space>
           <n-switch v-model:value="seriesList[1].emphasis.disabled" size="small"></n-switch>
         </n-space>

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

@@ -171,19 +171,7 @@ const backLevel = () => {
 
 // 切换地图
 const checkOrMap = async (newData: string) => {
-  if (newData === 'china') {
-    if (props.chartConfig.option.mapRegion.showHainanIsLands) {
-      // 显示南海
-      hainanLandsHandle(true)
-      vEchartsSetOption()
-    } else {
-      // 隐藏南海
-      hainanLandsHandle(false)
-      vEchartsSetOption()
-    }
-  } else {
-    await getGeojson(newData)
-  }
+  await getGeojson(newData)
   props.chartConfig.option.geo.map = newData
   props.chartConfig.option.series.forEach((item: any) => {
     if (item.type === 'map') item.map = newData

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

@@ -52,11 +52,7 @@ const option = {
         show: false,
         position: 'center',
         formatter: '{b}',
-        fontWeight: 'normal',
-        fontSize: 14,
-        color: '#454E54',
-        textBorderColor: '#ffffff',
-        textBorderWidth: 1
+        fontSize:12
       },
       emphasis: {
         label: {

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

@@ -18,20 +18,6 @@
         <n-text :depth="3">无鼠标点击图例场景时，可强行打开图例</n-text>
       </SettingItem>
     </SettingItemBox>
-    <SettingItemBox name="图形">
-      <setting-item name="内圈范围">
-        <n-input v-model:value="optionData.series[0].radius[0]" size="small"></n-input>
-      </setting-item>
-      <setting-item name="外圈范围">
-        <n-input v-model:value="optionData.series[0].radius[1]" size="small"></n-input>
-      </setting-item>
-      <setting-item name="X轴中心">
-        <n-input v-model:value="optionData.series[0].center[0]" size="small"></n-input>
-      </setting-item>
-      <setting-item name="Y轴中心">
-        <n-input v-model:value="optionData.series[0].center[1]" size="small"></n-input>
-      </setting-item>
-    </SettingItemBox>
     <SettingItemBox name="标签">
       <SettingItem>
         <n-space>
@@ -52,67 +38,28 @@
         <n-select v-model:value="optionData.series[0].label.formatter" size="small" :options="labelFormatterOptions" />
       </setting-item>
     </SettingItemBox>
-    <setting-item-box name="字体">
-      <setting-item name="大小">
-        <n-input-number v-model:value="optionData.series[0].label.fontSize" size="small" :min="0"></n-input-number>
-      </setting-item>
-      <setting-item name="颜色" v-if="optionData.series[0].label.color">
-        <n-color-picker size="small" :modes="['hex']" v-model:value="optionData.series[0].label.color"></n-color-picker>
-      </setting-item>
-      <SettingItem name="文字加粗" v-if="optionData.series[0].label.fontWeight">
-        <n-select
-          v-model:value="optionData.series[0].label.fontWeight"
-          size="small"
-          :options="labelConfig.fontWeight"
-        />
-      </SettingItem>
-      <setting-item name="文字边框大小" v-if="optionData.series[0].label.textBorderWidth">
-        <n-input-number
-          v-model:value="optionData.series[0].label.textBorderWidth"
-          size="small"
-          :min="0"
-        ></n-input-number>
-      </setting-item>
-      <setting-item name="文字边框色" v-if="optionData.series[0].label.textBorderColor">
-        <n-color-picker
-          size="small"
-          :modes="['hex']"
-          v-model:value="optionData.series[0].label.textBorderColor"
-        ></n-color-picker>
-      </setting-item>
-    </setting-item-box>
     <setting-item-box name="圆角">
-      <setting-item name="圆角大小">
-        <n-input-number
-          v-model:value="optionData.series[0].itemStyle.borderRadius"
-          size="small"
-          :min="0"
-        ></n-input-number>
+      <setting-item>
+        <n-space>
+          <n-input-number
+            v-model:value="optionData.series[0].itemStyle.borderRadius"
+            size="small"
+            :min="0"
+          ></n-input-number>
+          <n-text>圆角大小</n-text>
+        </n-space>
       </setting-item>
-      <setting-item name="线条宽度">
-        <n-input-number
-          v-model:value="optionData.series[0].itemStyle.borderWidth"
-          size="small"
-          :min="0"
-        ></n-input-number>
+      <setting-item>
+        <n-space>
+          <n-input-number
+            v-model:value="optionData.series[0].itemStyle.borderWidth"
+            size="small"
+            :min="0"
+          ></n-input-number>
+          <n-text>线条宽度</n-text>
+        </n-space>
       </setting-item>
     </setting-item-box>
-    <setting-item-box name="鼠标聚焦">
-      <setting-item name="文字大小">
-        <n-input-number
-          v-model:value="optionData.series[0].emphasis.label.fontSize"
-          size="small"
-          :min="0"
-        ></n-input-number>
-      </setting-item>
-      <SettingItem name="文字加粗" v-if="optionData.series[0].emphasis.label.fontWeight">
-        <n-select
-          v-model:value="optionData.series[0].emphasis.label.fontWeight"
-          size="small"
-          :options="labelConfig.fontWeight"
-        />
-      </SettingItem>
-    </setting-item-box>
   </CollapseItem>
 </template>
 

src/packages/components/Charts/Scatters/ScatterCommon/config.ts

@@ -47,9 +47,10 @@ export const option = {
   tooltip: {
     showDelay: 0,
     formatter: (params: { value: string | any[]; seriesName: string; name: string }) => {
+      // console.log(params)
       return params.value.length > 1
         ? `${params.seriesName}：<br />${params.value[0]} ${params.value[1]}`
-        : `${params.name} ${params.value}`
+        : `${params.seriesName}：<br />${params.name} ${params.value}`
     },
     axisPointer: {
       show: true,

src/packages/components/Decorates/FlowChart/FlowChartLine/config.ts

@@ -1,19 +0,0 @@
-import { PublicConfigClass } from '@/packages/public'
-import { CreateComponentType } from '@/packages/index.d'
-import { FlowChartLineConfig } from './index'
-import cloneDeep from 'lodash/cloneDeep'
-
-export const option = {
-  endWidth: 15,
-  lineWidth: 2, //线条粗细
-  lineNum: 2, //向下数量
-  lineNumUp: 2, //向上数量
-  backgroundCol: '#303a4c', //线条背景
-  animateCol: '#3788ea' //流动动画背景
-}
-
-export default class Config extends PublicConfigClass implements CreateComponentType {
-  public key = FlowChartLineConfig.key
-  public chartConfig = cloneDeep(FlowChartLineConfig)
-  public option = cloneDeep(option)
-}

src/packages/components/Decorates/FlowChart/FlowChartLine/config.vue

@@ -1,37 +0,0 @@
-<template>
-  <CollapseItem name="线条" :expanded="true">
-    <SettingItemBox name="折线数量">
-      <SettingItem name="向下增加">
-        <n-input-number size="small" :min="0" v-model:value="optionData.lineNum"></n-input-number>
-      </SettingItem>
-      <SettingItem name="向上增加">
-        <n-input-number size="small" :min="0" v-model:value="optionData.lineNumUp"></n-input-number>
-      </SettingItem>
-    </SettingItemBox>
-
-    <SettingItemBox name="折线样式">
-      <SettingItem name="折线粗细">
-        <n-input-number size="small" :min="1" v-model:value="optionData.lineWidth"></n-input-number>
-      </SettingItem>
-      <SettingItem name="背景条颜色">
-        <n-color-picker size="small" :modes="['hex']" v-model:value="optionData.backgroundCol"></n-color-picker>
-      </SettingItem>
-      <SettingItem name="流动颜色">
-        <n-color-picker size="small" :modes="['hex']" v-model:value="optionData.animateCol"></n-color-picker>
-      </SettingItem>
-    </SettingItemBox>
-  </CollapseItem>
-</template>
-
-<script setup lang="ts">
-import { PropType } from 'vue'
-import { CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
-import { option } from './config'
-
-const props = defineProps({
-  optionData: {
-    type: Object as PropType<typeof option>,
-    required: true
-  }
-})
-</script>

src/packages/components/Decorates/FlowChart/FlowChartLine/index.ts

@@ -1,14 +0,0 @@
-import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'
-import { ChatCategoryEnum,ChatCategoryEnumName } from '../../index.d'
-
-export const FlowChartLineConfig: ConfigType = {
-    key: 'FlowChartLine',
-    chartKey: 'VFlowChartLine',
-    conKey: 'VCFlowChartLine',
-    title: '流程线',
-    category: ChatCategoryEnum.FlowChart,
-    categoryName: ChatCategoryEnumName.FlowChart,
-    package: PackagesCategoryEnum.DECORATES,
-    chartFrame: ChartFrameEnum.STATIC,
-    image: 'flow-zhexian.png'
-}

src/packages/components/Decorates/FlowChart/FlowChartLine/index.vue

@@ -1,93 +0,0 @@
-<template>
-  <svg :width="w" :height="h">
-    <polyline :stroke-width="lineWidth" :points="getStartPoint(-1, '')" :stroke="backgroundCol" fill="none" />
-    <polyline
-      :stroke-width="lineWidth"
-      class="g-dashed-line"
-      :points="getStartPoint(-1, '')"
-      :stroke="animateCol"
-      fill="none"
-    />
-    <polyline
-      :stroke-width="lineWidth"
-      v-for="(item, index) in lineNum"
-      :key="index"
-      :points="getStartPoint(index + 1, 'down')"
-      :stroke="backgroundCol"
-      fill="none"
-    />
-    <polyline
-      :stroke-width="lineWidth"
-      class="g-dashed-line"
-      v-for="(item, index) in lineNum"
-      :key="index"
-      :points="getStartPoint(index + 1, 'down')"
-      :stroke="animateCol"
-      fill="none"
-    />
-    <polyline
-      :stroke-width="lineWidth"
-      v-for="(item, index) in lineNumUp"
-      :key="index"
-      :points="getStartPoint(index + 1, 'up')"
-      :stroke="backgroundCol"
-      fill="none"
-    />
-    <polyline
-      :stroke-width="lineWidth"
-      class="g-dashed-line"
-      v-for="(item, index) in lineNumUp"
-      :key="index"
-      :points="getStartPoint(index + 1, 'up')"
-      :stroke="animateCol"
-      fill="none"
-    />
-  </svg>
-</template>
-
-<script setup lang="ts">
-import { PropType, toRefs, computed } from 'vue'
-import { CreateComponentType } from '@/packages/index.d'
-
-const props = defineProps({
-  chartConfig: {
-    type: Object as PropType<CreateComponentType>,
-    required: true
-  }
-})
-
-const { w, h } = toRefs(props.chartConfig.attr)
-const { lineNum, lineNumUp, lineWidth, backgroundCol, animateCol } = toRefs(props.chartConfig.option)
-const getStartPoint = (num: number, direction: string) => {
-  const lineLength = w.value / 2
-  const lineColLength =
-    h.value / (lineNumUp.value + lineNum.value) - lineWidth.value / (lineNumUp.value + lineNum.value)
-  if (num === -1 && direction === '') {
-    return `0,${h.value / 2} ${lineLength},${h.value / 2} ${lineLength * 2},${h.value / 2}`
-  } else if (num !== -1 && direction === 'down') {
-    return `0,${h.value / 2} ${lineLength},${h.value / 2} ${lineLength},${h.value / 2 + num * lineColLength},${
-      lineLength * 2
-    },${h.value / 2 + num * lineColLength}`
-  } else if (num !== -1 && direction === 'up') {
-    return `0,${h.value / 2} ${lineLength},${h.value / 2} ${lineLength},${h.value / 2 - num * lineColLength},${
-      lineLength * 2
-    },${h.value / 2 - num * lineColLength}`
-  }
-}
-</script>
-
-<style scoped>
-.g-dashed-line {
-  stroke-dasharray: 20 130;
-  stroke-dashoffset: 0;
-  animation: move 3s infinite linear;
-}
-@keyframes move {
-  0% {
-    stroke-dashoffset: 20;
-  }
-  100% {
-    stroke-dashoffset: -130;
-  }
-}
-</style>

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

@@ -1,3 +0,0 @@
-import { FlowChartLineConfig } from './FlowChartLine/index'
-
-export default [FlowChartLineConfig]

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

@@ -1,20 +0,0 @@
-import { PublicConfigClass } from '@/packages/public'
-import { CreateComponentType } from '@/packages/index.d'
-import { CirclePointConfig } from './index'
-import cloneDeep from 'lodash/cloneDeep'
-import { chartInitConfig } from '@/settings/designSetting'
-
-export const option = {
-  outCircle: 15,
-  inCircle: 5,
-  outCircleColor: '#3f5261',
-  inCircleColor: '#fff',
-  outCircleWidth: 2
-}
-
-export default class Config extends PublicConfigClass implements CreateComponentType {
-  public key = CirclePointConfig.key
-  public attr = { ...chartInitConfig, w: 97, h: 97, zIndex: 1 }
-  public chartConfig = cloneDeep(CirclePointConfig)
-  public option = cloneDeep(option)
-}

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

@@ -1,51 +0,0 @@
-<template>
-  <CollapseItem name="线条" :expanded="true">
-    <SettingItemBox name="具体">
-      <SettingItem name="外圆环半径">
-        <n-input-number
-            size="small"
-            v-model:value="optionData.outCircle"
-        ></n-input-number>
-      </SettingItem>
-      <SettingItem name="内部圆形半径">
-        <n-input-number
-            size="small"
-            v-model:value="optionData.inCircle"
-        ></n-input-number>
-      </SettingItem>
-      <SettingItem name="外圆环粗细">
-        <n-input-number
-            size="small"
-            v-model:value="optionData.outCircleWidth"
-        ></n-input-number>
-      </SettingItem>
-
-      <SettingItem name="外圆环颜色">
-        <n-color-picker size="small" :modes="['hex']" v-model:value="optionData.outCircleColor"></n-color-picker>
-      </SettingItem>
-      <SettingItem name="内部圆形颜色">
-        <n-color-picker size="small" :modes="['hex']" v-model:value="optionData.inCircleColor"></n-color-picker>
-      </SettingItem>
-    </SettingItemBox>
-
-  </CollapseItem>
-
-</template>
-
-<script setup lang="ts">
-import { PropType } from 'vue'
-import {
-  CollapseItem,
-  SettingItemBox,
-  SettingItem
-} from '@/components/Pages/ChartItemSetting'
-import { option } from './config'
-
-const props = defineProps({
-  optionData: {
-    type: Object as PropType<typeof option>,
-    required: true
-  }
-})
-
-</script>

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

@@ -1,14 +0,0 @@
-import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'
-import { ChatCategoryEnum,ChatCategoryEnumName } from '../../index.d'
-
-export const CirclePointConfig: ConfigType = {
-    key: 'CirclePoint',
-    chartKey: 'VCirclePoint',
-    conKey: 'VCCirclePoint',
-    title: '圆点光环',
-    category: ChatCategoryEnum.MORE,
-    categoryName: ChatCategoryEnumName.MORE,
-    package: PackagesCategoryEnum.DECORATES,
-    chartFrame: ChartFrameEnum.STATIC,
-    image: 'flow-circle.png'
-}

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

@@ -1,28 +0,0 @@
-<template>
-  <svg :width="w" :height="h">
-    <defs>
-      <filter id="blurFilter" x="-20%" y="-20%" width="140%" height="140%">
-        <feGaussianBlur in="SourceGraphic" stdDeviation="1" />
-      </filter>
-    </defs>
-    <circle :cx="w / 2 " :cy="h / 2" :r="inCircle" :fill="inCircleColor" filter="url(#blurFilter)"/>
-    <!-- 外部圆环 -->
-    <circle :cx="w / 2 " :cy="h / 2" :r="outCircle" fill="none" :stroke="outCircleColor"  :stroke-width="outCircleWidth"/>
-  </svg>
-</template>
-
-<script setup lang="ts">
-import { PropType, toRefs } from 'vue'
-import { CreateComponentType } from '@/packages/index.d'
-
-const props = defineProps({
-  chartConfig: {
-    type: Object as PropType<CreateComponentType>,
-    required: true,
-  },
-})
-const { w, h } = toRefs(props.chartConfig.attr)
-const { outCircle,inCircle,outCircleColor,inCircleColor,outCircleWidth} = toRefs(props.chartConfig.option)
-
-</script>
-

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

@@ -6,7 +6,6 @@ import { CountDownConfig } from './CountDown/index'
 import { FlipperNumberConfig } from './FlipperNumber'
 import { PipelineHConfig } from './PipelineH/index'
 import { PipelineVConfig } from './PipelineV/index'
-import { CirclePointConfig } from './CirclePoint/index'
 
 export default [
   NumberConfig,
@@ -16,6 +15,5 @@ export default [
   ClockConfig,
   FullScreenConfig,
   PipelineHConfig,
-  PipelineVConfig,
-  CirclePointConfig
+  PipelineVConfig
 ]

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

@@ -1,7 +1,6 @@
 export enum ChatCategoryEnum {
   BORDER = 'Borders',
   DECORATE = 'Decorates',
-  FlowChart = 'FlowChart',
   THREE = 'Three',
   MORE = 'Mores'
 }
@@ -9,7 +8,6 @@ export enum ChatCategoryEnum {
 export enum ChatCategoryEnumName {
   BORDER = '边框',
   DECORATE = '装饰',
-  FlowChart = '流程',
   THREE = '三维',
   MORE = '更多'
-}
+}

src/packages/components/Decorates/index.ts

@@ -1,7 +1,6 @@
 import Borders from './Borders'
 import Decorates from './Decorates'
-import FlowChart from './FlowChart'
 import Three from './Three'
 import Mores from './Mores'
 
-export const DecorateList = [...Borders, ...Decorates,...FlowChart, ...Three, ...Mores]
+export const DecorateList = [...Borders, ...Decorates, ...Three, ...Mores]

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

@@ -8,8 +8,8 @@
         <n-input-number v-model:value="optionData.size" size="small" :min="0" placeholder="尺寸"></n-input-number>
       </setting-item>
     </setting-item-box>
-    <setting-item-box name="快捷旋转">
-      <setting-item name="也可使用通用的【变换】来旋转">
+    <setting-item-box name="旋转">
+      <setting-item name="旋转">
         <n-select v-model:value="optionData.rotate" size="small" :options="rotateMode"></n-select>
       </setting-item>
     </setting-item-box>
@@ -35,15 +35,15 @@ const rotateMode = [
     label: '0°'
   },
   {
-    value: 90,
+    value: 1,
     label: '90°'
   },
   {
-    value: 180,
+    value: 2,
     label: '180°'
   },
   {
-    value: 270,
+    value: 3,
     label: '270°'
   }
 ]

src/packages/components/Informations/Inputs/InputsInput/index.ts

@@ -10,5 +10,5 @@ export const InputsInputConfig: ConfigType = {
     categoryName: ChatCategoryEnumName.INPUTS,
     package: PackagesCategoryEnum.INFORMATIONS,
     chartFrame: ChartFrameEnum.STATIC,
-    image: 'inputs_input.png'
+    image: 'inputs_select.png'
 }

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

@@ -36,7 +36,7 @@ let option = shallowReactive({ ...configOption })
 // 预览更新
 const vVideoRef = ref(null)
 useChartDataFetch(props.chartConfig, useChartEditStore, (newData: any) => {
-  option.dataset = newData
+  option = newData
 })
 
 // 编辑更新

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

@@ -36,8 +36,6 @@
 import { computed, PropType, toRefs, watch, reactive, ref } from 'vue'
 import { CreateComponentType } from '@/packages/index.d'
 import { icon } from '@/plugins'
-import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
-import { useChartDataFetch } from '@/hooks'
 
 const props = defineProps({
   chartConfig: {
@@ -85,13 +83,6 @@ watch(
     deep: true
   }
 )
-
-// setdata 数据监听与更改
-useChartDataFetch(props.chartConfig, useChartEditStore, (newData: any) => {
-  props.chartConfig.option.dataset = newData
-})
-
-
 </script>
 
 <style lang="scss" scoped>

src/packages/components/VChart/Bars/VChartBarCommon/config.ts

@@ -1,47 +0,0 @@
-import { PublicConfigClass } from '@/packages/public'
-import { VChartBarCommonConfig } from './index'
-import { CreateComponentType } from '@/packages/index.d'
-import { vChartOptionPrefixHandle } from '@/packages/public/vChart'
-import data from './data.json'
-import cloneDeep from 'lodash/cloneDeep'
-import axisThemeJson from '@/settings/vchartThemes/axis.theme.json'
-import { IBarOption } from '../../index.d'
-
-export const includes = ['legends', 'tooltip']
-export const option: IBarOption & { dataset?: any } = {
-  // 图表配置
-  type: 'bar',
-  dataset: data,
-  stack: true,
-  xField: ['year', 'type'],
-  yField: ['value'],
-  seriesField: 'type',
-  // 业务配置（后续会被转换为图表spec)
-  category: VChartBarCommonConfig.category,
-  xAxis: {
-    name: 'x轴',
-    ...axisThemeJson,
-    grid: {
-      ...axisThemeJson.grid,
-      visible: false
-    }
-  },
-  yAxis: {
-    name: 'y轴',
-    ...axisThemeJson,
-    grid: {
-      ...axisThemeJson.grid,
-      style: {
-        ...axisThemeJson.grid.style,
-        lineDash: [3, 3]
-      }
-    }
-  }
-}
-
-export default class Config extends PublicConfigClass implements CreateComponentType {
-  public key = VChartBarCommonConfig.key
-  public chartConfig = cloneDeep(VChartBarCommonConfig)
-  // 图表配置项
-  public option = vChartOptionPrefixHandle(option, includes)
-}

src/packages/components/VChart/Bars/VChartBarCommon/config.vue

@@ -1,19 +0,0 @@
-<template>
-  <!-- vCharts 全局设置 -->
-  <VChartGlobalSetting :optionData="optionData"></VChartGlobalSetting>
-  <Axis :axis="optionData.xAxis"></Axis>
-  <Axis :axis="optionData.yAxis"></Axis>
-</template>
-
-<script setup lang="ts">
-import { PropType } from 'vue'
-import { VChartGlobalSetting, Axis } from '@/components/Pages/VChartItemSetting'
-import { vChartGlobalThemeJsonType } from '@/settings/vchartThemes/index'
-
-defineProps({
-  optionData: {
-    type: Object as PropType<vChartGlobalThemeJsonType>,
-    required: true
-  }
-})
-</script>

src/packages/components/VChart/Bars/VChartBarCommon/data.json

@@ -1,25 +0,0 @@
-{
-  "values": [
-    { "type": "Autocracies", "year": "1930", "value": 129 },
-    { "type": "Autocracies", "year": "1940", "value": 133 },
-    { "type": "Autocracies", "year": "1950", "value": 130 },
-    { "type": "Autocracies", "year": "1960", "value": 126 },
-    { "type": "Autocracies", "year": "1970", "value": 117 },
-    { "type": "Autocracies", "year": "1980", "value": 114 },
-    { "type": "Autocracies", "year": "1990", "value": 111 },
-    { "type": "Autocracies", "year": "2000", "value": 89 },
-    { "type": "Autocracies", "year": "2010", "value": 80 },
-    { "type": "Autocracies", "year": "2018", "value": 80 },
-
-    { "type": "Democracies", "year": "1930", "value": 22 },
-    { "type": "Democracies", "year": "1940", "value": 13 },
-    { "type": "Democracies", "year": "1950", "value": 25 },
-    { "type": "Democracies", "year": "1960", "value": 29 },
-    { "type": "Democracies", "year": "1970", "value": 38 },
-    { "type": "Democracies", "year": "1980", "value": 41 },
-    { "type": "Democracies", "year": "1990", "value": 57 },
-    { "type": "Democracies", "year": "2000", "value": 87 },
-    { "type": "Democracies", "year": "2010", "value": 98 },
-    { "type": "Democracies", "year": "2018", "value": 99 }
-  ]
-}

src/packages/components/VChart/Bars/VChartBarCommon/index.ts

@@ -1,14 +0,0 @@
-import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'
-import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'
-
-export const VChartBarCommonConfig: ConfigType = {
-  key: 'VChartBarCommon',
-  chartKey: 'VVChartBarCommon',
-  conKey: 'VCVChartBarCommon',
-  title: 'VChart柱状图',
-  category: ChatCategoryEnum.BAR,
-  categoryName: ChatCategoryEnumName.BAR,
-  package: PackagesCategoryEnum.VCHART,
-  chartFrame: ChartFrameEnum.VCHART,
-  image: 'vchart_bar_x.png'
-}

src/packages/components/VChart/Bars/VChartBarCommon/index.vue

@@ -1,22 +0,0 @@
-<template>
-  <GoVChart ref="vChartRef" :option="chartConfig.option"> </GoVChart>
-</template>
-
-<script setup lang="ts">
-import { PropType } from 'vue'
-import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
-import { GoVChart } from '@/components/GoVChart'
-import { useChartDataFetch } from '@/hooks'
-import config from './config'
-
-const props = defineProps({
-  chartConfig: {
-    type: Object as PropType<config>,
-    required: true
-  }
-})
-
-const { vChartRef } = useChartDataFetch(props.chartConfig, useChartEditStore, (newData: any) => {
-  props.chartConfig.option.dataset = newData
-})
-</script>

src/packages/components/VChart/Bars/VChartBarStack/config.ts

@@ -1,47 +0,0 @@
-import { PublicConfigClass } from '@/packages/public'
-import { VChartBarStackConfig } from './index'
-import { CreateComponentType } from '@/packages/index.d'
-import { vChartOptionPrefixHandle } from '@/packages/public/vChart'
-import data from './data.json'
-import cloneDeep from 'lodash/cloneDeep'
-import axisThemeJson from '@/settings/vchartThemes/axis.theme.json'
-import { IBarOption } from '../../index.d'
-
-export const includes = ['legends', 'tooltip']
-export const option: IBarOption & { dataset?: any } = {
-  // 图表配置
-  type: 'bar',
-  dataset: data,
-  xField: ['type'],
-  yField: ['value'],
-  seriesField: 'year',
-  stack: true,
-  // 业务配置（后续会被转换为图表spec)
-  category: VChartBarStackConfig.category,
-  xAxis: {
-    name: 'x轴',
-    ...axisThemeJson,
-    grid: {
-      ...axisThemeJson.grid,
-      visible: false
-    }
-  },
-  yAxis: {
-    name: 'y轴',
-    ...axisThemeJson,
-    grid: {
-      ...axisThemeJson.grid,
-      style: {
-        ...axisThemeJson.grid.style,
-        lineDash: [3, 3]
-      }
-    }
-  }
-}
-
-export default class Config extends PublicConfigClass implements CreateComponentType {
-  public key = VChartBarStackConfig.key
-  public chartConfig = cloneDeep(VChartBarStackConfig)
-  // 图表配置项
-  public option = vChartOptionPrefixHandle(option, includes)
-}

src/packages/components/VChart/Bars/VChartBarStack/config.vue

@@ -1,19 +0,0 @@
-<template>
-  <!-- vCharts 全局设置 -->
-  <VChartGlobalSetting :optionData="optionData"></VChartGlobalSetting>
-  <Axis :axis="optionData.xAxis"></Axis>
-  <Axis :axis="optionData.yAxis"></Axis>
-</template>
-
-<script setup lang="ts">
-import { PropType } from 'vue'
-import { VChartGlobalSetting, Axis } from '@/components/Pages/VChartItemSetting'
-import { vChartGlobalThemeJsonType } from '@/settings/vchartThemes/index'
-
-defineProps({
-  optionData: {
-    type: Object as PropType<vChartGlobalThemeJsonType>,
-    required: true
-  }
-})
-</script>

src/packages/components/VChart/Bars/VChartBarStack/data.json

@@ -1,16 +0,0 @@
-{
-  "values": [
-    { "type": "Nail polish", "year": "Africa", "value": 590 },
-    { "type": "Nail polish", "year": "EU", "value": 450 },
-    { "type": "Nail polish", "year": "China", "value": 474 },
-    { "type": "Nail polish", "year": "USA", "value": 459 },
-    { "type": "Eyebrow pencil", "year": "Africa", "value": 746 },
-    { "type": "Eyebrow pencil", "year": "EU", "value": 176 },
-    { "type": "Eyebrow pencil", "year": "China", "value": 210 },
-    { "type": "Eyebrow pencil", "year": "USA", "value": 775 },
-    { "type": "Rouge", "year": "Africa", "value": 896 },
-    { "type": "Rouge", "year": "EU", "value": 784 },
-    { "type": "Rouge", "year": "China", "value": 866 },
-    { "type": "Rouge", "year": "USA", "value": 899 }
-  ]
-}

src/packages/components/VChart/Bars/VChartBarStack/index.ts

@@ -1,14 +0,0 @@
-import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'
-import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'
-
-export const VChartBarStackConfig: ConfigType = {
-  key: 'VChartBarStack',
-  chartKey: 'VVChartBarStack',
-  conKey: 'VCVChartBarStack',
-  title: 'VChart柱状图',
-  category: ChatCategoryEnum.BAR,
-  categoryName: ChatCategoryEnumName.BAR,
-  package: PackagesCategoryEnum.VCHART,
-  chartFrame: ChartFrameEnum.VCHART,
-  image: 'vchart_bar_x_stack.png'
-}

src/packages/components/VChart/Bars/VChartBarStack/index.vue

@@ -1,22 +0,0 @@
-<template>
-  <GoVChart ref="vChartRef" :option="chartConfig.option"> </GoVChart>
-</template>
-
-<script setup lang="ts">
-import { PropType } from 'vue'
-import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
-import { GoVChart } from '@/components/GoVChart'
-import { useChartDataFetch } from '@/hooks'
-import config from './config'
-
-const props = defineProps({
-  chartConfig: {
-    type: Object as PropType<config>,
-    required: true
-  }
-})
-
-const { vChartRef } = useChartDataFetch(props.chartConfig, useChartEditStore, (newData: any) => {
-  props.chartConfig.option.dataset = newData
-})
-</script>

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

@@ -1,4 +0,0 @@
-import { VChartBarCommonConfig } from './VChartBarCommon/index'
-import { VChartBarStackConfig } from './VChartBarStack/index'
-
-export default [VChartBarCommonConfig, VChartBarStackConfig]

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

@@ -1,26 +0,0 @@
-import { IBarChartSpec } from '@visactor/vchart'
-import { ICartesianAxisCommonSpec } from '@visactor/vchart/esm/component/axis'
-
-
-export enum ChatCategoryEnum {
-  BAR = 'Bars',
-}
-
-export enum ChatCategoryEnumName {
-  BAR = '柱状图',
-}
-
-export interface IBarOption extends Omit<IBarChartSpec, 'axes'> {
-  category: ChatCategoryEnum.BAR
-  type: 'bar'
-  xAxis?: {
-    name: string
-  } & ICartesianAxisCommonSpec
-  yAxis?: {
-    name: string
-  } & ICartesianAxisCommonSpec
-}
-
-// todo
-// export type IOption = IBarOption | ILineOption ....
-export type IOption = IBarOption 

src/packages/components/VChart/index.ts

@@ -1,3 +0,0 @@
-import Bars from './Bars'
-
-export const VChartList = [...Bars]

src/packages/index.d.ts

@@ -1,13 +1,10 @@
 import { BaseEvent, EventLife, InteractEvents, InteractEventOn, InteractActionsType } from '@/enums/eventEnum'
 import type { GlobalThemeJsonType } from '@/settings/chartThemes/index'
 import type { RequestConfigType } from '@/store/modules/chartEditStore/chartEditStore.d'
-import type { ChatCategoryEnum, ChatCategoryEnumName } from '@/packages/components/VChart/index.d'
 
 export enum ChartFrameEnum {
   // 支持 dataset 的 echarts 框架
   ECHARTS = 'echarts',
-  // VChart 框架
-  VCHART = 'VChart',
   // UI 组件框架
   NAIVE_UI = 'naiveUI',
   // 自定义带数据组件
@@ -27,11 +24,11 @@ export type ConfigType = {
   // 标题
   title: string
   // 分类
-  category: ChatCategoryEnum
+  category: string
   // 分类名称
-  categoryName: ChatCategoryEnumName
+  categoryName: string
   // 所属包
-  package: PackagesCategoryEnum
+  package: string
   // 归类
   chartFrame?: ChartFrameEnum
   // 预览图
@@ -176,7 +173,6 @@ export type PickCreateComponentType<T extends keyof CreateComponentType> = Pick<
 // 包分类枚举
 export enum PackagesCategoryEnum {
   CHARTS = 'Charts',
-  VCHART = 'VChart',
   TABLES = 'Tables',
   INFORMATIONS = 'Informations',
   PHOTOS = 'Photos',
@@ -187,7 +183,6 @@ export enum PackagesCategoryEnum {
 // 包分类名称
 export enum PackagesCategoryName {
   CHARTS = '图表',
-  VCHART = 'VChart',
   TABLES = '列表',
   INFORMATIONS = '信息',
   PHOTOS = '图片',
@@ -204,7 +199,6 @@ export enum FetchComFlagType {
 // 图表包类型
 export type PackagesType = {
   [PackagesCategoryEnum.CHARTS]: ConfigType[]
-  [PackagesCategoryEnum.VCHART]: ConfigType[]
   [PackagesCategoryEnum.INFORMATIONS]: ConfigType[]
   [PackagesCategoryEnum.TABLES]: ConfigType[]
   [PackagesCategoryEnum.PHOTOS]: ConfigType[]

src/packages/index.ts

@@ -1,5 +1,4 @@
 import { ChartList } from '@/packages/components/Charts/index'
-import { VChartList } from '@/packages/components/VChart/index'
 import { DecorateList } from '@/packages/components/Decorates/index'
 import { InformationList } from '@/packages/components/Informations/index'
 import { TableList } from '@/packages/components/Tables/index'
@@ -20,7 +19,6 @@ const imagesModules: Record<string, { default: string }> = import.meta.glob('../
 // * 所有图表
 export let packagesList: PackagesType = {
   [PackagesCategoryEnum.CHARTS]: ChartList,
-  [PackagesCategoryEnum.VCHART]: VChartList,
   [PackagesCategoryEnum.INFORMATIONS]: InformationList,
   [PackagesCategoryEnum.TABLES]: TableList,
   [PackagesCategoryEnum.DECORATES]: DecorateList,