Merge branch 'master-fetch-dev' into master-fetch

Merge pull request !104 from lastbee1204/master-fetch

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

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,6 +1,6 @@
 {
   "name": "go-view",
-  "version": "1.2.1",
+  "version": "2.1.6",
   "engines": {
     "node": ">=16.14 <18.0.0"
   },

preview.yml

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

src/App.vue

@@ -17,7 +17,7 @@
 import { NConfigProvider } from 'naive-ui'
 import { GoAppProvider } from '@/components/GoAppProvider'
 import { I18n } from '@/components/I18n'
-import { 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,30 +1,82 @@
-import axios, { AxiosResponse, AxiosRequestConfig } from 'axios'
-import { ResultEnum } from "@/enums/httpEnum"
-import { ErrorPageNameMap } from "@/enums/pageEnum"
-import { redirectErrorPage } from '@/utils'
+import axios, { AxiosResponse, AxiosRequestConfig, Axios } from 'axios'
+import { ResultEnum, ModuleTypeEnum } from "@/enums/httpEnum"
+import { PageEnum, ErrorPageNameMap } from "@/enums/pageEnum"
+import { StorageEnum } from '@/enums/storageEnum'
+import { axiosPre } from '@/settings/httpSetting'
+import { SystemStoreEnum, SystemStoreUserInfoEnum } from '@/store/modules/systemStore/systemStore.d'
+import { redirectErrorPage, getLocalStorage, routerTurnByName, isPreview } from '@/utils'
+import { fetchAllowList } from './axios.config'
+import includes from 'lodash/includes'
+
+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,
+  baseURL: `${import.meta.env.PROD ? import.meta.env.VITE_PRO_PATH : ''}${axiosPre}`,
   timeout: ResultEnum.TIMEOUT,
-})
+}) as unknown as MyRequestInstance
 
 axiosInstance.interceptors.request.use(
   (config: AxiosRequestConfig) => {
+    // 白名单校验
+    if (includes(fetchAllowList, config.url)) return config
+    // 获取 token
+    const info = getLocalStorage(StorageEnum.GO_SYSTEM_STORE)
+    // 重新登录
+    if (!info) {
+      routerTurnByName(PageEnum.BASE_LOGIN_NAME)
+      return config
+    }
+    const userInfo = info[SystemStoreEnum.USER_INFO]
+    config.headers = {
+      ...config.headers,
+      [userInfo[SystemStoreUserInfoEnum.TOKEN_NAME] || 'token']: userInfo[SystemStoreUserInfoEnum.USER_TOKEN] || ''
+    }
     return config
   },
-  (error: AxiosRequestConfig) => {
-    Promise.reject(error)
+  (err: AxiosRequestConfig) => {
+    Promise.reject(err)
   }
 )
 
 // 响应拦截器
 axiosInstance.interceptors.response.use(
   (res: AxiosResponse) => {
+    // 预览页面错误不进行处理
+    if (isPreview()) {
+      return Promise.resolve(res.data)
+    }
     const { code } = res.data as { code: number }
+
     if (code === undefined || code === null) return Promise.resolve(res)
-    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) => {

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,98 @@
+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
+    }>(`${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/enums/editPageEnum.ts

@@ -46,7 +46,6 @@ export enum MenuEnum {
   UN_GROUP = 'unGroup',
   // 后退
   BACK = 'back',
-  // 前进
   FORWORD = 'forward',
   // 保存
   SAVE = 'save',
@@ -82,3 +81,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/useChartDataFetch.hook.ts

@@ -6,7 +6,6 @@ import { CreateComponentType, ChartFrameEnum } from '@/packages/index.d'
 import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
 import { RequestDataTypeEnum } from '@/enums/httpEnum'
 import { isPreview, newFunctionHandle, intervalUnitHandle } from '@/utils'
-import { setOption } from '@/packages/public/chart'
 
 // 获取类型
 type ChartEditStoreType = typeof useChartEditStore
@@ -35,7 +34,7 @@ export const useChartDataFetch = (
   const echartsUpdateHandle = (dataset: any) => {
     if (chartFrame === ChartFrameEnum.ECHARTS) {
       if (vChartRef.value) {
-        setOption(vChartRef.value, { dataset: dataset })
+        vChartRef.value.setOption({ dataset: dataset })
       }
     }
   }

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,6 +1,8 @@
 export default {
   create_btn: 'Creat',
-  create_tip: 'Please select a content for development',
+  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',

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

src/main.ts

@@ -3,7 +3,7 @@ import App from './App.vue'
 import router, { setupRouter } from '@/router'
 import i18n from '@/i18n/index'
 import { setupStore } from '@/store'
-import { setupNaive, setupDirectives, setupCustomComponents, initFunction } from '@/plugins'
+import { setupNaive, setupDirectives, setupCustomComponents } from '@/plugins'
 import { GoAppProvider } from '@/components/GoAppProvider/index'
 import { setHtmlTheme } from '@/utils'
 
@@ -53,7 +53,4 @@ async function appInit() {
   window['$vue'] = app
 }
 
-appInit().then(() => {
-  initFunction()
-})
-
+void appInit()

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

@@ -122,28 +122,23 @@ const calcData = (data: any, type?: string) => {
 
 // 数据解析
 const calcCapsuleLengthAndLabelData = (dataset: any) => {
-  try {
-    const { source } = dataset
-    if (!source || !source.length) return
+  const { source } = dataset
+  if (!source.length) return
 
-    state.capsuleItemHeight = numberSizeHandle(state.mergedConfig.itemHeight)
-    const capsuleValue = source.map((item: DataProps) => item[state.mergedConfig.dataset.dimensions[1]])
+  state.capsuleItemHeight = numberSizeHandle(state.mergedConfig.itemHeight)
+  const capsuleValue = source.map((item: DataProps) => item[state.mergedConfig.dataset.dimensions[1]])
 
-    const maxValue = Math.max(...capsuleValue)
+  const maxValue = Math.max(...capsuleValue)
 
-    state.capsuleValue = capsuleValue
+  state.capsuleValue = capsuleValue
 
-    state.capsuleLength = capsuleValue.map((v: any) => (maxValue ? v / maxValue : 0))
+  state.capsuleLength = capsuleValue.map((v: any) => (maxValue ? v / maxValue : 0))
 
-    const oneFifth = maxValue / 5
+  const oneFifth = maxValue / 5
 
-    const labelData = Array.from(new Set(new Array(6).fill(0).map((v, i) => Math.ceil(i * oneFifth))))
+  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);
-  }
+  state.labelData = labelData
 }
 
 const numberSizeHandle = (val: string | number) => {

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

@@ -1,6 +1,7 @@
 import { echartOptionProfixHandle, PublicConfigClass } from '@/packages/public'
 import { LineCommonConfig } from './index'
 import { CreateComponentType } from '@/packages/index.d'
+import { defaultTheme, chartColorsSearch } from '@/settings/chartThemes/index'
 import cloneDeep from 'lodash/cloneDeep'
 import dataJson from './data.json'
 

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

@@ -15,7 +15,7 @@ import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore
 import { chartColorsSearch, defaultTheme } from '@/settings/chartThemes/index'
 import { DatasetComponent, GridComponent, TooltipComponent, LegendComponent } from 'echarts/components'
 import { useChartDataFetch } from '@/hooks'
-import { isPreview, colorGradientCustomMerge} from '@/utils'
+import { isPreview } from '@/utils'
 
 const props = defineProps({
   themeSetting: {
@@ -45,9 +45,7 @@ watch(
   (newColor: keyof typeof chartColorsSearch) => {
     try {
       if (!isPreview()) {
-        const themeColor =
-          colorGradientCustomMerge(chartEditStore.getEditCanvasConfig.chartCustomThemeColorInfo)[newColor] ||
-          colorGradientCustomMerge(chartEditStore.getEditCanvasConfig.chartCustomThemeColorInfo)[defaultTheme]
+        const themeColor = chartColorsSearch[newColor] || chartColorsSearch[defaultTheme]
         props.chartConfig.option.series.forEach((value: any, index: number) => {
           value.areaStyle.color = new graphic.LinearGradient(0, 0, 0, 1, [
             {

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

@@ -14,7 +14,7 @@ import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore
 import { chartColorsSearch, defaultTheme } from '@/settings/chartThemes/index'
 import { DatasetComponent, GridComponent, TooltipComponent, LegendComponent } from 'echarts/components'
 import { useChartDataFetch } from '@/hooks'
-import { isPreview, colorGradientCustomMerge} from '@/utils'
+import { isPreview } from '@/utils'
 
 const props = defineProps({
   themeSetting: {
@@ -44,9 +44,7 @@ watch(
   (newColor: keyof typeof chartColorsSearch) => {
     try {
       if (!isPreview()) {
-        const themeColor =
-          colorGradientCustomMerge(chartEditStore.getEditCanvasConfig.chartCustomThemeColorInfo)[newColor] ||
-          colorGradientCustomMerge(chartEditStore.getEditCanvasConfig.chartCustomThemeColorInfo)[defaultTheme]
+        const themeColor = chartColorsSearch[newColor] || chartColorsSearch[defaultTheme]
         props.chartConfig.option.series.forEach((value: any, index: number) => {
           value.areaStyle.color = new graphic.LinearGradient(0, 0, 0, 1, [
             {

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

@@ -15,7 +15,7 @@ import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore
 import { chartColorsSearch, defaultTheme } from '@/settings/chartThemes/index'
 import { DatasetComponent, GridComponent, TooltipComponent, LegendComponent } from 'echarts/components'
 import { useChartDataFetch } from '@/hooks'
-import { isPreview, colorGradientCustomMerge } from '@/utils'
+import { isPreview } from '@/utils'
 
 const props = defineProps({
   themeSetting: {
@@ -45,9 +45,7 @@ watch(
   (newColor: keyof typeof chartColorsSearch) => {
     try {
       if (!isPreview()) {
-        const themeColor =
-          colorGradientCustomMerge(chartEditStore.getEditCanvasConfig.chartCustomThemeColorInfo)[newColor] ||
-          colorGradientCustomMerge(chartEditStore.getEditCanvasConfig.chartCustomThemeColorInfo)[defaultTheme]
+        const themeColor = chartColorsSearch[newColor] || chartColorsSearch[defaultTheme]
         props.chartConfig.option.series.forEach((value: any) => {
           value.lineStyle.shadowColor = themeColor[2]
           value.lineStyle.color.colorStops.forEach((v: { color: string }, i: number) => {

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

@@ -11,7 +11,7 @@ import { use, registerMap } from 'echarts/core'
 import { EffectScatterChart, MapChart } from 'echarts/charts'
 import { CanvasRenderer } from 'echarts/renderers'
 import { useChartDataFetch } from '@/hooks'
-import { mergeTheme, setOption } from '@/packages/public/chart'
+import { mergeTheme } from '@/packages/public/chart'
 import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
 import { isPreview } from '@/utils'
 import mapJsonWithoutHainanIsLands from './mapWithoutHainanIsLands.json'
@@ -76,7 +76,7 @@ registerMapInitAsync()
 // 手动触发渲染
 const vEchartsSetOption = () => {
   option.value = props.chartConfig.option
-  setOption(vChartRef.value, props.chartConfig.option)
+  vChartRef.value?.setOption(props.chartConfig.option)
 }
 
 // 更新数据处理

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

@@ -10,7 +10,7 @@ import { use } from 'echarts/core'
 import { CanvasRenderer } from 'echarts/renderers'
 import { HeatmapChart } from 'echarts/charts'
 import { includes } from './config'
-import { mergeTheme, setOption } from '@/packages/public/chart'
+import { mergeTheme } from '@/packages/public/chart'
 import { useChartDataFetch } from '@/hooks'
 import { CreateComponentType } from '@/packages/index.d'
 import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
@@ -68,7 +68,7 @@ const dataSetHandle = (dataset: typeof dataJson) => {
     props.chartConfig.option.series[0].data = seriesData
   }
   if (vChartRef.value && isPreview()) {
-    setOption(vChartRef.value, props.chartConfig.option)
+    vChartRef.value.setOption(props.chartConfig.option)
   }
 }
 

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

@@ -10,7 +10,7 @@ import { use } from 'echarts/core'
 import { CanvasRenderer } from 'echarts/renderers'
 import { RadarChart } from 'echarts/charts'
 import { includes } from './config'
-import { mergeTheme, setOption } from '@/packages/public/chart'
+import { mergeTheme } from '@/packages/public/chart'
 import { useChartDataFetch } from '@/hooks'
 import { CreateComponentType } from '@/packages/index.d'
 import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
@@ -50,7 +50,7 @@ const dataSetHandle = (dataset: typeof dataJson) => {
     props.chartConfig.option.radar.indicator = dataset.radarIndicator
   }
   if (vChartRef.value && isPreview()) {
-    setOption(vChartRef.value, props.chartConfig.option)
+    vChartRef.value.setOption(props.chartConfig.option)
   }
 }
 

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

@@ -10,7 +10,7 @@ import { use } from 'echarts/core'
 import { CanvasRenderer } from 'echarts/renderers'
 import { TreemapChart } from 'echarts/charts'
 import { includes } from './config'
-import { mergeTheme, setOption } from '@/packages/public/chart'
+import { mergeTheme } from '@/packages/public/chart'
 import { useChartDataFetch } from '@/hooks'
 import { CreateComponentType } from '@/packages/index.d'
 import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
@@ -42,7 +42,7 @@ const option = computed(() => {
 const dataSetHandle = (dataset: typeof dataJson) => {
   if (dataset) {
     props.chartConfig.option.series[0].data = dataset
-    setOption(vChartRef.value, props.chartConfig.option)
+    vChartRef.value?.setOption(props.chartConfig.option)
   }
 }
 

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

@@ -10,7 +10,7 @@ import 'echarts-liquidfill/src/liquidFill.js'
 import { CanvasRenderer } from 'echarts/renderers'
 import { GridComponent } from 'echarts/components'
 import config from './config'
-import { isPreview, isString, isNumber, colorGradientCustomMerge } from '@/utils'
+import { isPreview, isString, isNumber } from '@/utils'
 import { chartColorsSearch, defaultTheme } from '@/settings/chartThemes/index'
 import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
 import { useChartDataFetch } from '@/hooks'
@@ -44,9 +44,7 @@ watch(
   (newColor: keyof typeof chartColorsSearch) => {
     try {
       if (!isPreview()) {
-        const themeColor =
-          colorGradientCustomMerge(chartEditStore.getEditCanvasConfig.chartCustomThemeColorInfo)[newColor] ||
-          colorGradientCustomMerge(chartEditStore.getEditCanvasConfig.chartCustomThemeColorInfo)[defaultTheme]
+        const themeColor = chartColorsSearch[newColor] || chartColorsSearch[defaultTheme]
         // 背景颜色
         props.chartConfig.option.series[0].backgroundStyle.color = themeColor[2]
         // 水球颜色

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

@@ -14,7 +14,7 @@ export const option = {
 export default class Config extends PublicConfigClass implements CreateComponentType
 {
   public key = IframeConfig.key
-  public attr = { ...chartInitConfig, w: 1200, h: 800, zIndex: -1 }
+  public attr = { ...chartInitConfig, w: 800, h: 800, zIndex: -1 }
   public chartConfig = cloneDeep(IframeConfig)
   public option = cloneDeep(option)
 }

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

@@ -16,7 +16,7 @@ import 'echarts-wordcloud'
 import { use } from 'echarts/core'
 import { CanvasRenderer } from 'echarts/renderers'
 import config, { includes } from './config'
-import { mergeTheme, setOption } from '@/packages/public/chart'
+import { mergeTheme } from '@/packages/public/chart'
 import { useChartDataFetch } from '@/hooks'
 import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
 import { isPreview } from '@/utils'
@@ -49,7 +49,7 @@ const option = computed(() => {
 const dataSetHandle = (dataset: typeof dataJson) => {
   try {
     dataset && (props.chartConfig.option.series[0].data = dataset)
-    vChartRef.value && isPreview() && setOption(vChartRef.value, props.chartConfig.option)
+    vChartRef.value && isPreview() && vChartRef.value.setOption(props.chartConfig.option)
   } catch (error) {
     console.log(error)
   }

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

@@ -15,6 +15,7 @@ export const FontWeightObject = {
 }
 
 export const option = {
+  
   dataset: '让数字化看得见',
   fontSize: 32,
   fontColor: '#ffffff',
@@ -38,5 +39,4 @@ export default class Config extends PublicConfigClass implements CreateComponent
   public attr = { ...chartInitConfig, w: 500, h: 70, zIndex: -1 }
   public chartConfig = cloneDeep(TextBarrageConfig)
   public option = cloneDeep(option)
-  public preview = { overFlowHidden: true } 
 }

src/packages/components/Tables/Tables/TableScrollBoard/config.vue

@@ -40,15 +40,6 @@
       <SettingItem name="列宽度">
         <n-input v-model:value="columnWidth" :min="1" size="small" placeholder="列宽度(英文','分割)"></n-input>
       </SettingItem>
-      <SettingItem name="轮播方式">
-        <n-select
-          v-model:value="optionData.carousel"
-          :options="[
-            { label: '单条轮播', value: 'single' },
-            { label: '整页轮播', value: 'page' },
-          ]"
-        />
-      </SettingItem>
     </SettingItemBox>
 
     <SettingItemBox name="样式">

src/packages/index.d.ts

@@ -114,10 +114,6 @@ export interface PublicConfigType {
     // 动画
     animations: string[]
   }
-  preview?: {
-    // 预览超出隐藏
-    overFlowHidden?: boolean
-  }
   filter?: string
   status: StatusType
   events: {

src/packages/public/chart.ts

@@ -2,7 +2,6 @@ import merge from 'lodash/merge'
 import pick from 'lodash/pick'
 import { EchartsDataType } from '../index.d'
 import { globalThemeJson } from '@/settings/chartThemes/index'
-import type VChart from 'vue-echarts'
 
 /**
  * * 合并 color 和全局配置项
@@ -34,15 +33,3 @@ export const setData = (option: any, data: EchartsDataType) => {
   option.dataset = data
   return option
 }
-
-/**
- * * 配置公共 setOption 方法
- * @param instance
- * @param data
- */
-export const setOption = <T extends typeof VChart | undefined, D>(instance: T, data: D) => {
-  if (!instance) return
-  const option = instance.getOption()
-  option.dataset = null
-  instance.setOption(data)
-}

src/packages/public/publicConfig.ts

@@ -78,10 +78,6 @@ export class PublicConfigClass implements PublicConfigType {
     // 动画
     animations: []
   }
-  // 预览
-  public preview = {
-    overFlowHidden: false
-  }
   // 状态
   public status = {
     lock: false,

src/plugins/customComponents.ts

@@ -8,7 +8,10 @@ import { SketchRule } from 'vue3-sketch-ruler'
  * @param app
  */
 export function setupCustomComponents(app: App) {
+  // 骨架屏
   app.component('GoSkeleton', GoSkeleton)
+  // 加载
   app.component('GoLoading', GoLoading)
+  // 标尺
   app.component('SketchRule', SketchRule)
 }

src/plugins/icon.ts

@@ -1,5 +1,4 @@
 import {
-  Add as AddIcon,
   Close as CloseIcon,
   Remove as RemoveIcon,
   Resize as ResizeIcon,
@@ -53,9 +52,9 @@ import {
   ColorWand as ColorWandIcon,
   ArrowBack as ArrowBackIcon,
   ArrowForward as ArrowForwardIcon,
-  ArrowDown as ArrowDownIcon,
   Planet as PawIcon,
   Search as SearchIcon,
+  Reload as ReloadIcon,
   ChevronUpOutline as ChevronUpOutlineIcon,
   ChevronDownOutline as ChevronDownOutlineIcon,
   Pulse as PulseIcon,
@@ -95,6 +94,7 @@ import {
   FitToScreen as FitToScreenIcon,
   FitToHeight as FitToHeightIcon,
   FitToWidth as FitToWidthIcon,
+  Save as SaveIcon,
   Carbon3DCursor as Carbon3DCursorIcon,
   Carbon3DSoftware as Carbon3DSoftwareIcon,
   Filter as FilterIcon,
@@ -103,8 +103,6 @@ import {
 } from '@vicons/carbon'
 
 const ionicons5 = {
-  // 新增
-  AddIcon,
   // 帮助（问号）
   HelpOutlineIcon,
   // 添加
@@ -210,12 +208,12 @@ const ionicons5 = {
   ArrowBackIcon,
   // 前进
   ArrowForwardIcon,
-  // 向下
-  ArrowDownIcon,
   // 狗爪
   PawIcon,
   // 搜索（放大镜）
   SearchIcon,
+  // 加载
+  ReloadIcon,
   // 过滤器
   FilterIcon,
   // 向上
@@ -283,6 +281,8 @@ const carbon = {
   FitToScreenIcon,
   FitToHeightIcon,
   FitToWidthIcon,
+  // 保存
+  SaveIcon,
   // 成组
   Carbon3DCursorIcon,
   // 解组

src/plugins/index.ts

@@ -2,4 +2,3 @@ export { setupNaive } from '@/plugins/naive'
 export { setupDirectives } from '@/plugins/directives'
 export { setupCustomComponents } from '@/plugins/customComponents'
 export { icon } from '@/plugins/icon'
-export { initFunction } from '@/plugins/initFunction'

src/plugins/initFunction.ts

@@ -1,9 +0,0 @@
-/**
- * * 页面初始化就执行的函数
- */
-export const initFunction = async () => {
-  // 捕获全局错误
-  window.addEventListener("unhandledrejection", event => {
-    console.warn(`UNHANDLED PROMISE REJECTION: ${event.reason}`);
-  });
-}

src/plugins/naive.ts

@@ -57,7 +57,6 @@ import {
   NProgress,
   NDatePicker,
   NGrid,
-  NGi,
   NGridItem,
   NList,
   NListItem,
@@ -161,7 +160,6 @@ const naive = create({
     NProgress,
     NDatePicker,
     NGrid,
-    NGi,
     NGridItem,
     NList,
     NListItem,

src/router/base.ts

@@ -1,13 +1,13 @@
 import { RouteRecordRaw } from 'vue-router'
 import type { AppRouteRecordRaw } from '@/router/types';
-import { ErrorPage404, ErrorPage403, ErrorPage500, Layout } from '@/router/constant';
+import { ErrorPage404, ErrorPage403, ErrorPage500, Layout, RedirectHome, RedirectUnPublish } from '@/router/constant';
 import { PageEnum } from '@/enums/pageEnum'
 import { GoReload } from '@/components/GoReload'
 
 
 export const LoginRoute: RouteRecordRaw = {
-  path: '/login',
-  name: 'Login',
+  path: PageEnum.BASE_LOGIN,
+  name: PageEnum.BASE_LOGIN_NAME,
   component: () => import('@/views/login/index.vue'),
   meta: {
     title: '登录',
@@ -60,22 +60,21 @@ export const ReloadRoute: AppRouteRecordRaw = {
   },
 }
 
-export const RedirectRoute: AppRouteRecordRaw = {
-  path: PageEnum.REDIRECT,
-  name: PageEnum.REDIRECT_NAME,
-  component: Layout,
-  meta: {
-    title: PageEnum.REDIRECT_NAME,
-  },
-  children: [
-    {
-      path: '/redirect/:path(.*)',
-      name: PageEnum.REDIRECT_NAME,
-      component: () => import('@/views/redirect/index.vue'),
-      meta: {
-        title: PageEnum.REDIRECT_NAME,
-        hideBreadcrumb: true,
-      },
+export const RedirectRoute: RouteRecordRaw[] = [
+  {
+    path: PageEnum.REDIRECT,
+    name: PageEnum.REDIRECT_NAME,
+    component: RedirectHome,
+    meta: {
+      title: PageEnum.REDIRECT_NAME,
     },
-  ],
-};
+  },
+  {
+    path: PageEnum.REDIRECT_UN_PUBLISH,
+    name: PageEnum.REDIRECT_UN_PUBLISH_NAME,
+    component: RedirectUnPublish,
+    meta: {
+      title: PageEnum.REDIRECT_UN_PUBLISH_NAME,
+    },
+  },
+]

src/router/constant.ts

@@ -4,6 +4,10 @@ export const ErrorPage403 = () => import('@/views/exception/403.vue');
 
 export const ErrorPage500 = () => import('@/views/exception/500.vue');
 
+export const RedirectHome = () => import('@/views/redirect/index.vue');
+
+export const RedirectUnPublish = () => import('@/views/redirect/UnPublish.vue');
+
 export const Layout = () => import('@/layout/index.vue');
 
 export const ParentLayout = () => import('@/layout/parentLayout.vue');

src/router/index.ts

@@ -1,9 +1,8 @@
 import type { App } from 'vue'
 import { createRouter, createWebHashHistory, RouteRecordRaw } from 'vue-router'
-import { RedirectRoute } from '@/router/base'
 import { createRouterGuards } from './router-guards'
 import { PageEnum } from '@/enums/pageEnum'
-import { HttpErrorPage, LoginRoute, ReloadRoute } from '@/router/base'
+import { HttpErrorPage, LoginRoute, ReloadRoute, RedirectRoute } from '@/router/base'
 import { Layout } from '@/router/constant'
 
 import modules from '@/router/modules'
@@ -19,6 +18,7 @@ const RootRoute: Array<RouteRecordRaw> = [
     },
     children: [
       ...HttpErrorPage,
+      ...RedirectRoute,
       modules.projectRoutes,
       modules.chartRoutes,
       modules.previewRoutes,
@@ -28,7 +28,7 @@ const RootRoute: Array<RouteRecordRaw> = [
 ]
 
 
-export const constantRouter: any[] = [LoginRoute, ...RootRoute, RedirectRoute, ReloadRoute];
+export const constantRouter: any[] = [LoginRoute, ...RootRoute, ReloadRoute];
 
 const router = createRouter({
   history: createWebHashHistory(''),

src/router/router-guards.ts

@@ -1,7 +1,15 @@
 import { Router } from 'vue-router';
-import { PageEnum } from '@/enums/pageEnum'
+import { PageEnum, PreviewEnum } from '@/enums/pageEnum'
 import { loginCheck } from '@/utils'
 
+// 路由白名单
+const routerAllowList = [
+  // 登录
+  PageEnum.BASE_LOGIN_NAME,
+  // 预览
+  PreviewEnum.CHART_PREVIEW_NAME
+]
+
 export function createRouterGuards(router: Router) {
   // 前置
   router.beforeEach(async (to, from, next) => {
@@ -12,10 +20,8 @@ export function createRouterGuards(router: Router) {
       next({ name: PageEnum.ERROR_PAGE_NAME_404 })
     }
 
-    if (!loginCheck()) {
-      if (to.name === PageEnum.BASE_LOGIN_NAME) {
-        next()
-      }
+    // @ts-ignore
+    if (!routerAllowList.includes(to.name) && !loginCheck()) {
       next({ name: PageEnum.BASE_LOGIN_NAME })
     }
     next()

src/settings/chartThemes/index.ts

@@ -31,20 +31,38 @@ export const chartColors = {
 // 默认主题
 export const defaultTheme = 'dark'
 
-// 默认展示的选择器颜色列表
-export const swatchesColors = ['#232324', '#2a2a2b', '#313132', '#373739', '#757575', '#e0e0e0', '#eeeeee', '#fafafa']
-
-// 自定义颜色
-export type CustomColorsType = {
-  id: string,
-  name: string,
-  color: string[]
+// 主题色列表
+export type ChartColorsNameType = keyof typeof chartColorsName
+export const chartColorsName = {
+  dark: '明亮',
+  customed: '暗淡',
+  macarons: '马卡龙',
+  walden: '蓝绿',
+  purplePassion: '深紫',
+  vintage: '复古',
+  chalk: '粉青',
+  westeros: '灰粉',
+  wonderland: '青草',
+  essos: '橘红',
+  shine: '深色',
+  roma: '罗马红'
 }
 
-// 主题色列表, 自定义的颜色使用的是 UUID 作为标识，因为两者数据结构不一致
-export type ChartColorsNameType = keyof typeof chartColors
-
-
+// 主题色列表
+export const chartColorsshow = {
+  dark: 'linear-gradient(to right, #4992ff 0%, #7cffb2 100%)',
+  customed: 'linear-gradient(to right, #5470c6 0%, #91cc75 100%)',
+  macarons: 'linear-gradient(to right, #2ec7c9 0%, #b6a2de 100%)',
+  walden: 'linear-gradient(to right, #3fb1e3 0%, #6be6c1 100%)',
+  purplePassion: 'linear-gradient(to right, #9b8bba 0%, #e098c7 100%)',
+  vintage: 'linear-gradient(to right, #d87c7c 0%, #919e8b 100%)',
+  chalk: 'linear-gradient(to right, #fc97af 0%, #87f7cf 100%)',
+  westeros: 'linear-gradient(to right, #516b91 0%, #edafda 100%)',
+  wonderland: 'linear-gradient(to right, #4ea397 0%, #22c3aa 100%)',
+  essos: 'linear-gradient(to right, #893448 0%, #d95850 100%)',
+  shine: 'linear-gradient(to right, #c12e34 0%, #0098d9 100%)',
+  roma: 'linear-gradient(to right, #e01f54 0%, #5e4ea5 100%)'
+}
 // 渐变主题色列表（主色1、主色2、阴影、渐变1、渐变2）
 export const chartColorsSearch = {
   dark: ['#4992ff', '#7cffb2', 'rgba(68, 181, 226, 0.3)', 'rgba(73, 146, 255, 0.5)', 'rgba(124, 255, 178, 0.5)'],

src/settings/chartThemes/themes/chalk.json

@@ -8,6 +8,5 @@
     "#d4a4eb",
     "#d2f5a6",
     "#76f2f2"
-  ],
-  "name": "粉青"
+  ]
 }

src/settings/chartThemes/themes/customed.json

@@ -9,6 +9,5 @@
     "#fc8452",
     "#9a60b4",
     "#ea7ccc"
-  ],
-  "name": "暗淡"
+  ]
 }

src/settings/chartThemes/themes/dark.json

@@ -9,6 +9,5 @@
     "#ff8a45",
     "#8d48e3",
     "#dd79ff"
-  ],
-  "name": "明亮"
+  ]
 }

src/settings/chartThemes/themes/essos.json

@@ -6,6 +6,5 @@
     "#ffb248",
     "#f2d643",
     "#ebdba4"
-  ],
-  "name": "橘红"
+  ]
 }

src/settings/chartThemes/themes/macarons.json

@@ -20,6 +20,5 @@
     "#7eb00a",
     "#6f5553",
     "#c14089"
-  ],
-  "name": "马卡龙"
+  ]
 }

src/settings/chartThemes/themes/purple-passion.json

@@ -6,6 +6,5 @@
     "#71669e",
     "#cc70af",
     "#7cb4cc"
-  ],
-  "name": "深紫"
+  ]
 }

src/settings/chartThemes/themes/roma.json

@@ -20,6 +20,5 @@
     "#3cb371",
     "#d5b158",
     "#38b6b6"
-  ],
-  "name": "罗马红"
+  ]
 }

src/settings/chartThemes/themes/shine.json

@@ -8,6 +8,5 @@
     "#339ca8",
     "#cda819",
     "#32a487"
-  ],
-  "name": "深色"
+  ]
 }

src/settings/chartThemes/themes/vintage.json

@@ -10,6 +10,5 @@
     "#cc7e63",
     "#724e58",
     "#4b565b"
-  ],
-  "name": "复古"
+  ]
 }

src/settings/chartThemes/themes/walden.json

@@ -6,6 +6,5 @@
     "#a0a7e6",
     "#c4ebad",
     "#96dee8"
-  ],
-  "name": "蓝绿"
+  ]
 }

src/settings/chartThemes/themes/westeros.json

@@ -6,6 +6,5 @@
     "#93b7e3",
     "#a5e7f0",
     "#cbb0e3"
-  ],
-  "name": "灰粉"
+  ]
 }

src/settings/chartThemes/themes/wonderland.json

@@ -6,6 +6,5 @@
     "#d0648a",
     "#f58db2",
     "#f2b3c9"
-  ],
-  "name": "青草"
+  ]
 }

src/settings/designSetting.ts

@@ -61,6 +61,9 @@ export const editToJsonInterval = 5000
 // 数据请求间隔
 export const requestInterval = 30
 
+// 工作台自动保存间隔（s）
+export const saveInterval = 30
+
 // 数据请求间隔单位
 export const requestIntervalUnit = RequestHttpIntervalEnum.SECOND
 

src/settings/httpSetting.ts

@@ -0,0 +1,2 @@
+// 请求前缀
+export const axiosPre = '/api/goview'

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

@@ -1,5 +1,6 @@
 import { CreateComponentType, CreateComponentGroupType, FilterEnum } from '@/packages/index.d'
 import { HistoryActionTypeEnum } from '@/store/modules/chartHistoryStore/chartHistoryStore.d'
+import { SyncEnum } from '@/enums/editPageEnum'
 import {
   RequestHttpEnum,
   RequestContentTypeEnum,
@@ -10,7 +11,30 @@ import {
   RequestParamsObjType
 } from '@/enums/httpEnum'
 import { PreviewScaleEnum } from '@/enums/styleEnum'
-import type { ChartColorsNameType, CustomColorsType, GlobalThemeJsonType } from '@/settings/chartThemes/index'
+import type { ChartColorsNameType, GlobalThemeJsonType } from '@/settings/chartThemes/index'
+
+// 项目数据枚举
+export enum ProjectInfoEnum {
+  // ID
+  PROJECT_ID = "projectId",
+  // 名称
+  PROJECT_NAME = 'projectName',
+  // 描述
+  REMARKS = 'remarks',
+  // 缩略图
+  THUMBNAIL= 'thumbnail',
+  // 是否公开发布
+  RELEASE = 'release'
+}
+
+// 项目数据
+export type ProjectInfoType = {
+  [ProjectInfoEnum.PROJECT_ID]: string,
+  [ProjectInfoEnum.PROJECT_NAME]: string,
+  [ProjectInfoEnum.REMARKS]: string,
+  [ProjectInfoEnum.THUMBNAIL]: string,
+  [ProjectInfoEnum.RELEASE]: boolean
+}
 
 // 编辑画布属性
 export enum EditCanvasTypeEnum {
@@ -20,12 +44,13 @@ export enum EditCanvasTypeEnum {
   SCALE = 'scale',
   USER_SCALE = 'userScale',
   LOCK_SCALE = 'lockScale',
+  SAVE_STATUS = 'saveStatus',
   IS_CREATE = 'isCreate',
   IS_DRAG = 'isDrag',
   IS_SELECT = 'isSelect'
 }
 
-// 编辑区域
+// 编辑区域（临时）
 export type EditCanvasType = {
   // 编辑区域 DOM
   [EditCanvasTypeEnum.EDIT_LAYOUT_DOM]: HTMLElement | null
@@ -42,17 +67,18 @@ export type EditCanvasType = {
   [EditCanvasTypeEnum.IS_CREATE]: boolean
   // 拖拽中
   [EditCanvasTypeEnum.IS_DRAG]: boolean
+  // 保存状态
+  [EditCanvasTypeEnum.SAVE_STATUS]: SyncEnum
   // 框选中
   [EditCanvasTypeEnum.IS_SELECT]: boolean
 }
 
-// 滤镜/背景色/宽高主题等
+// 画布数据/滤镜/背景色/宽高主题等
 export enum EditCanvasConfigEnum {
   PROJECT_NAME = 'projectName',
   WIDTH = 'width',
   HEIGHT = 'height',
   CHART_THEME_COLOR = 'chartThemeColor',
-  CHART_CUSTOM_THEME_COLOR_INFO = 'chartCustomThemeColorInfo',
   CHART_THEME_SETTING = 'chartThemeSetting',
   BACKGROUND = 'background',
   BACKGROUND_IMAGE = 'backgroundImage',
@@ -60,7 +86,14 @@ export enum EditCanvasConfigEnum {
   PREVIEW_SCALE_TYPE = 'previewScaleType'
 }
 
-export interface EditCanvasConfigType {
+// 画布属性（需保存）
+export type EditCanvasConfigType = {
+  // ID
+  [EditCanvasConfigEnum.PROJECT_ID]: string,
+  // 项目名称
+  [EditCanvasConfigEnum.PROJECT_NAME]?: string,
+  // 项目描述
+  [EditCanvasConfigEnum.REMARKS]: string,
   // 滤镜-启用
   [FilterEnum.FILTERS_SHOW]: boolean
   // 滤镜-色相
@@ -88,12 +121,9 @@ export interface EditCanvasConfigType {
   [EditCanvasConfigEnum.HEIGHT]: number
   // 背景色
   [EditCanvasConfigEnum.BACKGROUND]?: string
-  // 背景图片
   [EditCanvasConfigEnum.BACKGROUND_IMAGE]?: string | null
   // 图表主题颜色
   [EditCanvasConfigEnum.CHART_THEME_COLOR]: ChartColorsNameType
-  // 自定义图表主题颜色
-  [EditCanvasConfigEnum.CHART_CUSTOM_THEME_COLOR_INFO]?: CustomColorsType[] 
   // 图表全局配置
   [EditCanvasConfigEnum.CHART_THEME_SETTING]: GlobalThemeJsonType
   // 图表主题颜色
@@ -137,6 +167,7 @@ export type RecordChartType = {
 
 // Store 枚举
 export enum ChartEditStoreEnum {
+  PROJECT_INFO = 'projectInfo',
   EDIT_RANGE = 'editRange',
   EDIT_CANVAS = 'editCanvas',
   RIGHT_MENU_SHOW = 'rightMenuShow',
@@ -198,6 +229,7 @@ export interface RequestConfigType extends RequestPublicConfigType {
 
 // Store 类型
 export interface ChartEditStoreType {
+  [ChartEditStoreEnum.PROJECT_INFO]: ProjectInfoType
   [ChartEditStoreEnum.EDIT_CANVAS]: EditCanvasType
   [ChartEditStoreEnum.EDIT_CANVAS_CONFIG]: EditCanvasConfigType
   [ChartEditStoreEnum.RIGHT_MENU_SHOW]: boolean

src/store/modules/chartEditStore/chartEditStore.ts

@@ -10,14 +10,22 @@ import { requestInterval, previewScaleType, requestIntervalUnit } from '@/settin
 import { useChartHistoryStore } from '@/store/modules/chartHistoryStore/chartHistoryStore'
 // 全局设置
 import { useSettingStore } from '@/store/modules/settingStore/settingStore'
+// 历史类型
+import { HistoryActionTypeEnum, HistoryItemType, HistoryTargetTypeEnum } from '@/store/modules/chartHistoryStore/chartHistoryStore.d'
+// 画布枚举
+import { MenuEnum, SyncEnum } from '@/enums/editPageEnum'
+
 import {
-  HistoryActionTypeEnum,
-  HistoryItemType,
-  HistoryTargetTypeEnum
-} from '@/store/modules/chartHistoryStore/chartHistoryStore.d'
-import { MenuEnum } from '@/enums/editPageEnum'
-import { getUUID, loadingStart, loadingFinish, loadingError, isString, isArray } from '@/utils'
+  getUUID,
+  loadingStart,
+  loadingFinish,
+  loadingError,
+  isString,
+  isArray
+} from '@/utils'
+
 import {
+  ProjectInfoType,
   ChartEditStoreEnum,
   ChartEditStorage,
   ChartEditStoreType,
@@ -36,6 +44,14 @@ const settingStore = useSettingStore()
 export const useChartEditStore = defineStore({
   id: 'useChartEditStore',
   state: (): ChartEditStoreType => ({
+    // 项目数据
+    projectInfo: {
+      projectId: '',
+      projectName: '',
+      remarks: '',
+      thumbnail: '',
+      release: false
+    },
     // 画布属性
     editCanvas: {
       // 编辑区域 Dom
@@ -54,7 +70,9 @@ export const useChartEditStore = defineStore({
       // 拖拽中
       isDrag: false,
       // 框选中
-      isSelect: false
+      isSelect: false,
+      // 同步中
+      saveStatus: SyncEnum.PENDING
     },
     // 右键菜单
     rightMenuShow: false,
@@ -108,8 +126,6 @@ export const useChartEditStore = defineStore({
       selectColor: true,
       // chart 主题色
       chartThemeColor: defaultTheme || 'dark',
-      // 自定义颜色列表
-      chartCustomThemeColorInfo: undefined,
       // 全局配置
       chartThemeSetting: globalThemeJson,
       // 适配方式
@@ -136,6 +152,9 @@ export const useChartEditStore = defineStore({
     componentList: []
   }),
   getters: {
+    getProjectInfo(): ProjectInfoType {
+      return this.projectInfo
+    },
     getMousePosition(): MousePositionType {
       return this.mousePosition
     },
@@ -170,6 +189,10 @@ export const useChartEditStore = defineStore({
     }
   },
   actions: {
+    // * 设置 peojectInfo 数据项
+    setProjectInfo<T extends keyof ProjectInfoType,  K extends ProjectInfoType[T]>(key: T, value: K) {
+      this.projectInfo[key] = value
+    },
     // * 设置 editCanvas 数据项
     setEditCanvas<T extends keyof EditCanvasType, K extends EditCanvasType[T]>(key: T, value: K) {
       this.editCanvas[key] = value

src/store/modules/settingStore/settingStore.ts

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

src/store/modules/systemStore/systemStore.d.ts

@@ -0,0 +1,31 @@
+export enum SystemStoreUserInfoEnum {
+  USER_TOKEN = 'userToken',
+  TOKEN_NAME = 'tokenName',
+  USER_ID = 'userId',
+  USER_NAME = 'userName',
+  NICK_NAME = 'nickName',
+}
+
+export interface UserInfoType {
+  [SystemStoreUserInfoEnum.USER_TOKEN]?: string,
+  [SystemStoreUserInfoEnum.TOKEN_NAME]?: string,
+  [SystemStoreUserInfoEnum.USER_ID]?: string,
+  [SystemStoreUserInfoEnum.USER_NAME]?: string,
+  [SystemStoreUserInfoEnum.NICK_NAME]?: string,
+}
+
+export interface FetchInfoType {
+  OSSUrl?: string,
+}
+
+export enum SystemStoreEnum {
+  // 用户
+  USER_INFO = 'userInfo',
+  // 请求
+  FETCH_INFO = 'fetchInfo'
+}
+
+export interface SystemStoreType {
+  [SystemStoreEnum.USER_INFO]: UserInfoType
+  [SystemStoreEnum.FETCH_INFO]: FetchInfoType
+}

src/store/modules/systemStore/systemStore.ts

@@ -0,0 +1,40 @@
+import { defineStore } from 'pinia'
+import { SystemStoreType, UserInfoType, FetchInfoType } from './systemStore.d'
+import { setLocalStorage, getLocalStorage } from '@/utils'
+import { StorageEnum } from '@/enums/storageEnum'
+
+const { GO_SYSTEM_STORE } = StorageEnum
+
+const storageSystem: SystemStoreType = getLocalStorage(GO_SYSTEM_STORE)
+
+// 系统数据记录
+export const useSystemStore = defineStore({
+  id: 'useSystemStore',
+  state: (): SystemStoreType => storageSystem || {
+    userInfo: {
+      userId: undefined,
+      userName: undefined,
+      userToken: undefined,
+      nickName: undefined
+    },
+    fetchInfo: {
+      OSSUrl: undefined
+    }
+  },
+  getters: {
+    getUserInfo(): UserInfoType {
+      return this.userInfo
+    },
+    getFetchInfo(): FetchInfoType {
+      return this.fetchInfo
+    },
+  },
+  actions: {
+    setItem<T extends keyof SystemStoreType, K extends SystemStoreType[T]>(key: T, value: K): void {
+      this.$patch(state => {
+        state[key] = value
+      });
+      setLocalStorage(GO_SYSTEM_STORE, this.$state)
+    }
+  }
+})

src/utils/file.ts

@@ -1,3 +1,65 @@
+/**
+ * * base64转file
+ * @param dataurl 
+ * @param fileName 
+ * @returns 
+ */
+export const base64toFile = (dataurl: string, fileName: string) => {
+  let dataArr = dataurl.split(","),
+  mime = (dataArr as any[])[0].match(/:(.*?);/)[1],
+  bstr = atob(dataArr[1]),
+  n = bstr.length,
+  u8arr = new Uint8Array(n);
+  while (n--) {
+    u8arr[n] = bstr.charCodeAt(n);
+  }
+  return new File([u8arr], fileName, { type: mime });
+}
+
+/**
+ * * file转url
+ */
+ export const fileToUrl = (file: File): string => {
+  const Url = URL || window.URL || window.webkitURL
+  const ImageUrl = Url.createObjectURL(file)
+  return ImageUrl
+}
+
+/**
+ * * url转file
+ */
+ export const urlToFile = (fileUrl: string, fileName = `${new Date().getTime()}`): File => {
+  const dataArr = fileUrl.split(',')
+  const mime = (dataArr as any[])[0].match(/:(.*);/)[1]
+  const originStr = atob(dataArr[1])
+  return new File([originStr], `${fileName}`, { type: mime })
+}
+
+/**
+ * * file转base64
+ * @param file 文件数据
+ * @param callback 回调函数 
+ */
+export const fileTobase64 = (file: File, callback: Function) => {
+  let reader = new FileReader()
+  reader.readAsDataURL(file)
+  reader.onload = function (e: ProgressEvent<FileReader>) {
+    if (e.target) {
+      let base64 = e.target.result
+      callback(base64)
+    }
+  }
+}
+
+/**
+ * * canvas转file
+ * @param canvas 
+ */
+export const canvastoFile = (canvas: HTMLCanvasElement, name?: string) => {
+  const dataurl = canvas.toDataURL('image/png')
+  return urlToFile(dataurl, name)
+}
+
 /**
  * *获取上传的文件数据
  * @param { File } file 文件对象
@@ -51,4 +113,4 @@ export const downloadTextFile = (
   // 字符内容转变成blob地址
   const blob = new Blob([content])
   downloadByA(URL.createObjectURL(blob), filename, fileSuffix)
-}
+}

src/utils/http.ts

@@ -0,0 +1,6 @@
+/**
+ * * 请求失败统一处理
+ */
+export const httpErrorHandle = () => {
+  window['$message'].error(window['$t']('http.error_message'))
+}

src/utils/index.ts

@@ -7,3 +7,4 @@ export * from '@/utils/plugin'
 export * from '@/utils/components'
 export * from '@/utils/type'
 export * from '@/utils/file'
+export * from '@/utils/http'

src/utils/plugin.ts

@@ -35,7 +35,7 @@ export const loadingError = () => {
  * })
  * ```
  */
-export const goDialog = (
+ export const goDialog = (
   params: {
     // 基本
     type?: DialogEnum

src/utils/router.ts

@@ -1,11 +1,12 @@
 import { useRoute } from 'vue-router'
-import { ResultEnum } from '@/enums/httpEnum'
-import { ErrorPageNameMap, PageEnum } from '@/enums/pageEnum'
+import { ResultEnum, RequestHttpHeaderEnum } from '@/enums/httpEnum'
+import { ErrorPageNameMap, PageEnum, PreviewEnum } from '@/enums/pageEnum'
 import { docPath, giteeSourceCodePath } from '@/settings/pathConst'
-import { cryptoDecode } from './crypto'
+import { SystemStoreEnum, SystemStoreUserInfoEnum } from '@/store/modules/systemStore/systemStore.d'
 import { StorageEnum } from '@/enums/storageEnum'
-import { clearLocalStorage, getLocalStorage } from './storage'
+import { clearLocalStorage, getLocalStorage, clearCookie } from './storage'
 import router from '@/router'
+import { logoutApi } from '@/api/path'
 
 /**
  * * 根据名字跳转路由
@@ -101,11 +102,20 @@ export const reloadRoutePage = () => {
 }
 
 /**
- * * 退出
+ * * 退出登录
  */
-export const logout = () => {
-  clearLocalStorage(StorageEnum.GO_LOGIN_INFO_STORE)
-  routerTurnByName(PageEnum.BASE_LOGIN_NAME)
+export const logout = async () => {
+  try {
+    const res = await logoutApi()
+    if(res && res.code === ResultEnum.SUCCESS) {
+      window['$message'].success(window['$t']('global.logout_success'))
+      clearCookie(RequestHttpHeaderEnum.COOKIE)
+      clearLocalStorage(StorageEnum.GO_SYSTEM_STORE)
+      routerTurnByName(PageEnum.BASE_LOGIN_NAME)
+    }
+  } catch (error) {
+    window['$message'].success(window['$t']('global.logout_failure'))
+  }
 }
 
 /**
@@ -157,7 +167,7 @@ export const fetchRouteParams = () => {
  * * 通过硬解析获取当前路由下的参数
  * @returns object
  */
- export const fetchRouteParamsLocation = () => {
+export const fetchRouteParamsLocation = () => {
   try {
     return document.location.hash.split('/').pop() || ''
   } catch (error) {
@@ -175,19 +185,29 @@ export const goHome = () => {
 }
 
 /**
- * * 判断是否登录（现阶段是有 login 数据即可）
+ * * 判断是否登录
  * @return boolean
  */
 export const loginCheck = () => {
   try {
-    const info = getLocalStorage(StorageEnum.GO_LOGIN_INFO_STORE)
+    const info = getLocalStorage(StorageEnum.GO_SYSTEM_STORE)
     if (!info) return false
-    const decodeInfo = cryptoDecode(info)
-    if (decodeInfo) {
+    if (info[SystemStoreEnum.USER_INFO][SystemStoreUserInfoEnum.USER_TOKEN]) {
       return true
     }
     return false
   } catch (error) {
     return false
   }
-} 
+}
+
+/**
+ * * 预览地址
+ * @returns 
+ */
+ export const previewPath = (id?: string | number) => {
+  const { origin, pathname } = document.location
+  const path = fetchPathByName(PreviewEnum.CHART_PREVIEW_NAME, 'href')
+  const previewPath = `${origin}${pathname}${path}/${id || fetchRouteParamsLocation()}`
+  return previewPath
+}

src/utils/storage.ts

@@ -44,7 +44,7 @@ export const clearLocalStorage = (name: string) => {
  */
 export const setSessionStorage = <T>(k: string, v: T) => {
   try {
-    window.sessionStorage.setItem(k, JSONStringify(v))
+    window.sessionStorage.setItem(k, JSON.stringify(v))
   } catch (error) {
     return false
   }
@@ -70,3 +70,41 @@ export const getSessionStorage: (k: string) => any = (k: string) => {
 export const clearSessioStorage = (name: string) => {
   window.sessionStorage.removeItem(name)
 }
+
+/**
+ * * 设置 cookie
+ * @param name 键名
+ * @param cvalue 键值
+ * @param exdays 过期时间
+ */
+export const setCookie = (name: string, cvalue: string, exdays: number) => {
+  const d = new Date();
+  d.setTime(d.getTime() + (exdays * 24 * 60 * 60 * 1000));
+  const expires = "expires=" + d.toUTCString();
+  document.cookie = name + "=" + cvalue + "; " + expires;
+}
+
+/**
+ * * 获取 cookie
+ * @param cname 键名
+ * @returns string
+ */
+export const getCookie = (cname: string) => {
+  const name = cname + "=";
+  const ca = document.cookie.split(';');
+  for (let i = 0; i < ca.length; i++) {
+    let c = ca[i];
+    while (c.charAt(0) == ' ') c = c.substring(1);
+    if (c.indexOf(name) != -1) return c.substring(name.length, c.length);
+  }
+  return "";
+}
+
+/**
+ * * 清除 cookie 
+ * @param name 键名
+ * @returns string
+ */
+export const clearCookie = (name: string) => {
+  setCookie(name, "", -1);
+}

src/utils/style.ts

@@ -2,7 +2,6 @@ import Color from 'color'
 import { useDesignStore } from '@/store/modules/designStore/designStore'
 import { PickCreateComponentType } from '@/packages/index.d'
 import { EditCanvasConfigType } from '@/store/modules/chartEditStore/chartEditStore.d'
-import { chartColors, chartColorsSearch, CustomColorsType } from '@/settings/chartThemes/index'
 
 type AttrType = PickCreateComponentType<'attr'>
 type StylesType = PickCreateComponentType<'styles'>
@@ -87,21 +86,6 @@ export function darken(color: string, concentration: number) {
   return Color(color).darken(concentration).toString()
 }
 
-/**
- * * hsl 转成16进制
- * @param hsl
- * @returns
- */
-export function hslToHexa(hslString: string): string {
-  const color = Color(hslString)
-  return color.hexa()
-}
-
-export function hslToHex(hslString: string): string {
-  const color = Color(hslString)
-  return color.hex()
-}
-
 /**
  * * 修改主题色
  * @param themeName 主题名称
@@ -116,48 +100,3 @@ export const setHtmlTheme = (themeName?: string) => {
   const designStore = useDesignStore()
   e.setAttribute('data-theme', designStore.themeName)
 }
-
-/**
- * * 合并基础颜色和自定义颜色
- * @param chartDefaultColors
- * @param customColor
- * @returns
- */
-export const colorCustomMerge = (customColor?: CustomColorsType[]) => {
-  type FormateCustomColorType = {
-    [T: string]: {
-      color: string[]
-      name: string
-    }
-  }
-  const formateCustomColor: FormateCustomColorType = {}
-  customColor?.forEach(item => {
-    formateCustomColor[item.id] = {
-      color: item.color,
-      name: item.name
-    }
-  })
-  return { ...formateCustomColor, ...chartColors }
-}
-
-/**
- * * 合并基础渐变颜色和自定义渐变颜色
- * @param customColor
- */
-export const colorGradientCustomMerge = (customColor?: CustomColorsType[]) => {
-  type FormateGradientCustomColorType = {
-    [T: string]: string[]
-  }
-  const formateGradientCustomColor: FormateGradientCustomColorType = {}
-  customColor?.forEach(item => {
-    formateGradientCustomColor[item.id] = [
-      item.color[0],
-      item.color[1],
-      fade(item.color[0], 0.3),
-      fade(item.color[0], 0.5),
-      fade(item.color[1], 0.5)
-    ]
-  })
-
-  return { ...formateGradientCustomColor, ...chartColorsSearch }
-}

src/utils/utils.ts

@@ -114,29 +114,6 @@ export const isMac = () => {
   return /macintosh|mac os x/i.test(navigator.userAgent)
 }
 
-/**
- * * file转url
- */
-export const fileToUrl = (file: File): string => {
-  const Url = URL || window.URL || window.webkitURL
-  const ImageUrl = Url.createObjectURL(file)
-  return ImageUrl
-}
-
-/**
- * * file转base64
- */
-export const fileTobase64 = (file: File, callback: Function) => {
-  let reader = new FileReader()
-  reader.readAsDataURL(file)
-  reader.onload = function (e: ProgressEvent<FileReader>) {
-    if (e.target) {
-      let base64 = e.target.result
-      callback(base64)
-    }
-  }
-}
-
 /**
  * * 挂载监听
  */

src/views/chart/ContentConfigurations/components/CanvasPage/components/ChartThemeColor/index.vue

@@ -1,16 +1,7 @@
 <template>
   <div class="go-chart-theme-color">
-    <n-card class="card-box" size="small" hoverable embedded @click="createColorHandle">
-      <n-text class="go-flex-items-center">
-        <span>自定义颜色</span>
-        <n-icon size="16">
-          <add-icon></add-icon>
-        </n-icon>
-      </n-text>
-    </n-card>
-
     <n-card
-      v-for="(value, key) in comChartColors"
+      v-for="(value, key) in chartColors"
       :key="key"
       class="card-box"
       :class="{ selected: key === selectName }"
@@ -20,51 +11,41 @@
       @click="selectTheme(key)"
     >
       <div class="go-flex-items-center">
-        <n-ellipsis style="text-align: left; width: 60px">{{ value.name }} </n-ellipsis>
+        <n-text>{{ chartColorsName[key] }}</n-text>
         <span
           class="theme-color-item"
           v-for="colorItem in fetchShowColors(value.color)"
           :key="colorItem"
           :style="{ backgroundColor: colorItem }"
-        ></span>
+       ></span>
       </div>
-      <div class="theme-bottom" :style="{ backgroundImage: colorBackgroundImage(value) }"></div>
+      <div
+        class="theme-bottom"
+        :style="{ backgroundImage: chartColorsshow[key] }"
+      ></div>
     </n-card>
-    <!-- 自定义颜色 modal -->
-    <create-color v-model:modelShow="createColorModelShow"></create-color>
   </div>
 </template>
 
 <script setup lang="ts">
-import { ref, computed } from 'vue'
-import cloneDeep from 'lodash/cloneDeep'
+import { computed } from 'vue'
 import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
 import { EditCanvasConfigEnum } from '@/store/modules/chartEditStore/chartEditStore.d'
-import { chartColors, ChartColorsNameType } from '@/settings/chartThemes/index'
+import {
+  chartColors,
+  chartColorsName,
+  chartColorsshow,
+  ChartColorsNameType
+} from '@/settings/chartThemes/index'
 import { useDesignStore } from '@/store/modules/designStore/designStore'
-import { loadAsyncComponent, colorCustomMerge } from '@/utils'
+import cloneDeep from 'lodash/cloneDeep'
 import { icon } from '@/plugins'
 
-type FormateCustomColorType = {
-  [T: string]: {
-    color: string[]
-    name: string
-  }
-}
-
-const CreateColor = loadAsyncComponent(() => import('../CreateColor/index.vue'))
-
-const { SquareIcon, AddIcon } = icon.ionicons5
+const { SquareIcon } = icon.ionicons5
 const chartEditStore = useChartEditStore()
 
 // 全局颜色
 const designStore = useDesignStore()
-const createColorModelShow = ref(false)
-
-// 合并默认颜色和自定义颜色
-const comChartColors = computed(() => {
-  return colorCustomMerge(chartEditStore.getEditCanvasConfig.chartCustomThemeColorInfo)
-})
 
 // 颜色
 const themeColor = computed(() => {
@@ -76,16 +57,6 @@ const selectName = computed(() => {
   return chartEditStore.getEditCanvasConfig.chartThemeColor
 })
 
-// 创建颜色
-const createColorHandle = () => {
-  createColorModelShow.value = true
-}
-
-// 底色
-const colorBackgroundImage = (item: { color: string[] }) => {
-  return `linear-gradient(to right, ${item.color[0]} 0%, ${item.color[5]} 100%)`
-}
-
 // 获取用来展示的色号
 const fetchShowColors = (colors: Array<string>) => {
   return cloneDeep(colors).splice(0, 6)
@@ -98,34 +69,36 @@ const selectTheme = (theme: ChartColorsNameType) => {
 </script>
 
 <style lang="scss" scoped>
-$radius: 10px;
-$itemRadius: 6px;
-
-@include go('chart-theme-color') {
+@include go(chart-theme-color) {
+  padding-top: 20px;
   .card-box {
     cursor: pointer;
     margin-top: 15px;
     padding: 0;
     @include fetch-bg-color('background-color4-shallow');
-    border-radius: $radius;
+    border-radius: 23px;
     overflow: hidden;
-
+    @include deep() {
+      .n-card__content {
+        padding-top: 5px;
+        padding-bottom: 10px;
+      }
+    }
     &.selected {
-      border: 2px solid v-bind('themeColor');
+      border: 1px solid v-bind('themeColor');
       border-bottom: 1px solid rgba(0, 0, 0, 0);
     }
     &:first-child {
-      margin-top: 5px;
+      margin-top: 0;
     }
     .go-flex-items-center {
       justify-content: space-between;
-      margin-top: -4px;
     }
     .theme-color-item {
       display: inline-block;
       width: 20px;
       height: 20px;
-      border-radius: $itemRadius;
+      border-radius: 50%;
     }
     .theme-bottom {
       position: absolute;
@@ -133,6 +106,7 @@ $itemRadius: 6px;
       bottom: 0px;
       width: 100%;
       height: 3px;
+      background-image: linear-gradient(to right, #e0c3fc 0%, #8ec5fc 100%);
     }
   }
 }

src/views/chart/ContentConfigurations/components/CanvasPage/components/CreateColor/index.vue

@@ -1,393 +0,0 @@
-<template>
-  <n-modal class="go-chart-create-color" v-model:show="modelShowRef" :mask-closable="false" :closeOnEsc="false">
-    <n-card :bordered="false" role="dialog" size="small" aria-modal="true" style="width: 900px; height: 720px">
-      <template #header></template>
-      <template #header-extra> </template>
-      <div class="create-content">
-        <div class="create-color-setting-box">
-          <create-color-render
-            v-if="selectColorId"
-            :selectColor="selectColor.selectInfo"
-            @updateColor="updateColorHandle"
-          ></create-color-render>
-          <!-- 无数据 -->
-          <div v-else class="no-data go-flex-center">
-            <img :src="noData" alt="暂无数据" />
-            <n-text :depth="3">暂未选择自定义颜色</n-text>
-          </div>
-        </div>
-        <div class="color-list-box">
-          <n-timeline class="pond-item-timeline" style="width: 20px">
-            <n-timeline-item type="info"> </n-timeline-item>
-            <n-timeline-item type="success"></n-timeline-item>
-          </n-timeline>
-          <div class="color-list">
-            <n-space>
-              <!-- 新增 -->
-              <n-button
-                class="create-btn"
-                :class="{ 'is-full': !!!selectColorId }"
-                type="primary"
-                :ghost="!!!selectColorId"
-                :secondary="!!selectColorId"
-                @click="createColor"
-              >
-                <span> 创建 </span>
-                <template #icon>
-                  <n-icon>
-                    <duplicate-outline-icon></duplicate-outline-icon>
-                  </n-icon>
-                </template>
-              </n-button>
-              <n-badge v-if="selectColorId" :show="updateColor !== undefined" dot>
-                <n-button class="create-btn" type="info" secondary @click="saveHandle">
-                  <span> 应用数据 </span>
-                  <template #icon>
-                    <n-icon>
-                      <arrow-down-icon></arrow-down-icon>
-                    </n-icon>
-                  </template>
-                </n-button>
-              </n-badge>
-            </n-space>
-            <n-divider style="margin: 10px 0"></n-divider>
-            <n-text v-if="!selectColorId" class="not-data-text" :depth="3">
-              暂无自定义颜色，
-              <n-a @click="createColor">立即创建</n-a>
-            </n-text>
-            <!-- 列表 -->
-            <div class="color-card-box" v-for="(item, index) in colorList" :key="index">
-              <n-card
-                class="color-card"
-                :class="{ selected: item.id === selectColorId }"
-                size="small"
-                hoverable
-                embedded
-                @click="selectHandle(item)"
-              >
-                <div class="go-flex-items-center">
-                  <n-ellipsis style="text-align: left; width: 70px">{{ item.name }} </n-ellipsis>
-                  <span
-                    class="theme-color-item"
-                    v-for="(colorItem, index) in item.color"
-                    :key="index"
-                    :style="{ backgroundColor: colorItem }"
-                  ></span>
-                </div>
-                <div class="theme-bottom" :style="{ backgroundImage: colorBackgroundImage(item) }"></div>
-              </n-card>
-              <n-tooltip trigger="hover">
-                <template #trigger>
-                  <n-button text :disabled="item.id === selectThemeColor" @click="deleteHandle(index)">
-                    <n-icon class="go-ml-1 go-cursor-pointer" size="16" :depth="3">
-                      <trash-icon></trash-icon>
-                    </n-icon>
-                  </n-button>
-                </template>
-                删除自定义颜色
-              </n-tooltip>
-            </div>
-          </div>
-        </div>
-      </div>
-      <!-- 底部 -->
-      <template #action>
-        <n-space justify="end">
-          <n-button @click="closeHandle">操作完成</n-button>
-        </n-space>
-      </template>
-    </n-card>
-  </n-modal>
-</template>
-
-<script setup lang="ts">
-import { ref, watch, computed, reactive, nextTick, onMounted } from 'vue'
-import cloneDeep from 'lodash/cloneDeep'
-import noData from '@/assets/images/canvas/noData.png'
-import { getUUID, goDialog } from '@/utils'
-import { icon } from '@/plugins'
-import { UvIndex } from '@vicons/carbon'
-import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
-import { EditCanvasConfigEnum } from '@/store/modules/chartEditStore/chartEditStore.d'
-import { CreateColorRender } from '../CreateColorRender/index'
-
-const props = defineProps({
-  modelShow: Boolean
-})
-const emit = defineEmits(['update:modelShow', 'editSaveHandle'])
-const { DuplicateOutlineIcon, TrashIcon, ArrowDownIcon } = icon.ionicons5
-
-type ColorType = {
-  id: string
-  name: string
-  color: string[]
-}
-
-// 默认颜色组
-const defaultColor: ColorType = {
-  id: getUUID(),
-  name: '未命名',
-  color: ['#6ae5bb', '#69e3de', '#5ac5ee', '#5ac4ee', '#4498ec', '#3c7ddf']
-}
-const chartEditStore = useChartEditStore()
-const modelShowRef = ref(false)
-// 颜色列表
-let colorList = reactive<Array<ColorType>>(chartEditStore.getEditCanvasConfig.chartCustomThemeColorInfo || [])
-// 子组件更新过的数据
-const updateColor = ref<ColorType | undefined>(undefined)
-// 所选颜色
-const selectColor = reactive<{
-  selectInfo: ColorType | undefined
-}>({
-  selectInfo: colorList[0]
-})
-
-watch(
-  () => props.modelShow,
-  newValue => {
-    modelShowRef.value = newValue
-    if (newValue) {
-      // 默认选中
-      if (colorList.length) selectColor.selectInfo = colorList[0]
-    }
-  }
-)
-
-// 当前选中的 ID
-const selectColorId = computed(() => selectColor?.selectInfo?.id)
-
-// 全局选择的主题
-const selectThemeColor = computed(() => chartEditStore.getEditCanvasConfig.chartThemeColor)
-
-// 选择
-const selectHandle = (item: ColorType) => {
-  if (item.id === selectColorId.value) return
-  if (updateColor.value !== undefined) {
-    goDialog({
-      message: '当前有变动未保存，是否直接放弃修改？',
-      onPositiveCallback: () => {
-        updateColor.value = undefined
-        selectColor.selectInfo = item
-      }
-    })
-  } else {
-    selectColor.selectInfo = item
-  }
-}
-
-// 创建
-const createColor = () => {
-  const positiveHandle = () => {
-    const newData = { ...cloneDeep(defaultColor), id: getUUID() }
-    selectColor.selectInfo = newData
-    colorList.push(newData)
-    selectHandle(newData)
-    updateColor.value = newData
-    saveHandle(false)
-  }
-  if (updateColor.value !== undefined) {
-    goDialog({
-      message: '当前有变动未保存，是否直接放弃修改？',
-      onPositiveCallback: () => {
-        updateColor.value = undefined
-        positiveHandle()
-      }
-    })
-  } else {
-    positiveHandle()
-  }
-}
-
-// 删除
-const deleteHandle = (index: number) => {
-  const positiveHandle = () => {
-    colorList.splice(index, 1)
-    chartEditStore.setEditCanvasConfig(EditCanvasConfigEnum.CHART_CUSTOM_THEME_COLOR_INFO, cloneDeep(colorList))
-    nextTick(() => {
-      if (colorList.length) {
-        selectHandle(colorList[index - 1 > -1 ? index - 1 : index])
-      } else {
-        // 已清空
-        selectColor.selectInfo = undefined
-      }
-    })
-  }
-  if (updateColor.value !== undefined) {
-    goDialog({
-      message: '当前有变动未保存，是否直接放弃修改？',
-      onPositiveCallback: () => {
-        updateColor.value = undefined
-        positiveHandle()
-      }
-    })
-  } else {
-    goDialog({
-      message: `是否删除此颜色？`,
-      onPositiveCallback: () => {
-        positiveHandle()
-      }
-    })
-  }
-}
-
-// 存储更新数据的值
-const updateColorHandle = (newColor: ColorType) => {
-  updateColor.value = newColor
-}
-
-// 保存数据
-const saveHandle = (onMessage = true) => {
-  if (!updateColor.value) return
-  const index = colorList.findIndex(item => item.id === updateColor.value?.id)
-  if (index !== -1) {
-    onMessage && window.$message.success('数据应用成功！')
-    const updateColorPrefix = cloneDeep({ ...updateColor.value, name: updateColor.value.name || '未定义' })
-    colorList.splice(index, 1, updateColorPrefix)
-    updateColor.value = undefined
-    const selectTheme = chartEditStore.getEditCanvasConfig.chartThemeColor
-    // 变换主题强制渐变色更新
-    chartEditStore.setEditCanvasConfig(EditCanvasConfigEnum.CHART_THEME_COLOR, 'dark')
-    // 存储到全局数据中
-    nextTick(() => {
-      chartEditStore.setEditCanvasConfig(EditCanvasConfigEnum.CHART_CUSTOM_THEME_COLOR_INFO, cloneDeep(colorList))
-      chartEditStore.setEditCanvasConfig(EditCanvasConfigEnum.CHART_THEME_COLOR, selectTheme)
-    })
-  } else {
-    window.$message.error('数据应用失败！')
-  }
-}
-
-// 关闭
-const closeHandle = () => {
-  const positiveHandle = () => {
-    updateColor.value = undefined
-    selectColor.selectInfo = undefined
-    emit('update:modelShow', false)
-  }
-
-  if (updateColor.value !== undefined) {
-    goDialog({
-      message: '当前有变动未保存，是否直接放弃修改？',
-      onPositiveCallback: () => {
-        positiveHandle()
-      }
-    })
-  } else {
-    positiveHandle()
-  }
-}
-
-// 底色
-const colorBackgroundImage = (item: ColorType) => {
-  return `linear-gradient(to right, ${item.color[0]} 0%, ${item.color[5]} 100%)`
-}
-</script>
-
-<style scoped lang="scss">
-$height: 600px;
-$listWidth: 280px;
-$color-radius: 8px;
-$color-item-radius: 4px;
-
-@include go('chart-create-color') {
-  .create-content {
-    display: flex;
-    /* 左侧 */
-    .create-color-setting-box {
-      flex: 1;
-      .no-data {
-        flex-direction: column;
-        width: 100%;
-        height: 100%;
-        img {
-          width: 200px;
-        }
-      }
-    }
-    /* 列表 */
-    .color-list-box {
-      display: flex;
-      padding-top: 10px;
-      margin-right: 5px;
-      .pond-item-timeline > .n-timeline-item {
-        &:first-child {
-          height: $height;
-        }
-      }
-      .color-list {
-        width: $listWidth;
-        position: relative;
-        padding-right: 8px;
-        .create-btn {
-          width: 133px;
-          &.is-full {
-            width: 280px;
-          }
-        }
-        .not-data-text {
-          display: block;
-          text-align: center;
-        }
-        .color-card-box {
-          display: flex;
-          align-items: center;
-          justify-content: space-between;
-          margin-top: 15px;
-          &:first-child {
-            margin-top: 0;
-          }
-          .color-card {
-            overflow: hidden;
-            cursor: pointer;
-            border-radius: $color-radius;
-            border: 2px solid rgba(0, 0, 0, 0);
-            border-bottom: 1px solid rgba(0, 0, 0, 0);
-            @include fetch-bg-color('background-color4-shallow');
-
-            @include deep() {
-              & > .n-card__content {
-                padding: 7px;
-                padding-top: 10px;
-                padding-bottom: 10px;
-              }
-            }
-            &.selected {
-              border: 2px solid var(--n-color-target);
-              border-bottom: 1px solid rgba(0, 0, 0, 0);
-            }
-            .go-flex-items-center {
-              justify-content: space-between;
-              margin-top: -4px;
-            }
-            .theme-color-item {
-              display: inline-block;
-              width: 16px;
-              height: 16px;
-              border-radius: $color-item-radius;
-            }
-            .theme-bottom {
-              position: absolute;
-              left: 0;
-              bottom: 0px;
-              width: 100%;
-              height: 3px;
-            }
-          }
-        }
-      }
-    }
-  }
-  &.n-card.n-modal,
-  .n-card {
-    @extend .go-background-filter;
-  }
-  .n-card-shallow {
-    background-color: rgba(0, 0, 0, 0) !important;
-  }
-  @include deep() {
-    & > .n-card__content {
-      padding-right: 0;
-    }
-  }
-}
-</style>

src/views/chart/ContentConfigurations/components/CanvasPage/components/CreateColorRender/index.ts

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

src/views/chart/ContentConfigurations/components/CanvasPage/components/CreateColorRender/index.vue

@@ -1,284 +0,0 @@
-<template>
-  <div class="create-color-setting" v-if="editColor">
-    <n-card :bordered="false" role="dialog" size="small" aria-modal="true">
-      <n-space justify="space-between">
-        <!-- 名称 -->
-        <n-input-group>
-          <n-input-group-label>名称:</n-input-group-label>
-          <n-input
-            class="create-color-name"
-            v-model:value.trim="editColor.name"
-            maxlength="8"
-            show-count
-            clearable
-            @change="titleChangeHandle"
-          />
-        </n-input-group>
-        <n-tag type="warning">底部图表仅展示 7 条数据</n-tag>
-      </n-space>
-      <!-- 颜色 -->
-      <n-scrollbar style="max-height: 132px">
-        <div class="color-list-box go-mt-3" :x-gap="12" :y-gap="12" :cols="4">
-          <div class="color-list-item" v-for="(item, index) in editColor.color" :key="index">
-            <div class="go-flex-items-center" :class="{ select: index === targetColor.index }">
-              <n-color-picker
-                style="width: 95px"
-                v-model:value="editColor.color[index]"
-                :show-preview="true"
-                :modes="['hex']"
-                @complete="completeHandle($event, index)"
-                @update:show="selectHandle(item, index)"
-              />
-              <div v-show="index > 5">
-                <n-tooltip trigger="hover">
-                  <template #trigger>
-                    <n-icon class="go-ml-1 go-cursor-pointer" size="16" :depth="3" @click="deleteColor(index)">
-                      <trash-icon></trash-icon>
-                    </n-icon>
-                  </template>
-                  删除颜色
-                </n-tooltip>
-              </div>
-            </div>
-          </div>
-          <div>
-            <n-button type="primary" secondary @click="addColor">
-              <div class="go-flex-items-center">
-                <span class="go-mr-4">添加</span>
-                <n-icon size="16">
-                  <add-icon></add-icon>
-                </n-icon>
-              </div>
-            </n-button>
-          </div>
-        </div>
-      </n-scrollbar>
-    </n-card>
-
-    <!-- 扩展色 -->
-    <div class="expend-color-box">
-      <n-card class="go-mt-3 expend-color" :bordered="false" role="dialog" size="small" aria-modal="true">
-        <n-text>默认扩展色：</n-text>
-        <n-divider style="margin: 10px 0"></n-divider>
-        <n-space :size="[4, 0]" justify="center">
-          <div
-            class="color-computed-item"
-            v-for="(item, index) in expandColorList.default"
-            :key="index"
-            @click="selectExpandColor(item, false)"
-          >
-            <div class="n-color-picker-checkboard"></div>
-            <div :style="getRenderBackgroundColor(item)"></div>
-          </div>
-        </n-space>
-      </n-card>
-      <n-card class="go-mt-3 expend-color" :bordered="false" role="dialog" size="small" aria-modal="true">
-        <n-text>透明扩展色：</n-text>
-        <n-divider style="margin: 10px 0"></n-divider>
-        <n-space :size="[4, 0]" justify="center">
-          <div
-            class="color-computed-item"
-            v-for="(item, index) in expandColorList.fade"
-            :key="index"
-            @click="selectExpandColor(item, true)"
-          >
-            <div class="n-color-picker-checkboard"></div>
-            <div :style="getRenderBackgroundColor(item)"></div>
-          </div>
-        </n-space>
-      </n-card>
-    </div>
-
-    <!-- 展示图表 -->
-    <create-color-render-chart :color="cloneDeep(editColor.color).splice(0, 7)"></create-color-render-chart>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { PropType, ref, watch, computed, reactive, nextTick } from 'vue'
-import cloneDeep from 'lodash/cloneDeep'
-import { darken, lighten, fade, hslToHex, hslToHexa, loadAsyncComponent } from '@/utils'
-import { icon } from '@/plugins'
-
-type ColorType = {
-  id: string
-  name: string
-  color: string[]
-}
-
-const props = defineProps({
-  selectColor: Object as PropType<ColorType>
-})
-
-const emit = defineEmits(['updateColor'])
-
-const { AddIcon, TrashIcon } = icon.ionicons5
-const CreateColorRenderChart = loadAsyncComponent(() => import('../CreateColorRenderChart/index.vue'))
-
-// 拷贝的一份数据
-const editColor = ref<ColorType | undefined>()
-// 目标颜色
-const targetColor = reactive<{
-  index: number
-  color?: string
-}>({
-  // -1 表示无选中元素
-  index: -1,
-  color: ''
-})
-
-// 监听值
-watch(
-  () => props.selectColor?.id,
-  () => {
-    editColor.value = cloneDeep(props.selectColor)
-    targetColor.index = 0
-    targetColor.color = editColor.value?.color[0]
-  },
-  {
-    immediate: true,
-    deep: false
-  }
-)
-
-// 扩展色
-const expandColorList = computed(() => {
-  return computedColorList(targetColor.color)
-})
-
-// 计算背景色
-const computedColorList = (color?: string) => {
-  if (!color)
-    return {
-      default: [],
-      fade: []
-    }
-  const num: number = 36
-  const comDarkenArr: string[] = []
-  const comLightenArr: string[] = []
-  const comDarkenFadeArr: string[] = []
-
-  for (let i = 0; i < num; i++) {
-    comLightenArr.unshift(lighten(color, (1 / 100) * (i + 1)))
-    comDarkenArr.push(darken(color, (3.5 / 100) * (i + 1)))
-  }
-
-  // 透明
-  comDarkenArr.forEach((item, i) => {
-    comDarkenFadeArr.unshift(fade(item, (1 / 100) * (i + 1)))
-  })
-
-  return {
-    default: [
-      ...comLightenArr.reverse().splice(0, parseInt(`${num / 2}`) - 9),
-      ...comDarkenArr.splice(0, parseInt(`${num / 2}`))
-    ],
-    fade: comDarkenFadeArr.reverse().splice(0, 27)
-  }
-}
-
-// 渲染背景色
-const getRenderBackgroundColor = (color?: string) => {
-  return {
-    backgroundColor: color
-  }
-}
-
-// 点击颜色
-const selectHandle = (color: string, index: number) => {
-  targetColor.color = color
-  targetColor.index = index
-}
-
-// 顶部改变颜色
-const completeHandle = (color?: string, index?: number) => {
-  color && (targetColor.color = color)
-  index && (targetColor.index = index)
-  nextTick(() => {
-    emit('updateColor', editColor.value)
-  })
-}
-
-// 选择扩展色
-const selectExpandColor = (color: string, isHexa: boolean) => {
-  const hexColor = isHexa ? hslToHexa(color) : hslToHex(color)
-  editColor.value && (editColor.value.color[targetColor.index] = hexColor)
-  nextTick(() => {
-    emit('updateColor', editColor.value)
-  })
-}
-
-// 新增颜色
-const addColor = () => {
-  const lastData = editColor.value?.color[editColor.value?.color.length - 1] || '#2c2c31'
-  editColor.value?.color.push(lastData)
-  nextTick(() => {
-    emit('updateColor', editColor.value)
-  })
-}
-
-// 删除颜色
-const deleteColor = (index: number) => {
-  editColor.value?.color.splice(index, 1)
-  if (index === targetColor.index) {
-    completeHandle(editColor.value?.color[index - 1], index - 1)
-  }
-}
-
-// 修改名称
-const titleChangeHandle = () => {
-  nextTick(() => {
-    emit('updateColor', editColor.value)
-  })
-}
-</script>
-
-<style scoped lang="scss">
-.create-color-setting {
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  height: 100%;
-  padding-right: 10px;
-  .create-color-name {
-    width: 200px;
-  }
-  .color-list-box {
-    display: flex;
-    flex-wrap: wrap;
-    row-gap: 8px;
-    .color-list-item {
-      width: calc(100% / 4);
-      .select {
-        .n-color-picker {
-          border: 2px solid v-bind('targetColor.color');
-          border-radius: 5px;
-        }
-      }
-    }
-  }
-  .expend-color-box {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    .expend-color {
-      width: calc(50% - 5px);
-      .color-computed-item {
-        position: relative;
-        display: inline-block;
-        height: 22px;
-        width: 22px;
-        cursor: pointer;
-        overflow: hidden;
-        border-radius: 4px;
-        & div {
-          position: absolute;
-          display: inline-block;
-          height: 22px;
-          width: 22px;
-        }
-      }
-    }
-  }
-}
-</style>

src/views/chart/ContentConfigurations/components/CanvasPage/components/CreateColorRenderChart/barOptions.ts

@@ -1,47 +0,0 @@
-import { echartOptionProfixHandle } from '@/packages/public'
-
-export const includes = ['legend', 'xAxis', 'yAxis', 'grid']
-
-const seriesHandle = (color: string[]) => {
-  const numHandle = (numsi: number, i: number) => parseInt(`${numsi * Math.random()}`, 10) * 2
-  const nums = [260, 251, 200, 334, 366, 256, 253]
-
-  return color.map((item, index) => ({
-    name: `data${index + 1}`,
-    type: 'bar',
-    data: nums.map((numsItem, numsi) => numHandle(numsItem, index))
-  }))
-}
-
-export const option = (color: string[]) => {
-  return echartOptionProfixHandle(
-    {
-      tooltip: {
-        trigger: 'axis',
-        showContent: false,
-        axisPointer: {
-          type: 'shadow'
-        }
-      },
-      grid: {
-        left: '3%',
-        right: '4%',
-        bottom: '3%',
-        containLabel: true
-      },
-      xAxis: {
-        type: 'category',
-        data: color.map((e, i) => `data${i + 1}`),
-        axisTick: {
-          alignWithLabel: true
-        }
-      },
-      yAxis: {
-        show: true,
-        type: 'value'
-      },
-      series: seriesHandle(color || [])
-    },
-    includes
-  )
-}

src/views/chart/ContentConfigurations/components/CanvasPage/components/CreateColorRenderChart/index.ts

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

src/views/chart/ContentConfigurations/components/CanvasPage/components/CreateColorRenderChart/index.vue

@@ -1,67 +0,0 @@
-<template>
-  <n-space>
-    <n-card v-if="barOption" class="go-mt-3" :bordered="false" role="dialog" size="small" aria-modal="true">
-      <n-tabs type="segment" size="small" animated>
-        <n-tab-pane name="柱状图" tab="柱状图">
-          <v-chart
-            ref="vChartRefBar"
-            :theme="{ color }"
-            :option="barOption"
-            :manual-update="true"
-            autoresize
-            :style="chartStyle"
-          ></v-chart>
-        </n-tab-pane>
-        <n-tab-pane name="折线图" tab="折线图">
-          <v-chart
-            ref="vChartRefLine"
-            :theme="{ color }"
-            :option="lineOption"
-            :manual-update="true"
-            autoresize
-            :style="chartStyle"
-          ></v-chart>
-        </n-tab-pane>
-      </n-tabs>
-    </n-card>
-  </n-space>
-</template>
-
-<script setup lang="ts">
-import { ref, watch, PropType } from 'vue'
-import VChart from 'vue-echarts'
-import { CanvasRenderer } from 'echarts/renderers'
-import { BarChart, LineChart } from 'echarts/charts'
-import { use } from 'echarts/core'
-import { DatasetComponent, GridComponent, TooltipComponent, LegendComponent } from 'echarts/components'
-import { option as barOptions } from './barOptions'
-import { option as lineOptions } from './lineOptions'
-
-const props = defineProps({
-  color: {
-    type: Array as PropType<string[]>,
-    required: true
-  }
-})
-use([DatasetComponent, CanvasRenderer, BarChart, LineChart, GridComponent, TooltipComponent, LegendComponent])
-
-const barOption = ref()
-const lineOption = ref()
-
-const chartStyle = {
-  width: '528px',
-  height: '200px'
-}
-
-watch(
-  () => props.color,
-  (newData: string[]) => {
-    barOption.value = barOptions(newData)
-    lineOption.value = lineOptions(newData)
-  },
-  {
-    immediate: true,
-    deep: true
-  }
-)
-</script>

src/views/chart/ContentConfigurations/components/CanvasPage/components/CreateColorRenderChart/lineOptions.ts

@@ -1,72 +0,0 @@
-import { echartOptionProfixHandle } from '@/packages/public'
-import { graphic } from 'echarts/core'
-import { fade, hslToHex } from '@/utils'
-
-export const includes = ['legend', 'xAxis', 'yAxis', 'grid']
-
-const seriesHandle = (color: string[]) => {
-  const numHandle = (numsi: number, i: number) => parseInt(`${numsi * Math.random()}`, 10) * 2
-  const nums = [130, 251, 200, 334, 366, 456, 223]
-
-  return color.map((item, index) => ({
-    name: `data${index + 1}`,
-    type: 'line',
-    smooth: true,
-    lineStyle: {
-      width: 1,
-      type: 'solid'
-    },
-    emphasis: {
-      focus: 'series'
-    },
-    areaStyle: {
-      opacity: 0.8,
-      color: new graphic.LinearGradient(0, 0, 0, 1, [
-        {
-          offset: 1,
-          color: item
-        },
-        {
-          offset: 0,
-          color: item
-        }
-      ])
-    },
-    showSymbol: false,
-    data: nums.reverse().map((numsItem, numsi) => numHandle(numsItem, index))
-  }))
-}
-
-export const option = (color: string[]) => {
-  return echartOptionProfixHandle(
-    {
-      tooltip: {
-        trigger: 'axis',
-        showContent: false,
-        axisPointer: {
-          type: 'shadow'
-        }
-      },
-      grid: {
-        left: '3%',
-        right: '4%',
-        bottom: '3%',
-        containLabel: true
-      },
-      xAxis: {
-        type: 'category',
-        boundaryGap: false,
-        data: color.map((e, i) => `data${i + 1}`),
-        axisTick: {
-          alignWithLabel: true
-        }
-      },
-      yAxis: {
-        show: true,
-        type: 'value'
-      },
-      series: seriesHandle(color || [])
-    },
-    includes
-  )
-}

src/views/chart/ContentConfigurations/components/CanvasPage/index.vue

@@ -22,7 +22,7 @@
       </n-form-item>
     </n-form>
 
-    <div class="upload-box">
+    <n-card class="upload-box">
       <n-upload
         v-model:file-list="uploadFileListRef"
         :show-file-list="false"
@@ -39,7 +39,7 @@
           </div>
         </n-upload-dragger>
       </n-upload>
-    </div>
+    </n-card>
     <n-space vertical :size="12">
       <n-space>
         <n-text>背景颜色</n-text>
@@ -128,20 +128,23 @@
 <script setup lang="ts">
 import { ref, nextTick, watch } from 'vue'
 import { backgroundImageSize } from '@/settings/designSetting'
-import { swatchesColors } from '@/settings/chartThemes/index'
 import { FileTypeEnum } from '@/enums/fileTypeEnum'
 import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
 import { EditCanvasConfigEnum } from '@/store/modules/chartEditStore/chartEditStore.d'
+import { useSystemStore } from '@/store/modules/systemStore/systemStore'
 import { StylesSetting } from '@/components/Pages/ChartItemSetting'
 import { UploadCustomRequestOptions } from 'naive-ui'
-import { fileToUrl, loadAsyncComponent } from '@/utils'
+import { loadAsyncComponent, fetchRouteParamsLocation } from '@/utils'
 import { PreviewScaleEnum } from '@/enums/styleEnum'
+import { ResultEnum } from '@/enums/httpEnum'
 import { icon } from '@/plugins'
+import { uploadFile} from '@/api/path'
 
 const { ColorPaletteIcon } = icon.ionicons5
 const { ScaleIcon, FitToScreenIcon, FitToHeightIcon, FitToWidthIcon } = icon.carbon
 
 const chartEditStore = useChartEditStore()
+const systemStore = useSystemStore()
 const canvasConfig = chartEditStore.getEditCanvasConfig
 const editCanvas = chartEditStore.getEditCanvas
 
@@ -163,6 +166,9 @@ const selectColorOptions = [
   }
 ]
 
+// 默认展示颜色列表
+const swatchesColors = ['#232324', '#2a2a2b', '#313132', '#373739', '#757575', '#e0e0e0', '#eeeeee', '#fafafa']
+
 const globalTabList = [
   {
     key: 'ChartTheme',
@@ -266,11 +272,30 @@ const clearColor = () => {
 // 自定义上传操作
 const customRequest = (options: UploadCustomRequestOptions) => {
   const { file } = options
-  nextTick(() => {
+  nextTick(async () => {
     if (file.file) {
-      const ImageUrl = fileToUrl(file.file)
-      chartEditStore.setEditCanvasConfig(EditCanvasConfigEnum.BACKGROUND_IMAGE, ImageUrl)
-      chartEditStore.setEditCanvasConfig(EditCanvasConfigEnum.SELECT_COLOR, false)
+      // 修改名称
+      const newNameFile = new File(
+        [file.file],
+        `${fetchRouteParamsLocation()}_index_background.png`,
+        { type: file.file.type }
+      )
+      let uploadParams = new FormData()
+      uploadParams.append('object', newNameFile)
+      const uploadRes = await uploadFile(uploadParams)
+
+      if(uploadRes && uploadRes.code === ResultEnum.SUCCESS) {
+        chartEditStore.setEditCanvasConfig(
+          EditCanvasConfigEnum.BACKGROUND_IMAGE,
+          `${systemStore.getFetchInfo.OSSUrl}${uploadRes.data.fileName}?time=${new Date().getTime()}`
+        )
+        chartEditStore.setEditCanvasConfig(
+          EditCanvasConfigEnum.SELECT_COLOR,
+          false
+        )
+        return
+      }
+      window['$message'].error('添加图片失败，请稍后重试！')
     } else {
       window['$message'].error('添加图片失败，请稍后重试！')
     }
@@ -292,10 +317,13 @@ $uploadHeight: 193px;
     cursor: pointer;
     margin-bottom: 20px;
     @include deep() {
+      .n-card__content {
+        padding: 0;
+        overflow: hidden;
+      }
       .n-upload-dragger {
         padding: 5px;
         width: $uploadWidth;
-        background-color: rgba(0, 0, 0, 0);
       }
     }
     .upload-show {
@@ -326,8 +354,8 @@ $uploadHeight: 193px;
     padding-right: 2.25em;
   }
   .select-preview-icon {
-    padding-right: 0.68em;
-    padding-left: 0.68em;
+    padding-right: .68em;
+    padding-left: .68em;
   }
   .tabs-box {
     margin-top: 20px;

src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMonacoEditor/index.vue

@@ -150,7 +150,7 @@ const filterRes = computed(() => {
   } catch (error) {
     // eslint-disable-next-line vue/no-side-effects-in-computed-properties
     errorFlag.value = true
-    return `过滤函数错误，日志：${error}`
+    return '过滤函数错误'
   }
 })
 

src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataPond/components/ChartDataPondList/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="go-chart-data-pond-list">
-    <n-timeline class="pond-item-timeline" style="width: 20px">
+    <n-timeline style="width: 20px">
       <n-timeline-item type="info"> </n-timeline-item>
       <n-timeline-item type="success"></n-timeline-item>
     </n-timeline>
@@ -115,9 +115,11 @@ $textSize: 10px;
   padding-bottom: 5px;
   margin-right: 5px;
   display: flex;
-  .pond-item-timeline > .n-timeline-item {
-    &:first-child {
-      height: $height;
+  @include deep() {
+    .n-timeline > .n-timeline-item {
+      &:first-child {
+        height: $height;
+      }
     }
   }
   .pond-item-box {