diff --git a/src/App.vue b/src/App.vue index 2fa191d8..26990551 100644 --- a/src/App.vue +++ b/src/App.vue @@ -30,5 +30,5 @@ const hljsTheme = useCode() // 全局语言 const { locale, dateLocale } = useLang() - +//测试提交 diff --git a/src/hooks/useChartDataFetch.hook.ts b/src/hooks/useChartDataFetch.hook.ts index 5fc84554..8eb47d90 100644 --- a/src/hooks/useChartDataFetch.hook.ts +++ b/src/hooks/useChartDataFetch.hook.ts @@ -119,7 +119,10 @@ export const useChartDataFetch = ( if (isPreview()) { targetComponent.request.requestDataType === RequestDataTypeEnum.Pond - ? addGlobalDataInterface(targetComponent, useChartEditStore, updateCallback || echartsUpdateHandle) + ? addGlobalDataInterface(targetComponent, useChartEditStore, (newData: any) => { + echartsUpdateHandle(newData) + if (updateCallback) updateCallback(newData) + }) : requestIntervalFn() } else { requestIntervalFn() diff --git a/src/packages/components/Charts/Mores/Funnel/index.vue b/src/packages/components/Charts/Mores/Funnel/index.vue index 35ba86fd..7965a058 100644 --- a/src/packages/components/Charts/Mores/Funnel/index.vue +++ b/src/packages/components/Charts/Mores/Funnel/index.vue @@ -1,44 +1,52 @@ - - - + + + diff --git a/src/packages/components/Charts/Mores/Graph/index.vue b/src/packages/components/Charts/Mores/Graph/index.vue index 378c968e..b0e49837 100644 --- a/src/packages/components/Charts/Mores/Graph/index.vue +++ b/src/packages/components/Charts/Mores/Graph/index.vue @@ -3,7 +3,7 @@ ref="vChartRef" :init-options="initOptions" :theme="themeColor" - :option="option" + :option="(option as EChartsOption)" :manual-update="isPreview()" autoresize > @@ -12,6 +12,7 @@ + + + diff --git a/src/packages/components/Charts/Pies/PieCommon/index.vue b/src/packages/components/Charts/Pies/PieCommon/index.vue index a662df38..ecb4e673 100644 --- a/src/packages/components/Charts/Pies/PieCommon/index.vue +++ b/src/packages/components/Charts/Pies/PieCommon/index.vue @@ -134,7 +134,10 @@ watch( ) const { vChartRef } = useChartDataFetch(props.chartConfig, useChartEditStore, (newData: typeof dataJson) => { - addPieInterval(newData) + clearPieInterval() + if (props.chartConfig.option.isCarousel) { + addPieInterval(newData) + } }) onMounted(() => { diff --git a/src/packages/components/Informations/Texts/TextCommon/index.vue b/src/packages/components/Informations/Texts/TextCommon/index.vue index 6732df8c..70c31f3b 100644 --- a/src/packages/components/Informations/Texts/TextCommon/index.vue +++ b/src/packages/components/Informations/Texts/TextCommon/index.vue @@ -70,6 +70,7 @@ const click = () => { display: flex; align-items: center; justify-content: v-bind('textAlign'); + overflow: hidden; .content { color: v-bind('fontColor');