[improvement](webapp) optimize drill down dimensions (#84)

This commit is contained in:
williamhliu
2023-09-13 15:05:23 +08:00
committed by GitHub
parent c8b5c0f3a3
commit c38507d50c
18 changed files with 322 additions and 380 deletions

View File

@@ -1,37 +1,24 @@
import { CHART_BLUE_COLOR, CHART_SECONDARY_COLOR, PREFIX_CLS } from '../../../common/constants';
import { DrillDownDimensionType, MsgDataType } from '../../../common/type';
import { MsgDataType } from '../../../common/type';
import { getChartLightenColor, getFormattedValue } from '../../../utils/utils';
import type { ECharts } from 'echarts';
import * as echarts from 'echarts';
import React, { useEffect, useRef, useState } from 'react';
import NoPermissionChart from '../NoPermissionChart';
import DrillDownDimensions from '../../DrillDownDimensions';
import { Spin } from 'antd';
import FilterSection from '../FilterSection';
type Props = {
data: MsgDataType;
triggerResize?: boolean;
drillDownDimension?: DrillDownDimensionType;
loading: boolean;
onSelectDimension: (dimension?: DrillDownDimensionType) => void;
onApplyAuth?: (model: string) => void;
};
const BarChart: React.FC<Props> = ({
data,
triggerResize,
drillDownDimension,
loading,
onSelectDimension,
onApplyAuth,
}) => {
const BarChart: React.FC<Props> = ({ data, triggerResize, loading, onApplyAuth }) => {
const chartRef = useRef<any>();
const [instance, setInstance] = useState<ECharts>();
const { queryColumns, queryResults, entityInfo, chatContext, queryMode } = data;
const { dateInfo, dimensionFilters } = chatContext || {};
const { queryColumns, queryResults, entityInfo } = data;
const categoryColumnName =
queryColumns?.find(column => column.showType === 'CATEGORY')?.nameEn || '';
@@ -159,48 +146,16 @@ const BarChart: React.FC<Props> = ({
);
}
// const hasFilterSection = dimensionFilters?.length > 0;
const prefixCls = `${PREFIX_CLS}-bar`;
return (
<div>
<div className={`${prefixCls}-top-bar`}>
<div className={`${prefixCls}-indicator-name`}>{metricColumn?.name}</div>
{drillDownDimension && (
<div className={`${prefixCls}-filter-section-wrapper`}>
(
<div className={`${prefixCls}-filter-section`}>
{/* <FilterSection chatContext={chatContext} entityInfo={entityInfo} /> */}
{drillDownDimension && (
<div className={`${prefixCls}-filter-item`}>
<div className={`${prefixCls}-filter-item-label`}></div>
<div className={`${prefixCls}-filter-item-value`}>{drillDownDimension.name}</div>
</div>
)}
</div>
)
</div>
)}
</div>
{/* {dateInfo && (
<div className={`${prefixCls}-date-range`}>
{dateInfo.startDate === dateInfo.endDate
? dateInfo.startDate
: `${dateInfo.startDate} ~ ${dateInfo.endDate}`}
</div>
)} */}
<Spin spinning={loading}>
<div className={`${prefixCls}-chart`} ref={chartRef} />
</Spin>
{queryMode.includes('METRIC') && (
<DrillDownDimensions
modelId={chatContext.modelId}
drillDownDimension={drillDownDimension}
dimensionFilters={chatContext.dimensionFilters}
onSelectDimension={onSelectDimension}
/>
)}
</div>
);
};