Merge branch 'main' into yulc_20240327

Author: yulichun

datav/frontend/src/i18n/locales/en.ts

@@ -464,7 +464,7 @@ export const panelMsg = i18n('panel', {
     "Final interval is caculated based on the current time range, max data points and the min interval, it's sent to datasource, e.g final interval will be directly passed as the step option that Prometheus requires",
 
   panelTitle: 'Panel Title',
-  panelDesc: 'give a short description to this panel',
+  panelDesc: 'give a short description to this panel, support markdown',
   panelType: 'Panel type',
   visualization: 'Built-in',
   externalPanels: 'External',

datav/frontend/src/i18n/locales/zh.json

@@ -414,7 +414,7 @@
     "finalInterval": "最终间隔",
     "finalIntervalTips": "最终间隔是根据当前的时间范围、最大点数和最小间隔综合计算出的，它将被发送到数据源并用于最终渲染的图表点间隔，例如 Prometheus 需要的 step 参数就是使用该值",
     "panelTitle": "图表标题",
-    "panelDesc": "给图表一个简单描述",
+    "panelDesc": "给图表一个简单描述，支持 markdown",
     "panelType": "图表类型",
     "visualization": "内置图表",
     "externalPanels": "外部图表",

datav/frontend/src/views/dashboard/edit-panel/PanelSettings.tsx

@@ -39,6 +39,7 @@ import { initTimeRange } from 'components/DatePicker/TimePicker'
 import DatePicker from '../components/PanelDatePicker'
 import customColors from 'theme/colors'
 import { ExternalLinksEditor } from 'components/ExternalLinks'
+import CodeEditor from 'components/CodeEditor/CodeEditor'
 
 // in edit mode, we need to cache all the plugins we have edited, until we save the dashboard
 let pluginsCachedInEdit = {}
@@ -116,16 +117,18 @@ const PanelSettings = memo(({ panel, onChange }: PanelEditorProps) => {
           />
         </PanelEditItem>
         <PanelEditItem title={t.description} desc={t1.panelDesc}>
-          <EditorInputItem
-            type='textarea'
-            size='sm'
-            value={panel.desc}
-            onChange={(v) =>
-              onChange((tempPanel: Panel) => {
-                tempPanel.desc = v
-              })
-            }
-          />
+          <Box className='bordered'>
+            <CodeEditor
+              value={panel.desc}
+              onChange={(v) =>
+                onChange((tempPanel: Panel) => {
+                  tempPanel.desc = v
+                })
+              }
+              height='150px'
+              language='markdown'
+            />
+          </Box>
         </PanelEditItem>
         <PanelEditItem title={t.transform} desc={t1.enableTransform}>
           <Switch

datav/frontend/src/views/dashboard/grid/PanelGrid/PanelGrid.tsx

@@ -738,7 +738,7 @@ const PanelHeader = ({
           pl='2'
         >
           {panel.styles.title.position != 'left' && <Box></Box>}
-          {!isEmpty(title) ? (
+          {!(isEmpty(title) && isEmpty(queryError)) ? (
             <HStack
               paddingTop={panel.styles.title.paddingTop}
               paddingBottom={panel.styles.title.paddingBottom}

datav/frontend/src/views/dashboard/plugins/built-in/panel/graph/Tooltip.tsx

@@ -145,6 +145,7 @@ const Tooltip = memo(({ props, options, data, inactiveSeries, defaultLegend }: P
                 filterIdx={focusIdx}
                 panelType={props.panel.type}
                 inactiveSeries={inactiveSeries}
+                defaultLegend={defaultLegend}
               />
             </Box>
           </TooltipContainer>

datav/frontend/src/views/dashboard/plugins/built-in/panel/graph/Tooltip/SeriesTable.tsx

@@ -163,9 +163,11 @@ const SeriesTable = memo(
                 let inactive 
                 if (!isEmpty(inactiveSeries)) {
                   inactive = inactiveSeries.includes(v.name)
-                } else [
+                } else {
+                  if (defaultLegend) {
                   inactive = !v.name.match(defaultLegend)
-                ]
+                  }
+                }
                 if (inactive) {
                   // hiding inactive tooltips
                   return <></>

datav/frontend/src/views/dashboard/plugins/built-in/panel/graph/options.ts

@@ -238,7 +238,11 @@ export const parseOptions = (
     if (!isEmpty(inactiveSeries)) {
       showSeries = inactiveSeries.includes(d.name) ? false : true
     } else {
-      showSeries = d.name.match(defaultLegend)
+      if (defaultLegend) {
+        showSeries = d.name.match(defaultLegend)
+      } else {
+        showSeries = true
+      }
     }
     series.push({
       show:  showSeries,

datav/frontend/src/views/dashboard/plugins/components/Legend.tsx

@@ -275,7 +275,9 @@ const LegendTable = memo(
                 if (!isEmpty(inactiveSeries)) {
                   inactive = inactiveSeries.includes(v.name)
                 } else {
-                  inactive = !v.name.match(defaultLegend)
+                  if (defaultLegend) {
+                    inactive = !v.name.match(defaultLegend)
+                  }
                 }
                 return (
                   <Tr verticalAlign='top' width='100%'>