From eae23b5021f11f33db63c02c333ee87b6600dc39 Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Thu, 18 May 2023 14:33:46 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E6=8E=A5=E5=85=A5=E6=9B=B4=E6=8D=A2=E6=8E=A5=E5=85=A5=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F=EF=BC=8C=E5=8F=82=E6=95=B0=E5=90=8D=E7=A7=B0=E6=9C=AA?=
 =?UTF-8?q?=E5=8F=91=E7=94=9F=E5=8F=98=E5=8C=96=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/device/Product/Detail/DeviceAccess/accessModal.vue | 5 ++++-
 src/views/device/Product/Detail/DeviceAccess/index.vue       | 4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/views/device/Product/Detail/DeviceAccess/accessModal.vue b/src/views/device/Product/Detail/DeviceAccess/accessModal.vue
index 3e5c6bbf..69286ec9 100644
--- a/src/views/device/Product/Detail/DeviceAccess/accessModal.vue
+++ b/src/views/device/Product/Detail/DeviceAccess/accessModal.vue
@@ -257,12 +257,15 @@ const findProvidersByProvider = (provider: string) => {
  */
 const submitData = async () => {
   if (selectedRowKeys.value.length) {
+
     if (checkData.value.channel === 'plugin') {
       const resp = await getProductByPluginId(checkData.value.channelId).catch(() => ({ success: false, result: []}))
+      const metadataResp = await getAccessConfig(props.productId!, checkData.value.id).catch(() => ({ success: false, result: {}}))
 
       emit('submit', {
         access: {...checkData.value},
-        productTypes: resp.result
+        productTypes: resp.result,
+        metadata: metadataResp.result
       })
     } else {
       loading.value= true
diff --git a/src/views/device/Product/Detail/DeviceAccess/index.vue b/src/views/device/Product/Detail/DeviceAccess/index.vue
index 99762247..cf5b621a 100644
--- a/src/views/device/Product/Detail/DeviceAccess/index.vue
+++ b/src/views/device/Product/Detail/DeviceAccess/index.vue
@@ -615,11 +615,13 @@ const checkAccess = async (data: any) => {
   productTypes.value = []
   productData.id = undefined
   productData.metadata = {}
+  metadata.value = data.metadata?.[0] || {
+    properties: []
+  }
   if (data.access.channel === 'plugin') { // 插件设备
     markdownToHtml.value = ''
     productTypes.value = data.productTypes.map(item => ({ ...item, label: item.name, value: item.id}))
   } else {
-    metadata.value = data.metadata[0]
     handleColumns()
     markdownToHtml.value = config.value?.document ? marked(config.value.document) : '';
     getGuide(!!data.metadata.length); //