From e738908b0e500c3c9b6c6f7c706e3c611f69cfe0 Mon Sep 17 00:00:00 2001
From: XieYongHong <18010623010@163.com>
Date: Mon, 17 Jul 2023 11:39:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=89=A9=E6=A8=A1?=
 =?UTF-8?q?=E5=9E=8B-=E8=A7=84=E5=88=99=E6=97=A0=E6=B3=95=E5=9B=9E?=
 =?UTF-8?q?=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.sh                                           |  4 ++--
 .../Metadata/Base/components/VirtualRule/index.vue | 14 ++++++++++----
 src/views/device/components/Metadata/Cat/index.vue |  2 +-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/build.sh b/build.sh
index 6ead7b78..818598a0 100644
--- a/build.sh
+++ b/build.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
-docker build -t registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-ui-vue:2.1.0-TEST .
-docker push registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-ui-vue:2.1.0-TEST
+docker build -t registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-ui-vue:2.1.0-SNAPSHOT .
+docker push registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-ui-vue:2.1.0-SNAPSHOT
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) {