Merge pull request #2244 from scottsut/dev

fix: Bug fixes

Author: scottsut

frontend/src/app/components/ChartDrill/ChartDrillContextMenu.tsx

@@ -80,6 +80,7 @@ const ChartDrillContextMenu: FC<{
     } else {
       rows = groupSection?.rows?.filter(v => v.uid === allFields[0].uid);
     }
+    rows = rows?.filter(row => row.type === DataViewFieldType.DATE);
     return getRuntimeDateLevelFields(rows);
   }, [drillOption, chartConfig?.datas, currentFields]);
 

frontend/src/app/components/ChartGraph/BasicBarChart/BasicBarChart.tsx

@@ -242,6 +242,7 @@ class BasicBarChart extends Chart implements IChartLifecycle {
     return {
       tooltip: {
         trigger: 'item',
+        confine: true,
         formatter: this.getTooltipFormatterFunc(
           chartDataSet,
           groupConfigs,

frontend/src/app/components/ChartGraph/BasicDoubleYChart/BasicDoubleYChart.tsx

@@ -180,6 +180,7 @@ class BasicDoubleYChart extends Chart {
         axisPointer: {
           type: 'cross',
         },
+        confine: true,
         formatter: this.getTooltipFormmaterFunc(
           styleConfigs,
           groupConfigs,
@@ -365,10 +366,10 @@ class BasicDoubleYChart extends Chart {
     );
 
     const _yAxisTemplate = (position, name): DoubleYChartYAxis => {
-      const [showAxis, inverse, font, showLabel] = getStyles(
+      const [showAxis, inverse, font, showLabel, showTitleAndUnit] = getStyles(
         styles,
         [`${position}Y`],
-        ['showAxis', 'inverseAxis', 'font', 'showLabel'],
+        ['showAxis', 'inverseAxis', 'font', 'showLabel', 'showTitleAndUnit'],
       );
       const [format] = getStyles(
         styles,
@@ -379,7 +380,7 @@ class BasicDoubleYChart extends Chart {
         type: 'value',
         position,
         showTitleAndUnit: true,
-        name,
+        name: showTitleAndUnit ? name : null,
         nameLocation: 'middle',
         nameGap: 50,
         nameRotate: 90,

frontend/src/app/components/ChartGraph/BasicDoubleYChart/config.ts

@@ -253,6 +253,12 @@ const config: ChartConfig = {
             color: '#495057',
           },
         },
+        {
+          label: 'common.showTitleAndUnit',
+          key: 'showTitleAndUnit',
+          default: true,
+          comType: 'checkbox',
+        },
         {
           label: 'yAxis.open',
           key: 'modal',
@@ -331,6 +337,12 @@ const config: ChartConfig = {
             color: '#495057',
           },
         },
+        {
+          label: 'common.showTitleAndUnit',
+          key: 'showTitleAndUnit',
+          default: true,
+          comType: 'checkbox',
+        },
         {
           label: 'yAxis.open',
           key: 'modal',

frontend/src/app/components/ChartGraph/BasicLineChart/BasicLineChart.tsx

@@ -212,6 +212,7 @@ class BasicLineChart extends Chart {
     return {
       tooltip: {
         trigger: 'item',
+        confine: true,
         formatter: this.getTooltipFormmaterFunc(
           chartDataSet,
           groupConfigs,

frontend/src/app/components/ChartGraph/BasicOutlineMapChart/BasicOutlineMapChart.tsx

@@ -291,14 +291,22 @@ class BasicOutlineMapChart extends Chart {
       areaEmphasisColor,
       enableFocus,
       borderStyle,
+      roam,
     ] = getStyles(
       styleConfigs,
       ['map'],
-      ['level', 'areaColor', 'areaEmphasisColor', 'focusArea', 'borderStyle'],
+      [
+        'level',
+        'areaColor',
+        'areaEmphasisColor',
+        'focusArea',
+        'borderStyle',
+        'roam',
+      ],
     );
     return {
       map: mapLevelName,
-      roam: 'move',
+      roam: roam && 'move',
       emphasis: {
         focus: enableFocus ? 'self' : 'none',
         itemStyle: {

frontend/src/app/components/ChartGraph/BasicPieChart/BasicPieChart.tsx

@@ -243,10 +243,11 @@ class BasicPieChart extends Chart {
   }
 
   private getPieSeriesImpl(styleConfigs: ChartStyleConfig[]): PieSeriesImpl {
+    const [avoidOverlap] = getStyles(styleConfigs, ['label'], ['avoidOverlap']);
     return {
       type: 'pie',
       sampling: 'average',
-      avoidLabelOverlap: false,
+      avoidLabelOverlap: avoidOverlap,
       ...this.getLabelStyle(styleConfigs),
       ...this.getSeriesStyle(styleConfigs),
       ...getGridStyle(styleConfigs),

frontend/src/app/components/ChartGraph/BasicPieChart/config.ts

@@ -111,6 +111,12 @@ const config: ChartConfig = {
           default: true,
           comType: 'checkbox',
         },
+        {
+          label: 'label.avoidOverlap',
+          key: 'avoidOverlap',
+          default: false,
+          comType: 'checkbox',
+        },
       ],
     },
     {
@@ -284,6 +290,7 @@ const config: ChartConfig = {
           showName: '维度值',
           showPercent: '百分比',
           showValue: '指标值',
+          avoidOverlap: '强制显示所有标签',
         },
         legend: {
           title: '图例',
@@ -333,6 +340,7 @@ const config: ChartConfig = {
           showName: 'Show Name',
           showPercent: 'Show Percentage',
           showValue: 'Show Value',
+          avoidOverlap: 'Force display of all labels',
         },
         legend: {
           title: 'Legend',

frontend/src/app/components/ChartGraph/BasicTableChart/AntdTableWrapper.tsx

@@ -16,8 +16,10 @@
  * limitations under the License.
  */
 
-import { Table } from 'antd';
+import { ConfigProvider, Table } from 'antd';
+import { antdLocales } from 'locales/i18n';
 import { FC, memo } from 'react';
+import { useTranslation } from 'react-i18next';
 import styled from 'styled-components/macro';
 
 interface TableStyleConfigProps {
@@ -47,6 +49,8 @@ const AntdTableWrapper: FC<{
   summaryFn?: (data) => { total: number; summarys: [] };
 }> = memo(
   ({ dataSource, columns, children, summaryFn, tableStyleConfig, ...rest }) => {
+    const { i18n } = useTranslation();
+
     const getTableSummaryRow = pageData => {
       if (!summaryFn) {
         return undefined;
@@ -68,13 +72,15 @@ const AntdTableWrapper: FC<{
     };
 
     return (
-      <StyledTable
-        {...rest}
-        tableStyleConfig={tableStyleConfig}
-        dataSource={dataSource}
-        columns={columns}
-        summary={getTableSummaryRow}
-      />
+      <ConfigProvider locale={antdLocales[i18n.language]}>
+        <StyledTable
+          {...rest}
+          tableStyleConfig={tableStyleConfig}
+          dataSource={dataSource}
+          columns={columns}
+          summary={getTableSummaryRow}
+        />
+      </ConfigProvider>
     );
   },
 );

frontend/src/app/components/ChartGraph/NormalOutlineMapChart/config.ts

@@ -97,6 +97,12 @@ const config: ChartConfig = {
             color: '#ced4da',
           },
         },
+        {
+          label: 'map.roam',
+          key: 'roam',
+          default: true,
+          comType: 'checkbox',
+        },
       ],
     },
     {
@@ -310,6 +316,7 @@ const config: ChartConfig = {
           focusArea: '聚焦选中区域',
           areaColor: '区域颜色',
           areaEmphasisColor: '选中区域高亮颜色',
+          roam: '鼠标平移',
         },
         levelType: {
           china: '中国-省级地图',
@@ -362,6 +369,7 @@ const config: ChartConfig = {
           focusArea: 'Focus Area',
           areaColor: 'Area Color',
           areaEmphasisColor: 'Area Emphasis Color',
+          roam: 'Mouse translating',
         },
         levelType: {
           china: 'China',