From 3842a8d8837a339c15c380e70db14e085b51c656 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Fri, 14 Aug 2020 17:21:32 +0800 Subject: [PATCH 1/2] =?UTF-8?q?BI-71041=20fix:=20searcher=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E5=85=81=E8=AE=B8=E6=90=9C=E7=A9=BA=E6=A0=BC=E5=90=8E?= =?UTF-8?q?=E8=BE=93=E5=85=A5=E7=A9=BA=E6=A0=BC=E4=B8=8D=E5=BA=94=E8=AF=A5?= =?UTF-8?q?=E9=80=80=E5=87=BA=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- changelog.md | 1 + src/base/combination/searcher.js | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changelog.md b/changelog.md index fd2f41750..6bbed0565 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,6 @@ # 更新日志 2.0(2020-08) +- 修复了searcher在允许搜索的情况下输入空格直接退出搜索的问题 - 修复了复选下拉系列'点按空格添加完全匹配项'添加的是显示值而非实际值的问题 - search_text_value_combo支持水印 - BI.makeObject 方法支持传入iteratee diff --git a/src/base/combination/searcher.js b/src/base/combination/searcher.js index b7b307e55..3a8891acf 100644 --- a/src/base/combination/searcher.js +++ b/src/base/combination/searcher.js @@ -80,7 +80,10 @@ BI.Searcher = BI.inherit(BI.Widget, { search(); break; case BI.Events.PAUSE: - self._pauseSearch(); + // 可以搜索空格的情况下输入空格不做处理, 展示上一次的结果 + if (!o.allowSearchBlank) { + self._pauseSearch(); + } break; } }); From 628ec05bad7d28ea6f9dd470a4247d9f76b3f129 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Fri, 14 Aug 2020 17:33:48 +0800 Subject: [PATCH 2/2] update --- src/case/combo/searchtextvaluecombo/trigger.searchtextvalue.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/case/combo/searchtextvaluecombo/trigger.searchtextvalue.js b/src/case/combo/searchtextvaluecombo/trigger.searchtextvalue.js index ff62ef243..edf3cb5ae 100644 --- a/src/case/combo/searchtextvaluecombo/trigger.searchtextvalue.js +++ b/src/case/combo/searchtextvaluecombo/trigger.searchtextvalue.js @@ -44,7 +44,7 @@ BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, { var keyword = obj.keyword; var finding = BI.Func.getSearchResult(o.items, keyword); var matched = finding.match, find = finding.find; - callback(find, matched); + callback(matched, find); }, listeners: [{ eventName: BI.Searcher.EVENT_CHANGE,