diff --git a/src/hooks/useChartDataFetch.hook.ts b/src/hooks/useChartDataFetch.hook.ts index 88330258..d13c60e7 100644 --- a/src/hooks/useChartDataFetch.hook.ts +++ b/src/hooks/useChartDataFetch.hook.ts @@ -1,6 +1,6 @@ -import { ref, toRefs } from 'vue' +import { ref, toRefs, toRaw } from 'vue' import type VChart from 'vue-echarts' -import { http } from '@/api/http' +import { customizeHttp } from '@/api/http' import { CreateComponentType, ChartFrameEnum } from '@/packages/index.d' import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore' import { RequestDataTypeEnum } from '@/enums/httpEnum' @@ -25,22 +25,25 @@ export const useChartDataFetch = ( const requestIntervalFn = () => { const chartEditStore = useChartEditStore() + + // 全局数据 const { requestOriginUrl, requestIntervalUnit: globalUnit, requestInterval: globalRequestInterval } = toRefs(chartEditStore.getRequestGlobalConfig) - // 组件类型 - const { chartFrame } = targetComponent.chartConfig - // 请求配置 + + // 目标组件 const { requestDataType, - requestHttpType, requestUrl, requestIntervalUnit: targetUnit, requestInterval: targetInterval } = toRefs(targetComponent.request) + // 组件类型 + const { chartFrame } = targetComponent.chartConfig + // 非请求类型 if (requestDataType.value !== RequestDataTypeEnum.AJAX) return @@ -55,8 +58,8 @@ export const useChartDataFetch = ( clearInterval(fetchInterval) const fetchFn = async () => { - const res: any = await http(requestHttpType.value)(completePath || '', {}) - if (res.data) { + const res = await customizeHttp(toRaw(targetComponent.request), toRaw(chartEditStore.requestGlobalConfig)) + if (res && res.data) { try { const filter = targetComponent.filter // 更新回调函数 diff --git a/src/views/preview/index.vue b/src/views/preview/index.vue index ea057f64..fbe74eca 100644 --- a/src/views/preview/index.vue +++ b/src/views/preview/index.vue @@ -1,7 +1,5 @@ <template> - <div - :class="`go-preview ${localStorageInfo.editCanvasConfig.previewScaleType}`" - > + <div :class="`go-preview ${localStorageInfo.editCanvasConfig.previewScaleType}`"> <template v-if="showEntity"> <!-- 实体区域 --> <div ref="entityRef" class="go-preview-entity"> @@ -10,9 +8,7 @@ <!-- 展示层 --> <div :style="previewRefStyle" v-if="show"> <!-- 渲染层 --> - <preview-render-list - :localStorageInfo="localStorageInfo" - ></preview-render-list> + <preview-render-list :localStorageInfo="localStorageInfo"></preview-render-list> </div> </div> </div> @@ -23,9 +19,7 @@ <!-- 展示层 --> <div :style="previewRefStyle" v-if="show"> <!-- 渲染层 --> - <preview-render-list - :localStorageInfo="localStorageInfo" - ></preview-render-list> + <preview-render-list :localStorageInfo="localStorageInfo"></preview-render-list> </div> </div> </template> @@ -43,21 +37,18 @@ import { useStore } from './hooks/useStore.hook' import { PreviewScaleEnum } from '@/enums/styleEnum' import type { ChartEditStorageType } from './index.d' -const localStorageInfo: ChartEditStorageType = - getSessionStorageInfo() as ChartEditStorageType +const localStorageInfo: ChartEditStorageType = getSessionStorageInfo() as ChartEditStorageType const previewRefStyle = computed(() => { return { ...getEditCanvasConfigStyle(localStorageInfo.editCanvasConfig), - ...getFilterStyle(localStorageInfo.editCanvasConfig), + ...getFilterStyle(localStorageInfo.editCanvasConfig) } }) const showEntity = computed(() => { const type = localStorageInfo.editCanvasConfig.previewScaleType - return ( - type === PreviewScaleEnum.SCROLL_Y || type === PreviewScaleEnum.SCROLL_X - ) + return type === PreviewScaleEnum.SCROLL_Y || type === PreviewScaleEnum.SCROLL_X }) useStore(localStorageInfo)