From 492bc33c00098a3b275209f1a9662845805a3527 Mon Sep 17 00:00:00 2001
From: JiangQiming <291854119@qq.com>
Date: Fri, 31 Mar 2023 16:17:59 +0800
Subject: [PATCH 1/3] fix: bug#11316

---
 src/views/media/Device/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/media/Device/index.vue b/src/views/media/Device/index.vue
index ee593afd..babfdb64 100644
--- a/src/views/media/Device/index.vue
+++ b/src/views/media/Device/index.vue
@@ -66,7 +66,7 @@
                                     <div class="card-item-content-text">
                                         型号
                                     </div>
-                                    <div>{{ slotProps.model }}</div>
+                                    <Ellipsis>{{ slotProps.model }}</Ellipsis>
                                 </j-col>
                                 <j-col :span="12">
                                     <div class="card-item-content-text">

From c178d226918f646598b6372a47c868eda76c9b1b Mon Sep 17 00:00:00 2001
From: JiangQiming <291854119@qq.com>
Date: Fri, 31 Mar 2023 17:01:39 +0800
Subject: [PATCH 2/3] fix: bug#11251

---
 src/views/notice/Template/Detail/index.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/views/notice/Template/Detail/index.vue b/src/views/notice/Template/Detail/index.vue
index 2fdab84e..b62822dc 100644
--- a/src/views/notice/Template/Detail/index.vue
+++ b/src/views/notice/Template/Detail/index.vue
@@ -1236,8 +1236,11 @@ const handleSubmit = () => {
         formData.value.variableDefinitions.some((s: any) => !s.name)
     )
         return;
-    // 邮件没有配置字段
-    if (formData.value.type === 'email') delete formData.value.configId;
+    if (formData.value.type === 'email') {
+        formData.value.template.text = formData.value.template.message;
+        // 邮件没有配置字段
+        delete formData.value.configId;
+    }
     if (formData.value.template.messageType === 'markdown')
         delete formData.value.template.link;
     if (formData.value.template.messageType === 'link')

From f6f99efe2bfcd9ac3c95c233f5f3994e84b3404d Mon Sep 17 00:00:00 2001
From: 100011797 <2642441182@qq.com>
Date: Fri, 31 Mar 2023 17:19:17 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E4=BA=A7=E5=93=81=E4=BF=AE=E6=94=B9=E5=90=8E=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=8F=98=E5=8C=96=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/rule-engine/Scene/Save/util.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/rule-engine/Scene/Save/util.ts b/src/views/rule-engine/Scene/Save/util.ts
index a9f583dc..93c4bf1a 100644
--- a/src/views/rule-engine/Scene/Save/util.ts
+++ b/src/views/rule-engine/Scene/Save/util.ts
@@ -123,6 +123,7 @@ export const EventEmitter = {
 }
 
 export const isActionChange = (_metadata: any, _message: any) => {
+  console.log(_metadata, _message)
   const _properties = _metadata?.properties || [];
   const _functions = _metadata?.functions || [];
   if (
@@ -144,7 +145,7 @@ export const isActionChange = (_metadata: any, _message: any) => {
   } else if (_message?.messageType === 'WRITE_PROPERTY') {
       const _data = Object.keys(_message?.properties)?.[0]
       if (_data) {
-          const _item = _functions.find((i: any) => i.id === _data);
+          const _item = _properties.find((i: any) => i.id === _data);
           return _item?.id;
       }
       return false;