Skip to content

Commit f5c4a54

Browse files
committed
refactor: getViewOption
handle view model by transformMeta
1 parent ba34d56 commit f5c4a54

File tree

1 file changed

+9
-10
lines changed
  • frontend/src/app/pages/DashBoardPage/pages/BoardEditor/components/ControllerWidgetPanel/ControllerConfig/ValuesSetter/ValuesOptionsSetter

1 file changed

+9
-10
lines changed

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

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import { Form, FormInstance, Radio, Select, Space } from 'antd';
2020
import { CascaderOptionType } from 'antd/lib/cascader';
2121
import useI18NPrefix from 'app/hooks/useI18NPrefix';
22-
import beginViewModelMigration from 'app/migration/ViewConfig/migrationViewModelConfig';
2322
import {
2423
OPERATOR_TYPE_OPTION,
2524
ValueOptionType,
@@ -29,6 +28,7 @@ import ChartDataView from 'app/types/ChartDataView';
2928
import { ControllerFacadeTypes } from 'app/types/FilterControlPanel';
3029
import { View } from 'app/types/View';
3130
import { getDistinctFields } from 'app/utils/fetch';
31+
import { transformMeta } from 'app/utils/internalChartHelper';
3232
import { FC, memo, useCallback, useEffect, useMemo, useState } from 'react';
3333
import styled from 'styled-components/macro';
3434
import { request2 } from 'utils/request';
@@ -70,15 +70,14 @@ const ValuesOptionsSetter: FC<{
7070
if (!viewId) return [];
7171
try {
7272
const { data } = await request2<View>(`/views/${viewId}`);
73-
let model = JSON.parse(beginViewModelMigration(data?.model));
74-
const option: CascaderOptionType[] = Object.keys(model.columns).map(
75-
key => {
76-
return {
77-
value: key,
78-
label: key,
79-
};
80-
},
81-
);
73+
let meta = transformMeta(data?.model);
74+
if (!meta) return [];
75+
const option: CascaderOptionType[] = meta.map(item => {
76+
return {
77+
value: item.id,
78+
label: item.id,
79+
};
80+
});
8281
return option;
8382
} catch (error) {
8483
errorHandle(error);

0 commit comments

Comments
 (0)