Pre Merge pull request !217 from 奔跑的面条/dev

src/App.vue

@@ -30,5 +30,5 @@ const hljsTheme = useCode()
 
 // 全局语言
 const { locale, dateLocale } = useLang()
-
+//测试提交
 </script>

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()

src/packages/components/Charts/Mores/Funnel/index.vue

@@ -1,10 +1,18 @@
 <template>
-  <v-chart ref="vChartRef" :init-options="initOptions" :theme="themeColor" :option="option" :manual-update="isPreview()" autoresize></v-chart>
+  <v-chart
+    ref="vChartRef"
+    :init-options="initOptions"
+    :theme="themeColor"
+    :option="(option as EChartsOption)"
+    :manual-update="isPreview()"
+    autoresize
+  ></v-chart>
 </template>
 
 <script setup lang="ts">
 import { computed, PropType } from 'vue'
 import VChart from 'vue-echarts'
+import { EChartsOption } from 'echarts'
 import { useCanvasInitOptions } from '@/hooks/useCanvasInitOptions.hook'
 import { use } from 'echarts/core'
 import { CanvasRenderer } from 'echarts/renderers'

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
   ></v-chart>
@@ -12,6 +12,7 @@
 <script setup lang="ts">
 import { ref, computed, PropType, watch } from 'vue'
 import VChart from 'vue-echarts'
+import { EChartsOption } from 'echarts'
 import { useCanvasInitOptions } from '@/hooks/useCanvasInitOptions.hook'
 import dataJson from './data.json'
 import { use } from 'echarts/core'

src/packages/components/Charts/Mores/Heatmap/index.vue

@@ -1,10 +1,18 @@
 <template>
-  <v-chart ref="vChartRef" :init-options="initOptions" :theme="themeColor" :option="option" :manual-update="isPreview()" autoresize></v-chart>
+  <v-chart
+    ref="vChartRef"
+    :init-options="initOptions"
+    :theme="themeColor"
+    :option="(option as EChartsOption)"
+    :manual-update="isPreview()"
+    autoresize
+  ></v-chart>
 </template>
 
 <script setup lang="ts">
 import { ref, watch, computed, PropType } from 'vue'
 import VChart from 'vue-echarts'
+import { EChartsOption } from 'echarts'
 import { useCanvasInitOptions } from '@/hooks/useCanvasInitOptions.hook'
 import dataJson from './data.json'
 import { use } from 'echarts/core'

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(() => {

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');