fix: remove duplicate expressions

This commit is contained in:
Fine 2024-07-30 17:42:36 +08:00
parent 4e00073ec2
commit b33fd94b7c

View File

@ -196,18 +196,22 @@ export async function useExpressionsQueryPodsMetrics(
variables.push(`$entity${index}: Entity!`); variables.push(`$entity${index}: Entity!`);
conditions[`entity${index}`] = entity; conditions[`entity${index}`] = entity;
const f = metrics.map((name: string, idx: number) => { const f = metrics.map((name: string, idx: number) => {
variables.push(`$expression${index}${idx}: String!`); if (index === 0) {
conditions[`expression${index}${idx}`] = name; variables.push(`$expression${idx}: String!`);
conditions[`expression${idx}`] = name;
}
let str = ""; let str = "";
if (config.subExpressions[idx]) { if (config.subExpressions[idx]) {
variables.push(`$subExpression${index}${idx}: String!`); if (index === 0) {
conditions[`subExpression${index}${idx}`] = config.subExpressions[idx]; variables.push(`$subExpression${idx}: String!`);
str = `subexpression${index}${idx}: execExpression(expression: $subExpression${index}${idx}, entity: $entity${index}, duration: $duration)${RespFields.execExpression}`; conditions[`subExpression${idx}`] = config.subExpressions[idx];
}
str = `subexpression${index}${idx}: execExpression(expression: $subExpression${idx}, entity: $entity${index}, duration: $duration)${RespFields.execExpression}`;
} }
return ( return (
str + str +
`expression${index}${idx}: execExpression(expression: $expression${index}${idx}, entity: $entity${index}, duration: $duration)${RespFields.execExpression}` `expression${index}${idx}: execExpression(expression: $expression${idx}, entity: $entity${index}, duration: $duration)${RespFields.execExpression}`
); );
}); });
return f; return f;