Merge pull request #996 from xieliuduo/fix-viewId

hotfix: handle view model by transformMeta and  fix chart with no view eg richTextChart

Author: scottsut

frontend/src/app/pages/DashBoardPage/pages/BoardEditor/components/ControllerWidgetPanel/ControllerConfig/ValuesSetter/ValuesOptionsSetter/ValuesOptionsSetter.tsx

@@ -28,6 +28,7 @@ import ChartDataView from 'app/types/ChartDataView';
 import { ControllerFacadeTypes } from 'app/types/FilterControlPanel';
 import { View } from 'app/types/View';
 import { getDistinctFields } from 'app/utils/fetch';
+import { transformMeta } from 'app/utils/internalChartHelper';
 import { FC, memo, useCallback, useEffect, useMemo, useState } from 'react';
 import styled from 'styled-components/macro';
 import { request2 } from 'utils/request';
@@ -69,11 +70,12 @@ const ValuesOptionsSetter: FC<{
     if (!viewId) return [];
     try {
       const { data } = await request2<View>(`/views/${viewId}`);
-      const model = JSON.parse(data.model);
-      const option: CascaderOptionType[] = Object.keys(model).map(key => {
+      let meta = transformMeta(data?.model);
+      if (!meta) return [];
+      const option: CascaderOptionType[] = meta.map(item => {
         return {
-          value: key,
-          label: key,
+          value: item.id,
+          label: item.id,
         };
       });
       return option;

frontend/src/app/pages/DashBoardPage/pages/BoardEditor/slice/thunk.ts

@@ -279,19 +279,20 @@ export const addWrapChartWidget = createAsyncThunk<
     { getState, dispatch },
   ) => {
     const dataCharts = [dataChart];
-    const viewViews = [view];
+    const viewViews = view ? [view] : [];
     dispatch(boardActions.setDataChartToMap(dataCharts));
     dispatch(boardActions.setViewMap(viewViews));
     let widget = widgetToolKit.chart.create({
       dashboardId: boardId,
       boardType: boardType,
       dataChartId: chartId,
-      viewId: view.id,
+      viewId: view?.id || '',
       dataChartConfig: dataChart,
       subType: 'widgetChart',
     });
     dispatch(addWidgetsToEditBoard([widget]));
-    dispatch(addVariablesToBoard(view.variables));
+    dispatch(addVariablesToBoard(view?.variables));
+
     return null;
   },
 );

frontend/src/app/pages/DashBoardPage/utils/index.ts

@@ -420,6 +420,7 @@ export const getChartWidgetRequestParams = (obj: {
     // errorHandle(`can\`t find Chart ${curWidget.datachartId}`);
     return null;
   }
+  if (!dataChart.viewId) return null;
   const chartDataView = viewMap[dataChart?.viewId];
 
   if (!chartDataView) {