diff --git a/src/assets/icons/cloud_queue.svg b/src/assets/icons/cloud_queue.svg new file mode 100644 index 00000000..4b1da735 --- /dev/null +++ b/src/assets/icons/cloud_queue.svg @@ -0,0 +1,17 @@ + + + + diff --git a/src/assets/icons/language.svg b/src/assets/icons/language.svg new file mode 100644 index 00000000..eab0146d --- /dev/null +++ b/src/assets/icons/language.svg @@ -0,0 +1,17 @@ + + + + diff --git a/src/assets/icons/linear_scale.svg b/src/assets/icons/linear_scale.svg new file mode 100644 index 00000000..6b739747 --- /dev/null +++ b/src/assets/icons/linear_scale.svg @@ -0,0 +1,17 @@ + + + + diff --git a/src/components/Selector.vue b/src/components/Selector.vue index c40867e9..b6dd34c7 100644 --- a/src/components/Selector.vue +++ b/src/components/Selector.vue @@ -37,8 +37,8 @@ import { ref, watch } from "vue"; import type { PropType } from "vue"; interface Option { - label: string; - value: string; + label: string | number; + value: string | number; } /*global defineProps, defineEmits*/ @@ -49,11 +49,14 @@ const props = defineProps({ default: () => [], }, value: { - type: [Array, String, Number] as PropType, + type: [Array, String, Number, undefined] as PropType, default: () => [], }, size: { type: null, default: "default" }, - placeholder: { type: String, default: "Select a option" }, + placeholder: { + type: [String, Number] as PropType, + default: "Select a option", + }, borderRadius: { type: Number, default: 3 }, multiple: { type: Boolean, default: false }, disabled: { type: Boolean, default: false }, @@ -61,7 +64,7 @@ const props = defineProps({ const selected = ref(props.value); function changeSelected() { - const options = props.options.filter((d: Option) => + const options = props.options.filter((d: any) => props.multiple ? selected.value.includes(d.value) : selected.value === d.value diff --git a/src/hooks/useProcessor.ts b/src/hooks/useProcessor.ts index 6d5560da..bd6632c2 100644 --- a/src/hooks/useProcessor.ts +++ b/src/hooks/useProcessor.ts @@ -57,7 +57,7 @@ export function useQueryProcessor(config: any) { variables.push(`$condition${index}: TopNCondition!`); conditions[`condition${index}`] = { name, - parentService: ["Service", "All"].includes(dashboardStore.entity) + parentService: ["All"].includes(dashboardStore.entity) ? null : selectorStore.currentService.value, normal: selectorStore.currentService.normal, diff --git a/src/layout/components/SideBar.vue b/src/layout/components/SideBar.vue index f5b49b01..31da52ca 100644 --- a/src/layout/components/SideBar.vue +++ b/src/layout/components/SideBar.vue @@ -33,13 +33,17 @@ limitations under the License. -->