diff --git a/src/views/device/Instance/Detail/Info/components/InklingModal/index.vue b/src/views/device/Instance/Detail/Info/components/InklingModal/index.vue
index bfccbc2d..c4ed9b2c 100644
--- a/src/views/device/Instance/Detail/Info/components/InklingModal/index.vue
+++ b/src/views/device/Instance/Detail/Info/components/InklingModal/index.vue
@@ -43,12 +43,14 @@ const route = useRoute()
 
 const handleOk = async () => {
   if (checkKey.value) {
+    loading.value = true
     const res = await savePluginData(
       'device',
       props.accessId!,
       route.params.id as string,
       checkKey.value
     ).catch(() => ({ success: false }))
+    loading.value = false
     if (res.success) {
       emit('submit', checkKey.value)
     }
diff --git a/src/views/device/Instance/Detail/Info/index.vue b/src/views/device/Instance/Detail/Info/index.vue
index 943820ec..3872dfc2 100644
--- a/src/views/device/Instance/Detail/Info/index.vue
+++ b/src/views/device/Instance/Detail/Info/index.vue
@@ -145,7 +145,8 @@ const saveInkling = (id: string) => {
     instanceStore.refresh(instanceStore.current?.id);
   }
   channelId.value = id
-  giveAnInkling()
+  queryInkling()
+  inkingVisible.value = false
 }
 
 const giveAnInkling = () => {
diff --git a/src/views/device/Product/Detail/DeviceAccess/index.vue b/src/views/device/Product/Detail/DeviceAccess/index.vue
index d216cdb4..fd0e1672 100644
--- a/src/views/device/Product/Detail/DeviceAccess/index.vue
+++ b/src/views/device/Product/Detail/DeviceAccess/index.vue
@@ -758,7 +758,7 @@ const updateAccessData = async (id: string, values: any) => {
     submitLoading.value = false
   }
 
-  if (access.value?.provider === "plugin_gateway") {
+  if (access.value?.provider === "plugin_gateway" && productData.id) {
     await savePluginData(
       'product',
       access.value?.id,
diff --git a/src/views/device/Product/Detail/DeviceAccess/metadataModal.vue b/src/views/device/Product/Detail/DeviceAccess/metadataModal.vue
index 05af91a0..6164f68b 100644
--- a/src/views/device/Product/Detail/DeviceAccess/metadataModal.vue
+++ b/src/views/device/Product/Detail/DeviceAccess/metadataModal.vue
@@ -133,7 +133,7 @@ const updateAccessData = async (id: string, values: any, metadata: string) => {
     return
   }
 
-  if (props.access?.provider === 'plugin_gateway') {
+  if (props.access?.provider === 'plugin_gateway' && props.data.productTypeId) {
     await savePluginData(
       'product',
       props.access.id,
diff --git a/src/views/device/Product/Detail/MetadataMap/index.vue b/src/views/device/Product/Detail/MetadataMap/index.vue
index ff8c16ec..fca7f634 100644
--- a/src/views/device/Product/Detail/MetadataMap/index.vue
+++ b/src/views/device/Product/Detail/MetadataMap/index.vue
@@ -101,11 +101,11 @@ const columns = [
 ]
 
 const selectedKeys = computed(() => {
-  return dataSource.value.filter(item => !!item?.plugin).map(item => item.id)
+  return dataSource.value?.filter(item => !!item?.plugin).map(item => item.id) || []
 })
 
 const selectedPluginKeys = computed(() => {
-  return dataSource.value.filter(item => !!item?.plugin).map(item => item.plugin)
+  return dataSource.value?.filter(item => !!item?.plugin).map(item => item.plugin) || []
 })
 
 const getMetadataMapData = () => {
@@ -151,7 +151,7 @@ const getDefaultMetadata = async () => {
       type: item.valueType?.type,
       plugin: _m?.pluginId, // 插件物模型id
     }
-  })
+  }) || []
   dataSourceCache.value = dataSource.value
 }