From 1bfd7bf9d3279d481231505697bb892c066d89d9 Mon Sep 17 00:00:00 2001
From: windy <1374721899@qq.com>
Date: Thu, 16 Jul 2020 15:05:35 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20combo?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9EbelowMouse?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 changelog.md                  | 1 +
 src/base/combination/combo.js | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/changelog.md b/changelog.md
index 347f6b0719..795cc377b1 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,6 @@
 # 更新日志
 2.0(2020-07)
+- combo新增belowMouse属性,允许popup在点击处弹出
 - 修复了datePicker在setValue的时候没有动态刷新可用月份的问题
 - 同步复选下拉及其面板新增getAllValue获取所有已选值
 - 同步复选下拉树及其面板新增getAllValue获取完整的选中树节点
diff --git a/src/base/combination/combo.js b/src/base/combination/combo.js
index f96c40c562..3a17ba0ff8 100644
--- a/src/base/combination/combo.js
+++ b/src/base/combination/combo.js
@@ -31,7 +31,8 @@
                 el: {},
                 popup: {},
                 comboClass: "bi-combo-popup",
-                hoverClass: "bi-combo-hover"
+                hoverClass: "bi-combo-hover",
+                belowMouse: false
             });
         },
 
@@ -349,7 +350,7 @@
             }
             var isVisible = this.popupView.isVisible();
             this.popupView.visible();
-            var combo = BI.isNotNull(e) ? {
+            var combo = (o.belowMouse && BI.isNotNull(e)) ? {
                 element: {
                     offset: function () {
                         return {

From fe39ce71b98da9f79efe6c1a1677411754cb2476 Mon Sep 17 00:00:00 2001
From: windy <1374721899@qq.com>
Date: Thu, 16 Jul 2020 15:09:07 +0800
Subject: [PATCH 2/3] update

---
 changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/changelog.md b/changelog.md
index 795cc377b1..8890424018 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,6 +1,7 @@
 # 更新日志
 2.0(2020-07)
 - combo新增belowMouse属性,允许popup在点击处弹出
+- combo新增hideWhenAnotherComboOpen属性,开启则当前popup展开时强制其他所有combo都收起
 - 修复了datePicker在setValue的时候没有动态刷新可用月份的问题
 - 同步复选下拉及其面板新增getAllValue获取所有已选值
 - 同步复选下拉树及其面板新增getAllValue获取完整的选中树节点

From f5afd0791347594e6e8f67183a04a7b6453d6093 Mon Sep 17 00:00:00 2001
From: windy <1374721899@qq.com>
Date: Thu, 16 Jul 2020 15:11:23 +0800
Subject: [PATCH 3/3] update

---
 changelog.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog.md b/changelog.md
index 8890424018..db9203c9ef 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,7 +1,7 @@
 # 更新日志
 2.0(2020-07)
 - combo新增belowMouse属性,允许popup在点击处弹出
-- combo新增hideWhenAnotherComboOpen属性,开启则当前popup展开时强制其他所有combo都收起
+- combo新增hideWhenAnotherComboOpen属性,开启则其他combo下拉时当前combo收起
 - 修复了datePicker在setValue的时候没有动态刷新可用月份的问题
 - 同步复选下拉及其面板新增getAllValue获取所有已选值
 - 同步复选下拉树及其面板新增getAllValue获取完整的选中树节点