From 68cddcad3a40a1ab90b975251fea8cfecb2f4425 Mon Sep 17 00:00:00 2001 From: ulleo Date: Thu, 20 Jun 2024 10:17:22 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=9F=B1=E7=BA=BF=E7=BB=84=E5=90=88=E5=9B=BE=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E8=81=94=E5=8A=A8=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core-frontend/src/utils/viewUtils.ts | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/core/core-frontend/src/utils/viewUtils.ts b/core/core-frontend/src/utils/viewUtils.ts index 7dde471796..4c12285c8f 100644 --- a/core/core-frontend/src/utils/viewUtils.ts +++ b/core/core-frontend/src/utils/viewUtils.ts @@ -1,18 +1,25 @@ import { getRange } from '@/utils/timeUitils' +import { union } from 'lodash-es' export function viewFieldTimeTrans(viewDataInfo, params) { if (viewDataInfo && params && params.dimensionList) { - const idNameMap = viewDataInfo.fields.reduce((pre, next) => { + const fields = viewDataInfo.fields + ? viewDataInfo.fields + : viewDataInfo.left?.fields || viewDataInfo.right?.fields + ? union(viewDataInfo.left?.fields, viewDataInfo.right?.fields) + : [] + + const idNameMap = fields.reduce((pre, next) => { pre[next['id']] = next['dataeaseName'] return pre }, {}) - const nameTypeMap = viewDataInfo.fields.reduce((pre, next) => { + const nameTypeMap = fields.reduce((pre, next) => { pre[next['dataeaseName']] = next['deType'] return pre }, {}) - const nameDateStyleMap = viewDataInfo.fields.reduce((pre, next) => { + const nameDateStyleMap = fields.reduce((pre, next) => { pre[next['dataeaseName']] = next['dateStyle'] return pre }, {})