Merge pull request #2244 from scottsut/dev

fix: Bug fixes
running-elephant · Sep 19, 2023 · f71c1be · f71c1be
2 parents df210f7 + 7db0d1f
commit f71c1be
Show file tree

Hide file tree

Showing 37 changed files with 889 additions and 315 deletions.
diff --git a/frontend/src/app/components/ChartDrill/ChartDrillContextMenu.tsx b/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]);
 

diff --git a/frontend/src/app/components/ChartGraph/BasicBarChart/BasicBarChart.tsx b/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,

diff --git a/frontend/src/app/components/ChartGraph/BasicDoubleYChart/BasicDoubleYChart.tsx b/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,

diff --git a/frontend/src/app/components/ChartGraph/BasicDoubleYChart/config.ts b/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',

diff --git a/frontend/src/app/components/ChartGraph/BasicLineChart/BasicLineChart.tsx b/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,

diff --git a/frontend/src/app/components/ChartGraph/BasicOutlineMapChart/BasicOutlineMapChart.tsx b/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: {

diff --git a/frontend/src/app/components/ChartGraph/BasicPieChart/BasicPieChart.tsx b/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),

diff --git a/frontend/src/app/components/ChartGraph/BasicPieChart/config.ts b/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',

diff --git a/frontend/src/app/components/ChartGraph/BasicTableChart/AntdTableWrapper.tsx b/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>
  );
  },
 );

diff --git a/frontend/src/app/components/ChartGraph/NormalOutlineMapChart/config.ts b/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',

diff --git a/frontend/src/app/components/ChartGraph/ScatterOutlineMapChart/config.ts b/frontend/src/app/components/ChartGraph/ScatterOutlineMapChart/config.ts
@@ -102,6 +102,12 @@ const config: ChartConfig = {
  color: '#ced4da',
  },
  },
+ {
+ label: 'map.roam',
+ key: 'roam',
+ default: true,
+ comType: 'checkbox',
+ },
  {
  label: 'map.cycleRatio',
  key: 'cycleRatio',
@@ -319,6 +325,7 @@ const config: ChartConfig = {
  cycleRatio: '气泡大像素比',
  areaColor: '区域颜色',
  areaEmphasisColor: '选中区域高亮颜色',
+ roam: '鼠标平移',
  },
  levelType: {
  china: '中国-省级地图',
@@ -369,6 +376,7 @@ const config: ChartConfig = {
  areaColor: 'Area Color',
  areaEmphasisColor: 'Area Emphasis Color',
  cycleRatio: 'Cycle Ratio',
+ roam: 'Mouse translating',
  },
  levelType: {
  china: 'China',

diff --git a/frontend/src/app/components/ChartIFrameContainer/ChartIFrameEventBroker.ts b/frontend/src/app/components/ChartIFrameContainer/ChartIFrameEventBroker.ts
@@ -149,8 +149,8 @@ class ChartIFrameEventBroker {
 
  private registerListener(c: IChart): void {
  this.subscribe(ChartLifecycle.Mounted, c?.onMount);
- this.subscribe(ChartLifecycle.Updated, c?.onUpdated);
  this.subscribe(ChartLifecycle.Resize, c?.onResize);
+ this.subscribe(ChartLifecycle.Updated, c?.onUpdated);
  this.subscribe(ChartLifecycle.UnMount, c?.onUnMount);
  }
 

diff --git a/frontend/src/app/components/ChartIFrameContainer/ChartIFrameLifecycleAdapter.tsx b/frontend/src/app/components/ChartIFrameContainer/ChartIFrameLifecycleAdapter.tsx
@@ -151,9 +151,8 @@ const ChartIFrameLifecycleAdapter: FC<{
  }, [chart?.meta?.id, isShown]);
 
  /**
- * Chart Update Event
- * Dependency: 'config', 'dataset', 'widgetSpecialConfig',
- * 'containerStatus', 'document', 'window', 'isShown', 'drillOption', 'selectedItems'
+ * Chart Resize Event
+ * Dependency: 'style.width', 'style.height', 'document', 'window', 'isShown'
  */
  useEffect(() => {
  if (
@@ -167,28 +166,27 @@ const ChartIFrameLifecycleAdapter: FC<{
  ) {
  return;
  }
+
  eventBrokerRef.current?.publish(
- ChartLifecycle.Updated,
+ ChartLifecycle.Resize,
  buildBrokerOption(),
  buildBrokerContext(),
  );
  // eslint-disable-next-line react-hooks/exhaustive-deps
  }, [
- config,
- dataset,
- widgetSpecialConfig,
- containerStatus,
+ style.width,
+ style.height,
  document,
  window,
  isShown,
- drillOption,
- selectedItems,
+ containerStatus,
  isLoadingData,
  ]);
 
  /**
- * Chart Resize Event
- * Dependency: 'style.width', 'style.height', 'document', 'window', 'isShown'
+ * Chart Update Event
+ * Dependency: 'config', 'dataset', 'widgetSpecialConfig',
+ * 'containerStatus', 'document', 'window', 'isShown', 'drillOption', 'selectedItems'
  */
  useEffect(() => {
  if (
@@ -202,20 +200,22 @@ const ChartIFrameLifecycleAdapter: FC<{
  ) {
  return;
  }
-
  eventBrokerRef.current?.publish(
- ChartLifecycle.Resize,
+ ChartLifecycle.Updated,
  buildBrokerOption(),
  buildBrokerContext(),
  );
  // eslint-disable-next-line react-hooks/exhaustive-deps
  }, [
- style.width,
- style.height,
+ config,
+ dataset,
+ widgetSpecialConfig,
+ containerStatus,
  document,
  window,
  isShown,
- containerStatus,
+ drillOption,
+ selectedItems,
  isLoadingData,
  ]);
 

diff --git a/frontend/src/app/components/SaveToDashboard.tsx b/frontend/src/app/components/SaveToDashboard.tsx
@@ -25,6 +25,7 @@ import { getCascadeAccess } from 'app/pages/MainPage/Access';
 import {
  PermissionLevels,
  ResourceTypes,
+ VizResourceSubTypes,
 } from 'app/pages/MainPage/pages/PermissionPage/constants';
 import { useAddViz } from 'app/pages/MainPage/pages/VizPage/hooks/useAddViz';
 import { SaveFormContext } from 'app/pages/MainPage/pages/VizPage/SaveFormContext';
@@ -136,7 +137,7 @@ const SaveToDashboard: FC<SaveToDashboardTypes> = memo(
  selectable: v.relType !== 'FOLDER',
  })),
  null,
- [],
+ [VizResourceSubTypes.Folder],
  { getIcon, filter: filterTreeNode },
  );
  }, [vizData, getIcon, filterTreeNode]);