diff --git a/src/views/device/components/Metadata/Base/components/VirtualRule/index.vue b/src/views/device/components/Metadata/Base/components/VirtualRule/index.vue index cc8a3a3d..b95c4a40 100644 --- a/src/views/device/components/Metadata/Base/components/VirtualRule/index.vue +++ b/src/views/device/components/Metadata/Base/components/VirtualRule/index.vue @@ -252,6 +252,13 @@ const options = computed(() => { return (dataSource?.value || []).filter((item: any) => item?.id !== props.value?.id); }); +const setInitVirtualRule = () => { + formData.virtualRule = { + triggerProperties: props.value?.expands?.virtualRule?.triggerProperties || ['*'], + rule: props.value?.expands?.virtualRule?.rule || initData.rule + } +} + const handleSearch = async () => { let resp: any = undefined; try { @@ -272,12 +279,11 @@ const handleSearch = async () => { triggerProperties: resp.result.triggerProperties, rule: resp.result.rule, } + } else { + setInitVirtualRule() } } catch (err) { - formData.virtualRule = { - triggerProperties: props.value?.expands?.virtualRule?.triggerProperties || ['*'], - rule: props.value?.expands?.virtualRule?.rule || initData.rule - } + setInitVirtualRule() } }; diff --git a/src/views/device/components/Metadata/Cat/index.vue b/src/views/device/components/Metadata/Cat/index.vue index 614ea090..601e78af 100644 --- a/src/views/device/components/Metadata/Cat/index.vue +++ b/src/views/device/components/Metadata/Cat/index.vue @@ -132,7 +132,7 @@ const routeChange = async (id: string) => { // ) const hideVirtualRule = (metadata: string) => { - const _metadata = JSON.parse(metadata) + const _metadata = JSON.parse(metadata || '{}') if (_metadata.properties) { _metadata.properties = _metadata.properties.map((item: any) => { if (item.expands.virtualRule) {