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

Merge pull request !133 from wallellen/master-fetch-dev

.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,184 +1,119 @@
-#### 总览
+## 总览
 
-<p align="center">
-    <img src="readme/logo-t-y.png" alt="go-view" />
-</p>
+**`master-fetch` 分支是带有后端接口请求的分支**
 
-<h4 align="center">开源、精美、便捷的「数据可视化」低代码开发平台</h4>
+**后端项目地址：[https://gitee.com/MTrun/go-view-serve](https://gitee.com/MTrun/go-view-serve)**
 
-#### 长期赞助商
+**接口说明地址：[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)**
 
-<div>
-  <div align="center" style="column-gap: 20px;">
-    <a
-      href="http://www.ccflow.org/?from=goviewGitee"
-      target="_blank"
-      style="
-        padding: 10px 20px;
-        display: inline-block;
-        border-radius: 10px;
-        background: #f9f9f9;
-      ">
-      <img src="readme/sponsors/ccflow-banner.png" alt="go-view" style="width: 250px;" width="250px" />
-    </a>
-    <span> &nbsp;</span>
-    <a
-      href="https://fastbee.cn/"
-      target="_blank"
-      style="
-        padding: 10px 20px;
-        display: inline-block;
-        border-radius: 10px;
-        background: #f9f9f9;
-      ">
-      <img src="readme/sponsors/fb-banner.gif" alt="go-view" style="width: 250px;" width="250px"/>
-    </a>
-    <br/>
-    <br/>
-    <a
-      href="https://www.qeasy.cloud/"
-      target="_blank"
-      style="
-        padding: 10px 20px;
-        display: inline-block;
-        border-radius: 10px;
-        background: #f9f9f9;
-      ">
-      <img src="readme/sponsors/qyy-banner.png" alt="go-view" style="width: 250px;" width="250px"/>
-    </a>
-    <span> &nbsp;</span>
-    <a
-      href="http://doc.zyplayer.com/#/integrate/zyplayer-doc?utm=goview"
-      target="_blank"
-      style="
-        padding: 10px 20px;
-        display: inline-block;
-        border-radius: 10px;
-        background: #f9f9f9;
-      ">
-      <img src="readme/sponsors/zyplayer-banner.png" alt="go-view" style="width: 250px;" width="250px"/>
-    </a>  
-  </div>
-</div>
+## 使用
 
-#### 😶 **纯前端** 分支： **`master`**
+所有的接口地址位置：`src\api\path\*`
 
-#### 👻 携带 **后端** 请求分支: **`master-fetch`**
+接口地址修改：`.env`
 
-#### 📚 GoView **文档** 地址：[https://www.mtruning.club/](https://www.mtruning.club/)
+```shell
+# port
+VITE_DEV_PORT = '8080'
 
-项目纯前端-Demo 地址：[https://vue.mtruning.club/](https://vue.mtruning.club/)
+# development path
+VITE_DEV_PATH = 'http://127.0.0.1:8080'
 
-项目带后端-Demo 地址：[https://demo.mtruning.club/](https://demo.mtruning.club/)
+# production path
+VITE_PRO_PATH = 'http://127.0.0.1:8080'
+```
 
-Cloud IDE 代码在线预览地址：[https://idegitee.com/dromara/go-view](https://idegitee.com/dromara/go-view)
+公共前缀修改：`src\settings\httpSetting.ts`
 
-#### 🤯 后端项目看这里!
+```shell
+// 请求前缀
+export const axiosPre = '/api/goview'
+```
 
-后端地址（社区实现，仅供参考）：
+接口封装：`src\api\http.ts`
 
-- `JAVA` [https://gitee.com/MTrun/go-view-serve](https://gitee.com/MTrun/go-view-serve) (当前使用)
-- `.NET` [https://gitee.com/sun_xiang_yu/go-view-dotnet](https://gitee.com/sun_xiang_yu/go-view-dotnet)
-- `NODE` [https://gitee.com/qwdingyu/led](https://gitee.com/qwdingyu/led)
-- `Docker 镜像` [https://gitee.com/AHEAD4/go-view-docker](https://gitee.com/AHEAD4/go-view-docker)
-- `接口文档`[https://docs.apipost.cn](https://docs.apipost.cn/preview/5aa85d10a59d66ce/ddb813732007ad2b?target_id=84dbc5b0-158f-4bcb-8f74-793ac604ada3) (不是最新, 以前端代码为准)
+```ts
+import axiosInstance from './axios'
+import { RequestHttpEnum, ContentTypeEnum } from '@/enums/httpEnum'
 
-#### 整体介绍
+export const get = (url: string, params?: object) => {
+  return axiosInstance({
+    url: url,
+    method: RequestHttpEnum.GET,
+    params: params,
+  })
+}
 
-- 框架：基于 `Vue3` 框架编写，使用 `hooks` 写法抽离部分逻辑，使代码结构更加清晰；
+export const post = (url: string, data?: object, headersType?: string) => {
+  return axiosInstance({
+    url: url,
+    method: RequestHttpEnum.POST,
+    data: data,
+    headers: {
+      'Content-Type': headersType || ContentTypeEnum.JSON
+    }
+  })
+}
 
-- 类型：使用 `TypeScript` 进行类型约束，减少未知错误发生概率，可以大胆修改逻辑内容；
+export const put = (url: string, data?: object, headersType?: string) => {
+  return axiosInstance({
+    url: url,
+    method: RequestHttpEnum.PUT,
+    data: data,
+    headers: {
+      'Content-Type': headersType || ContentTypeEnum.JSON
+    }
+  })
+}
 
-- 性能：多处性能优化，使用页面懒加载、组件动态注册、数据滚动加载等方式，提升页面渲染速度；
+export const del = (url: string, params?: object) => {
+  return axiosInstance({
+    url: url,
+    method: RequestHttpEnum.DELETE,
+    params
+  })
+}
 
-- 存储：拥有本地记忆，部分配置项采用 `storage` 存储本地，提升使用体验；
+// 获取请求函数，默认get
+export const http = (type?: RequestHttpEnum) => {
+  switch (type) {
+    case RequestHttpEnum.GET:
+      return get
 
-- 封装：项目进行了详细的工具类封装如：路由、存储、加/解密、文件处理、主题、NaiveUI 全局方法、组件等
+    case RequestHttpEnum.POST:
+      return post
 
-- 入选 NaiveUI 社区精选资源推荐：[查看 NaiveUI 推荐列表](https://www.naiveui.com/zh-CN/light/docs/community)
+    case RequestHttpEnum.PUT:
+      return put
 
-说明文档：
-![说明文档](readme/go-view-doc.png)
+    case RequestHttpEnum.DELETE:
+      return del
 
-工作台：
-![工作台](readme/go-view-canvas.png)
+    default:
+      return get
+  }
+}
 
-请求配置：
-![请求配置](readme/go-view-fetch.png)
-
-数据过滤：
-![数据过滤](readme/go-view-filter.png)
-
-高级事件编辑:
-![高级事件编辑](readme/go-view-event.png)
-
-自定义组件颜色:
-![高级事件编辑](readme/go-view-echarts-color.png)
-
-快捷主页：
-![快捷主页](readme/go-view-indexpage.png)
-
-主题色：
-![主题色](readme/go-view-color.png)
-
-亮白主题：
-![亮白主题](readme/go-view-theme.png)
-
-主要技术栈为：
-
-| 名称                | 版本  | 名称        | 版本   |
-| ------------------- | ----- | ----------- | ------ |
-| Vue                 | 3.2.x | TypeScript4 | 4.6.x  |
-| Vite                | 4.2.x | NaiveUI     | 2.34.x |
-| ECharts             | 5.3.x | Pinia       | 2.0.x  |
-| 详见 `package.json` | 😁    | 🥰          | 🤗     |
-
-开发环境:
-
-| 名称 | 版本    | 名称    | 版本  |
-| ---- | ------- | ------- | ----- |
-| node | 16.16.x | npm     | 8.5.x |
-| pnpm | 7.1.x   | windows | 11    |
-
-已完成图表：
-
-| 分类   | 名称             | 名称       | 名称           | 名称                     |
-| ------ | ---------------- | ---------- | -------------- | ------------------------ |
-| 图表   | 柱状图           | 横向柱状图 | 折线图         | 单/多 折线面积图(渐变色) |
-| \*     | 饼图             | 环形图     | 水球图         | 雷达图                   |
-| \*     | NaiveUI 多种进度 | 散点图     | 对数回归散点图 | 热力图                   |
-| \*     | 漏斗图           | 中国地图   | 高德地图       | 🦊                       |
-| 信息   | 文字             | 渐变文字   | 词云           | 嵌套网页                 |
-| \*     | 图片             | 视频       | 😺             | 🐯                       |
-| 列表   | 滚动排名列表     | 滚动表格   | 🐮             | 🐐                       |
-| 小组件 | 边框-01~13       | 装饰-01~05 | 数字翻牌       | 通用时间                 |
-| \*     | 数字计数         | 倒计时     | 时钟           | 🦁                       |
-
-## 浏览器支持
-
-开发和测试平台均在 `Google` 和最新版 `EDGE` 上完成，暂未测试 `IE11` 等其它浏览器，如有需求请自行测试与兼容。
-
-## 安装
-
-请查看文档：[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.6",
+  "version": "2.2.2",
   "engines": {
     "node": ">=12.0"
   },
@@ -33,7 +33,6 @@
     "highlight.js": "^11.5.0",
     "html2canvas": "^1.4.1",
     "keymaster": "^1.6.2",
-    "mitt": "^3.0.0",
     "monaco-editor": "^0.33.0",
     "naive-ui": "2.34.3",
     "pinia": "^2.0.13",
@@ -50,16 +49,14 @@
   "devDependencies": {
     "@commitlint/cli": "^17.0.2",
     "@commitlint/config-conventional": "^17.0.2",
-    "@iconify/types": "^2.0.0",
-    "@iconify/vue": "^4.1.1",
     "@types/node": "^16.11.26",
     "@types/three": "^0.144.0",
     "@typescript-eslint/eslint-plugin": "^5.18.0",
     "@typescript-eslint/parser": "^5.18.0",
     "@vicons/carbon": "^0.12.0",
     "@vicons/ionicons5": "~0.11.0",
-    "@vitejs/plugin-vue": "^4.2.3",
-    "@vitejs/plugin-vue-jsx": "^3.0.1",
+    "@vitejs/plugin-vue": "^1.10.2",
+    "@vitejs/plugin-vue-jsx": "^1.3.9",
     "@vue/compiler-sfc": "^3.2.31",
     "@vueuse/core": "^7.7.1",
     "commitlint": "^17.0.2",
@@ -78,7 +75,7 @@
     "sass": "^1.49.11",
     "sass-loader": "^12.6.0",
     "typescript": "4.6.3",
-    "vite": "4.3.6",
+    "vite": "4.2.1",
     "vite-plugin-compression": "^0.5.1",
     "vite-plugin-importer": "^0.2.5",
     "vite-plugin-mock": "^2.9.6",

preview.yml

@@ -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.data)
-    if (code === ResultEnum.DATA_SUCCESS) return Promise.resolve(res.data)
-    // 重定向
-    if (ErrorPageNameMap.get(code)) redirectErrorPage(code)
+
+    // 成功
+    if (code === ResultEnum.SUCCESS) {
+      return Promise.resolve(res.data)
+    }
+
+    // 登录过期
+    if (code === ResultEnum.TOKEN_OVERDUE) {
+      window['$message'].error(window['$t']('http.token_overdue_message'))
+      routerTurnByName(PageEnum.BASE_LOGIN_NAME)
+      return Promise.resolve(res.data)
+    }
+
+    // 固定错误码重定向
+    if (ErrorPageNameMap.get(code)) {
+      redirectErrorPage(code)
+      return Promise.resolve(res.data)
+    }
+    
+    // 提示错误
+    window['$message'].error(window['$t']((res.data as any).msg))
     return Promise.resolve(res.data)
   },
   (err: AxiosResponse) => {

src/api/http.ts

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

src/api/path/index.ts

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

src/api/path/project.api.ts

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

src/api/path/project.d.ts

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

src/api/path/system.api.ts

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

src/api/path/system.d.ts

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

src/components/GoUserInfo/index.vue

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

src/components/Pages/ChartItemSetting/GlobalSetting.vue

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

src/components/Pages/Flipper/index.vue

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

src/enums/editPageEnum.ts

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

src/enums/httpEnum.ts

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

src/enums/pageEnum.ts

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

src/enums/storageEnum.ts

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

src/hooks/index.ts

@@ -2,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/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/packages/chartConfiguration/echarts/index.ts

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

src/packages/chartConfiguration/echarts/legend.ts

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

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

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

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

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

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

@@ -8,7 +8,7 @@ import AMapLoader from '@amap/amap-jsapi-loader'
 import { CreateComponentType } from '@/packages/index.d'
 import { useChartDataFetch } from '@/hooks'
 import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
-import { MarkerEnum, ThemeEnum } from './config'
+import { MarkerEnum } from './config'
 import { isArray } from '@/utils'
 
 const props = defineProps({
@@ -51,6 +51,7 @@ const initMap = (newData: any) => {
         resizeEnable: true,
         zoom: amapZindex.value, // 地图显示的缩放级别
         center: [amapLon.value, amapLat.value],
+        mapStyle: `amap://styles/${amapStyleKeyCustom.value !== '' ? amapStyleKeyCustom.value : amapStyleKey.value}`, //自定义地图的显示样式
         lang: lang.value,
         features: features.value,
         pitch: pitch.value, // 地图俯仰角度，有效范围 0 度- 83 度
@@ -59,14 +60,6 @@ const initMap = (newData: any) => {
         willReadFrequently: true
       })
       dataHandle(props.chartConfig.option.dataset)
-      let satellite = new AMap.TileLayer.Satellite()
-      let roadNet = new AMap.TileLayer.RoadNet()
-      if (newData.amapStyleKey === ThemeEnum.WEIXIN) {
-        mapIns.add([satellite, roadNet])
-      } else {
-        mapIns.remove([satellite, roadNet])
-        mapIns.setMapStyle(`amap://styles/${amapStyleKeyCustom.value !== '' ? amapStyleKeyCustom.value : amapStyleKey.value}`)
-      }
     })
     .catch(e => {})
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,50 +0,0 @@
-<template>
-  <collapse-item name="属性" :expanded="true">
-    <setting-item-box name="样式">
-      <setting-item name="颜色">
-        <n-color-picker size="small" :modes="['hex']" v-model:value="optionData.color"></n-color-picker>
-      </setting-item>
-      <setting-item name="尺寸">
-        <n-input-number v-model:value="optionData.size" size="small" :min="0" placeholder="尺寸"></n-input-number>
-      </setting-item>
-    </setting-item-box>
-    <setting-item-box name="旋转">
-      <setting-item name="旋转">
-        <n-select v-model:value="optionData.rotate" size="small" :options="rotateMode"></n-select>
-      </setting-item>
-    </setting-item-box>
-  </collapse-item>
-</template>
-
-<script setup lang="ts">
-import { PropType } from 'vue'
-import { option } from './config'
-import { CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
-
-const props = defineProps({
-  optionData: {
-    type: Object as PropType<typeof option>,
-    required: true
-  }
-})
-
-// 旋转方式
-const rotateMode = [
-  {
-    value: 0,
-    label: '0°'
-  },
-  {
-    value: 1,
-    label: '90°'
-  },
-  {
-    value: 2,
-    label: '180°'
-  },
-  {
-    value: 3,
-    label: '270°'
-  }
-]
-</script>

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

@@ -1,14 +0,0 @@
-import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'
-import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'
-
-export const IconConfig: ConfigType = {
-  key: 'Icon',
-  chartKey: 'VIcon',
-  conKey: 'VCIcon',
-  title: '图标',
-  category: ChatCategoryEnum.DEFAULT,
-  categoryName: ChatCategoryEnumName.DEFAULT,
-  package: PackagesCategoryEnum.ICONS,
-  chartFrame: ChartFrameEnum.STATIC,
-  image: 'icon.png'
-}

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

@@ -1,31 +0,0 @@
-<template>
-  <div class="go-icon-box">
-    <Icon :icon="((dataset || '') as string)" :color="color" :width="size" :rotate="rotate" />
-  </div>
-</template>
-
-<script setup lang="ts">
-import { PropType, toRefs } from 'vue'
-import { CreateComponentType } from '@/packages/index.d'
-import { Icon } from '@iconify/vue'
-
-const props = defineProps({
-  chartConfig: {
-    type: Object as PropType<CreateComponentType>,
-    required: true
-  }
-})
-
-const { w, h } = toRefs(props.chartConfig.attr)
-const { dataset, color, size, rotate } = toRefs(props.chartConfig.option)
-</script>
-
-<style lang="scss" scoped>
-@include go('icon-box') {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  width: v-bind('`${w}px`');
-  height: v-bind('`${h}px`');
-}
-</style>

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

@@ -1,45 +0,0 @@
-import { IconConfig } from '../Default/Icon/index'
-import { PackagesCategoryEnum } from '@/packages/index.d'
-import { ChatCategoryEnum, ChatCategoryEnumName } from '../index.d'
-
-const iconNames = [
-  'line-md:beer-alt-filled-loop',
-  'line-md:beer-alt-twotone-loop',
-  'line-md:cloud-braces-loop',
-  'line-md:cloud-download-loop',
-  'line-md:cloud-download-outline-loop',
-  'line-md:cloud-upload-loop',
-  'line-md:cloud-upload-outline-loop',
-  'line-md:coffee-half-empty-twotone-loop',
-  'line-md:coffee-loop',
-  'line-md:coffee-twotone-loop',
-  'line-md:downloading-loop',
-  'line-md:github-loop',
-  'line-md:light-dark-loop',
-  'line-md:loading-alt-loop',
-  'line-md:loading-loop',
-  'line-md:loading-twotone-loop',
-  'line-md:moon-alt-loop',
-  'line-md:moon-alt-to-sunny-outline-loop-transition',
-  'line-md:moon-filled-loop',
-  'line-md:moon-filled-to-sunny-filled-loop-transition',
-  'line-md:star-pulsating-filled-loop',
-  'line-md:star-pulsating-loop',
-  'line-md:star-pulsating-twotone-loop',
-  'line-md:upload-loop',
-  'line-md:upload-outline-loop',
-  'line-md:uploading-loop'
-]
-const iconList = iconNames.map(name => ({
-  ...IconConfig,
-  category: ChatCategoryEnum.ML,
-  categoryName: ChatCategoryEnumName.ML,
-  package: PackagesCategoryEnum.ICONS,
-  image: name,
-  icon: name,
-  dataset: name,
-  title: name.replace('line-md:', ''),
-  redirectComponent: `${IconConfig.package}/${IconConfig.category}/${IconConfig.key}` // 跳转组件路径规则：packageName/categoryName/componentKey
-}))
-
-export default iconList

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

@@ -1,53 +0,0 @@
-import { IconConfig } from '../Default/Icon/index'
-import { PackagesCategoryEnum } from '@/packages/index.d'
-import { ChatCategoryEnum, ChatCategoryEnumName } from '../index.d'
-
-const iconNames = [
-  'wi:cloud',
-  'wi:cloudy',
-  'wi:cloudy-gusts',
-  'wi:cloudy-windy',
-  'wi:day-cloudy',
-  'wi:day-cloudy-high',
-  'wi:day-hail',
-  'wi:day-haze',
-  'wi:day-light-wind',
-  'wi:day-lightning',
-  'wi:day-rain',
-  'wi:day-rain-mix',
-  'wi:day-rain-wind',
-  'wi:day-showers',
-  'wi:day-sleet',
-  'wi:day-sleet-storm',
-  'wi:day-snow',
-  'wi:day-snow-thunderstorm',
-  'wi:day-snow-wind',
-  'wi:day-sprinkle',
-  'wi:day-storm-showers',
-  'wi:day-sunny',
-  'wi:day-sunny-overcast',
-  'wi:hail',
-  'wi:horizon',
-  'wi:horizon-alt',
-  'wi:hot',
-  'wi:lightning',
-  'wi:night-alt-cloudy',
-  'wi:night-alt-cloudy-gusts',
-  'wi:night-alt-cloudy-high',
-  'wi:night-alt-hail',
-  'wi:night-alt-lightning',
-  'wi:umbrella'
-]
-const iconList = iconNames.map(name => ({
-  ...IconConfig,
-  category: ChatCategoryEnum.WEATHER,
-  categoryName: ChatCategoryEnumName.WEATHER,
-  package: PackagesCategoryEnum.ICONS,
-  image: name,
-  icon: name,
-  dataset: name,
-  title: name.replace('wi:', ''),
-  redirectComponent: `${IconConfig.package}/${IconConfig.category}/${IconConfig.key}` // 跳转组件路径规则：packageName/categoryName/componentKey
-}))
-
-export default iconList

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

@@ -1,13 +0,0 @@
-export enum ChatCategoryEnum {
-  ML = 'MaterialLine',
-  COMMON = 'Common',
-  WEATHER = 'Weather',
-  DEFAULT = 'Default' // 这个仅用来表示组件分类目录，不要在 index.ts 中导入
-}
-
-export enum ChatCategoryEnumName {
-  ML = '动画',
-  COMMON = '通用',
-  WEATHER = '天气',
-  DEFAULT = '默认'
-}

src/packages/components/Icons/index.ts

@@ -1,5 +0,0 @@
-import MaterialLine from './MaterialLine'
-import Common from './Common'
-import Weather from './Weather'
-
-export const IconList = [...MaterialLine, ...Weather, ...Common]

src/packages/components/Informations/Inputs/InputsDate/config.ts

@@ -12,9 +12,7 @@ export const option = {
   [COMPONENT_INTERACT_EVENT_KET]: ComponentInteractEventEnum.DATE,
   // 下拉展示
   isPanel: 0,
-  dataset: dayjs().valueOf(),
-  differValue: 0
-
+  dataset: dayjs().valueOf()
 }
 
 export default class Config extends PublicConfigClass implements CreateComponentType {

src/packages/components/Informations/Inputs/InputsDate/config.vue

@@ -1,36 +1,31 @@
 <template>
   <collapse-item name="展示方式" :expanded="true">
     <setting-item-box name="选择方式">
-      <n-select v-model:value="optionData.isPanel" size="small" :options="panelOptions" />
+      <n-select
+        v-model:value="optionData.isPanel"
+        size="small"
+        :options="panelOptions"
+      />
     </setting-item-box>
   </collapse-item>
 
   <collapse-item name="时间配置" :expanded="true">
     <setting-item-box name="基础">
       <setting-item name="类型">
-        <n-select v-model:value="optionData.componentInteractEventKey" size="small" :options="datePickerTypeOptions" />
+        <n-select
+          v-model:value="optionData.componentInteractEventKey"
+          size="small"
+          :options="datePickerTypeOptions"
+        />
       </setting-item>
     </setting-item-box>
 
     <setting-item-box name="默认值" :alone="true">
-      <n-date-picker size="small" v-model:value="optionData.dataset" :type="optionData.componentInteractEventKey" />
-    </setting-item-box>
-
-    <setting-item-box :alone="true">
-      <template #name>
-        <n-text>动态</n-text>
-        <n-tooltip trigger="hover">
-          <template #trigger>
-            <n-icon size="21" :depth="3">
-              <help-outline-icon></help-outline-icon>
-            </n-icon>
-          </template>
-          <n-text>动态值不为0时，默认值:取当天时间相加当前值</n-text>
-        </n-tooltip>
-      </template>
-      <n-input-number v-model:value="optionData.differValue" class="input-num-width" size="small" :min="-40" :max="40">
-        <template #suffix> 天 </template>
-      </n-input-number>
+      <n-date-picker
+        size="small"
+        v-model:value="optionData.dataset"
+        :type="optionData.componentInteractEventKey"
+      />
     </setting-item-box>
   </collapse-item>
 </template>

src/packages/components/Informations/Inputs/InputsDate/index.vue

@@ -39,9 +39,9 @@ const onChange = (v: number | number[]) => {
       props.chartConfig,
       useChartEditStore,
       {
-        [ComponentInteractParamsEnum.DATE_START]: v[0] || dayjs().valueOf(),
-        [ComponentInteractParamsEnum.DATE_END]: v[1] || dayjs().valueOf(),
-        [ComponentInteractParamsEnum.DATE_RANGE]: `${v[0] || dayjs().valueOf()}-${v[1] || dayjs().valueOf()}`
+        [ComponentInteractParamsEnum.DATE_START]: v[0] | dayjs().valueOf(),
+        [ComponentInteractParamsEnum.DATE_END]: v[1] | dayjs().valueOf(),
+        [ComponentInteractParamsEnum.DATE_RANGE]: `${v[0]}-${v[1]}`
       },
       InteractEventOn.CHANGE
     )
@@ -50,12 +50,13 @@ const onChange = (v: number | number[]) => {
     useChartInteract(
       props.chartConfig,
       useChartEditStore,
-      { [ComponentInteractParamsEnum.DATE]: v || dayjs().valueOf() },
+      { [ComponentInteractParamsEnum.DATE]: v },
       InteractEventOn.CHANGE
     )
   }
 }
 
+// 手动更新
 watch(
   () => props.chartConfig.option.dataset,
   (newData: number | number[]) => {
@@ -67,25 +68,6 @@ watch(
     immediate: true
   }
 )
-
-// 手动更新
-watch(
-  () => props.chartConfig.option.differValue,
-  (newData: number) => {
-    if (props.chartConfig.option.differValue === 0) return
-    if (typeof option.dataset === 'object') {
-      option.dataset[0] = dayjs().add(newData, 'day').valueOf()
-      option.dataset[1] = dayjs().add(newData, 'day').valueOf()
-    } else {
-      option.dataset = dayjs().add(newData, 'day').valueOf()
-    }
-    // 关联目标组件首次请求带上默认内容
-    onChange(newData)
-  },
-  {
-    immediate: true
-  }
-)
 </script>
 
 <style lang="scss" scoped>

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

@@ -7,8 +7,7 @@
       :fallback-src="requireErrorImg()"
       :width="w"
       :height="h"
-      lazy
-    />
+    ></n-image>
   </div>
 </template>
 

src/packages/components/Informations/Texts/TextCommon/config.vue

@@ -2,7 +2,7 @@
   <collapse-item name="信息" :expanded="true">
     <setting-item-box name="文字" :alone="true">
       <setting-item>
-        <n-input v-model:value="optionData.dataset" type="textarea" size="small"></n-input>
+        <n-input v-model:value="optionData.dataset" size="small"></n-input>
       </setting-item>
     </setting-item-box>
     <setting-item-box name="链接" :alone="true">
@@ -30,7 +30,11 @@
         <n-input-number v-model:value="optionData.fontSize" size="small" placeholder="字体大小"></n-input-number>
       </setting-item>
       <setting-item name="字体粗细">
-        <n-select v-model:value="optionData.fontWeight" size="small" :options="fontWeightOptions" />
+        <n-select
+          v-model:value="optionData.fontWeight"
+          size="small"
+          :options="fontWeightOptions"
+        />
       </setting-item>
       <setting-item name="X轴内边距">
         <n-input-number v-model:value="optionData.paddingX" size="small" placeholder="输入内边距"></n-input-number>
@@ -83,7 +87,9 @@
 
 <script setup lang="ts">
 import { PropType } from 'vue'
-import { option, WritingModeEnum, WritingModeObject, FontWeightEnum, FontWeightObject } from './config'
+import { option, WritingModeEnum, WritingModeObject,
+  FontWeightEnum,
+  FontWeightObject, } from './config'
 import { CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
 const props = defineProps({
   optionData: {
@@ -111,13 +117,13 @@ const verticalOptions = [
 const fontWeightOptions = [
   {
     label: FontWeightEnum.NORMAL,
-    value: FontWeightObject[FontWeightEnum.NORMAL]
+    value: FontWeightObject[FontWeightEnum.NORMAL],
   },
   {
     label: FontWeightEnum.BOLD,
-    value: FontWeightObject[FontWeightEnum.BOLD]
-  }
-]
+    value: FontWeightObject[FontWeightEnum.BOLD],
+  },
+];
 const handleLinkClick = () => {
   window.open(props.optionData.linkHead + props.optionData.link)
 }

src/packages/components/Informations/Texts/TextCommon/index.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="go-text-box">
     <div class="content">
-      <span style="cursor: pointer; white-space: pre-wrap" v-if="link" @click="click"></span>
-      <span style="white-space: pre-wrap" v-else>{{ option.dataset }}</span>
+      <span style="cursor: pointer" v-if="link" @click="click">{{ option.dataset }}</span>
+      <span v-else>{{ option.dataset }}</span>
     </div>
   </div>
 </template>
@@ -82,7 +82,7 @@ const click = () => {
     border-width: v-bind('borderWidth + "px"');
     border-radius: v-bind('borderRadius + "px"');
     border-color: v-bind('borderColor');
-
+    
     background-color: v-bind('backgroundColor');
   }
 }

src/packages/components/Photos/Private/index.ts

@@ -1,91 +0,0 @@
-import { ChartFrameEnum, ConfigType, PackagesCategoryEnum } from '@/packages/index.d'
-import { ImageConfig } from '@/packages/components/Informations/Mores/Image/index'
-import { ChatCategoryEnum, ChatCategoryEnumName } from '../index.d'
-import { setLocalStorage, getLocalStorage, goDialog } from '@/utils'
-import { StorageEnum } from '@/enums/storageEnum'
-import { FileTypeEnum } from '@/enums/fileTypeEnum'
-import { backgroundImageSize } from '@/settings/designSetting'
-import { usePackagesStore } from '@/store/modules/packagesStore/packagesStore'
-
-const StoreKey = StorageEnum.GO_USER_MEDIA_PHOTOS
-
-/**
- * 上传完成事件类型
- */
-type UploadCompletedEventType = {
-  fileName: string
-  url: string
-}
-
-const userPhotosList: ConfigType[] = getLocalStorage(StoreKey) || []
-
-const uploadFile = (callback: Function | null = null) => {
-  const input = document.createElement('input')
-  input.type = 'file'
-  input.accept = '.png,.jpg,.jpeg,.gif' // 这里只允许部分图片类型
-  input.onchange = async () => {
-    if (!input.files || !input.files.length) return
-    const file = input.files[0]
-    const { name, size, type } = file
-    if (size > 1024 * 1024 * backgroundImageSize) {
-      window['$message'].warning(`图片超出 ${backgroundImageSize}M 限制，请重新上传！`)
-      return false
-    }
-    if (type !== FileTypeEnum.PNG && type !== FileTypeEnum.JPEG && type !== FileTypeEnum.GIF) {
-      window['$message'].warning('文件格式不符合，请重新上传！')
-      return false
-    }
-    const reader = new FileReader()
-    reader.onload = () => {
-      const eventObj: UploadCompletedEventType = { fileName: name, url: reader.result as string }
-      callback && callback(eventObj)
-    }
-    reader.readAsDataURL(file)
-  }
-  input.click()
-}
-
-const addConfig = {
-  ...ImageConfig,
-  category: ChatCategoryEnum.PRIVATE,
-  categoryName: ChatCategoryEnumName.PRIVATE,
-  package: PackagesCategoryEnum.PHOTOS,
-  chartFrame: ChartFrameEnum.STATIC,
-  title: '点击上传图片',
-  image: 'upload.png',
-  redirectComponent: `${ImageConfig.package}/${ImageConfig.category}/${ImageConfig.key}`, // 跳转组件路径规则：packageName/categoryName/componentKey
-  disabled: true,
-  configEvents: {
-    // 点击上传事件
-    addHandle: (photoConfig: ConfigType) => {
-      goDialog({
-        message: `图片需小于 ${backgroundImageSize}M 且只暂存在浏览器中。当前图片暂存上限5M，超过不再缓存新图片，请自行对接后端接口！现编译成 base64 进行渲染，对接后端后请使用【URL地址】进行交互！`,
-        transformOrigin: 'center',
-        onPositiveCallback: () => {
-          uploadFile((e: UploadCompletedEventType) => {
-            // 和上传组件一样配置，更换标题，图片，预设数据
-            const packagesStore = usePackagesStore()
-            const newPhoto = {
-              ...ImageConfig,
-              category: ChatCategoryEnum.PRIVATE,
-              categoryName: ChatCategoryEnumName.PRIVATE,
-              package: PackagesCategoryEnum.PHOTOS,
-              chartFrame: ChartFrameEnum.STATIC,
-              title: e.fileName,
-              image: e.url,
-              dataset: e.url,
-              redirectComponent: `${ImageConfig.package}/${ImageConfig.category}/${ImageConfig.key}` // 跳转组件路径规则：packageName/categoryName/componentKey
-            }
-            userPhotosList.unshift(newPhoto)
-            // 存储在本地数据中
-            setLocalStorage(StoreKey, userPhotosList)
-            // 插入到上传按钮前的位置
-            packagesStore.addPhotos(newPhoto, 1)
-          })
-        }
-      })
-    }
-  }
-}
-
-export default [addConfig, ...userPhotosList]

src/packages/components/Photos/Share/index.ts

@@ -1,23 +0,0 @@
-import { ChartFrameEnum, PackagesCategoryEnum } from '@/packages/index.d'
-import { ImageConfig } from '@/packages/components/Informations/Mores/Image/index'
-import { ChatCategoryEnum, ChatCategoryEnumName } from '../index.d'
-
-// 远程共享库（调接口获取图像列表）
-const imageList = [
-  { imageName: 'carousel1', imageUrl: 'https://naive-ui.oss-cn-beijing.aliyuncs.com/carousel-img/carousel1.jpeg' },
-  { imageName: 'carousel2', imageUrl: 'https://naive-ui.oss-cn-beijing.aliyuncs.com/carousel-img/carousel2.jpeg' }
-]
-
-const photoConfigList = imageList.map(i => ({
-  ...ImageConfig,
-  category: ChatCategoryEnum.SHARE,
-  categoryName: ChatCategoryEnumName.SHARE,
-  package: PackagesCategoryEnum.PHOTOS,
-  chartFrame: ChartFrameEnum.STATIC,
-  image: i.imageUrl,
-  dataset: i.imageUrl,
-  title: i.imageName,
-  redirectComponent: `${ImageConfig.package}/${ImageConfig.category}/${ImageConfig.key}` // 跳转组件路径规则：packageName/categoryName/componentKey
-}))
-
-export default photoConfigList

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

@@ -1,9 +0,0 @@
-export enum ChatCategoryEnum {
-  PRIVATE = 'Private',
-  SHARE = 'Share'
-}
-
-export enum ChatCategoryEnumName {
-  PRIVATE = '私有图',
-  SHARE = '共享图'
-}

src/packages/components/Photos/index.ts

@@ -1,4 +0,0 @@
-import Private from './Private'
-import Share from './Share'
-
-export const PhotoList = [...Private, ...Share]

src/packages/index.d.ts

@@ -15,34 +15,15 @@ export enum ChartFrameEnum {
 
 // 组件配置
 export type ConfigType = {
-  // 组件 key
   key: string
-  // 画布组件 key
   chartKey: string
-  // 右侧设置面板组件 key
   conKey: string
-  // 标题
   title: string
-  // 分类
   category: string
-  // 分类名称
   categoryName: string
-  // 所属包
   package: string
-  // 归类
   chartFrame?: ChartFrameEnum
-  // 预览图
   image: string
-  // 从指定路径创建创建该组件
-  redirectComponent?: string
-  // 组件预设的 dataset 值(图片/图标)
-  dataset?: any
-  // 禁用 拖拽或双击生成组件
-  disabled?: boolean
-  // 图标
-  icon?: string
-  // 事件
-  configEvents?: { [T: string]: Function }
 }
 
 // 数据请求
@@ -139,7 +120,7 @@ export interface PublicConfigType {
   }
   filter?: string
   status: StatusType
-  interactActions?: InteractActionsType[]
+  interactActions?: InteractActionsType[],
   events: {
     baseEvent: {
       [K in BaseEvent]?: string
@@ -159,7 +140,6 @@ export interface CreateComponentType extends PublicConfigType, requestConfig {
   key: string
   chartConfig: ConfigType
   option: GlobalThemeJsonType
-  groupList?: Array<CreateComponentType>
 }
 
 // 组件成组实例类
@@ -175,8 +155,6 @@ export enum PackagesCategoryEnum {
   CHARTS = 'Charts',
   TABLES = 'Tables',
   INFORMATIONS = 'Informations',
-  PHOTOS = 'Photos',
-  ICONS = 'Icons',
   DECORATES = 'Decorates'
 }
 
@@ -185,8 +163,6 @@ export enum PackagesCategoryName {
   CHARTS = '图表',
   TABLES = '列表',
   INFORMATIONS = '信息',
-  PHOTOS = '图片',
-  ICONS = '图标',
   DECORATES = '小组件'
 }
 
@@ -201,7 +177,5 @@ export type PackagesType = {
   [PackagesCategoryEnum.CHARTS]: ConfigType[]
   [PackagesCategoryEnum.INFORMATIONS]: ConfigType[]
   [PackagesCategoryEnum.TABLES]: ConfigType[]
-  [PackagesCategoryEnum.PHOTOS]: ConfigType[]
-  [PackagesCategoryEnum.ICONS]: ConfigType[]
   [PackagesCategoryEnum.DECORATES]: ConfigType[]
 }

src/packages/index.ts

@@ -1,99 +1,87 @@
-import { ChartList } from '@/packages/components/Charts/index'
-import { DecorateList } from '@/packages/components/Decorates/index'
-import { InformationList } from '@/packages/components/Informations/index'
-import { TableList } from '@/packages/components/Tables/index'
-import { PhotoList } from '@/packages/components/Photos/index'
-import { IconList } from '@/packages/components/Icons/index'
-import { PackagesCategoryEnum, PackagesType, ConfigType, FetchComFlagType } from '@/packages/index.d'
-
-const configModules: Record<string, { default: string }> = import.meta.glob('./components/**/config.vue', {
-  eager: true
-})
-const indexModules: Record<string, { default: string }> = import.meta.glob('./components/**/index.vue', {
-  eager: true
-})
-const imagesModules: Record<string, { default: string }> = import.meta.glob('../assets/images/chart/**', {
-  eager: true
-})
-
-// * 所有图表
-export let packagesList: PackagesType = {
-  [PackagesCategoryEnum.CHARTS]: ChartList,
-  [PackagesCategoryEnum.INFORMATIONS]: InformationList,
-  [PackagesCategoryEnum.TABLES]: TableList,
-  [PackagesCategoryEnum.DECORATES]: DecorateList,
-  [PackagesCategoryEnum.PHOTOS]: PhotoList,
-  [PackagesCategoryEnum.ICONS]: IconList
-}
-
-/**
- * * 获取目标组件配置信息
- * @param targetData
- */
-export const createComponent = async (targetData: ConfigType) => {
-  const { redirectComponent, category, key } = targetData
-  // redirectComponent 是给图片组件库和图标组件库使用的
-  if (redirectComponent) {
-    const [packageName, categoryName, keyName] = redirectComponent.split('/')
-    const redirectChart = await import(`./components/${packageName}/${categoryName}/${keyName}/config.ts`)
-    return new redirectChart.default()
-  }
-  const chart = await import(`./components/${targetData.package}/${category}/${key}/config.ts`)
-  return new chart.default()
-}
-
-/**
- * * 获取组件
- * @param {string} chartName 名称
- * @param {FetchComFlagType} flag 标识 0为展示组件, 1为配置组件
- */
-const fetchComponent = (chartName: string, flag: FetchComFlagType) => {
-  const module = flag === FetchComFlagType.VIEW ? indexModules : configModules
-  for (const key in module) {
-    const urlSplit = key.split('/')
-    if (urlSplit[urlSplit.length - 2] === chartName) {
-      return module[key]
-    }
-  }
-}
-
-/**
- * * 获取展示组件
- * @param {ConfigType} dropData 配置项
- */
-export const fetchChartComponent = (dropData: ConfigType) => {
-  const { key } = dropData
-  return fetchComponent(key, FetchComFlagType.VIEW)?.default
-}
-
-/**
- * * 获取配置组件
- * @param {ConfigType} dropData 配置项
- */
-export const fetchConfigComponent = (dropData: ConfigType) => {
-  const { key } = dropData
-  return fetchComponent(key, FetchComFlagType.CONFIG)?.default
-}
-
-/**
- * * 获取图片内容
- * @param {ConfigType} targetData 配置项
- */
-export const fetchImages = async (targetData?: ConfigType) => {
-  if (!targetData) return ''
-  // 正则判断图片是否为 url，是则直接返回该 url
-  if (/^(http|https):\/\/([\w.]+\/?)\S*/.test(targetData.image)) return targetData.image
-  // 新数据动态处理
-  const { image, package: targetDataPackage } = targetData
-  // 兼容旧数据
-  if (image.includes('@') || image.includes('base64')) return image
-
-  const imageName = image.substring(image.lastIndexOf('/') + 1)
-  for (const key in imagesModules) {
-    const urlSplit = key.split('/')
-    if (urlSplit[urlSplit.length - 1] === imageName) {
-      return imagesModules[key]?.default
-    }
-  }
-  return ''
-}
+import { ChartList } from '@/packages/components/Charts/index'
+import { DecorateList } from '@/packages/components/Decorates/index'
+import { InformationList } from '@/packages/components/Informations/index'
+import { TableList } from '@/packages/components/Tables/index'
+import { PackagesCategoryEnum, PackagesType, ConfigType, FetchComFlagType } from '@/packages/index.d'
+
+const configModules: Record<string, { default: string }> = import.meta.glob('./components/**/config.vue', {
+  eager: true
+})
+const indexModules: Record<string, { default: string }> = import.meta.glob('./components/**/index.vue', {
+  eager: true
+})
+const imagesModules: Record<string, { default: string }> = import.meta.glob('../assets/images/chart/**', {
+  eager: true
+})
+
+// * 所有图表
+export let packagesList: PackagesType = {
+  [PackagesCategoryEnum.CHARTS]: ChartList,
+  [PackagesCategoryEnum.INFORMATIONS]: InformationList,
+  [PackagesCategoryEnum.TABLES]: TableList,
+  [PackagesCategoryEnum.DECORATES]: DecorateList
+}
+
+/**
+ * * 获取目标组件配置信息
+ * @param targetData
+ */
+export const createComponent = async (targetData: ConfigType) => {
+  const { category, key } = targetData
+  const chart = await import(`./components/${targetData.package}/${category}/${key}/config.ts`)
+  return new chart.default()
+}
+
+/**
+ * * 获取组件
+ * @param {string} chartName 名称
+ * @param {FetchComFlagType} flag 标识 0为展示组件, 1为配置组件
+ */
+const fetchComponent = (chartName: string, flag: FetchComFlagType) => {
+  const module = flag === FetchComFlagType.VIEW ? indexModules : configModules
+  for (const key in module) {
+    const urlSplit = key.split('/')
+    if (urlSplit[urlSplit.length - 2] === chartName) {
+      return module[key]
+    }
+  }
+}
+
+/**
+ * * 获取展示组件
+ * @param {ConfigType} dropData 配置项
+ */
+export const fetchChartComponent = (dropData: ConfigType) => {
+  const { key } = dropData
+  return fetchComponent(key, FetchComFlagType.VIEW)?.default
+}
+
+/**
+ * * 获取配置组件
+ * @param {ConfigType} dropData 配置项
+ */
+export const fetchConfigComponent = (dropData: ConfigType) => {
+  const { key } = dropData
+  return fetchComponent(key, FetchComFlagType.CONFIG)?.default
+}
+
+/**
+ * * 获取图片内容
+ * @param {ConfigType} targetData 配置项
+ */
+export const fetchImages = async (targetData?: ConfigType) => {
+  if (!targetData) return ''
+  // 新数据动态处理
+  const { image, package: targetDataPackage } = targetData
+  // 兼容旧数据
+  if (image.includes('@') || image.includes('base64')) return image
+
+  const imageName = image.substring(image.lastIndexOf('/') + 1)
+  for (const key in imagesModules) {
+    const urlSplit = key.split('/')
+    if (urlSplit[urlSplit.length - 1] === imageName) {
+      return imagesModules[key]?.default
+    }
+  }
+  return ''
+}

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

@@ -56,19 +56,19 @@ import {
   ArrowDown as ArrowDownIcon,
   Planet as PawIcon,
   Search as SearchIcon,
+  Reload as ReloadIcon,
   ChevronUpOutline as ChevronUpOutlineIcon,
   ChevronDownOutline as ChevronDownOutlineIcon,
   Pulse as PulseIcon,
   Folder as FolderIcon,
   FolderOpen as FolderOpenIcon,
-  ImageOutline as ImageIcon,
+  Image as ImageIcon,
   Images as ImagesIcon,
   List as ListIcon,
   EyeOutline as EyeOutlineIcon,
   EyeOffOutline as EyeOffOutlineIcon,
   Albums as AlbumsIcon,
-  Analytics as AnalyticsIcon,
-  AirplaneOutline as AirPlaneOutlineIcon
+  Analytics as AnalyticsIcon
 } from '@vicons/ionicons5'
 
 import {
@@ -97,6 +97,7 @@ import {
   FitToScreen as FitToScreenIcon,
   FitToHeight as FitToHeightIcon,
   FitToWidth as FitToWidthIcon,
+  Save as SaveIcon,
   Carbon3DCursor as Carbon3DCursorIcon,
   Carbon3DSoftware as Carbon3DSoftwareIcon,
   Filter as FilterIcon,
@@ -218,6 +219,8 @@ const ionicons5 = {
   PawIcon,
   // 搜索（放大镜）
   SearchIcon,
+  // 加载
+  ReloadIcon,
   // 过滤器
   FilterIcon,
   // 向上
@@ -239,12 +242,10 @@ const ionicons5 = {
   // 眼睛
   EyeOutlineIcon,
   EyeOffOutlineIcon,
-  // 图表列表
+  // 图表列表 
   AlbumsIcon,
   // 分析
-  AnalyticsIcon,
-  // 飞机
-  AirPlaneOutlineIcon
+  AnalyticsIcon
 }
 
 const carbon = {
@@ -289,6 +290,8 @@ const carbon = {
   FitToScreenIcon,
   FitToHeightIcon,
   FitToWidthIcon,
+  // 保存
+  SaveIcon,
   // 成组
   Carbon3DCursorIcon,
   // 解组

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) => {
@@ -19,10 +27,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/global.theme.json

@@ -86,18 +86,8 @@
   },
   "legend": {
     "show": true,
-    "type": "scroll",
-    "x": "center",
-    "y": "top",
-    "icon": "circle",
-    "orient": "horizontal",
+    "top": "5%",
     "textStyle": {
-      "color": "#B9B8CE",
-      "fontSize": 18
-    },
-    "itemHeight": 15,
-    "itemWidth": 15,
-    "pageTextStyle": {
       "color": "#B9B8CE"
     }
   },

src/settings/designColor.json

@@ -2212,9 +2212,9 @@
     "pinyin": "tengluozi"
   },
   {
-    "CMYK": [34, 39, 0, 24],
-    "RGB": [128, 118, 195],
-    "hex": "#8076c3",
+    "CMYK": [57, 62, 16, 2],
+    "RGB": [128, 109, 158],
+    "hex": "#806d9e",
     "name": "槿紫",
     "pinyin": "jinzi"
   },

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,
@@ -12,6 +13,29 @@ import {
 import { PreviewScaleEnum } from '@/enums/styleEnum'
 import type { ChartColorsNameType, CustomColorsType, 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 {
   EDIT_LAYOUT_DOM = 'editLayoutDom',
@@ -20,13 +44,14 @@ export enum EditCanvasTypeEnum {
   SCALE = 'scale',
   USER_SCALE = 'userScale',
   LOCK_SCALE = 'lockScale',
+  SAVE_STATUS = 'saveStatus',
   IS_CREATE = 'isCreate',
   IS_DRAG = 'isDrag',
   IS_SELECT = 'isSelect',
   IS_CODE_EDIT="isCodeEdit"
 }
 
-// 编辑区域
+// 编辑区域（临时）
 export type EditCanvasType = {
   // 编辑区域 DOM
   [EditCanvasTypeEnum.EDIT_LAYOUT_DOM]: HTMLElement | null
@@ -43,13 +68,15 @@ export type EditCanvasType = {
   [EditCanvasTypeEnum.IS_CREATE]: boolean
   // 拖拽中
   [EditCanvasTypeEnum.IS_DRAG]: boolean
+  // 保存状态
+  [EditCanvasTypeEnum.SAVE_STATUS]: SyncEnum
   // 框选中
   [EditCanvasTypeEnum.IS_SELECT]: boolean
   // 代码编辑中
   [EditCanvasTypeEnum.IS_CODE_EDIT]: boolean
 }
 
-// 滤镜/背景色/宽高主题等
+// 画布数据/滤镜/背景色/宽高主题等
 export enum EditCanvasConfigEnum {
   PROJECT_NAME = 'projectName',
   WIDTH = 'width',
@@ -63,7 +90,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
   // 滤镜-色相
@@ -140,6 +174,7 @@ export type RecordChartType = {
 
 // Store 枚举
 export enum ChartEditStoreEnum {
+  PROJECT_INFO = 'projectInfo',
   EDIT_RANGE = 'editRange',
   EDIT_CANVAS = 'editCanvas',
   RIGHT_MENU_SHOW = 'rightMenuShow',
@@ -201,6 +236,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
@@ -55,6 +71,8 @@ export const useChartEditStore = defineStore({
       isDrag: false,
       // 框选中
       isSelect: false,
+      // 同步中
+      saveStatus: SyncEnum.PENDING,
       // 代码编辑中
       isCodeEdit: false
     },
@@ -138,6 +156,9 @@ export const useChartEditStore = defineStore({
     componentList: []
   }),
   getters: {
+    getProjectInfo(): ProjectInfoType {
+      return this.projectInfo
+    },
     getMousePosition(): MousePositionType {
       return this.mousePosition
     },
@@ -172,6 +193,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/packagesStore/packagesStore.d.ts

@@ -1,9 +1,8 @@
-import { PackagesType, ConfigType } from '@/packages/index.d'
-
-export { ConfigType }
-
-export { PackagesType }
-export interface PackagesStoreType {
-  packagesList: PackagesType,
-  newPhoto?: ConfigType
-}
+import { PackagesType, ConfigType } from '@/packages/index.d'
+
+export { ConfigType }
+
+export { PackagesType }
+export interface PackagesStoreType {
+  packagesList: PackagesType
+}

src/store/modules/packagesStore/packagesStore.ts

@@ -1,32 +1,16 @@
-import { defineStore } from 'pinia'
-import { ConfigType, PackagesStoreType, PackagesType } from './packagesStore.d'
-import { packagesList } from '@/packages/index'
-import { StorageEnum } from '@/enums/storageEnum'
-import { getLocalStorage, setLocalStorage } from '@/utils'
-
-// 组件 packages
-export const usePackagesStore = defineStore({
-  id: 'usePackagesStore',
-  state: (): PackagesStoreType => ({
-    packagesList: Object.freeze(packagesList),
-    newPhoto: undefined
-  }),
-  getters: {
-    getPackagesList(): PackagesType {
-      return this.packagesList
-    }
-  },
-  actions: {
-    addPhotos(newPhoto: ConfigType, index: number) {
-      this.newPhoto = newPhoto
-      this.packagesList.Photos.splice(index, 0, newPhoto)
-    },
-    deletePhotos(photoInfo: ConfigType, index: number) {
-      this.packagesList.Photos.splice(index, 1)
-      const StoreKey = StorageEnum.GO_USER_MEDIA_PHOTOS
-      const userPhotosList = getLocalStorage(StoreKey)
-      userPhotosList.splice(index - 1, 1)
-      setLocalStorage(StoreKey, userPhotosList)
-    }
-  }
-})
+import { defineStore } from 'pinia'
+import { PackagesStoreType, PackagesType } from './packagesStore.d'
+import { packagesList } from '@/packages/index'
+
+// 组件 pakages
+export const usePackagesStore = defineStore({
+  id: 'usePackagesStore',
+  state: (): PackagesStoreType => ({
+    packagesList: Object.freeze(packagesList)
+  }),
+  getters: {
+    getPackagesList(): PackagesType {
+      return this.packagesList
+    }
+  }
+})

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)
     }
   }
 })