From c401da070be411cadc39b7b681fbc106420dac04 Mon Sep 17 00:00:00 2001
From: wangshuaiswim <shuai-1991@qq.com>
Date: Thu, 2 Mar 2023 19:12:01 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=9B=BF=E6=8D=A2?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../device/components/Metadata/Base/index.vue | 13 ++++----
 .../device/components/Metadata/Cat/index.vue  |  2 +-
 .../device/components/Metadata/index.vue      | 33 +++++++++----------
 3 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/src/views/device/components/Metadata/Base/index.vue b/src/views/device/components/Metadata/Base/index.vue
index c7cae06d..eadd3543 100644
--- a/src/views/device/components/Metadata/Base/index.vue
+++ b/src/views/device/components/Metadata/Base/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <JTable :loading="loading" :data-source="data" size="small" :columns="columns" row-key="id" model="TABLE">
+  <j-pro-table :loading="loading" :data-source="data" size="small" :columns="columns" row-key="id" model="TABLE">
     <template #headerTitle>
       <a-input-search v-model:value="searchValue" placeholder="请输入名称" @search="handleSearch"></a-input-search>
     </template>
@@ -28,12 +28,12 @@
       {{ sourceMap[slotProps.expands?.source] }}
     </template>
     <template #type="slotProps">
-      <a-tag v-for="item in (slotProps.expands?.type || [])" :key="item">
+      <j-tag v-for="item in (slotProps.expands?.type || [])" :key="item">
         {{ expandsType[item] }}
-      </a-tag>
+      </j-tag>
     </template>
     <template #action="slotProps">
-      <a-space>
+      <j-space>
         <PermissionButton :uhas-permission="`${permission}:update`" type="link" key="edit" style="padding: 0"
           :udisabled="operateLimits('updata', type)" @click="handleEditClick(slotProps)" :tooltip="{
             title: operateLimits('updata', type) ? '当前的存储方式不支持编辑' : '编辑',
@@ -50,14 +50,13 @@
           }">
           <Aicon type="DeleteOutlined" />
         </PermissionButton>
-      </a-space>
+      </j-space>
     </template>
-  </JTable>
+  </j-pro-table>
 </template>
 <script setup lang="ts" name="BaseMetadata">
 import type { MetadataItem, MetadataType } from '@/views/device/Product/typings'
 import MetadataMapping from './columns'
-import JTable from '@/components/Table'
 import { useInstanceStore } from '@/store/instance'
 import { useProductStore } from '@/store/product'
 import { useMetadataStore } from '@/store/metadata'
diff --git a/src/views/device/components/Metadata/Cat/index.vue b/src/views/device/components/Metadata/Cat/index.vue
index eff77dc6..cddd46ec 100644
--- a/src/views/device/components/Metadata/Cat/index.vue
+++ b/src/views/device/components/Metadata/Cat/index.vue
@@ -15,7 +15,7 @@
           组装上报设备的数据。您可以导出完整物模型，用于云端应用开发。
         </p>
       </div>
-      <a-tabs @change="handleConvertMetadata">
+      <a-tabs @change="handleConvertMetadata" destroy-inactive-tab-pane>
         <a-tab-pane v-for="item in codecs" :key="item.id" :tab="item.name">
           <div class="cat-panel">
             <MonacoEditor v-model="value" theme="vs" style="height: 100%"></MonacoEditor>
diff --git a/src/views/device/components/Metadata/index.vue b/src/views/device/components/Metadata/index.vue
index d3d3908d..651af85a 100644
--- a/src/views/device/components/Metadata/index.vue
+++ b/src/views/device/components/Metadata/index.vue
@@ -1,8 +1,8 @@
 <template>
-  <a-card>
+  <j-card>
     <div class='device-detail-metadata' style="position: relative;">
       <div class="tips">
-        <a-tooltip :title="instanceStore.detail?.independentMetadata && type === 'device'
+        <j-tooltip :title="instanceStore.detail?.independentMetadata && type === 'device'
         ? '该设备已脱离产品物模型，修改产品物模型对该设备无影响'
         : '设备会默认继承产品的物模型，修改设备物模型后将脱离产品物模型'">
           <div class="ellipsis">
@@ -13,11 +13,11 @@
                 : '设备会默认继承产品的物模型，修改设备物模型后将脱离产品物模型'
             }}
           </div>
-        </a-tooltip>
+        </j-tooltip>
       </div>
-      <a-tabs class="metadataNav" destroyInactiveTabPane type="card">
+      <j-tabs class="metadataNav" destroyInactiveTabPane type="card">
         <template #rightExtra>
-          <a-space>
+          <j-space>
             <PermissionButton v-if="type === 'device' && instanceStore.detail?.independentMetadata"
               :hasPermission="`${permission}:update`" :popConfirm="{ title: '确认重置？', onConfirm: resetMetadata, }"
               :tooltip="{ title: '重置后将使用产品的物模型配置' }" key="reload">
@@ -25,32 +25,31 @@
             </PermissionButton>
             <PermissionButton :hasPermission="`${permission}:update`" @click="visible = true">快速导入</PermissionButton>
             <PermissionButton :hasPermission="`${permission}:update`" @click="cat = true">物模型TSL</PermissionButton>
-          </a-space>
+          </j-space>
         </template>
 
-        <a-tab-pane tab="属性定义" key="properties">
+        <j-tab-pane tab="属性定义" key="properties">
           <BaseMetadata :target="type" type="properties" :permission="permission" />
-        </a-tab-pane>
-        <a-tab-pane tab="功能定义" key="functions">
+        </j-tab-pane>
+        <j-tab-pane tab="功能定义" key="functions">
           <BaseMetadata :target="type" type="functions" :permission="permission" />
-        </a-tab-pane>
-        <a-tab-pane tab="事件定义" key="events">
+        </j-tab-pane>
+        <j-tab-pane tab="事件定义" key="events">
           <BaseMetadata :target="type" type="events" :permission="permission" />
-        </a-tab-pane>
-        <a-tab-pane tab="标签定义" key="tags">
+        </j-tab-pane>
+        <j-tab-pane tab="标签定义" key="tags">
           <BaseMetadata :target="type" type="tags" :permission="permission" />
-        </a-tab-pane>
-      </a-tabs>
+        </j-tab-pane>
+      </j-tabs>
       <Import v-model:visible="visible" :type="type" @close="visible = false" />
       <Cat v-model:visible="cat" @close="cat = false" :type="type" />
     </div>
-  </a-card>
+  </j-card>
 </template>
 <script setup lang="ts" name="Metadata">
 import PermissionButton from '@/components/PermissionButton/index.vue'
 import { deleteMetadata } from '@/api/device/instance.js'
 import { message } from 'ant-design-vue'
-import { SystemConst } from '@/utils/consts'
 import { useInstanceStore } from '@/store/instance'
 import Import from './Import/index.vue'
 import Cat from './Cat/index.vue'