fix: replace scopedVars

n9e · Feb 28, 2023 · 468e787 · 468e787
1 parent 1dd2a15
commit 468e787
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/pages/dashboard/Renderer/utils/replaceFieldWithVariable.ts b/src/pages/dashboard/Renderer/utils/replaceFieldWithVariable.ts
@@ -27,7 +27,6 @@ export const replaceExpressionVarsSpecifyRule = (
   _.forEach(scopedVars, (vValue, vKey) => {
     newExpression = replaceAllPolyfill(newExpression, getPlaceholder(vKey), vValue);
   });
-
   return newExpression;
 };
 
@@ -53,7 +52,7 @@ export const replaceExpressionScopedVars = (expression: string, scopedVars: any)
 export default function replaceFieldWithVariable(dashboardId, value: string, variableConfig?: IVariable[], scopedVars?: any) {
   if (!value) return value;
   if (scopedVars) {
-    return replaceExpressionScopedVars(value, scopedVars);
+    value = replaceExpressionScopedVars(value, scopedVars);
   }
   if (!variableConfig) {
     return value;

diff --git a/src/pages/dashboard/utils.ts b/src/pages/dashboard/utils.ts
@@ -268,6 +268,7 @@ function convertPanlesGrafanaToN9E(panels: any) {
             ...item.gridPos,
             i: uid,
           },
+
           panels: convertPanlesGrafanaToN9E(item.panels),
         };
       }
@@ -297,6 +298,8 @@ function convertPanlesGrafanaToN9E(panels: any) {
           .value(),
         options: convertOptionsGrafanaToN9E(item),
         custom: chartsMap[item.type] ? chartsMap[item.type].fn(item) : {},
+        maxPerRow: item.maxPerRow || 4,
+        repeat: item.repeat,
       };
     })
     .value();