From 29b6f02b736397cb63dd8165edfc1c4883e4bd48 Mon Sep 17 00:00:00 2001
From: XieYongHong <18010623010@163.com>
Date: Wed, 12 Jul 2023 11:23:33 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E7=89=A9=E6=A8=A1=E5=9E=8B=E5=B1=9E=E6=80=A7=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Properties/Metrics/ValueItem.vue          | 10 ++--
 .../Metadata/Base/hooks/useMatadata.ts        |  1 +
 .../device/components/Metadata/index.vue      | 28 +++++------
 .../device/components/Metadata/metadata.ts    | 48 +++++++++++--------
 4 files changed, 49 insertions(+), 38 deletions(-)

diff --git a/src/views/device/components/Metadata/Base/components/Properties/Metrics/ValueItem.vue b/src/views/device/components/Metadata/Base/components/Properties/Metrics/ValueItem.vue
index cd002fec..29396e42 100644
--- a/src/views/device/components/Metadata/Base/components/Properties/Metrics/ValueItem.vue
+++ b/src/views/device/components/Metadata/Base/components/Properties/Metrics/ValueItem.vue
@@ -59,9 +59,9 @@ const formData = reactive<{
   value: ValueType;
   rangeValue: ValueType;
 }>({
-  value: props.value.range === false ? props.value.value : undefined,
-  rangeValue: props.value.range === true
-      ? props.value.value || [undefined, undefined]
+  value: props.value?.range === false ? props.value?.value : undefined,
+  rangeValue: props.value?.range === true
+      ? props.value?.value || [undefined, undefined]
       : [undefined, undefined],
 });
 
@@ -69,9 +69,9 @@ const formRef = ref()
 
 const showText = computed(() => {
   if (props.value.range === false) {
-    return props.value.value || ''
+    return props.value?.value || ''
   } else {
-    return props.value.value?.[0] ? props.value.value.join('-') : ''
+    return props.value?.value?.[0] ? props.value.value.join('-') : ''
   }
 })
 
