diff --git a/src/hooks/useChartDataFetch.hook.ts b/src/hooks/useChartDataFetch.hook.ts index 5b4e48e..0138d1b 100644 --- a/src/hooks/useChartDataFetch.hook.ts +++ b/src/hooks/useChartDataFetch.hook.ts @@ -39,7 +39,7 @@ export const useChartDataFetch = ( } } - const requestIntervalFn =async () => { + const requestIntervalFn = () => { const chartEditStore = useChartEditStore() // 全局数据 @@ -75,11 +75,10 @@ export const useChartDataFetch = ( if (res) { try { const filter = targetComponent.filter - res.data = res.source echartsUpdateHandle(newFunctionHandle(res?.data, res, filter)) // 更新回调函数 if (updateCallback) { - updateCallback(newFunctionHandle(res?.data, res, filter),res) + updateCallback(newFunctionHandle(res?.data, res, filter)) } } catch (error) { console.error(error) @@ -88,9 +87,7 @@ export const useChartDataFetch = ( } // 立即调用 - await fetchFn() - - // fetchFn() + fetchFn() // 定时时间 const time = targetInterval && targetInterval.value ? targetInterval.value : globalRequestInterval.value // 单位 diff --git a/src/packages/components/Charts/Bars/BarCommon/index.vue b/src/packages/components/Charts/Bars/BarCommon/index.vue index 492de3a..77f6da0 100644 --- a/src/packages/components/Charts/Bars/BarCommon/index.vue +++ b/src/packages/components/Charts/Bars/BarCommon/index.vue @@ -7,7 +7,6 @@ :update-options="{ replaceMerge: replaceMergeArr }" - :key="key" autoresize > @@ -46,17 +45,9 @@ use([DatasetComponent, CanvasRenderer, BarChart, GridComponent, TooltipComponent const replaceMergeArr = ref() -const dataset1 = ref() -const dataset2 = ref(props.chartConfig.option) -const key = ref(0) -const option = ref() -// const option = computed(() => { -// if(dataset1.value){ -// dataset2.value.dataset = dataset1.value -// } -// key.value++ -// return mergeTheme(dataset2.value, props.themeSetting, includes) -// }) +const option = computed(() => { + return mergeTheme(props.chartConfig.option, props.themeSetting, includes) +}) // dataset 无法变更条数的补丁 watch( @@ -83,14 +74,6 @@ watch( deep: false } ) -const { vChartRef } = useChartDataFetch(props.chartConfig, useChartEditStore,(dataset,res)=>{ - dataset1.value = { - source : res.source, - dimensions : res.dimensions, - } - dataset2.value.dataset = dataset1.value - option.value = mergeTheme(dataset2.value, props.themeSetting, includes) - key.value++ -}) +const { vChartRef } = useChartDataFetch(props.chartConfig, useChartEditStore) diff --git a/src/utils/utils.ts b/src/utils/utils.ts index 0e8cf01..281f806 100644 --- a/src/utils/utils.ts +++ b/src/utils/utils.ts @@ -193,8 +193,7 @@ export const newFunctionHandle = ( try { if (!funcStr) return data const fn = new Function('data', 'res', funcStr) - const fnRes = fn(res,data) - // const fnRes = fn(cloneDeep(data), cloneDeep(res)) + const fnRes = fn(cloneDeep(data), cloneDeep(res)) const resHandle = isToString ? toString(fnRes) : fnRes // 成功回调 successCallBack && successCallBack(resHandle)