diff --git a/src/views/device/Instance/Detail/Info/components/Tags/Save.vue b/src/views/device/Instance/Detail/Info/components/Tags/Save.vue index e8ff918a..74d2096e 100644 --- a/src/views/device/Instance/Detail/Info/components/Tags/Save.vue +++ b/src/views/device/Instance/Detail/Info/components/Tags/Save.vue @@ -87,24 +87,32 @@ const handleOk = async () => { if (dataSource.value.length) { loading.value = true const list = (dataSource.value || []) - .filter((item: any) => item?.key && item?.value) + .filter((item: any) => item?.key && (item?.value !== undefined && item?.value !== null)) .map((i: any) => { const { dataType, ...extra } = i; + if (extra.value === 0) { + extra.value = String(extra.value) + } + return { ...extra }; }); if (list.length) { // 填值 - const resp = await saveTags(instanceStore.current?.id || '', list); - if (resp.status === 200) { + const resp = await saveTags(instanceStore.current?.id || '', list).finally(()=>{ + loading.value = false + }); + if (resp.success === 200) { onlyMessage('操作成功!'); } } - const _list = (dataSource.value || []).filter((item: any) => item?.key && !item?.value); + const _list = (dataSource.value || []).filter((item: any) => item?.key && (item?.value === undefined || item?.value === null)); if (_list.length) { // 删除值 _list.map(async (item: any) => { if (item.id) { - await delTags(instanceStore.current?.id || '', item.id); + await delTags(instanceStore.current?.id || '', item.id).catch(()=>{ + loading.value = false + }); } }); }