Commit 1fca59cb717b3ee2825fc495a8dd634325280a56

Authored by xp.Huang
2 parents e9d99e24 712968b5

Merge branch 'ft' into 'main_dev'

fix(src): 修复之前升级版本后,preview里部分代码注释了,axios配置文件ts类型错误

See merge request yunteng/thingskit-view!99
1 -import axios, { AxiosResponse, InternalAxiosRequestConfig, AxiosError } from 'axios' 1 +import axios, { AxiosResponse, AxiosRequestConfig, AxiosError } from 'axios'
2 import { ResultEnum } from "@/enums/httpEnum" 2 import { ResultEnum } from "@/enums/httpEnum"
3 import { ErrorPageNameMap } from "@/enums/pageEnum" 3 import { ErrorPageNameMap } from "@/enums/pageEnum"
4 import { redirectErrorPage } from '@/utils' 4 import { redirectErrorPage } from '@/utils'
@@ -9,7 +9,7 @@ const axiosInstance = axios.create({ @@ -9,7 +9,7 @@ const axiosInstance = axios.create({
9 }) 9 })
10 10
11 axiosInstance.interceptors.request.use( 11 axiosInstance.interceptors.request.use(
12 - (config: InternalAxiosRequestConfig) => { 12 + (config: AxiosRequestConfig) => {
13 return config 13 return config
14 }, 14 },
15 (error: AxiosError) => { 15 (error: AxiosError) => {
@@ -32,7 +32,7 @@ import { PreviewRenderList } from './components/PreviewRenderList' @@ -32,7 +32,7 @@ import { PreviewRenderList } from './components/PreviewRenderList'
32 import { getFilterStyle, setTitle } from '@/utils' 32 import { getFilterStyle, setTitle } from '@/utils'
33 33
34 // THINGS_KIT 重写预览逻辑,调用接口 34 // THINGS_KIT 重写预览逻辑,调用接口
35 -// import { getEditCanvasConfigStyle, getSessionStorageInfo, keyRecordHandle, dragCanvas } from './utils' 35 +import { dragCanvas } from './utils'
36 import { getEditCanvasConfigStyle,keyRecordHandle } from './utils' 36 import { getEditCanvasConfigStyle,keyRecordHandle } from './utils'
37 import { getSessionStorageInfo } from './external/usePreview' 37 import { getSessionStorageInfo } from './external/usePreview'
38 38