From 9ff650d76c5de4a3b44eeebeb4b616e25b2db7b3 Mon Sep 17 00:00:00 2001
From: 100011797 <2642441182@qq.com>
Date: Mon, 5 Jun 2023 14:52:45 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=BF=90=E8=A1=8C=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E5=8D=A1=E9=A1=BF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Detail/Running/Property/index.vue         | 54 +++++++++++--------
 1 file changed, 32 insertions(+), 22 deletions(-)

diff --git a/src/views/device/Instance/Detail/Running/Property/index.vue b/src/views/device/Instance/Detail/Running/Property/index.vue
index c45500b4..2ff87e0e 100644
--- a/src/views/device/Instance/Detail/Running/Property/index.vue
+++ b/src/views/device/Instance/Detail/Running/Property/index.vue
@@ -5,6 +5,7 @@
             :request="query"
             :params="_params"
             :bodyStyle="{ padding: '0 0 0 20px' }"
+            :scroll="{y : 400}"
         >
             <template #headerTitle>
                 <j-input-search
@@ -75,7 +76,7 @@
 </template>
 
 <script lang="ts" setup>
-import _, { groupBy, toArray } from 'lodash-es';
+import _, { groupBy, throttle, toArray } from 'lodash-es';
 import { PropertyData } from '../../../typings';
 import PropertyCard from './PropertyCard.vue';
 import ValueRender from './ValueRender.vue';
@@ -86,7 +87,7 @@ import { getProperty } from '@/api/device/instance';
 import { useInstanceStore } from '@/store/instance';
 import { message } from 'ant-design-vue';
 import { getWebSocket } from '@/utils/websocket';
-import { map } from 'rxjs/operators';
+import { map, throttleTime } from 'rxjs/operators';
 import { queryDashboard } from '@/api/comm';
 
 const columns = [
@@ -137,7 +138,7 @@ const _params = reactive({
 
 const subRef = ref();
 
-const list = ref<any[]>([]);
+// const list = ref<any[]>([]);
 
 const getActions = (data: Partial<Record<string, any>>) => {
     const arr = [];
@@ -213,15 +214,21 @@ const getActions = (data: Partial<Record<string, any>>) => {
     return arr;
 };
 
-// const valueChange = (arr: Record<string, any>[]) => {
-//     (arr || [])
-//         .sort((a: any, b: any) => a.timestamp - b.timestamp)
-//         .forEach((item: any) => {
-//             const { value } = item;
-//             propertyValue.value[value?.property] = { ...item, ...value };
-//         });
-//     list.value = []
-// };
+const valueChange = (arr: Record<string, any>[]) => {
+    (arr || [])
+        .sort((a: any, b: any) => a.timestamp - b.timestamp)
+        .forEach((item: any) => {
+            const { value } = item;
+            propertyValue.value[value?.property] = { ...item, ...value };
+        });
+};
+
+let messageCache = new Map()
+
+const throttleFn = throttle(() => {
+    const _list = [...messageCache.values()]
+    valueChange(_list)
+}, 500)
 
 const subscribeProperty = () => {
     const id = `instance-info-property-${instanceStore.current.id}-${
@@ -235,16 +242,19 @@ const subscribeProperty = () => {
     })
         ?.pipe(map((res: any) => res.payload))
         .subscribe((payload) => {
-            list.value = [...list.value, payload];
-            unref(list)
-                .sort((a: any, b: any) => a.timestamp - b.timestamp)
-                .forEach((item: any) => {
-                    const { value } = item;
-                    propertyValue.value[value?.property] = {
-                        ...item,
-                        ...value,
-                    };
-                });
+            if(payload.value?.property) {
+                messageCache.set(payload.value?.property, payload)
+                throttleFn()
+            }
+            // unref(list)
+            //     .sort((a: any, b: any) => a.timestamp - b.timestamp)
+            //     .forEach((item: any) => {
+            //         const { value } = item;
+            //         propertyValue.value[value?.property] = {
+            //             ...item,
+            //             ...value,
+            //         };
+            //     });
             // list.value = [...list.value, payload];
             // throttle(valueChange(list.value), 500);
         });