0017
/
iot-ui-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: bug#10947

This commit is contained in:
xieyonghong 2023-03-26 21:18:03 +08:00
parent 1d782a1231
commit 3810046bee
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/views/rule-engine/Scene/Save/action/ListItem/FilterCondition.vue
View File

@ -83,7 +83,7 @@ import ParamsDropdown, { DoubleParamsDropdown } from '../../components/ParamsDro
import { inject } from 'vue'
import { useSceneStore } from 'store/scene'
import { storeToRefs } from 'pinia';
import {cloneDeep, flattenDeep, set} from 'lodash-es'
import {cloneDeep, flattenDeep, isArray, set} from 'lodash-es'
import { Form } from 'jetlinks-ui-components'
import {treeFilter} from "@/utils/comm";
@ -263,7 +263,8 @@ const columnSelect = (e: any) => {
}
const termsTypeSelect = (e: { key: string, name: string }) => {
const value = arrayParamsKey.includes(e.key) ? [ undefined, undefined ] : undefined
const oldValue = isArray(paramsValue.value!.value) ? paramsValue.value!.value[0] : paramsValue.value!.value
const value = arrayParamsKey.includes(e.key) ? [ oldValue, undefined ] : oldValue
paramsValue.value = {
source: tabsOptions.value[0].key,
value: value

5
src/views/rule-engine/Scene/Save/components/Terms/ParamsItem.vue
View File

@ -81,7 +81,7 @@ import { ContextKey } from './util'
import { useSceneStore } from 'store/scene'
import { storeToRefs } from 'pinia';
import { Form } from 'jetlinks-ui-components'
import { pick } from 'lodash-es'
import {isArray, pick} from 'lodash-es'
const sceneStore = useSceneStore()
const { data: formModel } = storeToRefs(sceneStore)
@ -251,7 +251,8 @@ const columnSelect = (option: any) => {
}
const termsTypeSelect = (e: { key: string, name: string }) => {
const value = arrayParamsKey.includes(e.key) ? [ undefined, undefined ] : undefined
const oldValue = isArray(paramsValue.value!.value) ? paramsValue.value!.value[0] : paramsValue.value!.value
const value = arrayParamsKey.includes(e.key) ? [ oldValue, undefined ] : oldValue
paramsValue.value = {
source: tabsOptions.value[0].key,
value: value