diff --git a/src/components/Doc/index.ts b/src/components/Doc/index.ts deleted file mode 100644 index 36008f11..00000000 --- a/src/components/Doc/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -import Doc from './index.vue'; - -export { Doc }; diff --git a/src/components/GoDoc/index.ts b/src/components/GoDoc/index.ts new file mode 100644 index 00000000..80098f1e --- /dev/null +++ b/src/components/GoDoc/index.ts @@ -0,0 +1,3 @@ +import GoDoc from './index.vue'; + +export { GoDoc }; diff --git a/src/components/Doc/index.vue b/src/components/GoDoc/index.vue similarity index 100% rename from src/components/Doc/index.vue rename to src/components/GoDoc/index.vue diff --git a/src/hooks/useChartDataFetch.hook.ts b/src/hooks/useChartDataFetch.hook.ts index 5584a026..c1846e23 100644 --- a/src/hooks/useChartDataFetch.hook.ts +++ b/src/hooks/useChartDataFetch.hook.ts @@ -1,15 +1,18 @@ -import { toRefs, watchEffect } from 'vue' +import { ref, toRefs, watchEffect, nextTick } from 'vue' +import type VChart from 'vue-echarts' import { http } from '@/api/http' import { CreateComponentType } from '@/packages/index.d' import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore' import { RequestDataTypeEnum } from '@/enums/httpEnum' +import { isPreview } from '@/utils' /** - * 数据监听与更改 + * 图表的 setdata 数据监听与更改 * @param chartConfig */ export const useChartDataFetch = (chartConfig: CreateComponentType) => { - let fetchInterval:any = 0 + const vChartRef = ref(null) + let fetchInterval: any = 0 watchEffect(() => { clearInterval(fetchInterval) @@ -25,15 +28,23 @@ export const useChartDataFetch = (chartConfig: CreateComponentType) => { // 处理地址 if (requestUrl?.value && requestInterval.value > 0) { // requestOriginUrl 允许为空 - const completePath = requestOriginUrl && requestOriginUrl.value + requestUrl.value + const completePath = + requestOriginUrl && requestOriginUrl.value + requestUrl.value if (!completePath) return fetchInterval = setInterval(async () => { const res = await http(requestHttpType.value)(completePath || '', {}) - if(res.data) { - chartConfig.option.dataset = res.data as any + if (res.data) { + nextTick(() => { + chartConfig.option.dataset = res.data as any + if(isPreview() && vChartRef.value) { + vChartRef.value.setOption(chartConfig.option) + } + }) } }, requestInterval.value * 1000) } }) + + return { vChartRef } } diff --git a/src/hooks/useCode.hook.ts b/src/hooks/useCode.hook.ts index 52dd381c..53cebd04 100644 --- a/src/hooks/useCode.hook.ts +++ b/src/hooks/useCode.hook.ts @@ -2,6 +2,7 @@ import hljs from 'highlight.js/lib/core' import json from 'highlight.js/lib/languages/json' import typescript from 'highlight.js/lib/languages/typescript' +// * code 展示 export const useCode = () => { hljs.registerLanguage('json', json) hljs.registerLanguage('typescript', typescript) diff --git a/src/hooks/usePreviewScale.hook.ts b/src/hooks/usePreviewScale.hook.ts index 9997bc13..d03e475b 100644 --- a/src/hooks/usePreviewScale.hook.ts +++ b/src/hooks/usePreviewScale.hook.ts @@ -1,6 +1,7 @@ import { ref } from 'vue' import throttle from 'lodash/throttle' +// * 屏幕缩放适配 export const usePreviewScale = ( width: number, height: number, diff --git a/src/hooks/useTheme.hook.ts b/src/hooks/useTheme.hook.ts index ae5e846a..1560ffaa 100644 --- a/src/hooks/useTheme.hook.ts +++ b/src/hooks/useTheme.hook.ts @@ -5,7 +5,7 @@ import { borderRadius } from '@/settings/designSetting' import { toLight } from '@/utils' /** - * 设置全局主题 + * * 设置全局主题 */ export const useThemeOverridesHook = () => { const designStore = useDesignStore() diff --git a/src/packages/components/Charts/Bars/BarCommon/index.vue b/src/packages/components/Charts/Bars/BarCommon/index.vue index 8f2491f0..b191344f 100644 --- a/src/packages/components/Charts/Bars/BarCommon/index.vue +++ b/src/packages/components/Charts/Bars/BarCommon/index.vue @@ -1,5 +1,5 @@ diff --git a/src/packages/components/Charts/Bars/BarCrossrange/index.vue b/src/packages/components/Charts/Bars/BarCrossrange/index.vue index dc27f366..833d5a61 100644 --- a/src/packages/components/Charts/Bars/BarCrossrange/index.vue +++ b/src/packages/components/Charts/Bars/BarCrossrange/index.vue @@ -1,5 +1,5 @@ diff --git a/src/packages/components/Charts/Lines/LineCommon/index.vue b/src/packages/components/Charts/Lines/LineCommon/index.vue index 8915dd7d..1e820adc 100644 --- a/src/packages/components/Charts/Lines/LineCommon/index.vue +++ b/src/packages/components/Charts/Lines/LineCommon/index.vue @@ -1,5 +1,5 @@ \ No newline at end of file diff --git a/src/packages/components/Charts/Lines/LineGradientSingle/index.vue b/src/packages/components/Charts/Lines/LineGradientSingle/index.vue index f14acf57..32f37d9d 100644 --- a/src/packages/components/Charts/Lines/LineGradientSingle/index.vue +++ b/src/packages/components/Charts/Lines/LineGradientSingle/index.vue @@ -1,5 +1,5 @@ diff --git a/src/packages/components/Charts/Lines/LineGradients/index.vue b/src/packages/components/Charts/Lines/LineGradients/index.vue index f957f989..28d40a10 100644 --- a/src/packages/components/Charts/Lines/LineGradients/index.vue +++ b/src/packages/components/Charts/Lines/LineGradients/index.vue @@ -1,5 +1,5 @@ diff --git a/src/packages/components/Charts/Pies/PieCommon/index.vue b/src/packages/components/Charts/Pies/PieCommon/index.vue index f164b7b3..b5f38378 100644 --- a/src/packages/components/Charts/Pies/PieCommon/index.vue +++ b/src/packages/components/Charts/Pies/PieCommon/index.vue @@ -1,5 +1,5 @@ diff --git a/src/utils/router.ts b/src/utils/router.ts index 9e46bbea..a790bf7a 100644 --- a/src/utils/router.ts +++ b/src/utils/router.ts @@ -128,6 +128,10 @@ export const openGiteeSourceCode = () => { openNewWindow(giteeSourceCodePath) } +export const isPreview = () => { + return document.location.hash.includes('preview') +} + /** * * 获取当前路由下的参数 * @returns object diff --git a/src/utils/utils.ts b/src/utils/utils.ts index b61034c7..8f63d3ef 100644 --- a/src/utils/utils.ts +++ b/src/utils/utils.ts @@ -4,6 +4,14 @@ import screenfull from 'screenfull' import throttle from 'lodash/throttle' import Image_404 from '../assets/images/exception/image-404.png' +/** + * * 判断是否是开发环境 + * @return { Boolean } + */ +export const isDev = () => { + return import.meta.env.DEV +} + /** * * 生成一个不重复的ID * @param { Number } randomLength 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 bf1ad358..4fcc68d2 100644 --- a/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataAjax/index.vue +++ b/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataAjax/index.vue @@ -6,13 +6,15 @@ :options="selectOptions" /> + {{ requestOriginUrl || '暂无' }} +