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

fix: 修改bug

This commit is contained in:
100011797 2023-07-14 14:00:14 +08:00
parent 30de9c322a
commit c0bcccbfaf
1 changed files with 63 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
src/views/Northbound/DuerOS/Detail/command/index.vue
View File

@ -10,22 +10,28 @@
message: '请选择指令类型', message: '请选择指令类型',
}" }"
> >
<j-select <MSelect
placeholder="请选择指令类型"
v-model:value="modelRef.messageType" v-model:value="modelRef.messageType"
show-search :options="_options"
@change="onTypeChange" @change="onTypeChange"
> type="messageType"
<j-select-option value="READ_PROPERTY" />
>读取属性</j-select-option <!-- // <j-select
> // placeholder="请选择指令类型"
<j-select-option value="WRITE_PROPERTY" // v-model:value="modelRef.messageType"
>修改属性</j-select-option // show-search
> // @change="onTypeChange"
<j-select-option value="INVOKE_FUNCTION" // >
>调用功能</j-select-option // <j-select-option value="READ_PROPERTY"
> // >读取属性</j-select-option
</j-select> // >
// <j-select-option value="WRITE_PROPERTY"
// >修改属性</j-select-option
// >
// <j-select-option value="INVOKE_FUNCTION"
// >调用功能</j-select-option
// >
// </j-select> -->
</j-form-item> </j-form-item>
</j-col> </j-col>
<j-col <j-col
@ -89,7 +95,11 @@
:itemType=" :itemType="
property.valueType?.type || property.type || 'int' property.valueType?.type || property.type || 'int'
" "
:placeholder="property.valueType?.type === 'array' ? '多个数据用英文,分割' : ''" :placeholder="
property.valueType?.type === 'array'
? '多个数据用英文,分割'
: ''
"
:options=" :options="
property.valueType?.type === 'enum' property.valueType?.type === 'enum'
? (property?.valueType?.elements || []).map( ? (property?.valueType?.elements || []).map(
@ -102,15 +112,25 @@
) )
: property.valueType?.type === 'boolean' : property.valueType?.type === 'boolean'
? [ ? [
{ label: property.valueType?.trueText, value: property.valueType?.trueValue }, {
{ label: property.valueType?.falseText, value: property.valueType?.falseValue }, label: property.valueType?.trueText,
value: property.valueType?.trueValue,
},
{
label: property.valueType?.falseText,
value: property.valueType?.falseValue,
},
] ]
: undefined : undefined
" "
/> />
</j-form-item> </j-form-item>
</j-col> </j-col>
<j-col :span="24" v-if="modelRef.messageType === 'INVOKE_FUNCTION'" class="inputs"> <j-col
:span="24"
v-if="modelRef.messageType === 'INVOKE_FUNCTION'"
class="inputs"
>
<j-form-item <j-form-item
:name="['message', 'functionId']" :name="['message', 'functionId']"
label="功能" label="功能"
@ -164,6 +184,7 @@
<script lang="ts" setup> <script lang="ts" setup>
import EditTable from './EditTable.vue'; import EditTable from './EditTable.vue';
import MSelect from '../../../components/MSelect/index.vue';
const formRef = ref(); const formRef = ref();
@ -187,7 +208,7 @@ const props = defineProps({
}, },
}); });
const emit = defineEmits(['update:modelValue']) const emit = defineEmits(['update:modelValue']);
const editRef = ref(); const editRef = ref();
@ -210,11 +231,25 @@ const onPropertyChange = (val: string, flag?: boolean) => {
); );
property.value = _item || {}; property.value = _item || {};
} }
if(!flag){ if (!flag) {
modelRef.message.value = undefined modelRef.message.value = undefined;
} }
}; };
const _options = [
{
id: 'READ_PROPERTY',
name: '读取属性',
},
{
id: 'WRITE_PROPERTY',
name: '修改属性',
},
{
id: 'INVOKE_FUNCTION',
name: '调用功能',
},
];
const onTypeChange = () => { const onTypeChange = () => {
// 需要记住之前的选择, 所以注释了该代码 // 需要记住之前的选择, 所以注释了该代码
// modelRef.message = { // modelRef.message = {
@ -231,14 +266,14 @@ const funcChange = (val: string, _inputs?: any[]) => {
props.metadata?.functions.find((item: any) => item.id === val) props.metadata?.functions.find((item: any) => item.id === val)
?.inputs || []; ?.inputs || [];
const list = arr.map((item: any) => { const list = arr.map((item: any) => {
const _item = _inputs?.find(i => i.id === item.id) const _item = _inputs?.find((i) => i.id === item.id);
return { return {
id: item.id, id: item.id,
name: item.name, name: item.name,
value: undefined, value: undefined,
valueType: item?.valueType?.type, valueType: item?.valueType?.type,
..._item, ..._item,
required: item?.expands?.required required: item?.expands?.required,
}; };
}); });
modelRef.message.inputs = list; modelRef.message.inputs = list;
@ -254,7 +289,10 @@ watch(
onPropertyChange(newVal?.message?.properties, true); onPropertyChange(newVal?.message?.properties, true);
} }
if (newVal?.message?.functionId) { if (newVal?.message?.functionId) {
funcChange(newVal?.message?.functionId, newVal?.message?.inputs); funcChange(
newVal?.message?.functionId,
newVal?.message?.inputs,
);
} }
} }
}, },
@ -273,7 +311,7 @@ const saveBtn = () =>
resolve(false); resolve(false);
}); });
} }
emit('update:modelValue', _data) emit('update:modelValue', _data);
resolve(_data); resolve(_data);
}) })
.catch((err: any) => { .catch((err: any) => {