From 410dc4fc58d8ea4eeb4c7af49beb3a1ee47a791c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A5=94=E8=B7=91=E7=9A=84=E9=9D=A2=E6=9D=A1?= <1262327911@qq.com> Date: Fri, 8 Jul 2022 11:43:49 +0800 Subject: [PATCH 1/3] =?UTF-8?q?style:=20=E4=BF=AE=E6=94=B9=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E9=94=AE=E5=90=8D=20data=20=E4=B8=BA=20request?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/hooks/useChartDataFetch.hook.ts | 2 +- src/packages/index.d.ts | 4 +--- src/packages/public/publicConfig.ts | 6 ++---- src/store/modules/chartEditStore/chartEditStore.d.ts | 5 ++++- .../components/ChartData/components/ChartDataAjax/index.vue | 6 +++--- .../ChartData/components/ChartDataMatchingAndShow/index.vue | 2 +- .../ChartData/components/ChartDataMonacoEditor/index.vue | 4 ++-- .../ContentConfigurations/components/ChartData/index.vue | 4 ++-- 8 files changed, 16 insertions(+), 17 deletions(-) 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 @@ From 88abcf8a4acf2b34cfe72f73ed74d9a8171157dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A5=94=E8=B7=91=E7=9A=84=E9=9D=A2=E6=9D=A1?= <1262327911@qq.com> Date: Fri, 8 Jul 2022 11:45:39 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E5=8D=95=E7=8B=AC=E8=AF=B7=E6=B1=82=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/packages/public/publicConfig.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/packages/public/publicConfig.ts b/src/packages/public/publicConfig.ts index cc91491b..228f2b6b 100644 --- a/src/packages/public/publicConfig.ts +++ b/src/packages/public/publicConfig.ts @@ -7,7 +7,8 @@ import { chartInitConfig } from '@/settings/designSetting' const requestConfig: RequestConfigType = { requestDataType: RequestDataTypeEnum.STATIC, requestHttpType: RequestHttpEnum.GET, - requestUrl: '' + requestUrl: '', + requestInterval: 0 } export class publicConfig implements PublicConfigType { From 801f6e8d181f04308b07f61f0ed547651c1da9ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A5=94=E8=B7=91=E7=9A=84=E9=9D=A2=E6=9D=A1?= <1262327911@qq.com> Date: Fri, 8 Jul 2022 17:53:52 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E6=9B=B4=E6=96=B0=E5=8D=95=E7=8B=AC=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/hooks/useChartDataFetch.hook.ts | 13 ++++++++---- src/packages/public/publicConfig.ts | 2 +- .../chartEditStore/chartEditStore.d.ts | 2 +- .../components/ChartDataSetting/index.vue | 4 ++-- .../components/ChartDataAjax/index.vue | 21 ++++++++++++++----- 5 files changed, 29 insertions(+), 13 deletions(-) diff --git a/src/hooks/useChartDataFetch.hook.ts b/src/hooks/useChartDataFetch.hook.ts index 85c771b3..362cbce0 100644 --- a/src/hooks/useChartDataFetch.hook.ts +++ b/src/hooks/useChartDataFetch.hook.ts @@ -9,7 +9,6 @@ import { isPreview, newFunctionHandle } from '@/utils' // 获取类型 type ChartEditStoreType = typeof useChartEditStore - /** * setdata 数据监听与更改 * @param targetComponent @@ -30,7 +29,12 @@ export const useChartDataFetch = ( // 组件类型 const { chartFrame } = targetComponent.chartConfig // 请求配置 - const { requestDataType, requestHttpType, requestUrl } = toRefs(targetComponent.request) + const { + requestDataType, + requestHttpType, + requestUrl, + requestInterval: targetInterval + } = toRefs(targetComponent.request) // 非请求类型 if (requestDataType.value !== RequestDataTypeEnum.AJAX) return // 处理地址 @@ -65,12 +69,13 @@ export const useChartDataFetch = ( // 立即调用 fetchFn() + // 开启定时 - fetchInterval = setInterval(fetchFn, requestInterval.value * 1000) + const time = targetInterval && targetInterval.value ? targetInterval.value : requestInterval.value + fetchInterval = setInterval(fetchFn, time * 1000) } } isPreview() && requestIntervalFn() - return { vChartRef } } diff --git a/src/packages/public/publicConfig.ts b/src/packages/public/publicConfig.ts index 228f2b6b..d4fde6be 100644 --- a/src/packages/public/publicConfig.ts +++ b/src/packages/public/publicConfig.ts @@ -8,7 +8,7 @@ const requestConfig: RequestConfigType = { requestDataType: RequestDataTypeEnum.STATIC, requestHttpType: RequestHttpEnum.GET, requestUrl: '', - requestInterval: 0 + requestInterval: undefined } export class publicConfig implements PublicConfigType { diff --git a/src/store/modules/chartEditStore/chartEditStore.d.ts b/src/store/modules/chartEditStore/chartEditStore.d.ts index d037e3f2..dab3a992 100644 --- a/src/store/modules/chartEditStore/chartEditStore.d.ts +++ b/src/store/modules/chartEditStore/chartEditStore.d.ts @@ -147,7 +147,7 @@ export type RequestConfigType = { // 源后续的 url requestUrl?: string // 组件定制轮询时间 - requestInterval: number + requestInterval?: number } // Store 类型 diff --git a/src/views/chart/ContentConfigurations/components/CanvasPage/components/ChartDataSetting/index.vue b/src/views/chart/ContentConfigurations/components/CanvasPage/components/ChartDataSetting/index.vue index 7e4ec809..298a14ae 100644 --- a/src/views/chart/ContentConfigurations/components/CanvasPage/components/ChartDataSetting/index.vue +++ b/src/views/chart/ContentConfigurations/components/CanvasPage/components/ChartDataSetting/index.vue @@ -6,12 +6,12 @@ placeholder="源地址如: http://127.0.0.1" > - +