diff --git a/src/components/Pages/ChartGlobImage/index.ts b/src/components/Pages/ChartGlobImage/index.ts new file mode 100644 index 00000000..9203fcd7 --- /dev/null +++ b/src/components/Pages/ChartGlobImage/index.ts @@ -0,0 +1,3 @@ +import ChartGlobImage from './index.vue' + +export { ChartGlobImage } diff --git a/src/views/chart/ContentCharts/components/ChartsItemImage/index.vue b/src/components/Pages/ChartGlobImage/index.vue similarity index 76% rename from src/views/chart/ContentCharts/components/ChartsItemImage/index.vue rename to src/components/Pages/ChartGlobImage/index.vue index d5ba9f18..efd6bf41 100644 --- a/src/views/chart/ContentCharts/components/ChartsItemImage/index.vue +++ b/src/components/Pages/ChartGlobImage/index.vue @@ -3,7 +3,7 @@ diff --git a/src/packages/index.ts b/src/packages/index.ts index d568afcb..4f530faa 100644 --- a/src/packages/index.ts +++ b/src/packages/index.ts @@ -63,7 +63,8 @@ export const fetchConfigComponent = (dropData: ConfigType) => { * * 获取图片内容 * @param {ConfigType} targetData 配置项 */ -export const fetchImages = async (targetData: ConfigType) => { +export const fetchImages = async (targetData?: ConfigType) => { + if (!targetData) return '' // 新数据动态处理 const { image, package: targetDataPackage } = targetData // 兼容旧数据 diff --git a/src/utils/utils.ts b/src/utils/utils.ts index 858ac9c3..4042eaed 100644 --- a/src/utils/utils.ts +++ b/src/utils/utils.ts @@ -321,6 +321,12 @@ export const JSONParse = (data: string) => { return JSON.parse(data, (k, v) => { if (typeof v === 'string' && v.indexOf && (v.indexOf('function') > -1 || v.indexOf('=>') > -1)) { return eval(`(function(){return ${v}})()`) + } else if (typeof v === 'string' && v.indexOf && (v.indexOf('return ') > -1)) { + const baseLeftIndex = v.indexOf('(') + if (baseLeftIndex > -1) { + const newFn = `function ${v.substring(baseLeftIndex)}` + return eval(`(function(){return ${newFn}})()`) + } } return v }) diff --git a/src/views/chart/ContentCharts/components/ChartsItemBox/index.vue b/src/views/chart/ContentCharts/components/ChartsItemBox/index.vue index b6b9beeb..7ca3b1b0 100644 --- a/src/views/chart/ContentCharts/components/ChartsItemBox/index.vue +++ b/src/views/chart/ContentCharts/components/ChartsItemBox/index.vue @@ -22,7 +22,7 @@
- +
@@ -37,7 +37,7 @@