Merge pull request #191 in ~GUY/fineui from ~WINDY/fineui:master to master

* commit '0335daae093f5a020acde2d4adb3992b11487682':
  update
  BI-10584 文本组件遮盖

bi/base.js

@@ -3262,7 +3262,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.className === "CodeMirror-cursor" || $(e.target).closest(".CodeMirror-hints").length > 0) {//BI-9887 CodeMirror的公式弹框需要特殊处理下
             return;
         }
         var isHide = this.options.hideChecker.apply(this, [e]);
@@ -19066,7 +19067,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 () {

dist/base.js

@@ -3262,7 +3262,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.className === "CodeMirror-cursor" || $(e.target).closest(".CodeMirror-hints").length > 0) {//BI-9887 CodeMirror的公式弹框需要特殊处理下
             return;
         }
         var isHide = this.options.hideChecker.apply(this, [e]);
@@ -19066,7 +19067,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 () {

dist/bundle.js

@@ -32291,7 +32291,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.className === "CodeMirror-cursor" || $(e.target).closest(".CodeMirror-hints").length > 0) {//BI-9887 CodeMirror的公式弹框需要特殊处理下
             return;
         }
         var isHide = this.options.hideChecker.apply(this, [e]);
@@ -48095,7 +48096,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 () {

src/base/combination/combo.js

@@ -220,7 +220,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.className === "CodeMirror-cursor" || $(e.target).closest(".CodeMirror-hints").length > 0) {//BI-9887 CodeMirror的公式弹框需要特殊处理下
             return;
         }
         var isHide = this.options.hideChecker.apply(this, [e]);

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 () {