Merge pull request #772 from lyp000119/dev

fix: Edit charts page does not select default chart

Author: xieliuduo

frontend/src/app/components/ChartEditor.tsx

@@ -113,7 +113,10 @@ export const ChartEditor: React.FC<ChartEditorProps> = ({
 
   useMount(
     () => {
-      if (!dataChartId && !originChart) {
+      if (
+        (container === 'dataChart' && !dataChartId) ||
+        (container === 'widget' && !originChart)
+      ) {
         // Note: add default chart if new to editor
         const currentChart = ChartManager.instance().getDefaultChart();
         handleChartChange(currentChart);
@@ -135,6 +138,7 @@ export const ChartEditor: React.FC<ChartEditorProps> = ({
               backendChart: originChart as ChartDTO,
             }),
           );
+
           if (!originChart) {
             dispatch(actions.updateChartAggregation(true));
           }
@@ -201,7 +205,9 @@ export const ChartEditor: React.FC<ChartEditorProps> = ({
   );
 
   const clearDataConfig = useCallback(() => {
-    const currentChart = ChartManager.instance().getById(chart?.meta?.id);
+    const currentChart = chart?.meta?.id
+      ? ChartManager.instance().getById(chart?.meta?.id)
+      : ChartManager.instance().getDefaultChart();
     let targetChartConfig = CloneValueDeep(currentChart?.config);
     registerChartEvents(currentChart);
     setChart(currentChart);