diff --git a/package.json b/package.json index 5587098e..4ac9f680 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ }, "dependencies": { "animate.css": "^4.1.1", - "axios": "^0.23.0", + "axios": "0.23.0", "crypto-ts": "^1.0.2", "highlight.js": "^11.5.0", "naive-ui": "^2.25.2", diff --git a/src/api/http.ts b/src/api/http.ts index 2738217f..8cd91192 100644 --- a/src/api/http.ts +++ b/src/api/http.ts @@ -1,35 +1,40 @@ import axiosInstance from './axios' -import { RequestEnum, ContentTypeEnum } from '@/enums/httpEnum' +import { RequestHttpEnum, ContentTypeEnum } from '@/enums/httpEnum' export const get = (url: string, params: object) => { return axiosInstance({ url: url, - method: RequestEnum.GET, - params, + method: RequestHttpEnum.GET, + params }) } -export const post = (url: string, params: object, headersType: string) => { +export const post = (url: string, params: object, headersType?: string) => { return axiosInstance({ url: url, - method: RequestEnum.POST, + method: RequestHttpEnum.POST, data: params, headers: { - 'Content-Type': headersType || ContentTypeEnum.JSON, - }, + 'Content-Type': headersType || ContentTypeEnum.JSON + } }) } export const del = (url: string, params: object) => { return axiosInstance({ url: url, - method: RequestEnum.DELETE, - params, + method: RequestHttpEnum.DELETE, + params }) } -export default { - get, - post, - del, +// 获取请求函数,默认get +export const http = (type?: RequestHttpEnum) => { + return type === RequestHttpEnum.GET + ? get + : type === RequestHttpEnum.POST + ? post + : type === RequestHttpEnum.DELETE + ? del + : get } diff --git a/src/api/mock/index.js b/src/api/mock/index.ts similarity index 73% rename from src/api/mock/index.js rename to src/api/mock/index.ts index 084afc54..d9d4e23b 100644 --- a/src/api/mock/index.js +++ b/src/api/mock/index.ts @@ -6,7 +6,7 @@ Mock.setup({ // 单个X数据 const featchMockData = '/api/mockData' -Mock.mock(/\/api\/test(|\?\S*)$/, 'get', test.featchMockData) +Mock.mock(/\/api\/mockData(|\?\S*)$/, 'get', test.featchMockData) export { featchMockData diff --git a/src/api/mock/test.mock.js b/src/api/mock/test.mock.ts similarity index 100% rename from src/api/mock/test.mock.js rename to src/api/mock/test.mock.ts diff --git a/src/components/ChartItemSetting/SettingItemBox.vue b/src/components/ChartItemSetting/SettingItemBox.vue index fcdfaed8..56b81c40 100644 --- a/src/components/ChartItemSetting/SettingItemBox.vue +++ b/src/components/ChartItemSetting/SettingItemBox.vue @@ -1,9 +1,18 @@