From f6916f36aaa848686d07669ad8e5c9637defb8fb Mon Sep 17 00:00:00 2001 From: "liu.shiyi" Date: Tue, 14 Nov 2023 17:53:14 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=AF=B9=E6=95=B0=E6=8D=AE=E6=BA=90?= =?UTF-8?q?=E7=9A=84=E5=80=BC=E8=BF=9B=E8=A1=8C=E5=85=BC=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data-room-ui/packages/js/store/actions.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/data-room-ui/packages/js/store/actions.js b/data-room-ui/packages/js/store/actions.js index f7c18f66..e4cf596f 100644 --- a/data-room-ui/packages/js/store/actions.js +++ b/data-room-ui/packages/js/store/actions.js @@ -18,8 +18,13 @@ export default { const pageInfo = handleResData(data) // 兼容边框配置 pageInfo.chartList.forEach((chart) => { - if (chart.dataSource) { - chart.dataSource.source = chart.dataSource?.source || 'dataset' + // 对数据源的方式进行兼容 + if (chart.dataSource && ['texts', 'numbers'].includes(chart.type)) { + if (chart.dataSource.source === 'dataset' && (!chart.dataSource.businessKey)) { + chart.dataSource.source = 'static' + } + } else if (!chart.dataSource.source) { + chart.dataSource.source = 'dataset' } if (!chart.border) { @@ -28,7 +33,7 @@ export default { if (!chart.border.padding) { chart.border.padding = [0, 0, 0, 0] } - let plotSettingsIterator = false + const plotSettingsIterator = false if (chart.type == 'customComponent') { // 为本地G2组件配置添加迭代器 if (!plotSettingsIterator) {