From de7600a578033f34d24e37ef9c9041d8eebdb4a8 Mon Sep 17 00:00:00 2001
From: Kirigaya <1193466151@qq.com>
Date: Thu, 5 Sep 2024 12:33:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=20name=20search=20=E4=B8=8B?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E4=B8=8D=E6=8C=89=E7=85=A7=E8=A7=86=E5=9B=BE?=
 =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E6=9D=A5=E7=9A=84=20bug=20|=20=E8=A7=A3?=
 =?UTF-8?q?=E5=86=B3=E8=BF=9E=E7=BB=AD=E6=A1=86=E9=80=89=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E7=9A=84=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/sidebar/exist-group.vue       |  2 +-
 src/components/sidebar/handle-contextmenu.js |  2 +-
 src/components/toolbar/value-search.vue      | 10 +++++++---
 src/hook/wave-container-view.js              |  3 +++
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/components/sidebar/exist-group.vue b/src/components/sidebar/exist-group.vue
index 733ef7a..e90015d 100644
--- a/src/components/sidebar/exist-group.vue
+++ b/src/components/sidebar/exist-group.vue
@@ -31,7 +31,6 @@
 import { computed, defineComponent } from 'vue';
 import { contextmenu } from './handle-contextmenu';
 import { currentGroups } from './manage-group';
-import { globalLookup } from '@/hook/global';
 import { useI18n } from 'vue-i18n';
 import { joinGroup } from './exist-group';
 
@@ -65,6 +64,7 @@ function getItemName(view) {
 
 function onClick(group) {
     joinGroup(group);
+    contextmenu.show = false;
 }
 
 </script>
diff --git a/src/components/sidebar/handle-contextmenu.js b/src/components/sidebar/handle-contextmenu.js
index c4bd156..14c648a 100644
--- a/src/components/sidebar/handle-contextmenu.js
+++ b/src/components/sidebar/handle-contextmenu.js
@@ -5,7 +5,7 @@ import { WaveContainerView } from "@/hook/wave-container-view";
 import { sidebarSelectedWires } from "@/hook/sidebar-select-wire";
 
 /**
- * @namespace contextmenu
+ * @description 控制左侧 sidebar 右击菜单栏
  */
 export const contextmenu = reactive({
     show: false,
diff --git a/src/components/toolbar/value-search.vue b/src/components/toolbar/value-search.vue
index 8a2ba5f..7bc95a2 100644
--- a/src/components/toolbar/value-search.vue
+++ b/src/components/toolbar/value-search.vue
@@ -53,6 +53,7 @@ import { computed, defineComponent, reactive, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { onClickNext, onClickPrev, searchMode, toolbarValueSearch, valueSearchText } from './value-search';
 import { sidebarSelectedWires } from '@/hook/sidebar-select-wire';
+import { genOrderedLinks } from '@/hook/wave-container-view';
 
 
 defineComponent({ name: 'value-search' })
@@ -108,11 +109,14 @@ function searchByName() {
     toolbarValueSearch.searchResult.length = 0;
     toolbarValueSearch.resultLinkSet.clear();
     const name = toolbarValueSearch.content.trim();
-    for (const wireItem of globalLookup.currentWires) {
-        if (wireItem.name.includes(name)) {
-            addWire(wireItem);
+
+    for (const wireLink of genOrderedLinks({ returnGroup: false })) {
+        const signal = globalLookup.link2CurrentWires.get(wireLink);
+        if (signal && signal.name.includes(name)) {
+            addWire(signal);
         }
     }
+
     if (toolbarValueSearch.searchResult.length > 0) {
         toolbarValueSearch.cursorIndex = 0;
         const { link } = toolbarValueSearch.searchResult[0];
diff --git a/src/hook/wave-container-view.js b/src/hook/wave-container-view.js
index 2147db2..4e1b664 100644
--- a/src/hook/wave-container-view.js
+++ b/src/hook/wave-container-view.js
@@ -21,6 +21,9 @@ export const WaveContainerView = {
      * @param {WireItem} signal 
      */
     add(signal) {
+        if (globalLookup.currentWires.has(signal)) {
+            return;
+        }
         // 增加高效 CRUD 视图
         globalLookup.currentWires.add(signal);