Merge branch 'dev'

This commit is contained in:
奔跑的面条 2025-04-28 16:05:36 +08:00
commit 0aa70fe0c0

View File

@ -12,7 +12,7 @@
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { computed, PropType, onMounted, watch, ref } from 'vue' import { computed, PropType, onMounted, watch } from 'vue'
import VChart from 'vue-echarts' import VChart from 'vue-echarts'
import { useCanvasInitOptions } from '@/hooks/useCanvasInitOptions.hook' import { useCanvasInitOptions } from '@/hooks/useCanvasInitOptions.hook'
import { use } from 'echarts/core' import { use } from 'echarts/core'
@ -26,8 +26,6 @@ import { isPreview } from '@/utils'
import { DatasetComponent, GridComponent, TooltipComponent, LegendComponent } from 'echarts/components' import { DatasetComponent, GridComponent, TooltipComponent, LegendComponent } from 'echarts/components'
import dataJson from './data.json' import dataJson from './data.json'
const isInit = ref<boolean>(false)
const props = defineProps({ const props = defineProps({
themeSetting: { themeSetting: {
type: Object, type: Object,
@ -106,19 +104,18 @@ watch(
newData => { newData => {
try { try {
// //
if (!isInit.value) { if (isPreview()) {
isInit.value = true return
}
if (newData === 'nomal') {
props.chartConfig.option.series[0].radius = '70%'
props.chartConfig.option.series[0].roseType = false
} else if (newData === 'ring') {
props.chartConfig.option.series[0].radius = ['40%', '65%']
props.chartConfig.option.series[0].roseType = false
} else { } else {
if (newData === 'nomal') { props.chartConfig.option.series[0].radius = '70%'
props.chartConfig.option.series[0].radius = '70%' props.chartConfig.option.series[0].roseType = true
props.chartConfig.option.series[0].roseType = false
} else if (newData === 'ring') {
props.chartConfig.option.series[0].radius = ['40%', '65%']
props.chartConfig.option.series[0].roseType = false
} else {
props.chartConfig.option.series[0].radius = '70%'
props.chartConfig.option.series[0].roseType = true
}
} }
} catch (error) { } catch (error) {
console.log(error) console.log(error)