Merge branch 'dev' of https://gitee.com/MTrun/go-view into master-fetch

Merge pull request !26 from daidai/dev

.env

@@ -1,14 +1,8 @@
 # port
-VITE_DEV_PORT = '8001'
+VITE_DEV_PORT = '8080'
 
 # development path
-VITE_DEV_PATH = '/'
+VITE_DEV_PATH = 'http://1.117.240.165:8080'
 
 # production path
-VITE_PRO_PATH = '/'
-
-# spa-title
-VITE_GLOB_APP_TITLE = GoView
-
-# spa shortname
-VITE_GLOB_APP_SHORT_NAME = GoView
+VITE_PRO_PATH = 'http://1.117.240.165:8080'

.eslintrc.js

@@ -9,22 +9,16 @@ module.exports = {
     sourceType: 'module',
     ecmaFeatures: {
       jsx: true,
-      tsx: true
-    }
+      tsx: true,
+    },
   },
   env: {
     node: true,
-    // The Follow config only works with eslint-plugin-vue v8.0.0+
-    'vue/setup-compiler-macros': true
   },
-  extends: ['plugin:vue/vue3-essential', 'eslint:recommended'],
+  extends: ["plugin:vue/vue3-essential", "eslint:recommended"],
   rules: {
-    'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
-    'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
-    'no-unused-vars': 'off',
-    'vue/no-unused-vars': 'off',
-    'vue/multi-word-component-names': 'off',
-    'vue/valid-template-root': 'off',
-    'vue/no-mutating-props': 'off'
-  }
-}
+    "no-console": process.env.NODE_ENV === "production" ? "warn" : "off",
+    "no-debugger": process.env.NODE_ENV === "production" ? "warn" : "off",
+  },
+};
+

.gitignore

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

.workflow/branch-pipeline.yml

@@ -1,51 +0,0 @@
-version: '1.0'
-name: branch-pipeline
-displayName: BranchPipeline
-stages:
-  - stage: 
-    name: compile
-    displayName: 编译
-    steps:
-      - step: build@nodejs
-        name: build_nodejs
-        displayName: Nodejs 构建
-        # 支持8.16.2、10.17.0、12.16.1、14.16.0、15.12.0五个版本
-        nodeVersion: 14.16.0
-        # 构建命令：安装依赖 -> 清除上次打包产物残留 -> 执行构建 【请根据项目实际产出进行填写】
-        commands:
-          - npm install && rm -rf ./dist && npm run build
-        # 非必填字段，开启后表示将构建产物暂存，但不会上传到制品库中，7天后自动清除
-        artifacts:
-            # 构建产物名字，作为产物的唯一标识可向下传递，支持自定义，默认为BUILD_ARTIFACT。在下游可以通过${BUILD_ARTIFACT}方式引用来获取构建物地址
-          - name: BUILD_ARTIFACT
-            # 构建产物获取路径，是指代码编译完毕之后构建物的所在路径
-            path:
-              - ./dist
-      - step: publish@general_artifacts
-        name: publish_general_artifacts
-        displayName: 上传制品
-        # 上游构建任务定义的产物名，默认BUILD_ARTIFACT
-        dependArtifact: BUILD_ARTIFACT
-        # 上传到制品库时的制品命名，默认output
-        artifactName: output
-        dependsOn: build_nodejs
-  - stage: 
-    name: release
-    displayName: 发布
-    steps:
-      - step: publish@release_artifacts
-        name: publish_release_artifacts
-        displayName: '发布'
-        # 上游上传制品任务的产出
-        dependArtifact: output
-        # 发布制品版本号
-        version: '1.0.0.0'
-        # 是否开启版本号自增，默认开启
-        autoIncrement: true
-triggers:
-  push:
-    branches:
-      exclude:
-        - master
-      include:
-        - .*

.workflow/master-pipeline.yml

@@ -1,49 +0,0 @@
-version: '1.0'
-name: master-pipeline
-displayName: MasterPipeline
-stages:
-  - stage: 
-    name: compile
-    displayName: 编译
-    steps:
-      - step: build@nodejs
-        name: build_nodejs
-        displayName: Nodejs 构建
-        # 支持8.16.2、10.17.0、12.16.1、14.16.0、15.12.0五个版本
-        nodeVersion: 14.16.0
-        # 构建命令：安装依赖 -> 清除上次打包产物残留 -> 执行构建 【请根据项目实际产出进行填写】
-        commands:
-          - npm install && rm -rf ./dist && npm run build
-        # 非必填字段，开启后表示将构建产物暂存，但不会上传到制品库中，7天后自动清除
-        artifacts:
-            # 构建产物名字，作为产物的唯一标识可向下传递，支持自定义，默认为BUILD_ARTIFACT。在下游可以通过${BUILD_ARTIFACT}方式引用来获取构建物地址
-          - name: BUILD_ARTIFACT
-            # 构建产物获取路径，是指代码编译完毕之后构建物的所在路径
-            path:
-              - ./dist
-      - step: publish@general_artifacts
-        name: publish_general_artifacts
-        displayName: 上传制品
-        # 上游构建任务定义的产物名，默认BUILD_ARTIFACT
-        dependArtifact: BUILD_ARTIFACT
-        # 上传到制品库时的制品命名，默认output
-        artifactName: output
-        dependsOn: build_nodejs
-  - stage: 
-    name: release
-    displayName: 发布
-    steps:
-      - step: publish@release_artifacts
-        name: publish_release_artifacts
-        displayName: '发布'
-        # 上游上传制品任务的产出
-        dependArtifact: output
-        # 发布制品版本号
-        version: '1.0.0.0'
-        # 是否开启版本号自增，默认开启
-        autoIncrement: true
-triggers:
-  push:
-    branches:
-      include:
-        - master

.workflow/pr-pipeline.yml

@@ -1,36 +0,0 @@
-version: '1.0'
-name: pr-pipeline
-displayName: PRPipeline
-stages:
-  - stage: 
-    name: compile
-    displayName: 编译
-    steps:
-      - step: build@nodejs
-        name: build_nodejs
-        displayName: Nodejs 构建
-        # 支持8.16.2、10.17.0、12.16.1、14.16.0、15.12.0五个版本
-        nodeVersion: 14.16.0
-        # 构建命令：安装依赖 -> 清除上次打包产物残留 -> 执行构建 【请根据项目实际产出进行填写】
-        commands:
-          - npm install && rm -rf ./dist && npm run build
-        # 非必填字段，开启后表示将构建产物暂存，但不会上传到制品库中，7天后自动清除
-        artifacts:
-            # 构建产物名字，作为产物的唯一标识可向下传递，支持自定义，默认为BUILD_ARTIFACT。在下游可以通过${BUILD_ARTIFACT}方式引用来获取构建物地址
-          - name: BUILD_ARTIFACT
-            # 构建产物获取路径，是指代码编译完毕之后构建物的所在路径
-            path:
-              - ./dist
-      - step: publish@general_artifacts
-        name: publish_general_artifacts
-        displayName: 上传制品
-        # 上游构建任务定义的产物名，默认BUILD_ARTIFACT
-        dependArtifact: BUILD_ARTIFACT
-        # 上传到制品库时的制品命名，默认output
-        artifactName: output
-        dependsOn: build_nodejs
-triggers:
-  pr:
-    branches:
-      include:
-        - master

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021-present GoView
+Copyright (c) 2021-present Naive Ui Admin
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

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

