diff --git a/src/hooks/useChartDataFetch.hook.ts b/src/hooks/useChartDataFetch.hook.ts index f32be1b8..85c771b3 100644 --- a/src/hooks/useChartDataFetch.hook.ts +++ b/src/hooks/useChartDataFetch.hook.ts @@ -30,7 +30,7 @@ export const useChartDataFetch = ( // 组件类型 const { chartFrame } = targetComponent.chartConfig // 请求配置 - const { requestDataType, requestHttpType, requestUrl } = toRefs(targetComponent.data) + const { requestDataType, requestHttpType, requestUrl } = toRefs(targetComponent.request) // 非请求类型 if (requestDataType.value !== RequestDataTypeEnum.AJAX) return // 处理地址 diff --git a/src/packages/index.d.ts b/src/packages/index.d.ts index 8d27862e..41a1caac 100644 --- a/src/packages/index.d.ts +++ b/src/packages/index.d.ts @@ -27,9 +27,7 @@ export type ConfigType = { // 数据请求 interface requestConfig { - data: RequestConfigType, - // 暂时约定为数据存储区域(未使用) - requestData: any + request: RequestConfigType, } // Echarts 数据类型 diff --git a/src/packages/public/publicConfig.ts b/src/packages/public/publicConfig.ts index 05df5e28..cc91491b 100644 --- a/src/packages/public/publicConfig.ts +++ b/src/packages/public/publicConfig.ts @@ -41,10 +41,8 @@ export class publicConfig implements PublicConfigType { // 动画 animations: [] } - // 数据 - public data = { ...requestConfig } - // 数据获取 - public requestData = [] + // 请求 + public request = { ...requestConfig } // 数据过滤 public filter = undefined diff --git a/src/store/modules/chartEditStore/chartEditStore.d.ts b/src/store/modules/chartEditStore/chartEditStore.d.ts index f26c0461..d037e3f2 100644 --- a/src/store/modules/chartEditStore/chartEditStore.d.ts +++ b/src/store/modules/chartEditStore/chartEditStore.d.ts @@ -134,9 +134,10 @@ export enum ChartEditStoreEnum { export type RequestGlobalConfigType = { // 请求源地址 requestOriginUrl?: string - // 轮询时间 + // 全局默认轮询时间 requestInterval: number } + // 单个图表请求配置 export type RequestConfigType = { // 获取数据的方式 @@ -145,6 +146,8 @@ export type RequestConfigType = { requestHttpType: RequestHttpEnum // 源后续的 url requestUrl?: string + // 组件定制轮询时间 + requestInterval: number } // Store 类型 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 c9e32045..ead1032d 100644 --- a/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataAjax/index.vue +++ b/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataAjax/index.vue @@ -1,7 +1,7 @@ - + @@ -117,7 +117,7 @@ const selectOptions: SelectHttpType[] = [ const sendHandle = async () => { loading.value = true if(!targetData.value) return - const { requestUrl, requestHttpType } = targetData.value.data + const { requestUrl, requestHttpType } = targetData.value.request if (!requestUrl) { window['$message'].warning('请求参数不正确,请检查!') return diff --git a/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMatchingAndShow/index.vue b/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMatchingAndShow/index.vue index 58f9d001..c22b4429 100644 --- a/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMatchingAndShow/index.vue +++ b/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMatchingAndShow/index.vue @@ -118,7 +118,7 @@ const { uploadFileListRef, customRequest, beforeUpload, download } = useFile(tar // 是否展示过滤器 const filterShow = computed(() => { - return targetData.value.data.requestDataType === RequestDataTypeEnum.AJAX + return targetData.value.request.requestDataType === RequestDataTypeEnum.AJAX }) // 是图表类型 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 d92569e1..00eef16e 100644 --- a/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMonacoEditor/index.vue +++ b/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMonacoEditor/index.vue @@ -109,7 +109,7 @@ import cloneDeep from 'lodash/cloneDeep' const { DocumentTextIcon } = icon.ionicons5 const { FilterIcon, FilterEditIcon } = icon.carbon const { targetData, chartEditStore } = useTargetData() -const { requestDataType } = toRefs(targetData.value.data) +const { requestDataType } = toRefs(targetData.value.request) const { requestOriginUrl } = toRefs(chartEditStore.getRequestGlobalConfig) // 受控弹窗 @@ -124,7 +124,7 @@ const sourceData = ref('') // 动态获取数据 const fetchTargetData = async () => { try { - const { requestUrl, requestHttpType } = targetData.value.data + const { requestUrl, requestHttpType } = targetData.value.request if (!requestUrl) { window['$message'].warning('请求参数不正确,请检查!') sourceData.value = '请求参数不正确,请检查!' diff --git a/src/views/chart/ContentConfigurations/components/ChartData/index.vue b/src/views/chart/ContentConfigurations/components/ChartData/index.vue index c8c07a8e..e0771279 100644 --- a/src/views/chart/ContentConfigurations/components/ChartData/index.vue +++ b/src/views/chart/ContentConfigurations/components/ChartData/index.vue @@ -2,7 +2,7 @@
@@ -11,7 +11,7 @@