github/skywalking-booster-ui
2
0
Fork 1
mirror of https://github.com/apache/skywalking-booster-ui.git synced 2025-05-02 15:14:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Value Mappings (#423)

Browse Source
This commit is contained in:
Fine0830 2024-10-18 14:48:55 +08:00 committed by GitHub
parent 0007e3e3ae
commit 4c60f69aef
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/views/dashboard/configuration/widget/graph-styles/components/ValueMappings.vue
View File

@ -15,7 +15,7 @@ limitations under the License. -->
<template> <template>
<div> <div>
<span class="label">{{ t("valueMappings") }}</span> <span class="label">{{ t("valueMappings") }}</span>
<span class="label red">({{ t("mappingTip") }})</span> <span class="label red">{{ t("mappingTip") }}</span>
</div> </div>
<div v-for="(key, index) in keys" :key="index" class="mb-10 flex-h"> <div v-for="(key, index) in keys" :key="index" class="mb-10 flex-h">
<div class="content-decoration" contenteditable="true" @blur="changeKeys($event, index)"> <div class="content-decoration" contenteditable="true" @blur="changeKeys($event, index)">
@ -56,6 +56,9 @@ limitations under the License. -->
} }
delete valueMappings.value[list[index]]; delete valueMappings.value[list[index]];
keys.value = Object.keys(valueMappings.value); keys.value = Object.keys(valueMappings.value);
if (!keys.value.length) {
keys.value = [""];
}
updateConfig(); updateConfig();
} }
@ -87,7 +90,7 @@ limitations under the License. -->
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.content-decoration { .content-decoration {
width: 200px; width: 350px;
border: 1px solid $border-color; border: 1px solid $border-color;
cursor: text; cursor: text;
padding: 0 5px; padding: 0 5px;

6
src/views/dashboard/graphs/Card.vue
View File

@ -34,6 +34,7 @@ limitations under the License. -->
import type { PropType } from "vue"; import type { PropType } from "vue";
import { useI18n } from "vue-i18n"; import { useI18n } from "vue-i18n";
import type { CardConfig, MetricConfigOpt } from "@/types/dashboard"; import type { CardConfig, MetricConfigOpt } from "@/types/dashboard";
import { ElMessage } from "element-plus";
/*global defineProps */ /*global defineProps */
const props = defineProps({ const props = defineProps({
@ -67,9 +68,14 @@ limitations under the License. -->
} }
const list = Object.keys(valueMappings.value); const list = Object.keys(valueMappings.value);
for (const i of list) { for (const i of list) {
try {
if (new RegExp(i).test(String(singleVal.value))) { if (new RegExp(i).test(String(singleVal.value))) {
return valueMappings.value[i] || singleVal.value; return valueMappings.value[i] || singleVal.value;
} }
} catch (e) {
ElMessage.error("invalid regex string");
return singleVal.value;
}
} }
return singleVal.value; return singleVal.value;
} }

7
src/views/dashboard/graphs/Table.vue
View File

@ -47,6 +47,8 @@ limitations under the License. -->
import { computed } from "vue"; import { computed } from "vue";
import type { PropType } from "vue"; import type { PropType } from "vue";
import { useI18n } from "vue-i18n"; import { useI18n } from "vue-i18n";
import { ElMessage } from "element-plus";
/*global defineProps */ /*global defineProps */
const props = defineProps({ const props = defineProps({
data: { data: {
@ -83,9 +85,14 @@ limitations under the License. -->
} }
const list = Object.keys(valueMappings.value); const list = Object.keys(valueMappings.value);
for (const i of list) { for (const i of list) {
try {
if (new RegExp(i).test(String(source))) { if (new RegExp(i).test(String(source))) {
return valueMappings.value[i] || source; return valueMappings.value[i] || source;
} }
} catch (e) {
ElMessage.error("invalid regex string");
return source;
}
} }
return source; return source;
} }