From f44985ba3f90dbb08431d254fa163e506ec9dd1c Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Tue, 28 Mar 2023 09:35:47 +0800
Subject: [PATCH 1/2] =?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=E6=A0=87=E7=AD=BE=E8=AF=AF=E5=88=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/rule-engine/Scene/Save/action/ListItem/Item.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/rule-engine/Scene/Save/action/ListItem/Item.vue b/src/views/rule-engine/Scene/Save/action/ListItem/Item.vue
index 41666a52..1ad6e6a0 100644
--- a/src/views/rule-engine/Scene/Save/action/ListItem/Item.vue
+++ b/src/views/rule-engine/Scene/Save/action/ListItem/Item.vue
@@ -259,9 +259,9 @@
                                 type="icon-mubiao"
                                 style="padding:0 4px"
                             />
-                          < style='max-width: 200px;margin-right: 12px;'>
+                          <Ellipsis style='max-width: 200px;margin-right: 12px;'>
                             {{data?.options?.name}}
-                          </>
+                          </Ellipsis>
                           <Ellipsis style='max-width: 400px;'>
                             {{data?.options?.propertiesName}}
                           </Ellipsis>

From 4b2439374ab01af64205b4fcb071e6ff6e24cf34 Mon Sep 17 00:00:00 2001
From: JiangQiming <291854119@qq.com>
Date: Tue, 28 Mar 2023 10:07:17 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20bug#10740=E3=80=8111100?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/Basis/index.vue              | 2 +-
 src/views/system/Department/product/index.vue | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/views/system/Basis/index.vue b/src/views/system/Basis/index.vue
index 1b1402ea..04158667 100644
--- a/src/views/system/Basis/index.vue
+++ b/src/views/system/Basis/index.vue
@@ -204,7 +204,7 @@
                                     </div>
 
                                     <div class="upload-tips">推荐尺寸64*64</div>
-                                    <div class="upload-tips">支持icon格式</div>
+                                    <div class="upload-tips">支持ico格式</div>
                                 </j-form-item>
                             </j-col>
                         </j-row>
diff --git a/src/views/system/Department/product/index.vue b/src/views/system/Department/product/index.vue
index 408ef299..3f492d3f 100644
--- a/src/views/system/Department/product/index.vue
+++ b/src/views/system/Department/product/index.vue
@@ -543,6 +543,13 @@ const dialogs = reactive({
     editShow: false,
     nextShow: false,
 });
+
+watch(
+    () => props.parentId,
+    () => {
+        tableData._selectedRowKeys = [];
+    },
+);
 </script>
 
 <style lang="less" scoped>