diff --git a/src/views/rule-engine/Scene/Save/components/ParamsDropdown/Double.vue b/src/views/rule-engine/Scene/Save/components/ParamsDropdown/Double.vue index 40b7b70b..23c25abf 100644 --- a/src/views/rule-engine/Scene/Save/components/ParamsDropdown/Double.vue +++ b/src/views/rule-engine/Scene/Save/components/ParamsDropdown/Double.vue @@ -48,7 +48,7 @@ const label: Record = { const emit = defineEmits() -const myValue = ref(props.value) +const myValue = ref(props.value || [undefined, undefined] as any) const mySource = ref(props.source) const onSelect = (v: any, _label: string, index: number) => { diff --git a/src/views/rule-engine/Scene/Save/components/ParamsDropdown/index.vue b/src/views/rule-engine/Scene/Save/components/ParamsDropdown/index.vue index b76586ee..69b522a8 100644 --- a/src/views/rule-engine/Scene/Save/components/ParamsDropdown/index.vue +++ b/src/views/rule-engine/Scene/Save/components/ParamsDropdown/index.vue @@ -100,7 +100,7 @@ type Emit = { } const props = defineProps({ - ...defaultSetting + ...defaultSetting, }) const emit = defineEmits() diff --git a/src/views/rule-engine/Scene/Save/components/ParamsDropdown/typings.ts b/src/views/rule-engine/Scene/Save/components/ParamsDropdown/typings.ts index fc93e106..35974dbb 100644 --- a/src/views/rule-engine/Scene/Save/components/ParamsDropdown/typings.ts +++ b/src/views/rule-engine/Scene/Save/components/ParamsDropdown/typings.ts @@ -14,7 +14,7 @@ export type TabsOption = { key: string; component: string } -type ValueArrayType = [string, number] +type ValueArrayType = [string, number, undefined] export type ValueType = string | number | undefined | ValueArrayType export const defaultSetting = { diff --git a/src/views/rule-engine/Scene/Save/components/Terms/ParamsItem.vue b/src/views/rule-engine/Scene/Save/components/Terms/ParamsItem.vue index 66737739..5d6663fb 100644 --- a/src/views/rule-engine/Scene/Save/components/Terms/ParamsItem.vue +++ b/src/views/rule-engine/Scene/Save/components/Terms/ParamsItem.vue @@ -133,7 +133,7 @@ const props = defineProps({ type: '', termType: 'eq', value: { - source: 'fixed', + source: 'manual', value: undefined } }) @@ -223,7 +223,13 @@ const showDouble = computed(() => { metricOption.value = [] } - return isRange && !isMetric.value && !isSourceMetric + if (isRange) { + if (isMetric.value) { + return !isSourceMetric + } + return true + } + return false }) const mouseover = () => { @@ -298,7 +304,7 @@ const termAdd = () => { const terms = { column: undefined, value: { - source: 'fixed', + source: 'manual', value: undefined }, termType: undefined, diff --git a/src/views/rule-engine/Scene/Save/components/Terms/WhenItem.vue b/src/views/rule-engine/Scene/Save/components/Terms/WhenItem.vue index e31f07da..a30e5528 100644 --- a/src/views/rule-engine/Scene/Save/components/Terms/WhenItem.vue +++ b/src/views/rule-engine/Scene/Save/components/Terms/WhenItem.vue @@ -97,7 +97,7 @@ const addWhen = () => { { column: undefined, value: { - source: 'fixed', + source: 'manual', value: undefined }, termType: undefined,