feat: 新增数据池 hook
This commit is contained in:
parent
80e5dbd9cb
commit
649ab1fe8c
@ -2,5 +2,6 @@ export * from '@/hooks/useTheme.hook'
|
|||||||
export * from '@/hooks/usePreviewScale.hook'
|
export * from '@/hooks/usePreviewScale.hook'
|
||||||
export * from '@/hooks/useCode.hook'
|
export * from '@/hooks/useCode.hook'
|
||||||
export * from '@/hooks/useChartDataFetch.hook'
|
export * from '@/hooks/useChartDataFetch.hook'
|
||||||
|
export * from '@/hooks/useChartDataPondFetch.hook'
|
||||||
export * from '@/hooks/useLifeHandler.hook'
|
export * from '@/hooks/useLifeHandler.hook'
|
||||||
export * from '@/hooks/useLang.hook'
|
export * from '@/hooks/useLang.hook'
|
@ -1,6 +1,7 @@
|
|||||||
import { ref, toRefs, toRaw } from 'vue'
|
import { ref, toRefs, toRaw } from 'vue'
|
||||||
import type VChart from 'vue-echarts'
|
import type VChart from 'vue-echarts'
|
||||||
import { customizeHttp } from '@/api/http'
|
import { customizeHttp } from '@/api/http'
|
||||||
|
import { useChartDataPondFetch } from '@/hooks/'
|
||||||
import { CreateComponentType, ChartFrameEnum } from '@/packages/index.d'
|
import { CreateComponentType, ChartFrameEnum } from '@/packages/index.d'
|
||||||
import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
|
import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
|
||||||
import { RequestDataTypeEnum } from '@/enums/httpEnum'
|
import { RequestDataTypeEnum } from '@/enums/httpEnum'
|
||||||
@ -23,6 +24,22 @@ export const useChartDataFetch = (
|
|||||||
const vChartRef = ref<typeof VChart | null>(null)
|
const vChartRef = ref<typeof VChart | null>(null)
|
||||||
let fetchInterval: any = 0
|
let fetchInterval: any = 0
|
||||||
|
|
||||||
|
// 数据池
|
||||||
|
const { addGlobalDataInterface } = useChartDataPondFetch()
|
||||||
|
const { requestDataPondId } = toRefs(targetComponent.request)
|
||||||
|
|
||||||
|
// 组件类型
|
||||||
|
const { chartFrame } = targetComponent.chartConfig
|
||||||
|
|
||||||
|
// eCharts 组件配合 vChart 库更新方式
|
||||||
|
const echartsUpdateHandle = (dataset: any) => {
|
||||||
|
if (chartFrame === ChartFrameEnum.ECHARTS) {
|
||||||
|
if (vChartRef.value) {
|
||||||
|
vChartRef.value.setOption({ dataset: dataset })
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
const requestIntervalFn = () => {
|
const requestIntervalFn = () => {
|
||||||
const chartEditStore = useChartEditStore()
|
const chartEditStore = useChartEditStore()
|
||||||
|
|
||||||
@ -41,9 +58,6 @@ export const useChartDataFetch = (
|
|||||||
requestInterval: targetInterval
|
requestInterval: targetInterval
|
||||||
} = toRefs(targetComponent.request)
|
} = toRefs(targetComponent.request)
|
||||||
|
|
||||||
// 组件类型
|
|
||||||
const { chartFrame } = targetComponent.chartConfig
|
|
||||||
|
|
||||||
// 非请求类型
|
// 非请求类型
|
||||||
if (requestDataType.value !== RequestDataTypeEnum.AJAX) return
|
if (requestDataType.value !== RequestDataTypeEnum.AJAX) return
|
||||||
|
|
||||||
@ -58,16 +72,11 @@ export const useChartDataFetch = (
|
|||||||
clearInterval(fetchInterval)
|
clearInterval(fetchInterval)
|
||||||
|
|
||||||
const fetchFn = async () => {
|
const fetchFn = async () => {
|
||||||
const res = await customizeHttp(toRaw(targetComponent.request), toRaw(chartEditStore.requestGlobalConfig))
|
const res = await customizeHttp(toRaw(targetComponent.request), toRaw(chartEditStore.getRequestGlobalConfig))
|
||||||
if (res) {
|
if (res) {
|
||||||
try {
|
try {
|
||||||
const filter = targetComponent.filter
|
const filter = targetComponent.filter
|
||||||
// eCharts 组件配合 vChart 库更新方式
|
echartsUpdateHandle(newFunctionHandle(res?.data, res, filter))
|
||||||
if (chartFrame === ChartFrameEnum.ECHARTS) {
|
|
||||||
if (vChartRef.value) {
|
|
||||||
vChartRef.value.setOption({ dataset: newFunctionHandle(res?.data, res, filter) })
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// 更新回调函数
|
// 更新回调函数
|
||||||
if (updateCallback) {
|
if (updateCallback) {
|
||||||
updateCallback(newFunctionHandle(res?.data, res, filter))
|
updateCallback(newFunctionHandle(res?.data, res, filter))
|
||||||
@ -94,6 +103,10 @@ export const useChartDataFetch = (
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
isPreview() && requestIntervalFn()
|
if (isPreview()) {
|
||||||
|
requestDataPondId
|
||||||
|
? addGlobalDataInterface(targetComponent, useChartEditStore, updateCallback || echartsUpdateHandle)
|
||||||
|
: requestIntervalFn()
|
||||||
|
}
|
||||||
return { vChartRef }
|
return { vChartRef }
|
||||||
}
|
}
|
||||||
|
93
src/hooks/useChartDataPondFetch.hook.ts
Normal file
93
src/hooks/useChartDataPondFetch.hook.ts
Normal file
@ -0,0 +1,93 @@
|
|||||||
|
import { toRaw } from 'vue'
|
||||||
|
import { customizeHttp } from '@/api/http'
|
||||||
|
import { CreateComponentType } from '@/packages/index.d'
|
||||||
|
import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
|
||||||
|
import { RequestGlobalConfigType, RequestDataPondItemType } from '@/store/modules/chartEditStore/chartEditStore.d'
|
||||||
|
import { newFunctionHandle } from '@/utils'
|
||||||
|
|
||||||
|
// 获取类型
|
||||||
|
type ChartEditStoreType = typeof useChartEditStore
|
||||||
|
|
||||||
|
// 数据池存储的数据类型
|
||||||
|
type DataPondMapType = {
|
||||||
|
updateCallback: (...args: any) => any
|
||||||
|
filter?: string | undefined
|
||||||
|
}
|
||||||
|
|
||||||
|
// 数据池 Map 中请求对应 callback
|
||||||
|
const mittDataPondMap = new Map<string, DataPondMapType[]>()
|
||||||
|
|
||||||
|
// 创建单个数据项轮询接口
|
||||||
|
const newPondItemInterval = (
|
||||||
|
requestGlobalConfig: RequestGlobalConfigType,
|
||||||
|
requestDataPondItem: RequestDataPondItemType,
|
||||||
|
dataPondMapItem?: DataPondMapType[]
|
||||||
|
) => {
|
||||||
|
if (!dataPondMapItem) return
|
||||||
|
|
||||||
|
// 请求
|
||||||
|
const fetchFn = async () => {
|
||||||
|
try {
|
||||||
|
const res = await customizeHttp(toRaw(requestDataPondItem.dataPondRequestConfig), toRaw(requestGlobalConfig))
|
||||||
|
|
||||||
|
if (res) {
|
||||||
|
try {
|
||||||
|
// 遍历更新回调函数
|
||||||
|
dataPondMapItem.forEach(item => {
|
||||||
|
item.updateCallback(newFunctionHandle(res?.data, res, item.filter))
|
||||||
|
})
|
||||||
|
} catch (error) {
|
||||||
|
console.error(error)
|
||||||
|
return error
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
return error
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 立即调用
|
||||||
|
fetchFn()
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 数据池接口处理
|
||||||
|
*/
|
||||||
|
export const useChartDataPondFetch = () => {
|
||||||
|
// 新增全局接口
|
||||||
|
const addGlobalDataInterface = (
|
||||||
|
targetComponent: CreateComponentType,
|
||||||
|
useChartEditStore: ChartEditStoreType,
|
||||||
|
updateCallback: (...args: any) => any
|
||||||
|
) => {
|
||||||
|
const chartEditStore = useChartEditStore()
|
||||||
|
const { requestDataPond } = chartEditStore.getRequestGlobalConfig
|
||||||
|
|
||||||
|
// 组件对应的数据池 Id
|
||||||
|
const requestDataPondId = '111' || (targetComponent.request.requestDataPondId as string)
|
||||||
|
// 新增数据项
|
||||||
|
const mittPondIdArr = mittDataPondMap.get(requestDataPondId) || []
|
||||||
|
mittPondIdArr.push({
|
||||||
|
updateCallback: updateCallback,
|
||||||
|
filter: targetComponent.filter
|
||||||
|
})
|
||||||
|
mittDataPondMap.set(requestDataPondId, mittPondIdArr)
|
||||||
|
}
|
||||||
|
|
||||||
|
// 初始化数据池
|
||||||
|
const initDataPond = (requestGlobalConfig: RequestGlobalConfigType) => {
|
||||||
|
const { requestDataPond } = requestGlobalConfig
|
||||||
|
// 根据 mapId 查找对应的数据池配置
|
||||||
|
for (let pondKey of mittDataPondMap.keys()) {
|
||||||
|
const requestDataPondItem = requestDataPond.find(item => item.dataPondId === pondKey)
|
||||||
|
if (requestDataPondItem) {
|
||||||
|
newPondItemInterval(requestGlobalConfig, requestDataPondItem, mittDataPondMap.get(pondKey))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
addGlobalDataInterface,
|
||||||
|
initDataPond
|
||||||
|
}
|
||||||
|
}
|
@ -150,16 +150,27 @@ type RequestPublicConfigType = {
|
|||||||
requestParams: RequestParams
|
requestParams: RequestParams
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 数据池项类型
|
||||||
|
export type RequestDataPondItemType = {
|
||||||
|
dataPondId: string,
|
||||||
|
dataPondName: string,
|
||||||
|
dataPondRequestConfig: RequestConfigType
|
||||||
|
}
|
||||||
|
|
||||||
// 全局的图表请求配置
|
// 全局的图表请求配置
|
||||||
export interface RequestGlobalConfigType extends RequestPublicConfigType {
|
export interface RequestGlobalConfigType extends RequestPublicConfigType {
|
||||||
// 组件定制轮询时间
|
// 组件定制轮询时间
|
||||||
requestInterval: number
|
requestInterval: number
|
||||||
// 请求源地址
|
// 请求源地址
|
||||||
requestOriginUrl?: string
|
requestOriginUrl?: string
|
||||||
|
// 公共数据池
|
||||||
|
requestDataPond: RequestDataPondItemType[]
|
||||||
}
|
}
|
||||||
|
|
||||||
// 单个图表请求配置
|
// 单个图表请求配置
|
||||||
export interface RequestConfigType extends RequestPublicConfigType {
|
export interface RequestConfigType extends RequestPublicConfigType {
|
||||||
|
// 所选全局数据池的对应 id
|
||||||
|
requestDataPondId?: string
|
||||||
// 组件定制轮询时间
|
// 组件定制轮询时间
|
||||||
requestInterval?: number
|
requestInterval?: number
|
||||||
// 获取数据的方式
|
// 获取数据的方式
|
||||||
|
@ -113,6 +113,7 @@ export const useChartEditStore = defineStore({
|
|||||||
},
|
},
|
||||||
// 数据请求处理(需存储给后端)
|
// 数据请求处理(需存储给后端)
|
||||||
requestGlobalConfig: {
|
requestGlobalConfig: {
|
||||||
|
requestDataPond: [],
|
||||||
requestOriginUrl: '',
|
requestOriginUrl: '',
|
||||||
requestInterval: requestInterval,
|
requestInterval: requestInterval,
|
||||||
requestIntervalUnit: requestIntervalUnit,
|
requestIntervalUnit: requestIntervalUnit,
|
||||||
|
@ -125,7 +125,7 @@ const sendHandle = async () => {
|
|||||||
if (!targetData.value?.request) return
|
if (!targetData.value?.request) return
|
||||||
loading.value = true
|
loading.value = true
|
||||||
try {
|
try {
|
||||||
const res = await customizeHttp(toRaw(targetData.value.request), toRaw(chartEditStore.requestGlobalConfig))
|
const res = await customizeHttp(toRaw(targetData.value.request), toRaw(chartEditStore.getRequestGlobalConfig))
|
||||||
loading.value = false
|
loading.value = false
|
||||||
if (res) {
|
if (res) {
|
||||||
if(!res?.data && !targetData.value.filter) window['$message'].warning('您的数据不符合默认格式,请配置过滤器!')
|
if(!res?.data && !targetData.value.filter) window['$message'].warning('您的数据不符合默认格式,请配置过滤器!')
|
||||||
|
@ -128,7 +128,7 @@ const sourceData = ref<any>('')
|
|||||||
// 动态获取数据
|
// 动态获取数据
|
||||||
const fetchTargetData = async () => {
|
const fetchTargetData = async () => {
|
||||||
try {
|
try {
|
||||||
const res = await customizeHttp(toRaw(targetData.value.request), toRaw(chartEditStore.requestGlobalConfig))
|
const res = await customizeHttp(toRaw(targetData.value.request), toRaw(chartEditStore.getRequestGlobalConfig))
|
||||||
if (res) {
|
if (res) {
|
||||||
sourceData.value = res
|
sourceData.value = res
|
||||||
return
|
return
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
...getTransformStyle(item.styles),
|
...getTransformStyle(item.styles),
|
||||||
...getStatusStyle(item.status),
|
...getStatusStyle(item.status),
|
||||||
...getBlendModeStyle(item.styles) as any
|
...getBlendModeStyle(item.styles) as any
|
||||||
} as any"
|
}"
|
||||||
>
|
>
|
||||||
<!-- 分组 -->
|
<!-- 分组 -->
|
||||||
<preview-render-group
|
<preview-render-group
|
||||||
@ -36,7 +36,8 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { PropType, computed } from 'vue'
|
import { PropType, computed, onMounted } from 'vue'
|
||||||
|
import { useChartDataPondFetch } from '@/hooks'
|
||||||
import { ChartEditStorageType } from '../../index.d'
|
import { ChartEditStorageType } from '../../index.d'
|
||||||
import { PreviewRenderGroup } from '../PreviewRenderGroup/index'
|
import { PreviewRenderGroup } from '../PreviewRenderGroup/index'
|
||||||
import { CreateComponentGroupType } from '@/packages/index.d'
|
import { CreateComponentGroupType } from '@/packages/index.d'
|
||||||
@ -45,6 +46,9 @@ import { animationsClass, getFilterStyle, getTransformStyle, getBlendModeStyle }
|
|||||||
import { getSizeStyle, getComponentAttrStyle, getStatusStyle } from '../../utils'
|
import { getSizeStyle, getComponentAttrStyle, getStatusStyle } from '../../utils'
|
||||||
import { useLifeHandler } from '@/hooks'
|
import { useLifeHandler } from '@/hooks'
|
||||||
|
|
||||||
|
// 初始化数据池
|
||||||
|
const { initDataPond } = useChartDataPondFetch()
|
||||||
|
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
localStorageInfo: {
|
localStorageInfo: {
|
||||||
type: Object as PropType<ChartEditStorageType>,
|
type: Object as PropType<ChartEditStorageType>,
|
||||||
@ -63,6 +67,11 @@ const themeColor = computed(() => {
|
|||||||
const chartThemeColor = props.localStorageInfo.editCanvasConfig.chartThemeColor
|
const chartThemeColor = props.localStorageInfo.editCanvasConfig.chartThemeColor
|
||||||
return chartColors[chartThemeColor]
|
return chartColors[chartThemeColor]
|
||||||
})
|
})
|
||||||
|
|
||||||
|
// 组件渲染结束初始化数据池
|
||||||
|
onMounted(() => {
|
||||||
|
initDataPond(props.localStorageInfo.requestGlobalConfig)
|
||||||
|
})
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user