@cloudcare/guance-front-tools 1.0.9 → 1.0.11

package/lib/scripts/grafana-covert-to-guance.js

@@ -75,10 +75,10 @@ const grafanaPanelTypeToGuanceChartMap = {
 };
 const GRAFANA_KEYWORKD = ['__interval'];
 function replaceVariableStr(grafanaExpr) {
-    return grafanaExpr.replace(/\$([\d_\w]+)/g, (match, $0) => {
-        if (GRAFANA_KEYWORKD.includes($0))
+    return grafanaExpr.replace(/\$\{?([\d_\w]+)\}?/g, function (match, variable) {
+        if (GRAFANA_KEYWORKD.includes(variable))
             return match;
-        return `#{${$0}}`;
+        return `#{${variable}}`;
     });
 }
 /**
@@ -120,7 +120,7 @@ function tenToTweenty(source = 1) {
         return String.fromCharCode(item + 97 + (index === numArr.length - 1 ? 0 : -1));
     })
         .join('')
-        .toUpperCase();
+        .toLowerCase();
 }
 function getGridH(h, rowHeight, margin) {
     return Math.round(h * rowHeight + Math.max(0, 2 * (h - 1)) * margin);
@@ -141,19 +141,21 @@ function covertPanelToGuanceChart(grafanaPanel, rowPanel) {
     if (rowPanel) {
         const { gridPos: rowGridPos } = rowPanel;
         if (rowGridPos && gridPos) {
-            pos = {
-                x: gridPos.x,
-                w: gridPos.w,
-                y: gridPos.y - rowGridPos.y,
-                h: gridPos.h,
-            };
+            if (!rowPanel.collapsed) {
+                pos = {
+                    x: gridPos.x,
+                    w: gridPos.w,
+                    y: gridPos.y - rowGridPos.y,
+                    h: gridPos.h,
+                };
+            }
         }
     }
     const queries = [];
     if (targets && targets.length) {
         let currentIndex = 0;
         targets.forEach((_target) => {
-            const queryStr = _target.expr || _target.query;
+            const queryStr = _target.expr || _target.query || _target.queryText;
             if (!queryStr)
                 return;
             currentIndex++;
@@ -205,7 +207,7 @@ function covertPanelToGuanceChart(grafanaPanel, rowPanel) {
             h: getGuanceHByGrafanaH(pos.h),
             w: pos.w,
         },
-        name: title || '',
+        name: replaceVariableStr(title || ''),
         queries: queries,
         type: chartType,
     };
@@ -412,3 +414,4 @@ export function run(args) {
         }
     });
 }
+// console.log(JSON.stringify(result, null, 2))

package/lib/scripts/grafana-covert-to-guance.ts

@@ -13,7 +13,7 @@ import type {
   ChartTextSettings,
 } from '../generated/dashboardCharts'
 import type { DashboardData as GrafanaDashboardType, VariableModel, Panel, RowPanel } from './grafana-dashbord'
-
+import dataJson from '../example/test2.json'
 // 1.	Graph (折线图) - 用于展示时间序列数据的线图或柱状图。
 // 	2.	Stat (统计) - 用于显示单个数值，如当前值、最小值或最大值。
 // 	3.	Gauge (仪表盘) - 用于显示单个数值，并通过仪表盘样式进行可视化。
@@ -79,9 +79,9 @@ const grafanaPanelTypeToGuanceChartMap: { [key: string]: GuanceChartType } = {
 }
 const GRAFANA_KEYWORKD = ['__interval']
 function replaceVariableStr(grafanaExpr: string): string {
-  return grafanaExpr.replace(/\$([\d_\w]+)/g, (match, $0) => {
-    if (GRAFANA_KEYWORKD.includes($0)) return match
-    return `#{${$0}}`
+  return grafanaExpr.replace(/\$\{?([\d_\w]+)\}?/g, function (match, variable) {
+    if (GRAFANA_KEYWORKD.includes(variable)) return match
+    return `#{${variable}}`
   })
 }
 /**
@@ -124,7 +124,7 @@ function tenToTweenty(source: number = 1): string {
       return String.fromCharCode(item + 97 + (index === numArr.length - 1 ? 0 : -1))
     })
     .join('')
-    .toUpperCase()
+    .toLowerCase()
 }
 function getGridH(h: number, rowHeight: number, margin: number) {
   return Math.round(h * rowHeight + Math.max(0, 2 * (h - 1)) * margin)
@@ -146,11 +146,13 @@ function covertPanelToGuanceChart(grafanaPanel: Panel, rowPanel: RowPanel | unde
   if (rowPanel) {
     const { gridPos: rowGridPos } = rowPanel
     if (rowGridPos && gridPos) {
-      pos = {
-        x: gridPos.x,
-        w: gridPos.w,
-        y: gridPos.y - rowGridPos.y,
-        h: gridPos.h,
+      if (!rowPanel.collapsed) {
+        pos = {
+          x: gridPos.x,
+          w: gridPos.w,
+          y: gridPos.y - rowGridPos.y,
+          h: gridPos.h,
+        }
       }
     }
   }
@@ -158,7 +160,7 @@ function covertPanelToGuanceChart(grafanaPanel: Panel, rowPanel: RowPanel | unde
   if (targets && targets.length) {
     let currentIndex = 0
     targets.forEach((_target) => {
-      const queryStr: string | unknown = _target.expr || _target.query
+      const queryStr: string | unknown = _target.expr || _target.query || _target.queryText
       if (!queryStr) return
       currentIndex++
       const queryItem: GuanceChartQueryItem = {
@@ -209,7 +211,7 @@ function covertPanelToGuanceChart(grafanaPanel: Panel, rowPanel: RowPanel | unde
       h: getGuanceHByGrafanaH(pos.h),
       w: pos.w,
     },
-    name: title || '',
+    name: replaceVariableStr(title || ''),
     queries: queries,
     type: chartType,
   }
@@ -416,3 +418,4 @@ export async function run(args) {
     throw new Error(err)
   }
 }
+// console.log(JSON.stringify(result, null, 2))

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudcare/guance-front-tools",
-    "version": "1.0.9",
+    "version": "1.0.11",
     "publishConfig": {
         "access": "public"
     },
@@ -10,7 +10,7 @@
     "bin": {
         "grafanaCovertToGuance": "cli.js"
     },
-    "description": "观测云前端工具",
+    "description": "Guance front tools",
     "type": "module",
     "main": "lib/cjs/src/index.js",
     "types": "lib/cjs/src/index.d.ts",