Merge remote-tracking branch 'origin/dev' into dev

src/views/device/Instance/Detail/ChildDevice/EdgeMap/index.vue

@@ -184,6 +184,7 @@ let _metadata = ref();
 const loading = ref<boolean>(false);
 const channelList = ref([]);
 
+
 const modelRef = reactive({
     dataSource: [],
 });

src/views/device/Instance/Detail/ChildDevice/SaveChild/index.vue

@@ -146,7 +146,7 @@ const selectChange = (e: any) => {
         visible.value = true;
     }
     const item = productList.value.filter((i: any) => i.id === e)[0];
-    const array = JSON.parse(item.metadata || '{}')?.properties?.map(
+    const array = JSON.parse(item?.metadata || '{}')?.properties?.map(
         (i: any) => ({
             metadataType: 'property',
             metadataName: `${i.name}(${i.id})`,

src/views/device/Instance/Detail/index.vue

@@ -137,6 +137,7 @@ const routerParams = useRouterParams();
 const instanceStore = useInstanceStore();
 
 const statusMap = new Map();
+
 statusMap.set('online', 'success');
 statusMap.set('offline', 'error');
 statusMap.set('notActive', 'warning');
@@ -276,7 +277,7 @@ const initPage = async (newId: any) => {
 }
 
 onBeforeRouteUpdate((to: any) => {
-  if (to.params?.id) {
+  if (to.params?.id!==instanceStore.current.id) {
     initPage(to.params?.id)
   }
 })

src/views/device/Product/Detail/DeviceAccess/accessModal.vue

@@ -6,6 +6,7 @@
     okText="确定"
     cancelText="取消"
     :confirmLoading='loading'
+    :maskClosable="false"
     @ok="submitData"
     @cancel="cancel"
   >