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

fix: bug#11218

This commit is contained in:
xieyonghong 2023-03-30 19:50:59 +08:00
parent cf06b77fe1
commit 79c280cece
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/rule-engine/Scene/Save/action/Device/actions/index.vue
View File

@ -177,7 +177,7 @@ const functionRules = [
return Promise.reject('请输入功能值'); return Promise.reject('请输入功能值');
} else { } else {
const hasValue = value?.find( const hasValue = value?.find(
(item: { name: string; value: any }) => !item.value, (item: { name: string; value: any }) => item.value === undefined,
); );
if (hasValue) { if (hasValue) {
const functionItem = functions.value?.find( const functionItem = functions.value?.find(

5
src/views/rule-engine/Scene/Save/components/DropdownButton/util.ts
View File

@ -1,4 +1,4 @@
import { isEqual } from 'lodash-es' import { isBoolean, isEqual } from 'lodash-es'
export type DropdownButtonOptions = { export type DropdownButtonOptions = {
label: string; label: string;
@ -34,9 +34,10 @@ export const getComponent = (type: string): string => {
export const getOption = (data: any[], value?: string | number | boolean, key: string = 'name'): DropdownButtonOptions | any => { export const getOption = (data: any[], value?: string | number | boolean, key: string = 'name'): DropdownButtonOptions | any => {
let option let option
if (value === undefined && value === null) return option if (value === undefined && value === null) return option
let _value = isBoolean(value) ? String(value) : value
for (let i = 0; i < data.length; i++) { for (let i = 0; i < data.length; i++) {
const item = data[i] const item = data[i]
if (isEqual(item[key], value)) { if (isEqual(item[key], _value)) {
option = data[i] option = data[i]
break break
} else if (item.children && item.children.length) { } else if (item.children && item.children.length) {

2
src/views/rule-engine/Scene/Save/components/ParamsDropdown/index.vue
View File

@ -162,7 +162,7 @@ watchEffect(() => {
const option = getOption(_options, props.value as string, props.valueName) // 回显label值 const option = getOption(_options, props.value as string, props.valueName) // 回显label值
myValue.value = props.value myValue.value = props.value
mySource.value = props.source mySource.value = props.source
console.log(option, _options, props.valueName) console.log('paramsDropdown', option, _options, props.valueName, props.value, typeof props.value)
if (option) { if (option) {
label.value = option[props.labelName] || option.name label.value = option[props.labelName] || option.name
treeOpenKeys.value = openKeysByTree(_options, props.value, props.valueName) treeOpenKeys.value = openKeysByTree(_options, props.value, props.valueName)