diff --git a/src/hooks/useChartDataFetch.hook.ts b/src/hooks/useChartDataFetch.hook.ts
index a21787b5..f32be1b8 100644
--- a/src/hooks/useChartDataFetch.hook.ts
+++ b/src/hooks/useChartDataFetch.hook.ts
@@ -53,7 +53,6 @@ export const useChartDataFetch = (
// eCharts 组件配合 vChart 库更新方式
if (chartFrame === ChartFrameEnum.ECHARTS) {
if (vChartRef.value) {
-
vChartRef.value.setOption({ dataset: newFunctionHandle(res.data, filter) })
}
}
diff --git a/src/utils/utils.ts b/src/utils/utils.ts
index f6666b30..f7a161d0 100644
--- a/src/utils/utils.ts
+++ b/src/utils/utils.ts
@@ -5,7 +5,7 @@ import throttle from 'lodash/throttle'
import Image_404 from '../assets/images/exception/image-404.png'
import html2canvas from 'html2canvas'
import { downloadByA } from './file'
-import { isString } from './type'
+import { toString } from './type'
import cloneDeep from 'lodash/cloneDeep';
/**
@@ -196,7 +196,7 @@ export const canvasCut = (html: HTMLElement | null, callback?: Function) => {
export const newFunctionHandle = (
data: any,
funcStr?: string,
- toString?: boolean,
+ isToString?: boolean,
errorCallBack?: Function,
successCallBack?: Function
) => {
@@ -204,7 +204,7 @@ export const newFunctionHandle = (
if (!funcStr) return data
const fn = new Function('data', funcStr)
const fnRes = fn( cloneDeep(data))
- const resHandle = toString && isString(fnRes) ? fnRes : JSON.stringify(fnRes)
+ const resHandle = isToString ? toString(fnRes) : fnRes
// 成功回调
successCallBack && successCallBack(resHandle)
return resHandle
diff --git a/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMatchingAndShow/index.vue b/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMatchingAndShow/index.vue
index 71594ae4..39d31cef 100644
--- a/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMatchingAndShow/index.vue
+++ b/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMatchingAndShow/index.vue
@@ -72,7 +72,7 @@