From e6205e6602e709bb31c29065fed2110bd9aa5037 Mon Sep 17 00:00:00 2001
From: qiaochuLei <124648559+qiaochuLei@users.noreply.github.com>
Date: Wed, 11 Oct 2023 17:34:25 +0800
Subject: [PATCH 1/2] fix: bug#18996

* fix: bug#16956

* fix: bug#18996
---
 .../device/components/Metadata/Base/Base.vue  | 28 +++++++++----------
 .../components/Metadata/Import/index.vue      |  2 +-
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/views/device/components/Metadata/Base/Base.vue b/src/views/device/components/Metadata/Base/Base.vue
index 00355f71..06140d40 100644
--- a/src/views/device/components/Metadata/Base/Base.vue
+++ b/src/views/device/components/Metadata/Base/Base.vue
@@ -61,10 +61,11 @@
             title="继承自产品物模型的数据不支持修改"
           >
 <!--            <ModelButton :disabled="true"/>-->
-            <j-button :disabled="true" type="link" style="padding-left: 0;">
-              <AIcon type="SettingOutlined" />
-              配置
-            </j-button>
+              <j-button :disabled="true" type="link" >
+                <AIcon type="SettingOutlined" />
+                配置
+              </j-button>
+           
           </j-tooltip>
           <PermissionButton
                 v-else
@@ -93,7 +94,7 @@
             title="继承自产品物模型的数据不支持修改"
           >
 <!--            <ModelButton :disabled="true"/>-->
-            <j-button :disabled="true" type="link" style="padding-left: 0;">
+            <j-button :disabled="true" type="link">
               <AIcon type="SettingOutlined" />
               配置
             </j-button>
@@ -116,30 +117,29 @@
           </j-tag>
         </template>
         <template #other="{ data }">
-          <j-tooltip
+          <!-- <j-tooltip
             v-if="target === 'device' && productNoEdit.id?.includes?.(data.record.id)"
             title="继承自产品物模型的数据不支持修改"
-          >
+          > -->
 <!--            <ModelButton :disabled="true"/>-->
-            <j-button :disabled="true" type="link" style="padding-left: 0;">
+            <!-- <j-button :disabled="true" type="link" style="padding-left: 0;">
               <AIcon type="SettingOutlined" />
               配置
-            </j-button>
-          </j-tooltip>
+            </j-button> -->
+          <!-- </j-tooltip> -->
           <PermissionButton
-                v-else
                 :has-permission="`${permission}:update`"
                 type="link"
                 key="setting"
+                :tooltip="target === 'device' && productNoEdit.id?.includes?.(data.record.id) ? {
+                title: '继承自产品物模型的数据不支持删除',
+              } : undefined"
             >
             <OtherSetting
               v-model:value="data.record.expands"
               :id="data.record.id"
               :disabled="target === 'device' && productNoEdit.id?.includes?.(data.record.id)"
               :record="data.record"
-              :tooltip="target === 'device' && productNoEdit.id?.includes?.(data.record.id) ? {
-                title: '继承自产品物模型的数据不支持删除',
-              } : undefined"
               :type="data.record.valueType.type"
           />
             </PermissionButton>
diff --git a/src/views/device/components/Metadata/Import/index.vue b/src/views/device/components/Metadata/Import/index.vue
index 9be84aad..30d33732 100644
--- a/src/views/device/components/Metadata/Import/index.vue
+++ b/src/views/device/components/Metadata/Import/index.vue
@@ -637,7 +637,7 @@ const handleImport = async () => {
                     data[data?.type === 'copy' ? 'copy' : 'import'] ||
                         '{}',
                 );
-                if(data?.type === 'import'){
+                if(data?.type !== 'copy'){
                         Object.keys(_object).forEach((i:any)=>{
                         const map = new Map()
                         _object[i].forEach((item:any)=>(

From 18433ef6e3761d1b269615066a629fe81b3c88ad Mon Sep 17 00:00:00 2001
From: XieYongHong <18010623010@163.com>
Date: Mon, 16 Oct 2023 09:42:42 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?=
 =?UTF-8?q?=E6=97=A0=E6=95=88=E5=BC=95=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/device/Instance/Detail/Info/index.vue | 2 +-
 src/views/system/Basis/index.vue                | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/views/device/Instance/Detail/Info/index.vue b/src/views/device/Instance/Detail/Info/index.vue
index 9fdfc157..28c443e2 100644
--- a/src/views/device/Instance/Detail/Info/index.vue
+++ b/src/views/device/Instance/Detail/Info/index.vue
@@ -166,4 +166,4 @@ watch(() => instanceStore.current?.id, () => {
   }
 }, { immediate: true })
 
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/system/Basis/index.vue b/src/views/system/Basis/index.vue
index 8e5f8d9a..7424577b 100644
--- a/src/views/system/Basis/index.vue
+++ b/src/views/system/Basis/index.vue
@@ -319,7 +319,6 @@
                 </j-button>
             </div>
         </FullPage>
-        <Relation></Relation>
     </page-container>
 </template>
 
@@ -333,7 +332,6 @@ import { save_api } from '@/api/system/basis';
 import { usePermissionStore } from '@/store/permission';
 import { useSystem } from '@/store/system';
 import { settingDetail } from '@/api/login';
-import Relation from '@/components/Relation/index.vue'
 const action = `${BASE_API_PATH}/file/static`;
 const headers = { [TOKEN_KEY]: LocalStore.get(TOKEN_KEY) };
 const formRef = ref();