Merge pull request #1237 from scottsut/fix

refactor: not render context menu when drillable fields < 2

Author: Cuiyansong

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

@@ -182,16 +182,23 @@ const ChartDrillContextMenu: FC<{ chartConfig?: ChartConfig }> = memo(
       availableSourceFunctions,
     ]);
 
+    const hasContextMenu =
+      drillOption?.isDrillable || runtimeDateLevelFields?.length;
+
     return (
       <StyledChartDrill className="chart-drill-menu-container">
-        <Dropdown
-          disabled={!drillOption}
-          overlay={contextMenu}
-          destroyPopupOnHide={true}
-          trigger={['contextMenu']}
-        >
+        {hasContextMenu ? (
+          <Dropdown
+            disabled={!drillOption}
+            overlay={contextMenu}
+            destroyPopupOnHide={true}
+            trigger={['contextMenu']}
+          >
+            <div style={{ height: '100%' }}>{children}</div>
+          </Dropdown>
+        ) : (
           <div style={{ height: '100%' }}>{children}</div>
-        </Dropdown>
+        )}
       </StyledChartDrill>
     );
   },

frontend/src/app/models/ChartDrillOption.ts

@@ -63,6 +63,10 @@ export class ChartDrillOption implements IChartDrillOption {
     return this.cursor + 2 === this.drillFields.length;
   }
 
+  public get isDrillable() {
+    return this.drillFields.length > 1;
+  }
+
   public get canSelect() {
     return isEmptyArray(this.expandDownFields);
   }

frontend/src/app/types/ChartDrillOption.d.ts

@@ -22,6 +22,7 @@ export interface IChartDrillOption {
   mode: DrillMode;
   isSelectedDrill: boolean;
   isBottomLevel: boolean;
+  isDrillable: boolean;
   canSelect: boolean;
   toggleSelectedDrill(enable?: boolean): void;
   getAllFields(): ChartDataSectionField[];