docs: update

Signed-off-by: 奔跑的面条 <1262327911@qq.com>

.env

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

README.md

@@ -1,119 +1,227 @@
-## 总览
+</p>
+<p align="center">
+  <a
+      href="https://ai.goviewlink.com/saas/"
+      target="_blank"
+      style="
+        padding: 10px 20px;
+        display: inline-block;
+        border-radius: 10px;
+      ">
+    <img src="readme/GoViewPro.png" alt="go-view" />
+  </a>
+</p>
 
-**`master-fetch` 分支是带有后端接口请求的分支**
+<p align="center">
+    <img src="readme/logo-t-y.png" alt="go-view" />
+</p>
 
-**后端项目地址：[https://gitee.com/MTrun/go-view-serve](https://gitee.com/MTrun/go-view-serve)**
+<h4 align="center">
+开源、精美、便捷的「数据可视化」低代码开发平台
+</h4>
 
-**接口说明地址：[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)**
+<h4 align="center">
+<img src="https://gitee.com/dromara/go-view/badge/star.svg?theme=gvp" style="position: relative; display: inline-block; top: 6px; border-radius: 0px;" />
+<img src="https://gitcode.com/GoView/go-view/star/badge.svg" style="display: inline-block; position: relative; top: 4px;">
+</h4>
 
-## 使用
+#### 长期赞助商
 
-所有的接口地址位置：`src\api\path\*`
+<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.mingdao.com?s=utm_88&utm_source=Goview&utm_medium=banner&utm_campaign=gitee&utm_content=IT%E8%B5%8B%E8%83%BD%E4%B8%9A%E5%8A%A1"
+      target="_blank"
+      style="
+        padding: 10px 20px;
+        display: inline-block;
+        border-radius: 10px;
+        background: #f9f9f9;
+      ">
+      <img src="readme/sponsors/mdy-banner.png" alt="go-view" style="width: 270px;" width="270px"/>
+    </a>
+      <a
+      href="https://doc.hummingbird.winc-link.com?from=Goview"
+      target="_blank"
+      style="
+        padding: 10px 20px;
+        display: inline-block;
+        border-radius: 10px;
+        background: #f9f9f9;
+      ">
+      <img src="readme/sponsors/yingchuang-banner.png" alt="go-view" style="width: 270px;" width="270px"/>
+    </a>
+    <br/>
+    <br/>
+    <a
+      href="https://www.mtruning.club/chengDan/index.html"
+      target="_blank"
+      style="
+        padding: 10px 20px;
+        display: inline-block;
+        border-radius: 10px;
+        background: #f9f9f9;
+      ">
+      <img src="readme/sponsors/chengdan-banner.png" alt="go-view" style="width: 270px;" width="270px"/>
+    </a>
+  </div>
+</div>
 
-接口地址修改：`.env`
+#### 😶 **纯前端** 分支： **`master`**
 
-```shell
-# port
-VITE_DEV_PORT = '8080'
+#### 👻 携带 **后端** 请求分支: **`master-fetch`**
 
-# development path
-VITE_DEV_PATH = 'http://127.0.0.1:8080'
+#### 📚 GoView **文档** 地址：[https://www.mtruning.club/](https://www.mtruning.club/)
 
-# production path
-VITE_PRO_PATH = 'http://127.0.0.1:8080'
-```
+项目纯前端-Demo 地址：[https://vue.mtruning.club/](https://vue.mtruning.club/)
 
-公共前缀修改：`src\settings\httpSetting.ts`
+项目带后端-Demo 地址：[https://demo.mtruning.club/](https://demo.mtruning.club/)
 
-```shell
-// 请求前缀
-export const axiosPre = '/api/goview'
-```
+Cloud IDE 代码在线预览地址：[https://idegitee.com/dromara/go-view](https://idegitee.com/dromara/go-view)
 
-接口封装：`src\api\http.ts`
+#### 🤯 后端项目看这里!
 
-```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,
-  })
-}
+- `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)
+- `GO-goframe` [https://gitee.com/bufanyun/go-view-server](https://gitee.com/bufanyun/go-view-server)
+- `GO-gin` [https://gitee.com/ls1990/go-view-serve](https://gitee.com/ls1990/go-view-serve)
+- `接口文档` [https://docs.apipost.cn](https://docs.apipost.cn/preview/5aa85d10a59d66ce/ddb813732007ad2b?target_id=84dbc5b0-158f-4bcb-8f74-793ac604ada3) (不是最新, 以前端代码为准)
 
-export const post = (url: string, data?: object, headersType?: string) => {
-  return axiosInstance({
-    url: url,
-    method: RequestHttpEnum.POST,
-    data: data,
-    headers: {
-      'Content-Type': headersType || ContentTypeEnum.JSON
-    }
-  })
-}
+#### 整体介绍
 
-export const put = (url: string, data?: object, headersType?: string) => {
-  return axiosInstance({
-    url: url,
-    method: RequestHttpEnum.PUT,
-    data: data,
-    headers: {
-      'Content-Type': headersType || ContentTypeEnum.JSON
-    }
-  })
-}
+- 框架：基于 `Vue3` 框架编写，使用 `hooks` 写法抽离部分逻辑，使代码结构更加清晰；
 
-export const del = (url: string, params?: object) => {
-  return axiosInstance({
-    url: url,
-    method: RequestHttpEnum.DELETE,
-    params
-  })
-}
+- 类型：使用 `TypeScript` 进行类型约束，减少未知错误发生概率，可以大胆修改逻辑内容；
 
-// 获取请求函数，默认get
-export const http = (type?: RequestHttpEnum) => {
-  switch (type) {
-    case RequestHttpEnum.GET:
-      return get
+- 性能：多处性能优化，使用页面懒加载、组件动态注册、数据滚动加载等方式，提升页面渲染速度；
 
-    case RequestHttpEnum.POST:
-      return post
+- 存储：拥有本地记忆，部分配置项采用 `storage` 存储本地，提升使用体验；
 
-    case RequestHttpEnum.PUT:
-      return put
+- 封装：项目进行了详细的工具类封装如：路由、存储、加/解密、文件处理、主题、NaiveUI 全局方法、组件等
 
-    case RequestHttpEnum.DELETE:
-      return del
+- 可视化：基于开源图表库[ECharts](https://echarts.apache.org/zh/index.html) 和 [VChart](https://www.visactor.io/vchart) 编写，具有丰富的图表类型和适配大屏的主题效果；
 
-    default:
-      return get
-  }
-}
+- 入选 NaiveUI 社区精选资源推荐：[查看 NaiveUI 推荐列表](https://www.naiveui.com/zh-CN/light/docs/community)
 
-```
+说明文档：
+![说明文档](readme/go-view-doc.png)
+
+工作台：
+![工作台](readme/go-view-canvas.png)
+
+请求配置：
+![请求配置](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)
+
+最新动态: 整合字节图表框架 VChart[https://visactor.io/vchart](https://visactor.io/vchart)
+![图表框架 VChart](readme/go-view-vcharts.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 | 18.20.x | npm     | 10.7.x |
+| pnpm | 8.6.7   | 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 群：1030129384
+QQ 群：687586375
 
-![QQ群](readme/go-view-qq.png)
+<img width="260px" src="readme/go-view-qq.jpg" alt="QQ群" style="border-radius: 20px" />
+
+## Pro 部分功能展示
+
+体验地址： <a href="https://ai.goviewlink.com/saas/" target="_blank">https://ai.goviewlink.com/saas/</a>
 
 ![渲染海报](readme/logo-poster.png)

build/getConfigFileName.ts

@@ -0,0 +1,9 @@
+/**
+ * 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": "2.2.9",
+  "version": "1.3.2",
   "engines": {
     "node": ">=16.14"
   },
@@ -48,7 +48,7 @@
     "vue-i18n": "9.2.2",
     "vue-router": "4.0.12",
     "vue3-lazyload": "^0.2.5-beta",
-    "vue3-sketch-ruler": "1.3.3",
+    "vue3-sketch-ruler": "^1.3.3",
     "vuedraggable": "^4.1.0"
   },
   "devDependencies": {

pnpm-lock.yaml

@@ -111,8 +111,8 @@ importers:
         specifier: ^0.2.5-beta
         version: 0.2.5-beta(@vue/compiler-sfc@3.5.16)(vue@3.5.16(typescript@4.6.3))
       vue3-sketch-ruler:
-        specifier: 1.3.3
-        version: 1.3.3(vue@3.5.16(typescript@4.6.3))
+        specifier: ^1.3.3
+        version: 1.3.16(vue@3.5.16(typescript@4.6.3))
       vuedraggable:
         specifier: ^4.1.0
         version: 4.1.0(vue@3.5.16(typescript@4.6.3))
@@ -3946,8 +3946,9 @@ packages:
       '@vue/compiler-sfc': '>=3.0.0'
       vue: '>=3.0.0'
 
-  vue3-sketch-ruler@1.3.3:
-    resolution: {integrity: sha512-k7wK34fWq0v4PiEklF0KAxS37UJS2nm8mMaE8g4Bqv9ZbBY7MxqrkM1wIj9VHmjN/MyQeodFWdg6lJv/ZESKlw==}
+  vue3-sketch-ruler@1.3.16:
+    resolution: {integrity: sha512-k/TBOwbueU9eWOF7k/emsZMwtEqFk/FxG+h//TlaZ2B8RWbxhIe6hPFgggO4Jng10ARsuH4cMGAR+ZOuN4ozgg==}
+    deprecated: This version is deprecated. Please upgrade to version 2X for better features and performance.See https://github.com/kakajun/vue3-sketch-ruler
     hasBin: true
     peerDependencies:
       '@vue/composition-api': ^1.1.0
@@ -4322,7 +4323,7 @@ snapshots:
       '@types/node': 20.5.1
       chalk: 4.1.2
       cosmiconfig: 8.3.6(typescript@5.8.3)
-      cosmiconfig-typescript-loader: 4.4.0(@types/node@20.5.1)(cosmiconfig@8.3.6(typescript@4.6.3))(ts-node@10.9.2(@types/node@16.18.126)(typescript@4.6.3))(typescript@5.8.3)
+      cosmiconfig-typescript-loader: 4.4.0(@types/node@20.5.1)(cosmiconfig@8.3.6(typescript@5.8.3))(ts-node@10.9.2(@types/node@20.5.1)(typescript@5.8.3))(typescript@5.8.3)
       lodash.isplainobject: 4.0.6
       lodash.merge: 4.6.2
       lodash.uniq: 4.5.0
@@ -5555,7 +5556,7 @@ snapshots:
 
   core-util-is@1.0.3: {}
 
-  cosmiconfig-typescript-loader@4.4.0(@types/node@20.5.1)(cosmiconfig@8.3.6(typescript@4.6.3))(ts-node@10.9.2(@types/node@16.18.126)(typescript@4.6.3))(typescript@5.8.3):
+  cosmiconfig-typescript-loader@4.4.0(@types/node@20.5.1)(cosmiconfig@8.3.6(typescript@5.8.3))(ts-node@10.9.2(@types/node@20.5.1)(typescript@5.8.3))(typescript@5.8.3):
     dependencies:
       '@types/node': 20.5.1
       cosmiconfig: 8.3.6(typescript@5.8.3)
@@ -8185,7 +8186,7 @@ snapshots:
       '@vue/compiler-sfc': 3.5.16
       vue: 3.5.16(typescript@4.6.3)
 
-  vue3-sketch-ruler@1.3.3(vue@3.5.16(typescript@4.6.3)):
+  vue3-sketch-ruler@1.3.16(vue@3.5.16(typescript@4.6.3)):
     optionalDependencies:
       vue: 3.5.16(typescript@4.6.3)
 

preview.yml

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

src/App.vue

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

src/api/axios.config.ts

@@ -1,14 +0,0 @@
-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,93 +1,34 @@
-import axios, { AxiosResponse, AxiosRequestConfig, Axios, AxiosError, InternalAxiosRequestConfig } from 'axios'
-import { RequestHttpHeaderEnum, ResultEnum, ModuleTypeEnum } from '@/enums/httpEnum'
-import { PageEnum, ErrorPageNameMap } from '@/enums/pageEnum'
-import { StorageEnum } from '@/enums/storageEnum'
-import { axiosPre } from '@/settings/httpSetting'
-import { SystemStoreEnum, SystemStoreUserInfoEnum } from '@/store/modules/systemStore/systemStore.d'
-import { redirectErrorPage, getLocalStorage, routerTurnByName, isPreview } from '@/utils'
-import { fetchAllowList } from './axios.config'
-import includes from 'lodash/includes'
-
-export interface MyResponseType<T> {
-  code: ResultEnum
-  data: T
-  message: string
-}
-
-export interface MyRequestInstance extends Axios {
-  <T = any>(config: AxiosRequestConfig): Promise<MyResponseType<T>>
-}
+import axios, { AxiosResponse, InternalAxiosRequestConfig, AxiosError } from 'axios'
+import { ResultEnum } from "@/enums/httpEnum"
+import { ErrorPageNameMap } from "@/enums/pageEnum"
+import { redirectErrorPage } from '@/utils'
 
 const axiosInstance = axios.create({
-  baseURL: `${import.meta.env.PROD ? import.meta.env.VITE_PRO_PATH : ''}${axiosPre}`,
-  timeout: ResultEnum.TIMEOUT
-}) as unknown as MyRequestInstance
+  baseURL: import.meta.env.DEV ? import.meta.env.VITE_DEV_PATH : import.meta.env.VITE_PRO_PATH,
+  timeout: ResultEnum.TIMEOUT,
+})
 
 axiosInstance.interceptors.request.use(
   (config: InternalAxiosRequestConfig) => {
-    // 白名单校验
-    if (includes(fetchAllowList, config.url)) return config
-    // 获取 token
-    const info = getLocalStorage(StorageEnum.GO_SYSTEM_STORE)
-    // 重新登录
-    if (!info) {
-      routerTurnByName(PageEnum.BASE_LOGIN_NAME)
-      return config
-    }
-    const userInfo = info[SystemStoreEnum.USER_INFO]
-    config.headers[userInfo[SystemStoreUserInfoEnum.TOKEN_NAME] || 'token'] =  userInfo[SystemStoreUserInfoEnum.USER_TOKEN] || ''
     return config
   },
-  (err: AxiosError) => {
-    Promise.reject(err)
+  (error: AxiosError) => {
+    Promise.reject(error)
   }
 )
 
 // 响应拦截器
 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.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))
+    if (code === ResultEnum.DATA_SUCCESS) return Promise.resolve(res.data)
+    // 重定向
+    if (ErrorPageNameMap.get(code)) redirectErrorPage(code)
     return Promise.resolve(res.data)
   },
-  (err: AxiosError) => {
-    const status = err.response?.status
-    switch (status) {
-      case 401:
-        routerTurnByName(PageEnum.BASE_LOGIN_NAME)
-        Promise.reject(err)
-        break
-
-      default:
-        Promise.reject(err)
-        break
-    }
+  (err: AxiosResponse) => {
+    Promise.reject(err)
   }
 )
 

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 = <T = any>(url: string, params?: object) => {
-  return axiosInstance<T>({
+export const get = (url: string, params?: object) => {
+  return axiosInstance({
     url: url,
     method: RequestHttpEnum.GET,
-    params: params,
+    params: params
   })
 }
 
-export const post = <T = any>(url: string, data?: object, headersType?: string) => {
-  return axiosInstance<T>({
+export const post = (url: string, data?: object, headersType?: string) => {
+  return axiosInstance({
     url: url,
     method: RequestHttpEnum.POST,
     data: data,
@@ -28,8 +28,8 @@ export const post = <T = any>(url: string, data?: object, headersType?: string)
   })
 }
 
-export const patch = <T = any>(url: string, data?: object, headersType?: string) => {
-  return axiosInstance<T>({
+export const patch = (url: string, data?: object, headersType?: string) => {
+  return axiosInstance({
     url: url,
     method: RequestHttpEnum.PATCH,
     data: data,
@@ -39,8 +39,8 @@ export const patch = <T = any>(url: string, data?: object, headersType?: string)
   })
 }
 
-export const put = <T = any>(url: string, data?: object, headersType?: ContentTypeEnum) => {
-  return axiosInstance<T>({
+export const put = (url: string, data?: object, headersType?: ContentTypeEnum) => {
+  return axiosInstance({
     url: url,
     method: RequestHttpEnum.PUT,
     data: data,
@@ -50,8 +50,8 @@ export const put = <T = any>(url: string, data?: object, headersType?: ContentTy
   })
 }
 
-export const del = <T = any>(url: string, params?: object) => {
-  return axiosInstance<T>({
+export const del = (url: string, params?: object) => {
+  return axiosInstance({
     url: url,
     method: RequestHttpEnum.DELETE,
     params
@@ -82,11 +82,11 @@ export const http = (type?: RequestHttpEnum) => {
 }
 const prefix = 'javascript:'
 // 对输入字符进行转义处理
-export const translateStr = (target: string | Record<any, any>) => {
+export const translateStr = (target: string | object) => {
   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 | Record<any, any>) => {
   }
   for (const key in target) {
     if (Object.prototype.hasOwnProperty.call(target, key)) {
-      const subTarget = target[key]
-      target[key] = translateStr(subTarget)
+      const subTarget = (target as any)[key];
+      (target as any)[key] = translateStr(subTarget)
     }
   }
   return target

src/api/path/index.ts

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

src/api/path/project.api.ts

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

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

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

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

src/enums/editPageEnum.ts

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

src/enums/httpEnum.ts

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

src/enums/pageEnum.ts

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

src/hooks/index.ts

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

src/hooks/useChartDataPondFetch.hook.ts

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

src/hooks/useSystemInit.hook.ts

@@ -1,23 +0,0 @@
-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,8 +11,6 @@ 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',
@@ -28,14 +26,8 @@ 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,8 +1,6 @@
 export default {
-  create_btn: 'Creat',
-  create_success: 'Creat Success!',
-  create_failure: 'Failed to create, please try again later！',
-  create_tip: 'Please select a content for development!',
+  create_btn: 'Create',
+  create_tip: 'Please select a content for development',
   project: 'Project',
   my: 'My',
   new_project: 'New Project',

src/i18n/zh/index.ts

@@ -11,8 +11,6 @@ const global = {
   help: '帮助中心',
   contact: '关于软件',
   logout: '退出登录',
-  logout_success: '退出成功！',
-  logout_failure: '退出失败！',
   // 系统设置
   sys_set: '系统设置',
   lang_set: '语言设置',
@@ -20,27 +18,16 @@ 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,8 +1,6 @@
 export default {
   // aside
   create_btn: '新建',
-  create_success: '新建成功！',
-  create_failure: '新建失败，请稍后重试！',
   create_tip: '从哪里出发好呢？',
   project: '项目',
   my: '我的',

src/plugins/customComponents.ts

@@ -8,10 +8,7 @@ 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,7 +56,6 @@ import {
   ArrowDown as ArrowDownIcon,
   Planet as PawIcon,
   Search as SearchIcon,
-  Reload as ReloadIcon,
   ChevronUpOutline as ChevronUpOutlineIcon,
   ChevronDownOutline as ChevronDownOutlineIcon,
   ChevronForward as ChevronForwardIcon,
@@ -99,7 +98,6 @@ import {
   FitToScreen as FitToScreenIcon,
   FitToHeight as FitToHeightIcon,
   FitToWidth as FitToWidthIcon,
-  Save as SaveIcon,
   Carbon3DCursor as Carbon3DCursorIcon,
   Carbon3DSoftware as Carbon3DSoftwareIcon,
   Filter as FilterIcon,
@@ -223,8 +221,6 @@ const ionicons5 = {
   PawIcon,
   // 搜索（放大镜）
   SearchIcon,
-  // 加载
-  ReloadIcon,
   // 过滤器
   FilterIcon,
   // 向上
@@ -298,8 +294,6 @@ 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, RedirectHome, RedirectUnPublish } from '@/router/constant';
+import { ErrorPage404, ErrorPage403, ErrorPage500, Layout } from '@/router/constant';
 import { PageEnum } from '@/enums/pageEnum'
 import { GoReload } from '@/components/GoReload'
 
 
 export const LoginRoute: RouteRecordRaw = {
-  path: PageEnum.BASE_LOGIN,
-  name: PageEnum.BASE_LOGIN_NAME,
+  path: '/login',
+  name: 'Login',
   component: () => import('@/views/login/index.vue'),
   meta: {
     title: '登录',
@@ -60,21 +60,22 @@ export const ReloadRoute: AppRouteRecordRaw = {
   },
 }
 
-export const RedirectRoute: RouteRecordRaw[] = [
-  {
-    path: PageEnum.REDIRECT,
-    name: PageEnum.REDIRECT_NAME,
-    component: RedirectHome,
-    meta: {
-      title: PageEnum.REDIRECT_NAME,
-    },
+export const RedirectRoute: AppRouteRecordRaw = {
+  path: PageEnum.REDIRECT,
+  name: PageEnum.REDIRECT_NAME,
+  component: Layout,
+  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,
+  children: [
+    {
+      path: '/redirect/:path(.*)',
+      name: PageEnum.REDIRECT_NAME,
+      component: () => import('@/views/redirect/index.vue'),
+      meta: {
+        title: PageEnum.REDIRECT_NAME,
+        hideBreadcrumb: true,
+      },
     },
-  },
-]
+  ],
+};

src/router/constant.ts

@@ -4,10 +4,6 @@ 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,8 +1,9 @@
 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, RedirectRoute } from '@/router/base'
+import { HttpErrorPage, LoginRoute, ReloadRoute } from '@/router/base'
 import { Layout } from '@/router/constant'
 
 import modules from '@/router/modules'
@@ -18,7 +19,6 @@ 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, ReloadRoute];
+export const constantRouter: any[] = [LoginRoute, ...RootRoute, RedirectRoute, ReloadRoute];
 
 const router = createRouter({
   history: createWebHashHistory(''),

src/router/router-guards.ts

@@ -1,15 +1,7 @@
 import { Router } from 'vue-router';
-import { PageEnum, PreviewEnum } from '@/enums/pageEnum'
+import { PageEnum } 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) => {
@@ -27,8 +19,10 @@ export function createRouterGuards(router: Router) {
       next({ name: PageEnum.ERROR_PAGE_NAME_404 })
     }
 
-    // @ts-ignore
-    if (!routerAllowList.includes(to.name) && !loginCheck()) {
+    if (!loginCheck()) {
+      if (to.name === PageEnum.BASE_LOGIN_NAME) {
+        next()
+      }
       next({ name: PageEnum.BASE_LOGIN_NAME })
     }
     next()

src/settings/designSetting.ts

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

src/settings/httpSetting.ts

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

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

@@ -1,6 +1,5 @@
 import { CreateComponentType, CreateComponentGroupType, FilterEnum } from '@/packages/index.d'
 import { HistoryActionTypeEnum } from '@/store/modules/chartHistoryStore/chartHistoryStore.d'
-import { SyncEnum } from '@/enums/editPageEnum'
 import {
   RequestHttpEnum,
   RequestContentTypeEnum,
@@ -13,29 +12,6 @@ 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',
@@ -44,14 +20,13 @@ 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
@@ -68,15 +43,13 @@ 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',
@@ -91,14 +64,7 @@ export enum EditCanvasConfigEnum {
   PREVIEW_SCALE_TYPE = 'previewScaleType'
 }
 
-// 画布属性（需保存）
-export type EditCanvasConfigType = {
-  // ID
-  [EditCanvasConfigEnum.PROJECT_ID]: string,
-  // 项目名称
-  [EditCanvasConfigEnum.PROJECT_NAME]?: string,
-  // 项目描述
-  [EditCanvasConfigEnum.REMARKS]: string,
+export interface EditCanvasConfigType {
   // 滤镜-启用
   [FilterEnum.FILTERS_SHOW]: boolean
   // 滤镜-色相
@@ -177,7 +143,6 @@ export type RecordChartType = {
 
 // Store 枚举
 export enum ChartEditStoreEnum {
-  PROJECT_INFO = 'projectInfo',
   EDIT_RANGE = 'editRange',
   EDIT_CANVAS = 'editCanvas',
   RIGHT_MENU_SHOW = 'rightMenuShow',
@@ -239,7 +204,6 @@ 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,22 +10,14 @@ 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 {
-  getUUID,
-  loadingStart,
-  loadingFinish,
-  loadingError,
-  isString,
-  isArray
-} from '@/utils'
-
+  HistoryActionTypeEnum,
+  HistoryItemType,
+  HistoryTargetTypeEnum
+} from '@/store/modules/chartHistoryStore/chartHistoryStore.d'
+import { MenuEnum } from '@/enums/editPageEnum'
+import { getUUID, loadingStart, loadingFinish, loadingError, isString, isArray } from '@/utils'
 import {
-  ProjectInfoType,
   ChartEditStoreEnum,
   ChartEditStorage,
   ChartEditStoreType,
@@ -44,14 +36,6 @@ const settingStore = useSettingStore()
 export const useChartEditStore = defineStore({
   id: 'useChartEditStore',
   state: (): ChartEditStoreType => ({
-    // 项目数据
-    projectInfo: {
-      projectId: '',
-      projectName: '',
-      remarks: '',
-      thumbnail: '',
-      release: false
-    },
     // 画布属性
     editCanvas: {
       // 编辑区域 Dom
@@ -71,8 +55,6 @@ export const useChartEditStore = defineStore({
       isDrag: false,
       // 框选中
       isSelect: false,
-      // 同步中
-      saveStatus: SyncEnum.PENDING,
       // 代码编辑中
       isCodeEdit: false
     },
@@ -158,9 +140,6 @@ export const useChartEditStore = defineStore({
     componentList: []
   }),
   getters: {
-    getProjectInfo(): ProjectInfoType {
-      return this.projectInfo
-    },
     getMousePosition(): MousePositionType {
       return this.mousePosition
     },
@@ -224,10 +203,6 @@ export const useChartEditStore = defineStore({
     setEditCanvasConfig<T extends keyof EditCanvasConfigType, K extends EditCanvasConfigType[T]>(key: T, value: K) {
       this.editCanvasConfig[key] = value
     },
-    // * 设置 peojectInfo 数据项
-    setProjectInfo<T extends keyof ProjectInfoType, K extends ProjectInfoType[T]>(key: T, value: K) {
-      this.projectInfo[key] = value
-    },
     // * 设置右键菜单
     setRightMenuShow(value: boolean) {
       this.rightMenuShow = value

src/store/modules/settingStore/settingStore.ts

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

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

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

src/store/modules/systemStore/systemStore.ts

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

src/utils/file.ts

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

src/utils/http.ts

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

src/utils/index.ts

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

src/utils/plugin.ts

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

src/utils/router.ts

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

src/utils/storage.ts

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

src/utils/utils.ts

@@ -114,6 +114,29 @@ export const isMac = () => {
   return /macintosh|mac os x/i.test(navigator.userAgent)
 }
 
+/**
+ * * file转url
+ */
+export const fileToUrl = (file: File): string => {
+  const Url = URL || window.URL || window.webkitURL
+  const ImageUrl = Url.createObjectURL(file)
+  return ImageUrl
+}
+
+/**
+ * * file转base64
+ */
+export const fileTobase64 = (file: File, callback: Function) => {
+  let reader = new FileReader()
+  reader.readAsDataURL(file)
+  reader.onload = function (e: ProgressEvent<FileReader>) {
+    if (e.target) {
+      let base64 = e.target.result
+      callback(base64)
+    }
+  }
+}
+
 /**
  * * 挂载监听
  */
@@ -334,23 +357,3 @@ export const JSONParse = (data: string) => {
 export const setTitle = (title?: string) => {
   title && (document.title = title)
 }
-
-/**
- * 处理网页关闭事件
- */
-export const addWindowUnload = () => {
-  // 关闭网页出现离开提示
-  window.onbeforeunload = function (e) {
-    e = e || window.event
-    // 兼容IE8和Firefox 4之前的版本
-    if (e) {
-      e.returnValue = '您确定要离开当前页面吗？请确认是否保存数据！'
-    }
-    // Chrome, Safari, Firefox 4+, Opera 12+ , IE 9+
-    return '您确定要离开当前页面吗？请确认是否保存数据！'
-  }
-  // 返回销毁事件函数
-  return () => {
-    window.onbeforeunload = null
-  }
-}

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

@@ -132,20 +132,16 @@ import { swatchesColors } from '@/settings/chartThemes/index'
 import { FileTypeEnum } from '@/enums/fileTypeEnum'
 import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
 import { EditCanvasConfigEnum } from '@/store/modules/chartEditStore/chartEditStore.d'
-import { useSystemStore } from '@/store/modules/systemStore/systemStore'
 import { StylesSetting } from '@/components/Pages/ChartItemSetting'
 import { UploadCustomRequestOptions } from 'naive-ui'
-import { loadAsyncComponent, fetchRouteParamsLocation } from '@/utils'
+import { fileToUrl, loadAsyncComponent } from '@/utils'
 import { PreviewScaleEnum } from '@/enums/styleEnum'
-import { ResultEnum } from '@/enums/httpEnum'
 import { icon } from '@/plugins'
-import { uploadFile } from '@/api/path'
 
 const { ColorPaletteIcon } = icon.ionicons5
 const { ScaleIcon, FitToScreenIcon, FitToHeightIcon, FitToWidthIcon } = icon.carbon
 
 const chartEditStore = useChartEditStore()
-const systemStore = useSystemStore()
 const canvasConfig = chartEditStore.getEditCanvasConfig
 const editCanvas = chartEditStore.getEditCanvas
 
@@ -180,7 +176,7 @@ const globalTabList = [
     title: 'VChart主题',
     icon: ColorPaletteIcon,
     render: VChartThemeColor
-  }
+  },
 ]
 
 const previewTypeList = [
@@ -277,33 +273,11 @@ const clearColor = () => {
 // 自定义上传操作
 const customRequest = (options: UploadCustomRequestOptions) => {
   const { file } = options
-  nextTick(async () => {
+  nextTick(() => {
     if (file.file) {
-      // 修改名称
-      const newNameFile = new File([file.file], `${fetchRouteParamsLocation()}_index_background.png`, {
-        type: file.file.type
-      })
-      let uploadParams = new FormData()
-      uploadParams.append('object', newNameFile)
-      window['$message'].warn('该上传接口与项目预览图为同一个，请自行在后端新增一个上传背景图接口')
-      const uploadRes = await uploadFile(uploadParams)
-
-      if (uploadRes && uploadRes.code === ResultEnum.SUCCESS) {
-        if (uploadRes.data.fileurl) {
-          chartEditStore.setEditCanvasConfig(
-            EditCanvasConfigEnum.BACKGROUND_IMAGE,
-            `${uploadRes.data.fileurl}?time=${new Date().getTime()}`
-          )
-        } else {
-          chartEditStore.setEditCanvasConfig(
-            EditCanvasConfigEnum.BACKGROUND_IMAGE,
-            `${systemStore.getFetchInfo.OSSUrl || ''}${uploadRes.data.fileName}?time=${new Date().getTime()}`
-          )
-        }
-        chartEditStore.setEditCanvasConfig(EditCanvasConfigEnum.SELECT_COLOR, false)
-        return
-      }
-      window['$message'].error('添加图片失败，请稍后重试！')
+      const ImageUrl = fileToUrl(file.file)
+      chartEditStore.setEditCanvasConfig(EditCanvasConfigEnum.BACKGROUND_IMAGE, ImageUrl)
+      chartEditStore.setEditCanvasConfig(EditCanvasConfigEnum.SELECT_COLOR, false)
     } else {
       window['$message'].error('添加图片失败，请稍后重试！')
     }

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

@@ -43,7 +43,6 @@ import { RequestContentTypeEnum } from '@/enums/httpEnum'
 import { useTargetData } from '../../../hooks/useTargetData.hook'
 import { RequestGlobalConfig } from './components/RequestGlobalConfig'
 import { RequestTargetConfig } from './components/RequestTargetConfig'
-import { useSync } from '@/views/chart/hooks/useSync.hook'
 import { CreateComponentType, CreateComponentGroupType } from '@/packages/index.d'
 
 const props = defineProps({
@@ -53,9 +52,6 @@ const props = defineProps({
 })
 const emit = defineEmits(['update:modelShow', 'sendHandle'])
 
-const { targetData } = useTargetData()
-const { dataSyncUpdate } = useSync()
-
 // 解构基础配置
 const { chartConfig } = toRefs(props.targetData as CreateComponentType)
 const { requestContentType } = toRefs((props.targetData as CreateComponentType).request)
@@ -82,7 +78,6 @@ const closeHandle = () => {
 const closeAndSendHandle = () => {
   emit('update:modelShow', false)
   emit('sendHandle')
-  dataSyncUpdate()
 }
 
 const onEsc = () => {

src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataRequest/pondIndex.vue

@@ -54,7 +54,6 @@ import { useTargetData } from '../../../hooks/useTargetData.hook'
 import { RequestGlobalConfig } from './components/RequestGlobalConfig'
 import { RequestTargetConfig } from './components/RequestTargetConfig'
 import { RequestDataPondItemType } from '@/store/modules/chartEditStore/chartEditStore.d'
-import { useSync } from '@/views/chart/hooks/useSync.hook'
 import { goDialog } from '@/utils'
 
 const props = defineProps({
@@ -63,7 +62,6 @@ const props = defineProps({
 })
 const emit = defineEmits(['update:modelShow', 'editSaveHandle'])
 
-const { dataSyncUpdate } = useSync()
 const pondName = ref()
 const inputInstRef = ref()
 const modelShowRef = ref(false)
@@ -92,7 +90,6 @@ const closeAndSendHandle = () => {
     onPositiveCallback: () => {
       emit('update:modelShow', false)
       emit('editSaveHandle', props.targetDataRequest)
-      dataSyncUpdate()
     }
   })
 }

src/views/chart/ContentEdit/components/EditBottom/index.vue

@@ -5,8 +5,6 @@
       <edit-history></edit-history>
       <!-- CTRL按键触发展示 -->
       <n-text id="keyboard-dress-show" depth="3"></n-text>
-      <n-divider vertical />
-      <edit-data-sync></edit-data-sync>
     </n-space>
 
     <n-space class="bottom-ri">
@@ -59,8 +57,7 @@ import { SelectInst } from 'naive-ui'
 import { reactive, ref, toRefs, watchEffect } from 'vue'
 import { icon } from '@/plugins'
 import { EditHistory } from '../EditHistory/index'
-import { EditShortcutKey } from '../EditShortcutKey/index'
-import { EditDataSync } from '../EditDataSync/index'
+import EditShortcutKey from '../EditShortcutKey/index.vue'
 import { useDesignStore } from '@/store/modules/designStore/designStore'
 import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
 import { EditCanvasTypeEnum } from '@/store/modules/chartEditStore/chartEditStore.d'
@@ -155,10 +152,6 @@ $max-width: 670px;
   display: flex;
   align-items: center;
   justify-content: space-between;
-  padding: 0 10px;
-  width: 100%;
-  min-width: $min-width;
-  height: 40px;
   .bottom-ri {
     position: relative;
     top: 15px;

src/views/chart/ContentEdit/components/EditDataSync/index.ts

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

src/views/chart/ContentEdit/components/EditDataSync/index.vue

@@ -1,97 +0,0 @@
-<template>
-  <div class="go-edit-data-sync go-flex-items-center">
-    <n-tooltip trigger="hover">
-      <template #trigger>
-        <n-text class="status-desc go-ml-2" :type="descType" depth="3">
-          {{ statusDesc }}
-        </n-text>
-      </template>
-      <span>{{saveInterval}}s 更新一次</span>
-    </n-tooltip>
-    <n-spin
-      v-show="statusDesc === statusDescObj[1]['text']"
-      class="go-ml-2"
-      size="small"
-    >
-      <template #icon>
-        <n-icon size="13">
-          <reload-icon />
-        </n-icon>
-      </template>
-    </n-spin>
-  </div>
-</template>
-
-<script lang="ts" setup>
-import { ref, toRefs, watch } from 'vue'
-import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
-import { useDesignStore } from '@/store/modules/designStore/designStore'
-import { SyncEnum } from '@/enums/editPageEnum'
-import { icon } from '@/plugins'
-import { saveInterval } from '@/settings/designSetting'
-
-const { ReloadIcon } = icon.ionicons5
-
-const chartEditStore = useChartEditStore()
-const designStore = useDesignStore()
-
-const { saveStatus } = toRefs(chartEditStore.getEditCanvas)
-const themeColor = ref(designStore.getAppTheme)
-
-const statusDesc = ref('')
-const descType = ref('')
-let setTimeoutIns: NodeJS.Timeout = setTimeout(() => {})
-
-const statusDescObj = {
-  [SyncEnum.PENDING]: {
-    text: '等待自动同步',
-    type: '',
-  },
-  [SyncEnum.START]: {
-    text: '正在同步中',
-    type: 'success',
-  },
-  [SyncEnum.SUCCESS]: {
-    text: '同步成功！',
-    type: 'success',
-  },
-  [SyncEnum.FAILURE]: {
-    text: '同步失败!',
-    type: 'error',
-  },
-}
-
-watch(
-  () => saveStatus.value,
-  newData => {
-    clearTimeout(setTimeoutIns)
-    statusDesc.value = statusDescObj[newData]['text']
-    descType.value = statusDescObj[newData]['type']
-    // 3秒重置展示
-    setTimeoutIns = setTimeout(() => {
-      statusDesc.value = statusDescObj[SyncEnum.PENDING]['text']
-      descType.value = statusDescObj[SyncEnum.PENDING]['type']
-    }, 3000)
-  },
-  {
-    immediate: true,
-  }
-)
-</script>
-
-<style lang="scss" scoped>
-@include go('edit-data-sync') {
-  @include deep() {
-    .n-spin {
-      width: 13px;
-      height: 13px;
-    }
-  }
-  .status-desc {
-    cursor: default;
-    color: v-bind('themeColor');
-    font-size: 12px;
-    opacity: 0.8;
-  }
-}
-</style>

src/views/chart/ContentEdit/components/EditHistory/index.vue

@@ -133,6 +133,9 @@ const options = computed(() => {
 </script>
 
 <style lang="scss" scoped>
+.mr-10 {
+  margin-right: 10px;
+}
 .edit-history-popover {
   .btn-text {
     font-size: 12px;

src/views/chart/ContentEdit/components/EditShortcutKey/ShortcutKeyModal.vue

@@ -112,25 +112,20 @@ const shortcutKeyOptions = [
     win: `${WinKeyboard.CTRL.toUpperCase()} + ${WinKeyboard.SHIFT.toUpperCase()} + Z `,
     mac: `${MacKeyboard.CTRL.toUpperCase()} + ${MacKeyboard.SHIFT.toUpperCase()} + Z `
   },
-  {
-    label: '保存',
-    win: `${WinKeyboard.CTRL.toUpperCase()} + S `,
-    mac: `${MacKeyboard.CTRL.toUpperCase()} + S `,
-  },
   {
     label: '多选',
     win: `${WinKeyboard.CTRL.toUpperCase()} + 🖱️ `,
-    mac: `${MacKeyboard.CTRL.toUpperCase()} + 🖱️ `
+    mac: `${MacKeyboard.CTRL_SOURCE_KEY.toUpperCase()} + 🖱️ `
   },
   {
     label: '创建分组',
     win: `${WinKeyboard.CTRL.toUpperCase()} + G / 🖱️ `,
-    mac: `${MacKeyboard.CTRL.toUpperCase()} + G / 🖱️`
+    mac: `${MacKeyboard.CTRL_SOURCE_KEY.toUpperCase()} + G / 🖱️`
   },
   {
     label: '解除分组',
     win: `${WinKeyboard.CTRL.toUpperCase()} + ${WinKeyboard.SHIFT.toUpperCase()} + G `,
-    mac: `${MacKeyboard.CTRL.toUpperCase()} + ${WinKeyboard.SHIFT.toUpperCase()} + G `
+    mac: `${MacKeyboard.CTRL_SOURCE_KEY.toUpperCase()} + ${WinKeyboard.SHIFT.toUpperCase()} + G `
   }
 ]
 

src/views/chart/ContentEdit/components/EditShortcutKey/index.ts

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

src/views/chart/ContentEdit/components/EditTools/hooks/useFile.hooks.ts

@@ -7,6 +7,7 @@ import { useSync } from '@/views/chart/hooks/useSync.hook'
 export const useFile = () => {
   const importUploadFileListRef = ref()
   const { updateComponent } = useSync()
+
   // 上传-前置
   //@ts-ignore
   const importBeforeUpload = ({ file }) => {

src/views/chart/ContentEdit/components/EditTools/hooks/useSyncUpdate.hook.ts

@@ -9,7 +9,7 @@ import { SavePageEnum } from '@/enums/editPageEnum'
 import { editToJsonInterval } from '@/settings/designSetting'
 import { goDialog } from '@/utils'
 
-const { updateComponent, dataSyncUpdate } = useSync()
+const { updateComponent } = useSync()
 const chartEditStore = useChartEditStore()
 
 export const syncData = () => {
@@ -17,9 +17,8 @@ export const syncData = () => {
     message: '是否覆盖源视图内容，此操作不可撤回?',
     isMaskClosable: true,
     transformOrigin: 'center',
-    onPositiveCallback: async () => {
+    onPositiveCallback: () => {
       window['$message'].success('正在同步编辑器...')
-      dataSyncUpdate && (await dataSyncUpdate())
       dispatchEvent(new CustomEvent(SavePageEnum.CHART, { detail: chartEditStore.getStorageInfo() }))
     }
   })

src/views/chart/ContentEdit/index.vue

@@ -87,21 +87,13 @@ import { onMounted, computed, provide, watch } from 'vue'
 import { chartColors } from '@/settings/chartThemes/index'
 import { MenuEnum } from '@/enums/editPageEnum'
 import { CreateComponentType, CreateComponentGroupType } from '@/packages/index.d'
-import {
-  animationsClass,
-  getFilterStyle,
-  getTransformStyle,
-  getBlendModeStyle,
-  colorCustomMerge,
-  addWindowUnload
-} from '@/utils'
+import { animationsClass, getFilterStyle, getTransformStyle, getBlendModeStyle, colorCustomMerge } from '@/utils'
 import { useContextMenu } from '@/views/chart/hooks/useContextMenu.hook'
 import { MenuOptionsItemType } from '@/views/chart/hooks/useContextMenu.hook.d'
 import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
 import { SCALE_KEY } from '@/views/preview/hooks/useScale.hook'
 import { useLayout } from './hooks/useLayout.hook'
 import { useAddKeyboard } from '../hooks/useKeyboard.hook'
-import { useSync } from '../hooks/useSync.hook'
 import { dragHandle, dragoverHandle, mousedownHandleUnStop, useMouseHandle } from './hooks/useDrag.hook'
 import { useComponentStyle, useSizeStyle } from './hooks/useStyle.hook'
 import { useInitVChartsTheme } from '@/hooks'
@@ -116,10 +108,6 @@ import { EditTools } from './components/EditTools'
 
 const chartEditStore = useChartEditStore()
 const { handleContextMenu } = useContextMenu()
-const { dataSyncFetch, intervalDataSyncUpdate } = useSync()
-
-// 加入网页关闭提示
-addWindowUnload()
 
 // 编辑时注入scale变量，消除警告
 provide(SCALE_KEY, null)
@@ -195,12 +183,7 @@ useInitVChartsTheme(chartEditStore)
 
 // 键盘事件
 onMounted(() => {
-  // 键盘事件
   useAddKeyboard()
-  // 获取数据
-  dataSyncFetch()
-  // 定时更新数据
-  // intervalDataSyncUpdate()
 })
 </script>
 

src/views/chart/ContentHeader/headerLeftBtn/index.vue

@@ -29,44 +29,26 @@
         </template>
         <span>{{ item.title }}</span>
       </n-tooltip>
-
-      <n-divider vertical />
-
-      <!-- 保存 -->
-      <n-tooltip placement="bottom" trigger="hover">
-        <template #trigger>
-          <div class="save-btn" >
-            <n-button size="small" type="primary" ghost @click="dataSyncUpdate()">
-              <template #icon>
-                <n-icon>
-                  <SaveIcon></SaveIcon>
-                </n-icon>
-              </template>
-            </n-button>
-          </div>
-        </template>
-        <span>保存</span>
-      </n-tooltip>
     </n-space>
   </n-space>
 </template>
 
 <script setup lang="ts">
-import { toRefs, ref, Ref, reactive, computed } from 'vue'
+import { toRefs, Ref, reactive, computed } from 'vue'
 import { renderIcon, goDialog, goHome } from '@/utils'
 import { icon } from '@/plugins'
 import { useRemoveKeyboard } from '../../hooks/useKeyboard.hook'
-import { useSync } from '../../hooks/useSync.hook'
+
 import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
+
 import { useChartHistoryStore } from '@/store/modules/chartHistoryStore/chartHistoryStore'
 import { HistoryStackEnum } from '@/store/modules/chartHistoryStore/chartHistoryStore.d'
+
 import { useChartLayoutStore } from '@/store/modules/chartLayoutStore/chartLayoutStore'
 import { ChartLayoutStoreEnum } from '@/store/modules/chartLayoutStore/chartLayoutStore.d'
 
 const { LayersIcon, BarChartIcon, PrismIcon, HomeIcon, ArrowBackIcon, ArrowForwardIcon } = icon.ionicons5
-const { SaveIcon } = icon.carbon
 const { setItem } = useChartLayoutStore()
-const { dataSyncUpdate } = useSync()
 const { getLayers, getCharts, getDetails } = toRefs(useChartLayoutStore())
 const chartEditStore = useChartEditStore()
 const chartHistoryStore = useChartHistoryStore()
@@ -148,7 +130,7 @@ const clickHistoryHandle = (item: ItemType<HistoryStackEnum>) => {
 // 返回首页
 const goHomeHandle = () => {
   goDialog({
-    message: '确定已保存了数据（Ctrl / ⌘ + S），并返回到首页吗？',
+    message: '返回将不会保存任何操作',
     isMaskClosable: true,
     onPositiveCallback: () => {
       goHome()

src/views/chart/ContentHeader/headerRightBtn/index.vue

@@ -1,92 +1,30 @@
 <template>
   <n-space class="go-mt-0" :wrap="false">
-    <n-button v-for="item in comBtnList" :key="item.key" :type="item.type()" ghost @click="item.event">
+    <n-button v-for="item in comBtnList" :key="item.title" :type="item.type" ghost @click="item.event">
       <template #icon>
         <component :is="item.icon"></component>
       </template>
-      <span>{{ item.title() }}</span>
+      <span>{{ item.title }}</span>
     </n-button>
   </n-space>
-
-  <!-- 发布管理弹窗 -->
-  <n-modal v-model:show="modelShow" @afterLeave="closeHandle">
-    <n-list bordered class="go-system-setting">
-      <template #header>
-        <n-space justify="space-between">
-          <n-h3 class="go-mb-0">发布管理</n-h3>
-          <n-icon size="20" class="go-cursor-pointer" @click="closeHandle">
-            <close-icon></close-icon>
-          </n-icon>
-        </n-space>
-      </template>
-
-      <n-list-item>
-        <n-space :size="10">
-          <n-alert :show-icon="false" title="预览地址：" type="success">
-            {{ previewPath() }}
-          </n-alert>
-          <n-space vertical>
-            <n-button tertiary type="primary" @click="copyPreviewPath()"> 复制地址 </n-button>
-            <n-button :type="release ? 'warning' : 'primary'" @click="sendHandle">
-              {{ release ? '取消发布' : '发布大屏' }}
-            </n-button>
-          </n-space>
-        </n-space>
-      </n-list-item>
-
-      <n-list-item>
-        <n-space :size="10">
-          <n-button @click="modelShowHandle">关闭弹窗</n-button>
-        </n-space>
-      </n-list-item>
-    </n-list>
-  </n-modal>
 </template>
 
 <script setup lang="ts">
-import { ref, computed, watchEffect } from 'vue'
-import { useRoute } from 'vue-router'
-import { useClipboard } from '@vueuse/core'
+import { computed } from 'vue'
+import { renderIcon, goDialog, fetchPathByName, routerTurnByPath, setSessionStorage, getSessionStorage } from '@/utils'
 import { PreviewEnum } from '@/enums/pageEnum'
 import { StorageEnum } from '@/enums/storageEnum'
-import { ResultEnum } from '@/enums/httpEnum'
+import { useRoute } from 'vue-router'
 import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
 import { syncData } from '../../ContentEdit/components/EditTools/hooks/useSyncUpdate.hook'
-import { ProjectInfoEnum } from '@/store/modules/chartEditStore/chartEditStore.d'
-import { changeProjectReleaseApi } from '@/api/path'
-import {
-  previewPath,
-  renderIcon,
-  fetchPathByName,
-  routerTurnByPath,
-  setSessionStorage,
-  getSessionStorage,
-  httpErrorHandle,
-  fetchRouteParamsLocation
-} from '@/utils'
 import { icon } from '@/plugins'
 import { cloneDeep } from 'lodash'
 
-const { BrowsersOutlineIcon, SendIcon, AnalyticsIcon, CloseIcon } = icon.ionicons5
+const { BrowsersOutlineIcon, SendIcon, AnalyticsIcon } = icon.ionicons5
 const chartEditStore = useChartEditStore()
 
-const previewPathRef = ref(previewPath())
-const { copy, isSupported } = useClipboard({ source: previewPathRef })
-
 const routerParamsInfo = useRoute()
 
-const modelShow = ref<boolean>(false)
-const release = ref<boolean>(false)
-
-watchEffect(() => {
-  release.value = chartEditStore.getProjectInfo.release || false
-})
-
-// 关闭弹窗
-const closeHandle = () => {
-  modelShow.value = false
-}
-
 // 预览
 const previewHandle = () => {
   const path = fetchPathByName(PreviewEnum.CHART_PREVIEW_NAME, 'href')
@@ -101,10 +39,7 @@ const previewHandle = () => {
     const repeateIndex = sessionStorageInfo.findIndex((e: { id: string }) => e.id === previewId)
     // 重复替换
     if (repeateIndex !== -1) {
-      sessionStorageInfo.splice(repeateIndex, 1, {
-        id: previewId,
-        ...storageInfo
-      })
+      sessionStorageInfo.splice(repeateIndex, 1, { id: previewId, ...storageInfo })
       setSessionStorage(StorageEnum.GO_CHART_STORAGE_LIST, sessionStorageInfo)
     } else {
       sessionStorageInfo.push({
@@ -120,63 +55,35 @@ const previewHandle = () => {
   routerTurnByPath(path, [previewId], undefined, true)
 }
 
-// 模态弹窗
-const modelShowHandle = () => {
-  modelShow.value = !modelShow.value
-}
-
-// 复制预览地址
-const copyPreviewPath = (successText?: string, failureText?: string) => {
-  if (isSupported) {
-    copy()
-    window['$message'].success(successText || '复制成功！')
-  } else {
-    window['$message'].error(failureText || '复制失败！')
-  }
-}
-
 // 发布
-const sendHandle = async () => {
-  const res = await changeProjectReleaseApi({
-    id: fetchRouteParamsLocation(),
-    // 反过来
-    state: release.value ? -1 : 1
+const sendHandle = () => {
+  goDialog({
+    message: '想体验发布功能，请前往 master-fetch 分支查看: https://gitee.com/MTrun/go-view/tree/master-fetch',
+    positiveText: '了然',
+    closeNegativeText: true,
+    onPositiveCallback: () => {}
   })
-
-  if (res && res.code === ResultEnum.SUCCESS) {
-    modelShowHandle()
-    if (!release.value) {
-      copyPreviewPath('发布成功！已复制地址到剪贴板~', '发布成功！')
-    } else {
-      window['$message'].success(`已取消发布`)
-    }
-    chartEditStore.setProjectInfo(ProjectInfoEnum.RELEASE, !release.value)
-  } else {
-    httpErrorHandle()
-  }
 }
 
 const btnList = [
   {
     select: true,
-    title: () => '同步内容',
-    type: () => 'primary',
+    title: '同步内容',
+    type: 'primary',
     icon: renderIcon(AnalyticsIcon),
     event: syncData
   },
   {
-    key: 'preview',
-    title: () => '预览',
-    type: () => 'default',
+    select: true,
+    title: '预览',
     icon: renderIcon(BrowsersOutlineIcon),
     event: previewHandle
   },
   {
-    key: 'release',
-    title: () => (release.value ? '已发布' : '发布'),
+    select: true,
+    title: '发布',
     icon: renderIcon(SendIcon),
-    type: () => (release.value ? 'primary' : 'default'),
-    event: modelShowHandle
+    event: sendHandle
   }
 ]
 
@@ -191,15 +98,7 @@ const comBtnList = computed(() => {
 </script>
 
 <style lang="scss" scoped>
-@include go('system-setting') {
-  @extend .go-background-filter;
-  min-width: 100px;
-  max-width: 60vw;
-  padding-bottom: 20px;
-  @include deep() {
-    .n-list-item:not(:last-child) {
-      border-bottom: 0;
-    }
-  }
+.align-center {
+  margin-top: -4px;
 }
 </style>

src/views/chart/ContentHeader/headerTitle/index.vue

@@ -28,27 +28,28 @@
 </template>
 
 <script setup lang="ts">
-import { ref, nextTick, computed, watchEffect } from 'vue'
-import { ResultEnum } from '@/enums/httpEnum'
-import { fetchRouteParamsLocation, httpErrorHandle, setTitle } from '@/utils'
+import { ref, nextTick, computed } from 'vue'
+import { fetchRouteParamsLocation, setTitle } from '@/utils'
 import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
-import { ProjectInfoEnum, EditCanvasConfigEnum } from '@/store/modules/chartEditStore/chartEditStore.d'
-import { updateProjectApi } from '@/api/path'
-import { useSync } from '../../hooks/useSync.hook'
+import { EditCanvasConfigEnum } from '@/store/modules/chartEditStore/chartEditStore.d'
 import { icon } from '@/plugins'
 
-const chartEditStore = useChartEditStore()
-const { dataSyncUpdate } = useSync()
 const { FishIcon } = icon.ionicons5
+const chartEditStore = useChartEditStore()
 
 const focus = ref<boolean>(false)
 const inputInstRef = ref(null)
 
-const title = ref<string>(fetchRouteParamsLocation())
+// 根据路由 id 参数获取项目信息
+const fetchProhectInfoById = () => {
+  const id = fetchRouteParamsLocation()
+  if (id.length) {
+    return id[0]
+  }
+  return ''
+}
 
-watchEffect(() => {
-  title.value = chartEditStore.getProjectInfo.projectName || ''
-})
+const title = ref<string>(fetchProhectInfoById() || '')
 
 const comTitle = computed(() => {
   // eslint-disable-next-line vue/no-side-effects-in-computed-properties
@@ -66,18 +67,8 @@ const handleFocus = () => {
   })
 }
 
-const handleBlur = async () => {
+const handleBlur = () => {
   focus.value = false
-  chartEditStore.setProjectInfo(ProjectInfoEnum.PROJECT_NAME, title.value || '')
-  const res = (await updateProjectApi({
-    id: fetchRouteParamsLocation(),
-    projectName: title.value
-  }))
-  if (res && res.code === ResultEnum.SUCCESS) {
-    dataSyncUpdate()
-  } else {
-    httpErrorHandle()
-  }
 }
 </script>
 <style lang="scss" scoped>

src/views/chart/hooks/useKeyboard.hook.ts

@@ -1,5 +1,4 @@
 import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
-import { useSync } from './useSync.hook' 
 import { WinKeyboard, MacKeyboard, MenuEnum } from '@/enums/editPageEnum'
 import throttle from 'lodash/throttle'
 import debounce from 'lodash/debounce'
@@ -8,7 +7,7 @@ import { setKeyboardDressShow } from '@/utils'
 
 // Keymaster可以支持识别以下组合键： ⇧，shift，option，⌥，alt，ctrl，control，command，和⌘
 const chartEditStore = useChartEditStore()
-const useSyncIns = useSync()
+
 const winCtrlMerge = (e: string) => `${WinKeyboard.CTRL}+${e}`
 const winShiftMerge = (e: string) => `${WinKeyboard.SHIFT}+${e}`
 const winAltMerge = (e: string) => `${WinKeyboard.ALT}+${e}`
@@ -24,7 +23,6 @@ export const winKeyboardValue = {
   [MenuEnum.DELETE]: 'delete',
   [MenuEnum.BACK]: winCtrlMerge('z'),
   [MenuEnum.FORWORD]: winCtrlMerge(winShiftMerge('z')),
-  [MenuEnum.SAVE]: winCtrlMerge('s'),
   [MenuEnum.GROUP]: winCtrlMerge('g'),
   [MenuEnum.UN_GROUP]: winCtrlMerge(winShiftMerge('g')),
   [MenuEnum.LOCK]: winCtrlMerge('l'),
@@ -50,7 +48,6 @@ export const macKeyboardValue = {
   [MenuEnum.DELETE]: macCtrlMerge('backspace'),
   [MenuEnum.BACK]: macCtrlMerge('z'),
   [MenuEnum.FORWORD]: macCtrlMerge(macShiftMerge('z')),
-  [MenuEnum.SAVE]: macCtrlMerge('s'),
   [MenuEnum.GROUP]: macCtrlMerge('g'),
   [MenuEnum.UN_GROUP]: macCtrlMerge(macShiftMerge('g')),
   [MenuEnum.LOCK]: macCtrlMerge('l'),
@@ -74,7 +71,6 @@ const winKeyList: Array<string> = [
   winKeyboardValue.back,
   winKeyboardValue.forward,
 
-  winKeyboardValue.save,
   winKeyboardValue.group,
   winKeyboardValue.unGroup,
 
@@ -100,7 +96,6 @@ const macKeyList: Array<string> = [
   macKeyboardValue.back,
   macKeyboardValue.forward,
 
-  macKeyboardValue.save,
   macKeyboardValue.group,
   macKeyboardValue.unGroup,
 
@@ -220,11 +215,6 @@ export const useAddKeyboard = () => {
       case keyboardValue.show:
         keymaster(e, throttle(() => { chartEditStore.setShow(); return false }, throttleTime))
         break;
-
-      // 保存 ct+s
-      case keyboardValue.save:
-        keymaster(e, throttle(() => { useSyncIns.dataSyncUpdate(); return false }, 200))
-        break;
     }
   }
   winKeyList.forEach((key: string) => {

src/views/chart/hooks/useSync.hook.ts

@@ -1,23 +1,11 @@
-import { onUnmounted } from 'vue';
-import html2canvas from 'html2canvas'
-import { getUUID, httpErrorHandle, fetchRouteParamsLocation, base64toFile, JSONStringify, JSONParse } from '@/utils'
+import { getUUID } from '@/utils'
 import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
-import { EditCanvasTypeEnum, ChartEditStoreEnum, ProjectInfoEnum, ChartEditStorage } from '@/store/modules/chartEditStore/chartEditStore.d'
+import { ChartEditStoreEnum, ChartEditStorage } from '@/store/modules/chartEditStore/chartEditStore.d'
 import { useChartHistoryStore } from '@/store/modules/chartHistoryStore/chartHistoryStore'
-import { StylesSetting } from '@/components/Pages/ChartItemSetting'
-import { useSystemStore } from '@/store/modules/systemStore/systemStore'
 import { useChartLayoutStore } from '@/store/modules/chartLayoutStore/chartLayoutStore'
 import { ChartLayoutStoreEnum } from '@/store/modules/chartLayoutStore/chartLayoutStore.d'
 import { fetchChartComponent, fetchConfigComponent, createComponent } from '@/packages/index'
-import { saveInterval } from '@/settings/designSetting'
-import throttle from 'lodash/throttle'
-// 接口状态
-import { ResultEnum } from '@/enums/httpEnum'
-// 接口
-import { saveProjectApi, fetchProjectApi, uploadFile, updateProjectApi } from '@/api/path'
-// 画布枚举
-import { SyncEnum } from '@/enums/editPageEnum'
-import { CreateComponentType, CreateComponentGroupType, ConfigType } from '@/packages/index.d'
+import { CreateComponentType, CreateComponentGroupType } from '@/packages/index.d'
 import { BaseEvent, EventLife } from '@/enums/eventEnum'
 import { PublicGroupConfigClass } from '@/packages/public/publicConfig'
 import merge from 'lodash/merge'
@@ -101,7 +89,6 @@ const componentMerge = (newObject: any, sources: any, notComponent = false) => {
 export const useSync = () => {
   const chartEditStore = useChartEditStore()
   const chartHistoryStore = useChartHistoryStore()
-  const systemStore = useSystemStore()
   const chartLayoutStore = useChartLayoutStore()
   /**
    * * 组件动态注册
@@ -218,142 +205,7 @@ export const useSync = () => {
     chartLayoutStore.setItemUnHandle(ChartLayoutStoreEnum.PERCENTAGE, 0)
   }
 
-  /**
-   * * 赋值全局数据
-   * @param projectData 项目数据
-   * @returns
-   */
-  const updateStoreInfo = (projectData: {
-    id: string,
-    projectName: string,
-    indexImage: string,
-    remarks: string,
-    state: number
-  }) => {
-    const { id, projectName, remarks, indexImage, state } = projectData
-    // ID
-    chartEditStore.setProjectInfo(ProjectInfoEnum.PROJECT_ID, id)
-    // 名称
-    chartEditStore.setProjectInfo(ProjectInfoEnum.PROJECT_NAME, projectName)
-    // 描述
-    chartEditStore.setProjectInfo(ProjectInfoEnum.REMARKS, remarks)
-    // 缩略图
-    chartEditStore.setProjectInfo(ProjectInfoEnum.THUMBNAIL, indexImage)
-    // 发布
-    chartEditStore.setProjectInfo(ProjectInfoEnum.RELEASE, state === 1)
-  }
-
-  // * 数据获取
-  const dataSyncFetch = async () => {
-    // FIX:重新执行dataSyncFetch需清空chartEditStore.componentList,否则会导致图层重复
-    // 切换语言等操作会导致重新执行 dataSyncFetch,此时pinia中并未清空chartEditStore.componentList，导致图层重复
-    chartEditStore.componentList = []
-    chartEditStore.setEditCanvas(EditCanvasTypeEnum.SAVE_STATUS, SyncEnum.START)
-    try {
-      const res = await fetchProjectApi({ projectId: fetchRouteParamsLocation() })
-      if (res && res.code === ResultEnum.SUCCESS) {
-        if (res.data) {
-          updateStoreInfo(res.data)
-          // 更新全局数据
-          await updateComponent(JSONParse(res.data.content))
-          return
-        }else {
-          chartEditStore.setProjectInfo(ProjectInfoEnum.PROJECT_ID, fetchRouteParamsLocation())
-        }
-        setTimeout(() => {
-          chartEditStore.setEditCanvas(EditCanvasTypeEnum.SAVE_STATUS, SyncEnum.SUCCESS)
-        }, 1000)
-        return
-      }
-      chartEditStore.setEditCanvas(EditCanvasTypeEnum.SAVE_STATUS, SyncEnum.FAILURE)
-    } catch (error) {
-      chartEditStore.setEditCanvas(EditCanvasTypeEnum.SAVE_STATUS, SyncEnum.FAILURE)
-      httpErrorHandle()
-    }
-  }
-
-  // * 数据保存
-  const dataSyncUpdate = throttle(async (updateImg = true) => {
-    if(!fetchRouteParamsLocation()) return
-
-    let projectId = chartEditStore.getProjectInfo[ProjectInfoEnum.PROJECT_ID];
-    if(projectId === null || projectId === ''){
-      window['$message'].error('数据初未始化成功,请刷新页面！')
-      return
-    }
-
-    chartEditStore.setEditCanvas(EditCanvasTypeEnum.SAVE_STATUS, SyncEnum.START)
-
-    // 异常处理：缩略图上传失败不影响JSON的保存
-    try {
-      if (updateImg) {
-        // 获取缩略图片
-        const range = document.querySelector('.go-edit-range') as HTMLElement
-        // 生成图片
-        const canvasImage: HTMLCanvasElement = await html2canvas(range, {
-          backgroundColor: null,
-          allowTaint: true,
-          useCORS: true
-        })
-
-        // 上传预览图
-        let uploadParams = new FormData()
-        uploadParams.append('object', base64toFile(canvasImage.toDataURL(), `${fetchRouteParamsLocation()}_index_preview.png`))
-        const uploadRes = await uploadFile(uploadParams)
-        // 保存预览图
-        if(uploadRes && uploadRes.code === ResultEnum.SUCCESS) {
-          if (uploadRes.data.fileurl) {
-            await updateProjectApi({
-              id: fetchRouteParamsLocation(),
-              indexImage: `${uploadRes.data.fileurl}`
-            })
-          } else {
-            await updateProjectApi({
-              id: fetchRouteParamsLocation(),
-              indexImage: `${systemStore.getFetchInfo.OSSUrl}${uploadRes.data.fileName}`
-            })
-          }
-        }
-      }
-    } catch (e) {
-      console.log(e)
-    }
-
-    // 保存数据
-    let params = new FormData()
-    params.append('projectId', projectId)
-    params.append('content', JSONStringify(chartEditStore.getStorageInfo() || {}))
-    const res= await saveProjectApi(params)
-
-    if (res && res.code === ResultEnum.SUCCESS) {
-      // 成功状态
-      setTimeout(() => {
-        chartEditStore.setEditCanvas(EditCanvasTypeEnum.SAVE_STATUS, SyncEnum.SUCCESS)
-      }, 1000)
-      return
-    }
-    // 失败状态
-    chartEditStore.setEditCanvas(EditCanvasTypeEnum.SAVE_STATUS, SyncEnum.FAILURE)
-  }, 3000)
-
-  // * 定时处理
-  const intervalDataSyncUpdate = () => {
-    // 定时获取数据
-    const syncTiming = setInterval(() => {
-      dataSyncUpdate()
-    }, saveInterval * 1000)
-
-    // 销毁
-    onUnmounted(() => {
-      clearInterval(syncTiming)
-    })
-  }
-
   return {
-    updateComponent,
-    updateStoreInfo,
-    dataSyncFetch,
-    dataSyncUpdate,
-    intervalDataSyncUpdate
+    updateComponent
   }
 }

src/views/edit/index.vue

@@ -35,7 +35,7 @@
             lineNumbers: 'on',
             minimap: { enabled: true }
           }"
-          />
+        />
       </n-layout-content>
     </n-layout>
   </div>
@@ -46,17 +46,11 @@ import { ref } from 'vue'
 import { MonacoEditor } from '@/components/Pages/MonacoEditor'
 import { SavePageEnum } from '@/enums/editPageEnum'
 import { getSessionStorageInfo } from '../preview/utils'
-import { setSessionStorage, fetchRouteParamsLocation, JSONStringify, JSONParse, setTitle, goDialog } from '@/utils'
+import { setSessionStorage, JSONStringify, JSONParse, setTitle, goDialog } from '@/utils'
 import { StorageEnum } from '@/enums/storageEnum'
 import { icon } from '@/plugins'
-import { useSync } from '@/views/chart/hooks/useSync.hook'
-import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
-import { ProjectInfoEnum } from '@/store/modules/chartEditStore/chartEditStore.d'
 import type { ChartEditStorageType } from '../preview/index.d'
 
-const chartEditStore = useChartEditStore()
-const { dataSyncUpdate } = useSync()
-
 const { ChevronBackOutlineIcon, DownloadIcon, AnalyticsIcon } = icon.ionicons5
 const showOpenFilePicker: Function = (window as any).showOpenFilePicker
 const content = ref('')
@@ -128,16 +122,11 @@ async function updateSync() {
     message: '是否覆盖源视图内容? 此操作不可撤！',
     isMaskClosable: true,
     transformOrigin: 'center',
-    onPositiveCallback: async () => {
+    onPositiveCallback: () => {
       try {
         const detail = JSONParse(content.value)
         delete detail.id
         // 保持id不变
-        // 带后端版本额外处理请求
-        if (dataSyncUpdate) {
-          chartEditStore.setProjectInfo(ProjectInfoEnum.PROJECT_ID, fetchRouteParamsLocation())
-          await dataSyncUpdate(false) // JSON界面保存不上传缩略图
-        }
         window.opener.dispatchEvent(new CustomEvent(SavePageEnum.JSON, { detail }))
         window['$message'].success('正在同步内容...')
       } catch (e) {

src/views/exception/403.vue

@@ -4,7 +4,7 @@
       <img src="~@/assets/images/exception/403.svg" alt="" />
     </div>
     <div class="text-center">
-      <h1>抱歉，你无权访问该页面</h1>
+      <h1 class="text-base text-gray-500">抱歉，你无权访问该页面</h1>
     </div>
     <n-button type="primary" @click="goHome">回到首页</n-button>
   </div>

src/views/exception/404.vue

@@ -4,7 +4,7 @@
       <img src="~@/assets/images/exception/404.svg" alt="" />
     </div>
     <div class="text-center">
-      <h1>抱歉，你访问的页面不存在</h1>
+      <h1 class="text-base text-gray-500">抱歉，你访问的页面不存在</h1>
     </div>
     <n-button type="primary" @click="goHome">回到首页</n-button>
   </div>

src/views/exception/500.vue

@@ -4,9 +4,9 @@
       <img src="~@/assets/images/exception/500.svg" alt="" />
     </div>
     <div class="text-center">
-      <h1 class="text-base text-gray-500">抱歉，服务器出错了，建议您重新登录呢</h1>
+      <h1 class="text-base text-gray-500">抱歉，服务器出错了</h1>
     </div>
-    <n-button type="primary" secondary @click="goLogin">重新登录</n-button>
+    <n-button type="primary" secondary @click="goHome">回到首页</n-button>
   </div>
 </template>
 
@@ -14,8 +14,8 @@
 import { PageEnum } from '@/enums/pageEnum'
 import { routerTurnByName } from '@/utils'
 
-function goLogin() {
-  routerTurnByName(PageEnum.BASE_LOGIN_NAME)
+function goHome() {
+  routerTurnByName(PageEnum.BASE_HOME_NAME)
 }
 </script>
 

src/views/login/index.vue

@@ -117,29 +117,42 @@
 import { reactive, ref, onMounted } from 'vue'
 import shuffle from 'lodash/shuffle'
 import { carouselInterval } from '@/settings/designSetting'
-import { useSystemStore } from '@/store/modules/systemStore/systemStore'
-import { SystemStoreUserInfoEnum, SystemStoreEnum } from '@/store/modules/systemStore/systemStore.d'
+import { useDesignStore } from '@/store/modules/designStore/designStore'
 import { GoThemeSelect } from '@/components/GoThemeSelect'
 import { GoLangSelect } from '@/components/GoLangSelect'
 import { LayoutHeader } from '@/layout/components/LayoutHeader'
 import { LayoutFooter } from '@/layout/components/LayoutFooter'
 import { PageEnum } from '@/enums/pageEnum'
-import { StorageEnum } from '@/enums/storageEnum'
 import { icon } from '@/plugins'
-import { routerTurnByName } from '@/utils'
-import { loginApi } from '@/api/path'
+import { StorageEnum } from '@/enums/storageEnum'
+import { routerTurnByName, cryptoEncode, setLocalStorage } from '@/utils'
+const { GO_LOGIN_INFO_STORE } = StorageEnum
 
 const { PersonOutlineIcon, LockClosedOutlineIcon } = icon.ionicons5
 
+interface FormState {
+  username: string
+  password: string
+}
+
 const formRef = ref()
 const loading = ref(false)
 const autoLogin = ref(true)
 const show = ref(false)
 const showBg = ref(false)
-const systemStore = useSystemStore()
+const designStore = useDesignStore()
 
 const t = window['$t']
 
+onMounted(() => {
+  setTimeout(() => {
+    show.value = true
+  }, 300)
+  setTimeout(() => {
+    showBg.value = true
+  }, 100)
+})
+
 const formInline = reactive({
   username: 'admin',
   password: '123456',
@@ -182,58 +195,38 @@ const getImageUrl = (name: string, folder: string) => {
   return new URL(`../../assets/images/${folder}/${name}.png`, import.meta.url).href
 }
 
-// 打乱图片顺序
+// 打乱
 const shuffleHandle = () => {
   shuffleTimiing.value = setInterval(() => {
     bgList.value = shuffle(bgList.value)
   }, carouselInterval)
 }
 
-// 登录
-const handleSubmit = async (e: Event) => {
+// 点击事件
+const handleSubmit = (e: Event) => {
   e.preventDefault()
   formRef.value.validate(async (errors: any) => {
     if (!errors) {
       const { username, password } = formInline
       loading.value = true
-      // 提交请求
-      const res = await loginApi({
-        username,
-        password
-      })
-      if(res && res.data) {
-        const { tokenValue, tokenName } = res.data.token
-        const { nickname, username, id } = res.data.userinfo
-
-        // 存储到 pinia 
-        systemStore.setItem(SystemStoreEnum.USER_INFO, {
-          [SystemStoreUserInfoEnum.USER_TOKEN]: tokenValue,
-          [SystemStoreUserInfoEnum.TOKEN_NAME]: tokenName,
-          [SystemStoreUserInfoEnum.USER_ID]: id,
-          [SystemStoreUserInfoEnum.USER_NAME]: username,
-          [SystemStoreUserInfoEnum.NICK_NAME]: nickname,
-          t
-        })
-        
-        window['$message'].success(t('login.login_success'))
-        routerTurnByName(PageEnum.BASE_HOME_NAME, true)
-      }
-      loading.value = false
+      setLocalStorage(
+        GO_LOGIN_INFO_STORE,
+        cryptoEncode(
+          JSON.stringify({
+            username,
+            password,
+          })
+        )
+      )
+      window['$message'].success(`${t('login.login_success')}!`)
+      routerTurnByName(PageEnum.BASE_HOME_NAME, true)
     } else {
-      window['$message'].error(t('login.login_message'))
+      window['$message'].error(`${t('login.login_message')}!`)
     }
   })
 }
 
 onMounted(() => {
-  setTimeout(() => {
-    show.value = true
-  }, 300)
-
-  setTimeout(() => {
-    showBg.value = true
-  }, 100)
-
   shuffleHandle()
 })
 </script>

src/views/preview/hooks/useComInstall.hook.ts

@@ -8,7 +8,7 @@ export const useComInstall = (localStorageInfo: ChartEditStorageType) => {
 
   // 注册组件(一开始无法获取window['$vue'])
   const intervalTiming = setInterval(() => {
-    if (window['$vue']?.component) {
+    if (window['$vue'].component) {
       clearInterval(intervalTiming)
 
       const intComponent = (target: CreateComponentType) => {

src/views/preview/hooks/useScale.hook.ts

@@ -6,7 +6,6 @@ import { PreviewScaleEnum } from '@/enums/styleEnum'
 export const SCALE_KEY = 'scale-value'
 
 export const useScale = (localStorageInfo: ChartEditStorageType) => {
-
   const entityRef = ref()
   const previewRef = ref()
   const width = ref(localStorageInfo.editCanvasConfig.width)

src/views/preview/index.d.ts

@@ -1,6 +1,5 @@
 import { ChartEditStorage } from '@/store/modules/chartEditStore/chartEditStore.d'
 
 export interface ChartEditStorageType extends ChartEditStorage {
-  id: string,
-  isRelease?: boolean
+  id: string
 }

src/views/preview/utils/storage.ts

@@ -1,8 +1,6 @@
-import { getSessionStorage, fetchRouteParamsLocation, httpErrorHandle, JSONParse } from '@/utils'
-import { ResultEnum } from '@/enums/httpEnum'
+import { getSessionStorage } from '@/utils'
 import { StorageEnum } from '@/enums/storageEnum'
 import { ChartEditStorage } from '@/store/modules/chartEditStore/chartEditStore.d'
-import { fetchProjectApi } from '@/api/path'
 import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
 
 const chartEditStore = useChartEditStore()
@@ -12,31 +10,16 @@ export interface ChartEditStorageType extends ChartEditStorage {
 }
 
 // 根据路由 id 获取存储数据的信息
-export const getSessionStorageInfo = async () => {
-  const id = fetchRouteParamsLocation()
-  const storageList: ChartEditStorageType[] = getSessionStorage(StorageEnum.GO_CHART_STORAGE_LIST)
+export const getSessionStorageInfo = () => {
+  const urlHash = document.location.hash
+  const toPathArray = urlHash.split('/')
+  const id = toPathArray && toPathArray[toPathArray.length - 1]
 
-  // 是否本地预览
-  if (!storageList || storageList.findIndex(e => e.id === id.toString()) === -1) {
-    // 接口调用
-    const res = await fetchProjectApi({ projectId: id })
-    if (res && res.code === ResultEnum.SUCCESS) {
-      const { content, state } = res.data
-      if (state === -1) {
-        // 跳转未发布页
-        return { isRelease: false }
-      }
-      const parseData = { ...JSONParse(content), id }
-      const { editCanvasConfig, requestGlobalConfig, componentList } = parseData
-      chartEditStore.editCanvasConfig = editCanvasConfig
-      chartEditStore.requestGlobalConfig = requestGlobalConfig
-      chartEditStore.componentList = componentList
-      return parseData
-    } else {
-      httpErrorHandle()
-    }
-  } else {
-    // 本地读取
+  const storageList: ChartEditStorageType[] = getSessionStorage(
+    StorageEnum.GO_CHART_STORAGE_LIST
+  )
+
+  if (storageList) {
     for (let i = 0; i < storageList.length; i++) {
       if (id.toString() === storageList[i]['id']) {
         const { editCanvasConfig, requestGlobalConfig, componentList } = storageList[i]
@@ -47,4 +30,4 @@ export const getSessionStorageInfo = async () => {
       }
     }
   }
-}
+}

src/views/project/index.vue

@@ -27,16 +27,6 @@
 import { ProjectLayoutSider } from './layout/components/ProjectLayoutSider'
 import { LayoutHeaderPro } from '@/layout/components/LayoutHeaderPro'
 import { LayoutTransitionMain } from '@/layout/components/LayoutTransitionMain/index'
-import { goDialog } from '@/utils'
-
-// 提示
-goDialog({
-  message: '不要在官方后端上发布任何私密数据，任何人都看得到并进行删除！！！！',
-  isMaskClosable: true,
-  closeNegativeText: true,
-  transformOrigin: 'center',
-  onPositiveCallback: () => {}
-})
 </script>
 
 <style lang="scss" scoped>

src/views/project/items/components/ProjectItemsCard/index.vue

@@ -7,7 +7,7 @@
           <mac-os-control-btn
             class="top-btn"
             :hidden="['remove']"
-            @close="deleteHandle"
+            @close="deleteHanlde"
             @resize="resizeHandle"
          ></mac-os-control-btn>
         </div>
@@ -17,7 +17,9 @@
             object-fit="contain"
             height="180"
             preview-disabled
-            :src="`${cardData.image}?time=${new Date().getTime()}`"
+            :src="
+              requireUrl('project/moke-20211219181327.png')
+            "
             :alt="cardData.title"
             :fallback-src="requireErrorImg()"
          ></n-image>
@@ -25,8 +27,8 @@
       </div>
       <template #action>
         <div class="go-flex-items-center list-footer" justify="space-between">
-          <n-text class="go-ellipsis-1">
-            {{ cardData.title || cardData.id || '未命名' }}
+          <n-text class="go-ellipsis-1" :title="cardData.title">
+            {{ cardData.title || '' }}
           </n-text>
           <!-- 工具 -->
           <div class="go-flex-items-center list-footer-ri">
@@ -73,8 +75,8 @@
                 </n-tooltip>
               </template>
             </n-space>
-          <!-- end -->
           </div>
+          <!-- end -->
         </div>
       </template>
     </n-card>
@@ -99,12 +101,17 @@ const {
   SendIcon
 } = icon.ionicons5
 
-const emit = defineEmits(['preview', 'delete', 'resize', 'edit', 'release'])
+const emit = defineEmits(['delete', 'resize', 'edit'])
 
 const props = defineProps({
   cardData: Object as PropType<Chartype>
 })
 
+// 处理url获取
+const requireUrl = (name: string) => {
+  return new URL(`../../../../../assets/images/${name}`, import.meta.url).href
+}
+
 const fnBtnList = reactive([
   {
     label: renderLang('global.r_edit'),
@@ -128,7 +135,7 @@ const selectOptions = ref([
     label: props.cardData?.release
       ? renderLang('global.r_unpublish')
       : renderLang('global.r_publish'),
-    key: 'release',
+    key: 'send',
     icon: renderIcon(SendIcon)
   },
   {
@@ -140,14 +147,8 @@ const selectOptions = ref([
 
 const handleSelect = (key: string) => {
   switch (key) {
-    case 'preview':
-      previewHandle()
-      break
     case 'delete':
-      deleteHandle()
-      break
-    case 'release':
-      releaseHandle()
+      deleteHanlde()
       break
     case 'edit':
       editHandle()
@@ -155,13 +156,8 @@ const handleSelect = (key: string) => {
   }
 }
 
-// 预览处理
-const previewHandle = () => {
-  emit('preview', props.cardData)
-}
-
 // 删除处理
-const deleteHandle = () => {
+const deleteHanlde = () => {
   emit('delete', props.cardData)
 }
 
@@ -170,11 +166,6 @@ const editHandle = () => {
   emit('edit', props.cardData)
 }
 
-// 编辑处理
-const releaseHandle = () => {
-  emit('release', props.cardData)
-}
-
 // 放大处理
 const resizeHandle = () => {
   emit('resize', props.cardData)

src/views/project/items/components/ProjectItemsList/hooks/useData.hook.ts

@@ -1,124 +1,58 @@
-import { ref, reactive } from 'vue'
-import { goDialog, httpErrorHandle } from '@/utils'
+import { ref } from 'vue'
+import { goDialog } from '@/utils'
 import { DialogEnum } from '@/enums/pluginEnum'
-import { projectListApi, deleteProjectApi, changeProjectReleaseApi } from '@/api/path'
-import { Chartype, ChartList } from '../../../index.d'
-import { ResultEnum } from '@/enums/httpEnum'
-
+import { ChartList } from '../../..'
 // 数据初始化
 export const useDataListInit = () => {
-  const loading = ref(true)
-
-  const paginat = reactive({
-    // 当前页数
-    page: 1,
-    // 每页值
-    limit: 12,
-    // 总数
-    count: 10
-  })
-
-  const list = ref<ChartList>([])
-
-  // 数据请求
-  const fetchList = async () => {
-    loading.value = true
-    const res = await projectListApi({
-      page: paginat.page,
-      limit: paginat.limit
-    })
-    if (res && res.data) {
-      const { count } = res as any // 这里的count与data平级，不在Response结构中
-      paginat.count = count
-      list.value = res.data.map(e => {
-        const { id, projectName, state, createTime, indexImage, createUserId } = e
-        return {
-          id: id,
-          title: projectName,
-          createId: createUserId,
-          time: createTime,
-          image: indexImage,
-          release: state !== -1
-        }
-      })
-      setTimeout(() => {
-        loading.value = false
-      }, 500)
-      return
+  const list = ref<ChartList>([
+    {
+      id: 1,
+      title: '物料1-假数据不可用',
+      release: true,
+      label: '官方案例'
+    },
+    {
+      id: 2,
+      title: '物料2-假数据不可用',
+      release: false,
+      label: '官方案例'
+    },
+    {
+      id: 3,
+      title: '物料3-假数据不可用',
+      release: false,
+      label: '官方案例'
+    },
+    {
+      id: 4,
+      title: '物料4-假数据不可用',
+      release: false,
+      label: '官方案例'
+    },
+    {
+      id: 5,
+      title: '物料5-假数据不可用',
+      release: false,
+      label: '官方案例'
     }
-    httpErrorHandle()
-  }
+  ])
 
-  // 修改页数
-  const changePage = (_page: number) => {
-    paginat.page = _page
-    fetchList()
-  }
-
-  // 修改大小
-  const changeSize = (_size: number) => {
-    paginat.limit = _size
-    fetchList()
-  }
-
-  // 删除处理
-  const deleteHandle = (cardData: Chartype) => {
+  // 删除
+  const deleteHandle = (cardData: object, index: number) => {
     goDialog({
       type: DialogEnum.DELETE,
       promise: true,
       onPositiveCallback: () =>
-        new Promise(res => {
-          res(
-            deleteProjectApi({
-              ids: cardData.id
-            })
-          )
-        }),
-      promiseResCallback: (res: any) => {
-        if (res.code === ResultEnum.SUCCESS) {
-          window['$message'].success(window['$t']('global.r_delete_success'))
-          fetchList()
-          return
-        }
-        httpErrorHandle()
+        new Promise(res => setTimeout(() => res(1), 1000)),
+      promiseResCallback: (e: any) => {
+        window.$message.success('删除成功')
+        list.value.splice(index, 1)
       }
     })
   }
 
-  // 发布处理
-  const releaseHandle = async (cardData: Chartype, index: number) => {
-    const { id, release } = cardData
-    const res = await changeProjectReleaseApi({
-      id: id,
-      // [-1未发布, 1发布]
-      state: !release ? 1 : -1
-    })
-    if (res && res.code === ResultEnum.SUCCESS) {
-      list.value = []
-      fetchList()
-      // 发布 -> 未发布
-      if (release) {
-        window['$message'].success(window['$t']('global.r_unpublish_success'))
-        return
-      }
-      // 未发布 -> 发布
-      window['$message'].success(window['$t']('global.r_publish_success'))
-      return
-    }
-    httpErrorHandle()
-  }
-
-  // 立即请求
-  fetchList()
-
   return {
-    loading,
-    paginat,
     list,
-    fetchList,
-    releaseHandle,
-    changeSize,
-    changePage,
     deleteHandle
   }
 }

src/views/project/items/components/ProjectItemsList/hooks/useModal.hook.ts

@@ -1,7 +1,8 @@
 import { ref } from 'vue'
 import { ChartEnum } from '@/enums/pageEnum'
-import { fetchPathByName, routerTurnByPath, openNewWindow, previewPath } from '@/utils'
+import { fetchPathByName, routerTurnByPath } from '@/utils'
 import { Chartype } from '../../../index.d'
+
 export const useModalDataInit = () => {
   const modalShow = ref<boolean>(false)
   const modalData = ref<Chartype | null>(null)
@@ -12,31 +13,25 @@ export const useModalDataInit = () => {
     modalData.value = null
   }
 
-  // 缩放处理
+  // 打开 modal
   const resizeHandle = (cardData: Chartype) => {
-    if (!cardData) return
+    if(!cardData) return
     modalShow.value = true
     modalData.value = cardData
   }
 
-  // 编辑处理
+  // 打开 modal
   const editHandle = (cardData: Chartype) => {
-    if (!cardData) return
+    if(!cardData) return
     const path = fetchPathByName(ChartEnum.CHART_HOME_NAME, 'href')
     routerTurnByPath(path, [cardData.id], undefined, true)
   }
 
-  // 预览处理
-  const previewHandle = (cardData: Chartype) => {
-    openNewWindow(previewPath(cardData.id))
-  }
-
   return {
     modalData,
     modalShow,
     closeModal,
     resizeHandle,
-    editHandle,
-    previewHandle
+    editHandle
   }
 }

src/views/project/items/components/ProjectItemsList/index.vue

@@ -1,40 +1,28 @@
 <template>
   <div class="go-items-list">
-    <!-- 加载 -->
-    <div v-show="loading">
-      <go-loading></go-loading>
-    </div>
-    <!-- 列表 -->
-    <div v-show="!loading">
-      <n-grid :x-gap="20" :y-gap="20" cols="2 s:2 m:3 l:4 xl:4 xxl:4" responsive="screen">
-        <n-grid-item v-for="(item, index) in list" :key="item.id">
-          <project-items-card
-            :cardData="item"
-            @preview="previewHandle"
-            @resize="resizeHandle"
-            @delete="deleteHandle(item)"
-            @release="releaseHandle(item, index)"
-            @edit="editHandle"
-          ></project-items-card>
-        </n-grid-item>
-      </n-grid>
-    </div>
-
-    <!-- 分页 -->
+    <n-grid
+      :x-gap="20"
+      :y-gap="20"
+      cols="2 s:2 m:3 l:4 xl:4 xxl:4"
+      responsive="screen"
+    >
+      <n-grid-item v-for="(item, index) in list" :key="item.id">
+        <project-items-card
+          :cardData="item"
+          @resize="resizeHandle"
+          @delete="deleteHandle($event, index)"
+          @edit="editHandle"
+        ></project-items-card>
+      </n-grid-item>
+    </n-grid>
     <div class="list-pagination">
       <n-pagination
-        :page="paginat.page"
-        :page-size="paginat.limit"
-        :item-count="paginat.count"
-        :page-sizes="[12, 24, 36, 48]"
-        @update:page="changePage"
-        @update:page-size="changeSize"
+        :item-count="10"
+        :page-sizes="[10, 20, 30, 40]"
         show-size-picker
       />
     </div>
   </div>
-
-  <!-- model -->
   <project-items-modal-card
     v-if="modalData"
     :modalShow="modalShow"
@@ -52,8 +40,8 @@ import { useModalDataInit } from './hooks/useModal.hook'
 import { useDataListInit } from './hooks/useData.hook'
 
 const { CopyIcon, EllipsisHorizontalCircleSharpIcon } = icon.ionicons5
-const { modalData, modalShow, closeModal, previewHandle, resizeHandle, editHandle } = useModalDataInit()
-const { loading, paginat, list, changeSize, changePage, releaseHandle, deleteHandle } = useDataListInit()
+const { list, deleteHandle } = useDataListInit()
+const { modalData, modalShow, closeModal, resizeHandle, editHandle } = useModalDataInit()
 </script>
 
 <style lang="scss" scoped>
@@ -62,7 +50,7 @@ $contentHeight: 250px;
   display: flex;
   flex-direction: column;
   justify-content: space-between;
-  min-height: calc(100vh - #{$--header-height} - 40px - 2px);
+  min-height: calc(100vh - #{$--header-height} * 2 - 2px);
   .list-content {
     position: relative;
     height: $contentHeight;

src/views/project/items/components/ProjectItemsModalCard/index.vue

@@ -11,7 +11,7 @@
         <n-space class="list-content-top go-px-0" justify="center">
           <n-space>
             <n-text>
-              {{ cardData?.title || cardData?.id || '未命名' }}
+              {{ cardData?.title || '' }}
             </n-text>
           </n-space>
         </n-space>
@@ -26,7 +26,9 @@
         <!-- 中间 -->
         <div class="list-content-img">
           <img
-            :src="cardData?.image"
+            :src="
+              requireUrl('project/moke-20211219181327.png')
+            "
             :alt="cardData?.title"
           />
         </div>
@@ -73,11 +75,10 @@
 </template>
 
 <script setup lang="ts">
-import { ref, reactive, PropType, watch } from 'vue'
+import { ref, reactive, watch } from 'vue'
 import { renderIcon, renderLang } from '@/utils'
 import { icon } from '@/plugins'
 import { MacOsControlBtn } from '@/components/Tips/MacOsControlBtn'
-import { Chartype } from '../../index.d'
 
 const { HammerIcon } = icon.ionicons5
 const showRef = ref(false)
@@ -139,14 +140,12 @@ const closeHandle = () => {
 <style lang="scss" scoped>
 $padding: 30px;
 $contentHeight: calc(80vh);
-$imageHeight: calc(80vh - 110px);
 $contentWidth: calc(82vw);
 
 @include go('modal-box') {
   width: $contentWidth;
-  height: $contentHeight;
   .list-content {
-    margin-top: 20px;
+    margin-top: 28px;
     border-radius: $--border-radius-base;
     overflow: hidden;
     @include background-image('background-point');
@@ -161,9 +160,8 @@ $contentWidth: calc(82vw);
     }
     &-img {
       @extend .go-flex-center;
-      padding: 6px 0;
       img {
-        height: $imageHeight;
+        max-height: $contentHeight;
         min-height: 200px;
         max-width: 100%;
         @extend .go-border-radius;

src/views/project/items/index.d.ts

@@ -1,11 +1,8 @@
 export type Chartype = {
   id: number | string
   title: string // 标题
-  label?: string // 标签
-  time: string, // 时间
-  image: string, // 预览图地址
-  createId: string, // 创建者
-  release: boolean // false 未发布 | true 已发布
+  label: string // 标签
+  release: boolean // 0未发布 | 1已发布
 }
 
 export type ChartList = Chartype[]

src/views/project/items/index.vue

@@ -10,6 +10,6 @@ import { ProjectItemsList } from './components/ProjectItemsList'
 
 <style lang="scss" scoped>
 @include go(project-items) {
-  padding: 20px 20px;
+  padding: 30px 20px;
 }
 </style>

src/views/project/layout/components/ProjectLayoutCreate/components/CreateModal/index.vue

@@ -18,7 +18,7 @@
             :disabled="item.disabled"
             v-for="item in typeList"
             :key="item.key"
-            @click="btnHandle(item.key)"
+            @click="btnHandle"
           >
             <component :is="item.title"></component>
             <template #icon>
@@ -38,9 +38,7 @@
 import { ref, watch, shallowRef } from 'vue'
 import { icon } from '@/plugins'
 import { PageEnum, ChartEnum } from '@/enums/pageEnum'
-import { ResultEnum } from '@/enums/httpEnum'
 import { fetchPathByName, routerTurnByPath, renderLang, getUUID } from '@/utils'
-import { createProjectApi } from '@/api/path'
 
 const { FishIcon, CloseIcon } = icon.ionicons5
 const { StoreIcon, ObjectStorageIcon } = icon.carbon
@@ -72,8 +70,8 @@ const typeList = shallowRef([
   }
 ])
 
-watch(() => props.show, newValue => {
-  showRef.value = newValue
+watch(props, newValue => {
+  showRef.value = newValue.show
 })
 
 // 关闭对话框
@@ -82,32 +80,11 @@ const closeHandle = () => {
 }
 
 // 处理按钮点击
-const btnHandle = async (key: string) => {
-  switch (key) {
-    case ChartEnum.CHART_HOME_NAME:
-      try {
-        // 新增项目
-        const res = await createProjectApi({
-          // 项目名称
-          projectName: getUUID(),
-          // remarks
-          remarks: null,
-          // 图片地址
-          indexImage: null,
-        })
-        if(res && res.code === ResultEnum.SUCCESS) {
-          window['$message'].success(window['$t']('project.create_success'))
-
-          const { id } = res.data
-          const path = fetchPathByName(ChartEnum.CHART_HOME_NAME, 'href')
-          routerTurnByPath(path, [id], undefined, true)
-          closeHandle()
-        }
-      } catch (error) {
-        window['$message'].error(window['$t']('project.create_failure'))
-      }
-      break;
-  }
+const btnHandle = (key: string) => {
+  closeHandle()
+  const id = getUUID()
+  const path = fetchPathByName(ChartEnum.CHART_HOME_NAME, 'href')
+  routerTurnByPath(path, [id], undefined, true)
 }
 </script>
 <style lang="scss" scoped>