From f90068338676e201939cc410dac817deff80dfa1 Mon Sep 17 00:00:00 2001
From: pengjin <pengjin@travelsky.com.cn>
Date: Thu, 25 May 2023 14:52:36 +0800
Subject: [PATCH] =?UTF-8?q?datart-bugfix=E5=9C=A8=E4=BB=AA=E8=A1=A8?=
 =?UTF-8?q?=E7=9B=98=E4=B8=AD=E4=BF=AE=E6=94=B9=E6=97=A5=E6=9C=9F=E7=BB=B4?=
 =?UTF-8?q?=E5=BA=A6=EF=BC=8C=E7=BC=BA=E5=B0=91=E6=97=A5=E6=9C=9F=E7=BB=B4?=
 =?UTF-8?q?=E5=BA=A6=E5=AD=97=E6=AE=B5=20=E5=A4=8D=E7=8E=B0=E6=AD=A5?=
 =?UTF-8?q?=E9=AA=A4=EF=BC=9A=201.=20=E5=88=9B=E5=BB=BA=E4=BB=AA=E8=A1=A8?=
 =?UTF-8?q?=E7=9B=98=EF=BC=8C=E5=9C=A8=E4=BB=AA=E8=A1=A8=E7=9B=98=E4=B8=AD?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E4=B8=80=E4=B8=AA=E5=B8=A6=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E7=BB=B4=E5=BA=A6=E7=9A=84=E5=9B=BE=E8=A1=A8=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E9=80=80=E5=87=BA=202.=20=E9=87=8D=E6=96=B0=E9=80=B2=E5=85=A5?=
 =?UTF-8?q?=E4=BB=AA=E8=A1=A8=E7=9B=98=E5=90=8E=EF=BC=8C=E5=86=8D=E6=AC=A1?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E8=A1=A8=EF=BC=8C=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=E5=B1=82=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 4a804b0efbe983e49eba5860c33db94e6855fc24)
---
 .../pages/ChartWorkbenchPage/slice/thunks.ts   | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/frontend/src/app/pages/ChartWorkbenchPage/slice/thunks.ts b/frontend/src/app/pages/ChartWorkbenchPage/slice/thunks.ts
index 7e579f118..d58fe0f68 100644
--- a/frontend/src/app/pages/ChartWorkbenchPage/slice/thunks.ts
+++ b/frontend/src/app/pages/ChartWorkbenchPage/slice/thunks.ts
@@ -29,7 +29,10 @@ import {
   buildUpdateChartRequest,
   convertToChartDto,
 } from 'app/utils/ChartDtoHelper';
-import { filterCurrentUsedComputedFields } from 'app/utils/chartHelper';
+import {
+  createDateLevelComputedFieldForConfigComputedFields,
+  filterCurrentUsedComputedFields
+} from 'app/utils/chartHelper';
 import { fetchAvailableSourceFunctionsAsync } from 'app/utils/fetch';
 import { filterSqlOperatorName } from 'app/utils/internalChartHelper';
 import { request2 } from 'utils/request';
@@ -208,6 +211,19 @@ export const fetchChartAction = createAsyncThunk<
     });
     return convertToChartDto(response?.data);
   }
+
+  if (arg.backendChart?.config) {
+    return {
+      ...arg.backendChart,
+      config: {
+        ...arg.backendChart.config,
+        computedFields: createDateLevelComputedFieldForConfigComputedFields(
+          arg.backendChart?.view.meta,
+          arg.backendChart?.config.computedFields,
+        )
+      }
+    }
+  }
   return arg.backendChart as any;
 });