From f5ef19817bf0acb801db2d5c1a215fce47149aa8 Mon Sep 17 00:00:00 2001 From: xieyonghong <18010623010@163.com> Date: Fri, 31 Mar 2023 13:42:10 +0800 Subject: [PATCH] fix: bug#10943 --- .../Save/action/ListItem/FilterCondition.vue | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/views/rule-engine/Scene/Save/action/ListItem/FilterCondition.vue b/src/views/rule-engine/Scene/Save/action/ListItem/FilterCondition.vue index 8ff62501..705449db 100644 --- a/src/views/rule-engine/Scene/Save/action/ListItem/FilterCondition.vue +++ b/src/views/rule-engine/Scene/Save/action/ListItem/FilterCondition.vue @@ -86,6 +86,7 @@ import { storeToRefs } from 'pinia'; import {cloneDeep, flattenDeep, isArray, set} from 'lodash-es' import { Form } from 'jetlinks-ui-components' import {treeFilter} from "@/utils/comm"; +import { timeTypeKeys } from '@/views/rule-engine/Scene/Save/components/Terms/util' const sceneStore = useSceneStore() const { data: formModel } = storeToRefs(sceneStore) @@ -285,7 +286,19 @@ const columnSelect = (e: any) => { const termsTypeSelect = (e: { key: string, name: string }) => { const oldValue = isArray(paramsValue.value!.value) ? paramsValue.value!.value[0] : paramsValue.value!.value - const value = arrayParamsKey.includes(e.key) ? [ oldValue, undefined ] : oldValue + let value = arrayParamsKey.includes(e.key) ? [ oldValue, undefined ] : oldValue + + // 如果上次的值 在 timeTypeKeys中 则不变 + if (timeTypeKeys.includes(e.key)) { + if (tabsOptions.value[0].component !== 'int') { + value = undefined + } + tabsOptions.value[0].component = 'int' + } else if (!timeTypeKeys.includes(e.key) && tabsOptions.value[0].component == 'int') { + value = undefined + tabsOptions.value[0].component = 'date' + } + paramsValue.value = { source: paramsValue.value?.source || tabsOptions.value[0].key, value: value