From 285d108bbc41c81d74be82616f31e8bc80fa7ad4 Mon Sep 17 00:00:00 2001
From: XieYongHong <18010623010@163.com>
Date: Thu, 11 May 2023 18:47:34 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=9C=BA=E6=99=AF?=
 =?UTF-8?q?=E8=81=94=E5=8A=A8=E5=85=B3=E7=B3=BB=E7=94=A8=E6=88=B7=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: 优化采集器无数据时页面卡死问题

* fix: 修复场景联动关系用户显示
---
 .../Scene/Save/action/Notify/variableItem/User.vue         | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/views/rule-engine/Scene/Save/action/Notify/variableItem/User.vue b/src/views/rule-engine/Scene/Save/action/Notify/variableItem/User.vue
index 27b809b2..d955afc5 100644
--- a/src/views/rule-engine/Scene/Save/action/Notify/variableItem/User.vue
+++ b/src/views/rule-engine/Scene/Save/action/Notify/variableItem/User.vue
@@ -178,7 +178,7 @@ const source = computed(() => {
 });
 
 const triggerType = computed(() => {
-    return data?.trigger || data?.trigger?.type;
+    return data.value?.trigger?.type;
 });
 
 const relationData = computed(() => {
@@ -228,7 +228,7 @@ const getRelationUsers = async (notifyType: string, notifierId: string) => {
     }
 };
 
-const getUser = async (_source: string, triggerType: string) => {
+const getUser = async (_source: string, _triggerType: string) => {
     const newTree = [
         {
             title: '平台用户',
@@ -243,7 +243,8 @@ const getUser = async (_source: string, triggerType: string) => {
         paging: false,
         sorts: [{ name: 'name', order: 'asc' }],
     });
-    if (triggerType && triggerType === 'device' && _source === 'relation') {
+  console.log(_triggerType, _source)
+    if (_triggerType && _triggerType === 'device' && _source === 'relation') {
         relationResp = await NoticeApi.getRelationUsers({
             paging: false,
             sorts: [{ name: 'name', order: 'asc' }],