@cloudcare/guance-front-tools 1.0.12 → 1.0.13

package/lib/cjs/generated/dashboardCharts.d.ts

@@ -5,6 +5,10 @@
  * 图表视图变量列表结构
  */
 export type ChartVarsSettings = ChartVarsItem[];
+/**
+ * 图表跳转链接列表
+ */
+export type ChartsCommonChartLinksSchemaJson = ChartsCommonChartLinkItemSchemaJson[];
 /**
  * 图表设置配置完整结构。
  */
@@ -201,22 +205,20 @@ export type CommonChartStackContentSettings = 'group' | 'index';
 /**
  * 图表全局设置单位
  *
+ * @minItems 2
  * @maxItems 2
  */
-export type ChartUnitItemsSettings = [] | [
-    'custom' | 'length' | 'area' | 'mass' | 'volume' | 'each' | 'temperature' | 'time' | 'digital' | 'diitalUnit' | 'partsPer' | 'speed' | 'pace' | 'pressure' | 'current' | 'voltage' | 'power' | 'reactivePower' | 'apparentPower' | 'energy' | 'reactiveEnergy' | 'volumeFlowRate' | 'illuminance' | 'frequency' | 'angle' | 'throughput' | 'percent' | 'rmb' | 'currencySymbol'
-] | [
+export type ChartUnitItemsSettings = [
     ('custom' | 'length' | 'area' | 'mass' | 'volume' | 'each' | 'temperature' | 'time' | 'digital' | 'diitalUnit' | 'partsPer' | 'speed' | 'pace' | 'pressure' | 'current' | 'voltage' | 'power' | 'reactivePower' | 'apparentPower' | 'energy' | 'reactiveEnergy' | 'volumeFlowRate' | 'illuminance' | 'frequency' | 'angle' | 'throughput' | 'percent' | 'rmb' | 'currencySymbol'),
     (('mm' | 'cm' | 'm' | 'in' | 'ft-us' | 'ft' | 'mi' | 'mm2' | 'cm2' | 'm2' | 'ha' | 'km2' | 'in2' | 'ft2' | 'ac' | 'mi2' | 'mcg' | 'mg' | 'g' | 'kg' | 'oz' | 'lb' | 'mt' | 't' | 'mm3' | 'cm3' | 'ml' | 'l' | 'kl' | 'm3' | 'km3' | 'tsp' | 'Tbs' | 'in3' | 'fl-oz' | 'cup' | 'pnt' | 'qt' | 'gal' | 'ft3' | 'yd3' | 'mm3/s' | 'cm3/s' | 'ml/s' | 'cl/s' | 'dl/s' | 'l/s' | 'l/min' | 'l/h' | 'kl/s' | 'kl/min' | 'kl/h' | 'm3/s' | 'm3/min' | 'm3/h' | 'km3/s' | 'tsp/s' | 'Tbs/s' | 'in3/s' | 'in3/min' | 'in3/h' | 'fl-oz/s' | 'fl-oz/min' | 'fl-oz/h' | 'cup/s' | 'pnt/s' | 'pnt/min' | 'pnt/h' | 'qt/s' | 'gal/s' | 'gal/min' | 'gal/h' | 'ft3/s' | 'ft3/min' | 'ft3/h' | 'yd3/s' | 'yd3/min' | 'yd3/h' | 'C' | 'F' | 'K' | 'R' | 'ns' | 'μs' | 'ms' | 's' | 'min' | 'h' | 'd' | 'week' | 'month' | 'year' | 'Hz' | 'mHz' | 'kHz' | 'MHz' | 'GHz' | 'THz' | 'rpm' | 'deg/s' | 'rad/s' | 'm/s' | 'km/h' | 'm/h' | 'knot' | 'ft/s' | 's/m' | 'min/km' | 's/ft' | 'Pa' | 'hPa' | 'kPa' | 'MPa' | 'bar' | 'torr' | 'psi' | 'ksi' | 'b' | 'Kb' | 'Mb' | 'Gb' | 'Tb' | 'B' | 'KB' | 'MB' | 'GB' | 'TB' | 'lx' | 'ft-cd' | 'ppm' | 'ppb' | 'ppt' | 'ppq' | 'V' | 'mV' | 'kV' | 'A' | 'mA' | 'kA' | 'W' | 'mW' | 'kW' | 'MW' | 'GW' | 'VA' | 'mVA' | 'kVA' | 'MVA' | 'GVA' | 'VAR' | 'mVAR' | 'kVAR' | 'MVAR' | 'GVAR' | 'Wh' | 'mWh' | 'kWh' | 'MWh' | 'GWh' | 'J' | 'kJ' | 'VARh' | 'mVARh' | 'kVARh' | 'MVARh' | 'GVARh' | 'deg' | 'rad' | 'grad' | 'arcmin' | 'arcsec') | string)
 ];
 /**
  * 图表单位数据配置
  *
+ * @minItems 2
  * @maxItems 2
  */
-export type ChartUnitItemsSettings1 = [] | [
-    'custom' | 'length' | 'area' | 'mass' | 'volume' | 'each' | 'temperature' | 'time' | 'digital' | 'diitalUnit' | 'partsPer' | 'speed' | 'pace' | 'pressure' | 'current' | 'voltage' | 'power' | 'reactivePower' | 'apparentPower' | 'energy' | 'reactiveEnergy' | 'volumeFlowRate' | 'illuminance' | 'frequency' | 'angle' | 'throughput' | 'percent' | 'rmb' | 'currencySymbol'
-] | [
+export type ChartUnitItemsSettings1 = [
     ('custom' | 'length' | 'area' | 'mass' | 'volume' | 'each' | 'temperature' | 'time' | 'digital' | 'diitalUnit' | 'partsPer' | 'speed' | 'pace' | 'pressure' | 'current' | 'voltage' | 'power' | 'reactivePower' | 'apparentPower' | 'energy' | 'reactiveEnergy' | 'volumeFlowRate' | 'illuminance' | 'frequency' | 'angle' | 'throughput' | 'percent' | 'rmb' | 'currencySymbol'),
     (('mm' | 'cm' | 'm' | 'in' | 'ft-us' | 'ft' | 'mi' | 'mm2' | 'cm2' | 'm2' | 'ha' | 'km2' | 'in2' | 'ft2' | 'ac' | 'mi2' | 'mcg' | 'mg' | 'g' | 'kg' | 'oz' | 'lb' | 'mt' | 't' | 'mm3' | 'cm3' | 'ml' | 'l' | 'kl' | 'm3' | 'km3' | 'tsp' | 'Tbs' | 'in3' | 'fl-oz' | 'cup' | 'pnt' | 'qt' | 'gal' | 'ft3' | 'yd3' | 'mm3/s' | 'cm3/s' | 'ml/s' | 'cl/s' | 'dl/s' | 'l/s' | 'l/min' | 'l/h' | 'kl/s' | 'kl/min' | 'kl/h' | 'm3/s' | 'm3/min' | 'm3/h' | 'km3/s' | 'tsp/s' | 'Tbs/s' | 'in3/s' | 'in3/min' | 'in3/h' | 'fl-oz/s' | 'fl-oz/min' | 'fl-oz/h' | 'cup/s' | 'pnt/s' | 'pnt/min' | 'pnt/h' | 'qt/s' | 'gal/s' | 'gal/min' | 'gal/h' | 'ft3/s' | 'ft3/min' | 'ft3/h' | 'yd3/s' | 'yd3/min' | 'yd3/h' | 'C' | 'F' | 'K' | 'R' | 'ns' | 'μs' | 'ms' | 's' | 'min' | 'h' | 'd' | 'week' | 'month' | 'year' | 'Hz' | 'mHz' | 'kHz' | 'MHz' | 'GHz' | 'THz' | 'rpm' | 'deg/s' | 'rad/s' | 'm/s' | 'km/h' | 'm/h' | 'knot' | 'ft/s' | 's/m' | 'min/km' | 's/ft' | 'Pa' | 'hPa' | 'kPa' | 'MPa' | 'bar' | 'torr' | 'psi' | 'ksi' | 'b' | 'Kb' | 'Mb' | 'Gb' | 'Tb' | 'B' | 'KB' | 'MB' | 'GB' | 'TB' | 'lx' | 'ft-cd' | 'ppm' | 'ppb' | 'ppt' | 'ppq' | 'V' | 'mV' | 'kV' | 'A' | 'mA' | 'kA' | 'W' | 'mW' | 'kW' | 'MW' | 'GW' | 'VA' | 'mVA' | 'kVA' | 'MVA' | 'GVA' | 'VAR' | 'mVAR' | 'kVAR' | 'MVAR' | 'GVAR' | 'Wh' | 'mWh' | 'kWh' | 'MWh' | 'GWh' | 'J' | 'kJ' | 'VARh' | 'mVARh' | 'kVARh' | 'MVARh' | 'GVARh' | 'deg' | 'rad' | 'grad' | 'arcmin' | 'arcsec') | string)
 ];
@@ -625,7 +627,7 @@ export type CommonChartLegendValuesSettings = ('first' | 'last' | 'avg' | 'min'
 /**
  * 支持图表类型枚举
  */
-export type ChartType = 'group' | 'sequence' | 'singlestat' | 'pie' | 'bar' | 'histogram' | 'slo' | 'toplist' | 'gauge' | 'scatter' | 'bubble' | 'table' | 'treemap' | 'funnel' | 'chinamap' | 'worldmap' | 'hexgon' | 'heatmap' | 'topology' | 'sankey' | 'log' | 'object' | 'alarm' | 'text' | 'video' | 'picture' | 'command' | 'iframe';
+export type ChartType = 'group' | 'sequence' | 'singlestat' | 'pie' | 'bar' | 'histogram' | 'slo' | 'toplist' | 'gauge' | 'scatter' | 'bubble' | 'table' | 'treemap' | 'funnel' | 'chinamap' | 'worldmap' | 'hexgon' | 'heatmap' | 'topology' | 'sankey' | 'change' | 'log' | 'object' | 'monitor' | 'alarm' | 'text' | 'video' | 'picture' | 'command' | 'iframe';
 /**
  * 概览图配置信息
  */
@@ -919,11 +921,11 @@ export type ChartWorldMapSettings = CommonChartSettings & {
 /**
  * 支持图表类型枚举
  */
-export type ChartType1 = 'group' | 'sequence' | 'singlestat' | 'pie' | 'bar' | 'histogram' | 'slo' | 'toplist' | 'gauge' | 'scatter' | 'bubble' | 'table' | 'treemap' | 'funnel' | 'chinamap' | 'worldmap' | 'hexgon' | 'heatmap' | 'topology' | 'sankey' | 'log' | 'object' | 'alarm' | 'text' | 'video' | 'picture' | 'command' | 'iframe';
+export type ChartType1 = 'group' | 'sequence' | 'singlestat' | 'pie' | 'bar' | 'histogram' | 'slo' | 'toplist' | 'gauge' | 'scatter' | 'bubble' | 'table' | 'treemap' | 'funnel' | 'chinamap' | 'worldmap' | 'hexgon' | 'heatmap' | 'topology' | 'sankey' | 'change' | 'log' | 'object' | 'monitor' | 'alarm' | 'text' | 'video' | 'picture' | 'command' | 'iframe';
 /**
  * 支持图表类型枚举
  */
-export type ChartType2 = 'group' | 'sequence' | 'singlestat' | 'pie' | 'bar' | 'histogram' | 'slo' | 'toplist' | 'gauge' | 'scatter' | 'bubble' | 'table' | 'treemap' | 'funnel' | 'chinamap' | 'worldmap' | 'hexgon' | 'heatmap' | 'topology' | 'sankey' | 'log' | 'object' | 'alarm' | 'text' | 'video' | 'picture' | 'command' | 'iframe';
+export type ChartType2 = 'group' | 'sequence' | 'singlestat' | 'pie' | 'bar' | 'histogram' | 'slo' | 'toplist' | 'gauge' | 'scatter' | 'bubble' | 'table' | 'treemap' | 'funnel' | 'chinamap' | 'worldmap' | 'hexgon' | 'heatmap' | 'topology' | 'sankey' | 'change' | 'log' | 'object' | 'monitor' | 'alarm' | 'text' | 'video' | 'picture' | 'command' | 'iframe';
 /**
  * 图表查询语句列表结构
  */
@@ -966,9 +968,9 @@ export interface DashboardData {
             [k: string]: unknown;
         }[];
         /**
-         * 固定字段
+         * 仪表板主体类型，现有数据中常缺省，存在时固定为 template
          */
-        type?: 'template';
+        type?: 'template' | null;
         [k: string]: unknown;
     };
     /**
@@ -1072,6 +1074,7 @@ export interface ChartVarsItem {
  */
 export interface ChartData {
     extend: {
+        links?: ChartsCommonChartLinksSchemaJson;
         settings?: ChartSettings;
         [k: string]: unknown;
     };
@@ -1109,16 +1112,42 @@ export interface ChartData {
     queries: ChartQueries;
     [k: string]: unknown;
 }
+/**
+ * 图表联动跳转项
+ */
+export interface ChartsCommonChartLinkItemSchemaJson {
+    /**
+     * 跳转地址
+     */
+    url: string;
+    /**
+     * 打开方式
+     */
+    open: 'newWin' | 'curWin' | 'drawerWin';
+    /**
+     * 是否展示
+     */
+    show: boolean;
+    /**
+     * 跳转类型
+     */
+    type: 'logging' | 'container' | 'processes' | 'tracing' | 'host' | 'custom';
+    /**
+     * 是否修改过显示状态
+     */
+    showChanged: boolean;
+    [k: string]: unknown;
+}
 /**
  * 图表时间相关配置完整结构。
  */
 export interface ChartTimeSettings {
-    timeInterval: 'auto' | '1ms' | '10ms' | '50ms' | '100ms' | '500ms' | '1s' | '10s' | '20s' | '30s' | '1m' | '5m' | '10m' | '30m' | '1h' | '6h' | '12h' | '1d' | '7d' | '30d';
+    timeInterval?: 'auto' | '1ms' | '10ms' | '50ms' | '100ms' | '500ms' | '1s' | '10s' | '20s' | '30s' | '1m' | '5m' | '10m' | '30m' | '1h' | '6h' | '12h' | '1d' | '7d' | '30d';
     /**
      * 返回最大数据电枢
      */
     maxPointCount?: number;
-    fixedTime: ChartsSettingsSettingsFixedTimeSchemaJson;
+    fixedTime?: ChartsSettingsSettingsFixedTimeSchemaJson;
     [k: string]: unknown;
 }
 /**
@@ -1359,10 +1388,22 @@ export interface ChartQueryItem {
          * 图表查询语句，可以是 dql语句，也可以是 promql 语句
          */
         q?: string;
+        /**
+         * 文本图内容，支持 HTML 或 Markdown 文本
+         */
+        content?: string;
         /**
          * 查询语句的唯一标识，由单个大写英文字母构成
          */
         code?: string;
+        /**
+         * 查询语句类型冗余字段，实际数据中可能是 promql/dql，也可能是 default/simple 这类查询模式
+         */
+        type?: 'default' | 'simple' | 'dql' | 'promql';
+        /**
+         * PromQL 查询顺序编号
+         */
+        promqlCode?: number;
         [k: string]: unknown;
     };
     [k: string]: unknown;

package/lib/cjs/scripts/grafana-covert-to-guance-core.d.ts

@@ -1,4 +1,4 @@
 import type { DashboardData as GuanceDashboardType } from '../generated/dashboardCharts';
 import type { DashboardData as GrafanaDashboardType, VariableModel, Panel, RowPanel } from './grafana-dashbord';
 export declare function covert(grafanaData: GrafanaDashboardType): GuanceDashboardType;
-export type { GrafanaDashboardType, Panel as GrafanaPanel, RowPanel as GrafanaRowPanel, VariableModel as GrafanaVariableModel };
+export type { GrafanaDashboardType, Panel as GrafanaPanel, RowPanel as GrafanaRowPanel, VariableModel as GrafanaVariableModel, };

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

@@ -1,294 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.covert = covert;
-var grafanaPanelTypeToGuanceChartMap = {
-    stat: 'singlestat',
-    singlestat: 'singlestat',
-    barchart: 'bar',
-    timeseries: 'sequence',
-    graph: 'sequence',
-    piechart: 'pie',
-    histogram: 'histogram',
-    bargauge: 'toplist',
-    gauge: 'gauge',
-    table: 'table',
-    text: 'text',
-    heatmap: 'heatmap',
-    treemap: 'treemap',
-};
-var GRAFANA_KEYWORKD = ['__interval'];
-var VARIABLE_MAP = {
-    query: 'PROMQL_QUERY',
-    custom: 'CUSTOM_LIST',
-};
-var VARIABLE_DATASOURCE_MAP = {
-    query: 'dataflux',
-    custom: 'custom',
-};
-function isSupportedVariableType(type) {
-    return Object.prototype.hasOwnProperty.call(VARIABLE_MAP, type);
-}
-function replaceVariableStr(grafanaExpr) {
-    return grafanaExpr.replace(/\$\{?([\d_\w]+)\}?/g, function (match, variable) {
-        if (GRAFANA_KEYWORKD.indexOf(variable) > -1)
-            return match;
-        return "#{".concat(variable, "}");
-    });
-}
-function sortPanelItemsByRowCol(panels) {
-    return panels.slice(0).sort(function (panelA, panelB) {
-        var posA = panelA.gridPos;
-        var posB = panelB.gridPos;
-        if (!posA || !posB)
-            return -1;
-        if (posA.y === posB.y && posA.x === posB.x && posA.w > posB.w) {
-            return -1;
-        }
-        if (posA.y === posB.y && posA.x === posB.x) {
-            return 0;
-        }
-        if (posA.y > posB.y || (posA.y === posB.y && posA.x > posB.x)) {
-            return 1;
-        }
-        return -1;
-    });
-}
-function tenToTweenty(source) {
-    if (source === void 0) { source = 1; }
-    var numArr = [];
-    source--;
-    do {
-        numArr.push(source % 26);
-        source = Math.floor(source / 26);
-    } while (source > 0);
-    return numArr
-        .reverse()
-        .map(function (item, index) {
-        return String.fromCharCode(item + 97 + (index === numArr.length - 1 ? 0 : -1));
-    })
-        .join('')
-        .toLowerCase();
-}
-function getGridH(h, rowHeight, margin) {
-    return Math.round(h * rowHeight + Math.max(0, 2 * (h - 1)) * margin);
-}
-function getGuanceHByGrafanaH(granfanH) {
-    return (getGridH(granfanH, 30, 4) + 10) / 20;
-}
-function covertPanelToGuanceChart(grafanaPanel, rowPanel) {
-    var gridPos = grafanaPanel.gridPos, title = grafanaPanel.title, type = grafanaPanel.type, targets = grafanaPanel.targets, options = grafanaPanel.options;
-    var chartType = grafanaPanelTypeToGuanceChartMap[type];
-    var pos = {
-        x: gridPos.x,
-        w: gridPos.w,
-        y: gridPos.y,
-        h: gridPos.h,
-    };
-    if (rowPanel) {
-        var rowGridPos = rowPanel.gridPos;
-        if (rowGridPos && gridPos && !rowPanel.collapsed) {
-            pos = {
-                x: gridPos.x,
-                w: gridPos.w,
-                y: gridPos.y - rowGridPos.y,
-                h: gridPos.h,
-            };
-        }
-    }
-    var queries = [];
-    if (targets && targets.length) {
-        var currentIndex_1 = 0;
-        targets.forEach(function (_target) {
-            var queryStr = _target.expr || _target.query || _target.queryText;
-            if (!queryStr)
-                return;
-            currentIndex_1++;
-            var queryItem = {
-                datasource: 'dataflux',
-                qtype: 'promql',
-                type: chartType,
-                query: {
-                    q: replaceVariableStr(queryStr),
-                    type: 'promql',
-                    code: tenToTweenty(currentIndex_1),
-                    promqlCode: currentIndex_1,
-                },
-            };
-            queries.push(queryItem);
-        });
-    }
-    var settings = {};
-    if (options) {
-        switch (chartType) {
-            case 'text':
-                queries.push({
-                    query: {
-                        content: options.content,
-                    },
-                });
-                break;
-            case 'toplist':
-                settings = {
-                    showTopSize: true,
-                    chartType: 'bar',
-                };
-                break;
-            default:
-                break;
-        }
-    }
-    return {
-        extend: {
-            settings: settings,
-        },
-        group: {
-            name: rowPanel ? rowPanel.title : null,
-        },
-        pos: {
-            x: pos.x,
-            y: getGuanceHByGrafanaH(pos.y),
-            h: getGuanceHByGrafanaH(pos.h),
-            w: pos.w,
-        },
-        name: replaceVariableStr(title || ''),
-        queries: queries,
-        type: chartType,
-    };
-}
-function covertPanelsToCharts(grafanaPanelData, rowPanel) {
-    var guanceCharts = [];
-    grafanaPanelData.forEach(function (grafanaPanel) {
-        if (!grafanaPanel.gridPos)
-            return;
-        guanceCharts.push(covertPanelToGuanceChart(grafanaPanel, rowPanel));
-    });
-    return guanceCharts;
-}
+// This script is the shared conversion source for the published API and CLI.
+// Keep it thin and delegate to the maintained converter implementation.
+// @ts-ignore
+var convert_grafana_dashboard_mjs_1 = require("../../skills/grafana-to-guance-dashboard/scripts/convert-grafana-dashboard.mjs");
 function covert(grafanaData) {
-    var _a, _b, _c;
-    var covertGuanceResult = {};
-    covertGuanceResult.title = grafanaData.title;
-    var guanceVars = [];
-    (_b = (_a = grafanaData.templating) === null || _a === void 0 ? void 0 : _a.list) === null || _b === void 0 ? void 0 : _b.forEach(function (_variable, index) {
-        var current = _variable.current, type = _variable.type, allValue = _variable.allValue;
-        var variableType = String(type);
-        if (!isSupportedVariableType(variableType))
-            return;
-        var defaultVal = {
-            label: '',
-            value: '',
-        };
-        if (current) {
-            var labels = [];
-            var values = [];
-            if (Array.isArray(current.text)) {
-                labels = current.text;
-            }
-            else if (typeof current.text === 'string') {
-                labels = [current.text];
-            }
-            if (Array.isArray(current.value)) {
-                values = current.value;
-            }
-            else if (typeof current.value === 'string') {
-                values = [current.value];
-            }
-            labels = labels.map(function (label) {
-                if (label === 'All') {
-                    if (allValue === '.*') {
-                        return '*';
-                    }
-                    return 'all values';
-                }
-                return label;
-            });
-            values = values.map(function (value) {
-                if (value === '$__all') {
-                    if (allValue === '.*') {
-                        return '*';
-                    }
-                    return '__all__';
-                }
-                return value;
-            });
-            defaultVal = {
-                label: labels.join(','),
-                value: values.join(','),
-            };
-        }
-        var value = _variable.query;
-        if (value && typeof value === 'object' && value.query) {
-            value = replaceVariableStr(value.query);
-        }
-        else if (value && typeof value === 'string') {
-            value = replaceVariableStr(_variable.query);
-        }
-        else {
-            return;
-        }
-        var guanceVariableItem = {
-            type: VARIABLE_MAP[variableType],
-            datasource: VARIABLE_DATASOURCE_MAP[variableType],
-            name: _variable.label || _variable.name || '',
-            seq: index,
-            hide: _variable.hide ? 1 : 0,
-            multiple: _variable.multi !== undefined ? _variable.multi : true,
-            includeStar: _variable.includeAll !== undefined ? _variable.includeAll : true,
-            valueSort: 'desc',
-            code: _variable.name,
-            definition: {
-                value: value,
-                defaultVal: defaultVal,
-            },
-        };
-        guanceVars.push(guanceVariableItem);
-    });
-    var guanceGroups = [];
-    var guanceExpand = {};
-    var guanceCharts = [];
-    var lastRowPanel;
-    var lastPanels = [];
-    var grafanaCharts = ((_c = grafanaData.panels) === null || _c === void 0 ? void 0 : _c.filter(function (_panel) { return _panel.type === 'row' || grafanaPanelTypeToGuanceChartMap[_panel.type]; })) || [];
-    grafanaCharts = sortPanelItemsByRowCol(grafanaCharts);
-    grafanaCharts.forEach(function (_panel) {
-        var _a;
-        if (_panel.type === 'row') {
-            var _rowPanel = _panel;
-            if (_rowPanel.title) {
-                guanceGroups.push({
-                    name: _rowPanel.title,
-                });
-                guanceExpand[_rowPanel.title] = !_rowPanel.collapsed;
-            }
-            if (lastPanels.length) {
-                guanceCharts.push.apply(guanceCharts, covertPanelsToCharts(lastPanels, lastRowPanel));
-                lastPanels = [];
-                lastRowPanel = undefined;
-            }
-            if (_rowPanel.collapsed) {
-                var subPanels = ((_a = _rowPanel.panels) === null || _a === void 0 ? void 0 : _a.filter(function (_childPanel) {
-                    return _childPanel.type === 'row' || grafanaPanelTypeToGuanceChartMap[_childPanel.type];
-                })) || [];
-                guanceCharts.push.apply(guanceCharts, covertPanelsToCharts(subPanels, _rowPanel));
-            }
-            else {
-                lastRowPanel = _rowPanel;
-            }
-        }
-        else {
-            lastPanels.push(_panel);
-        }
-    });
-    if (lastPanels.length) {
-        guanceCharts.push.apply(guanceCharts, covertPanelsToCharts(lastPanels, lastRowPanel));
-    }
-    covertGuanceResult.dashboardExtend = {
-        groupUnfoldStatus: guanceExpand,
-    };
-    covertGuanceResult.main = {
-        vars: guanceVars,
-        charts: guanceCharts,
-        groups: guanceGroups,
-    };
-    return covertGuanceResult;
+    return (0, convert_grafana_dashboard_mjs_1.convertDashboard)(grafanaData);
 }

package/lib/esm/generated/dashboardCharts.d.ts

@@ -5,6 +5,10 @@
  * 图表视图变量列表结构
  */
 export type ChartVarsSettings = ChartVarsItem[];
+/**
+ * 图表跳转链接列表
+ */
+export type ChartsCommonChartLinksSchemaJson = ChartsCommonChartLinkItemSchemaJson[];
 /**
  * 图表设置配置完整结构。
  */
@@ -201,22 +205,20 @@ export type CommonChartStackContentSettings = 'group' | 'index';
 /**
  * 图表全局设置单位
  *
+ * @minItems 2
  * @maxItems 2
  */
-export type ChartUnitItemsSettings = [] | [
-    'custom' | 'length' | 'area' | 'mass' | 'volume' | 'each' | 'temperature' | 'time' | 'digital' | 'diitalUnit' | 'partsPer' | 'speed' | 'pace' | 'pressure' | 'current' | 'voltage' | 'power' | 'reactivePower' | 'apparentPower' | 'energy' | 'reactiveEnergy' | 'volumeFlowRate' | 'illuminance' | 'frequency' | 'angle' | 'throughput' | 'percent' | 'rmb' | 'currencySymbol'
-] | [
+export type ChartUnitItemsSettings = [
     ('custom' | 'length' | 'area' | 'mass' | 'volume' | 'each' | 'temperature' | 'time' | 'digital' | 'diitalUnit' | 'partsPer' | 'speed' | 'pace' | 'pressure' | 'current' | 'voltage' | 'power' | 'reactivePower' | 'apparentPower' | 'energy' | 'reactiveEnergy' | 'volumeFlowRate' | 'illuminance' | 'frequency' | 'angle' | 'throughput' | 'percent' | 'rmb' | 'currencySymbol'),
     (('mm' | 'cm' | 'm' | 'in' | 'ft-us' | 'ft' | 'mi' | 'mm2' | 'cm2' | 'm2' | 'ha' | 'km2' | 'in2' | 'ft2' | 'ac' | 'mi2' | 'mcg' | 'mg' | 'g' | 'kg' | 'oz' | 'lb' | 'mt' | 't' | 'mm3' | 'cm3' | 'ml' | 'l' | 'kl' | 'm3' | 'km3' | 'tsp' | 'Tbs' | 'in3' | 'fl-oz' | 'cup' | 'pnt' | 'qt' | 'gal' | 'ft3' | 'yd3' | 'mm3/s' | 'cm3/s' | 'ml/s' | 'cl/s' | 'dl/s' | 'l/s' | 'l/min' | 'l/h' | 'kl/s' | 'kl/min' | 'kl/h' | 'm3/s' | 'm3/min' | 'm3/h' | 'km3/s' | 'tsp/s' | 'Tbs/s' | 'in3/s' | 'in3/min' | 'in3/h' | 'fl-oz/s' | 'fl-oz/min' | 'fl-oz/h' | 'cup/s' | 'pnt/s' | 'pnt/min' | 'pnt/h' | 'qt/s' | 'gal/s' | 'gal/min' | 'gal/h' | 'ft3/s' | 'ft3/min' | 'ft3/h' | 'yd3/s' | 'yd3/min' | 'yd3/h' | 'C' | 'F' | 'K' | 'R' | 'ns' | 'μs' | 'ms' | 's' | 'min' | 'h' | 'd' | 'week' | 'month' | 'year' | 'Hz' | 'mHz' | 'kHz' | 'MHz' | 'GHz' | 'THz' | 'rpm' | 'deg/s' | 'rad/s' | 'm/s' | 'km/h' | 'm/h' | 'knot' | 'ft/s' | 's/m' | 'min/km' | 's/ft' | 'Pa' | 'hPa' | 'kPa' | 'MPa' | 'bar' | 'torr' | 'psi' | 'ksi' | 'b' | 'Kb' | 'Mb' | 'Gb' | 'Tb' | 'B' | 'KB' | 'MB' | 'GB' | 'TB' | 'lx' | 'ft-cd' | 'ppm' | 'ppb' | 'ppt' | 'ppq' | 'V' | 'mV' | 'kV' | 'A' | 'mA' | 'kA' | 'W' | 'mW' | 'kW' | 'MW' | 'GW' | 'VA' | 'mVA' | 'kVA' | 'MVA' | 'GVA' | 'VAR' | 'mVAR' | 'kVAR' | 'MVAR' | 'GVAR' | 'Wh' | 'mWh' | 'kWh' | 'MWh' | 'GWh' | 'J' | 'kJ' | 'VARh' | 'mVARh' | 'kVARh' | 'MVARh' | 'GVARh' | 'deg' | 'rad' | 'grad' | 'arcmin' | 'arcsec') | string)
 ];
 /**
  * 图表单位数据配置
  *
+ * @minItems 2
  * @maxItems 2
  */
-export type ChartUnitItemsSettings1 = [] | [
-    'custom' | 'length' | 'area' | 'mass' | 'volume' | 'each' | 'temperature' | 'time' | 'digital' | 'diitalUnit' | 'partsPer' | 'speed' | 'pace' | 'pressure' | 'current' | 'voltage' | 'power' | 'reactivePower' | 'apparentPower' | 'energy' | 'reactiveEnergy' | 'volumeFlowRate' | 'illuminance' | 'frequency' | 'angle' | 'throughput' | 'percent' | 'rmb' | 'currencySymbol'
-] | [
+export type ChartUnitItemsSettings1 = [
     ('custom' | 'length' | 'area' | 'mass' | 'volume' | 'each' | 'temperature' | 'time' | 'digital' | 'diitalUnit' | 'partsPer' | 'speed' | 'pace' | 'pressure' | 'current' | 'voltage' | 'power' | 'reactivePower' | 'apparentPower' | 'energy' | 'reactiveEnergy' | 'volumeFlowRate' | 'illuminance' | 'frequency' | 'angle' | 'throughput' | 'percent' | 'rmb' | 'currencySymbol'),
     (('mm' | 'cm' | 'm' | 'in' | 'ft-us' | 'ft' | 'mi' | 'mm2' | 'cm2' | 'm2' | 'ha' | 'km2' | 'in2' | 'ft2' | 'ac' | 'mi2' | 'mcg' | 'mg' | 'g' | 'kg' | 'oz' | 'lb' | 'mt' | 't' | 'mm3' | 'cm3' | 'ml' | 'l' | 'kl' | 'm3' | 'km3' | 'tsp' | 'Tbs' | 'in3' | 'fl-oz' | 'cup' | 'pnt' | 'qt' | 'gal' | 'ft3' | 'yd3' | 'mm3/s' | 'cm3/s' | 'ml/s' | 'cl/s' | 'dl/s' | 'l/s' | 'l/min' | 'l/h' | 'kl/s' | 'kl/min' | 'kl/h' | 'm3/s' | 'm3/min' | 'm3/h' | 'km3/s' | 'tsp/s' | 'Tbs/s' | 'in3/s' | 'in3/min' | 'in3/h' | 'fl-oz/s' | 'fl-oz/min' | 'fl-oz/h' | 'cup/s' | 'pnt/s' | 'pnt/min' | 'pnt/h' | 'qt/s' | 'gal/s' | 'gal/min' | 'gal/h' | 'ft3/s' | 'ft3/min' | 'ft3/h' | 'yd3/s' | 'yd3/min' | 'yd3/h' | 'C' | 'F' | 'K' | 'R' | 'ns' | 'μs' | 'ms' | 's' | 'min' | 'h' | 'd' | 'week' | 'month' | 'year' | 'Hz' | 'mHz' | 'kHz' | 'MHz' | 'GHz' | 'THz' | 'rpm' | 'deg/s' | 'rad/s' | 'm/s' | 'km/h' | 'm/h' | 'knot' | 'ft/s' | 's/m' | 'min/km' | 's/ft' | 'Pa' | 'hPa' | 'kPa' | 'MPa' | 'bar' | 'torr' | 'psi' | 'ksi' | 'b' | 'Kb' | 'Mb' | 'Gb' | 'Tb' | 'B' | 'KB' | 'MB' | 'GB' | 'TB' | 'lx' | 'ft-cd' | 'ppm' | 'ppb' | 'ppt' | 'ppq' | 'V' | 'mV' | 'kV' | 'A' | 'mA' | 'kA' | 'W' | 'mW' | 'kW' | 'MW' | 'GW' | 'VA' | 'mVA' | 'kVA' | 'MVA' | 'GVA' | 'VAR' | 'mVAR' | 'kVAR' | 'MVAR' | 'GVAR' | 'Wh' | 'mWh' | 'kWh' | 'MWh' | 'GWh' | 'J' | 'kJ' | 'VARh' | 'mVARh' | 'kVARh' | 'MVARh' | 'GVARh' | 'deg' | 'rad' | 'grad' | 'arcmin' | 'arcsec') | string)
 ];
@@ -625,7 +627,7 @@ export type CommonChartLegendValuesSettings = ('first' | 'last' | 'avg' | 'min'
 /**
  * 支持图表类型枚举
  */
-export type ChartType = 'group' | 'sequence' | 'singlestat' | 'pie' | 'bar' | 'histogram' | 'slo' | 'toplist' | 'gauge' | 'scatter' | 'bubble' | 'table' | 'treemap' | 'funnel' | 'chinamap' | 'worldmap' | 'hexgon' | 'heatmap' | 'topology' | 'sankey' | 'log' | 'object' | 'alarm' | 'text' | 'video' | 'picture' | 'command' | 'iframe';
+export type ChartType = 'group' | 'sequence' | 'singlestat' | 'pie' | 'bar' | 'histogram' | 'slo' | 'toplist' | 'gauge' | 'scatter' | 'bubble' | 'table' | 'treemap' | 'funnel' | 'chinamap' | 'worldmap' | 'hexgon' | 'heatmap' | 'topology' | 'sankey' | 'change' | 'log' | 'object' | 'monitor' | 'alarm' | 'text' | 'video' | 'picture' | 'command' | 'iframe';
 /**
  * 概览图配置信息
  */
@@ -919,11 +921,11 @@ export type ChartWorldMapSettings = CommonChartSettings & {
 /**
  * 支持图表类型枚举
  */
-export type ChartType1 = 'group' | 'sequence' | 'singlestat' | 'pie' | 'bar' | 'histogram' | 'slo' | 'toplist' | 'gauge' | 'scatter' | 'bubble' | 'table' | 'treemap' | 'funnel' | 'chinamap' | 'worldmap' | 'hexgon' | 'heatmap' | 'topology' | 'sankey' | 'log' | 'object' | 'alarm' | 'text' | 'video' | 'picture' | 'command' | 'iframe';
+export type ChartType1 = 'group' | 'sequence' | 'singlestat' | 'pie' | 'bar' | 'histogram' | 'slo' | 'toplist' | 'gauge' | 'scatter' | 'bubble' | 'table' | 'treemap' | 'funnel' | 'chinamap' | 'worldmap' | 'hexgon' | 'heatmap' | 'topology' | 'sankey' | 'change' | 'log' | 'object' | 'monitor' | 'alarm' | 'text' | 'video' | 'picture' | 'command' | 'iframe';
 /**
  * 支持图表类型枚举
  */
-export type ChartType2 = 'group' | 'sequence' | 'singlestat' | 'pie' | 'bar' | 'histogram' | 'slo' | 'toplist' | 'gauge' | 'scatter' | 'bubble' | 'table' | 'treemap' | 'funnel' | 'chinamap' | 'worldmap' | 'hexgon' | 'heatmap' | 'topology' | 'sankey' | 'log' | 'object' | 'alarm' | 'text' | 'video' | 'picture' | 'command' | 'iframe';
+export type ChartType2 = 'group' | 'sequence' | 'singlestat' | 'pie' | 'bar' | 'histogram' | 'slo' | 'toplist' | 'gauge' | 'scatter' | 'bubble' | 'table' | 'treemap' | 'funnel' | 'chinamap' | 'worldmap' | 'hexgon' | 'heatmap' | 'topology' | 'sankey' | 'change' | 'log' | 'object' | 'monitor' | 'alarm' | 'text' | 'video' | 'picture' | 'command' | 'iframe';
 /**
  * 图表查询语句列表结构
  */
@@ -966,9 +968,9 @@ export interface DashboardData {
             [k: string]: unknown;
         }[];
         /**
-         * 固定字段
+         * 仪表板主体类型，现有数据中常缺省，存在时固定为 template
          */
-        type?: 'template';
+        type?: 'template' | null;
         [k: string]: unknown;
     };
     /**
@@ -1072,6 +1074,7 @@ export interface ChartVarsItem {
  */
 export interface ChartData {
     extend: {
+        links?: ChartsCommonChartLinksSchemaJson;
         settings?: ChartSettings;
         [k: string]: unknown;
     };
@@ -1109,16 +1112,42 @@ export interface ChartData {
     queries: ChartQueries;
     [k: string]: unknown;
 }
+/**
+ * 图表联动跳转项
+ */
+export interface ChartsCommonChartLinkItemSchemaJson {
+    /**
+     * 跳转地址
+     */
+    url: string;
+    /**
+     * 打开方式
+     */
+    open: 'newWin' | 'curWin' | 'drawerWin';
+    /**
+     * 是否展示
+     */
+    show: boolean;
+    /**
+     * 跳转类型
+     */
+    type: 'logging' | 'container' | 'processes' | 'tracing' | 'host' | 'custom';
+    /**
+     * 是否修改过显示状态
+     */
+    showChanged: boolean;
+    [k: string]: unknown;
+}
 /**
  * 图表时间相关配置完整结构。
  */
 export interface ChartTimeSettings {
-    timeInterval: 'auto' | '1ms' | '10ms' | '50ms' | '100ms' | '500ms' | '1s' | '10s' | '20s' | '30s' | '1m' | '5m' | '10m' | '30m' | '1h' | '6h' | '12h' | '1d' | '7d' | '30d';
+    timeInterval?: 'auto' | '1ms' | '10ms' | '50ms' | '100ms' | '500ms' | '1s' | '10s' | '20s' | '30s' | '1m' | '5m' | '10m' | '30m' | '1h' | '6h' | '12h' | '1d' | '7d' | '30d';
     /**
      * 返回最大数据电枢
      */
     maxPointCount?: number;
-    fixedTime: ChartsSettingsSettingsFixedTimeSchemaJson;
+    fixedTime?: ChartsSettingsSettingsFixedTimeSchemaJson;
     [k: string]: unknown;
 }
 /**
@@ -1359,10 +1388,22 @@ export interface ChartQueryItem {
          * 图表查询语句，可以是 dql语句，也可以是 promql 语句
          */
         q?: string;
+        /**
+         * 文本图内容，支持 HTML 或 Markdown 文本
+         */
+        content?: string;
         /**
          * 查询语句的唯一标识，由单个大写英文字母构成
          */
         code?: string;
+        /**
+         * 查询语句类型冗余字段，实际数据中可能是 promql/dql，也可能是 default/simple 这类查询模式
+         */
+        type?: 'default' | 'simple' | 'dql' | 'promql';
+        /**
+         * PromQL 查询顺序编号
+         */
+        promqlCode?: number;
         [k: string]: unknown;
     };
     [k: string]: unknown;

package/lib/esm/scripts/grafana-covert-to-guance-core.d.ts

@@ -1,4 +1,4 @@
 import type { DashboardData as GuanceDashboardType } from '../generated/dashboardCharts';
 import type { DashboardData as GrafanaDashboardType, VariableModel, Panel, RowPanel } from './grafana-dashbord';
 export declare function covert(grafanaData: GrafanaDashboardType): GuanceDashboardType;
-export type { GrafanaDashboardType, Panel as GrafanaPanel, RowPanel as GrafanaRowPanel, VariableModel as GrafanaVariableModel };
+export type { GrafanaDashboardType, Panel as GrafanaPanel, RowPanel as GrafanaRowPanel, VariableModel as GrafanaVariableModel, };