github/skywalking-booster-ui
2
0
Fork 1
mirror of https://github.com/apache/skywalking-booster-ui.git synced 2025-07-04 16:45:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: update

Browse Source
This commit is contained in:
Fine 2023-12-20 14:56:03 +08:00
parent 2a11d58d30
commit f91664bc77
2 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/dashboard/configuration/Tab.vue
View File

@ -43,7 +43,7 @@ limitations under the License. -->
child.children.find( child.children.find(
(item: any) => (item: any) =>
item.type === WidgetType.Widget && item.type === WidgetType.Widget &&
!(Object.keys(ListEntity).includes(item.graph.type as string) && child.children === 1), !(Object.keys(ListEntity).includes(item.graph.type as string) && child.children.length === 1),
), ),
), ),
); );
@ -52,7 +52,7 @@ limitations under the License. -->
expressions[child.name] = child.expression || ""; expressions[child.name] = child.expression || "";
} }
function changeExpression(name: string) { function changeExpression(name: string) {
if (!expressions[name].includes("is_present")) { if (expressions[name] && !expressions[name].includes("is_present")) {
ElMessage.error("Only support the is_present function"); ElMessage.error("Only support the is_present function");
return; return;
} }

24
src/views/dashboard/controls/Tab.vue
View File

@ -126,9 +126,8 @@ limitations under the License. -->
import type { PropType } from "vue"; import type { PropType } from "vue";
import type { LayoutConfig } from "@/types/dashboard"; import type { LayoutConfig } from "@/types/dashboard";
import { useDashboardStore } from "@/store/modules/dashboard"; import { useDashboardStore } from "@/store/modules/dashboard";
import { useSelectorStore } from "@/store/modules/selectors";
import controls from "./tab"; import controls from "./tab";
import { dragIgnoreFrom, WidgetType, ListEntity } from "../data"; import { dragIgnoreFrom, WidgetType } from "../data";
import copy from "@/utils/copy"; import copy from "@/utils/copy";
import { useExpressionsQueryProcessor } from "@/hooks/useExpressionsProcessor"; import { useExpressionsQueryProcessor } from "@/hooks/useExpressionsProcessor";
@ -148,7 +147,6 @@ limitations under the License. -->
setup(props) { setup(props) {
const { t } = useI18n(); const { t } = useI18n();
const dashboardStore = useDashboardStore(); const dashboardStore = useDashboardStore();
const selectorStore = useSelectorStore();
const route = useRoute(); const route = useRoute();
const activeTabIndex = ref<number>(Number(route.params.activeTabIndex) || 0); const activeTabIndex = ref<number>(Number(route.params.activeTabIndex) || 0);
const activeTabWidget = ref<string>(""); const activeTabWidget = ref<string>("");
@ -254,19 +252,7 @@ limitations under the License. -->
const tabsProps = props.data; const tabsProps = props.data;
const metrics = []; const metrics = [];
for (const child of tabsProps.children || []) { for (const child of tabsProps.children || []) {
if (child.expression) { child.expression && metrics.push(child.expression);
const expList = parseTabsExpression(child.expression);
for (const exp of expList) {
let isList = false;
let item = child.children.find((d: any) => d.expressions.join(", ").includes(exp));
if (item && item.graph && Object.keys(ListEntity).includes(item.graph.type as string)) {
isList = true;
}
if (item && !isList) {
metrics.push(child.expression);
}
}
}
} }
if (!metrics.length) { if (!metrics.length) {
return; return;
@ -284,12 +270,6 @@ limitations under the License. -->
dashboardStore.setConfigs(tabsProps); dashboardStore.setConfigs(tabsProps);
} }
function parseTabsExpression(inputString: string) {
const resultString = inputString.replace(/is_present\(|\)/g, "");
const result = resultString.replace(/\s/g, "").split(",");
return result || [];
}
watch( watch(
() => (props.data.children || []).map((d: any) => d.expression), () => (props.data.children || []).map((d: any) => d.expression),