diff --git a/src/views/dashboard/Widget.vue b/src/views/dashboard/Widget.vue index 466ae247..b7a2c50e 100644 --- a/src/views/dashboard/Widget.vue +++ b/src/views/dashboard/Widget.vue @@ -149,6 +149,7 @@ limitations under the License. --> metrics: config.value.metrics || [], metricTypes: config.value.metricTypes || [], metricConfig: config.value.metricConfig || [], + subExpressions: config.value.subExpressions || [], }; source.value = isExpression ? await useExpressionsSourceProcessor(json, d) : await useSourceProcessor(json, d); } diff --git a/src/views/dashboard/components/WidgetLink.vue b/src/views/dashboard/components/WidgetLink.vue index a03e6b27..c92d4411 100644 --- a/src/views/dashboard/components/WidgetLink.vue +++ b/src/views/dashboard/components/WidgetLink.vue @@ -92,7 +92,7 @@ limitations under the License. --> step: appStore.durationRow.step, utc: appStore.utc, }); - const { widget, graph, metrics, metricTypes, metricConfig, metricMode, expressions, typesOfMQE } = + const { widget, graph, metrics, metricTypes, metricConfig, metricMode, expressions, typesOfMQE, subExpressions } = dashboardStore.selectedGrid; const c = (metricConfig || []).map((d: any) => { const t: any = {}; @@ -114,6 +114,9 @@ limitations under the License. --> if (metricMode === MetricModes.Expression) { opt.expressions = expressions; opt.typesOfMQE = typesOfMQE; + if (subExpressions && subExpressions.length) { + opt.subExpressions = subExpressions; + } } else { opt.metrics = metrics; opt.metricTypes = metricTypes; diff --git a/src/views/dashboard/configuration/widget/metric/Index.vue b/src/views/dashboard/configuration/widget/metric/Index.vue index 0199cfad..d16272b3 100644 --- a/src/views/dashboard/configuration/widget/metric/Index.vue +++ b/src/views/dashboard/configuration/widget/metric/Index.vue @@ -34,6 +34,10 @@ limitations under the License. --> size="small" @change="changeMetricMode" /> +
+ Summary + Detail +
@@ -643,4 +647,9 @@ limitations under the License. --> border-color: #409eff; } } + + .title { + display: inline-block; + width: 410px; + }