build/constant.ts

@@ -1,4 +1,3 @@
-import path from 'path'
 export const OUTPUT_DIR = 'dist'
 
 // monaco-editor 路径
@@ -7,7 +6,7 @@ export const prefix = `monaco-editor/esm/vs`
 // chunk 警告大小
 export const chunkSizeWarningLimit = 2000
 
-// 禁用 brotliSize 压缩大小报告
+// 禁用 brotli 压缩大小报告
 export const brotliSize = false
 
 // 分包
@@ -15,12 +14,7 @@ export const rollupOptions = {
   output: {
     chunkFileNames: 'static/js/[name]-[hash].js',
     entryFileNames: 'static/js/[name]-[hash].js',
-    assetFileNames: (chunkInfo) => {
-      if(['.png', '.jpg', '.jpeg'].includes(path.extname(chunkInfo.name))) {
-        return `static/[ext]/[name].[ext]`
-      }
-      return `static/[ext]/[name]-[hash].[ext]`
-    },
+    assetFileNames: 'static/[ext]/[name]-[hash].[ext]',
     manualChunks: {
       jsonWorker: [`${prefix}/language/json/json.worker`],
       cssWorker: [`${prefix}/language/css/css.worker`],

build/getConfigFileName.ts

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

index.css

@@ -83,3 +83,24 @@
     opacity: 1;
   }
 }
+
+/* 小屏处理 0~1000*/
+.mobile-terminal {
+  display: none;
+}
+@media (max-width: 1000px) {
+  #app {
+    display: none;
+  }
+  .mobile-terminal {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 100vw;
+    height: 100vh;
+    text-align: center;
+    font-size: 24px;
+    font-weight: 200;
+    background-image: linear-gradient(to top, #fff1eb 0%, #ace0f9 100%);
+  }
+}

index.html

@@ -7,8 +7,10 @@
     <meta name="description" content="GoView 是高效、高性能的拖拽式低代码数据可视化开发平台，将页面元素封装为基础组件，无需编写代码即可完成业务需求。">
     <meta name="keywords" content="GoView，goview，低代码，可视化">
     <meta name="author" content="奔跑的面条，面条">
-    <meta name="viewport" content="width=device-width,initial-scale=1.0,minimum-scale=1,maximum-scale=1,user-scalable=0">
-    <meta name="viewport" content="width=device-width,initial-scale=1.0,user-scalable=yes" media="(min-width: 769px)">
+    <meta
+      name="viewport"
+      content="width=device-width,initial-scale=1.0,minimum-scale=1.0,maximum-scale=1.0,user-scalable=0"
+    />
     <link rel="icon" href="./favicon.ico" />
     <title>GoView</title>
     <link rel="stylesheet" href="./index.css" />
@@ -22,6 +24,9 @@
         </div>
       </div>
     </div>
+    <div class="mobile-terminal">
+      <p>请使用 Web 端进行查看</p>
+    </div>
     <script type="module" src="/src/main.ts"></script>
   </body>
 </html>

package.json

@@ -1,51 +1,32 @@
 {
   "name": "go-view",
-  "version": "1.1.11",
-  "engines": {
-    "node": ">=16.14"
-  },
+  "version": "2.0.4",
   "scripts": {
     "dev": "vite --host",
-    "build": "vite build",
+    "build": "vue-tsc --noEmit && vite build",
     "preview": "vite preview",
     "new": "plop --plopfile ./plop/plopfile.js",
-    "postinstall": "husky install",
-    "lint": "eslint --ext .js,.jsx,.ts,.tsx,.vue src",
-    "lint:fix": "eslint --ext .js,.jsx,.ts,.tsx,.vue src --fix"
+    "postinstall": "husky install"
   },
   "dependencies": {
-    "@amap/amap-jsapi-loader": "^1.0.1",
-    "@amap/amap-jsapi-types": "^0.0.8",
-    "@iconify/json": "^2.2.158",
     "@types/color": "^3.0.3",
     "@types/crypto-js": "^4.1.1",
     "@types/keymaster": "^1.6.30",
-    "@types/lodash": "^4.14.184",
-    "@visactor/vchart": "^2.0.0",
-    "@visactor/vchart-theme": "^1.12.2",
     "animate.css": "^4.1.1",
-    "axios": "^1.4.0",
+    "axios": "^0.27.2",
     "color": "^4.2.3",
     "crypto-js": "^4.1.1",
-    "dayjs": "^1.11.7",
-    "dom-helpers": "^5.2.1",
     "echarts-liquidfill": "^3.1.0",
-    "echarts-stat": "^1.2.0",
-    "echarts-wordcloud": "^2.0.0",
-    "gsap": "^3.11.3",
     "highlight.js": "^11.5.0",
     "html2canvas": "^1.4.1",
-    "iconify-icon": "^1.0.8",
     "keymaster": "^1.6.2",
-    "mitt": "^3.0.0",
     "monaco-editor": "^0.33.0",
-    "naive-ui": "2.40.3",
+    "naive-ui": "2.30.3",
     "pinia": "^2.0.13",
     "screenfull": "^6.0.1",
-    "three": "^0.145.0",
-    "vue": "^3.5.13",
+    "vue": "^3.2.31",
     "vue-demi": "^0.13.1",
-    "vue-i18n": "9.2.2",
+    "vue-i18n": "9.1.10",
     "vue-router": "4.0.12",
     "vue3-lazyload": "^0.2.5-beta",
     "vue3-sketch-ruler": "^1.3.3",
@@ -55,13 +36,12 @@
     "@commitlint/cli": "^17.0.2",
     "@commitlint/config-conventional": "^17.0.2",
     "@types/node": "^16.11.26",
-    "@types/three": "^0.144.0",
     "@typescript-eslint/eslint-plugin": "^5.18.0",
     "@typescript-eslint/parser": "^5.18.0",
     "@vicons/carbon": "^0.12.0",
     "@vicons/ionicons5": "~0.11.0",
-    "@vitejs/plugin-vue": "^4.2.3",
-    "@vitejs/plugin-vue-jsx": "^3.0.1",
+    "@vitejs/plugin-vue": "^1.10.2",
+    "@vitejs/plugin-vue-jsx": "^1.3.9",
     "@vue/compiler-sfc": "^3.2.31",
     "@vueuse/core": "^7.7.1",
     "commitlint": "^17.0.2",
@@ -77,10 +57,10 @@
     "mockjs": "^1.1.0",
     "plop": "^3.0.5",
     "prettier": "^2.6.2",
-    "sass": "1.49.11",
+    "sass": "^1.49.11",
     "sass-loader": "^12.6.0",
-    "typescript": "4.6.3",
-    "vite": "4.3.6",
+    "typescript": "^4.6.3",
+    "vite": "2.9.5",
     "vite-plugin-compression": "^0.5.1",
     "vite-plugin-importer": "^0.2.5",
     "vite-plugin-mock": "^2.9.6",

src/App.vue

@@ -1,9 +1,9 @@
 <template>
   <n-config-provider
+    :locale="zhCN"
     :theme="darkTheme"
     :hljs="hljsTheme"
-    :locale="locale"
-    :date-locale="dateLocale"
+    :date-locale="dateZhCN"
     :theme-overrides="overridesTheme"
   >
     <go-app-provider>
@@ -14,10 +14,11 @@
 </template>
 
 <script lang="ts" setup>
-import { NConfigProvider } from 'naive-ui'
+import { zhCN, dateZhCN, NConfigProvider } from 'naive-ui'
 import { GoAppProvider } from '@/components/GoAppProvider'
 import { I18n } from '@/components/I18n'
-import { useDarkThemeHook, useThemeOverridesHook, useCode, useLang } from '@/hooks'
+
+import { useSystemInit, useDarkThemeHook, useThemeOverridesHook, useCode } from '@/hooks'
 
 // 暗黑主题
 const darkTheme = useDarkThemeHook()
@@ -28,7 +29,6 @@ const overridesTheme = useThemeOverridesHook()
 // 代码主题
 const hljsTheme = useCode()
 
-// 全局语言
-const { locale, dateLocale } = useLang()
-//测试提交
+// 系统全局数据初始化
+useSystemInit()
 </script>

src/api/axios.config.ts

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

src/api/axios.ts

@@ -1,19 +1,37 @@
-import axios, { AxiosResponse, InternalAxiosRequestConfig, AxiosError } from 'axios'
-import { ResultEnum } from "@/enums/httpEnum"
-import { ErrorPageNameMap } from "@/enums/pageEnum"
-import { redirectErrorPage } from '@/utils'
+import axios, { AxiosResponse, AxiosRequestConfig } from 'axios'
+import { ResultEnum, RequestHttpHeaderEnum } 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, httpErrorHandle } from '@/utils'
+import { fetchAllowList } from './axios.config'
+import includes from 'lodash/includes'
 
 const axiosInstance = axios.create({
-  baseURL: import.meta.env.DEV ? import.meta.env.VITE_DEV_PATH : import.meta.env.VITE_PRO_PATH,
+  baseURL: `${import.meta.env.PROD ? import.meta.env.VITE_PRO_PATH : ''}${axiosPre}`,
   timeout: ResultEnum.TIMEOUT,
 })
 
 axiosInstance.interceptors.request.use(
-  (config: InternalAxiosRequestConfig) => {
+  (config: AxiosRequestConfig) => {
+    // 白名单校验
+    if (includes(fetchAllowList, config.url)) return config
+    // 获取 token
+    const info = getLocalStorage(StorageEnum.GO_SYSTEM_STORE)
+    // 重新登录
+    if (!info) {
+      routerTurnByName(PageEnum.BASE_LOGIN_NAME)
+      return config
+    } 
+    config.headers = {
+      ...config.headers,
+      [RequestHttpHeaderEnum.TOKEN]: info[SystemStoreEnum.USER_INFO][SystemStoreUserInfoEnum.USER_TOKEN] || ''
+    }
     return config
   },
-  (error: AxiosError) => {
-    Promise.reject(error)
+  (err: AxiosRequestConfig) => {
+    Promise.reject(err)
   }
 )
 
@@ -21,13 +39,31 @@ axiosInstance.interceptors.request.use(
 axiosInstance.interceptors.response.use(
   (res: AxiosResponse) => {
     const { code } = res.data as { code: number }
-    if (code === undefined || code === null) return Promise.resolve(res.data)
-    if (code === ResultEnum.DATA_SUCCESS) return Promise.resolve(res.data)
-    // 重定向
-    if (ErrorPageNameMap.get(code)) redirectErrorPage(code)
+
+    // 成功
+    if (code === ResultEnum.SUCCESS) {
+      return Promise.resolve(res.data)
+    }
+
+    // 登录过期
+    if (code === ResultEnum.TOKEN_OVERDUE) {
+      window['$message'].error(window['$t']('http.token_overdue_message'))
+      routerTurnByName(PageEnum.BASE_LOGIN_NAME)
+      return Promise.resolve(res.data)
+    }
+
+    // 固定错误码重定向
+    if (ErrorPageNameMap.get(code)) {
+      redirectErrorPage(code)
+      return Promise.resolve(res.data)
+    }
+    
+    // 提示错误
+    window['$message'].error(window['$t']((res.data as any).msg))
     return Promise.resolve(res.data)
   },
   (err: AxiosResponse) => {
+    httpErrorHandle()
     Promise.reject(err)
   }
 )

src/api/http.ts

@@ -13,7 +13,7 @@ export const get = (url: string, params?: object) => {
   return axiosInstance({
     url: url,
     method: RequestHttpEnum.GET,
-    params: params
+    params: params,
   })
 }
 
@@ -80,32 +80,6 @@ export const http = (type?: RequestHttpEnum) => {
       return get
   }
 }
-const prefix = 'javascript:'
-// 对输入字符进行转义处理
-export const translateStr = (target: string | object) => {
-  if (typeof target === 'string') {
-    if (target.startsWith(prefix)) {
-      const funcStr = target.split(prefix)[1]
-      let result;
-      try {
-        result = new Function(`${funcStr}`)()
-      } catch (error) {
-        console.log(error)
-        window['$message'].error('js内容解析有误！')
-      }
-      return result
-    } else {
-      return target
-    }
-  }
-  for (const key in target) {
-    if (Object.prototype.hasOwnProperty.call(target, key)) {
-      const subTarget = (target as any)[key];
-      (target as any)[key] = translateStr(subTarget)
-    }
-  }
-  return target
-}
 
 /**
  * * 自定义请求
@@ -113,9 +87,10 @@ export const translateStr = (target: string | object) => {
  * @param globalParams 全局参数
  */
 export const customizeHttp = (targetParams: RequestConfigType, globalParams: RequestGlobalConfigType) => {
-  if (!targetParams || !globalParams) {
+  if(!targetParams || !globalParams) {
     return
   }
+
   // 全局
   const {
     // 全局请求源地址
@@ -150,19 +125,18 @@ export const customizeHttp = (targetParams: RequestConfigType, globalParams: Req
   }
 
   // 处理头部
-  let headers: RequestParamsObjType = {
+  const headers: RequestParamsObjType = {
     ...globalRequestParams.Header,
-    ...targetRequestParams.Header
+    ...targetRequestParams.Header,
   }
-  headers = translateStr(headers)
 
   // data 参数
   let data: RequestParamsObjType | FormData | string = {}
   // params 参数
-  let params: RequestParamsObjType = { ...targetRequestParams.Params }
-  params = translateStr(params)
+  let params: RequestParamsObjType = targetRequestParams.Params
   // form 类型处理
   let formData: FormData = new FormData()
+  formData.set('default', 'defaultData')
   // 类型处理
 
   switch (requestParamsBodyType) {
@@ -171,38 +145,34 @@ export const customizeHttp = (targetParams: RequestConfigType, globalParams: Req
 
     case RequestBodyEnum.JSON:
       headers['Content-Type'] = ContentTypeEnum.JSON
-      //json对象也能使用'javasctipt:'来动态拼接参数
-      data = translateStr(targetRequestParams.Body['json'])
-      if(typeof data === 'string')  data = JSON.parse(data)
+      data = JSON.parse(targetRequestParams.Body['json'])
       // json 赋值给 data
       break
 
     case RequestBodyEnum.XML:
       headers['Content-Type'] = ContentTypeEnum.XML
       // xml 字符串赋值给 data
-      data = translateStr(targetRequestParams.Body['xml'])
+      data = targetRequestParams.Body['xml']
       break
 
-    case RequestBodyEnum.X_WWW_FORM_URLENCODED: {
+    case RequestBodyEnum.X_WWW_FORM_URLENCODED:
       headers['Content-Type'] = ContentTypeEnum.FORM_URLENCODED
       const bodyFormData = targetRequestParams.Body['x-www-form-urlencoded']
-      for (const i in bodyFormData) formData.set(i, translateStr(bodyFormData[i]))
+      for (const i in bodyFormData) formData.set(i, bodyFormData[i])
       // FormData 赋值给 data
       data = formData
       break
-    }
 
-    case RequestBodyEnum.FORM_DATA: {
+    case RequestBodyEnum.FORM_DATA:
       headers['Content-Type'] = ContentTypeEnum.FORM_DATA
       const bodyFormUrlencoded = targetRequestParams.Body['form-data']
       for (const i in bodyFormUrlencoded) {
-        formData.set(i, translateStr(bodyFormUrlencoded[i]))
+        formData.set(i, bodyFormUrlencoded[i])
       }
       // FormData 赋值给 data
       data = formData
       break
   }
-  }
 
   // sql 处理
   if (requestContentType === RequestContentTypeEnum.SQL) {
@@ -210,17 +180,11 @@ export const customizeHttp = (targetParams: RequestConfigType, globalParams: Req
     data = requestSQLContent
   }
 
-  try {
-    const url =  (new Function("return `" + `${requestOriginUrl}${requestUrl}`.trim() + "`"))();
   return axiosInstance({
-        url,
+    url: `${requestOriginUrl}${requestUrl}`,
     method: requestHttpType,
     data,
     params,
     headers
   })
-  } catch (error) {
-    console.log(error)
-    window['$message'].error('URL地址格式有误！')
-  }
 }

src/api/mock/graph.json

@@ -1,100 +0,0 @@
-{
-    "nodes": [
-      {
-        "id": "0",
-        "name": "Myriel",
-        "symbolSize": "@integer(0, 50)",
-        "x": -266.82776,
-        "y": 299.6904,
-        "value": "@integer(0, 50)",
-        "category": 3
-      },
-      {
-        "id": "1",
-        "name": "Napoleon",
-        "symbolSize": "@integer(0, 50)",
-        "x": -418.08344,
-        "y": 446.8853,
-        "value": "@integer(0, 50)",
-        "category": 5
-      },
-      {
-        "id": "2",
-        "name": "MlleBaptistine",
-        "symbolSize": "@integer(0, 50)",
-        "x": -212.76357,
-        "y": 245.29176,
-        "value": "@integer(0, 50)",
-        "category": 1
-      },
-      {
-        "id": "3",
-        "name": "MmeMagloire",
-        "symbolSize": "@integer(0, 50)",
-        "x": -242.82404,
-        "y": 235.26283,
-        "value": "@integer(0, 50)",
-        "category": 1
-      },
-      {
-        "id": "4",
-        "name": "CountessDeLo",
-        "symbolSize": "@integer(0, 50)",
-        "x": -379.30386,
-        "y": 429.06424,
-        "value": "@integer(0, 50)",
-        "category": 0
-      }
-    ],
-    "links": [
-      {
-        "source": "1",
-        "target": "@integer(2, 4)"
-      },
-      {
-        "source": "2",
-        "target": "@integer(3, 4)"
-      },
-      {
-        "source": "3",
-        "target": "@integer(0, 2)"
-      },
-      {
-        "source": "3",
-        "target": "@integer(0, 1)"
-      },
-      {
-        "source": "4",
-        "target": "@integer(0, 3)"
-      }
-    ],
-    "categories": [
-      {
-        "name": "A"
-      },
-      {
-        "name": "B"
-      },
-      {
-        "name": "C"
-      },
-      {
-        "name": "D"
-      },
-      {
-        "name": "E"
-      },
-      {
-        "name": "F"
-      },
-      {
-        "name": "G"
-      },
-      {
-        "name": "H"
-      },
-      {
-        "name": "I"
-      }
-    ]
-  }

src/api/mock/heatMapData.json

@@ -1,199 +0,0 @@
-{
-  "xAxis": [
-    "12a",
-    "1a",
-    "2a",
-    "3a",
-    "4a",
-    "5a",
-    "6a",
-    "7a",
-    "8a",
-    "9a",
-    "10a",
-    "11a",
-    "12p",
-    "1p",
-    "2p",
-    "3p",
-    "4p",
-    "5p",
-    "6p",
-    "7p",
-    "8p",
-    "9p",
-    "10p",
-    "11p"
-  ],
-  "yAxis": ["Saturday", "Friday", "Thursday", "Wednesday", "Tuesday", "Monday", "Sunday"],
-  "seriesData": [
-    [0, 0, "@integer(0, 10)"],
-    [1, 0, "@integer(0, 10)"],
-    [2, 0, "-"],
-    [3, 0, "-"],
-    [4, 0, "-"],
-    [5, 0, "-"],
-    [6, 0, "-"],
-    [7, 0, "-"],
-    [8, 0, "-"],
-    [9, 0, "-"],
-    [10, 0, "-"],
-    [11, 0, "@integer(0, 10)"],
-    [12, 0, "@integer(0, 10)"],
-    [13, 0, "@integer(0, 10)"],
-    [14, 0, "@integer(0, 10)"],
-    [15, 0, "@integer(0, 10)"],
-    [16, 0, "@integer(0, 10)"],
-    [17, 0, "@integer(0, 10)"],
-    [18, 0, "@integer(0, 10)"],
-    [19, 0, "@integer(0, 10)"],
-    [20, 0, "@integer(0, 10)"],
-    [21, 0, "@integer(0, 10)"],
-    [22, 0, "@integer(0, 10)"],
-    [23, 0, "@integer(0, 10)"],
-    [0, 1, 7],
-    [1, 1, "-"],
-    [2, 1, "-"],
-    [3, 1, "-"],
-    [4, 1, "-"],
-    [5, 1, "-"],
-    [6, 1, "-"],
-    [7, 1, "-"],
-    [8, 1, "-"],
-    [9, 1, "-"],
-    [10, 1, "@integer(0, 10)"],
-    [11, 1, "@integer(0, 10)"],
-    [12, 1, "@integer(0, 10)"],
-    [13, 1, "@integer(0, 10)"],
-    [14, 1, "@integer(0, 10)"],
-    [15, 1, "@integer(0, 10)"],
-    [16, 1, "@integer(0, 10)"],
-    [17, 1, "@integer(0, 10)"],
-    [18, 1, "@integer(0, 10)"],
-    [19, 1, "@integer(0, 10)"],
-    [20, 1, "@integer(0, 10)"],
-    [21, 1, "@integer(0, 10)"],
-    [22, 1, "@integer(0, 10)"],
-    [23, 1, "@integer(0, 10)"],
-    [0, 2, 1],
-    [1, 2, 1],
-    [2, 2, "-"],
-    [3, 2, "-"],
-    [4, 2, "-"],
-    [5, 2, "-"],
-    [6, 2, "-"],
-    [7, 2, "-"],
-    [8, 2, "-"],
-    [9, 2, "-"],
-    [10, 2, "@integer(0, 10)"],
-    [11, 2, "@integer(0, 10)"],
-    [12, 2, "@integer(0, 10)"],
-    [13, 2, "@integer(0, 10)"],
-    [14, 2, "@integer(0, 10)"],
-    [15, 2, "@integer(0, 10)"],
-    [16, 2, "@integer(0, 10)"],
-    [17, 2, "@integer(0, 10)"],
-    [18, 2, "@integer(0, 10)"],
-    [19, 2, "@integer(0, 10)"],
-    [20, 2, "@integer(0, 10)"],
-    [21, 2, "@integer(0, 10)"],
-    [22, 2, "@integer(0, 10)"],
-    [23, 2, "@integer(0, 10)"],
-    [0, 3, 7],
-    [1, 3, 3],
-    [2, 3, "-"],
-    [3, 3, "-"],
-    [4, 3, "-"],
-    [5, 3, "-"],
-    [6, 3, "-"],
-    [7, 3, "-"],
-    [8, 3, 1],
-    [9, 3, "-"],
-    [10, 3, "@integer(0, 10)"],
-    [11, 3, "@integer(0, 10)"],
-    [12, 3, "@integer(0, 10)"],
-    [13, 3, "@integer(0, 10)"],
-    [14, 3, "@integer(0, 10)"],
-    [15, 3, "@integer(0, 10)"],
-    [16, 3, "@integer(0, 10)"],
-    [17, 3, "@integer(0, 10)"],
-    [18, 3, "@integer(0, 10)"],
-    [19, 3, "@integer(0, 10)"],
-    [20, 3, "@integer(0, 10)"],
-    [21, 3, "@integer(0, 10)"],
-    [22, 3, "@integer(0, 10)"],
-    [23, 3, "@integer(0, 10)"],
-    [0, 4, "@integer(0, 10)"],
-    [1, 4, "@integer(0, 10)"],
-    [2, 4, "-"],
-    [3, 4, "-"],
-    [4, 4, "-"],
-    [5, 4, "@integer(0, 10)"],
-    [6, 4, "-"],
-    [7, 4, "-"],
-    [8, 4, "-"],
-    [9, 4, "@integer(0, 10)"],
-    [10, 4, "@integer(0, 10)"],
-    [11, 4, "@integer(0, 10)"],
-    [12, 4, "@integer(0, 10)"],
-    [13, 4, "@integer(0, 10)"],
-    [14, 4, "@integer(0, 10)"],
-    [15, 4, "@integer(0, 10)"],
-    [16, 4, "@integer(0, 10)"],
-    [17, 4, "@integer(0, 10)"],
-    [18, 4, "@integer(0, 10)"],
-    [19, 4, "@integer(0, 10)"],
-    [20, 4, "@integer(0, 10)"],
-    [21, 4, "@integer(0, 10)"],
-    [22, 4, "@integer(0, 10)"],
-    [23, 4, "-"],
-    [0, 5, "@integer(0, 10)"],
-    [1, 5, "@integer(0, 10)"],
-    [2, 5, "-"],
-    [3, 5, "@integer(0, 10)"],
-    [4, 5, "-"],
-    [5, 5, "-"],
-    [6, 5, "-"],
-    [7, 5, "-"],
-    [8, 5, "@integer(0, 10)"],
-    [9, 5, "-"],
-    [10, 5, "@integer(0, 10)"],
-    [11, 5, "@integer(0, 10)"],
-    [12, 5, "@integer(0, 10)"],
-    [13, 5, "@integer(0, 10)"],
-    [14, 5, "@integer(0, 10)"],
-    [15, 5, "@integer(0, 10)"],
-    [16, 5, "@integer(0, 10)"],
-    [17, 5, "@integer(0, 10)"],
-    [18, 5, "-"],
-    [19, 5, "@integer(0, 10)"],
-    [20, 5, "@integer(0, 10)"],
-    [21, 5, "@integer(0, 10)"],
-    [22, 5, "@integer(0, 10)"],
-    [23, 5, "-"],
-    [0, 6, "@integer(0, 10)"],
-    [1, 6, "-"],
-    [2, 6, "-"],
-    [3, 6, "-"],
-    [4, 6, "-"],
-    [5, 6, "-"],
-    [6, 6, "-"],
-    [7, 6, "-"],
-    [8, 6, "-"],
-    [9, 6, "-"],
-    [10, 6, "@integer(0, 10)"],
-    [11, 6, "-"],
-    [12, 6, "@integer(0, 10)"],
-    [13, 6, "@integer(0, 10)"],
-    [14, 6, "@integer(0, 10)"],
-    [15, 6, "@integer(0, 10)"],
-    [16, 6, "-"],
-    [17, 6, "-"],
-    [18, 6, "-"],
-    [19, 6, "-"],
-    [20, 6, "@integer(0, 10)"],
-    [21, 6, "@integer(0, 10)"],
-    [22, 6, "@integer(0, 10)"],
-    [23, 6, "@integer(0, 10)"]
-  ]
-}

src/api/mock/index.ts

@@ -1,29 +1,15 @@
 import test from './test.mock'
-import vchart from './vchart.mock'
 import { MockMethod } from 'vite-plugin-mock'
 import { RequestHttpEnum } from '@/enums/httpEnum'
 
 // 单个X数据
 export const chartDataUrl = '/mock/chartData'
-export const chartSingleDataUrl = '/mock/chartSingleData'
 export const numberFloatUrl = '/mock/number/float'
 export const numberIntUrl = '/mock/number/int'
 export const textUrl = '/mock/text'
 export const imageUrl = '/mock/image'
 export const rankListUrl = '/mock/rankList'
 export const scrollBoardUrl = '/mock/scrollBoard'
-export const radarUrl = '/mock/radarData'
-export const heatMapUrl = '/mock/heatMapData'
-export const scatterBasicUrl = '/mock/scatterBasic'
-export const mapUrl = '/mock/map'
-export const capsuleUrl = '/mock/capsule'
-export const wordCloudUrl = '/mock/wordCloud'
-export const treemapUrl = '/mock/treemap'
-export const threeEarth01Url = '/mock/threeEarth01Data'
-export const sankeyUrl = '/mock/sankey'
-export const graphUrl = '/mock/graphData'
-
-export const vchartBarDataUrl = '/mock/vchart/barDataUrl'
 
 const mockObject: MockMethod[] = [
   {
@@ -33,11 +19,6 @@ const mockObject: MockMethod[] = [
     method: RequestHttpEnum.GET,
     response: () => test.fetchMockData
   },
-  {
-    url: chartSingleDataUrl,
-    method: RequestHttpEnum.GET,
-    response: () => test.fetchMockSingleData
-  },
   {
     url: numberFloatUrl,
     method: RequestHttpEnum.GET,
@@ -67,61 +48,6 @@ const mockObject: MockMethod[] = [
     url: scrollBoardUrl,
     method: RequestHttpEnum.GET,
     response: () => test.fetchScrollBoard
-  },
-  {
-    url: radarUrl,
-    method: RequestHttpEnum.GET,
-    response: () => test.fetchRadar
-  },
-  {
-    url: heatMapUrl,
-    method: RequestHttpEnum.GET,
-    response: () => test.fetchHeatmap
-  },
-  {
-    url: scatterBasicUrl,
-    method: RequestHttpEnum.GET,
-    response: () => test.fetchScatterBasic
-  },
-  {
-    url: mapUrl,
-    method: RequestHttpEnum.GET,
-    response: () => test.fetchMap
-  },
-  {
-    url: capsuleUrl,
-    method: RequestHttpEnum.GET,
-    response: () => test.fetchCapsule
-  },
-  {
-    url: wordCloudUrl,
-    method: RequestHttpEnum.GET,
-    response: () => test.fetchWordCloud
-  },
-  {
-    url: treemapUrl,
-    method: RequestHttpEnum.GET,
-    response: () => test.fetchTreemap
-  },
-  {
-    url: threeEarth01Url,
-    method: RequestHttpEnum.GET,
-    response: () => test.threeEarth01Data
-  },
-  {
-    url: sankeyUrl,
-    method: RequestHttpEnum.GET,
-    response: () => test.fetchSankey
-  },
-  {
-    url: graphUrl,
-    method: RequestHttpEnum.GET,
-    response: () => test.graphData
-  },
-  {
-    url: vchartBarDataUrl,
-    method: RequestHttpEnum.GET,
-    response: () => vchart.bar
   }
 ]
 

src/api/mock/map.json

@@ -1,9 +0,0 @@
-{
-  "markers|50": [
-    {
-      "name": "某某地市",
-      "value": "@integer(2, 20)",
-      "position": ["@float(115, 117, 1, 6)", "@float(38, 40, 1, 6)"]
-    }
-  ]
-}

src/api/mock/sankey.json

@@ -1,86 +0,0 @@
-{
-  "label": [
-    {
-      "name": "a"
-    },
-    {
-      "name": "b"
-    },
-    {
-      "name": "a1"
-    },
-    {
-      "name": "a2"
-    },
-    {
-      "name": "b1"
-    },
-    {
-      "name": "b2"
-    }
-  ],
-  "links": [
-    {
-      "source": "a",
-      "target": "a1",
-      "value": "@integer(0, 10)"
-    },
-    {
-      "source": "a",
-      "target": "a2",
-      "value": "@integer(0, 10)"
-    },
-    {
-      "source": "b",
-      "target": "b1",
-      "value": "@integer(0, 10)"
-    },
-    {
-      "source": "a",
-      "target": "b1",
-      "value": "@integer(0, 10)"
-    },
-    {
-      "source": "b1",
-      "target": "a1",
-      "value": "@integer(0, 10)"
-    },
-    {
-      "source": "b1",
-      "target": "b2",
-      "value": "@integer(0, 10)"
-    }
-  ],
-  "levels": [
-    {
-      "depth": 0,
-      "itemStyle": {
-        "color": "#decbe4"
-      },
-      "lineStyle": {
-        "color": "source",
-        "opacity": 0.9
-      }
-    },
-    {
-      "depth": 1,
-      "itemStyle": {
-        "color": "#b3cde3"
-      },
-      "lineStyle": {
-        "color": "source",
-        "opacity": 0.6
-      }
-    },
-    {
-      "depth": 2,
-      "itemStyle": {
-        "color": "#ccebc5"
-      },
-      "lineStyle": {
-        "color": "source",
-        "opacity": 0.6
-      }
-    }
-  ]
-}

src/api/mock/scatter.json

@@ -1,56 +0,0 @@
-[
-  {
-    "dimensions": ["data1"],
-    "source": [
-      [10.0, "@integer(0, 100)"],
-      [8.07, "@integer(0, 100)"],
-      [13.0, "@integer(0, 100)"],
-      [9.05, "@integer(0, 100)"],
-      [11.0, "@integer(0, 100)"],
-      [14.0, "@integer(0, 100)"],
-      [13.4, "@integer(0, 100)"],
-      [10.0, "@integer(0, 100)"],
-      [14.0, "@integer(0, 100)"],
-      [12.5, "@integer(0, 100)"],
-      [9.15, "@integer(0, 100)"],
-      [11.5, "@integer(0, 100)"],
-      [3.03, "@integer(0, 100)"],
-      [12.2, "@integer(0, 100)"],
-      [2.02, "@integer(0, 100)"],
-      [1.05, "@integer(0, 100)"],
-      [4.05, "@integer(0, 100)"],
-      [6.03, "@integer(0, 100)"],
-      [12.0, "@integer(0, 100)"],
-      [12.0, "@integer(0, 100)"],
-      [7.08, "@integer(0, 100)"],
-      [5.02, "@integer(0, 100)"]
-    ]
-  },
-  {
-    "dimensions": ["data2"],
-    "source": [
-      [10.0, "@integer(0, 70)"],
-      [8.07, "@integer(0, 70)"],
-      [13.0, "@integer(0, 70)"],
-      [9.05, "@integer(0, 70)"],
-      [11.0, "@integer(0, 70)"],
-      [14.0, "@integer(0, 70)"],
-      [13.4, "@integer(0, 70)"],
-      [10.0, "@integer(0, 70)"],
-      [14.0, "@integer(0, 70)"],
-      [12.5, "@integer(0, 70)"],
-      [9.15, "@integer(0, 70)"],
-      [11.5, "@integer(0, 70)"],
-      [3.03, "@integer(0, 70)"],
-      [12.2, "@integer(0, 70)"],
-      [2.02, "@integer(0, 70)"],
-      [1.05, "@integer(0, 70)"],
-      [4.05, "@integer(0, 70)"],
-      [6.03, "@integer(0, 70)"],
-      [12.0, "@integer(0, 70)"],
-      [12.0, "@integer(0, 70)"],
-      [7.08, "@integer(0, 70)"],
-      [5.02, "@integer(0, 70)"]
-    ]
-  }
-]

src/api/mock/test.mock.ts

@@ -1,51 +1,41 @@
-import heatmapJson from './heatMapData.json'
-import scatterJson from './scatter.json'
-import mapJson from './map.json'
-import tTreemapJson from './treemap.json'
-import sankeyJson from './sankey.json'
-import graphDataJson from './graph.json'
-
 export default {
-  // 单图表
-  fetchMockSingleData: {
-    code: 0,
-    status: 200,
-    msg: '请求成功',
-    data: {
-    dimensions: ['product', 'dataOne'],
-      'source|20': [
-        {
-          product: '@name',
-          'dataOne|0-900': 3
-        }
-      ]
-    }
-  },
-  // 胶囊图
-  fetchCapsule: {
-    code: 0,
-    status: 200,
-    msg: '请求成功',
-    data: {
-      dimensions: ['name', 'value'],
-      "source|2-5": [
-        { 'name|+1': ["厦门","福州","北京","上海","新疆","郑州","湖南","内蒙古"], 'value|0-40': 20 },
-      ]
-    }
-  },
   // 图表
   fetchMockData: {
     code: 0,
     status: 200,
     msg: '请求成功',
     data: {
-      dimensions: ['product', 'dataOne', 'dataTwo', 'dataThree'],
-      'source|20': [
+      dimensions: ['product', 'dataOne', 'dataTwo'],
+      source: [
         {
           product: '@name',
           'dataOne|100-900': 3,
-          'dataTwo|100-900': 3,
-          'dataThree|100-900': 3
+          'dataTwo|100-900': 3
+        },
+        {
+          product: '@name',
+          'dataOne|100-900': 3,
+          'dataTwo|100-900': 3
+        },
+        {
+          product: '@name',
+          'dataOne|100-900': 3,
+          'dataTwo|100-900': 3
+        },
+        {
+          product: '@name',
+          'dataOne|100-900': 3,
+          'dataTwo|100-900': 3
+        },
+        {
+          product: '@name',
+          'dataOne|100-900': 3,
+          'dataTwo|100-900': 3
+        },
+        {
+          product: '@name',
+          'dataOne|100-900': 3,
+          'dataTwo|100-900': 3
         }
       ]
     }
@@ -55,7 +45,21 @@ export default {
     code: 0,
     status: 200,
     msg: '请求成功',
-    'data|50': [{ name: '@name', 'value|100-900': 5 }]
+    data: [
+      { name: '@name', 'value|100-900': 5 },
+      { name: '@name', 'value|100-900': 5 },
+      { name: '@name', 'value|100-900': 5 },
+      { name: '@name', 'value|100-900': 5 },
+      { name: '@name', 'value|100-900': 5 },
+      { name: '@name', 'value|100-900': 5 },
+      { name: '@name', 'value|100-900': 5 },
+      { name: '@name', 'value|100-900': 5 },
+      { name: '@name', 'value|100-900': 5 },
+      { name: '@name', 'value|100-900': 5 },
+      { name: '@name', 'value|100-900': 5 },
+      { name: '@name', 'value|100-900': 5 },
+      { name: '@name', 'value|100-900': 5 }
+    ]
   },
   // 轮播表格
   fetchScrollBoard: {
@@ -75,165 +79,29 @@ export default {
       ['行10列1', '行10列2', '行10列3']
     ]
   },
-  // 获取数字-浮点型
+  // 获取数字
   fetchNumberFloat: {
     code: 0,
     status: 200,
     msg: '请求成功',
     data: '@float(0, 0.99, 1, 4)'
   },
-  // 获取数字-整型
   fetchNumberInt: {
     code: 0,
     status: 200,
     msg: '请求成功',
     data: '@integer(0, 100)'
   },
-  // 文字
   fetchText: {
     code: 0,
     status: 200,
     msg: '请求成功',
     data: '@paragraph(1, 10)'
   },
-  // 图片
   fetchImage: (num: number) => ({
     code: 0,
     status: 200,
     msg: '请求成功',
     data: `https://robohash.org/${num}`
-  }),
-  // 雷达
-  fetchRadar: {
-    code: 0,
-    status: 200,
-    msg: '请求成功',
-    data: {
-      radarIndicator: [
-        { name: '@name', max: 10000 },
-        { name: '@name', max: 10000 },
-        { name: '@name', max: 10000 },
-        { name: '@name', max: 10000 },
-        { name: '@name', max: 10000 },
-        { name: '@name', max: 10000 }
-      ],
-      seriesData: [
-        {
-          value: [
-            '@integer(0, 10000)',
-            '@integer(0, 10000)',
-            '@integer(0, 10000)',
-            '@integer(0, 10000)',
-            '@integer(0, 10000)',
-            '@integer(0, 10000)'
-          ],
-          name: 'data1'
-        },
-        {
-          value: [
-            '@integer(0, 10000)',
-            '@integer(0, 10000)',
-            '@integer(0, 10000)',
-            '@integer(0, 10000)',
-            '@integer(0, 10000)',
-            '@integer(0, 10000)'
-          ],
-          name: 'data2'
-        }
-      ]
-    }
-  },
-  // 热力图
-  fetchHeatmap: {
-    code: 0,
-    status: 200,
-    msg: '请求成功',
-    data: heatmapJson
-  },
-  // 散点图
-  fetchScatterBasic: {
-    code: 0,
-    status: 200,
-    msg: '请求成功',
-    data: scatterJson
-  },
-  // 中国地图
-  fetchMap: {
-    code: 0,
-    status: 200,
-    msg: '请求成功',
-    data: mapJson
-  },
-  // 词云
-  fetchWordCloud: {
-    code: 0,
-    status: 200,
-    msg: '请求成功',
-    data: [
-      {
-        name: '@name',
-        value: 8000,
-        textStyle: {
-          color: '#78fbb2'
-        },
-        emphasis: {
-          textStyle: {
-            color: 'red'
-          }
-        }
-      },
-      { name: '@name', value: '@integer(10, 8000)' },
-      { name: '@name', value: '@integer(10, 8000)' },
-      { name: '@name', value: '@integer(10, 8000)' },
-      { name: '@name', value: '@integer(10, 8000)' },
-      { name: '@name', value: '@integer(10, 8000)' },
-      { name: '@name', value: '@integer(10, 8000)' },
-      { name: '@name', value: '@integer(10, 8000)' },
-      { name: '@name', value: '@integer(10, 8000)' },
-      { name: '@name', value: '@integer(10, 8000)' },
-      { name: '@name', value: '@integer(10, 8000)' },
-      { name: '@name', value: '@integer(10, 8000)' },
-      { name: '@name', value: '@integer(10, 8000)' },
-      { name: '@name', value: '@integer(10, 8000)' },
-      { name: '@name', value: '@integer(10, 8000)' },
-      { name: '@name', value: '@integer(10, 8000)' },
-      { name: '@name', value: '@integer(10, 8000)' },
-      { name: '@name', value: '@integer(10, 8000)' },
-      { name: '@name', value: '@integer(10, 8000)' },
-      { name: '@name', value: '@integer(10, 8000)' }
-    ]
-  },
-  // 树图
-  fetchTreemap: {
-    code: 0,
-    status: 200,
-    msg: '请求成功',
-    data: tTreemapJson
-  },
-  // 三维地球
-  threeEarth01Data: {
-    code: 0,
-    status: 200,
-    msg: '请求成功',
-    data: [
-      {
-        startArray: { name: '@name', N: '@integer(10, 100)', E: '@integer(10, 100)' },
-        'endArray|10': [{ name: '@name', N: '@integer(10, 100)', E: '@integer(10, 100)' }]
-      }
-    ]
-  },
-  // 桑基图
-  fetchSankey: {
-    code: 0,
-    status: 200,
-    msg: '请求成功',
-    data: sankeyJson
-  },
-  // 关系图
-  graphData: {
-    code: 0,
-    status: 200,
-    msg: '请求成功',
-    data: graphDataJson
-  },
+  })
 }

src/api/mock/treemap.json

@@ -1,50 +0,0 @@
-[
-  {
-    "name": "@name",
-    "value": "@integer(0, 1000)",
-    "children": [
-      {
-        "name": "@name",
-        "value": "@integer(0, 500)"
-      },
-      {
-        "name": "@name",
-        "value": "@integer(0, 500)"
-      }
-    ]
-  },
-  {
-    "name": "@name",
-    "value": "@integer(0, 1000)",
-    "children": [
-      {
-        "name": "@name",
-        "value": "@integer(0, 00)"
-      },
-      {
-        "name": "@name",
-        "value": "@integer(0, 500)"
-      }
-    ]
-  },
-  {
-    "name": "@name",
-    "value": "@integer(0, 1000)",
-    "children": [
-      {
-        "name": "@name",
-        "value": "@integer(0, 1000)"
-      }
-    ]
-  },
-  {
-    "name": "@name",
-    "value": "@integer(0, 1000)",
-    "children": [
-      {
-        "name": "@name",
-        "value": "@integer(0, 1000)"
-      }
-    ]
-  }
-]

src/api/mock/vchart.mock.ts

@@ -1,10 +0,0 @@
-import bar from './vchart/bar.json'
-
-export default {
-  bar: {
-    code: 0,
-    status: 200,
-    msg: '请求成功',
-    data: bar
-  }
-}

src/api/mock/vchart/bar.json

@@ -1,16 +0,0 @@
-{
-  "values": [
-    { "type": "Nail polish", "year": "Africa", "value|100-900": 3 },
-    { "type": "Nail polish", "year": "EU", "value|100-900": 3 },
-    { "type": "Nail polish", "year": "China", "value|100-900": 3 },
-    { "type": "Nail polish", "year": "USA", "value|100-900": 3 },
-    { "type": "Eyebrow pencil", "year": "Africa", "value|100-900": 3 },
-    { "type": "Eyebrow pencil", "year": "EU", "value|100-900": 3 },
-    { "type": "Eyebrow pencil", "year": "China", "value|100-900": 3 },
-    { "type": "Eyebrow pencil", "year": "USA", "value|100-900": 3 },
-    { "type": "Rouge", "year": "Africa", "value|100-900": 3 },
-    { "type": "Rouge", "year": "EU", "value|100-900": 3 },
-    { "type": "Rouge", "year": "China", "value|100-900": 3 },
-    { "type": "Rouge", "year": "USA", "value|100-900": 3 }
-  ]
-}

src/api/path/index.ts

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

src/api/path/project.api.ts

@@ -0,0 +1,84 @@
+import { http } from '@/api/http'
+import { httpErrorHandle } from '@/utils'
+import { ContentTypeEnum, RequestHttpEnum, ModuleTypeEnum } from '@/enums/httpEnum'
+
+// * 项目列表
+export const projectListApi = async (data: object) => {
+  try { 
+    const res = await http(RequestHttpEnum.GET)(`${ModuleTypeEnum.PROJECT}/list`, data);
+    return res;
+  } catch {
+    httpErrorHandle();
+  }
+}
+
+// * 新增项目
+export const createProjectApi = async (data: object) => {
+  try { 
+    const res = await http(RequestHttpEnum.POST)(`${ModuleTypeEnum.PROJECT}/create`, data);
+    return res;
+  } catch {
+    httpErrorHandle();
+  }
+}
+
+// * 获取项目
+export const fetchProjectApi = async (data: object) => {
+  try { 
+    const res = await http(RequestHttpEnum.GET)(`${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 (url:string, data: object) => {
+  try { 
+    const res = await http(RequestHttpEnum.POST)(url, data, ContentTypeEnum.FORM_DATA);
+    return res;
+  } catch {
+    httpErrorHandle();
+  }
+}

src/api/path/system.api.ts

@@ -0,0 +1,33 @@
+import { http } from '@/api/http'
+import { httpErrorHandle } from '@/utils'
+import { RequestHttpEnum, ModuleTypeEnum } from '@/enums/httpEnum'
+
+// * 登录
+export const loginApi = async (data: object) => {
+  try {
+    const res = await http(RequestHttpEnum.POST)(`${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)(`${ModuleTypeEnum.SYSTEM}/getOssInfo`, data);
+    return res;
+  } catch(err) {
+    httpErrorHandle();
+  }
+}