fanruan
/
fineui
4
1
Fork 3
Code Issues 1 Pull Requests Releases Wiki Activity
Browse Source

update

es6
windy 7 years ago
parent
2cf1f4c163
commit
0335daae09
5 changed files with 35 additions and 32 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified 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. 2
      src/base/combination/combo.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))) { // if (this.element.__isMouseInBounds__(e) || (this.popupView && this.popupView.element.__isMouseInBounds__(e))) {
// return; // 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; return;
} }
var isHide = this.options.hideChecker.apply(this, [e]); var isHide = this.options.hideChecker.apply(this, [e]);
@ -19066,7 +19067,7 @@ BI.CodeEditor = BI.inherit(BI.Single, {
BI.nextTick(function () { BI.nextTick(function () {
self.fireEvent(BI.CodeEditor.EVENT_FOCUS); self.fireEvent(BI.CodeEditor.EVENT_FOCUS);
}); });
e.stopPropagation(); //e.stopPropagation();
}); });
// this.editor.on("blur", function () { // 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))) { // if (this.element.__isMouseInBounds__(e) || (this.popupView && this.popupView.element.__isMouseInBounds__(e))) {
// return; // 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; return;
} }
var isHide = this.options.hideChecker.apply(this, [e]); var isHide = this.options.hideChecker.apply(this, [e]);
@ -19066,7 +19067,7 @@ BI.CodeEditor = BI.inherit(BI.Single, {
BI.nextTick(function () { BI.nextTick(function () {
self.fireEvent(BI.CodeEditor.EVENT_FOCUS); self.fireEvent(BI.CodeEditor.EVENT_FOCUS);
}); });
e.stopPropagation(); //e.stopPropagation();
}); });
// this.editor.on("blur", function () { // 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))) { // if (this.element.__isMouseInBounds__(e) || (this.popupView && this.popupView.element.__isMouseInBounds__(e))) {
// return; // 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; return;
} }
var isHide = this.options.hideChecker.apply(this, [e]); var isHide = this.options.hideChecker.apply(this, [e]);
@ -48095,7 +48096,7 @@ BI.CodeEditor = BI.inherit(BI.Single, {
BI.nextTick(function () { BI.nextTick(function () {
self.fireEvent(BI.CodeEditor.EVENT_FOCUS); self.fireEvent(BI.CodeEditor.EVENT_FOCUS);
}); });
e.stopPropagation(); //e.stopPropagation();
}); });
// this.editor.on("blur", function () { // this.editor.on("blur", function () {

50
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

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

@ -221,7 +221,7 @@ BI.Combo = BI.inherit(BI.Widget, {
// return; // return;
// } // }
//BI-10290 公式combo双击公式内容会收起 //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的公式弹框需要特殊处理下 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; return;
} }
var isHide = this.options.hideChecker.apply(this, [e]); var isHide = this.options.hideChecker.apply(this, [e]);

Write Preview
Loading…
Cancel
Save