From 4778b558d7fa2cce830a52b077bcbf0f9449f3de Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Mon, 27 Mar 2023 17:49:21 +0800
Subject: [PATCH] fix: bug#10822

---
 src/views/rule-engine/Scene/Save/Device/OrgList.vue | 2 +-
 src/views/rule-engine/Scene/Save/Device/Product.vue | 8 +++++++-
 src/views/rule-engine/Scene/index.vue               | 3 ++-
 yarn.lock                                           | 4 ++--
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/views/rule-engine/Scene/Save/Device/OrgList.vue b/src/views/rule-engine/Scene/Save/Device/OrgList.vue
index 34a91082..15407912 100644
--- a/src/views/rule-engine/Scene/Save/Device/OrgList.vue
+++ b/src/views/rule-engine/Scene/Save/Device/OrgList.vue
@@ -3,7 +3,7 @@
     :columns="columns"
     type='simple'
     @search="handleSearch"
-    class='search'
+    class='scene-search'
     target="scene-triggrt-device-category"
   />
   <j-divider style='margin: 0' />
diff --git a/src/views/rule-engine/Scene/Save/Device/Product.vue b/src/views/rule-engine/Scene/Save/Device/Product.vue
index a422076f..5c6b3a9d 100644
--- a/src/views/rule-engine/Scene/Save/Device/Product.vue
+++ b/src/views/rule-engine/Scene/Save/Device/Product.vue
@@ -171,7 +171,13 @@ const columns = [
     hideInTable: true,
     search: {
       type: 'treeSelect',
-      options: queryTree({ paging: false }).then(resp => resp.result),
+      options: () => {
+        return new Promise((res => {
+          queryTree({ paging: false }).then(resp => {
+            res(resp.result)
+          })
+        }))
+      },
       componentProps: {
         fieldNames: {
           label: 'name',
diff --git a/src/views/rule-engine/Scene/index.vue b/src/views/rule-engine/Scene/index.vue
index 865d7bb1..44ad893d 100644
--- a/src/views/rule-engine/Scene/index.vue
+++ b/src/views/rule-engine/Scene/index.vue
@@ -53,8 +53,9 @@
                             </span>
                         </Ellipsis>
                       <div class="subTitle">
+                        说明：
                         <Ellipsis :lineClamp="2">
-                                说明：{{
+                                {{
                                     slotProps?.description ||
                                     typeMap.get(slotProps.triggerType)?.tip
                                 }}
diff --git a/yarn.lock b/yarn.lock
index e886d399..05fda229 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3700,8 +3700,8 @@ jetlinks-store@^0.0.3:
 
 jetlinks-ui-components@^1.0.5:
   version "1.0.5"
-  resolved "http://47.108.170.157:9013/jetlinks-ui-components/-/jetlinks-ui-components-1.0.5.tgz#27312836506c4833dcaaef075e1d3c694d75ae4d"
-  integrity sha512-oum7zipoDUVkm/tPd7yu+mw9mR5NmfBcvBf49ebf55s+nz4zyArFOITzldQJ3Wx6BwaUUH/BiDwskHH+KgBVyg==
+  resolved "http://47.108.170.157:9013/jetlinks-ui-components/-/jetlinks-ui-components-1.0.5.tgz#b4a660205c347de7f873ab656cf69f495c449212"
+  integrity sha512-OGIVtCMNpztUtbrqMte6g4GuFrr+CFS1F1Kapu8rhGNn/gk6Ag28kKPY2epkCh8aEmo/Imi0slhT5M0QCyToRQ==
   dependencies:
     "@vueuse/core" "^9.12.0"
     ant-design-vue "^3.2.15"