caoww
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

es6
guy 7 years ago
parent
d09189cdd1 b662d46e8b
commit
57abc1946f
6 changed files with 37 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      bi/base.js
  2. 5
      dist/base.js
  3. 5
      dist/bundle.js
  4. 50
      dist/bundle.min.js
  5. 3
      src/base/combination/combo.js
  6. 2
      src/base/single/editor/editor.code.js

5
bi/base.js
Unescape View File

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

5
dist/base.js vendored
Unescape View File

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

5
dist/bundle.js vendored
Unescape View File

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

50
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

3
src/base/combination/combo.js
Unescape View File

@ -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]);

2
src/base/single/editor/editor.code.js
Unescape View File

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

Write Preview
Loading…
Cancel
Save