Merge branch 'main' of github.com:apache/skywalking-booster-ui into feat/profile

This commit is contained in:
Fine 2023-06-12 13:22:35 +08:00
commit d94a52cf19
4 changed files with 12 additions and 7 deletions

View File

@ -93,11 +93,14 @@ limitations under the License. -->
/> />
<Icon class="cp" iconName="remove_circle_outline" size="middle" @click="deleteMetric(index)" /> <Icon class="cp" iconName="remove_circle_outline" size="middle" @click="deleteMetric(index)" />
</span> </span>
<div v-if="(errors || states.tips)[index] && isExpression" class="ml-10 red sm"> <div v-if="(states.tips || [])[index] && isExpression" class="ml-10 red sm">
{{ (errors || states.tips)[index] }} {{ states.tips[index] }}
</div> </div>
<div v-if="(subErrors || states.tips)[index] && isExpression" class="ml-10 red sm"> <div v-if="(errors || [])[index] && isExpression" class="ml-10 red sm">
{{ (subErrors || states.tips)[index] }} {{ (errors || [])[index] }}
</div>
<div v-if="(subErrors || [])[index] && isExpression" class="ml-10 red sm">
{{ (subErrors || [])[index] }}
</div> </div>
</div> </div>
<div>{{ t("visualization") }}</div> <div>{{ t("visualization") }}</div>

View File

@ -15,7 +15,7 @@ limitations under the License. -->
<template> <template>
<div <div
v-if="!isNaN(singleVal)" v-if="singleVal !== null && !isNaN(singleVal)"
class="chart-card" class="chart-card"
:style="{ :style="{
fontSize: `${config.fontSize}px`, fontSize: `${config.fontSize}px`,

View File

@ -179,9 +179,9 @@ limitations under the License. -->
); );
endpoints.value = params.data; endpoints.value = params.data;
colMetrics.value = params.names; colMetrics.value = params.names;
colSubMetrics.value = params.subNames;
metricTypes.value = params.metricTypesArr; metricTypes.value = params.metricTypesArr;
metricConfig.value = params.metricConfigArr; metricConfig.value = params.metricConfigArr;
colSubMetrics.value = params.colSubMetrics;
emit("expressionTips", { tips: params.expressionsTips, subTips: params.subExpressionsTips }); emit("expressionTips", { tips: params.expressionsTips, subTips: params.subExpressionsTips });
return; return;
@ -216,6 +216,7 @@ limitations under the License. -->
...(props.config.metrics || []), ...(props.config.metrics || []),
...(props.config.metricConfig || []), ...(props.config.metricConfig || []),
...(props.config.expressions || []), ...(props.config.expressions || []),
...(props.config.subExpressions || []),
props.config.metricMode, props.config.metricMode,
], ],
(data, old) => { (data, old) => {

View File

@ -215,7 +215,7 @@ limitations under the License. -->
); );
instances.value = params.data; instances.value = params.data;
colMetrics.value = params.names; colMetrics.value = params.names;
colSubMetrics.value = params.colSubMetrics; colSubMetrics.value = params.subNames;
metricTypes.value = params.metricTypesArr; metricTypes.value = params.metricTypesArr;
metricConfig.value = params.metricConfigArr; metricConfig.value = params.metricConfigArr;
emit("expressionTips", { tips: params.expressionsTips, subTips: params.subExpressionsTips }); emit("expressionTips", { tips: params.expressionsTips, subTips: params.subExpressionsTips });
@ -268,6 +268,7 @@ limitations under the License. -->
...(props.config.metrics || []), ...(props.config.metrics || []),
...(props.config.metricConfig || []), ...(props.config.metricConfig || []),
...(props.config.expressions || []), ...(props.config.expressions || []),
...(props.config.subExpressions || []),
props.config.metricMode, props.config.metricMode,
], ],
(data, old) => { (data, old) => {