From aea6aa6ce4886441d55ab80c81587553a0f5f833 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=B4=AA=E6=B4=AA?= <2498601771@qq.com> Date: Thu, 23 May 2024 16:00:40 +0800 Subject: [PATCH] =?UTF-8?q?CN-1664=20feat:=20=E5=AE=9E=E4=BD=93=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E6=A1=86=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/advancedSearch/Index.vue | 8 +- src/components/advancedSearch/TextMode.vue | 7 +- .../advancedSearch/showhint/Hint/Hint.vue | 5 +- .../advancedSearch/showhint/Hint/HintInfo.vue | 102 +++++++++++++++++- 4 files changed, 117 insertions(+), 5 deletions(-) diff --git a/src/components/advancedSearch/Index.vue b/src/components/advancedSearch/Index.vue index f9e8c647..81a65291 100644 --- a/src/components/advancedSearch/Index.vue +++ b/src/components/advancedSearch/Index.vue @@ -129,7 +129,13 @@ export default { enterListener (event) { if (event.keyCode === 13) { this.$refs.tagMode && this.$refs.tagMode.enterSearch() - this.$refs.textMode && this.$refs.textMode.search() + const timer = setTimeout(() => { + // 如果回车是选择hint面板的值,则不进行搜索 + if (this.$refs.textMode && !this.$refs.textMode.isHintEnter) { + this.$refs.textMode.search() + } + clearTimeout(timer) + }, 100) } } }, diff --git a/src/components/advancedSearch/TextMode.vue b/src/components/advancedSearch/TextMode.vue index 7c56bea6..5aed6786 100644 --- a/src/components/advancedSearch/TextMode.vue +++ b/src/components/advancedSearch/TextMode.vue @@ -44,6 +44,7 @@ @@ -86,7 +87,8 @@ export default { hintVisible: false, dataset: null, CodeMirror, - myUnitTestStr: this.unitTestStr + myUnitTestStr: this.unitTestStr, + isHintEnter: null } }, emits: ['changeMode', 'search'], @@ -467,6 +469,9 @@ export default { this.emitter.on('advanced-search', function () { vm.search() }) + }, + handleEnter (e) { + this.isHintEnter = e } }, watch: { diff --git a/src/components/advancedSearch/showhint/Hint/Hint.vue b/src/components/advancedSearch/showhint/Hint/Hint.vue index 262e492f..2d331b8d 100644 --- a/src/components/advancedSearch/showhint/Hint/Hint.vue +++ b/src/components/advancedSearch/showhint/Hint/Hint.vue @@ -3,7 +3,7 @@
- +
@@ -29,6 +29,9 @@ export default { methods: { onSelect (item, index, hintList) { this.$emit('select', item, index, hintList) + }, + onKeydownEnter (e) { + this.$emit('keydownEnter', e) } } } diff --git a/src/components/advancedSearch/showhint/Hint/HintInfo.vue b/src/components/advancedSearch/showhint/Hint/HintInfo.vue index c5154706..f3cf5ba3 100644 --- a/src/components/advancedSearch/showhint/Hint/HintInfo.vue +++ b/src/components/advancedSearch/showhint/Hint/HintInfo.vue @@ -1,10 +1,11 @@