diff --git a/src/views/device/components/Metadata/Base/hooks/useMatadata.ts b/src/views/device/components/Metadata/Base/hooks/useMatadata.ts
index 88ea90bf..00863694 100644
--- a/src/views/device/components/Metadata/Base/hooks/useMatadata.ts
+++ b/src/views/device/components/Metadata/Base/hooks/useMatadata.ts
@@ -35,6 +35,7 @@ const useMetadata = (type: 'device' | 'product', key?: MetadataType, ): {
             const productMetadata: any = JSON.parse(instanceStore.current.productMetadata)
             const metaArray = key ? productMetadata[key] : []
             const productIndexKeys = metaArray?.map((item:any, index: number) => index) || []
+            productNoEdit.value.ids = metaArray?.map((item: any) => item.id) || []
             productNoEdit.value.id = productIndexKeys
             productNoEdit.value.name = productIndexKeys
             if (key === 'properties') {
diff --git a/src/views/device/components/Metadata/index.vue b/src/views/device/components/Metadata/index.vue
index 7baf6267..2e57b302 100644
--- a/src/views/device/components/Metadata/index.vue
+++ b/src/views/device/components/Metadata/index.vue
@@ -1,19 +1,19 @@
 <template>
     <div class='device-detail-metadata' style="position: relative;">
-      <div class="tips">
-        <j-tooltip :title="instanceStore.detail?.independentMetadata && type === 'device'
-        ? '该设备已脱离产品物模型，修改产品物模型对该设备无影响'
-        : '设备会默认继承产品的物模型，修改设备物模型后将脱离产品物模型'">
-          <div class="ellipsis" style='color: #999;'>
-            <AIcon type="InfoCircleOutlined" style="margin-right: 3px" />
-            {{
-              instanceStore.detail?.independentMetadata && type === 'device'
-                ? '该设备已脱离产品物模型，修改产品物模型对该设备无影响'
-                : '设备会默认继承产品的物模型，修改设备物模型后将脱离产品物模型'
-            }}
-          </div>
-        </j-tooltip>
-      </div>
+<!--      <div class="tips">-->
+<!--        <j-tooltip :title="instanceStore.detail?.independentMetadata && type === 'device'-->
+<!--        ? '该设备已脱离产品物模型，修改产品物模型对该设备无影响'-->
+<!--        : '设备会默认继承产品的物模型，修改设备物模型后将脱离产品物模型'">-->
+<!--          <div class="ellipsis" style='color: #999;'>-->
+<!--            <AIcon type="InfoCircleOutlined" style="margin-right: 3px" />-->
+<!--            {{-->
+<!--              instanceStore.detail?.independentMetadata && type === 'device'-->
+<!--                ? '该设备已脱离产品物模型，修改产品物模型对该设备无影响'-->
+<!--                : '设备会默认继承产品的物模型，修改设备物模型后将脱离产品物模型'-->
+<!--            }}-->
+<!--          </div>-->
+<!--        </j-tooltip>-->
+<!--      </div>-->
       <j-tabs class="metadataNav" destroyInactiveTabPane type="card">
         <template #rightExtra>
           <j-space>
diff --git a/src/views/device/components/Metadata/metadata.ts b/src/views/device/components/Metadata/metadata.ts
index 7a1b9db3..6c9cc28b 100644
--- a/src/views/device/components/Metadata/metadata.ts
+++ b/src/views/device/components/Metadata/metadata.ts
@@ -2,10 +2,16 @@ import { saveProductMetadata } from "@/api/device/product";
 import { saveMetadata } from "@/api/device/instance";
 import type { DeviceInstance } from "../../Instance/typings";
 import type { DeviceMetadata, MetadataItem, MetadataType, ProductItem } from "../../Product/typings";
+import { differenceBy } from "lodash-es";
 
+const filterProductMetadata = (data: any[], productMetaData: any[]) => {
+  const ids = productMetaData.map((item: any) => item.id)
+  const idsSet = new Set(ids)
+  return data.filter((a) => !idsSet.has(a.id))
+}
 /**
  * 更新物模型
- * @param type 物模型类型 events
+ * @param type 物模型类型 "events" | "functions" | "properties" | "tags"
  * @param item 物模型数据 【{a},{b},{c}】
  // * @param target product、device
  * @param data product 、device [{event:[1,2,3]]
@@ -21,25 +27,29 @@ import type { DeviceMetadata, MetadataItem, MetadataType, ProductItem } from "..
 ): ProductItem | DeviceInstance => {
   if (!data) return data;
   const metadata = JSON.parse(data.metadata || '{}') as DeviceMetadata;
-  const config = (metadata[type] || []) as MetadataItem[];
-  if (item.length > 0) {
-    item.forEach((i) => {
-      const index = config.findIndex((c) => c.id === i.id);
-      if (index > -1) {
-        config[index] = i;
-        // onEvent?.('update', i);
-      } else {
-        config.push(i);
-        // onEvent?.('add', i);
-      }
-    });
-  } else {
-    console.warn('未触发物模型修改');
+  let productMetaData
+
+  if ((data as DeviceInstance).productMetadata) {
+    productMetaData = JSON.parse((data as DeviceInstance).productMetadata)
   }
-  console.log('updateMetadata', config, type)
-  // @ts-ignore
-  // metadata[type] = config.sort((a, b) => b?.sortsIndex - a?.sortsIndex);
-  metadata[type] = item.sort((a, b) => b?.sortsIndex - a?.sortsIndex);
+
+  if (productMetaData) {
+    if (productMetaData.properties && productMetaData.properties.length) {
+      metadata.properties = filterProductMetadata(metadata.properties, productMetaData.properties)
+    }
+    if (productMetaData.functions && productMetaData.functions.length) {
+      metadata.functions = filterProductMetadata(metadata.functions, productMetaData.functions)
+    }
+    if (productMetaData.events && productMetaData.events.length) {
+      metadata.events = filterProductMetadata(metadata.events, productMetaData.events)
+    }
+    if (productMetaData.tags && productMetaData.tags.length) {
+      metadata.tags = filterProductMetadata(metadata.tags, productMetaData.tags)
+    }
+  }
+
+  console.log(metadata)
+  metadata[type] = metadata[type].sort((a, b) => b?.sortsIndex - a?.sortsIndex) as any[]
   console.log('updateMetadata',metadata)
   data.metadata = JSON.stringify(metadata);
   onEvent?.(data.metadata)