diff --git a/src/api/axios.ts b/src/api/axios.ts index a64cfcd0..65ff033c 100644 --- a/src/api/axios.ts +++ b/src/api/axios.ts @@ -21,7 +21,7 @@ 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) + 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) diff --git a/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataAjax/index.vue b/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataAjax/index.vue index 1e4cce55..203bb0e6 100644 --- a/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataAjax/index.vue +++ b/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataAjax/index.vue @@ -132,7 +132,7 @@ const sendHandle = async () => { if (res) { const { data } = res if (!data && !targetData.value.filter) window['$message'].warning('您的数据不符合默认格式,请配置过滤器!') - targetData.value.option.dataset = newFunctionHandle(data.data, data, targetData.value.filter) + targetData.value.option.dataset = newFunctionHandle(data, res, targetData.value.filter) showMatching.value = true return } diff --git a/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMonacoEditor/index.vue b/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMonacoEditor/index.vue index 529fb248..8bdb6440 100644 --- a/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMonacoEditor/index.vue +++ b/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMonacoEditor/index.vue @@ -129,7 +129,7 @@ const fetchTargetData = async () => { try { const res = await customizeHttp(toRaw(targetData.value.request), toRaw(chartEditStore.getRequestGlobalConfig)) if (res) { - sourceData.value = res.data + sourceData.value = res return } window['$message'].warning('没有拿到返回值,请检查接口!')