Merge branch 'dev' into master-fetch

Merge pull request !270 from 叶建新/N/A

.env

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

README.md

@@ -1,146 +1,114 @@
 ## 总览
 
-![logo](readme/logo-t-y.png)
+**`master-fetch` 分支是带有后端接口请求的分支**
 
-GoView 是一个高效的拖拽式低代码数据可视化开发平台，将图表或页面元素封装为基础组件，无需编写代码即可制作数据大屏，减少心智负担。
+**后端项目地址：[https://gitee.com/MTrun/go-view-serve](https://gitee.com/MTrun/go-view-serve)**
 
-### 😶 纯 **前端** 分支： **`master`**
+**接口说明地址：[https://docs.apipost.cn/preview/5aa85d10a59d66ce/ddb813732007ad2b?target_id=84dbc5b0-158f-4bcb-8f74-793ac604ada3#3e053622-1e76-43f9-a039-756aee822dbb](https://docs.apipost.cn/preview/5aa85d10a59d66ce/ddb813732007ad2b?target_id=84dbc5b0-158f-4bcb-8f74-793ac604ada3#3e053622-1e76-43f9-a039-756aee822dbb)**
 
-### 👻 携带 **后端** 请求分支: **`master-fetch`**
+## 使用
 
-### 📚 GoView **文档** 地址：[http://www.mtruning.club:81/](http://www.mtruning.club:81/)
+所有的接口地址位置：`src\api\path\*`
 
-项目纯前端-Demo 地址：[https://www.mtruning.club](https://www.mtruning.club)
-
-项目带后端-Demo 地址：[后端 Demo 地址](http://1.117.240.165:8080/goview/#/login)
-
-文档-在线地址：[http://www.mtruning.club:81/](http://www.mtruning.club:81/)
-
-文档-源码地址：[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)
-
-接口说明地址：[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` 写法抽离部分逻辑，使代码结构更加清晰；
-
-- 类型：使用 `TypeScript` 进行类型约束，减少未知错误发生概率，可以大胆修改逻辑内容；
-
-- 性能：多处性能优化，使用页面懒加载、组件动态注册、数据滚动加载等方式，提升页面渲染速度；
-
-- 存储：拥有本地记忆，部分配置项采用 `storage` 存储本地，提升使用体验；
-
-- 封装：项目进行了详细的工具类封装如：路由、存储、加/解密、文件处理、主题、NaiveUI 全局方法、组件等
-
-工作台：
-![项目截图](readme/go-view-canvas.png)
-
-请求配置：
-![项目截图](readme/go-view-fetch.png)
-
-数据过滤：
-![项目截图](readme/go-view-filter.png)
-
-主题色：
-![项目截图](readme/go-view-color.png)
-
-主要技术栈为：
-
-| 名称                | 版本  | 名称        | 版本   |
-| ------------------- | ----- | ----------- | ------ |
-| Vue                 | 3.2.x | TypeScript4 | 4.6.x  |
-| Vite                | 4.2.x | NaiveUI     | 2.34.x |
-| ECharts             | 5.3.x | Pinia       | 2.0.x  |
-| 详见 `package.json` | 😁    | 🥰          | 🤗     |
-
-开发环境:
-
-| 名称 | 版本    | 名称    | 版本  |
-| ---- | ------- | ------- | ----- |
-| node | 16.16.x | npm     | 8.5.x |
-| pnpm | 7.1.x   | windows | 11    |
-
-已完成图表：
-
-| 分类   | 名称             | 名称             | 名称     |
-| ------ | ---------------- | ---------------- | -------- |
-| 图表   | 柱状图           | 横向柱状图       | 折线图   |
-| \*     | 单/多 折线面积图 | 饼图             | 水球图   |
-| \*     | 环形图           | NaiveUI 多种进度 | 🤠       |
-| 信息   | 文字             | 图片             | 😶       |
-| 列表   | 滚动排名列表     | 滚动表格         | 🤓       |
-| 小组件 | 边框-01~13       | 装饰-01~05       | 数字翻牌 |
-
-## 浏览器支持
-
-开发和测试平台均在 `Google` 和最新版 `EDGE` 上完成，暂未测试 `IE11` 等其它浏览器，如有需求请自行测试与兼容。
-
-## 安装
-
-本项目采用` pnpm` 进行包管理
+接口地址修改：`.env`
 
 ```shell
-#建议使用 nrm 切换到淘宝源 https://registry.npmmirror.com/
-#pnpm
-pnpm install
+# port
+VITE_DEV_PORT = '8080'
 
-#yarn
-yarn install
+# development path
+VITE_DEV_PATH = 'http://127.0.0.1:8080'
 
-#npm
-npm install
+# production path
+VITE_PRO_PATH = 'http://127.0.0.1:8080'
 ```
 
-## 启动
+公共前缀修改：`src\settings\httpSetting.ts`
 
 ```shell
-#pnpm
-pnpm dev
-
-# npm
-npm run dev
-
-#yarn
-yarn dev
-
-#Makefile
-make dev
+// 请求前缀
+export const axiosPre = '/api/goview'
 ```
 
-## 编译
+接口封装：`src\api\http.ts`
 
-```shell
-#pnpm
-pnpm run build
+```ts
+import axiosInstance from './axios'
+import { RequestHttpEnum, ContentTypeEnum } from '@/enums/httpEnum'
 
-# npm
-npm run build
+export const get = (url: string, params?: object) => {
+  return axiosInstance({
+    url: url,
+    method: RequestHttpEnum.GET,
+    params: params,
+  })
+}
 
-#yarn
-yarn run build
+export const post = (url: string, data?: object, headersType?: string) => {
+  return axiosInstance({
+    url: url,
+    method: RequestHttpEnum.POST,
+    data: data,
+    headers: {
+      'Content-Type': headersType || ContentTypeEnum.JSON
+    }
+  })
+}
 
-#Makefile
-make dist
+export const put = (url: string, data?: object, headersType?: string) => {
+  return axiosInstance({
+    url: url,
+    method: RequestHttpEnum.PUT,
+    data: data,
+    headers: {
+      'Content-Type': headersType || ContentTypeEnum.JSON
+    }
+  })
+}
+
+export const del = (url: string, params?: object) => {
+  return axiosInstance({
+    url: url,
+    method: RequestHttpEnum.DELETE,
+    params
+  })
+}
+
+// 获取请求函数，默认get
+export const http = (type?: RequestHttpEnum) => {
+  switch (type) {
+    case RequestHttpEnum.GET:
+      return get
+
+    case RequestHttpEnum.POST:
+      return post
+
+    case RequestHttpEnum.PUT:
+      return put
+
+    case RequestHttpEnum.DELETE:
+      return del
+
+    default:
+      return get
+  }
+}
 
 ```
 
 ## 代码提交
 
-- feat: 新功能
-- fix: 修复 Bug
-- docs: 文档修改
-- perf: 性能优化
-- revert: 版本回退
-- ci: CICD 集成相关
-- test: 添加测试代码
-- refactor: 代码重构
-- build: 影响项目构建或依赖修改
-- style: 不影响程序逻辑的代码修改
-- chore: 不属于以上类型的其他类型(日常事务)
+* feat: 新功能
+* fix: 修复 Bug
+* docs: 文档修改
+* perf: 性能优化
+* revert: 版本回退
+* ci: CICD集成相关
+* test: 添加测试代码
+* refactor: 代码重构
+* build: 影响项目构建或依赖修改
+* style: 不影响程序逻辑的代码修改
+* chore: 不属于以上类型的其他类型(日常事务)
 
 ## 交流
 

build/getConfigFileName.ts

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

package.json

@@ -1,12 +1,12 @@
 {
   "name": "go-view",
-  "version": "1.1.11",
+  "version": "2.2.9",
   "engines": {
     "node": ">=16.14"
   },
   "scripts": {
     "dev": "vite --host",
-    "build": "vue-tsc --noEmit && vite build",
+    "build": "vite build",
     "preview": "vite preview",
     "new": "plop --plopfile ./plop/plopfile.js",
     "postinstall": "husky install",
@@ -21,7 +21,7 @@
     "@types/crypto-js": "^4.1.1",
     "@types/keymaster": "^1.6.30",
     "@types/lodash": "^4.14.184",
-    "@visactor/vchart": "^1.12.12",
+    "@visactor/vchart": "^2.0.0",
     "@visactor/vchart-theme": "^1.12.2",
     "animate.css": "^4.1.1",
     "axios": "^1.4.0",
@@ -48,7 +48,7 @@
     "vue-i18n": "9.2.2",
     "vue-router": "4.0.12",
     "vue3-lazyload": "^0.2.5-beta",
-    "vue3-sketch-ruler": "^1.3.3",
+    "vue3-sketch-ruler": "1.3.3",
     "vuedraggable": "^4.1.0"
   },
   "devDependencies": {
@@ -77,7 +77,7 @@
     "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",

src/App.vue

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

src/api/axios.config.ts

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

src/api/axios.ts

@@ -1,34 +1,93 @@
-import axios, { AxiosResponse, InternalAxiosRequestConfig, AxiosError } from 'axios'
-import { ResultEnum } from "@/enums/httpEnum"
-import { ErrorPageNameMap } from "@/enums/pageEnum"
-import { redirectErrorPage } from '@/utils'
+import axios, { AxiosResponse, AxiosRequestConfig, Axios, AxiosError, InternalAxiosRequestConfig } from 'axios'
+import { RequestHttpHeaderEnum, ResultEnum, ModuleTypeEnum } from '@/enums/httpEnum'
+import { PageEnum, ErrorPageNameMap } from '@/enums/pageEnum'
+import { StorageEnum } from '@/enums/storageEnum'
+import { axiosPre } from '@/settings/httpSetting'
+import { SystemStoreEnum, SystemStoreUserInfoEnum } from '@/store/modules/systemStore/systemStore.d'
+import { redirectErrorPage, getLocalStorage, routerTurnByName, isPreview } from '@/utils'
+import { fetchAllowList } from './axios.config'
+import includes from 'lodash/includes'
+
+export interface MyResponseType<T> {
+  code: ResultEnum
+  data: T
+  message: string
+}
+
+export interface MyRequestInstance extends Axios {
+  <T = any>(config: AxiosRequestConfig): Promise<MyResponseType<T>>
+}
 
 const axiosInstance = axios.create({
-  baseURL: import.meta.env.DEV ? import.meta.env.VITE_DEV_PATH : import.meta.env.VITE_PRO_PATH,
-  timeout: ResultEnum.TIMEOUT,
-})
+  baseURL: `${import.meta.env.PROD ? import.meta.env.VITE_PRO_PATH : ''}${axiosPre}`,
+  timeout: ResultEnum.TIMEOUT
+}) as unknown as MyRequestInstance
 
 axiosInstance.interceptors.request.use(
   (config: InternalAxiosRequestConfig) => {
+    // 白名单校验
+    if (includes(fetchAllowList, config.url)) return config
+    // 获取 token
+    const info = getLocalStorage(StorageEnum.GO_SYSTEM_STORE)
+    // 重新登录
+    if (!info) {
+      routerTurnByName(PageEnum.BASE_LOGIN_NAME)
+      return config
+    }
+    const userInfo = info[SystemStoreEnum.USER_INFO]
+    config.headers[userInfo[SystemStoreUserInfoEnum.TOKEN_NAME] || 'token'] =  userInfo[SystemStoreUserInfoEnum.USER_TOKEN] || ''
     return config
   },
-  (error: AxiosError) => {
-    Promise.reject(error)
+  (err: AxiosError) => {
+    Promise.reject(err)
   }
 )
 
 // 响应拦截器
 axiosInstance.interceptors.response.use(
   (res: AxiosResponse) => {
+    // 预览页面错误不进行处理
+    if (isPreview()) {
+      return Promise.resolve(res.data)
+    }
     const { code } = res.data as { code: number }
+
     if (code === undefined || code === null) return Promise.resolve(res.data)
-    if (code === ResultEnum.DATA_SUCCESS) return Promise.resolve(res.data)
-    // 重定向
-    if (ErrorPageNameMap.get(code)) redirectErrorPage(code)
+
+    // 成功
+    if (code === ResultEnum.SUCCESS) {
+      return Promise.resolve(res.data)
+    }
+
+    // 登录过期
+    if (code === ResultEnum.TOKEN_OVERDUE) {
+      window['$message'].error(window['$t']('http.token_overdue_message'))
+      routerTurnByName(PageEnum.BASE_LOGIN_NAME)
+      return Promise.resolve(res.data)
+    }
+
+    // 固定错误码重定向
+    if (ErrorPageNameMap.get(code)) {
+      redirectErrorPage(code)
+      return Promise.resolve(res.data)
+    }
+
+    // 提示错误
+    window['$message'].error(window['$t']((res.data as any).msg))
     return Promise.resolve(res.data)
   },
-  (err: AxiosResponse) => {
-    Promise.reject(err)
+  (err: AxiosError) => {
+    const status = err.response?.status
+    switch (status) {
+      case 401:
+        routerTurnByName(PageEnum.BASE_LOGIN_NAME)
+        Promise.reject(err)
+        break
+
+      default:
+        Promise.reject(err)
+        break
+    }
   }
 )
 

src/api/http.ts

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

src/api/path/index.ts

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

src/api/path/project.api.ts

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

src/api/path/project.d.ts

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

src/api/path/system.api.ts

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

src/api/path/system.d.ts

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

src/components/GoUserInfo/index.vue

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

src/components/GoVChart/index.vue

@@ -9,9 +9,13 @@
 
 <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 { 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 = [
@@ -193,7 +197,7 @@ const createOrUpdateChart = (
   }
 ) => {
   if (vChartRef.value && !chart) {
-    const spec = transformHandler[chartProps.category](chartProps)
+    const spec = transformHandler[chartProps.category || '']?.(chartProps)
     chart = new VChart(
       { ...spec, data: chartProps.dataset },
       {
@@ -204,8 +208,12 @@ const createOrUpdateChart = (
     chart.renderSync()
     return true
   } else if (chart) {
-    const spec = transformHandler[chartProps.category](chartProps)
-    chart.updateSpec({ ...spec, data: toRaw(chartProps.dataset), dataset: undefined })
+    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

src/components/GoVChart/register.ts

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

@@ -0,0 +1,32 @@
+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,4 +1,4 @@
-import { cloneDeep } from "lodash"
+import { cloneDeep } from 'lodash'
 
 export default (chartProps: any) => {
   const spec = cloneDeep(chartProps)
@@ -18,15 +18,28 @@ export default (chartProps: any) => {
   // axis
   const { name: xAxisName, ...restXAxisProps } = chartProps.xAxis
   const { name: yAxisName, ...restYAxisProps } = chartProps.yAxis
-  spec.axes = [{
-    orient: 'bottom',
-    ...restXAxisProps
-  }, {
-    orient: 'left',
-    ...restYAxisProps
-  }]
+  spec.axes = [
+    {
+      orient: 'bottom',
+      ...restXAxisProps
+      // paddingInner: 0.5
+    },
+    {
+      orient: 'left',
+      ...restYAxisProps
+    }
+  ]
+
   delete spec.xAxis
   delete spec.yAxis
-  console.log('spec-transform', spec)
+
+  spec.label = {
+    ...spec.label,
+    style: {
+      ...spec.label?.style,
+      lineWidth: 0
+    }
+  }
+  // console.log('spec-bar-transform', spec)
   return spec
-}
+}

src/components/GoVChart/transformProps/funnels.ts

@@ -0,0 +1,28 @@
+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,8 +1,20 @@
 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

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

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

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

@@ -0,0 +1,21 @@
+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/VChartItemSetting/Axis.vue

@@ -1,18 +1,29 @@
 <template>
-  <collapse-item v-model:name="axis.name">
+  <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-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 name="角度">
+      <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 :style="axis.label.style"></FontStyle>
+      <FontStyle v-if="axis.label" :style="toRefs(axis.label.style)"></FontStyle>
     </setting-item-box>
     <setting-item-box name="轴标题">
       <setting-item name="可见性">
@@ -20,10 +31,16 @@
           <n-switch v-model:value="axis.title.visible" size="small"></n-switch>
         </n-space>
       </setting-item>
-      <setting-item name="标题内容">
+      <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 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="可见性">
@@ -45,7 +62,11 @@
           <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-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>
@@ -57,15 +78,33 @@
 </template>
 
 <script setup lang="ts">
-import { PropType } from 'vue'
+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'
 
-defineProps({
+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

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

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

@@ -15,7 +15,7 @@
           </setting-item>
         </setting-item-box>
         <setting-item-box name="项配置">
-          <FontStyle :style="legendItem.item.label.style"></FontStyle>
+          <FontStyle :style="toRefs(legendItem.item.label.style)"></FontStyle>
         </setting-item-box>
       </collapse-item>
     </div>
@@ -23,7 +23,7 @@
 </template>
 
 <script setup lang="ts">
-import { PropType } from 'vue'
+import { PropType, toRefs } from 'vue'
 import { legendsConfig } from '@/packages/chartConfiguration/vcharts/index'
 import FontStyle from './common/FontStyle.vue'
 import { vChartGlobalThemeJsonType } from '@/settings/vchartThemes/index'

src/components/Pages/VChartItemSetting/Line.vue

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

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

@@ -20,20 +20,20 @@
         </setting-item>
       </setting-item-box>
       <setting-item-box name="标题">
-        <FontStyle :style="optionData.tooltip.style.titleLabel"></FontStyle>
+        <FontStyle :style="toRefs(optionData.tooltip.style.titleLabel)"></FontStyle>
       </setting-item-box>
       <setting-item-box name="名称">
-        <FontStyle :style="optionData.tooltip.style.keyLabel"></FontStyle>
+        <FontStyle :style="toRefs(optionData.tooltip.style.keyLabel)"></FontStyle>
       </setting-item-box>
       <setting-item-box name="值">
-        <FontStyle :style="optionData.tooltip.style.valueLabel"></FontStyle>
+        <FontStyle :style="toRefs(optionData.tooltip.style.valueLabel)"></FontStyle>
       </setting-item-box>
     </collapse-item>
   </div>
 </template>
 
 <script setup lang="ts">
-import { PropType } from 'vue'
+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'

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

@@ -1,21 +1,28 @@
 <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 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">
@@ -26,7 +33,7 @@ import { SettingItem } from '@/components/Pages/ChartItemSetting'
 
 defineProps({
   style: {
-    type: Object as PropType<FontType>,
+    type: Object as PropType<any>,
     required: true
   }
 })

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

@@ -0,0 +1,84 @@
+<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,4 +1,8 @@
 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 }
+export { VChartGlobalSetting, Axis, Label, Bar, Line, Point }

src/enums/editPageEnum.ts

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

src/enums/httpEnum.ts

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

src/enums/pageEnum.ts

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

src/enums/storageEnum.ts

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

src/hooks/index.ts

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

src/hooks/useChartDataPondFetch.hook.ts

@@ -116,7 +116,7 @@ export const useChartDataPondFetch = () => {
       const requestDataPondItem = computed(() => {
         return requestGlobalConfig.requestDataPond.find(item => item.dataPondId === pondKey)
       }) as ComputedRef<RequestDataPondItemType>
-      if (requestDataPondItem) {
+      if (requestDataPondItem.value) {
         newPondItemInterval(chartEditStore.requestGlobalConfig, requestDataPondItem, mittDataPondMap.get(pondKey))
       }
     }

src/hooks/useSystemInit.hook.ts

@@ -0,0 +1,23 @@
+import { useSystemStore } from '@/store/modules/systemStore/systemStore'
+import { SystemStoreEnum } from '@/store/modules/systemStore/systemStore.d'
+import { ResultEnum } from '@/enums/httpEnum'
+import { ossUrlApi } from '@/api/path'
+
+
+// * 初始化
+export const useSystemInit = async () => {
+  const systemStore = useSystemStore()
+
+  // 获取 OSS 信息的 url 地址，用来拼接展示图片的地址
+  const getOssUrl = async () => {
+    const res = await ossUrlApi({})
+    if (res && res.code === ResultEnum.SUCCESS) {
+      systemStore.setItem(SystemStoreEnum.FETCH_INFO, {
+        OSSUrl: res.data?.bucketURL
+      })
+    }
+  }
+
+  // 执行
+  getOssUrl()
+}

src/i18n/en/index.ts

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

src/i18n/en/login.ts

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

src/i18n/en/project.ts

@@ -1,11 +1,13 @@
 export default {
-  create_btn: 'Create',
-  create_tip: 'Please select a content for development',
+  create_btn: 'Creat',
+  create_success: 'Creat Success!',
+  create_failure: 'Failed to create, please try again later！',
+  create_tip: 'Please select a content for development!',
   project: 'Project',
   my: 'My',
   new_project: 'New Project',
   all_project: 'All Project',
-  my_templete: 'My Templete',
+  my_template: 'My Template',
   template_market: 'Template Market',
 
   // items 

src/i18n/zh/index.ts

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

src/i18n/zh/login.ts

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

src/i18n/zh/project.ts

@@ -1,12 +1,14 @@
 export default {
   // aside
   create_btn: '新建',
+  create_success: '新建成功！',
+  create_failure: '新建失败，请稍后重试！',
   create_tip: '从哪里出发好呢？',
   project: '项目',
   my: '我的',
   new_project: '新项目',
   all_project: '全部项目',
-  my_templete: '我的模板',
+  my_template: '我的模板',
   template_market: '模板市场',
 
   // items 

src/packages/chartConfiguration/vcharts/index.ts

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

src/packages/chartConfiguration/vcharts/label.ts

@@ -0,0 +1,120 @@
+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/style.ts

@@ -0,0 +1,150 @@
+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/CapsuleChart/index.vue

@@ -124,7 +124,14 @@ const calcData = (data: any, type?: string) => {
 const calcCapsuleLengthAndLabelData = (dataset: any) => {
   try {
     const { source } = dataset
-    if (!source || !source.length) return
+    if (!source) return
+
+    if (source.length === 0) {
+      // 清空数据
+      state.capsuleLength = []
+      state.labelData = []
+      return
+    }
 
     state.capsuleItemHeight = numberSizeHandle(state.mergedConfig.itemHeight)
     const capsuleValue = source.map((item: DataProps) => item[state.mergedConfig.dataset.dimensions[1]])
@@ -140,9 +147,8 @@ 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/Lines/LineCommon/index.vue

@@ -23,9 +23,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 +61,7 @@ watch(
       if (Array.isArray(newData?.dimensions)) {
         const seriesArr = []
         for (let i = 0; i < newData.dimensions.length - 1; i++) {
-          seriesArr.push(seriesItem)
+          seriesArr.push(cloneDeep(seriesItem))
         }
         replaceMergeArr.value = ['series']
         props.chartConfig.option.series = seriesArr

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

@@ -56,7 +56,7 @@ export const option = {
   mapOptions: {
     pitch: 60,
     skyColor: '#53A9DE',
-    amapKey: 'd5f3e16589dbecae64d05fe90e2ba4f2',
+    amapKey: '',
     amapStyleKey: ThemeEnum.DARK,
     amapStyleKeyCustom: '',
     amapLon: 116.397428,

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

@@ -49,16 +49,12 @@ const {
   dataset
 } = toRefs(props.chartConfig.option)
 
-const option = shallowReactive({
-  dataset: configOption.dataset
-})
-
 // 手动更新
 watch(
   () => props.chartConfig.option.dataset,
   (newData: any) => {
     try {
-      option.dataset = toNumber(newData, 2)
+      dataset.value = toNumber(newData, 2)
     } catch (error) {
       console.log(error)
     }
@@ -69,6 +65,6 @@ watch(
 )
 // 预览更新
 useChartDataFetch(props.chartConfig, useChartEditStore, (newData: number) => {
-  option.dataset = toNumber(newData, 2)
+  dataset.value = toNumber(newData, 2)
 })
 </script>

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

@@ -61,7 +61,7 @@ const option = {
       emphasis: {
         label: {
           show: true,
-          fontSize: '40',
+          fontSize: 40,
           fontWeight: 'bold'
         }
       },

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

@@ -66,7 +66,7 @@
           :options="labelConfig.fontWeight"
         />
       </SettingItem>
-      <setting-item name="文字边框大小" v-if="optionData.series[0].label.textBorderWidth">
+      <setting-item name="文字边框大小" v-if="optionData.series[0].label.textBorderWidth > -1">
         <n-input-number
           v-model:value="optionData.series[0].label.textBorderWidth"
           size="small"
@@ -81,7 +81,7 @@
         ></n-color-picker>
       </setting-item>
     </setting-item-box>
-    <setting-item-box name="圆角">
+    <setting-item-box name="分段样式">
       <setting-item name="圆角大小">
         <n-input-number
           v-model:value="optionData.series[0].itemStyle.borderRadius"

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

@@ -103,6 +103,10 @@ watch(
   () => props.chartConfig.option.type,
   newData => {
     try {
+      // 防止初始化时触发修改，导致部分参数丢失
+      if (isPreview()) {
+        return
+      }
       if (newData === 'nomal') {
         props.chartConfig.option.series[0].radius = '70%'
         props.chartConfig.option.series[0].roseType = false

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

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div ref="vChartRef">
     <n-countdown
       ref="countdownRef"
       :duration="totalDuration"
@@ -79,6 +79,8 @@ import { CreateComponentType } from '@/packages/index.d'
 import { Flipper } from '@/components/Pages/Flipper'
 import { OptionType } from './config'
 import { CountdownInst, CountdownProps } from 'naive-ui/es/countdown/src/Countdown'
+import { useChartDataFetch } from '@/hooks'
+import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
 
 const props = defineProps({
   chartConfig: {
@@ -174,6 +176,10 @@ watch(
 onMounted(() => {
   updateTotalDuration()
 })
+
+const { vChartRef } = useChartDataFetch(props.chartConfig, useChartEditStore, (newData: any) => {
+  props.chartConfig.option.dataset = newData
+})
 </script>
 
 <style lang="scss" scoped>

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

@@ -10,7 +10,11 @@
         <div class="rank" :style="`color: ${color};font-size: ${indexFontSize}px`">No.{{ item.ranking }}</div>
         <div class="info-name" :style="`font-size: ${leftFontSize}px`" v-html="item.name" />
         <div class="ranking-value" :style="`color: ${textColor};font-size: ${rightFontSize}px`">
-          {{ status.mergedConfig.valueFormatter ? status.mergedConfig.valueFormatter(item) : item.value }}
+          {{
+            typeof status.mergedConfig.valueFormatter === 'function'
+              ? status.mergedConfig.valueFormatter(item)
+              : item.value
+          }}
           {{ unit }}
         </div>
       </div>
@@ -62,7 +66,8 @@ const status = reactive({
 const calcRowsData = () => {
   let { dataset, rowNum, sort } = status.mergedConfig
   // @ts-ignore
-  sort &&dataset.sort(({ value: a }, { value: b  } )  => {
+  sort &&
+    dataset.sort(({ value: a }, { value: b }) => {
       if (a > b) return -1
       if (a < b) return 1
       if (a === b) return 0
@@ -137,7 +142,7 @@ const onRestart = async () => {
     calcRowsData()
     let flag = true
     if (dataset.length <= rowNum) {
-      flag=false
+      flag = false
     }
     calcHeights(flag)
     animation(flag)

src/packages/components/VChart/Areas/VChartArea/config.ts

@@ -0,0 +1,47 @@
+import { PublicConfigClass } from '@/packages/public'
+import { VChartAreaConfig } 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 { IAreaOption } from '../../index.d'
+
+export const includes = ['legends', 'tooltip']
+export const option: IAreaOption & { dataset?: any } = {
+  // 图表配置
+  type: 'area',
+  dataset: data,
+  xField: 'type',
+  yField: 'value',
+  seriesField: 'country',
+  stack: true,
+  // 业务配置（后续会被转换为图表spec)
+  category: VChartAreaConfig.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 = VChartAreaConfig.key
+  public chartConfig = cloneDeep(VChartAreaConfig)
+  // 图表配置项
+  public option = vChartOptionPrefixHandle(option, includes)
+}

src/packages/components/VChart/Areas/VChartArea/config.vue

@@ -0,0 +1,19 @@
+<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/Areas/VChartArea/data.json

@@ -0,0 +1,16 @@
+{
+  "values": [
+    { "type": "Nail polish", "country": "China", "value": 3054 },
+    { "type": "Nail polish", "country": "USA", "value": 12814 },
+    { "type": "Eyebrow pencil", "country": "China", "value": 5067 },
+    { "type": "Eyebrow pencil", "country": "USA", "value": 13012 },
+    { "type": "Rouge", "country": "China", "value": 7004 },
+    { "type": "Rouge", "country": "USA", "value": 11624 },
+    { "type": "Lipstick", "country": "China", "value": 9054 },
+    { "type": "Lipstick", "country": "USA", "value": 8814 },
+    { "type": "Eyeshadows", "country": "China", "value": 12043 },
+    { "type": "Eyeshadows", "country": "USA", "value": 12998 },
+    { "type": "Eyeliner", "country": "China", "value": 15067 },
+    { "type": "Eyeliner", "country": "USA", "value": 12321 }
+  ]
+}

src/packages/components/VChart/Areas/VChartArea/index.ts

@@ -0,0 +1,14 @@
+import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'
+import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'
+
+export const VChartAreaConfig: ConfigType = {
+  key: 'VChartArea',
+  chartKey: 'VVChartArea',
+  conKey: 'VCVChartArea',
+  title: 'VChart面积图',
+  category: ChatCategoryEnum.AREA,
+  categoryName: ChatCategoryEnumName.AREA,
+  package: PackagesCategoryEnum.VCHART,
+  chartFrame: ChartFrameEnum.VCHART,
+  image: 'vchart_area.png'
+}

src/packages/components/VChart/Areas/VChartArea/index.vue

@@ -0,0 +1,22 @@
+<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/Areas/VChartPercentArea/config.ts

@@ -0,0 +1,48 @@
+import { PublicConfigClass } from '@/packages/public'
+import { VChartPercentAreaConfig } 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 { IAreaOption } from '../../index.d'
+
+export const includes = ['legends', 'tooltip']
+export const option: IAreaOption & { dataset?: any } = {
+  // 图表配置
+  type: 'area',
+  dataset: data,
+  xField: 'type',
+  yField: 'value',
+  seriesField: 'country',
+  stack: true,
+  percent: true,
+  // 业务配置（后续会被转换为图表spec)
+  category: VChartPercentAreaConfig.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 = VChartPercentAreaConfig.key
+  public chartConfig = cloneDeep(VChartPercentAreaConfig)
+  // 图表配置项
+  public option = vChartOptionPrefixHandle(option, includes)
+}

src/packages/components/VChart/Areas/VChartPercentArea/config.vue

@@ -0,0 +1,19 @@
+<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/Areas/VChartPercentArea/data.json

@@ -0,0 +1,16 @@
+{
+  "values": [
+    { "type": "Nail polish", "country": "China", "value": 3054 },
+    { "type": "Nail polish", "country": "USA", "value": 12814 },
+    { "type": "Eyebrow pencil", "country": "China", "value": 5067 },
+    { "type": "Eyebrow pencil", "country": "USA", "value": 13012 },
+    { "type": "Rouge", "country": "China", "value": 7004 },
+    { "type": "Rouge", "country": "USA", "value": 11624 },
+    { "type": "Lipstick", "country": "China", "value": 9054 },
+    { "type": "Lipstick", "country": "USA", "value": 8814 },
+    { "type": "Eyeshadows", "country": "China", "value": 12043 },
+    { "type": "Eyeshadows", "country": "USA", "value": 12998 },
+    { "type": "Eyeliner", "country": "China", "value": 15067 },
+    { "type": "Eyeliner", "country": "USA", "value": 12321 }
+  ]
+}

src/packages/components/VChart/Areas/VChartPercentArea/index.ts

@@ -0,0 +1,14 @@
+import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'
+import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'
+
+export const VChartPercentAreaConfig: ConfigType = {
+  key: 'VChartPercentArea',
+  chartKey: 'VVChartPercentArea',
+  conKey: 'VCVChartPercentArea',
+  title: 'VChart百分比面积图',
+  category: ChatCategoryEnum.AREA,
+  categoryName: ChatCategoryEnumName.AREA,
+  package: PackagesCategoryEnum.VCHART,
+  chartFrame: ChartFrameEnum.VCHART,
+  image: 'vchart_percent_area.png'
+}

src/packages/components/VChart/Areas/VChartPercentArea/index.vue

@@ -0,0 +1,22 @@
+<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/Areas/index.ts

@@ -0,0 +1,4 @@
+import { VChartAreaConfig } from './VChartArea/index'
+import { VChartPercentAreaConfig } from './VChartPercentArea/index'
+
+export default [VChartAreaConfig, VChartPercentAreaConfig]

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

@@ -3,11 +3,11 @@ 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'
+import { ChatCategoryEnum, IBarOption } from '../../index.d'
+import { merge, cloneDeep } from 'lodash'
 
-export const includes = ['legends', 'tooltip']
+export const includes = ['legends', 'tooltip', 'label', 'bar']
 export const option: IBarOption & { dataset?: any } = {
   // 图表配置
   type: 'bar',
@@ -17,10 +17,17 @@ export const option: IBarOption & { dataset?: any } = {
   yField: ['value'],
   seriesField: 'type',
   // 业务配置（后续会被转换为图表spec)
-  category: VChartBarCommonConfig.category,
+  category: VChartBarCommonConfig.category as ChatCategoryEnum.BAR,
   xAxis: {
     name: 'x轴',
-    ...axisThemeJson,
+    ...(merge(cloneDeep(axisThemeJson), {
+      unit: {
+        style: {
+          dx: 10,
+          dy: 0
+        }
+      }
+    }) as any),
     grid: {
       ...axisThemeJson.grid,
       visible: false
@@ -28,12 +35,18 @@ export const option: IBarOption & { dataset?: any } = {
   },
   yAxis: {
     name: 'y轴',
-    ...axisThemeJson,
+    ...(merge(cloneDeep(axisThemeJson), {
+      unit: {
+        style: {
+          dx: 0,
+          dy: -10
+        }
+      }
+    }) as any),
     grid: {
       ...axisThemeJson.grid,
       style: {
-        ...axisThemeJson.grid.style,
-        lineDash: [3, 3]
+        ...axisThemeJson.grid.style
       }
     }
   }

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

@@ -3,11 +3,15 @@
   <VChartGlobalSetting :optionData="optionData"></VChartGlobalSetting>
   <Axis :axis="optionData.xAxis"></Axis>
   <Axis :axis="optionData.yAxis"></Axis>
+  <!-- 标签 -->
+  <Label :optionData="optionData"></Label>
+  <!-- 柱体 -->
+  <Bar :optionData="optionData"></Bar>
 </template>
 
 <script setup lang="ts">
 import { PropType } from 'vue'
-import { VChartGlobalSetting, Axis } from '@/components/Pages/VChartItemSetting'
+import { VChartGlobalSetting, Axis, Label, Bar } from '@/components/Pages/VChartItemSetting'
 import { vChartGlobalThemeJsonType } from '@/settings/vchartThemes/index'
 
 defineProps({

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

@@ -5,7 +5,7 @@ export const VChartBarCommonConfig: ConfigType = {
   key: 'VChartBarCommon',
   chartKey: 'VVChartBarCommon',
   conKey: 'VCVChartBarCommon',
-  title: 'VChart柱状图',
+  title: '并列柱状图-VChart',
   category: ChatCategoryEnum.BAR,
   categoryName: ChatCategoryEnumName.BAR,
   package: PackagesCategoryEnum.VCHART,

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

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

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

@@ -0,0 +1,23 @@
+<template>
+  <!-- vCharts 全局设置 -->
+  <VChartGlobalSetting :optionData="optionData"></VChartGlobalSetting>
+  <Axis :axis="optionData.xAxis"></Axis>
+  <Axis :axis="optionData.yAxis"></Axis>
+  <!-- 标签 -->
+  <Label :optionData="optionData"></Label>
+  <!-- 柱体 -->
+  <Bar :optionData="optionData"></Bar>
+</template>
+
+<script setup lang="ts">
+import { PropType } from 'vue'
+import { VChartGlobalSetting, Axis, Label, Bar } 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/VChartBarCrossrange/data.json

@@ -0,0 +1,25 @@
+{
+  "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/VChartBarCrossrange/index.ts

@@ -0,0 +1,14 @@
+import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'
+import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'
+
+export const VChartBarCrossrangeConfig: ConfigType = {
+  key: 'VChartBarCrossrange',
+  chartKey: 'VVChartBarCrossrange',
+  conKey: 'VCVChartBarCrossrange',
+  title: '并列柱状图-VChart',
+  category: ChatCategoryEnum.BAR,
+  categoryName: ChatCategoryEnumName.BAR,
+  package: PackagesCategoryEnum.VCHART,
+  chartFrame: ChartFrameEnum.VCHART,
+  image: 'vchart_bar_y.png'
+}

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

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

@@ -3,11 +3,18 @@ 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'
+import { ChatCategoryEnum, IBarOption } from '../../index.d'
+import { merge, cloneDeep } from 'lodash'
+import { vChartGlobalThemeJson } from '@/settings/vchartThemes'
 
-export const includes = ['legends', 'tooltip']
+const barConfig = merge(cloneDeep(vChartGlobalThemeJson.bar), {
+  style: {
+    width: 15
+  }
+})
+
+export const includes = ['legends', 'tooltip', 'label']
 export const option: IBarOption & { dataset?: any } = {
   // 图表配置
   type: 'bar',
@@ -16,11 +23,20 @@ export const option: IBarOption & { dataset?: any } = {
   yField: ['value'],
   seriesField: 'year',
   stack: true,
+  // 开启百分比
+  percent: false,
   // 业务配置（后续会被转换为图表spec)
-  category: VChartBarStackConfig.category,
+  category: VChartBarStackConfig.category as ChatCategoryEnum.BAR,
   xAxis: {
     name: 'x轴',
-    ...axisThemeJson,
+    ...(merge(cloneDeep(axisThemeJson), {
+      unit: {
+        style: {
+          dx: 10,
+          dy: 0
+        }
+      }
+    }) as any),
     grid: {
       ...axisThemeJson.grid,
       visible: false
@@ -28,14 +44,23 @@ export const option: IBarOption & { dataset?: any } = {
   },
   yAxis: {
     name: 'y轴',
-    ...axisThemeJson,
+    ...(merge(cloneDeep(axisThemeJson), {
+      unit: {
+        style: {
+          dx: 0,
+          dy: -10
+        }
+      }
+    }) as any),
     grid: {
       ...axisThemeJson.grid,
       style: {
-        ...axisThemeJson.grid.style,
-        lineDash: [3, 3]
+        ...axisThemeJson.grid.style
       }
     }
+  },
+  bar: {
+    ...barConfig
   }
 }
 

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

@@ -3,12 +3,26 @@
   <VChartGlobalSetting :optionData="optionData"></VChartGlobalSetting>
   <Axis :axis="optionData.xAxis"></Axis>
   <Axis :axis="optionData.yAxis"></Axis>
+  <!-- 标签 -->
+  <Label :optionData="optionData"></Label>
+  <!-- 柱体 -->
+  <Bar :optionData="optionData"></Bar>
+  <!-- 开启百分比 -->
+  <CollapseItem name="百分比堆叠">
+    <SettingItemBox name="配置" alone>
+      <n-space>
+        <span>开启百分比堆叠</span>
+        <n-switch v-model:value="optionData.percent" size="small"></n-switch>
+      </n-space>
+    </SettingItemBox>
+  </CollapseItem>
 </template>
 
 <script setup lang="ts">
 import { PropType } from 'vue'
-import { VChartGlobalSetting, Axis } from '@/components/Pages/VChartItemSetting'
+import { VChartGlobalSetting, Axis, Label, Bar } from '@/components/Pages/VChartItemSetting'
 import { vChartGlobalThemeJsonType } from '@/settings/vchartThemes/index'
+import { CollapseItem, SettingItemBox } from '@/components/Pages/ChartItemSetting'
 
 defineProps({
   optionData: {

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

@@ -5,7 +5,7 @@ export const VChartBarStackConfig: ConfigType = {
   key: 'VChartBarStack',
   chartKey: 'VVChartBarStack',
   conKey: 'VCVChartBarStack',
-  title: 'VChart柱状图',
+  title: '堆叠柱状图-VChart',
   category: ChatCategoryEnum.BAR,
   categoryName: ChatCategoryEnumName.BAR,
   package: PackagesCategoryEnum.VCHART,

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

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

src/packages/components/VChart/Funnels/VChartFunnel/config.ts

@@ -0,0 +1,25 @@
+import { PublicConfigClass } from '@/packages/public'
+import { VChartFunnelConfig } 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 { IFunnelOption } from '../../index.d'
+
+export const includes = ['legends', 'tooltip']
+export const option: IFunnelOption & { dataset?: any } = {
+  // 图表配置
+  type: 'funnel',
+  dataset: data,
+  categoryField: 'name',
+  valueField: 'value',
+  // 业务配置（后续会被转换为图表spec)
+  category: VChartFunnelConfig.category,
+}
+
+export default class Config extends PublicConfigClass implements CreateComponentType {
+  public key = VChartFunnelConfig.key
+  public chartConfig = cloneDeep(VChartFunnelConfig)
+  // 图表配置项
+  public option = vChartOptionPrefixHandle(option, includes)
+}

src/packages/components/VChart/Funnels/VChartFunnel/config.vue

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

src/packages/components/VChart/Funnels/VChartFunnel/data.json

@@ -0,0 +1,24 @@
+{
+  "values": [
+    {
+      "value": 100,
+      "name": "Step1"
+    },
+    {
+      "value": 80,
+      "name": "Step2"
+    },
+    {
+      "value": 60,
+      "name": "Step3"
+    },
+    {
+      "value": 40,
+      "name": "Step4"
+    },
+    {
+      "value": 20,
+      "name": "Step5"
+    }
+  ]
+}

src/packages/components/VChart/Funnels/VChartFunnel/index.ts

@@ -0,0 +1,14 @@
+import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'
+import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'
+
+export const VChartFunnelConfig: ConfigType = {
+  key: 'VChartFunnel',
+  chartKey: 'VVChartFunnel',
+  conKey: 'VCVChartFunnel',
+  title: '漏斗图-VChart',
+  category: ChatCategoryEnum.FUNNEL,
+  categoryName: ChatCategoryEnumName.FUNNEL,
+  package: PackagesCategoryEnum.VCHART,
+  chartFrame: ChartFrameEnum.VCHART,
+  image: 'vchart_funnel.png'
+}

src/packages/components/VChart/Funnels/VChartFunnel/index.vue

@@ -0,0 +1,22 @@
+<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/Funnels/index.ts

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

src/packages/components/VChart/Lines/VChartLine/config.ts

@@ -0,0 +1,49 @@
+import { PublicConfigClass } from '@/packages/public'
+import { VChartLineConfig } 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 { ChatCategoryEnum, ILineOption } from '../../index.d'
+
+export const includes = ['legends', 'tooltip', 'label', 'line', 'point']
+export const option: ILineOption & { dataset?: any } = {
+  // 图表配置
+  type: 'line',
+  dataset: data,
+  xField: 'type',
+  yField: 'value',
+  seriesField: 'country',
+  stack: true,
+  // 开启百分比
+  percent: false,
+  // 业务配置（后续会被转换为图表spec)
+  category: VChartLineConfig.category as ChatCategoryEnum.LINE,
+  xAxis: {
+    name: 'x轴',
+    ...axisThemeJson,
+    grid: {
+      ...axisThemeJson.grid,
+      visible: false
+    }
+  } as any,
+  yAxis: {
+    name: 'y轴',
+    ...axisThemeJson,
+    grid: {
+      ...axisThemeJson.grid,
+      style: {
+        ...axisThemeJson.grid.style,
+        lineDash: [3, 3]
+      }
+    }
+  } as any
+}
+
+export default class Config extends PublicConfigClass implements CreateComponentType {
+  public key = VChartLineConfig.key
+  public chartConfig = cloneDeep(VChartLineConfig)
+  // 图表配置项
+  public option = vChartOptionPrefixHandle(option, includes)
+}

src/packages/components/VChart/Lines/VChartLine/config.vue

@@ -0,0 +1,33 @@
+<template>
+  <!-- vCharts 全局设置 -->
+  <VChartGlobalSetting :optionData="optionData"></VChartGlobalSetting>
+  <Axis :axis="optionData.xAxis"></Axis>
+  <Axis :axis="optionData.yAxis"></Axis>
+  <!-- 开启百分比 -->
+  <CollapseItem name="百分比堆叠">
+    <SettingItemBox name="配置" alone>
+      <n-space>
+        <span>开启百分比堆叠</span>
+        <n-switch v-model:value="optionData.percent" size="small"></n-switch>
+      </n-space>
+    </SettingItemBox>
+  </CollapseItem>
+  <Line :optionData="optionData"></Line>
+  <Label :optionData="optionData" :positionOptions="labelConfig.linePosition"></Label>
+  <Point :optionData="optionData"></Point>
+</template>
+
+<script setup lang="ts">
+import { PropType } from 'vue'
+import { VChartGlobalSetting, Axis, Label, Line, Point } from '@/components/Pages/VChartItemSetting'
+import { vChartGlobalThemeJsonType } from '@/settings/vchartThemes/index'
+import { CollapseItem, SettingItemBox } from '@/components/Pages/ChartItemSetting'
+import { labelConfig } from '@/packages/chartConfiguration/vcharts/index'
+
+defineProps({
+  optionData: {
+    type: Object as PropType<vChartGlobalThemeJsonType>,
+    required: true
+  }
+})
+</script>