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

fix: bug#10869

This commit is contained in:
xieyonghong 2023-04-01 11:44:02 +08:00
parent 9557586bb9
commit df0b467656
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
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 { inject } from 'vue'
import { useSceneStore } from 'store/scene' import { useSceneStore } from 'store/scene'
import { storeToRefs } from 'pinia'; import { storeToRefs } from 'pinia';
import {cloneDeep, flattenDeep, isArray, set} from 'lodash-es' import { cloneDeep, flattenDeep, isArray, isObject, set } from 'lodash-es'
import { Form } from 'jetlinks-ui-components' import { Form } from 'jetlinks-ui-components'
import {treeFilter} from "@/utils/comm"; import {treeFilter} from "@/utils/comm";
import { timeTypeKeys } from '@/views/rule-engine/Scene/Save/components/Terms/util' import { timeTypeKeys } from '@/views/rule-engine/Scene/Save/components/Terms/util'
@ -177,12 +177,21 @@ const handOptionByColumn = (option: any) => {
termTypeOptions.value = option.termTypes || [] termTypeOptions.value = option.termTypes || []
tabsOptions.value[0].component = option.type tabsOptions.value[0].component = option.type
columnType.value = option.type columnType.value = option.type
const _options = isArray(option.options) ? option.options : [] const _options = option.options
if (option.type === 'boolean') { if (option.type === 'boolean') {
valueOptions.value = _options?.map((item: any) => ({ ...item, label: item.name, value: item.id})) || [ // 处理_options为Object时
{ label: '是', value: true }, if (isObject(_options)) {
{ label: '否', value: false }, const bool = (_options as any)?.bool
valueOptions.value = [
{ label: bool.falseText, name: bool.falseText, value: bool.falseValue, id: bool.falseValue },
{ label: bool.trueText, name: bool.trueText, value: bool.trueValue, id: bool.trueValue },
] ]
} else {
valueOptions.value = _options?.map((item: any) => ({ ...item, label: item.name, value: item.id})) || [
{ label: '是', name: '是', value: true, id: true },
{ label: '否', name: '否', value: false, id: false },
]
}
} else if(option.type === 'enum') { } else if(option.type === 'enum') {
valueOptions.value = _options?.map((item: any) => ({ ...item, label: item.name, value: item.id})) || [] valueOptions.value = _options?.map((item: any) => ({ ...item, label: item.name, value: item.id})) || []
} else{ } else{