From 53ee8cba1a00d355bdc31f1499c13009378d2d42 Mon Sep 17 00:00:00 2001
From: windy <1374721899@qq.com>
Date: Mon, 23 Oct 2017 16:28:55 +0800
Subject: [PATCH] =?UTF-8?q?BI-10584=20=E6=96=87=E6=9C=AC=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E9=81=AE=E7=9B=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/base/combination/combo.js         | 3 ++-
 src/base/single/editor/editor.code.js | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/base/combination/combo.js b/src/base/combination/combo.js
index be77d0680..0ee81ad45 100644
--- a/src/base/combination/combo.js
+++ b/src/base/combination/combo.js
@@ -219,7 +219,8 @@ BI.Combo = BI.inherit(BI.Widget, {
         // if (this.element.__isMouseInBounds__(e) || (this.popupView && this.popupView.element.__isMouseInBounds__(e))) {
         //     return;
         // }
-        if (this.element.find(e.target).length > 0 || e.target.className === "CodeMirror-cursor" || $(e.target).closest(".CodeMirror-hints").length > 0) {//BI-9887 CodeMirror的公式弹框需要特殊处理下
+        //BI-10290 公式combo双击公式内容会收起
+        if (this.element.find(e.target).length > 0 || $(e.target).closest(".CodeMirror").length > 0 || $(e.target).closest(".CodeMirror-hints").length > 0) {//BI-9887 CodeMirror的公式弹框需要特殊处理下
             return;
         }
         var isHide = this.options.hideChecker.apply(this, [e]);
diff --git a/src/base/single/editor/editor.code.js b/src/base/single/editor/editor.code.js
index 3ef7f5519..738f207a5 100644
--- a/src/base/single/editor/editor.code.js
+++ b/src/base/single/editor/editor.code.js
@@ -50,7 +50,7 @@ BI.CodeEditor = BI.inherit(BI.Single, {
             BI.nextTick(function () {
                 self.fireEvent(BI.CodeEditor.EVENT_FOCUS);
             });
-            e.stopPropagation();
+            //e.stopPropagation();
         });
 
         // this.editor.on("blur", function () {